From: Tom Hughes Date: Wed, 22 Aug 2012 19:52:08 +0000 (+0100) Subject: Merge branch 'master' into openstreetbugs X-Git-Tag: live~5791^2~106 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22?hp=fe16fec000e8f26127f656bf68c513f2745b4059 Merge branch 'master' into openstreetbugs Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml config/openlayers.cfg db/structure.sql vendor/assets/openlayers/OpenLayers.js --- diff --git a/.gitignore b/.gitignore index 021bc9be2..2e7dfe16e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ public/assets public/attachments tmp .DS_Store +*~ diff --git a/Gemfile b/Gemfile index 65de156e1..25b10fe7b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,10 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.2' +gem 'rails', '3.2.8' + +# Require things which have moved to gems in ruby 1.9 +gem 'bigdecimal', :platforms => :ruby_19 # Require the postgres database driver gem 'pg' @@ -11,26 +14,36 @@ gem 'pg' gem 'jquery-rails' # Load rails plugins -gem 'rails-i18n', ">= 0.5.1" +gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'oauth-plugin', '>= 0.4.0.pre7' +gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' -gem 'composite_primary_keys', '>= 5.0.0' +gem 'composite_primary_keys', '>= 5.0.8' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' gem 'jsonify-rails' +# We need ruby-openid 2.2.0 or later for ruby 1.9 support +gem 'ruby-openid', '>= 2.2.0' + +# Browser detection support +gem 'browser' + +# Markdown formatting support +gem 'redcarpet' + # Character conversion support for ruby 1.8 gem 'iconv', :platforms => :ruby_18 # Load libxml support for XML parsing and generation gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml' -# Load HTML sanitizer +# Use for HTML sanitisation gem 'sanitize' +gem 'htmlentities' # Load SystemTimer for implementing request timeouts gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18 @@ -44,6 +57,7 @@ gem 'memcached', '>= 1.4.1' # Gems needed for running tests group :test do gem 'timecop' + gem 'minitest', :platforms => :ruby_19 end # Gems needed for compiling assets diff --git a/Gemfile.lock b/Gemfile.lock index e212d1003..158694564 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,35 +2,36 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + actionmailer (3.2.8) + actionpack (= 3.2.8) + mail (~> 2.4.4) + actionpack (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) - rack-cache (~> 1.1) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) + sprockets (~> 2.1.3) + activemodel (3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) + activeresource (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) + activesupport (3.2.8) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.2.7) arel (3.0.2) + bigdecimal (1.1.0) + browser (0.1.4) builder (3.0.0) cocaine (0.2.1) coffee-rails (3.2.2) @@ -39,53 +40,59 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.2.0) - composite_primary_keys (5.0.1) + coffee-script-source (1.3.3) + composite_primary_keys (5.0.8) activerecord (~> 3.2.0) deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) - execjs (1.3.0) + execjs (1.4.0) multi_json (~> 1.0) - faraday (0.7.6) - addressable (~> 2.2) + faraday (0.8.4) multipart-post (~> 1.1) - rack (~> 1.1) hike (1.2.1) + htmlentities (4.3.1) http_accept_language (1.0.2) - httpclient (2.2.4) + httpauth (0.1) + httpclient (2.2.7) i18n (0.6.0) iconv (0.1) - journey (1.0.3) - jquery-rails (2.0.1) - railties (>= 3.2.0, < 5.0) + journey (1.0.4) + jquery-rails (2.1.1) + railties (>= 3.1.0, < 5.0) thor (~> 0.14) - json (1.6.5) + json (1.7.5) jsonify (0.3.1) multi_json (~> 1.0) - jsonify-rails (0.3.1) + jsonify-rails (0.3.2) actionpack - jsonify (>= 0.3.1) + jsonify (< 0.4.0) + jwt (0.1.5) + multi_json (>= 1.0) libv8 (3.3.10.4) - libxml-ruby (2.2.2) - mail (2.4.3) + libxml-ruby (2.3.3) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - memcached (1.4.1) - mime-types (1.17.2) - multi_json (1.1.0) + memcached (1.4.3) + mime-types (1.19) + minitest (3.3.0) + multi_json (1.3.6) multipart-post (1.1.5) - nokogiri (1.5.0) - oauth (0.4.5) - oauth-plugin (0.4.0.rc2) + nokogiri (1.5.5) + oauth (0.4.6) + oauth-plugin (0.4.1) multi_json oauth (~> 0.4.4) - oauth2 + oauth2 (>= 0.5.0) rack - oauth2 (0.5.2) - faraday (~> 0.7) + oauth2 (0.8.0) + faraday (~> 0.8) + httpauth (~> 0.1) + jwt (~> 0.1.4) multi_json (~> 1.0) + rack (~> 1.2) open_id_authentication (1.1.0) rack-openid (~> 1.3) paperclip (2.7.0) @@ -93,7 +100,7 @@ GEM activesupport (>= 2.3.2) cocaine (>= 0.0.2) mime-types - pg (0.13.2) + pg (0.14.0) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -105,51 +112,52 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) + rails (3.2.8) + actionmailer (= 3.2.8) + actionpack (= 3.2.8) + activerecord (= 3.2.8) + activeresource (= 3.2.8) + activesupport (= 3.2.8) bundler (~> 1.0) - railties (= 3.2.2) - rails-i18n (0.5.1) + railties (= 3.2.8) + rails-i18n (0.6.5) i18n (~> 0.5) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (3.2.8) + actionpack (= 3.2.8) + activesupport (= 3.2.8) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - rinku (1.5.1) - ruby-openid (2.1.8) + redcarpet (2.1.1) + rinku (1.7.0) + ruby-openid (2.2.0) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.1.15) - sass-rails (3.2.4) + sass (3.2.1) + sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.2) + sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - therubyracer (0.9.10) + therubyracer (0.10.2) libv8 (~> 3.3.10) - thor (0.14.6) + thor (0.16.0) tilt (1.3.3) - timecop (0.3.5) + timecop (0.4.5) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) - uglifier (1.2.3) + tzinfo (0.3.33) + uglifier (1.2.7) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + multi_json (~> 1.3) validates_email_format_of (1.5.3) PLATFORMS @@ -157,10 +165,13 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) + bigdecimal + browser coffee-rails (~> 3.2.1) - composite_primary_keys (>= 5.0.0) + composite_primary_keys (>= 5.0.8) deadlock_retry (>= 1.2.0) dynamic_form + htmlentities http_accept_language (>= 1.0.2) httpclient iconv @@ -168,13 +179,16 @@ DEPENDENCIES jsonify-rails libxml-ruby (>= 2.0.5) memcached (>= 1.4.1) - oauth-plugin (>= 0.4.0.pre7) + minitest + oauth-plugin (>= 0.4.1) open_id_authentication (>= 1.1.0) paperclip (~> 2.0) pg - rails (= 3.2.2) - rails-i18n (>= 0.5.1) + rails (= 3.2.8) + rails-i18n (>= 0.6.3) + redcarpet rinku (>= 1.2.2) + ruby-openid (>= 2.2.0) sanitize sass-rails (~> 3.2.3) therubyracer diff --git a/README.md b/README.md index edad66cc0..4579b9b80 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,10 @@ will be a better place to start. Anybody hacking on the code is welcome to join the [rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) mailing list where other people hacking on the code hang out and will be happy -to help with any problems you may encounter. +to help with any problems you may encounter. If you are looking for a +project to help out with, please take a look at the list of +[Top Ten Tasks](http://wiki.openstreetmap.org/wiki/Top_Ten_Tasks) that +EWG maintains on the wiki. There are also weekly IRC meetings, at 1800 GMT on Mondays in #osm-ewg on the OFTC network where questions can be asked and ideas discussed. For more diff --git a/app/assets/images/loading.gif b/app/assets/images/loading.gif new file mode 100644 index 000000000..c21d3ede8 Binary files /dev/null and b/app/assets/images/loading.gif differ diff --git a/app/assets/images/sotm.png b/app/assets/images/sotm.png index 8c11ebed4..169b8071d 100644 Binary files a/app/assets/images/sotm.png and b/app/assets/images/sotm.png differ diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png new file mode 100644 index 000000000..f422d70c4 Binary files /dev/null and b/app/assets/images/sprite.png differ diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg new file mode 100644 index 000000000..f6c1209ef --- /dev/null +++ b/app/assets/images/sprite.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb index f23972104..50b0fe441 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -11,17 +11,15 @@ function createMap(divName, options) { controls: options.controls || [ new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Attribution(), - new OpenLayers.Control.LayerSwitcher(), + new SimpleLayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoom(), - new OpenLayers.Control.PanZoomBar(), + new OpenLayers.Control.Zoom(), + new OpenLayers.Control.SimplePanZoom(), new OpenLayers.Control.ScaleLine({geodesic: true}) ], - units: "m", - maxResolution: 156543.0339, numZoomLevels: 20, displayProjection: new OpenLayers.Projection("EPSG:4326"), - theme: "<%= asset_path 'theme/default/style.css' %>" + theme: "<%= asset_path 'theme/openstreetmap/style.css' %>" }); var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), { @@ -69,9 +67,6 @@ function createMap(divName, options) { markers = new OpenLayers.Layer.Markers("Markers", { displayInLayerSwitcher: false, numZoomLevels: 20, - maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508), - maxResolution: 156543, - units: "m", projection: "EPSG:900913" }); map.addLayer(markers); @@ -81,27 +76,35 @@ function createMap(divName, options) { function getArrowIcon() { var size = new OpenLayers.Size(25, 22); - var offset = new OpenLayers.Pixel(-30, -27); + var offset = new OpenLayers.Pixel(-22, -20); var icon = new OpenLayers.Icon("<%= asset_path 'arrow.png' %>", size, offset); return icon; } function addMarkerToMap(position, icon, description) { - var marker = new OpenLayers.Marker(position.clone().transform(epsg4326, map.getProjectionObject()), icon); + var marker = new OpenLayers.Marker(proj(position), icon); markers.addMarker(marker); if (description) { - marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) }); + marker.events.register("mouseover", marker, function() { + openMapPopup(marker, description); + }); } return marker; } function addObjectToMap(url, zoom, callback) { - var layer = new OpenLayers.Layer.GML("Objects", url, { - format: OpenLayers.Format.OSM, + var layer = new OpenLayers.Layer.Vector("Objects", { + strategies: [ + new OpenLayers.Strategy.Fixed() + ], + protocol: new OpenLayers.Protocol.HTTP({ + url: url, + format: new OpenLayers.Format.OSM() + }), style: { strokeColor: "blue", strokeWidth: 3, @@ -139,8 +142,6 @@ function addObjectToMap(url, zoom, callback) { }); map.addLayer(layer); - - layer.loadGML(); } function addBoxToMap(boxbounds, id, outline) { @@ -155,9 +156,9 @@ function addBoxToMap(boxbounds, id, outline) { if (outline) { vertices = boxbounds.toGeometry().getVertices(); vertices.push(new OpenLayers.Geometry.Point(vertices[0].x, vertices[0].y)); - geometry = new OpenLayers.Geometry.LineString(vertices).transform(epsg4326, map.getProjectionObject()); + geometry = proj(new OpenLayers.Geometry.LineString(vertices)); } else { - geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject()); + geometry = proj(boxbounds.toGeometry()); } var box = new OpenLayers.Feature.Vector(geometry, {}, { strokeWidth: 2, @@ -197,27 +198,19 @@ function removeBoxFromMap(box){ vectors.removeFeature(box); } -function getMapCenter() { - return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326); +function proj(x) { + return x.clone().transform(epsg4326, map.getProjectionObject()); +} + +function unproj(x) { + return x.clone().transform(map.getProjectionObject(), epsg4326); } function setMapCenter(center, zoom) { - zoom = parseInt(zoom); + zoom = parseInt(zoom, 10); var numzoom = map.getNumZoomLevels(); if (zoom >= numzoom) zoom = numzoom - 1; - map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom); -} - -function setMapExtent(extent) { - map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject())); -} - -function getMapExtent() { - return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326); -} - -function getMapZoom() { - return map.getZoom(); + map.setCenter(proj(center), zoom); } function getEventPosition(event) { @@ -265,7 +258,3 @@ function setMapLayers(layerConfig) { } } } - -function scaleToZoom(scale) { - return Math.log(360.0/(scale * 512.0)) / Math.log(2.0); -} diff --git a/app/assets/javascripts/menu.js b/app/assets/javascripts/menu.js index e829f2aa6..a01fc39cc 100644 --- a/app/assets/javascripts/menu.js +++ b/app/assets/javascripts/menu.js @@ -19,65 +19,31 @@ function openMenu(anchor, menu, align) { }); } -/* - * Close a menu. - */ -function closeMenu(menu) { - clearTimeout(menu.timer); - menu.hide(); -} - -/* - * Callback called when the mouse enters a menu anchor. - */ -function enterMenuAnchor(event, anchor, menu, delay, align) { - if (!anchor.hasClass("disabled")) { - clearTimeout(menu.timer); - - if (delay > 0) { - menu.timer = setTimeout(function () { openMenu(anchor, menu, align); }, delay); - } else { - openMenu(event, menu, align); - } - } -} - -/* - * Callback called when the mouse leaves a menu anchor. - */ -function leaveMenuAnchor(event, anchor, menu) { - var to = event.relatedTarget; - - if (!menu.is(to) && menu.has(to).length === 0) { - menu.hide(); - } - - clearTimeout(menu.timer); -} - -/* - * Callback called when the mouse leaves a menu. - */ -function leaveMenu(event, anchor, menu) { - var to = event.relatedTarget; - - if (!anchor.is(to) && menu.has(to).length === 0) { - menu.hide(); - } - - clearTimeout(menu.timer); -} - /* * Setup a menu, triggered by hovering over an anchor for a given time. */ -function createMenu(anchorid, menuid, delay, align) { - var anchor = $("#" + anchorid); - var menu = $("#" + menuid); +function createMenu(anchorid, menuid, align) { + var $anchor = $("#" + anchorid); + var $arrow = $("#" + anchorid + " .menuicon"); + var $menu = $("#" + menuid); + var $page = $(":not(#" + menuid + ", #" + anchorid + ")"); + + function hide() { + $menu.hide(); + $page.off("click", hide); + } - anchor.mouseup(function (event) { closeMenu(menu); }); - anchor.mouseover(function (event) { enterMenuAnchor(anchor, anchor, menu, delay, align); }); - anchor.mouseout(function (event) { leaveMenuAnchor(event, anchor, menu); }); - menu.mouseup(function (event) { closeMenu(menu); }); - menu.mouseout(function (event) { leaveMenu(event, anchor, menu); }); + $arrow.click(function(e) { + if ($anchor.is(":not(.disabled)")) { + e.stopPropagation(); + e.preventDefault(); + if ($menu.is(":visible")) { + $menu.hide(); + $page.off("click", hide); + } else { + openMenu($anchor, $menu.show(), align); + $page.on("click", hide); + } + } + }); } diff --git a/app/assets/javascripts/openlayers.js.erb b/app/assets/javascripts/openlayers.js.erb index c428da014..ebb9578a3 100644 --- a/app/assets/javascripts/openlayers.js.erb +++ b/app/assets/javascripts/openlayers.js.erb @@ -1,5 +1,7 @@ //= require OpenLayers //= require OpenStreetMap +//= require SimpleLayerSwitcher +//= require SimplePanZoom OpenLayers.Util.imageURLs = { "404.png": "<%= asset_path 'img/404.png' %>", @@ -28,8 +30,6 @@ OpenLayers.Util.imageURLs = { "zoom-world-mini.png": "<%= asset_path 'img/zoom-world-mini.png' %>" }; -OpenLayers.Util.OSM.MISSING_TILE_URL = "<%= asset_path 'img/404.png' %>"; - OpenLayers.Util.origGetImageLocation = OpenLayers.Util.getImageLocation; OpenLayers.Util.getImageLocation = function(image) { diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js index 93a5127f9..311798aa5 100644 --- a/app/assets/javascripts/site.js +++ b/app/assets/javascripts/site.js @@ -1,5 +1,7 @@ //= require jquery //= require jquery_ujs +//= require jquery.autogrowtextarea +//= require jquery.timers /* * Called as the user scrolls/zooms around to aniplate hrefs of the @@ -142,23 +144,6 @@ function setArgs(url, args) { return url.replace(/\?.*$/, "") + "?" + queryitems.join("&"); } -/* - * Called to get a CSS property for an element. - */ -function getStyle(el, property) { - var style; - - if (el.currentStyle) { - style = el.currentStyle[property]; - } else if( window.getComputedStyle ) { - style = document.defaultView.getComputedStyle(el,null).getPropertyValue(property); - } else { - style = el.style[property]; - } - - return style; -} - /* * Called to interpolate JavaScript variables in strings using a * similar syntax to rails I18n string interpolation - the only @@ -221,3 +206,64 @@ function makeShortCode(lat, lon, zoom) { } return str; } + +/* + * Click handler to switch a rich text control to preview mode + */ +function previewRichtext(event) { + var editor = $(this).parents(".richtext_container").find("textarea"); + var preview = $(this).parents(".richtext_container").find(".richtext_preview"); + var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth(); + var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight(); + + if (preview.contents().length == 0) { + preview.oneTime(500, "loading", function () { + preview.addClass("loading"); + }); + + preview.load(editor.attr("data-preview-url"), { text: editor.val() }, function () { + preview.stopTime("loading"); + preview.removeClass("loading"); + }); + } + + editor.hide(); + preview.width(width); + preview.css("min-height", minHeight + "px"); + preview.show(); + + $(this).siblings(".richtext_doedit").prop("disabled", false); + $(this).prop("disabled", true); + + event.preventDefault(); +} + +/* + * Click handler to switch a rich text control to edit mode + */ +function editRichtext(event) { + var editor = $(this).parents(".richtext_container").find("textarea"); + var preview = $(this).parents(".richtext_container").find(".richtext_preview"); + + preview.hide(); + editor.show(); + + $(this).siblings(".richtext_dopreview").prop("disabled", false); + $(this).prop("disabled", true); + + event.preventDefault(); +} + +/* + * Setup any rich text controls + */ +$(document).ready(function () { + $(".richtext_preview").hide(); + $(".richtext_content textarea").change(function () { + $(this).parents(".richtext_container").find(".richtext_preview").empty(); + }); + $(".richtext_doedit").prop("disabled", true); + $(".richtext_dopreview").prop("disabled", false); + $(".richtext_doedit").click(editRichtext); + $(".richtext_dopreview").click(previewRichtext); +}); diff --git a/app/assets/openlayers/SimpleLayerSwitcher.js b/app/assets/openlayers/SimpleLayerSwitcher.js new file mode 100644 index 000000000..db3c720bb --- /dev/null +++ b/app/assets/openlayers/SimpleLayerSwitcher.js @@ -0,0 +1,175 @@ +var SimpleLayerSwitcher = OpenLayers.Class(OpenLayers.Control, { + layerStates: null, + layersDiv: null, + ascending: true, + + initialize: function(options) { + OpenLayers.Control.prototype.initialize.apply(this, arguments); + this.layerStates = []; + }, + + destroy: function() { + OpenLayers.Event.stopObservingElement(this.div); + + //clear out layers info and unregister their events + this.map.events.un({ + "addlayer": this.redraw, + "changelayer": this.redraw, + "removelayer": this.redraw, + "changebaselayer": this.redraw, + scope: this + }); + OpenLayers.Control.prototype.destroy.apply(this, arguments); + }, + + setMap: function(map) { + OpenLayers.Control.prototype.setMap.apply(this, arguments); + + this.map.events.on({ + "addlayer": this.redraw, + "changelayer": this.redraw, + "removelayer": this.redraw, + "changebaselayer": this.redraw, + scope: this + }); + }, + + draw: function() { + OpenLayers.Control.prototype.draw.apply(this); + this.loadContents(); + this.redraw(); + return this.div; + }, + + checkRedraw: function() { + var redraw = false; + if ( !this.layerStates.length || + (this.map.layers.length != this.layerStates.length) ) { + redraw = true; + } else { + for (var i=0, len=this.layerStates.length; i and a . + * By default it is displayed in the upper left corner of the map as 4 + * directional arrows above a vertical slider. + * + * Inherits from: + * - + */ +OpenLayers.Control.SimplePanZoom = OpenLayers.Class(OpenLayers.Control.PanZoom, { + + /** + * APIProperty: zoomStopWidth + */ + zoomStopWidth: 18, + + /** + * APIProperty: zoomStopHeight + */ + zoomStopHeight: 7, + + /** + * Property: slider + */ + slider: null, + + /** + * Property: sliderEvents + * {} + */ + sliderEvents: null, + + /** + * Property: zoombarDiv + * {DOMElement} + */ + zoombarDiv: null, + + /** + * APIProperty: zoomWorldIcon + * {Boolean} + */ + zoomWorldIcon: false, + + /** + * APIProperty: panIcons + * {Boolean} Set this property to false not to display the pan icons. If + * false the zoom world icon is placed under the zoom bar. Defaults to + * true. + */ + panIcons: true, + + /** + * APIProperty: forceFixedZoomLevel + * {Boolean} Force a fixed zoom level even though the map has + * fractionalZoom + */ + forceFixedZoomLevel: false, + + /** + * Property: mouseDragStart + * {} + */ + mouseDragStart: null, + + /** + * Property: deltaY + * {Number} The cumulative vertical pixel offset during a zoom bar drag. + */ + deltaY: null, + + /** + * Property: zoomStart + * {} + */ + zoomStart: null, + + /** + * Constructor: OpenLayers.Control.PanZoomBar + */ + buttons: null, + + /** + * APIMethod: destroy + */ + destroy: function() { + + this._removeZoomBar(); + + this.map.events.un({ + "changebaselayer": this.redraw, + "updatesize": this.redraw, + scope: this + }); + + OpenLayers.Control.PanZoom.prototype.destroy.apply(this, arguments); + + delete this.mouseDragStart; + delete this.zoomStart; + }, + + /** + * Method: setMap + * + * Parameters: + * map - {} + */ + setMap: function(map) { + OpenLayers.Control.PanZoom.prototype.setMap.apply(this, arguments); + this.map.events.on({ + "changebaselayer": this.redraw, + "updatesize": this.redraw, + scope: this + }); + }, + + /** + * Method: redraw + * clear the div and start over. + */ + redraw: function() { + if (this.div !== null) { + this.removeButtons(); + this._removeZoomBar(); + } + this.draw(); + this.moveZoomBar(); + }, + + /** + * Method: draw + * + * Parameters: + * px - {} + */ + draw: function(px) { + // initialize our internal div + OpenLayers.Control.prototype.draw.apply(this, arguments); + px = this.position.clone(); + + // place the controls + this.buttons = []; + var ids = ['panup', 'panleft', 'panright', 'pandown', 'zoomout', 'zoomin']; + + for (var i = 0; i < ids.length; i++) { + var b = document.createElement('div'); + b.id = ids[i]; + b.action = ids[i]; + b.className = 'button olButton'; + this.div.appendChild(b); + this.buttons.push(b); + } + + this._addZoomBar(); + return this.div; + }, + + /** + * Method: _addZoomBar + * + * Parameters: + * centered - {} where zoombar drawing is to start. + */ + _addZoomBar:function() { + var id = this.id + "_" + this.map.id; + var zoomsToEnd = this.map.getNumZoomLevels() - 1 - this.map.getZoom(); + var slider = document.createElement('div'); + slider.id = 'slider'; + slider.className = 'button'; + slider.style.cursor = 'move'; + this.slider = slider; + + this.sliderEvents = new OpenLayers.Events(this, slider, null, true, + { includeXY: true }); + this.sliderEvents.on({ + "touchstart": this.zoomBarDown, + "touchmove": this.zoomBarDrag, + "touchend": this.zoomBarUp, + "mousedown": this.zoomBarDown, + "mousemove": this.zoomBarDrag, + "mouseup": this.zoomBarUp + }); + + var height = this.zoomStopHeight * (this.map.getNumZoomLevels()); + + // this is the background image + var div = document.createElement('div'); + div.className = 'button olButton'; + div.id = 'zoombar'; + this.zoombarDiv = div; + + this.div.appendChild(div); + this.startTop = 75; + this.div.appendChild(slider); + + this.map.events.register("zoomend", this, this.moveZoomBar); + }, + + /** + * Method: _removeZoomBar + */ + _removeZoomBar: function() { + this.sliderEvents.un({ + "touchstart": this.zoomBarDown, + "touchmove": this.zoomBarDrag, + "touchend": this.zoomBarUp, + "mousedown": this.zoomBarDown, + "mousemove": this.zoomBarDrag, + "mouseup": this.zoomBarUp + }); + this.sliderEvents.destroy(); + + this.div.removeChild(this.zoombarDiv); + this.zoombarDiv = null; + this.div.removeChild(this.slider); + this.slider = null; + + this.map.events.unregister("zoomend", this, this.moveZoomBar); + }, + + /** + * Method: onButtonClick + * + * Parameters: + * evt - {Event} + */ + onButtonClick: function(evt) { + OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this, arguments); + if (evt.buttonElement === this.zoombarDiv) { + var levels = evt.buttonXY.y / this.zoomStopHeight; + if (this.forceFixedZoomLevel || !this.map.fractionalZoom) { + levels = Math.floor(levels); + } + var zoom = (this.map.getNumZoomLevels() - 1) - levels; + zoom = Math.min(Math.max(zoom, 0), this.map.getNumZoomLevels() - 1); + this.map.zoomTo(zoom); + } + }, + + /** + * Method: passEventToSlider + * This function is used to pass events that happen on the div, or the map, + * through to the slider, which then does its moving thing. + * + * Parameters: + * evt - {} + */ + passEventToSlider:function(evt) { + this.sliderEvents.handleBrowserEvent(evt); + }, + + /* + * Method: zoomBarDown + * event listener for clicks on the slider + * + * Parameters: + * evt - {} + */ + zoomBarDown:function(evt) { + if (!OpenLayers.Event.isLeftClick(evt) && !OpenLayers.Event.isSingleTouch(evt)) { + return; + } + this.map.events.on({ + "touchmove": this.passEventToSlider, + "mousemove": this.passEventToSlider, + "mouseup": this.passEventToSlider, + scope: this + }); + this.mouseDragStart = evt.xy.clone(); + this.zoomStart = evt.xy.clone(); + this.div.style.cursor = "move"; + // reset the div offsets just in case the div moved + this.zoombarDiv.offsets = null; + OpenLayers.Event.stop(evt); + }, + + /* + * Method: zoomBarDrag + * This is what happens when a click has occurred, and the client is + * dragging. Here we must ensure that the slider doesn't go beyond the + * bottom/top of the zoombar div, as well as moving the slider to its new + * visual location + * + * Parameters: + * evt - {} + */ + zoomBarDrag: function(evt) { + if (this.mouseDragStart !== null) { + var deltaY = this.mouseDragStart.y - evt.xy.y; + var offsets = OpenLayers.Util.pagePosition(this.zoombarDiv); + if ((evt.clientY - offsets[1]) > 0 && + (evt.clientY - offsets[1]) < 140) { + var newTop = parseInt(this.slider.style.top, 10) - deltaY; + this.slider.style.top = newTop + "px"; + this.mouseDragStart = evt.xy.clone(); + } + // set cumulative displacement + this.deltaY = this.zoomStart.y - evt.xy.y; + OpenLayers.Event.stop(evt); + } + }, + + /* + * Method: zoomBarUp + * Perform cleanup when a mouseup event is received -- discover new zoom + * level and switch to it. + * + * Parameters: + * evt - {} + */ + zoomBarUp: function(evt) { + if (!OpenLayers.Event.isLeftClick(evt) && evt.type !== "touchend") { + return; + } + if (this.mouseDragStart) { + this.div.style.cursor = ""; + this.map.events.un({ + "touchmove": this.passEventToSlider, + "mouseup": this.passEventToSlider, + "mousemove": this.passEventToSlider, + scope: this + }); + var zoomLevel = this.map.zoom; + zoomLevel += this.deltaY/this.zoomStopHeight; + zoomLevel = Math.max(Math.round(zoomLevel), 0); + this.map.zoomTo(zoomLevel); + this.mouseDragStart = null; + this.zoomStart = null; + this.deltaY = 0; + OpenLayers.Event.stop(evt); + } + }, + + /* + * Method: moveZoomBar + * Change the location of the slider to match the current zoom level. + */ + moveZoomBar:function() { + var newTop = + ((this.map.getNumZoomLevels()-1) - this.map.getZoom()) * + this.zoomStopHeight + this.startTop; + this.slider.style.top = newTop + "px"; + }, + CLASS_NAME: "OpenLayers.Control.SimplePanZoom" +}); diff --git a/app/assets/openlayers/theme/default/style.css.scss b/app/assets/openlayers/theme/default/style.css.scss deleted file mode 100644 index 3dbc047b0..000000000 --- a/app/assets/openlayers/theme/default/style.css.scss +++ /dev/null @@ -1,433 +0,0 @@ -div.olMap { - z-index: 0; - padding: 0 !important; - margin: 0 !important; - cursor: default; -} - -div.olMapViewport { - text-align: left; -} - -div.olLayerDiv { - -moz-user-select: none; - -khtml-user-select: none; -} - -.olLayerGoogleCopyright { - left: 2px; - bottom: 2px; -} -.olLayerGoogleV3.olLayerGoogleCopyright { - right: auto !important; -} -.olLayerGooglePoweredBy { - left: 2px; - bottom: 15px; -} -.olLayerGoogleV3.olLayerGooglePoweredBy { - bottom: 15px !important; -} -.olControlAttribution { - font-size: smaller; - right: 3px; - bottom: 4.5em; - position: absolute; - display: block; -} -.olControlScale { - right: 3px; - bottom: 3em; - display: block; - position: absolute; - font-size: smaller; -} -.olControlScaleLine { - display: block; - position: absolute; - left: 10px; - bottom: 15px; - font-size: xx-small; -} -.olControlScaleLineBottom { - border: solid 2px black; - border-bottom: none; - margin-top:-2px; - text-align: center; -} -.olControlScaleLineTop { - border: solid 2px black; - border-top: none; - text-align: center; -} - -.olControlPermalink { - right: 3px; - bottom: 1.5em; - display: block; - position: absolute; - font-size: smaller; -} - -div.olControlMousePosition { - bottom: 0em; - right: 3px; - display: block; - position: absolute; - font-family: Arial; - font-size: smaller; -} - -.olControlOverviewMapContainer { - position: absolute; - bottom: 0; - right: 0; -} - -.olControlOverviewMapElement { - padding: 10px 18px 10px 10px; - background-color: #00008B; - -moz-border-radius: 1em 0 0 0; -} - -.olControlOverviewMapMinimizeButton { - right: 0; - bottom: 80px; - cursor: pointer; -} - -.olControlOverviewMapMaximizeButton { - right: 0; - bottom: 80px; - cursor: pointer; -} - -.olControlOverviewMapExtentRectangle { - overflow: hidden; - background-image: image-url("theme/default/img/blank.gif"); - cursor: move; - border: 2px dotted red; -} -.olControlOverviewMapRectReplacement { - overflow: hidden; - cursor: move; - background-image: image-url("theme/default/img/overview_replacement.gif"); - background-repeat: no-repeat; - background-position: center; -} - -.olLayerGeoRSSDescription { - float:left; - width:100%; - overflow:auto; - font-size:1.0em; -} -.olLayerGeoRSSClose { - float:right; - color:gray; - font-size:1.2em; - margin-right:6px; - font-family:sans-serif; -} -.olLayerGeoRSSTitle { - float:left;font-size:1.2em; -} - -.olPopupContent { - padding:5px; - overflow: auto; -} - -.olControlNavigationHistory { - background-image: image-url("theme/default/img/navigation_history.png"); - background-repeat: no-repeat; - width: 24px; - height: 24px; - -} -.olControlNavigationHistoryPreviousItemActive { - background-position: 0 0; -} -.olControlNavigationHistoryPreviousItemInactive { - background-position: 0 -24px; -} -.olControlNavigationHistoryNextItemActive { - background-position: -24px 0; -} -.olControlNavigationHistoryNextItemInactive { - background-position: -24px -24px; -} - -div.olControlSaveFeaturesItemActive { - background-image: image-url("theme/default/img/save_features_on.png"); - background-repeat: no-repeat; - background-position: 0 1px; -} -div.olControlSaveFeaturesItemInactive { - background-image: image-url("theme/default/img/save_features_off.png"); - background-repeat: no-repeat; - background-position: 0 1px; -} - -.olHandlerBoxZoomBox { - border: 2px solid red; - position: absolute; - background-color: white; - opacity: 0.50; - font-size: 1px; - filter: alpha(opacity=50); -} -.olHandlerBoxSelectFeature { - border: 2px solid blue; - position: absolute; - background-color: white; - opacity: 0.50; - font-size: 1px; - filter: alpha(opacity=50); -} - -.olControlPanPanel { - top: 10px; - left: 5px; -} - -.olControlPanPanel div { - background-image: image-url("theme/default/img/pan-panel.png"); - height: 18px; - width: 18px; - cursor: pointer; - position: absolute; -} - -.olControlPanPanel .olControlPanNorthItemInactive { - top: 0; - left: 9px; - background-position: 0 0; -} -.olControlPanPanel .olControlPanSouthItemInactive { - top: 36px; - left: 9px; - background-position: 18px 0; -} -.olControlPanPanel .olControlPanWestItemInactive { - position: absolute; - top: 18px; - left: 0; - background-position: 0 18px; -} -.olControlPanPanel .olControlPanEastItemInactive { - top: 18px; - left: 18px; - background-position: 18px 18px; -} - -.olControlZoomPanel { - top: 71px; - left: 14px; -} - -.olControlZoomPanel div { - background-image: image-url("theme/default/img/zoom-panel.png"); - position: absolute; - height: 18px; - width: 18px; - cursor: pointer; -} - -.olControlZoomPanel .olControlZoomInItemInactive { - top: 0; - left: 0; - background-position: 0 0; -} - -.olControlZoomPanel .olControlZoomToMaxExtentItemInactive { - top: 18px; - left: 0; - background-position: 0 -18px; -} - -.olControlZoomPanel .olControlZoomOutItemInactive { - top: 36px; - left: 0; - background-position: 0 18px; -} - -/* - * When a potential text is bigger than the image it move the image - * with some headers (closes #3154) - */ -.olControlPanZoomBar div { - font-size: 1px; -} - -.olPopupCloseBox { - background: image-url("theme/default/img/close.gif") no-repeat; - cursor: pointer; -} - -.olFramedCloudPopupContent { - padding: 5px; - overflow: auto; -} - -.olControlNoSelect { - -moz-user-select: none; - -khtml-user-select: none; -} - -.olImageLoadError { - background-color: pink; - opacity: 0.5; - filter: alpha(opacity=50); /* IE */ -} - -/** - * Cursor styles - */ - -.olCursorWait { - cursor: wait; -} -.olDragDown { - cursor: move; -} -.olDrawBox { - cursor: crosshair; -} -.olControlDragFeatureOver { - cursor: move; -} -.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown { - cursor: -moz-grabbing; -} - -/** - * Layer switcher - */ -.olControlLayerSwitcher { - position: absolute; - top: 25px; - right: 0; - width: 20em; - font-family: sans-serif; - font-weight: bold; - margin-top: 3px; - margin-left: 3px; - margin-bottom: 3px; - font-size: smaller; - color: white; - background-color: transparent; -} - -.olControlLayerSwitcher .layersDiv { - padding-top: 5px; - padding-left: 10px; - padding-bottom: 5px; - padding-right: 75px; - background-color: darkblue; - width: 100%; - height: 100%; -} - -.olControlLayerSwitcher .layersDiv .baseLbl, -.olControlLayerSwitcher .layersDiv .dataLbl { - margin-top: 3px; - margin-left: 3px; - margin-bottom: 3px; -} - -.olControlLayerSwitcher .layersDiv .baseLayersDiv, -.olControlLayerSwitcher .layersDiv .dataLayersDiv { - padding-left: 10px; -} - -.olControlLayerSwitcher .maximizeDiv, -.olControlLayerSwitcher .minimizeDiv { - top: 5px; - right: 0; - cursor: pointer; -} - -.olBingAttribution { - color: #DDD; -} -.olBingAttribution.road { - color: #333; -} - -.olGoogleAttribution.hybrid, .olGoogleAttribution.satellite { - color: #EEE; -} -.olGoogleAttribution { - color: #333; -} -span.olGoogleAttribution a { - color: #77C; -} -span.olGoogleAttribution.hybrid a, span.olGoogleAttribution.satellite a { - color: #EEE; -} - -/** - * Editing and navigation icons. - * (using the editing_tool_bar.png sprint image) - */ -.olControlNavToolbar , -.olControlEditingToolbar { - margin: 5px 5px 0 0; -} -.olControlNavToolbar div, -.olControlEditingToolbar div { - background-image: image-url("theme/default/img/editing_tool_bar.png"); - background-repeat: no-repeat; - margin: 0 0 5px 5px; - width: 24px; - height: 22px; - cursor: pointer -} -/* positions */ -.olControlEditingToolbar { - right: 0; - top: 0; -} -.olControlNavToolbar { - top: 295px; - left: 9px; -} -/* layouts */ -.olControlEditingToolbar div { - float: right; -} -/* individual controls */ -.olControlNavToolbar .olControlNavigationItemInactive, -.olControlEditingToolbar .olControlNavigationItemInactive { - background-position: -103px -1px; -} -.olControlNavToolbar .olControlNavigationItemActive , -.olControlEditingToolbar .olControlNavigationItemActive { - background-position: -103px -24px; -} -.olControlNavToolbar .olControlZoomBoxItemInactive { - background-position: -128px -1px; -} -.olControlNavToolbar .olControlZoomBoxItemActive { - background-position: -128px -24px; -} -.olControlEditingToolbar .olControlDrawFeaturePointItemInactive { - background-position: -77px -1px; -} -.olControlEditingToolbar .olControlDrawFeaturePointItemActive { - background-position: -77px -24px; -} -.olControlEditingToolbar .olControlDrawFeaturePathItemInactive { - background-position: -51px -1px; -} -.olControlEditingToolbar .olControlDrawFeaturePathItemActive { - background-position: -51px -24px; -} -.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive{ - background-position: -26px -1px; -} -.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { - background-position: -26px -24px; -} diff --git a/app/assets/openlayers/theme/openstreetmap/SimpleLayerSwitcher.css.scss b/app/assets/openlayers/theme/openstreetmap/SimpleLayerSwitcher.css.scss new file mode 100644 index 000000000..48e730f6c --- /dev/null +++ b/app/assets/openlayers/theme/openstreetmap/SimpleLayerSwitcher.css.scss @@ -0,0 +1,44 @@ +.SimpleLayerSwitcher { + position: absolute; + top: 10px; + right: 10px; + background: #fff; + border: 1px solid #ccc; + min-width: 150px; + background: #fff; +} + +.SimpleLayerSwitcher a.basey { + display: block; + text-decoration: none; + color: #838383; + padding: 2px 5px 2px 20px; +} + +.SimpleLayerSwitcher a.basey-on { + color: #000; + background-color: #fff; + background-image: image-url("theme/openstreetmap/img/carat.png"); + background-repeat: no-repeat; + background-position: 7px 9px; +} + +.SimpleLayerSwitcher a.basey-off { + display: none; +} + +.SimpleLayerSwitcher:hover a { + border-top: 1px solid #eee; +} + +.SimpleLayerSwitcher a:hover { + background-color: #f5f5f5; +} + +.SimpleLayerSwitcher:hover a:first-child { + border-top: none; +} + +.SimpleLayerSwitcher:hover a.basey-off { + display: block; +} diff --git a/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss b/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss new file mode 100644 index 000000000..ad6a63223 --- /dev/null +++ b/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss @@ -0,0 +1,79 @@ +.olControlSimplePanZoom { + top: 10px; + right: 10px; +} + +.olControlSimplePanZoom .button { + background-image: image-url("theme/openstreetmap/img/map_sprite.png"); + position: absolute; + background-repeat: no-repeat; + cursor: hand; + cursor: pointer; +} + +.olControlSimplePanZoom #panup { + left: 10px; + width: 25px; + height: 13px; + background-position: -15px -5px; +} + +.olControlSimplePanZoom #pandown { + left: 10px; + top: 36px; + width: 25px; + height: 15px; + background-position: -15px -40px; +} + +.olControlSimplePanZoom #panleft { + top: 13px; + width: 25px; + height: 24px; + background-position: -5px -17px; +} + +.olControlSimplePanZoom #panright { + top: 13px; + width: 25px; + height: 24px; + left: 25px; + background-position: -30px -17px; +} + +.olControlSimplePanZoom #zoomin { + top: 50px; + width: 26px; + height: 20px; + left: 10px; + background-position: -15px -61px; +} + +.olControlSimplePanZoom #zoomout { + top: 210px; + width: 26px; + height: 20px; + left: 10px; + background-position: -15px -220px; +} + +.olControlSimplePanZoom #slider { + top: 75px; + width: 25px; + height: 10px; + left: 10px; + -webkit-transition: top 100ms linear; + -moz-transition: top 100ms linear; + -o-transition: top 100ms linear; + background-position: -77px -58px; + pointer: move; + cursor: move; +} + +.olControlSimplePanZoom #zoombar { + top: 70px; + width: 26px; + height: 140px; + left: 10px; + background-position: -15px -80px; +} diff --git a/app/assets/openlayers/theme/openstreetmap/img/carat.png b/app/assets/openlayers/theme/openstreetmap/img/carat.png new file mode 100644 index 000000000..7fdf17e32 Binary files /dev/null and b/app/assets/openlayers/theme/openstreetmap/img/carat.png differ diff --git a/app/assets/openlayers/theme/openstreetmap/img/map_sprite.png b/app/assets/openlayers/theme/openstreetmap/img/map_sprite.png new file mode 100644 index 000000000..99734b12f Binary files /dev/null and b/app/assets/openlayers/theme/openstreetmap/img/map_sprite.png differ diff --git a/vendor/assets/openlayers/img/404.png b/app/assets/openlayers/theme/openstreetmap/img/missing-tile.png similarity index 100% rename from vendor/assets/openlayers/img/404.png rename to app/assets/openlayers/theme/openstreetmap/img/missing-tile.png diff --git a/app/assets/openlayers/theme/openstreetmap/style.css.scss b/app/assets/openlayers/theme/openstreetmap/style.css.scss new file mode 100644 index 000000000..b082c9933 --- /dev/null +++ b/app/assets/openlayers/theme/openstreetmap/style.css.scss @@ -0,0 +1,61 @@ +/* + *= require theme/default/style + *= require theme/openstreetmap/SimpleLayerSwitcher + *= require theme/openstreetmap/SimplePanZoom + */ + +.olControlOverviewMapExtentRectangle { + background-image: image-url("theme/default/img/blank.gif"); +} + +.olControlOverviewMapRectReplacement { + background-image: image-url("theme/default/img/overview_replacement.gif"); +} + +.olControlNavigationHistory { + background-image: image-url("theme/default/img/navigation_history.png"); +} + +div.olControlSaveFeaturesItemActive { + background-image: image-url("theme/default/img/save_features_on.png"); +} + +div.olControlSaveFeaturesItemInactive { + background-image: image-url("theme/default/img/save_features_off.png"); +} + +.olControlPanPanel div { + background-image: image-url("theme/default/img/pan-panel.png"); +} + +.olControlZoomPanel div { + background-image: image-url("theme/default/img/zoom-panel.png"); +} + +.olPopupCloseBox { + background: image-url("theme/default/img/close.gif") no-repeat; +} + +.olImageLoadError { + // remove opacity? + // remove filter? + background: image-url("theme/openstreetmap/img/missing-tile.png") no-repeat; +} + +.olControlNavToolbar div, +.olControlEditingToolbar div { + background-image: image-url("theme/default/img/editing_tool_bar.png"); +} + +div.olControlZoom a { + color: black; + background: #ffffff; + border: 1px solid #cccccc; + // remove filter +} + +div.olControlZoom a:hover { + background: #f5f5f5; +} + +// remove max-width hover? diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 42b5f5397..f2f16ec85 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -85,12 +85,17 @@ h2 { /* Rules for the introductory text displayed in the left sidebar to new users */ -#intro { - border-top: 1px solid #ccc; +.sidebar-copy { + padding: 0px 10px; } -#intro p { - margin: 5px; +.sidebar-copy p { + margin: 5px 0; +} + +.sidebar-copy.intro { + margin-top: -1px; + border-top: 1px solid #ccc; } /* @@ -99,16 +104,19 @@ h2 { * undergoing maintenance. */ -#alert { - width: 170px; - margin: 5px; - padding: 5px; - border: 1px solid #ccc; - background: #d00; - line-height: 1.2em; - font-size: 14px; - border-radius: 5px; - -moz-border-radius: 5px; +.sidebar-alert { + padding: 4px 5px 4px 5px; + border-top: 1px solid #ccc; + margin-top: 4px; + margin-bottom: -4px; + background: #e00; + font-size: 13px; + font-weight: bold; + line-height: 17px; + + p { + margin: 5px; + } } /* @@ -117,25 +125,26 @@ h2 { * donation drives. */ -.notice { - width: 170px; - margin: 5px; - padding: 5px; - border: 1px solid #ccc; +.sidebar-notice { + padding: 4px 5px 4px 5px; + border-top: 1px solid #ccc; + margin-top: 4px; + margin-bottom: -4px; background: #ea0; - line-height: 20px; - font-size: 14px; - border-radius: 5px; - -moz-border-radius: 5px; + font-size: 13px; + line-height: 17px; + + p { + margin: 5px; + } } /* Rules for the menu displayed in the left sidebar */ .left_menu { - padding: 5px; + padding: 5px 10px; margin: 4px 0; border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; line-height: 20px; font-size: 14px; font-weight: bold; @@ -156,6 +165,13 @@ h2 { padding: 0px; } +/* submenus */ +.left_menu ul li ul { + font-weight: normal; + line-height: 15px; + font-size: 12px; +} + .left_menu a { color: #000; } @@ -163,14 +179,17 @@ h2 { /* Rules for SOTM advert */ #sotm { - width: 180px; - min-width: 180px; - margin: 5px; + width: 165px; + margin: 10px; padding: 0px; border: 0px; background: #fff; } +#sotm img { + width: 165px; +} + /* * Rules for "optional boxes" which appear in the left sidebar on * certain pages. Current users are the seach box on the main page @@ -178,9 +197,8 @@ h2 { */ .optionalbox { - padding: 5px; + padding: 5px 10px; margin: 4px 0; - border-top: 1px solid #ccc; } .optionalbox h1 { @@ -194,13 +212,6 @@ h2 { /* Rules for the search box */ .whereami { - line-height: 20px; - vertical-align: bottom; -} - -.search_container { - height: 15px; - padding-bottom: 5px; } #search_field form { @@ -209,34 +220,71 @@ h2 { padding: 0px; } +#search_field { + position:relative; +} + #search_field input[type="text"] { - width: 136px; + width: 165px; + padding: 5px; + font-size: 14px; + line-height: 15px; + height: 25px; + box-shadow: inset #DDD 0px 1px 3px; + box-sizing: border-box; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; +} + +#search_field input[type="text"]:focus { + outline: none; + border: 1px solid #000; } #search_field input[type="submit"] { - width: 26px; + width: 15px; + height: 15px; + border:0; + text-indent:-1000px; padding-left: 0px; padding-right: 0px; + background: url(sprite.png); + position:absolute; + right:2px; + top:5px; + cursor:pointer; } .search_help { - margin-top: 2px; - margin-bottom: 0px; + margin:0; +} + +.deemphasize { + color: #999; +} + +.deemphasize a { + color: #7092FF; } /* Rules for donation request box */ .donate { - width: 155px; - margin: 10px 5px; + width: 153px; + margin: 10px 10px; padding: 5px; - border: 1px solid #ccc; + border: 1px solid #AED1A0; background: #cbeea7; line-height: 20px; text-align: center; font-size: 14px; - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: 2px; + -moz-border-radius: 2px; +} + +.donate a { + color:#222; } /* Rules for Creative Commons logo button */ @@ -290,7 +338,24 @@ h2 { #tabnav a:visited.disabled, #tabnav a:link:hover.disabled, #tabnav a:visited:hover.disabled { - color: #888; + color: #ccc; + cursor: default; +} + +#tabnav a:link.disabled:hover, +#tabnav a:visited.disabled:hover, +#tabnav a:link:hover.disabled:hover, +#tabnav a:visited:hover.disabled:hover { + text-decoration: none; +} + +.count-number { + padding: 2px 5px; + border-radius: 3px; + background: #eee; + margin: 0 2px; + font-size: 11px; + color: #333; } /* Rules for greeting bar in the top right corner */ @@ -345,23 +410,34 @@ h2 { /* Rules for edit menu */ +.menuicon { + padding: 5px; + + &:hover { + background: #eee; + text-decoration: none !important; + } +} + .menu { display: none; z-index: 10000; position: absolute; background-color: #ffffff; - border: 1px solid black; + border: 1px solid #cccccc; + border-top: 0px; } .menu ul { - margin-top: 10px; - margin-bottom: 10px; - padding-left: 10px; - padding-right: 10px; + margin: 0px; + padding: 0px; } .menu li { + padding: 2px 5px; + margin: 0px; list-style-type: none; + border-top: 1px solid #eee; white-space: nowrap; } @@ -828,6 +904,10 @@ p#contributorGuidance { /* Rules for the account settings page */ +#accountForm { + margin-top: 20px; +} + #accountForm td { padding-bottom: 10px; } @@ -879,11 +959,11 @@ p#contributorGuidance { /* Rules for the user map */ -.user_map .olControlPanZoomBar { +.user_map .olControlSimplePanZoom { display: none; } -.user_map .olControlPanZoom { +.user_map .olControlZoom { display: block; } @@ -912,6 +992,14 @@ p#contributorGuidance { font-weight: bold; } +.inbox-row .inbox-mark-read { + display: none; +} + +.inbox-row-unread .inbox-mark-unread { + display: none; +} + /* Rules for "flash" notice boxes shown at the top of the content area */ #error { @@ -997,7 +1085,7 @@ input[type="email"], input[type="url"], input[type="password"], textarea { - border: 1px solid #888; + border: 1px solid #ccc; } /* Rules for user images */ @@ -1049,3 +1137,63 @@ abbr.geo { vertical-align: text-bottom; border: 0; } + +/* Rules for rich text editors */ + +.richtext_container { + white-space: nowrap; + + .richtext_content { + display: inline-block; + vertical-align: top; + + .richtext_preview { + display: inline-block; + margin-top: 1px; + margin-bottom: 1px; + border: 4px solid #eee; + background-color: #eee; + white-space: normal; + + &.loading { + background-image: image-url("loading.gif"); + background-repeat: no-repeat; + background-position: center; + } + + > :first-child { + margin-top: 0px; + } + } + } + + .richtext_help { + display: inline-block; + vertical-align: top; + background-color: #ddd; + padding: 5px 10px 10px 10px; + font-size: 12px; + + p { + margin: 0px; + } + + th { + vertical-align: top; + } + + td { + font-family: fixed; + line-height: 16px; + padding: 0px !important; + } + + input.richtext_doedit { + margin-top: 5px !important; + } + + input.richtext_dopreview { + margin-top: 5px !important; + } + } +} diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css index 2cf195632..51e999924 100644 --- a/app/assets/stylesheets/large.css +++ b/app/assets/stylesheets/large.css @@ -14,7 +14,7 @@ /* Rules for OpenLayers maps */ -.olControlPanZoom { +.olControlZoom { display: none; } diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss index 5eba8ddb9..aaa182b8f 100644 --- a/app/assets/stylesheets/ltr.css.scss +++ b/app/assets/stylesheets/ltr.css.scss @@ -6,26 +6,6 @@ html body { text-align: left; } -/* - * Rules for alert boxes shown in the left sidebar when important - * information needs to be conveyed such as when the site is - * undergoing maintenance. - */ - -#alert { - text-align: left; -} - -/* - * Rules for notice boxes shown in the left sidebar when important, but - * non-critical information needs to be conveyed such as notices about - * donation drives. - */ - -.notice { - text-align: left; -} - /* Rules for the menu displayed in the left sidebar */ .left_menu { @@ -60,12 +40,6 @@ html body { text-align: left; } -/* Rules for the search box */ - -.whereami { - float: right; -} - /* Rules for tabbed navigation bar */ #top-bar { @@ -235,3 +209,28 @@ input.openid_url { background: image-url('openid_input.png') repeat-y left white; padding-left: 16px; } + +/* Rules for rich text editors */ + +.richtext_container { + .richtext_help { + margin-left: 15px; + + th { + text-align: left; + padding: 0px 15px 0px 0px !important; + } + + td { + text-align: left; + } + + input.richtext_doedit { + margin-right: 10px !important; + } + + input.richtext_dopreview { + margin-left: 10px !important; + } + } +} diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index a349ccfde..367bd4fa5 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -26,15 +26,15 @@ display: none; } -.olControlPanZoom { +.olControlZoom { display: none; } -.olControlPanZoomBar { +.olControlSimplePanZoom { display: none; } -.olControlLayerSwitcher { +.SimpleLayerSwitcher { display: none; } diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss index b9223e522..c4cb08521 100644 --- a/app/assets/stylesheets/rtl.css.scss +++ b/app/assets/stylesheets/rtl.css.scss @@ -6,26 +6,6 @@ html body { text-align: right; } -/* - * Rules for alert boxes shown in the left sidebar when important - * information needs to be conveyed such as when the site is - * undergoing maintenance. - */ - -#alert { - text-align: right; -} - -/* - * Rules for notice boxes shown in the left sidebar when important, but - * non-critical information needs to be conveyed such as notices about - * donation drives. - */ - -.notice { - text-align: right; -} - /* Rules for the menu displayed in the left sidebar */ .left_menu { @@ -60,12 +40,6 @@ html body { text-align: right; } -/* Rules for the search box */ - -.whereami { - float: left; -} - /* Rules for tabbed navigation bar */ #top-bar { @@ -235,3 +209,28 @@ input.openid_url { background: image-url('openid_input.png') repeat-y right white; padding-right: 16px; } + +/* Rules for rich text editors */ + +.richtext_container { + .richtext_help { + margin-right: 15px; + + th { + text-align: right; + padding: 0px 0px 0px 15px !important; + } + + td { + text-align: right; + } + + input.richtext_doedit { + margin-left: 10px !important; + } + + input.richtext_dopreview { + margin-right: 10px !important; + } + } +} diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index 412cf7203..66cc68655 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -18,7 +18,8 @@ h1 { /* Rules for tabbed navigation bar */ #top-bar { - margin: 0; + margin: 0px; + height: 19px; } #tabnav { @@ -90,18 +91,20 @@ h1 { border: 0; } -.olControlPanZoomBar { +.olControlSimplePanZoom { display: none; } /* Rules for the main content area */ #content { - left: 10px; - right: 10px; - top: 47px; + left: 0px; + right: 0px; + top: 38px; margin-left: 0px; margin-right: 0px; + border-left: 0px; + border-right: 0px; } #content.site_index { diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 9f38f0dcd..ef7a63639 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -133,7 +133,7 @@ class AmfController < ApplicationController amf_handle_error("'startchangeset'",nil,nil) do user = getuser(usertoken) if !user then return -1,"You are not logged in, so Potlatch can't write any changes to the database." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if cstags @@ -359,13 +359,13 @@ class AmfController < ApplicationController amf_handle_error_with_timeout("'getway_old' #{id}, #{timestamp}", 'way',id) do if timestamp == '' # undelete - old_way = OldWay.where(:visible => true, :way_id => id).order("version DESC").first + old_way = OldWay.where(:visible => true, :way_id => id).unredacted.order("version DESC").first points = old_way.get_nodes_undelete unless old_way.nil? else begin # revert timestamp = DateTime.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") - old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).order("timestamp DESC").first + old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless old_way.nil? points = old_way.get_nodes_revert(timestamp) if !old_way.visible @@ -403,11 +403,11 @@ class AmfController < ApplicationController # Find list of revision dates for way and all constituent nodes revdates=[] revusers={} - Way.find(wayid).old_ways.collect do |a| + Way.find(wayid).old_ways.unredacted.collect do |a| revdates.push(a.timestamp) unless revusers.has_key?(a.timestamp.to_i) then revusers[a.timestamp.to_i]=change_user(a) end a.nds.each do |n| - Node.find(n).old_nodes.collect do |o| + Node.find(n).old_nodes.unredacted.collect do |o| revdates.push(o.timestamp) unless revusers.has_key?(o.timestamp.to_i) then revusers[o.timestamp.to_i]=change_user(o) end end @@ -423,7 +423,7 @@ class AmfController < ApplicationController # Remove any elements where 2 seconds doesn't elapse before next one revdates.delete_if { |d| revdates.include?(d+1) or revdates.include?(d+2) } # Collect all in one nested array - revdates.collect! {|d| [d.succ.strftime("%d %b %Y, %H:%M:%S")] + revusers[d.to_i] } + revdates.collect! {|d| [(d + 1).strftime("%d %b %Y, %H:%M:%S")] + revusers[d.to_i] } revdates.uniq! return ['way', wayid, revdates] @@ -436,8 +436,8 @@ class AmfController < ApplicationController def getnode_history(nodeid) #:doc: begin - history = Node.find(nodeid).old_nodes.reverse.collect do |old_node| - [old_node.timestamp.succ.strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node) + history = Node.find(nodeid).old_nodes.unredacted.reverse.collect do |old_node| + [(old_node.timestamp + 1).strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node) end return ['node', nodeid, history] rescue ActiveRecord::RecordNotFound @@ -459,7 +459,7 @@ class AmfController < ApplicationController amf_handle_error_with_timeout("'findgpx'" ,nil,nil) do user = getuser(usertoken) if !user then return -1,"You must be logged in to search for GPX traces." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end query = Trace.visible_to(user) if searchterm.to_i > 0 then @@ -523,7 +523,7 @@ class AmfController < ApplicationController amf_handle_error("'putrelation' #{relid}" ,'relation',relid) do user = getuser(usertoken) if !user then return -1,"You are not logged in, so the relation could not be saved." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if !tags_ok(tags) then return -1,"One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end @@ -613,7 +613,7 @@ class AmfController < ApplicationController user = getuser(usertoken) if !user then return -1,"You are not logged in, so the way could not be saved." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end @@ -722,7 +722,7 @@ class AmfController < ApplicationController amf_handle_error("'putpoi' #{id}", 'node',id) do user = getuser(usertoken) if !user then return -1,"You are not logged in, so the point could not be saved." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if !tags_ok(tags) then return -1,"One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end @@ -782,7 +782,7 @@ class AmfController < ApplicationController n = Node.find(id) v = n.version unless timestamp == '' - n = OldNode.where("id = ? AND timestamp <= ?", id, timestamp).order("timestamp DESC").first + n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first end if n @@ -807,7 +807,7 @@ class AmfController < ApplicationController amf_handle_error("'deleteway' #{way_id}" ,'way', way_id) do user = getuser(usertoken) unless user then return -1,"You are not logged in, so the way could not be deleted." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end way_id = way_id.to_i diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 002bd73b8..602b79d69 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -2,6 +2,7 @@ class ApiController < ApplicationController skip_before_filter :verify_authenticity_token before_filter :check_api_readable, :except => [:capabilities] + before_filter :setup_user_auth, :only => [:permissions] after_filter :compress_output around_filter :api_call_handle_error, :api_call_timeout @@ -289,4 +290,20 @@ class ApiController < ApplicationController render :text => doc.to_s, :content_type => "text/xml" end + + # External apps that use the api are able to query which permissions + # they have. This currently returns a list of permissions granted to the current user: + # * if authenticated via OAuth, this list will contain all permissions granted by the user to the access_token. + # * if authenticated via basic auth all permissions are granted, so the list will contain all permissions. + # * unauthenticated users have no permissions, so the list will be empty. + def permissions + @permissions = case + when current_token.present? + ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) } + when @user + ClientApplication.all_permissions + else + [] + end + end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6caed0594..8f9ae2948 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,13 +4,6 @@ class ApplicationController < ActionController::Base protect_from_forgery if STATUS == :database_readonly or STATUS == :database_offline - after_filter :clear_session - wrap_parameters false - - def clear_session - session.clear - end - def self.cache_sweeper(*sweepers) end end @@ -51,7 +44,13 @@ class ApplicationController < ActionController::Base end def require_user - redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath unless @user + unless @user + if request.get? + redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath + else + render :nothing => true, :status => :forbidden + end + end end ## @@ -112,6 +111,20 @@ class ApplicationController < ActionController::Base require_capability(:allow_write_gpx) end + ## + # require that the user is a moderator, or fill out a helpful error message + # and return them to the index for the controller this is wrapped from. + def require_moderator + unless @user.moderator? + if request.get? + flash[:error] = t('application.require_moderator.not_a_moderator') + redirect_to :action => 'index' + else + render :nothing => true, :status => :forbidden + end + end + end + ## # sets up the @user object for use by other methods. this is mostly called # from the authorize method, but can be called elsewhere if authorisation @@ -133,7 +146,7 @@ class ApplicationController < ActionController::Base # have we identified the user? if @user # check if the user has been banned - if not @user.active_blocks.empty? + if @user.blocks.active.exists? # NOTE: need slightly more helpful message than this. report_error t('application.setup_user_auth.blocked'), :forbidden end @@ -161,6 +174,22 @@ class ApplicationController < ActionController::Base end end + ## + # to be used as a before_filter *after* authorize. this checks that + # the user is a moderator and, if not, returns a forbidden error. + # + # NOTE: this isn't a very good way of doing it - it duplicates logic + # from require_moderator - but what we really need to do is a fairly + # drastic refactoring based on :format and respond_to? but not a + # good idea to do that in this branch. + def authorize_moderator(errormessage="Access restricted to moderators") + # check user is a moderator + unless @user.moderator? + render :text => errormessage, :status => :forbidden + return false + end + end + def check_database_readable(need_api = false) if STATUS == :database_offline or (need_api and STATUS == :api_offline) redirect_to :controller => 'site', :action => 'offline' @@ -356,6 +385,26 @@ class ApplicationController < ActionController::Base !@user.nil? end + ## + # ensure that there is a "this_user" instance variable + def lookup_this_user + unless @this_user = User.active.find_by_display_name(params[:display_name]) + render_unknown_user params[:display_name] + end + end + + ## + # render a "no such user" page + def render_unknown_user(name) + @title = t "user.no_such_user.title" + @not_found_user = name + + respond_to do |format| + format.html { render :template => "user/no_such_user", :status => :not_found } + format.all { render :nothing => true, :status => :not_found } + end + end + private # extract authorisation credentials from headers, returns user = nil if none diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 33bdd6630..73f0940d8 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -7,6 +7,11 @@ class BrowseController < ApplicationController around_filter :web_timeout, :except => [:start] def start + @max_features = case + when browser.ie? && browser.version.to_i < 8 then 100 + when browser.ie? && browser.version.to_i < 9 then 500 + else 2000 + end end def relation diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index cfe86de51..947732fb1 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -143,10 +143,11 @@ class ChangesetController < ApplicationController def download changeset = Changeset.find(params[:id]) - # get all the elements in the changeset and stick them in a big array. - elements = [changeset.old_nodes, - changeset.old_ways, - changeset.old_relations].flatten + # get all the elements in the changeset which haven't been redacted + # and stick them in a big array. + elements = [changeset.old_nodes.unredacted, + changeset.old_ways.unredacted, + changeset.old_relations.unredacted].flatten # sort the elements by timestamp and version number, as this is the # almost sensible ordering available. this would be much nicer if @@ -259,10 +260,8 @@ class ChangesetController < ApplicationController else changesets = changesets.where("false") end - elsif request.format == :html - @title = t 'user.no_such_user.title' - @not_found_user = params[:display_name] - render :template => 'user/no_such_user', :status => :not_found + else + render_unknown_user params[:display_name] return end end diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index f87b02ef9..68d3a81ee 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -4,6 +4,7 @@ class DiaryEntryController < ApplicationController before_filter :authorize_web before_filter :set_locale before_filter :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment] + before_filter :lookup_this_user, :only => [:view, :comments] before_filter :check_database_readable before_filter :check_database_writable, :only => [:new, :edit] before_filter :require_administrator, :only => [:hide, :hidecomment] @@ -84,10 +85,7 @@ class DiaryEntryController < ApplicationController :order => 'created_at DESC', :per_page => 20) else - @title = t'diary_entry.no_such_user.title' - @not_found_user = params[:display_name] - - render :action => 'no_such_user', :status => :not_found + render_unknown_user params[:display_name] end elsif params[:language] @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name @@ -167,49 +165,36 @@ class DiaryEntryController < ApplicationController end def view - user = User.active.find_by_display_name(params[:display_name]) - - if user - @entry = user.diary_entries.visible.where(:id => params[:id]).first - if @entry - @title = t 'diary_entry.view.title', :user => params[:display_name], :title => @entry.title - else - @title = t 'diary_entry.no_such_entry.title', :id => params[:id] - render :action => 'no_such_entry', :status => :not_found - end + @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first + if @entry + @title = t 'diary_entry.view.title', :user => params[:display_name], :title => @entry.title else - @not_found_user = params[:display_name] - - render :action => 'no_such_user', :status => :not_found + @title = t 'diary_entry.no_such_entry.title', :id => params[:id] + render :action => 'no_such_entry', :status => :not_found end end def hide entry = DiaryEntry.find(params[:id]) - entry.update_attributes(:visible => false) + entry.update_attributes({:visible => false}, :without_protection => true) redirect_to :action => "list", :display_name => entry.user.display_name end def hidecomment comment = DiaryComment.find(params[:comment]) - comment.update_attributes(:visible => false) + comment.update_attributes({:visible => false}, :without_protection => true) redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id end def comments - @this_user = User.active.find_by_display_name(params[:display_name]) - - if @this_user - @comment_pages, @comments = paginate(:diary_comments, - :conditions => { :user_id => @this_user }, - :order => 'created_at DESC', - :per_page => 20) - @page = (params[:page] || 1).to_i - else - @title = t'diary_entry.no_such_user.title' - @not_found_user = params[:display_name] - render :action => 'no_such_user', :status => :not_found - end + @comment_pages, @comments = paginate(:diary_comments, + :conditions => { + :user_id => @this_user, + :visible => true + }, + :order => 'created_at DESC', + :per_page => 20) + @page = (params[:page] || 1).to_i end private ## diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index cc3ed70c5..2102a5704 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -21,15 +21,6 @@ class ExportController < ApplicationController scale = params[:mapnik_scale] redirect_to "http://parent.tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}" - - elsif format == "osmarender" - #redirect to the t@h 'MapOf' service - format = params[:osmarender_format] - zoom = params[:osmarender_zoom].to_i - width = bbox.slippy_width(zoom).to_i - height = bbox.slippy_height(zoom).to_i - - redirect_to "http://tah.openstreetmap.org/MapOf/index.php?long=#{bbox.centre_lon}&lat=#{bbox.centre_lat}&z=#{zoom}&w=#{width}&h=#{height}&format=#{format}" end end end diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index c55c85833..2b03790aa 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -26,7 +26,7 @@ class GeocoderController < ApplicationController @sources.push "osm_nominatim" else @sources.push "osm_nominatim" - @sources.push "geonames" + @sources.push "geonames" if defined?(GEONAMES_USERNAME) end end @@ -272,7 +272,7 @@ class GeocoderController < ApplicationController @results = Array.new # ask geonames.org - response = fetch_xml("http://ws.geonames.org/search?q=#{escape_query(query)}&maxRows=20") + response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&maxRows=20&username=#{GEONAMES_USERNAME}") # parse the response response.elements.each("geonames/geoname") do |geoname| diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index ec183fc3e..94bee5d35 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -4,44 +4,32 @@ class MessageController < ApplicationController before_filter :authorize_web before_filter :set_locale before_filter :require_user + before_filter :lookup_this_user, :only => [:new] before_filter :check_database_readable before_filter :check_database_writable, :only => [:new, :reply, :mark] - # Allow the user to write a new message to another user. This action also + # Allow the user to write a new message to another user. This action also # deals with the sending of that message to the other user when the user # clicks send. # The display_name param is the display name of the user that the message is being sent to. def new - @to_user = User.find_by_display_name(params[:display_name]) - if @to_user - if params[:message] - if @user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR - flash[:error] = t 'message.new.limit_exceeded' - else - @message = Message.new(params[:message]) - @message.to_user_id = @to_user.id - @message.from_user_id = @user.id - @message.sent_on = Time.now.getutc - - if @message.save - flash[:notice] = t 'message.new.message_sent' - Notifier.message_notification(@message).deliver - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - end - end + if params[:message] + if @user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR + flash[:error] = t 'message.new.limit_exceeded' else - if params[:title] - # ?title= is set when someone reponds to this user's diary - # entry. Then we pre-fill out the subject and the - @title = @subject = params[:title] - else - # The default /message/new/$user view - @title = t 'message.new.title' + @message = Message.new(params[:message]) + @message.to_user_id = @this_user.id + @message.from_user_id = @user.id + @message.sent_on = Time.now.getutc + + if @message.save + flash[:notice] = t 'message.new.message_sent' + Notifier.message_notification(@message).deliver + redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end end else - @title = t'message.no_such_user.title' - render :action => 'no_such_user', :status => :not_found + @title = t 'message.new.title' end end @@ -50,9 +38,9 @@ class MessageController < ApplicationController message = Message.find(params[:message_id]) if message.to_user_id == @user.id then - @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" + @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}" - @to_user = User.find(message.from_user_id) + @this_user = User.find(message.from_user_id) render :action => 'new' else @@ -101,22 +89,19 @@ class MessageController < ApplicationController # Set the message as being read or unread. def mark - if params[:message_id] - id = params[:message_id] - @message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first - if params[:mark] == 'unread' - message_read = false - notice = t 'message.mark.as_unread' - else - message_read = true - notice = t 'message.mark.as_read' - end - @message.message_read = message_read - if @message.save - if not request.xhr? - flash[:notice] = notice - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - end + @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id]) + if params[:mark] == 'unread' + message_read = false + notice = t 'message.mark.as_unread' + else + message_read = true + notice = t 'message.mark.as_read' + end + @message.message_read = message_read + if @message.save + if not request.xhr? + flash[:notice] = notice + redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end end rescue ActiveRecord::RecordNotFound @@ -126,19 +111,16 @@ class MessageController < ApplicationController # Delete the message. def delete - if params[:message_id] - id = params[:message_id] - message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first - message.from_user_visible = false if message.sender == @user - message.to_user_visible = false if message.recipient == @user - if message.save - flash[:notice] = t 'message.delete.deleted' + message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id]) + message.from_user_visible = false if message.sender == @user + message.to_user_visible = false if message.recipient == @user + if message.save + flash[:notice] = t 'message.delete.deleted' - if params[:referer] - redirect_to params[:referer] - else - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - end + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end end rescue ActiveRecord::RecordNotFound diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index d4d1bd888..856fdd790 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -32,7 +32,7 @@ class OauthController < ApplicationController @token.invalidate! flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name) end - redirect_to :controller => 'oauth_clients', :action => 'index' + redirect_to oauth_clients_url(:display_name => @token.user.display_name) end protected diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb new file mode 100644 index 000000000..c23df70df --- /dev/null +++ b/app/controllers/old_controller.rb @@ -0,0 +1,77 @@ +# this class pulls together the logic for all the old_* controllers +# into one place. as it turns out, the API methods for historical +# nodes, ways and relations are basically identical. +class OldController < ApplicationController + require 'xml/libxml' + + skip_before_filter :verify_authenticity_token + before_filter :setup_user_auth, :only => [ :history, :version ] + before_filter :authorize, :only => [ :redact ] + before_filter :authorize_moderator, :only => [ :redact ] + before_filter :require_allow_write_api, :only => [ :redact ] + before_filter :check_api_readable + before_filter :check_api_writable, :only => [ :redact ] + after_filter :compress_output + around_filter :api_call_handle_error, :api_call_timeout + before_filter :lookup_old_element, :except => [ :history ] + before_filter :lookup_old_element_versions, :only => [ :history ] + + def history + # the .where() method used in the lookup_old_element_versions + # call won't throw an error if no records are found, so we have + # to do that ourselves. + raise OSM::APINotFoundError.new if @elements.empty? + + doc = OSM::API.new.get_xml_doc + + visible_elements = if show_redactions? + @elements + else + @elements.unredacted + end + + visible_elements.each do |element| + doc.root << element.to_xml_node + end + + render :text => doc.to_s, :content_type => "text/xml" + end + + def version + if @old_element.redacted? and not show_redactions? + render :nothing => true, :status => :forbidden + + else + response.last_modified = @old_element.timestamp + + doc = OSM::API.new.get_xml_doc + doc.root << @old_element.to_xml_node + + render :text => doc.to_s, :content_type => "text/xml" + end + end + + def redact + redaction_id = params['redaction'] + unless redaction_id.nil? + # if a redaction ID was specified, then set this element to + # be redacted in that redaction. + redaction = Redaction.find(redaction_id.to_i) + @old_element.redact!(redaction) + + else + # if no redaction ID was provided, then this is an unredact + # operation. + @old_element.redact!(nil) + end + + # just return an empty 200 OK for success + render :nothing => true + end + + private + + def show_redactions? + @user and @user.moderator? and params[:show_redactions] == "true" + end +end diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb index 615213ac1..16f33013e 100644 --- a/app/controllers/old_node_controller.rb +++ b/app/controllers/old_node_controller.rb @@ -1,33 +1,12 @@ -class OldNodeController < ApplicationController - require 'xml/libxml' +class OldNodeController < OldController - skip_before_filter :verify_authenticity_token - before_filter :check_api_readable - after_filter :compress_output - around_filter :api_call_handle_error, :api_call_timeout - - def history - node = Node.find(params[:id]) - - doc = OSM::API.new.get_xml_doc - - node.old_nodes.each do |old_node| - doc.root << old_node.to_xml_node - end - - render :text => doc.to_s, :content_type => "text/xml" - end + private - def version - if old_node = OldNode.where(:node_id => params[:id], :version => params[:version]).first - response.last_modified = old_node.timestamp - - doc = OSM::API.new.get_xml_doc - doc.root << old_node.to_xml_node + def lookup_old_element + @old_element = OldNode.find([params[:id], params[:version]]) + end - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :not_found - end + def lookup_old_element_versions + @elements = OldNode.where(:node_id => params[:id]).order(:version) end end diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb index 19b4e5d34..0cb3b2747 100644 --- a/app/controllers/old_relation_controller.rb +++ b/app/controllers/old_relation_controller.rb @@ -1,32 +1,12 @@ -class OldRelationController < ApplicationController - require 'xml/libxml' +class OldRelationController < OldController - skip_before_filter :verify_authenticity_token - before_filter :check_api_readable - after_filter :compress_output - around_filter :api_call_handle_error, :api_call_timeout - - def history - relation = Relation.find(params[:id]) - doc = OSM::API.new.get_xml_doc - - relation.old_relations.each do |old_relation| - doc.root << old_relation.to_xml_node - end - - render :text => doc.to_s, :content_type => "text/xml" - end + private - def version - if old_relation = OldRelation.where(:relation_id => params[:id], :version => params[:version]).first - response.last_modified = old_relation.timestamp - - doc = OSM::API.new.get_xml_doc - doc.root << old_relation.to_xml_node + def lookup_old_element + @old_element = OldRelation.find([params[:id], params[:version]]) + end - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :not_found - end + def lookup_old_element_versions + @elements = OldRelation.where(:relation_id => params[:id]).order(:version) end end diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb index 3836d4ab7..f6f282309 100644 --- a/app/controllers/old_way_controller.rb +++ b/app/controllers/old_way_controller.rb @@ -1,33 +1,12 @@ -class OldWayController < ApplicationController - require 'xml/libxml' +class OldWayController < OldController - skip_before_filter :verify_authenticity_token - before_filter :check_api_readable - after_filter :compress_output - around_filter :api_call_handle_error, :api_call_timeout - - def history - way = Way.find(params[:id]) - - doc = OSM::API.new.get_xml_doc - - way.old_ways.each do |old_way| - doc.root << old_way.to_xml_node - end - - render :text => doc.to_s, :content_type => "text/xml" - end + private - def version - if old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first - response.last_modified = old_way.timestamp - - doc = OSM::API.new.get_xml_doc - doc.root << old_way.to_xml_node + def lookup_old_element + @old_element = OldWay.find([params[:id], params[:version]]) + end - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :not_found - end + def lookup_old_element_versions + @elements = OldWay.where(:way_id => params[:id]).order(:version) end end diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb new file mode 100644 index 000000000..f8713608d --- /dev/null +++ b/app/controllers/redactions_controller.rb @@ -0,0 +1,76 @@ +class RedactionsController < ApplicationController + layout 'site' + + before_filter :authorize_web + before_filter :set_locale + before_filter :require_user, :only => [:new, :create, :edit, :update, :destroy] + before_filter :require_moderator, :only => [:new, :create, :edit, :update, :destroy] + before_filter :lookup_redaction, :only => [:show, :edit, :update, :destroy] + before_filter :check_database_readable + before_filter :check_database_writable, :only => [:create, :update, :destroy] + + def index + @redactions_pages, @redactions = paginate(:redactions, :order => :id, :per_page => 10) + end + + def new + @redaction = Redaction.new + end + + def create + @redaction = Redaction.new + @redaction.user = @user + @redaction.title = params[:redaction][:title] + @redaction.description = params[:redaction][:description] + # note that the description format will default to 'markdown' + + if @redaction.save + flash[:notice] = t('redaction.create.flash') + redirect_to @redaction + else + render :action => 'new' + end + end + + def show + end + + def edit + end + + def update + # note - don't update the user ID + @redaction.title = params[:redaction][:title] + @redaction.description = params[:redaction][:description] + + if @redaction.save + flash[:notice] = t('redaction.update.flash') + redirect_to @redaction + else + render :action => 'edit' + end + end + + def destroy + unless @redaction.old_nodes.empty? and + @redaction.old_ways.empty? and + @redaction.old_relations.empty? + flash[:error] = t('redaction.destroy.not_empty') + redirect_to @redaction + else + if @redaction.destroy + flash[:notice] = t('redaction.destroy.flash') + redirect_to :redactions + else + flash[:error] = t('redaction.destroy.error') + redirect_to @redaction + end + end + end + + private + + def lookup_redaction + @redaction = Redaction.find(params[:id]) + end +end diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index cf4465b9c..fa33deeee 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -85,4 +85,8 @@ class SiteController < ApplicationController def copyright @locale = params[:copyright_locale] || I18n.locale end + + def preview + render :text => RichText.new(params[:format], params[:text]).to_html + end end diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 7b2314be3..05f97bf0d 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -30,9 +30,7 @@ class TraceController < ApplicationController if !display_name.blank? target_user = User.active.where(:display_name => display_name).first if target_user.nil? - @title = t'trace.no_such_user.title' - @not_found_user = display_name - render :action => 'no_such_user', :status => :not_found + render_unknown_user display_name return end end diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 2bdafa80e..455e45c3f 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -4,7 +4,7 @@ class UserBlocksController < ApplicationController before_filter :authorize_web before_filter :set_locale before_filter :require_user, :only => [:new, :create, :edit, :update, :revoke] - before_filter :require_moderator, :only => [:create, :update, :revoke] + before_filter :require_moderator, :only => [:new, :create, :edit, :update, :revoke] before_filter :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by] before_filter :lookup_user_block, :only => [:show, :edit, :update, :revoke] before_filter :require_valid_params, :only => [:create, :update] @@ -34,46 +34,43 @@ class UserBlocksController < ApplicationController end def create - unless @valid_params - redirect_to :action => "new" - return - end - - @user_block = UserBlock.new({ - :user_id => @this_user.id, - :creator_id => @user.id, - :reason => params[:user_block][:reason], - :ends_at => Time.now.getutc() + @block_period.hours, - :needs_view => params[:user_block][:needs_view] - }, :without_protection => true) + if @valid_params + @user_block = UserBlock.new({ + :user_id => @this_user.id, + :creator_id => @user.id, + :reason => params[:user_block][:reason], + :ends_at => Time.now.getutc() + @block_period.hours, + :needs_view => params[:user_block][:needs_view] + }, :without_protection => true) - if @user_block.save - flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name) - redirect_to @user_block + if @user_block.save + flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name) + redirect_to @user_block + else + render :action => "new" + end else - render :action => "new" + redirect_to new_user_block_path(:display_name => params[:display_name]) end end def update - unless @valid_params - redirect_to :action => "edit" - return - end - - if @user_block.creator_id != @user.id - flash[:error] = t('user_block.update.only_creator_can_edit') - redirect_to :action => "edit" - return - end - - if @user_block.update_attributes({ :ends_at => Time.now.getutc() + @block_period.hours, - :reason => params[:user_block][:reason], - :needs_view => params[:user_block][:needs_view] }, :without_protection => true) - flash[:notice] = t('user_block.update.success') - redirect_to(@user_block) + if @valid_params + if @user_block.creator_id != @user.id + flash[:error] = t('user_block.update.only_creator_can_edit') + redirect_to :action => "edit" + elsif @user_block.update_attributes({ + :ends_at => Time.now.getutc() + @block_period.hours, + :reason => params[:user_block][:reason], + :needs_view => params[:user_block][:needs_view] + }, :without_protection => true) + flash[:notice] = t('user_block.update.success') + redirect_to(@user_block) + else + render :action => "edit" + end else - render :action => "edit" + redirect_to edit_user_block_path(:id => params[:id]) end end @@ -109,24 +106,6 @@ class UserBlocksController < ApplicationController end private - ## - # require that the user is a moderator, or fill out a helpful error message - # and return them to the blocks index. - def require_moderator - unless @user.moderator? - flash[:error] = t('user_block.filter.not_a_moderator') - redirect_to :action => 'index' - end - end - - ## - # ensure that there is a "this_user" instance variable - def lookup_this_user - @this_user = User.find_by_display_name(params[:display_name]) - rescue ActiveRecord::RecordNotFound - redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user - end - ## # ensure that there is a "user_block" instance variable def lookup_user_block diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 0aeab63b3..620ab5090 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -7,8 +7,8 @@ class UserController < ApplicationController before_filter :authorize_web, :except => [:api_details, :api_gpx_files] before_filter :set_locale, :except => [:api_details, :api_gpx_files] before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend] - before_filter :check_database_readable, :except => [:api_details, :api_gpx_files] - before_filter :check_database_writable, :only => [:login, :new, :account, :go_public, :make_friend, :remove_friend] + before_filter :check_database_readable, :except => [:login, :api_details, :api_gpx_files] + before_filter :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend] before_filter :check_api_readable, :only => [:api_details, :api_gpx_files] before_filter :require_allow_read_prefs, :only => [:api_details] before_filter :require_allow_read_gpx, :only => [:api_gpx_files] @@ -143,51 +143,24 @@ class UserController < ApplicationController @tokens = @user.oauth_tokens.authorized if params[:user] and params[:user][:display_name] and params[:user][:description] - @user.display_name = params[:user][:display_name] - @user.new_email = params[:user][:new_email] - - if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0 - @user.pass_crypt = params[:user][:pass_crypt] - @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] - end - - @user.description = params[:user][:description] - @user.languages = params[:user][:languages].split(",") - - case params[:image_action] - when "new" then @user.image = params[:user][:image] - when "delete" then @user.image = nil - end - - @user.home_lat = params[:user][:home_lat] - @user.home_lon = params[:user][:home_lon] - - if params[:user][:preferred_editor] == "default" - @user.preferred_editor = nil - else - @user.preferred_editor = params[:user][:preferred_editor] - end - - @user.openid_url = nil if params[:user][:openid_url].blank? - if params[:user][:openid_url] and params[:user][:openid_url].length > 0 and params[:user][:openid_url] != @user.openid_url # If the OpenID has changed, we want to check that it is a # valid OpenID and one the user has control over before saving # it as a password equivalent for the user. - session[:new_user] = @user + session[:new_user_settings] = params openid_verify(params[:user][:openid_url], @user) else - update_user(@user) + update_user(@user, params) end elsif using_open_id? # The redirect from the OpenID provider reenters here # again and we need to pass the parameters through to # the open_id_authentication function - @user = session.delete(:new_user) + settings = session.delete(:new_user_settings) openid_verify(nil, @user) do |user| - update_user(user) + update_user(user, settings) end end end @@ -419,54 +392,60 @@ class UserController < ApplicationController (@this_user.visible? or (@user and @user.administrator?)) @title = @this_user.display_name else - @title = t 'user.no_such_user.title' - @not_found_user = params[:display_name] - render :action => 'no_such_user', :status => :not_found + render_unknown_user params[:display_name] end end def make_friend - if params[:display_name] - name = params[:display_name] - new_friend = User.active.where(:display_name => name).first - friend = Friend.new - friend.user_id = @user.id - friend.friend_user_id = new_friend.id - unless @user.is_friends_with?(new_friend) - if friend.save - flash[:notice] = t 'user.make_friend.success', :name => name - Notifier.friend_notification(friend).deliver + @new_friend = User.find_by_display_name(params[:display_name]) + + if @new_friend + if request.post? + friend = Friend.new + friend.user_id = @user.id + friend.friend_user_id = @new_friend.id + unless @user.is_friends_with?(@new_friend) + if friend.save + flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name + Notifier.friend_notification(friend).deliver + else + friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name)) + end else - friend.add_error(t('user.make_friend.failed', :name => name)) + flash[:warning] = t 'user.make_friend.already_a_friend', :name => @new_friend.display_name end - else - flash[:warning] = t 'user.make_friend.already_a_friend', :name => name - end - if params[:referer] - redirect_to params[:referer] - else - redirect_to :controller => 'user', :action => 'view' + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'user', :action => 'view' + end end + else + render_unknown_user params[:display_name] end end def remove_friend - if params[:display_name] - name = params[:display_name] - friend = User.active.where(:display_name => name).first - if @user.is_friends_with?(friend) - Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}" - flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name - else - flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name - end + @friend = User.find_by_display_name(params[:display_name]) - if params[:referer] - redirect_to params[:referer] - else - redirect_to :controller => 'user', :action => 'view' + if @friend + if request.post? + if @user.is_friends_with?(@friend) + Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{@friend.id}" + flash[:notice] = t 'user.remove_friend.success', :name => @friend.display_name + else + flash[:error] = t 'user.remove_friend.not_a_friend', :name => @friend.display_name + end + + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'user', :action => 'view' + end end + else + render_unknown_user params[:display_name] end end @@ -546,7 +525,7 @@ private if user = User.find_by_openid_url(identity_url) case user.status when "pending" then - failed_login t('user.login.account not active') + failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name)) when "active", "confirmed" then successful_login(user) when "suspended" then @@ -563,8 +542,8 @@ private # to the create account page with username and email filled # in if they have been given by the OpenID provider through # the simple registration protocol. - nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"] - email = sreg["email"] || ax["http://axschema.org/contact/email"] + nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first + email = sreg["email"] || ax["http://axschema.org/contact/email"].first redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url end elsif result.missing? @@ -660,7 +639,38 @@ private ## # update a user's details - def update_user(user) + def update_user(user, params) + user.display_name = params[:user][:display_name] + user.new_email = params[:user][:new_email] + + if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0 + user.pass_crypt = params[:user][:pass_crypt] + user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] + end + + if params[:user][:description] != user.description + user.description = params[:user][:description] + user.description_format = "markdown" + end + + user.languages = params[:user][:languages].split(",") + + case params[:image_action] + when "new" then user.image = params[:user][:image] + when "delete" then user.image = nil + end + + user.home_lat = params[:user][:home_lat] + user.home_lon = params[:user][:home_lon] + + if params[:user][:preferred_editor] == "default" + user.preferred_editor = nil + else + user.preferred_editor = params[:user][:preferred_editor] + end + + user.openid_url = nil if params[:user][:openid_url].blank? + if user.save set_locale diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index 54dc90dee..7dad891e2 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -8,7 +8,6 @@ class UserRolesController < ApplicationController before_filter :require_valid_role before_filter :not_in_role, :only => [:grant] before_filter :in_role, :only => [:revoke] - around_filter :setup_nonce def grant @this_user.roles.create({ @@ -23,6 +22,9 @@ class UserRolesController < ApplicationController end private + ## + # require that the user is an administrator, or fill out a helpful error message + # and return them to theuser page. def require_administrator unless @user.administrator? flash[:error] = t'user_role.filter.not_an_administrator' @@ -30,30 +32,6 @@ class UserRolesController < ApplicationController end end - ## - # ensure that there is a "this_user" instance variable - def lookup_this_user - @this_user = User.find_by_display_name(params[:display_name]) - rescue ActiveRecord::RecordNotFound - redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user - end - - ## - # the random nonce here which isn't predictable, making an CSRF - # procedure much, much more difficult. setup the nonce. if the given - # nonce matches the session nonce then yield into the actual method. - # otherwise, just sets up the nonce for the form. - def setup_nonce - if params[:nonce] and params[:nonce] == session[:nonce] - @nonce = params[:nonce] - yield - else - @nonce = OAuth::Helper.generate_nonce - session[:nonce] = @nonce - render - end - end - ## # require that the given role is valid. the role is a URL # parameter, so should always be present. diff --git a/app/helpers/amf_helper.rb b/app/helpers/amf_helper.rb deleted file mode 100644 index 5735422c2..000000000 --- a/app/helpers/amf_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module AmfHelper -end diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb deleted file mode 100644 index 1f82fcf9b..000000000 --- a/app/helpers/api_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApiHelper -end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f4b900017..e6a1e58e6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,14 +1,6 @@ module ApplicationHelper require 'rexml/document' - def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM).html_safe - end - - def htmlize(text) - return linkify(sanitize(simple_format(text))) - end - def linkify(text) if text.html_safe? Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe @@ -83,45 +75,35 @@ module ApplicationHelper content_tag(tag, capture(&block), :class => "hide_unless_administrator") end - def describe_location(lat, lon, zoom = nil, language = nil) - zoom = zoom || 14 - language = language || request.user_preferred_languages.join(',') - url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" - - begin - response = OSM::Timer.timeout(4) do - REXML::Document.new(Net::HTTP.get(URI.parse(url))) - end - rescue Exception - response = nil - end - - if response and result = response.get_text("reversegeocode/result") - result.to_s + def preferred_editor + if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor else - "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" + DEFAULT_EDITOR end end - def user_image(user, options = {}) - options[:class] ||= "user_image" - - image_tag user.image.url(:large), options + def scale_to_zoom(scale) + Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0) end - def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + def richtext_area(object_name, method, options = {}) + id = "#{object_name.to_s}_#{method.to_s}" + format = options.delete(:format) || "markdown" - image_tag user.image.url(:small), options - end + content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do + output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do + output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format))) + output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview") + end - def preferred_editor - if params[:editor] - params[:editor] - elsif @user and @user.preferred_editor - @user.preferred_editor - else - DEFAULT_EDITOR + output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do + output_buffer << render("site/#{format}_help") + output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit", :disabled => true) + output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview") + end end end diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index de439d56f..ffc638cdf 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -13,20 +13,34 @@ module BrowseHelper if version name = t 'printable_name.with_version', :id => name, :version => object.version.to_s end - if object.tags.include? "name:#{I18n.locale}" - name = t 'printable_name.with_name', :name => object.tags["name:#{I18n.locale}"].to_s, :id => name - elsif object.tags.include? 'name' - name = t 'printable_name.with_name', :name => object.tags['name'].to_s, :id => name + + # don't look at object tags if redacted, so as to avoid giving + # away redacted version tag information. + unless object.redacted? + if object.tags.include? "name:#{I18n.locale}" + name = t 'printable_name.with_name', :name => object.tags["name:#{I18n.locale}"].to_s, :id => name + elsif object.tags.include? 'name' + name = t 'printable_name.with_name', :name => object.tags['name'].to_s, :id => name + end end + return name end def link_class(type, object) - return type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') + if object.redacted? + type + " deleted" + else + type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') + end end def link_title(object) - return h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence) + if object.redacted? + "" + else + h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence) + end end def format_key(key) diff --git a/app/helpers/diary_entry_helper.rb b/app/helpers/diary_entry_helper.rb deleted file mode 100644 index bf6af03da..000000000 --- a/app/helpers/diary_entry_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module DiaryEntryHelper -end diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb deleted file mode 100644 index 34acf5f1a..000000000 --- a/app/helpers/export_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ExportHelper -end diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index 082f9e530..f5519ddc3 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -1,25 +1,43 @@ module GeocoderHelper def result_to_html(result) - html_options = {} - #html_options[:title] = strip_tags(result[:description]) if result[:description] + html_options = { :class => "set_position", :data => {} } + if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat] - html_options[:href] = raw("?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}") + url = "?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}" else - html_options[:href] = raw("?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}") + url = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}" + end + + result.each do |key,value| + html_options[:data][key.to_s.tr('_', '-')] = value end html = "" html << result[:prefix] if result[:prefix] html << " " if result[:prefix] and result[:name] - - if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat] - html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, null, #{result[:min_lon]}, #{result[:min_lat]}, #{result[:max_lon]}, #{result[:max_lat]})", html_options) if result[:name] - else - html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options) if result[:name] - end - + html << link_to(result[:name], url, html_options) if result[:name] html << result[:suffix] if result[:suffix] return raw(html) end + + def describe_location(lat, lon, zoom = nil, language = nil) + zoom = zoom || 14 + language = language || request.user_preferred_languages.join(',') + url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" + + begin + response = OSM::Timer.timeout(4) do + REXML::Document.new(Net::HTTP.get(URI.parse(url))) + end + rescue Exception + response = nil + end + + if response and result = response.get_text("reversegeocode/result") + result.to_s + else + "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" + end + end end diff --git a/app/helpers/node_helper.rb b/app/helpers/node_helper.rb deleted file mode 100644 index ff049b0fc..000000000 --- a/app/helpers/node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module NodeHelper -end diff --git a/app/helpers/oauth_clients_helper.rb b/app/helpers/oauth_clients_helper.rb deleted file mode 100644 index 3b909aaf3..000000000 --- a/app/helpers/oauth_clients_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OauthClientsHelper -end \ No newline at end of file diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb deleted file mode 100644 index 010cf9f5a..000000000 --- a/app/helpers/oauth_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OauthHelper -end diff --git a/app/helpers/old_node_helper.rb b/app/helpers/old_node_helper.rb deleted file mode 100644 index c39bc621f..000000000 --- a/app/helpers/old_node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldNodeHelper -end diff --git a/app/helpers/old_way_helper.rb b/app/helpers/old_way_helper.rb deleted file mode 100644 index d7982a661..000000000 --- a/app/helpers/old_way_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldWayHelper -end diff --git a/app/helpers/old_way_node_helper.rb b/app/helpers/old_way_node_helper.rb deleted file mode 100644 index 933d6613f..000000000 --- a/app/helpers/old_way_node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldWayNodeHelper -end diff --git a/app/helpers/old_way_tag_helper.rb b/app/helpers/old_way_tag_helper.rb deleted file mode 100644 index c23661b8a..000000000 --- a/app/helpers/old_way_tag_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldWayTagHelper -end diff --git a/app/helpers/site_helper.rb b/app/helpers/site_helper.rb deleted file mode 100644 index c87948673..000000000 --- a/app/helpers/site_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SiteHelper -end diff --git a/app/helpers/swf_helper.rb b/app/helpers/swf_helper.rb deleted file mode 100644 index cf2a311dc..000000000 --- a/app/helpers/swf_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SwfHelper -end diff --git a/app/helpers/trace_points_helper.rb b/app/helpers/trace_points_helper.rb deleted file mode 100644 index 0252b91fe..000000000 --- a/app/helpers/trace_points_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TracePointsHelper -end diff --git a/app/helpers/tracepoint_helper.rb b/app/helpers/tracepoint_helper.rb deleted file mode 100644 index 8a5a031a9..000000000 --- a/app/helpers/tracepoint_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TracepointHelper -end diff --git a/app/helpers/tracetag_helper.rb b/app/helpers/tracetag_helper.rb deleted file mode 100644 index c1479e124..000000000 --- a/app/helpers/tracetag_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TracetagHelper -end diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 7a9a75c31..6a239df5d 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -1,12 +1,25 @@ module UserHelper + def user_image(user, options = {}) + options[:class] ||= "user_image" + + image_tag user.image.url(:large), options + end + + def user_thumbnail(user, options = {}) + options[:class] ||= "user_thumbnail" + + image_tag user.image.url(:small), options + end + def openid_logo image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo" end def openid_button(name, url) - link_to_function( + link_to( image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")), - "submitOpenidUrl('#{url}')", + "#", + :class => "openid_button", :data => { :url => url }, :title => t("user.login.openid_providers.#{name}.title") ) end diff --git a/app/helpers/user_preference_helper.rb b/app/helpers/user_preference_helper.rb deleted file mode 100644 index bd7e11bdd..000000000 --- a/app/helpers/user_preference_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module UserPreferenceHelper -end diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb new file mode 100644 index 000000000..369efca5a --- /dev/null +++ b/app/helpers/user_roles_helper.rb @@ -0,0 +1,37 @@ +module UserRolesHelper + def role_icons(user) + UserRole::ALL_ROLES.reduce("".html_safe) { |s,r| s + " " + role_icon(user, r) } + end + + def role_icon(user, role) + if @user and @user.administrator? + if user.has_role?(role) + image = "roles/#{role}.png" + alt = t("user.view.role.revoke.#{role}") + title = t("user.view.role.revoke.#{role}") + url = revoke_role_path(:display_name => user.display_name, :role => role) + confirm = t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role) + else + image = "roles/blank_#{role}.png" + alt = t("user.view.role.grant.#{role}") + title = t("user.view.role.grant.#{role}") + url = grant_role_path(:display_name => user.display_name, :role => role) + confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role) + end + elsif user.has_role?(role) + image = "roles/#{role}.png" + alt = t("user.view.role.#{role}") + title = t("user.view.role.#{role}") + end + + if image + icon = image_tag(image, :size => "20x20", :border => 0, :alt => alt, :title => title) + + if url + icon = link_to(icon, url, :method => :post, :confirm => confirm) + end + end + + icon + end +end diff --git a/app/helpers/way_helper.rb b/app/helpers/way_helper.rb deleted file mode 100644 index e597a980b..000000000 --- a/app/helpers/way_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module WayHelper -end diff --git a/app/helpers/way_node_helper.rb b/app/helpers/way_node_helper.rb deleted file mode 100644 index 884dbccb8..000000000 --- a/app/helpers/way_node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module WayNodeHelper -end diff --git a/app/helpers/way_tag_helper.rb b/app/helpers/way_tag_helper.rb deleted file mode 100644 index 66a53ff34..000000000 --- a/app/helpers/way_tag_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module WayTagHelper -end diff --git a/app/models/changeset.rb b/app/models/changeset.rb index b76d0c5a7..adb41b204 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -1,7 +1,7 @@ class Changeset < ActiveRecord::Base require 'xml/libxml' - belongs_to :user + belongs_to :user, :counter_cache => true has_many :changeset_tags diff --git a/app/models/client_application.rb b/app/models/client_application.rb index b1f402292..9a074fb30 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -2,7 +2,7 @@ require 'oauth' class ClientApplication < ActiveRecord::Base belongs_to :user - has_many :tokens, :class_name => "OauthToken" + has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all has_many :access_tokens has_many :oauth2_verifiers has_many :oauth_tokens diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb index b915e027a..075d288ed 100644 --- a/app/models/diary_comment.rb +++ b/app/models/diary_comment.rb @@ -7,6 +7,12 @@ class DiaryComment < ActiveRecord::Base attr_accessible :body + after_initialize :set_defaults + + def body + RichText.new(read_attribute(:body_format), read_attribute(:body)) + end + def digest md5 = Digest::MD5.new md5 << diary_entry_id.to_s @@ -15,4 +21,10 @@ class DiaryComment < ActiveRecord::Base md5 << body md5.hexdigest end + +private + + def set_defaults + self.body_format = "markdown" unless self.attribute_present?(:body_format) + end end diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 1d836353f..64a412d28 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -25,4 +25,16 @@ class DiaryEntry < ActiveRecord::Base validates_associated :language attr_accessible :title, :body, :language_code, :latitude, :longitude + + after_initialize :set_defaults + + def body + RichText.new(read_attribute(:body_format), read_attribute(:body)) + end + +private + + def set_defaults + self.body_format = "markdown" unless self.attribute_present?(:body_format) + end end diff --git a/app/models/message.rb b/app/models/message.rb index 0b3416003..f897af3c2 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -11,6 +11,35 @@ class Message < ActiveRecord::Base attr_accessible :title, :body + after_initialize :set_defaults + + def self.from_mail(mail, from, to) + if mail.multipart? + if mail.text_part + body = mail.text_part.decoded + elsif mail.html_part + body = HTMLEntities.new.decode(Sanitize.clean(mail.html_part.decoded)) + end + elsif mail.text? and mail.sub_type == "html" + body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded)) + else + body = mail.decoded + end + + message = Message.new({ + :sender => from, + :recipient => to, + :sent_on => mail.date.new_offset(0), + :title => mail.subject.sub(/\[OpenStreetMap\] */, ""), + :body => body, + :body_format => "text" + }, :without_protection => true) + end + + def body + RichText.new(read_attribute(:body_format), read_attribute(:body)) + end + def digest md5 = Digest::MD5.new md5 << from_user_id.to_s @@ -20,4 +49,10 @@ class Message < ActiveRecord::Base md5 << body md5.hexdigest end + +private + + def set_defaults + self.body_format = "markdown" unless self.attribute_present?(:body_format) + end end diff --git a/app/models/node.rb b/app/models/node.rb index 537872459..2f528076e 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -3,6 +3,7 @@ class Node < ActiveRecord::Base include GeoRecord include ConsistencyValidations + include NotRedactable self.table_name = "current_nodes" @@ -200,11 +201,14 @@ class Node < ActiveRecord::Base def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) el1 = XML::Node.new 'node' el1['id'] = self.id.to_s - el1['lat'] = self.lat.to_s - el1['lon'] = self.lon.to_s el1['version'] = self.version.to_s el1['changeset'] = self.changeset_id.to_s + if self.visible? + el1['lat'] = self.lat.to_s + el1['lon'] = self.lon.to_s + end + if changeset_cache.key?(self.changeset_id) # use the cache if available else diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb index b38fe0ec0..c9595e870 100644 --- a/app/models/oauth_token.rb +++ b/app/models/oauth_token.rb @@ -14,7 +14,9 @@ class OauthToken < ActiveRecord::Base end def invalidate! - update_attribute(:invalidated_at, Time.now) + update_attributes({ + :invalidated_at => Time.now + }, :without_protection => true) end def authorized? diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 64ae1a70c..c2ec43c9c 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -5,6 +5,10 @@ class OldNode < ActiveRecord::Base self.table_name = "nodes" self.primary_keys = "node_id", "version" + # note this needs to be included after the table name changes, or + # the queries generated by Redactable will use the wrong table name. + include Redactable + validates_presence_of :changeset_id, :timestamp validates_inclusion_of :visible, :in => [ true, false ] validates_numericality_of :latitude, :longitude @@ -12,7 +16,9 @@ class OldNode < ActiveRecord::Base validates_associated :changeset belongs_to :changeset - + belongs_to :redaction + belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id" + def validate_position errors.add(:base, "Node is not in the world") unless in_world? end @@ -39,13 +45,6 @@ class OldNode < ActiveRecord::Base def to_xml_node el1 = XML::Node.new 'node' el1['id'] = self.node_id.to_s - el1['lat'] = self.lat.to_s - el1['lon'] = self.lon.to_s - el1['changeset'] = self.changeset.id.to_s - if self.changeset.user.data_public? - el1['user'] = self.changeset.user.display_name - el1['uid'] = self.changeset.user.id.to_s - end self.tags.each do |k,v| el2 = XML::Node.new('tag') @@ -54,9 +53,23 @@ class OldNode < ActiveRecord::Base el1 << el2 end + if self.visible? + el1['lat'] = self.lat.to_s + el1['lon'] = self.lon.to_s + end + + el1['changeset'] = self.changeset.id.to_s + if self.changeset.user.data_public? + el1['user'] = self.changeset.user.display_name + el1['uid'] = self.changeset.user.id.to_s + end + el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema el1['version'] = self.version.to_s + + el1['redacted'] = self.redaction.id.to_s if self.redacted? + return el1 end @@ -106,4 +119,10 @@ class OldNode < ActiveRecord::Base def containing_relation_members return [] end + + # check whether this element is the latest version - that is, + # has the same version as its "current" counterpart. + def is_latest_version? + current_node.version == self.version + end end diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index a75dacd0e..390c142db 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -4,7 +4,13 @@ class OldRelation < ActiveRecord::Base self.table_name = "relations" self.primary_keys = "relation_id", "version" + # note this needs to be included after the table name changes, or + # the queries generated by Redactable will use the wrong table name. + include Redactable + belongs_to :changeset + belongs_to :redaction + belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id" has_many :old_members, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version], :order => :sequence_id has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version] @@ -99,6 +105,8 @@ class OldRelation < ActiveRecord::Base el1['version'] = self.version.to_s el1['changeset'] = self.changeset_id.to_s + el1['redacted'] = self.redaction.id.to_s if self.redacted? + self.old_members.each do |member| e = XML::Node.new 'member' e['type'] = member.member_type.to_s.downcase @@ -106,13 +114,14 @@ class OldRelation < ActiveRecord::Base e['role'] = member.member_role.to_s el1 << e end - + self.old_tags.each do |tag| e = XML::Node.new 'tag' e['k'] = tag.k e['v'] = tag.v el1 << e end + return el1 end @@ -130,4 +139,10 @@ class OldRelation < ActiveRecord::Base def containing_relation_members return [] end + + # check whether this element is the latest version - that is, + # has the same version as its "current" counterpart. + def is_latest_version? + current_relation.version == self.version + end end diff --git a/app/models/old_way.rb b/app/models/old_way.rb index db8a6df40..bc114d73a 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -1,10 +1,16 @@ class OldWay < ActiveRecord::Base include ConsistencyValidations - + self.table_name = "ways" self.primary_keys = "way_id", "version" + # note this needs to be included after the table name changes, or + # the queries generated by Redactable will use the wrong table name. + include Redactable + belongs_to :changeset + belongs_to :redaction + belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id" has_many :old_nodes, :class_name => 'OldWayNode', :foreign_key => [:way_id, :version] has_many :old_tags, :class_name => 'OldWayTag', :foreign_key => [:way_id, :version] @@ -97,19 +103,22 @@ class OldWay < ActiveRecord::Base end el1['version'] = self.version.to_s el1['changeset'] = self.changeset.id.to_s + + el1['redacted'] = self.redaction.id.to_s if self.redacted? self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order e = XML::Node.new 'nd' e['ref'] = nd.node_id.to_s el1 << e end - + self.old_tags.each do |tag| e = XML::Node.new 'tag' e['k'] = tag.k e['v'] = tag.v el1 << e end + return el1 end @@ -132,7 +141,7 @@ class OldWay < ActiveRecord::Base def get_nodes_revert(timestamp) points=[] self.nds.each do |n| - oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).order("timestamp DESC").first + oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).unredacted.order("timestamp DESC").first curnode = Node.find(n) id = n; reuse = curnode.visible if oldnode.lat != curnode.lat or oldnode.lon != curnode.lon or oldnode.tags != curnode.tags then @@ -158,4 +167,10 @@ class OldWay < ActiveRecord::Base def containing_relation_members return [] end + + # check whether this element is the latest version - that is, + # has the same version as its "current" counterpart. + def is_latest_version? + current_way.version == self.version + end end diff --git a/app/models/redaction.rb b/app/models/redaction.rb new file mode 100644 index 000000000..43f5b3c7b --- /dev/null +++ b/app/models/redaction.rb @@ -0,0 +1,32 @@ +## +# Redaction represents a record associated with a particular +# action on the database to hide revisions from the history +# which are not appropriate to redistribute any more. +# +# The circumstances of the redaction can be recorded in the +# record's title and description fields, which can be +# displayed linked from the redacted records. +# +class Redaction < ActiveRecord::Base + belongs_to :user + + has_many :old_nodes + has_many :old_ways + has_many :old_relations + + after_initialize :set_defaults + + # this method overrides the AR default to provide the rich + # text object for the description field. + def description + RichText.new(read_attribute(:description_format), read_attribute(:description)) + end + + private + + # set the default format to be markdown, in the absence of + # any other setting. + def set_defaults + self.description_format = "markdown" unless self.attribute_present?(:description_format) + end +end diff --git a/app/models/relation.rb b/app/models/relation.rb index 21ee058d8..e5ea85d6d 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -2,7 +2,8 @@ class Relation < ActiveRecord::Base require 'xml/libxml' include ConsistencyValidations - + include NotRedactable + self.table_name = "current_relations" belongs_to :changeset diff --git a/app/models/trace.rb b/app/models/trace.rb index b72fda07d..bc47aa8e0 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -1,7 +1,7 @@ class Trace < ActiveRecord::Base self.table_name = "gpx_files" - belongs_to :user + belongs_to :user, :counter_cache => true has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all diff --git a/app/models/user.rb b/app/models/user.rb index 51bc52f3c..e126adb98 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,7 +18,10 @@ class User < ActiveRecord::Base has_many :client_applications has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application] - has_many :active_blocks, :class_name => "UserBlock", :conditions => proc { [ "user_blocks.ends_at > :ends_at or user_blocks.needs_view", { :ends_at => Time.now.getutc } ] } + has_many :blocks, :class_name => "UserBlock" + has_many :blocks_created, :class_name => "UserBlock", :foreign_key => :creator_id + has_many :blocks_revoked, :class_name => "UserBlock", :foreign_key => :revoker_id + has_many :roles, :class_name => "UserRole" scope :visible, where(:status => ["pending", "active", "confirmed"]) @@ -35,7 +38,7 @@ class User < ActiveRecord::Base validates_length_of :display_name, :within => 3..255, :allow_nil => true validates_email_format_of :email, :if => Proc.new { |u| u.email_changed? } validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? } - validates_format_of :display_name, :with => /^[^\/;.,?]*$/, :if => Proc.new { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /^[^\/;.,?%#]*$/, :if => Proc.new { |u| u.display_name_changed? } validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? } validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? } validates_numericality_of :home_lat, :allow_nil => true @@ -46,7 +49,7 @@ class User < ActiveRecord::Base attr_accessible :display_name, :email, :email_confirmation, :openid_url, :pass_crypt, :pass_crypt_confirmation, :consider_pd - after_initialize :set_creation_time + after_initialize :set_defaults before_save :encrypt_password has_attached_file :image, @@ -78,7 +81,7 @@ class User < ActiveRecord::Base user = nil end - token.update_attribute(:expiry, 1.week.from_now) if token and user + token.update_column(:expiry, 1.week.from_now) if token and user return user end @@ -103,6 +106,10 @@ class User < ActiveRecord::Base return el1 end + def description + RichText.new(read_attribute(:description_format), read_attribute(:description)) + end + def languages attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : [] end @@ -180,7 +187,7 @@ class User < ActiveRecord::Base # returns the first active block which would require users to view # a message, or nil if there are none. def blocked_on_view - active_blocks.detect { |b| b.needs_view? } + blocks.active.detect { |b| b.needs_view? } end ## @@ -202,10 +209,10 @@ class User < ActiveRecord::Base def spam_score changeset_score = self.changesets.limit(10).length * 50 trace_score = self.traces.limit(10).length * 50 - diary_entry_score = self.diary_entries.inject(0) { |s,e| s += OSM.spam_score(e.body) } - diary_comment_score = self.diary_comments.inject(0) { |s,e| s += OSM.spam_score(e.body) } + diary_entry_score = self.diary_entries.inject(0) { |s,e| s += e.body.spam_score } + diary_comment_score = self.diary_comments.inject(0) { |s,c| s += c.body.spam_score } - score = OSM.spam_score(self.description) + score = self.description.spam_score / 4.0 score += diary_entry_score / self.diary_entries.length if self.diary_entries.length > 0 score += diary_comment_score / self.diary_comments.length if self.diary_comments.length > 0 score -= changeset_score @@ -222,14 +229,16 @@ class User < ActiveRecord::Base private - def set_creation_time + def set_defaults self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time) + self.description_format = "markdown" unless self.attribute_present?(:description_format) end def encrypt_password if pass_crypt_confirmation self.pass_salt = OSM::make_token(8) self.pass_crypt = OSM::encrypt_password(pass_crypt, pass_salt) + self.pass_crypt_confirmation = nil end end end diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 7bf8f86b5..2cf0eefc4 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -5,8 +5,22 @@ class UserBlock < ActiveRecord::Base belongs_to :creator, :class_name => "User", :foreign_key => :creator_id belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id + after_initialize :set_defaults + PERIODS = USER_BLOCK_PERIODS + ## + # scope to match active blocks + def self.active + self.where("needs_view or ends_at > ?", Time.now.getutc) + end + + ## + # return a renderable version of the reason text. + def reason + RichText.new(read_attribute(:reason_format), read_attribute(:reason)) + end + ## # returns true if the block is currently active (i.e: the user can't # use the API). @@ -25,7 +39,14 @@ class UserBlock < ActiveRecord::Base }, :without_protection => true) end - private +private + + ## + # set default values for new records. + def set_defaults + self.reason_format = "markdown" unless self.attribute_present?(:reason_format) + end + ## # validate that only moderators are allowed to change the # block. this should be caught and dealt with in the controller, diff --git a/app/models/way.rb b/app/models/way.rb index adf8b928f..9bd792ddc 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -2,6 +2,7 @@ class Way < ActiveRecord::Base require 'xml/libxml' include ConsistencyValidations + include NotRedactable self.table_name = "current_ways" diff --git a/app/views/api/permissions.builder b/app/views/api/permissions.builder new file mode 100644 index 000000000..066f56788 --- /dev/null +++ b/app/views/api/permissions.builder @@ -0,0 +1,9 @@ +# create list of permissions +xml.instruct! :xml, :version=>"1.0" +xml.osm("version" => "#{API_VERSION}", "generator" => "OpenStreetMap Server") do + xml.permissions do + @permissions.each do |permission| + xml.permission :name => permission + end + end +end diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb index d3af9bc15..d8ca30a15 100644 --- a/app/views/browse/_map.html.erb +++ b/app/views/browse/_map.html.erb @@ -15,12 +15,12 @@ <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %> <% end -%> <br /> - <%= link_to(t("browse.map.edit.area"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %> + <%= link_to(h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %> <% unless map.instance_of? Changeset or map.instance_of? Note %> <br /> - <%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %> + <%= link_to(t("browse.map.larger." + map.class.to_s.downcase), { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %> <br /> - <%= link_to("", { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %> + <%= link_to(h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %> <% end %> <% else %> <%= t 'browse.map.deleted' %> @@ -83,7 +83,7 @@ var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat); var centre = bbox.getCenterLonLat(); - setMapExtent(bbox); + map.zoomToExtent(proj(bbox)); addBoxToMap(bbox); $("#loading").hide(); @@ -136,6 +136,9 @@ url += "/" + previous_version; } + $("#object_larger_map").hide(); + $("#object_edit").hide(); + addObjectToMap(url, true, function(extent) { $("#loading").hide(); $("#browse_map .geolink").show(); @@ -155,7 +158,6 @@ }); <% end -%> - <% unless map.instance_of? Changeset -%> $("#remote_object_edit").click(function (event) { return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>"); }); @@ -166,9 +168,8 @@ }); <% end -%> - $("#object_larger_map").html("<%=j t('browse.map.larger.' + map.class.to_s.downcase) %>"); - $("#object_edit").html("<%=j t('browse.map.edit.' + map.class.to_s.downcase) %>"); - <% end -%> + $("#object_larger_map").show(); + $("#object_edit").show(); updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>); } else { @@ -177,8 +178,8 @@ }); <% end -%> - createMenu("area_edit", "area_edit_menu", 1000, "right"); - createMenu("object_edit", "object_edit_menu", 1000, "right"); + createMenu("area_edit", "area_edit_menu", "right"); + createMenu("object_edit", "object_edit_menu", "right"); } window.onload = init; diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb index 50188c934..23176eab2 100644 --- a/app/views/browse/_node_details.html.erb +++ b/app/views/browse/_node_details.html.erb @@ -1,11 +1,16 @@ +<% if node_details.redacted? %> +<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %></p> +<% else %> <table class="browse_details" id="<%= node_details.version %>"> <%= render :partial => "common_details", :object => node_details %> + <% if node_details.visible -%> <tr> <th><%= t 'browse.node_details.coordinates' %></th> <td><div class="geo"><%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %></div></td> </tr> + <% end -%> <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %> <tr valign="top"> @@ -22,3 +27,4 @@ <% end %> </table> +<% end %> diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb index 95e1743b5..57314817d 100644 --- a/app/views/browse/_relation_details.html.erb +++ b/app/views/browse/_relation_details.html.erb @@ -1,3 +1,6 @@ +<% if relation_details.redacted? %> +<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p> +<% else %> <table class="browse_details" id="<%= relation_details.version %>"> <%= render :partial => "common_details", :object => relation_details %> @@ -25,3 +28,4 @@ <% end %> </table> +<% end %> diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb index 648009f56..1313cb250 100644 --- a/app/views/browse/_way_details.html.erb +++ b/app/views/browse/_way_details.html.erb @@ -1,3 +1,6 @@ +<% if way_details.redacted? %> +<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p> +<% else %> <table class="browse_details" id="<%= way_details.version %>"> <%= render :partial => "common_details", :object => way_details %> @@ -33,3 +36,4 @@ <% end %> </table> +<% end %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index aff873e45..2796f7c5f 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -8,5 +8,5 @@ <% end %> <%= render :partial => "changeset_details", :object => @changeset %> <hr /> -<%= raw t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"), - :osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> +<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> +| <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 7b0ad746c..8f0a2001b 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -7,10 +7,13 @@ <% end %> <%= render :partial => "navigation" %> <h2><%= t'browse.node.node_title', :node_name => @name %></h2> +<% if @node.visible -%> <%= render :partial => "map", :object => @node %> +<% end -%> <%= render :partial => "node_details", :object => @node %> <hr /> -<%= raw t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "old_node", :action => "version", :version => @node.version), - :view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"), - :edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) -%> +<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %> +| <%= link_to(t('browse.node.view_history'), :action => "node_history") %> +<% if @node.visible -%> +| <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %> +<% end -%> diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index 9966d558d..937ad7dc0 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -3,10 +3,12 @@ @title = t('browse.node_history.node_history') + ' | ' + @name %> <h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2> +<% if @node.visible -%> <%= render :partial => "map", :object => @node %> +<% end -%> <% @node.old_nodes.reverse.each do |node| %> <%= render :partial => "node_details", :object => node %> <hr /> <% end %> -<%= raw t 'browse.node_history.download', :download_xml_link => link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history"), - :view_details_link => link_to(t('browse.node_history.view_details'), :action => "node") %> +<%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %> +| <%= link_to(t('browse.node_history.view_details'), :action => "node") %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 2128d18a9..28e251ac2 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -10,5 +10,5 @@ <%= render :partial => "map", :object => @relation %> <%= render :partial => "relation_details", :object => @relation %> <hr /> -<%= raw t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"), - :view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %> +<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %> +| <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %> diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index 4080bccb7..8fb08e6e9 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -8,5 +8,5 @@ <%= render :partial => "relation_details", :object => relation %> <hr /> <% end %> -<%= raw t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"), - :view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %> +<%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %> +| <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %> diff --git a/app/views/browse/start.js.erb b/app/views/browse/start.js.erb index d427ddbaf..1a32a3a79 100644 --- a/app/views/browse/start.js.erb +++ b/app/views/browse/start.js.erb @@ -32,9 +32,11 @@ function startBrowse() { browseBoxControl.handler.callbacks.done = endDrag; map.addControl(browseBoxControl); - map.events.register("moveend", map, showData); + map.events.register("moveend", map, updateData); map.events.triggerEvent("moveend"); + $("#browse_select_view").click(useMap); + $("#browse_select_box").click(startDrag); $("#browse_hide_areas_box").html("<%=j t 'browse.start_rjs.hide_areas' %>"); @@ -42,7 +44,7 @@ function startBrowse() { $("#browse_hide_areas_box").click(hideAreas); } -function showData() { +function updateData() { if (browseMode == "auto") { if (map.getZoom() >= 15) { useMap(false); @@ -77,7 +79,7 @@ function stopBrowse() { } map.dataLayer.setVisibility(false); - map.events.unregister("moveend", map, showData); + map.events.unregister("moveend", map, updateData); } } @@ -133,8 +135,6 @@ function showAreas() { useMap(true); } -$("#browse_select_view").click(useMap); - function endDrag(bbox) { var bounds = bbox.getBounds(); var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326); @@ -149,59 +149,42 @@ function endDrag(bbox) { $("#browse_select_view").show(); } -function displayFeatureWarning() { +function displayFeatureWarning(count, limit, callback) { clearStatus(); var div = document.createElement("div"); var p = document.createElement("p"); - p.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.loaded_an_area_with_num_features' %>", { num_features: browseFeatureList.length }))); + p.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.loaded_an_area_with_num_features' %>", { num_features: count, max_features: limit }))); div.appendChild(p); var input = document.createElement("input"); input.type = "submit"; input.value = "<%=j t 'browse.start_rjs.load_data' %>"; - input.onclick = loadFeatureList; + input.onclick = callback; div.appendChild(input); $("#browse_content").html(""); $("#browse_content").append(div); } -function loadFeatureList() { - browseDataLayer.addFeatures(browseFeatureList); - browseDataLayer.events.triggerEvent("loadend"); - - browseFeatureList = []; - - return false; -} - -function customDataLoader(request) { - if (this.map.dataLayer.active) { +function customDataLoader(resp, options) { + if (map.dataLayer.active) { + var request = resp.priv; var doc = request.responseXML; if (!doc || !doc.documentElement) { doc = request.responseText; } - var options = {}; - - OpenLayers.Util.extend(options, this.formatOptions); - - if (this.map && !this.projection.equals(this.map.getProjectionObject())) { - options.externalProjection = this.projection; - options.internalProjection = this.map.getProjectionObject(); - } - - var gml = this.format ? new this.format(options) : new OpenLayers.Format.GML(options); - - browseFeatureList = gml.read(doc); + resp.features = this.format.read(doc); - if (!this.maxFeatures || browseFeatureList.length <= this.maxFeatures) { - loadFeatureList(); + if (!this.maxFeatures || resp.features.length <= this.maxFeatures) { + options.callback.call(options.scope, resp); } else { - displayFeatureWarning(); + displayFeatureWarning(resp.features.length, this.maxFeatures, function () { + options.callback.call(options.scope, resp); + }); } } } @@ -213,11 +196,11 @@ function getData(bounds, reload) { if (size > <%= MAX_REQUEST_AREA %>) { setStatus(i18n("<%=j t 'browse.start_rjs.unable_to_load_size', :max_bbox_size => MAX_REQUEST_AREA %>", { bbox_size: size })); } else { - loadGML("/api/<%= API_VERSION %>/map?bbox=" + projected.toBBOX(), reload); + loadData("/api/<%= API_VERSION %>/map?bbox=" + projected.toBBOX(), reload); } } -function loadGML(url, reload) { +function loadData(url, reload) { setStatus("<%=j t 'browse.start_rjs.loading' %>"); $("#browse_content").empty(); @@ -242,11 +225,17 @@ function loadGML(url, reload) { if (browseDataLayer) browseDataLayer.destroyFeatures(); - browseDataLayer = new OpenLayers.Layer.GML("Data", url, { - format: OpenLayers.Format.OSM, - formatOptions: formatOptions, - maxFeatures: 100, - requestSuccess: customDataLoader, + browseDataLayer = new OpenLayers.Layer.Vector("Data", { + strategies: [ + new OpenLayers.Strategy.Fixed() + ], + protocol: new OpenLayers.Protocol.HTTP({ + url: url, + format: new OpenLayers.Format.OSM(formatOptions), + maxFeatures: <%= @max_features %>, + handleRead: customDataLoader + }), + projection: new OpenLayers.Projection("EPSG:4326"), displayInLayerSwitcher: false, styleMap: new OpenLayers.StyleMap({ 'default': style, @@ -263,8 +252,7 @@ function loadGML(url, reload) { browseSelectControl.activate(); } else { browseDataLayer.destroyFeatures(); - browseDataLayer.format(formatOptions); - browseDataLayer.setUrl(url); + browseDataLayer.refresh({ url: url }); } browseActiveFeature = null; @@ -307,7 +295,7 @@ function dataLoaded() { browseObjectList.appendChild(list); var link = document.createElement("a"); - link.href = this.url; + link.href = this.protocol.url; link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.object_list.api' %>")); browseObjectList.appendChild(link); diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 41341fef8..167ac6959 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -12,6 +12,6 @@ <hr /> <%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %> | <%= link_to(t('browse.way.view_history'), :action => "way_history") %> -<% unless @midnode.nil? %> - | <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %> -<% end %> +<% unless @midnode.nil? -%> +| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %> +<% end -%> diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index 2245017db..f581dd189 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -8,5 +8,5 @@ <%= render :partial => "way_details", :object => way %> <hr /> <% end %> -<%= raw t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"), - :view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %> +<%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %> +| <%= link_to(t('browse.way_history.view_details'), :action => "way") %> diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb index d0d65d9d7..8016378c8 100644 --- a/app/views/changeset/_map.html.erb +++ b/app/views/changeset/_map.html.erb @@ -37,12 +37,12 @@ $("#tr-changeset-" + id).removeClass("selected"); } - function init() { + $(document).ready(function () { var map = createMap("changeset_list_map", { controls: [ new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoom(), - new OpenLayers.Control.PanZoomBar() + new OpenLayers.Control.Zoom(), + new OpenLayers.Control.SimplePanZoom() ] }); @@ -80,11 +80,9 @@ selectControl.activate(); <% if ! @bbox.nil? %> - setMapExtent(new OpenLayers.Bounds(<%= @bbox %>)); + map.zoomToExtent(proj(new OpenLayers.Bounds(<%= @bbox %>))); <% else %> - setMapExtent(bounds); + map.zoomToExtent(proj(bounds)); <% end %> - } - - Event.observe(window, "load", init); + }); </script> diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb index bf8adbe20..f715e237b 100644 --- a/app/views/changeset/list.html.erb +++ b/app/views/changeset/list.html.erb @@ -1,14 +1,20 @@ <h1><%= @heading %></h1> <p><%= raw(@description) %></p> -<%= render :partial => 'changeset_paging_nav' %> +<% if @edits.size > 0 %> + <%= render :partial => 'changeset_paging_nav' %> -<div id="changeset_list_container"> - <%= render :partial => 'map' %> - <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %> -</div> + <div id="changeset_list_container"> + <%= render :partial => 'map' %> + <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %> + </div> -<%= render :partial => 'changeset_paging_nav' %> + <%= render :partial => 'changeset_paging_nav' %> +<% elsif @user and @user.display_name == params[:display_name] %> + <p><%= t('changeset.list.empty_user_html') %></p> +<% else %> + <p><%= t('changeset.list.empty_anon_html') %></p> +<% end %> <% unless params[:friends] or params[:nearby] -%> <%= atom_link_to params.merge({ :page => nil, :action => :feed }) %> diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb index 05cb80157..163af888f 100644 --- a/app/views/diary_entry/_diary_comment.html.erb +++ b/app/views/diary_entry/_diary_comment.html.erb @@ -1,7 +1,7 @@ <%= user_thumbnail diary_comment.user %> <h4 id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></h4> -<%= htmlize(diary_comment.body) %> +<%= diary_comment.body.to_html %> <%= if_administrator(:span) do %> - <%= link_to t('diary_entry.diary_comment.hide_link'), {:action => 'hidecomment', :display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id}, {:confirm => t('diary_entry.diary_comment.confirm')} %> + <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %> <% end %> <hr /> diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb index dc09ed957..eae60e822 100644 --- a/app/views/diary_entry/_diary_entry.html.erb +++ b/app/views/diary_entry/_diary_entry.html.erb @@ -1,7 +1,7 @@ <b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br /> <div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>"> - <%= htmlize(diary_entry.body) %> + <%= diary_entry.body.to_html %> </div> <% if diary_entry.latitude and diary_entry.longitude %> @@ -9,7 +9,7 @@ <br /> <% end %> -<%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :language => diary_entry.language_code)) %> +<%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %> <% if params[:action] == 'list' %> <br /> @@ -23,7 +23,7 @@ | <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %> <% end %> <%= if_administrator(:span) do %> - | <%= link_to t('diary_entry.diary_entry.hide_link'), {:action => 'hide', :display_name => diary_entry.user.display_name, :id => diary_entry.id}, {:confirm => t('diary_entry.diary_entry.confirm')} %> + | <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %> <% end %> <br /> diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb index b506ddfb0..f477ab8b6 100644 --- a/app/views/diary_entry/comments.html.erb +++ b/app/views/diary_entry/comments.html.erb @@ -11,7 +11,7 @@ <tr class="<%= cl %>"> <td><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td> <td><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td> - <td><%= htmlize(comment.body) %></td> + <td><%= comment.body.to_html %></td> </tr> <% end -%> </table> diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb index f6273a828..6b4d9c177 100644 --- a/app/views/diary_entry/edit.html.erb +++ b/app/views/diary_entry/edit.html.erb @@ -10,7 +10,7 @@ </tr> <tr valign="top"> <td class="fieldName"><%= t 'diary_entry.edit.body' -%></td> - <td><%= f.text_area :body, :cols => 80 %></td> + <td><%= richtext_area :diary_entry, :body, :cols => 80, :format => @diary_entry.body_format %></td> </tr> <tr valign="top"> <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td> diff --git a/app/views/diary_entry/no_such_user.html.erb b/app/views/diary_entry/no_such_user.html.erb deleted file mode 100644 index f1ba37d7b..000000000 --- a/app/views/diary_entry/no_such_user.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -<h2><%= t 'diary_entry.no_such_user.heading', :user => @not_found_user %></h2> -<p><%= t 'diary_entry.no_such_user.body', :user => @not_found_user %></p> diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder index 4c9670a6d..7ee36e9bd 100644 --- a/app/views/diary_entry/rss.rss.builder +++ b/app/views/diary_entry/rss.rss.builder @@ -20,7 +20,7 @@ xml.rss("version" => "2.0", xml.title h(entry.title) xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false) xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false) - xml.description htmlize(entry.body) + xml.description entry.body.to_html xml.author entry.user.display_name xml.pubDate entry.created_at.to_s(:rfc822) xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false) diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb index 7073aa740..1bce441b4 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -13,8 +13,8 @@ <%= error_messages_for 'diary_comment' %> - <%= form_for DiaryComment.new, :url => { :action => 'comment' } do |f| %> - <%= f.text_area :body, :cols => 80, :rows => 5 %> + <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %> + <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %> <br /> <br /> <%= submit_tag t('diary_entry.view.save_button') %> diff --git a/app/views/export/_sidebar.html.erb b/app/views/export/_sidebar.html.erb index b8f681b2f..539c6f448 100644 --- a/app/views/export/_sidebar.html.erb +++ b/app/views/export/_sidebar.html.erb @@ -46,7 +46,7 @@ <p class="export_heading"><%= t'export.start.options' %></p> <div class="export_details"> - <p><%= t'export.start.format' %> <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"], ["Postscript", "ps"]], "png")) %></p> + <p><%= t'export.start.format' %> <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"]], "png")) %></p> <p><%= t'export.start.scale' %> 1 : <%= text_field_tag("mapnik_scale", nil, :size => 8) %> <span class="export_hint">(<%= t'export.start.max' %> 1 : <span id="mapnik_max_scale"></span>)</span></p> <p><%= t'export.start.image_size' %> <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span></p> </div> diff --git a/app/views/export/start.js.erb b/app/views/export/start.js.erb index 1134d16d8..e433a498f 100644 --- a/app/views/export/start.js.erb +++ b/app/views/export/start.js.erb @@ -214,15 +214,15 @@ function validateControls() { } var max_scale = maxMapnikScale(); + var disabled = true; - if ($("#format_osm").prop("checked") && bounds.getWidth() * bounds.getHeight() > <%= MAX_REQUEST_AREA %>) { - $("#export_commit").prop("disabled", true); - } else if ($("#format_mapnik").prop("checked") && $("#mapnik_scale").val() < max_scale) { - $("#export_commit").prop("disabled", true); - } else { - $("#export_commit").prop("disabled", false); + if ($("#format_osm").prop("checked")) { + disabled = bounds.getWidth() * bounds.getHeight() > <%= MAX_REQUEST_AREA %>; + } else if ($("#format_mapnik").prop("checked")) { + disabled = $("#mapnik_scale").val() < max_scale; } + $("#export_commit").prop("disabled", disabled); $("#mapnik_max_scale").html(roundScale(max_scale)); } diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb index 18716618f..fcaa5ae64 100644 --- a/app/views/layouts/_inbox.html.erb +++ b/app/views/layouts/_inbox.html.erb @@ -1,7 +1,13 @@ -<% -inbox_attributes = {} -inbox_attributes[:id] = "inboxanchor" -inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0 -inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size +<%= + link_to( + t("layouts.inbox_html", + :count => @user.new_messages.size > 0 ? + content_tag( + :span, @user.new_messages.size, :class => "count-number" + ) : + "" + ), + inbox_path(:display_name => @user.display_name), + :id => "inboxanchor" + ) %> -<%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index b6fb08986..0bff66656 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -31,21 +31,15 @@ editclass = 'geolink llz object minzoom13 disabled' historyclass = 'geolink bbox minzoom11' exportclass = 'geolink llz layers' - traceclass = '' - diaryclass = '' - viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index' - editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit' - historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list' + viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index' + editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit' + historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list' exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export' - traceclass += ' active' if params['controller'] == 'trace' - diaryclass += ' active' if params['controller'] == 'diary_entry' %> <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li> - <li><%= link_to h(t('layouts.edit')) + ' ▾'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li> + <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li> <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %></li> <li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %></li> - <li><%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %></li> - <li><%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %></li> </ul> </div> @@ -54,11 +48,12 @@ <% Editors::ALL_EDITORS.each do |editor| %> <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li> <% end %> + <%= yield :editmenu %> </ul> </div> <script type="text/javascript"> - createMenu("editanchor", "editmenu", 1000, "left"); + createMenu("editanchor", "editmenu", "left"); </script> <div id="left"> @@ -71,62 +66,89 @@ <%= yield :optionals %> <% unless @user %> - <div id="intro"> + <div class="sidebar-copy intro"> <p> <%= t 'layouts.intro_1' %> </p> <p> - <%= t 'layouts.intro_2' %> - </p> - <p> - <%= raw(t 'layouts.intro_3', - :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), - :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"), - :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url'))) %> + <%= t 'layouts.intro_2_html', + :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"), + :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')), + :license => link_to(t('layouts.intro_2_license'), + url_for({:controller => 'site', :action => 'copyright'})), + :create_account => link_to(t('layouts.intro_2_create_account'), + url_for({:controller => 'user', :action => 'new'})) + %> </p> </div> <% end %> <% if STATUS == :database_offline or STATUS == :api_offline %> - <div id="alert"> - <%= t 'layouts.osm_offline' %> + <div class="sidebar-alert"> + <p><%= t 'layouts.osm_offline' %></p> </div> <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> - <div id="alert"> - <%= t 'layouts.osm_read_only' %> + <div class="sidebar-alert"> + <p><%= t 'layouts.osm_read_only' %></p> </div> <% end %> <% if false %> - <div id="donate" class="notice"> - <%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %> + <div class="sidebar-notice"> + <p><%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %></p> </div> <% end %> <div id="left_menu" class="left_menu"> <ul> - <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li> - <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li> - <li><%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %></li> - <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.community_blogs_title' %>"><%= t 'layouts.community_blogs' %></a></li> - <li><a href="http://www.osmfoundation.org" title="<%= t 'layouts.foundation_title' %>"><%= t 'layouts.foundation' %></a></li> + <li><%= t'layouts.help' %> + <ul> + <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li> + <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li> + <li><%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %></li> + </ul> + </li> + <li><%= t'layouts.community' %> + <ul> + <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.community_blogs_title' %>"><%= t 'layouts.community_blogs' %></a></li> + <li><a href="http://www.osmfoundation.org" title="<%= t 'layouts.foundation_title' %>"><%= t 'layouts.foundation' %></a></li> + <li><%= link_to(t('layouts.user_diaries'), { + :controller => 'diary_entry', + :action => 'list', + :display_name => nil + }, { + :title => t('layouts.user_diaries_tooltip') + }) %></li> + </ul> + </li> + <li><%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip') } %></li> <%= yield :left_menu %> </ul> </div> - <center> - <div class="donate"> - <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a> - </div> - </center> + <div id="sotm"> + <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2012'), :title => t('layouts.sotm2012'), :border => "0"), "http://stateofthemap.org/register-now/" %> + </div> + + <div class="donate"> + <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a> + </div> + <div class='sidebar-copy'> + <p class='deemphasize'><%= t 'layouts.partners_html', + :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %> + </p> + </div> </div> <script type="text/javascript"> $(document).ready(function () { var auth_token = $("meta[name=csrf-token]").attr("content"); - $("form input[name=authenticity_token]").val(auth_token); + + $("textarea").autoGrow(); }); </script> diff --git a/app/views/message/_message_summary.html.erb b/app/views/message/_message_summary.html.erb index 82d528a04..6d09d5c71 100644 --- a/app/views/message/_message_summary.html.erb +++ b/app/views/message/_message_summary.html.erb @@ -4,11 +4,8 @@ <td class="inbox-sender" bgcolor="<%= this_colour %>"><%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %></td> <td class="inbox-subject" bgcolor="<%= this_colour %>"><%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %></td> <td class="inbox-sent nowrap" bgcolor="<%= this_colour %>"><%= l message_summary.sent_on, :format => :friendly %></td> - <% if message_summary.message_read? %> - <td><%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %></td> - <% else %> - <td><%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %></td> - <% end %> + <td class="inbox-mark-unread"><%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %></td> + <td class="inbox-mark-read"><%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %></td> <td><%= button_to t('message.message_summary.reply_button'), :controller => 'message', :action => 'reply', :message_id => message_summary.id %></td> <td><%= button_to t('message.message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath %></td> </tr> diff --git a/app/views/message/_sent_message_summary.html.erb b/app/views/message/_sent_message_summary.html.erb index f9aa2310d..830f105da 100644 --- a/app/views/message/_sent_message_summary.html.erb +++ b/app/views/message/_sent_message_summary.html.erb @@ -1,7 +1,7 @@ <% this_colour = cycle('lightgrey', 'white') %> <tr class="inbox-row"> - <td class="inbox-sender" bgcolor="<%= this_colour %>"><%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => sent_message_summary.recipient.display_name %></td> + <td class="inbox-sender" bgcolor="<%= this_colour %>"><%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %></td> <td class="inbox-subject" bgcolor="<%= this_colour %>"><%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %></td> <td class="inbox-sent nowrap" bgcolor="<%= this_colour %>"><%= l sent_message_summary.sent_on, :format => :friendly %></td> <td><%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %></td> diff --git a/app/views/message/mark.js.erb b/app/views/message/mark.js.erb index 2e545b62e..d67e74ace 100644 --- a/app/views/message/mark.js.erb +++ b/app/views/message/mark.js.erb @@ -1,3 +1,7 @@ $("#inboxanchor").replaceWith("<%=j render :partial => "layouts/inbox" %>"); $("#inbox-count").replaceWith("<%=j render :partial => "message_count" %>"); -$("#inbox-<%= @message.id %>").replaceWith("<%=j render :partial => "message_summary", :object => @message %>"); +<% if @message.message_read? -%> +$("#inbox-<%= @message.id %>").removeClass("inbox-row-unread").addClass("inbox-row"); +<% else -%> +$("#inbox-<%= @message.id %>").removeClass("inbox-row").addClass("inbox-row-unread"); +<% end -%> diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb index 113e566d8..ed95e2252 100644 --- a/app/views/message/new.html.erb +++ b/app/views/message/new.html.erb @@ -1,8 +1,8 @@ -<h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@to_user.display_name), {:controller => 'user', :action => 'view', :display_name => @to_user.display_name})) %></h2> +<h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h2> <%= error_messages_for 'message' %> -<%= form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %> +<%= form_for :message, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %> <table> <tr valign="top"> <td class="fieldName"><%= t'message.new.subject' %></td> @@ -10,7 +10,7 @@ </tr> <tr valign="top"> <td class="fieldName"><%= t'message.new.body' %></td> - <td><%= f.text_area :body, :cols => 80, :value => @body %></td> + <td><%= richtext_area :message, :body, :cols => 80, :value => @body %></td> </tr> <tr> <td></td> diff --git a/app/views/message/no_such_user.html.erb b/app/views/message/no_such_user.html.erb deleted file mode 100644 index ace99530e..000000000 --- a/app/views/message/no_such_user.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -<h1><%= t'message.no_such_user.heading' %></h1> -<p><%= t'message.no_such_user.body' %></p> diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb index ece514289..6f6823c1b 100644 --- a/app/views/message/outbox.html.erb +++ b/app/views/message/outbox.html.erb @@ -1,6 +1,6 @@ <h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %></h2> -<p><%= t'message.outbox.messages', :count => @user.sent_messages.size %> +<p><%= t'message.outbox.messages', :count => @user.sent_messages.size %></p> <% if @user.sent_messages.size > 0 %> <div id="messages"> diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb index 6bad015cc..d829c79e9 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -20,7 +20,7 @@ </tr> <tr> <th></th> - <td><%= htmlize(@message.body) %></td> + <td><%= @message.body.to_html %></td> <td></td> </tr> </table> @@ -57,7 +57,7 @@ </tr> <tr> <th></th> - <td><%= htmlize(@message.body) %></td> + <td><%= @message.body.to_html %></td> <td></td> </tr> </table> diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb new file mode 100644 index 000000000..b47900a63 --- /dev/null +++ b/app/views/notifier/diary_comment_notification.html.erb @@ -0,0 +1,9 @@ +<p><%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %></p> + +<p><%= raw t'notifier.diary_comment_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p> + +== +<%= @text.to_html %> +== + +<p><%= raw t'notifier.diary_comment_notification.footer', :readurl => link_to(@readurl, @readurl), :commenturl => link_to(@commenturl, @commenturl), :replyurl => link_to(@replyurl, @replyurl) %></p> diff --git a/app/views/notifier/diary_comment_notification.text.erb b/app/views/notifier/diary_comment_notification.text.erb index 193e10de9..7d112a42b 100644 --- a/app/views/notifier/diary_comment_notification.text.erb +++ b/app/views/notifier/diary_comment_notification.text.erb @@ -3,7 +3,7 @@ <%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %> == -<%= raw @text %> +<%= raw @text.to_text %> == <%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %> diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb index ef55b9b96..0b2ff9e69 100644 --- a/app/views/notifier/message_notification.html.erb +++ b/app/views/notifier/message_notification.html.erb @@ -3,7 +3,7 @@ <p><%= raw t'notifier.message_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p> == -<%= htmlize @text %> +<%= @text.to_html %> == <p> diff --git a/app/views/notifier/message_notification.text.erb b/app/views/notifier/message_notification.text.erb index 25b3c0498..10a9ff361 100644 --- a/app/views/notifier/message_notification.text.erb +++ b/app/views/notifier/message_notification.text.erb @@ -3,7 +3,7 @@ <%= raw t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %> == -<%= raw @text %> +<%= raw @text.to_text %> == <%= raw t'notifier.message_notification.footer1', :readurl => @readurl %> diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb index 2769fcd28..8139a2d73 100644 --- a/app/views/oauth_clients/show.html.erb +++ b/app/views/oauth_clients/show.html.erb @@ -24,4 +24,9 @@ <p><%= t'oauth_clients.show.support_notice' %></p> -<p><%= link_to t('oauth_clients.show.edit'), edit_oauth_client_url(@client_application.user.display_name, @client_application) %></p> +<table> +<tr> +<td><%= button_to t('oauth_clients.show.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get %></td> +<td><%= button_to t('oauth_clients.show.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('oauth_clients.show.confirm') } %></td> +</tr> +</table> diff --git a/app/views/redactions/_redaction.html.erb b/app/views/redactions/_redaction.html.erb new file mode 100644 index 000000000..9974d2bc9 --- /dev/null +++ b/app/views/redactions/_redaction.html.erb @@ -0,0 +1 @@ +<li><%= link_to redaction.title, redaction %></li> diff --git a/app/views/redactions/_redactions.html.erb b/app/views/redactions/_redactions.html.erb new file mode 100644 index 000000000..a6b6820ed --- /dev/null +++ b/app/views/redactions/_redactions.html.erb @@ -0,0 +1,3 @@ +<ul id="redaction_list"> + <%= render :partial => 'redaction', :collection => @redactions %> +</ul> diff --git a/app/views/redactions/edit.html.erb b/app/views/redactions/edit.html.erb new file mode 100644 index 000000000..2a5e69d0a --- /dev/null +++ b/app/views/redactions/edit.html.erb @@ -0,0 +1,19 @@ +<% @title = t 'redaction.edit.title' %> +<h1><%= t 'redaction.edit.heading' %></h1> + +<%= form_for(@redaction) do |f| %> + <%= f.error_messages %> + + <p> + <%= f.label :title, t('redaction.edit.title') %><br /> + <%= f.text_field :title %> + </p> + <p> + <%= f.label :description, t('redaction.edit.description') %><br /> + <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %> + </p> + <p> + <%= f.submit t('redaction.edit.submit') %> + </p> +<% end %> + diff --git a/app/views/redactions/index.html.erb b/app/views/redactions/index.html.erb new file mode 100644 index 000000000..1fa683de8 --- /dev/null +++ b/app/views/redactions/index.html.erb @@ -0,0 +1,8 @@ +<% @title = t('redaction.index.title') %> +<h1><%= t('redaction.index.heading') %></h1> + +<% unless @redactions.empty? %> + <%= render :partial => 'redactions' %> +<% else %> + <p><%= t 'redaction.index.empty' %></p> +<% end %> diff --git a/app/views/redactions/new.html.erb b/app/views/redactions/new.html.erb new file mode 100644 index 000000000..c714acdbc --- /dev/null +++ b/app/views/redactions/new.html.erb @@ -0,0 +1,20 @@ +<% @title = t 'redaction.new.title' %> +<h1><%= t 'redaction.new.heading' %></h1> + +<%= form_for(@redaction) do |f| %> + <%= f.error_messages %> + + <p> + <%= f.label :title, t('redaction.new.title') %><br /> + <%= f.text_field :title %> + </p> + <p> + <%= f.label :description, t('redaction.new.description') %><br /> + <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %> + </p> + <p> + <%= f.submit t('redaction.new.submit') %> + </p> +<% end %> + + diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb new file mode 100644 index 000000000..1a24f15b4 --- /dev/null +++ b/app/views/redactions/show.html.erb @@ -0,0 +1,20 @@ +<% @title = t('redaction.show.title') %> +<h1><%= t('redaction.show.heading', :title => @redaction.title) %></h1> + +<p> + <b><%= t 'redaction.show.user' %></b> + <%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %> +</p> +<p> + <b><%= t 'redaction.show.description' %></b> + <%= @redaction.description.to_html %> +</p> + +<% if @user and @user.moderator? %> +<table> +<tr> +<td><%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %></td> +<td><%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %></td> +</tr> +</table> +<% end %> diff --git a/vendor/assets/openlayers/theme/default/framedCloud.css b/app/views/site/_html_help.erb similarity index 100% rename from vendor/assets/openlayers/theme/default/framedCloud.css rename to app/views/site/_html_help.erb diff --git a/app/views/site/_key.html.erb b/app/views/site/_key.html.erb index 54bbca6a7..15f64275c 100644 --- a/app/views/site/_key.html.erb +++ b/app/views/site/_key.html.erb @@ -1,5 +1,18 @@ <script type="text/javascript"> - function openMapKey() { +$(document).ready(function () { + var updateMapKey = function () { + $("#sidebar_content").load("<%= url_for :action => :key %>", { + layer: map.baseLayer.keyid, + zoom: map.getZoom() + }); + } + + var closeMapKey = function () { + map.events.unregister("zoomend", map, updateMapKey); + map.events.unregister("changelayer", map, updateMapKey); + } + + $("#open_map_key").click(function () { updateMapKey(); openSidebar({ @@ -9,21 +22,10 @@ map.events.register("zoomend", map, updateMapKey); map.events.register("changelayer", map, updateMapKey); - } - - function closeMapKey() { - map.events.unregister("zoomend", map, updateMapKey); - map.events.unregister("changelayer", map, updateMapKey); - } - - function updateMapKey() { - $("#sidebar_content").load("<%= url_for :action => :key %>", { - layer: map.baseLayer.keyid, - zoom: map.getZoom() - }); - } + }); +}); </script> <% content_for :left_menu do %> - <li><%= link_to_function t('site.key.map_key'), "openMapKey()", :title => t('site.key.map_key_tooltip') %></li> + <li><%= link_to t("site.key.map_key"), "#", :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></li> <% end %> diff --git a/app/views/site/_markdown_help.html.erb b/app/views/site/_markdown_help.html.erb new file mode 100644 index 000000000..832679716 --- /dev/null +++ b/app/views/site/_markdown_help.html.erb @@ -0,0 +1,29 @@ +<table> + <thead> + <tr> + <th colspan="2"><%= t "site.markdown_help.title_html" %></th> + </tr> + </thead> + <tbody> + <tr> + <th><%= t "site.markdown_help.headings" %></th> + <td># <%= t "site.markdown_help.heading" %><br />## <%= t "site.markdown_help.subheading" %></td> + </tr> + <tr> + <th><%= t "site.markdown_help.unordered" %></th> + <td>* <%= t "site.markdown_help.first" %><br />* <%= t "site.markdown_help.second" %></td> + </tr> + <tr> + <th><%= t "site.markdown_help.ordered" %></th> + <td>1. <%= t "site.markdown_help.first" %><br />2. <%= t "site.markdown_help.second" %></td> + </tr> + <tr> + <th><%= t "site.markdown_help.link" %></th> + <td>[<%= t "site.markdown_help.text" %>](<%= t "site.markdown_help.url" %>)</td> + </tr> + <tr> + <th><%= t "site.markdown_help.image" %></th> + <td>![<%= t "site.markdown_help.alt" %>](<%= t "site.markdown_help.url" %>)</td> + </tr> + </tbody> +</table> diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb index 9dcceeb9b..2cdccc4b0 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -44,7 +44,13 @@ doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>); - function setPosition(lat, lon, zoom) { - doSWF(lat, lon, zoom || 15); - } + $(document).ready(function () { + $("body").on("click", "a.set_position", function () { + var lat = parseFloat($(this).attr("data-lat")); + var lon = parseFloat($(this).attr("data-lon")); + var zoom = parseInt($(this).attr("data-zoom")); + + doSWF(lat, lon, zoom || 15); + }); + }); </script> diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index c443a917a..4559282ca 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -28,7 +28,10 @@ if (lat) { flashvars.lat = lat; } if (lon) { flashvars.lon = lon; } flashvars.zoom = zoom; + flashvars.assets = "<%= asset_path "potlatch2/assets.zip" %>"; + flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>"; flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>"; + flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>"; <% if params['gpx'] %> flashvars.gpx = '<%= h(params['gpx']) %>'; <% end %> @@ -56,7 +59,7 @@ attributes.id = "potlatch"; attributes.bgcolor = "#FFFFFF"; - swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.85","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes); + swfobject.embedSWF("<%= asset_path("potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.102","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes); // 700,600 for fixed size, 100%,100% for resizable } @@ -70,11 +73,17 @@ doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>); <% end -%> - function setPosition(lat, lon, zoom) { - $("#potlatch").each(function () { - this.setPosition(lat, lon, Math.max(zoom || 15, 13)); + $(document).ready(function () { + $("body").on("click", "a.set_position", function () { + var lat = parseFloat($(this).attr("data-lat")); + var lon = parseFloat($(this).attr("data-lon")); + var zoom = parseInt($(this).attr("data-zoom")); + + $("#potlatch").each(function () { + this.setPosition(lat, lon, Math.max(zoom || 15, 13)); + }); }); - } + }); function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) { updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat); diff --git a/app/views/site/_resize.html.erb b/app/views/site/_resize.html.erb index a6583762f..f26e2248c 100644 --- a/app/views/site/_resize.html.erb +++ b/app/views/site/_resize.html.erb @@ -18,12 +18,16 @@ function resizeMap() { var content_width = $("#content").width(); var content_height = $("#content").height(); - var sidebar_width = 0 + $("#sidebar:visible").outerWidth(true); + var sidebar_width = 0; var left_border = parseFloat($("#map").css("border-left-width")); var right_border = parseFloat($("#map").css("border-right-width")); var top_border = parseFloat($("#map").css("border-top-width")); var bottom_border = parseFloat($("#map").css("border-bottom-width")); + $("#sidebar:visible").each(function () { + sidebar_width = sidebar_width + $(this).outerWidth(true); + }); + <% if t('html.dir') == "ltr" -%> $("#map").css("left", (sidebar_width) + "px"); <% else -%> diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb index 3391a102b..9adc3dafe 100644 --- a/app/views/site/_search.html.erb +++ b/app/views/site/_search.html.erb @@ -15,7 +15,7 @@ $("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>"); <% if params[:action] == 'index' -%> - var extent = getMapExtent(); + var extent = unproj(map.getExtent()); $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :search %>", { query: $("#query").val(), @@ -43,18 +43,17 @@ <% content_for :optionals do %> <div class="optionalbox"> - <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span> - <h1><%= t 'site.search.search' %></h1> <div class="search_container"> <div id="search_field"> <%= form_tag "#", :id => "search_form" do %> - <%= text_field_tag :query, h(params[:query]), :tabindex => "1" %> <%= submit_tag t('site.search.submit_text') %> + <%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search') %> <% end %> </div> </div> - <p class="search_help"> + <p class='search_help deemphasize'> <%= raw(t 'site.search.search_help') %> + <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span> </p> </div> <% end %> diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 03dee8716..0ef9d7b2b 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -18,7 +18,8 @@ <%= raw t 'license_page.native.text', :native_link => link_to(t('license_page.native.native_link'), :controller => 'site', - :action => 'copyright'), + :action => 'copyright', + :copyright_locale => nil), :mapping_link => link_to(t('license_page.native.mapping_link'), :controller => 'site', :action => 'index') %> @@ -40,4 +41,32 @@ <% end %> <% end %> -<%= raw t('license_page.legal_babble', :locale => @locale) %> +<h2><%= t "license_page.legal_babble.title_html", :locale => @locale %></h2> + +<p><%= t "license_page.legal_babble.intro_1_html", :locale => @locale %></p> +<p><%= t "license_page.legal_babble.intro_2_html", :locale => @locale %></p> + +<h3><%= t "license_page.legal_babble.credit_title_html", :locale => @locale %></h3> +<p><%= t "license_page.legal_babble.credit_1_html", :locale => @locale %></p> +<p><%= t "license_page.legal_babble.credit_2_html", :locale => @locale %></p> + +<h3><%= t "license_page.legal_babble.more_title_html", :locale => @locale %></h3> +<p><%= t "license_page.legal_babble.more_1_html", :locale => @locale %></p> +<p><%= t "license_page.legal_babble.more_2_html", :locale => @locale %></p> +<p><%= t "license_page.legal_babble.more_3_html", :locale => @locale %></p> + +<h3><%= t "license_page.legal_babble.contributors_title_html", :locale => @locale %></h3> +<p><%= t "license_page.legal_babble.contributors_intro_html", :locale => @locale %></p> +<ul id="contributors"> + <li><%= t "license_page.legal_babble.contributors_au_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_at_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_ca_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_fr_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_nl_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_nz_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_pl_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_za_html", :locale => @locale %></li> + <li><%= t "license_page.legal_babble.contributors_gb_html", :locale => @locale %></li> +</ul> +<p><%= t "license_page.legal_babble.contributors_footer_1_html", :locale => @locale %></p> +<p><%= t "license_page.legal_babble.contributors_footer_2_html", :locale => @locale %></p> diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index 84de92954..d68b989df 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -11,7 +11,7 @@ <% else %> <% content_for :greeting do %> <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> -<%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> | +<%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | <% end %> <% end %> diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 118e82ee2..8aa318a3f 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -1,9 +1,15 @@ <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> <% content_for :greeting do %> - <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> | + <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | <% end %> <% end %> +<% unless STATUS == :api_offline or STATUS == :database_offline -%> + <% content_for :editmenu do -%> + <li><%= link_to t("browse.start_rjs.data_layer_name"), "#", :id => "show_data" %></li> + <% end -%> +<% end -%> + <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> <%= render :partial => 'key' %> <%= render :partial => 'search' %> @@ -12,7 +18,6 @@ <div id="noscript"> <p><%= t 'site.index.js_1' %></p> <p><%= t 'site.index.js_2' %></p> - <p><%= t 'site.index.js_3' %></p> </div> </noscript> @@ -141,8 +146,10 @@ end map = createMap("map"); <% unless STATUS == :api_offline or STATUS == :database_offline %> - map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false }); - map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData); + map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { + visibility: false, + displayInLayerSwitcher: false + }); map.addLayer(map.dataLayer); var noteLayer = addNoteLayer(map, "<%= notes_url :format => 'json' %>", $("#createnoteanchor"), 11); @@ -156,18 +163,18 @@ end <% if bbox %> var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>); - setMapExtent(bbox); + map.zoomToExtent(proj(bbox)); <% if box %> $(window).load(function() { addBoxToMap(bbox) }); <% end %> <% else %> var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>); + <% if params[:scale].to_f > 0 then -%> + var zoom = <%= scale_to_zoom params[:scale] %>; + <% else -%> var zoom = <%= zoom %>; - - <% if params[:scale] and params[:scale].length > 0 then %> - zoom = scaleToZoom(<%= params[:scale].to_f %>); - <% end %> + <% end -%> setMapCenter(centre, zoom); <% end %> @@ -198,44 +205,44 @@ end handleResize(); } - function toggleData() { - if (map.dataLayer.visibility) { + $(document).ready(function () { + $("#show_data").click(function () { $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" }); - } else if (map.dataLayer.active) { - closeSidebar(); - } - } - - function getPosition() { - return getMapCenter(); - } - - function getZoom() { - return getMapZoom(); - } - - function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) { - var centre = new OpenLayers.LonLat(lon, lat); + }); - if (min_lon && min_lat && max_lon && max_lat) { - var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat); + $("body").on("click", "a.set_position", function () { + var lat = parseFloat($(this).attr("data-lat")); + var lon = parseFloat($(this).attr("data-lon")); + var zoom = parseInt($(this).attr("data-zoom")); + var min_lon = parseFloat($(this).attr("data-min-lon")); + var min_lat = parseFloat($(this).attr("data-min-lat")); + var max_lon = parseFloat($(this).attr("data-max-lon")); + var max_lat = parseFloat($(this).attr("data-max-lat")); + var centre = new OpenLayers.LonLat(lon, lat); + + if (min_lon && min_lat && max_lon && max_lat) { + var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat); + + map.zoomToExtent(proj(bbox)); + } else { + setMapCenter(centre, zoom); + } - setMapExtent(bbox); - } else { - setMapCenter(centre, zoom); - } + if (marker) { + removeMarkerFromMap(marker); + } - if (marker) - removeMarkerFromMap(marker); + marker = addMarkerToMap(centre, getArrowIcon()); - marker = addMarkerToMap(centre, getArrowIcon()); - } + return false; + }); + }); function updateLocation() { - var lonlat = getMapCenter(); + var lonlat = unproj(map.getCenter()); var zoom = map.getZoom(); var layers = getMapLayers(); - var extents = getMapExtent(); + var extents = unproj(map.getExtent()); var expiry = new Date(); var objtype; var objid; @@ -252,7 +259,7 @@ end } function remoteEditHandler(event) { - var extent = getMapExtent(); + var extent = unproj(map.getExtent()); var loaded = false; $("#linkloader").load(function () { loaded = true; }); @@ -293,7 +300,7 @@ end $(document).ready(function () { $("#exportanchor").click(function (e) { $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" }); - Event.stop(e); + e.preventDefault(); }); <% if params[:action] == 'export' -%> diff --git a/app/views/trace/_trace_paging_nav.html.erb b/app/views/trace/_trace_paging_nav.html.erb index c338a1469..669c1fe70 100644 --- a/app/views/trace/_trace_paging_nav.html.erb +++ b/app/views/trace/_trace_paging_nav.html.erb @@ -1,5 +1,6 @@ <p> +<% if @traces.size > 1 %> <% if @page > 1 %> <%= link_to t('trace.trace_paging_nav.previous'), params.merge({ :page => @page - 1 }) %> <% else %> @@ -13,5 +14,5 @@ <% else %> <%= link_to t('trace.trace_paging_nav.next'), params.merge({ :page => @page + 1 }) %> <% end %> - +<% end %> </p> diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb index 2475b5ad2..5a33defc8 100644 --- a/app/views/trace/list.html.erb +++ b/app/views/trace/list.html.erb @@ -20,16 +20,20 @@ <% end %> </p> -<%= render :partial => 'trace_paging_nav' %> +<% if @traces.size > 0 %> + <%= render :partial => 'trace_paging_nav' %> -<table id="trace_list" cellpadding="3"> - <tr> - <th></th> - <th></th> - </tr> - <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %> -</table> + <table id="trace_list" cellpadding="3"> + <tr> + <th></th> + <th></th> + </tr> + <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %> + </table> -<%= render :partial => 'trace_paging_nav' %> + <%= render :partial => 'trace_paging_nav' %> +<% else %> + <p><%= t 'trace.list.empty_html', :upload_link => trace_create_path %></p> +<% end %> <%= render :partial => 'trace_optionals' %> diff --git a/app/views/trace/no_such_user.html.erb b/app/views/trace/no_such_user.html.erb deleted file mode 100644 index 6b1b27f46..000000000 --- a/app/views/trace/no_such_user.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -<h2><%= t'trace.no_such_user.heading', :user => @not_found_user %></h2> -<p><%= t'trace.no_such_user.body', :user => @not_found_user %></p> diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb index 9bac0dc2d..a13b2c50a 100644 --- a/app/views/user/_contact.html.erb +++ b/app/views/user/_contact.html.erb @@ -28,14 +28,15 @@ <%= t'changeset.changeset.no_edits' %> <% end %> </td> +</tr> <tr> <td> <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %> | <% if @user.is_friends_with?(contact) %> - <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => contact.display_name, :referer => request.fullpath %> + <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% else %> - <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => contact.display_name, :referer => request.fullpath %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% end %> </td> </tr> diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb index eb99f4372..2d886527c 100644 --- a/app/views/user/_map.html.erb +++ b/app/views/user/_map.html.erb @@ -24,11 +24,11 @@ end function init(){ var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>); + <% if params[:scale].to_f > 0 then -%> + var zoom = <%= scale_to_zoom params[:scale] %>; + <% else -%> var zoom = <%= zoom %>; - - <% if params['scale'] and params['scale'].length > 0 then %> - zoom = scaleToZoom(<%= params['scale'].to_f() %>); - <% end %> + <% end -%> var map = createMap("map"); diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb index 4f62a51e9..4f2f59c92 100644 --- a/app/views/user/_user.html.erb +++ b/app/views/user/_user.html.erb @@ -19,7 +19,7 @@ %> <% end %> </p> - <%= htmlize(user.description) %> + <%= user.description.to_html %> </td> <td> <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %> diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 3e8d1b0bf..cdd3160e8 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,4 +1,8 @@ <h2><%= t 'user.account.my settings' %></h2> + +<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> | +<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> + <%= error_messages_for 'user' %> <%= form_for :user, :html => { :multipart => true } do |f| %> <table id="accountForm"> @@ -63,7 +67,7 @@ <tr> <td class="fieldName"><%= t 'user.account.profile description' %></td> - <td><%= f.text_area :description, :rows => '5', :cols => '60' %></td> + <td><%= richtext_area :user, :description, :rows => '15', :cols => '80' %></td> </tr> <tr> @@ -132,8 +136,3 @@ <%= raw t 'user.account.public editing note.text' %> <%= button_to t('user.account.make edits public button'), :action => :go_public %> <% end %> -<br/> -<br/> -<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %> -<br/> -<br/> diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index c185a11b7..5208d0a7f 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -32,7 +32,7 @@ <table id="login_openid_buttons"> <tr> - <td><%= link_to_function(image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "showOpenidUrl()", :title => t("user.login.openid_providers.openid.title")) %></td> + <td><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></td> <td><%= openid_button "google", "gmail.com" %></td> <td><%= openid_button "yahoo", "me.yahoo.com" %></td> <td><%= openid_button "myopenid", "myopenid.com" %></td> @@ -65,18 +65,20 @@ </div> <script type="text/javascript"> -function showOpenidUrl() { - $("#openid_url").val("http://"); - $("#login_openid_buttons").hide(); - $("#login_openid_url").show(); - $("#login_openid_submit").show(); -} +$(document).ready(function() { + $("#openid_open_url").click(function() { + $("#openid_url").val("http://"); + $("#login_openid_buttons").hide(); + $("#login_openid_url").show(); + $("#login_openid_submit").show(); + }); -function submitOpenidUrl(url) { - $("#openid_url").val(url); - $("#login_form").submit(); -} + $(".openid_button").click(function() { + $("#openid_url").val($(this).attr("data-url")); + $("#login_form").submit(); + }); -$("#login_openid_url").hide(); -$("#login_openid_submit").hide(); + $("#login_openid_url").hide(); + $("#login_openid_submit").hide(); +}); </script> diff --git a/app/views/user/make_friend.html.erb b/app/views/user/make_friend.html.erb new file mode 100644 index 000000000..abae0d201 --- /dev/null +++ b/app/views/user/make_friend.html.erb @@ -0,0 +1,7 @@ +<h1><%= t "user.make_friend.heading", :user => @new_friend.display_name %></h1> +<%= form_tag do %> + <% if params[:referer] -%> + <%= hidden_field_tag("referer", params[:referer]) %> + <% end -%> + <%= submit_tag t("user.make_friend.button") %> +<% end %> diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index e8400eb90..f45072a92 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -51,7 +51,7 @@ <tr> <td></td> <td> - <span id="openid_prompt" class="minorNote"><%= link_to_function(raw(t('user.new.use openid', :logo => openid_logo)), "enableOpenID()") %></span> + <span id="openid_prompt" class="minorNote"><%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %></span> <span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span> </td> </tr> @@ -88,9 +88,13 @@ function disableOpenID() $("#openid_url").prop("disabled", true); } -<% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%> -enableOpenID(); -<% else -%> -disableOpenID(); -<% end -%> +$(document).ready(function () { + $("#openid_enable").click(enableOpenID); + + <% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%> + enableOpenID(); + <% else -%> + disableOpenID(); + <% end -%> +}); </script> diff --git a/app/views/user/remove_friend.html.erb b/app/views/user/remove_friend.html.erb new file mode 100644 index 000000000..0919bc95a --- /dev/null +++ b/app/views/user/remove_friend.html.erb @@ -0,0 +1,7 @@ +<h1><%= t "user.remove_friend.heading", :user => @friend.display_name %></h1> +<%= form_tag do %> + <% if params[:referer] -%> + <%= hidden_field_tag("referer", params[:referer]) %> + <% end -%> + <%= submit_tag t("user.remove_friend.button") %> +<% end %> diff --git a/app/views/user/suspended.html.erb b/app/views/user/suspended.html.erb index 0ea1cb50d..53a4eb082 100644 --- a/app/views/user/suspended.html.erb +++ b/app/views/user/suspended.html.erb @@ -2,4 +2,4 @@ <h1><%= t "user.suspended.heading" %></h1> -<%= t "user.suspended.body", :webmaster => link_to(t("user.suspended.webmaster"), "mailto:webmaster@openstreetmap.org") %> +<%= raw t "user.suspended.body", :webmaster => link_to(t("user.suspended.webmaster"), "mailto:webmaster@openstreetmap.org") %> diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 834a8528f..97811d3a4 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,43 +1,42 @@ <%= user_image @this_user %> -<h2><%= h(@this_user.display_name) %> - -<% UserRole::ALL_ROLES.each do |role| %> - <% if @user and @user.administrator? %> - <% if @this_user.has_role? role %> - <%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %> - <% else %> - <%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %> - <% end %> - <% elsif @this_user.has_role? role %> - <%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %> - <% end %> -<% end %></h2> +<h2><%= @this_user.display_name %><%= role_icons(@this_user) %></h2> <div id="userinformation"> <% if @user and @this_user.id == @user.id %> <!-- Displaying user's own profile page --> - <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> - | - <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new' %> - | - <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> - | <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> + <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span> | - <%= link_to t('user.view.my traces'), :controller => 'trace', :action=> 'mine' %> + <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> + <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span> | <%= link_to t('user.view.my notes'), :controller => 'note', :action=> 'mine' %> | - <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> + <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> | - <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> + <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %> | - <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> - <% if @user and @user.moderator? %> - | <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> + <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> + <% if @user.blocks.exists? %> + | + <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> + <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span> + <% end %> + <% if @user and @user.moderator? and @user.blocks_created.exists? %> + | + <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> + <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span> <% end %> <% else %> + <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> + <span class='count-number'><%= number_with_delimiter(@this_user.changesets.size) %></span> + | + <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %> + <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span> + | + <%= link_to t('user.view.notes'), :controller => 'note', :action=> 'mine' %> + | <!-- Displaying another user's profile page --> <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> | @@ -45,21 +44,20 @@ | <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> | - <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.notes'), :controller => 'note', :action=> 'mine' %> - | <% if @user and @user.is_friends_with?(@this_user) %> - <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> + <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %> <% else %> - <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %> <% end %> - | - <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> - <% if @this_user.moderator? %> - | <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> + <% if @this_user.blocks.exists? %> + | + <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> + <span class='count-number'><%= number_with_delimiter(@this_user.blocks.active.size) %></span> + <% end %> + <% if @this_user.moderator? and @this_user.blocks_created.exists? %> + | + <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> + <span class='count-number'><%= number_with_delimiter(@this_user.blocks_created.active.size) %></span> <% end %> <% if @user and @user.moderator? %> | <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %> @@ -68,19 +66,19 @@ <% if @user and @user.administrator? %> <br/> <% if ["active", "confirmed"].include? @this_user.status %> - <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'set_status', :status => 'pending', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% elsif ["pending"].include? @this_user.status %> - <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% end %> <% if ["active", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.confirm_user'), {:controller => 'user', :action => 'set_status', :status => 'confirmed', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% end %> <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'set_status', :status => 'deleted', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% else %> - <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | <% end %> - <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> + <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> <% end %> </div> @@ -107,7 +105,7 @@ <h3><%= t 'user.view.description' %></h3> -<div id="description"><%= htmlize(@this_user.description) %></div> +<div id="description"><%= @this_user.description.to_html %></div> <% if @user and @this_user.id == @user.id %> <div id="map" class="user_map"> diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb index 7127cc283..12f0c7ced 100644 --- a/app/views/user_blocks/_blocks.html.erb +++ b/app/views/user_blocks/_blocks.html.erb @@ -17,3 +17,19 @@ </tr> <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %> </table> + +<p> + <% if @user_blocks_pages.current_page.number > 1 -%> + <%= link_to t('user_block.partial.previous'), params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %> + <% else -%> + <%= t('user_block.partial.previous') %> + <% end -%> + + | <%= t('user_block.partial.showing_page', :page => @user_blocks_pages.current_page.number) %> | + + <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%> + <%= link_to t('user_block.partial.next'), params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %> + <% else -%> + <%= t('user_block.partial.next') %> + <% end -%> +</p> diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index a50ac75d7..d78bd11d8 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -9,7 +9,7 @@ <p> <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %><br /> - <%= f.text_area :reason, :cols => 80, :rows => 5 %> + <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %> </p> <p> <%= label_tag 'user_block_period', t('user_block.edit.period') %><br /> diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb index 80854b840..f63298373 100644 --- a/app/views/user_blocks/new.html.erb +++ b/app/views/user_blocks/new.html.erb @@ -9,7 +9,7 @@ <p> <%= f.label :reason, t('user_block.new.reason', :name => @this_user.display_name) %><br /> - <%= f.text_area :reason, :cols => 80, :rows => 5 %> + <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %> </p> <p> <%= label_tag 'user_block_period', t('user_block.new.period') %><br /> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 4ba69a73f..2311541d9 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -18,7 +18,7 @@ <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p> <p><b><%= t'user_block.show.reason' %></b></p> -<%= htmlize(@user_block.reason) %> +<%= @user_block.reason.to_html %> <% if @user_block.ends_at > Time.now.getutc %> <% if @user and @user.id == @user_block.creator_id %> diff --git a/app/views/user_roles/grant.html.erb b/app/views/user_roles/grant.html.erb deleted file mode 100644 index 13f81184c..000000000 --- a/app/views/user_roles/grant.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= form_tag request.fullpath do %> -<%= hidden_field_tag 'nonce', @nonce %> -<% @title = t('user_role.grant.heading') %> -<h1><%= t('user_role.grant.heading') %></h1> -<p><%= t('user_role.grant.are_you_sure', :name => params[:display_name], :role => params[:role]) %></p> -<p><%= submit_tag t('user_role.grant.confirm') %></p> -<% end %> diff --git a/app/views/user_roles/revoke.html.erb b/app/views/user_roles/revoke.html.erb deleted file mode 100644 index 240a91fff..000000000 --- a/app/views/user_roles/revoke.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= form_tag request.fullpath do %> -<%= hidden_field_tag 'nonce', @nonce %> -<% @title = t('user_role.revoke.heading') %> -<h1><%= t('user_role.revoke.heading') %></h1> -<p><%= t('user_role.revoke.are_you_sure', :name => params[:display_name], :role => params[:role]) %></p> -<p><%= submit_tag t'user_role.revoke.confirm' %></p> -<% end %> diff --git a/config/application.rb b/config/application.rb index 25df04b44..879f5714d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -62,7 +62,9 @@ module OpenStreetMap # This will create an empty whitelist of attributes available for mass-assignment for all models # in your app. As such, your models will need to explicitly whitelist or blacklist accessible # parameters by using an attr_accessible or attr_protected declaration. - config.active_record.whitelist_attributes = true + unless STATUS == :database_offline + config.active_record.whitelist_attributes = true + end # Enable the asset pipeline config.assets.enabled = true diff --git a/config/environments/development.rb b/config/environments/development.rb index 75f8fee12..5cb58cf13 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -23,11 +23,15 @@ OpenStreetMap::Application.configure do config.action_dispatch.best_standards_support = :builtin # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict + unless STATUS == :database_offline + config.active_record.mass_assignment_sanitizer = :strict + end # Log the query plan for queries taking more than this (works # with SQLite, MySQL, and PostgreSQL) - config.active_record.auto_explain_threshold_in_seconds = 0.5 + unless STATUS == :database_offline + config.active_record.auto_explain_threshold_in_seconds = 0.5 + end # Do not compress assets config.assets.compress = false diff --git a/config/environments/production.rb b/config/environments/production.rb index 56c33ec98..2b900df88 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -60,7 +60,7 @@ OpenStreetMap::Application.configure do config.assets.precompile += %w( openlayers.js ) config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) - config.assets.precompile += %w( browse.css theme/default/style.css ) + config.assets.precompile += %w( browse.css theme/openstreetmap/style.css ) # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false diff --git a/config/example.application.yml b/config/example.application.yml index 501b3d2ad..593509297 100644 --- a/config/example.application.yml +++ b/config/example.application.yml @@ -40,6 +40,8 @@ defaults: &defaults max_messages_per_hour: 60 # Domain for handling message replies #messages_domain: "messages.openstreetmap.org" + # Geonames authentication details + #geonames_username: "" # Quova authentication details #quova_username: "" #quova_password: "" diff --git a/config/initializers/buffered_logger.rb b/config/initializers/buffered_logger.rb index b75e74ec6..c3a31b319 100644 --- a/config/initializers/buffered_logger.rb +++ b/config/initializers/buffered_logger.rb @@ -4,7 +4,7 @@ module ActiveSupport alias_method :old_add, :add def add(severity, message = nil, progname = nil, &block) - return if @level > severity + return if self.level > severity message = (message || (block && block.call) || progname).to_s time = Time.now message = "[%s.%06d #%d] %s" % [time.strftime("%Y-%m-%d %H:%M:%S"), time.usec, $$, message.sub(/^\n+/, "")] diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 22704901f..036de52d1 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -1,17 +1,5 @@ module I18n module Backend - class Simple - def init_translations_with_mn_cleanup - init_translations_without_mn_cleanup - - translations[:mn][:errors][:template].delete(:body) - translations[:mn][:activemodel][:errors][:template].delete(:body) - translations[:mn][:activerecord][:errors][:template].delete(:body) - end - - alias_method_chain :init_translations, :mn_cleanup - end - module Fallbacks def find_first_string_or_lambda_default(defaults) defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) } diff --git a/config/initializers/openid.rb b/config/initializers/openid.rb index 966164b3e..a171d1e7b 100644 --- a/config/initializers/openid.rb +++ b/config/initializers/openid.rb @@ -1 +1,7 @@ -OpenIdAuthentication.store = :file +if defined?(MEMCACHE_SERVERS) + require "openid/store/memcache" + + OpenIdAuthentication.store = OpenID::Store::Memcache.new(MemCache.new(:namespace => "rails", :string_return_types => true)) +else + OpenIdAuthentication.store = :file +end diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb index 7360e2701..0df38f0fa 100644 --- a/config/initializers/sanitize.rb +++ b/config/initializers/sanitize.rb @@ -1,3 +1,4 @@ Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup Sanitize::Config::OSM[:add_attributes] = { 'a' => { 'rel' => 'nofollow' } } +Sanitize::Config::OSM[:remove_contents] = [ 'script', 'style' ] diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 02548e803..aa9071404 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,32 +1,6 @@ # Be sure to restart your server when you modify this file. if defined?(MEMCACHE_SERVERS) - unless STATUS == :database_offline or STATUS == :database_readonly - module Rack - module Session - class Memcache - def get_session(env, sid) - with_lock(env, [nil, {}]) do - unless sid and session = @pool.get(sid) - if sid and s = ActiveRecord::SessionStore::SqlBypass.find_by_session_id(sid) - session = s.data - s.destroy - else - sid, session = generate_sid, {} - end - - unless /^STORED/ =~ @pool.add(sid, session) - raise "Session collision on '#{sid.inspect}'" - end - end - [sid, session] - end - end - end - end - end - end - cache = MemCache.new(:namespace => "rails:session", :string_return_types => true) OpenStreetMap::Application.config.session_store :mem_cache_store, :cache => cache, :key => "_osm_session" diff --git a/config/initializers/streaming.rb b/config/initializers/streaming.rb index 0fc092951..db61e6b24 100644 --- a/config/initializers/streaming.rb +++ b/config/initializers/streaming.rb @@ -5,6 +5,8 @@ module ActionController def send_file(file, options = {}) if file.is_a? File or file.is_a? Tempfile + headers["Content-Length"] ||= file.size.to_s + options[:filename] ||= File.basename(file.path) unless options[:url_based_filename] send_file_headers! options @@ -12,6 +14,8 @@ module ActionController self.content_type = options[:content_type] if options.key?(:content_type) self.response_body = file else + headers["Content-Length"] ||= File.size(file).to_s + old_send_file(file, options) end end diff --git a/config/languages.yml b/config/languages.yml index bc986a54b..d4baa3b3e 100644 --- a/config/languages.yml +++ b/config/languages.yml @@ -40,6 +40,9 @@ ba: be: english: Belarusian native: Беларуская +be-Tarask: + english: Belarusian (TaraÅ¡kievica orthography) + native: беларуская (тарашкевіца) bg: english: Bulgarian native: Български @@ -474,10 +477,10 @@ sq: native: Shqip sr: english: Serbian - native: Српски / Srpski -sr-EC: - english: Serbian Cyrillic ekavian - native: Српски (ћирилица) + native: Српски +sr-Latn: + english: Serbian (Latin script) + native: srpski (latinica) ss: english: Swati native: SiSwati diff --git a/config/locales/README b/config/locales/README index 1262e2d0c..e8dc83288 100644 --- a/config/locales/README +++ b/config/locales/README @@ -1,13 +1,13 @@ This directory contains all the translations for the openstreetmap.org website. -Do NOT edit any translations in here, please use TranslateWiki instead. +Do NOT edit any translations in here, please use translatewiki.net instead. The only file in this directory that should be edited by hand is en.yml, when -localisation strings change or new translations are introduced. All other -languages _need_ to be edited using TranslateWiki. Please make sure that you -run the tests using *rake test* to make sure that there are no errors, as there +localisation strings change or new translations are introduced. All other +languages _need_ to be edited using translatewiki.net. Please make sure that you +run the tests using *rake test* to make sure that there are no errors, as there is at least one test that makes sure that all translations are valid (we'll makes sure that they won't cause the site to not work). There is more information about translating the website on the wiki at -http://wiki.openstreetmap.org/wiki/Website_Internationalization +http://wiki.openstreetmap.org/wiki/Website_Internationalization. diff --git a/config/locales/af.yml b/config/locales/af.yml index d443ecf3a..0d71e72a5 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -92,7 +92,6 @@ af: next_changeset_tooltip: Volgende wysiging deur %{user} prev_changeset_tooltip: Vorige wysiging deur %{user} node: - download: "%{download_xml_link}, %{view_history_link} of %{edit_link}" download_xml: Laai XML af edit: wysig node: Node @@ -102,7 +101,6 @@ af: coordinates: "Koördinate:" part_of: "Deel af:" node_history: - download: "%{download_xml_link} of %{view_details_link}" download_xml: Laai XML af node_history: Nodegeskiedenis node_history_title: "Nodegeskiedenis: %{node_name}" @@ -118,14 +116,12 @@ af: of: van showing_page: Bladsy relation: - download: "%{download_xml_link} of %{view_history_link}" download_xml: Laai XML af view_history: wys geskiedenis relation_details: members: "Lede:" part_of: "Deel van:" relation_history: - download: "%{download_xml_link} of %{view_details_link}" download_xml: Laai XML af relation_history: Relasiegeskiedenis relation_history_title: "Relasie Geskiedenis: %{relation_name}" @@ -178,7 +174,6 @@ af: type: node: node way: - download: "%{download_xml_link}, %{view_history_link} of %{edit_link}" download_xml: Laai XML af edit: wysig view_history: besigtig geskiedenis @@ -191,7 +186,6 @@ af: nodes: "Nodes:" part_of: "Deel van:" way_history: - download: "%{download_xml_link} of %{view_details_link}" download_xml: Laai XML af view_details: besigtig besonderhede way_history: Weggeskiedenis @@ -271,10 +265,6 @@ af: body: Jammer, daar is geen dagboekinskrywing of kommentaar met die id %{id} nie. Kontroleer u spelling, of miskien is die skakel waarop u gekliek het verkeerd. heading: Die inskrywing met id %{id} bestaan nie title: Die opgevraagde dagboekinskrywing bestaan nie - no_such_user: - body: Jammer, daar is geen gebruiker met die naam %{user} nie. Kontroleer u spelling, of miskien is die skakel waarop u gekliek het verkeerd. - heading: Die gebruiker %{user} bestaan nie - title: Geen sodanige gebruiker nie view: leave_a_comment: Los opmerking agter login: Teken in @@ -441,46 +431,15 @@ af: boundary: administrative: Administratiewe grens building: - apartments: Woonstelblok - block: Boublok - bunker: Bunker - chapel: Kapel - church: Kerk - city_hall: Stadsaal - commercial: Kommersiële-gebou - dormitory: Studentehuis - entrance: Ingang - faculty: Fakulteit-gebou - farm: Plaasgebou - flats: Woonstelle - garage: Garage - hall: Saal - hospital: Hospitaal-gebou - hotel: Hotel - house: Huis - industrial: Industriële gebou - office: Kantoorgebou - public: Openbare gebou - residential: Residensiële gebou - retail: Kleinhandel-gebou - school: Skoolgebou - shop: Winkel - stadium: Stadion - store: Winkel - terrace: Terras - tower: Toring - train_station: Spoorwegstasie - university: Universiteitsgebou + "yes": Gebou highway: bridleway: Ruiterpad bus_stop: Bushalte construction: Snelweg in aanbou cycleway: Fietspad - distance_marker: Afstandsmerker emergency_access_point: Noodtoeganspunt footway: Voetpad ford: Fort - gate: Hek motorway: Snelweg motorway_junction: Snelwegknooppunt path: Pad @@ -536,10 +495,8 @@ af: landfill: Stortingsterrein military: Militêre gebied mine: Myn - mountain: Berg nature_reserve: Natuurreservaat park: Park - plaza: Plein quarry: Steengroewe railway: Spoor reservoir: Reservoir @@ -572,7 +529,6 @@ af: cave_entrance: Grotingang channel: Kanaal cliff: Kloof - coastline: Kuslyn crater: Krater feature: Besienswaardigheid fjord: Fjord @@ -642,7 +598,6 @@ af: switch: Spoogwegpunte tram_stop: Tramhalte shop: - apparel: Kledingwinkel art: Kunswinkel bakery: Bakkery beauty: Skoonheidssalon @@ -650,7 +605,6 @@ af: books: Boekwinkel butcher: Slagter car: Motorwinkel - car_dealer: Motorhandelaar car_parts: Motoronderdele car_repair: Motorherstel carpet: Mat-/tapytwinkel @@ -663,7 +617,6 @@ af: cosmetics: Kosmetiesewinkel discount: Afslagwinkel doityourself: Doen-dit-self-winkel - drugstore: Apteek dry_cleaning: Droogskoonmaker electronics: Elektronikawinkel farm: Plaaswinkel @@ -762,15 +715,11 @@ af: history: Geskiedenis home: tuis home_tooltip: Gaan na tuisligging - inbox: inboks (%{count}) inbox_tooltip: one: U inboks bevat 1 ongeleesde boodskap other: U inboks bevat %{count} ongeleesde boodskappe zero: U inboks bevat geen ongelees boodskappe nie intro_1: OpenStreetMap is 'n vry bewerkbare kaart van die hele wêreld. Dit word deur mense soos u geskep. - intro_2: Met OpenStreetMap kan u geografiese data van die hele aarde sien, wysig en gebruik. - intro_3: OpenStreetMap se webwerf word ondersteun deur %{ucl} en %{bytemark}. Ander ondersteuners word by %{partners} gelys. - intro_3_partners: wiki log_in: Teken in log_in_tooltip: Teken aan met 'n bestaande rekening logo: @@ -824,10 +773,6 @@ af: no_such_message: heading: Die boodskap bestaan nie title: Die boodskap bestaan nie - no_such_user: - body: Jammer, daar is geen gebruiker met die naam nie - heading: Die gebruiker bestaan nie - title: Die gebruiker bestaan nie outbox: date: Datum inbox: inboks @@ -1061,9 +1006,6 @@ af: your_traces: U GPS-spore make_public: made_public: Spoor is openbaar gemaak - no_such_user: - heading: Die gebruiker %{user} bestaan nie - title: Die gebruiker bestaan nie trace: ago: "%{time_in_words_ago} gelede" by: deur @@ -1094,8 +1036,6 @@ af: trace_optionals: tags: Etikette trace_paging_nav: - next: Volgende » - previous: » Vorige showing_page: Bladsy %{page} view: delete_track: Verwyder hierdie spoor @@ -1297,8 +1237,6 @@ af: show: Wys hierdie blokkade submit: Opdateer blokkade title: Wysig blokkade op %{name} - filter: - not_a_moderator: U moet 'n moderator wees om die aksie te kan uitvoer. helper: time_future: Verval oor %{time}. time_past: Het %{time} gelede verval. diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 942b5ede9..13cb147b5 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -9,6 +9,7 @@ # Author: Heroid # Author: Mdupont # Author: MicroBoy +# Author: Nemo bis aln: activerecord: attributes: @@ -87,7 +88,6 @@ aln: changeset: changeset: "Ndryshim: %{id}" changesetxml: Ndryshim en XML - download: Shkarkone %{changeset_xml_link} ose %{osmchange_xml_link} feed: title: Ndryshim %{id} title_comment: Ndryshimi %{id} - %{comment} @@ -140,7 +140,6 @@ aln: next_changeset_tooltip: Tjetri ndryshim prej %{user} prev_changeset_tooltip: Ndryshimi i ma hershēm prej %{user} node: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" download_xml: Merre me XML edit: ndrro node: Nyje @@ -150,7 +149,6 @@ aln: coordinates: "Koordinatat:" part_of: "Pjesë e:" node_history: - download: "%{download_xml_link} ose %{view_details_link}" download_xml: Merre me XML node_history: Historia e Pikës node_history_title: "Historia e Pikës: %{node_name}" @@ -166,7 +164,6 @@ aln: of: pi showing_page: Tu e tregue faqen relation: - download: "%{download_xml_link} ose %{view_history_link}" download_xml: Shkarkoje XML relation: Lidhja relation_title: "Lidhja: %{relation_name}" @@ -175,7 +172,6 @@ aln: members: "Anëtarët:" part_of: "Pjesë e:" relation_history: - download: "%{download_xml_link} ose %{view_details_link}" download_xml: Merre me XML relation_history: Historia e Lidhjes relation_history_title: "Historia e Lidhjes: %{relation_name}" @@ -235,7 +231,6 @@ aln: relation: lidhje way: rrugë way: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" download_xml: Shkarko XML edit: ndrro view_history: kqyre historine @@ -248,7 +243,6 @@ aln: nodes: "Nyjet:" part_of: "Pjesë e:" way_history: - download: "%{download_xml_link} ose %{view_details_link}" download_xml: Merre me XML view_details: kqyre n'detaje way_history: Historia e Udhës @@ -341,10 +335,6 @@ aln: body: Me na fal, por nuk ka shënim në ditar ose koment me id %{id}. Ju lutem shihni drejtshkrimin, ose lidhja që keni kliku asht gabim. heading: "Nuk ka shënim me id: %{id}" title: Nuk ka hyrje të tilla ditar - no_such_user: - body: Me na fal, po nuk ka anëtarë me emnin %{user}. Ju lutem kshyrni shkronjat, ose nashta lidhja që keni trus është gabim. - heading: Anëtari %{user} nuk egziston - title: Nuk ka anëtarë të tillë view: leave_a_comment: Lene naj koment login: Hyrje @@ -520,36 +510,7 @@ aln: boundary: administrative: Administrative kufitare building: - apartments: Apartament Blloku - block: Ndërtimi Blloku - bunker: Bunker - chapel: Kishëz - church: Kishë - city_hall: Bashkia - commercial: Komercial Ndërtimi - dormitory: Konvikt - entrance: Ndërtimi Hyrja - faculty: Fakulteti Ndërtimi - farm: Farm Ndërtimi - flats: Banesa - garage: Garazh - hall: Sallë - hospital: Spitali Ndërtimi - hotel: Hotel - house: Shpi - industrial: ndërtesë industriale - office: Zyra për ndërtim - public: Publike Ndërtimi - residential: godinë banimi - retail: Shitje me pakicë për ndërtim - school: Shkolla Ndërtimi - shop: Shitore - stadium: Stadium - store: Dyqan - terrace: Tarracë - tower: Kullë - train_station: Stacion hekurudhor - university: Universiteti për ndërtim + "yes": Ndërtesë highway: bridleway: Rruge pa osfallt bus_guideway: Lane udhëzoi Autobuseve @@ -557,11 +518,9 @@ aln: byway: Rruge ansore construction: Highway nën ndërtim cycleway: Rruge per biciklla - distance_marker: Largësia Marker emergency_access_point: Pike Hyrje e urgjencës footway: Rrugë e kambsorve ford: Fiord - gate: Portë living_street: rrugës ku njerëzit jetojnë minor: rrugë të vogla motorway: Autostradë @@ -626,11 +585,9 @@ aln: meadow: Livadh military: Zonë Ushtarake mine: Imi - mountain: Mal nature_reserve: Natyra Rezervat park: Park piste: Piste - plaza: Shesh publik quarry: Gurore railway: Hekurudhor recreation_ground: Zbavitje Ground @@ -668,7 +625,6 @@ aln: cave_entrance: Shpella Hyrja channel: Kanal cliff: Shkamb - coastline: Vijë e bregdetit crater: Krater feature: Veçuni fell: Moqal @@ -748,7 +704,6 @@ aln: yard: depo stacioni hekurudhor shop: alcohol: kiosk - apparel: Veshmbathje Shop art: Shitore e kafshëve bakery: Dyqan buke beauty: Bukuri Shop @@ -757,7 +712,6 @@ aln: books: Librari butcher: Kasap car: Shitore e Kerreve - car_dealer: shitje makine car_parts: pjesë makinash car_repair: riparimin e makinave carpet: dyqan qilim @@ -772,7 +726,6 @@ aln: department_store: Departamenti Shitore discount: artikuj zbritje dyqan doityourself: Për ta bërë vetë - drugstore: Farmaci dry_cleaning: Pastrimi kimik electronics: Elektronikë Shop estate_agent: agjent immobile @@ -882,15 +835,11 @@ aln: history: Historia home: shtëpi home_tooltip: Shkoni në shtëpi vend - inbox: postë (%{count}) inbox_tooltip: one: Kutia jote ka 1 mesazh të palexume other: Kutia jote ka %{count} mesazhe të palexume zero: Kutia jote nuk ka asnjë mesazh të palexume intro_1: OpenStreetMap është një hartë e lirë editable e tërë botës. Kjo është bërë nga njerëzit si ju. - intro_2: OpenStreetMap ta mundëson ty me shiku, ndryshu dhe përdor të dhana gjeografike në një mënyrë bashkëpunuese prej kudo në Tokë. - intro_3: OpenStreetMap e pret është i mbështetur mirë nga %{ucl} dhe %{bytemark}. mbështetësit e tjerë të projektit janë të shënuara në %{partners}. - intro_3_partners: wiki license: title: Të dhënat OpenStreetMap është i liçensuar nën Creative Commons Attribution-Share njësoj License 2,0 Generic log_in: log in @@ -918,7 +867,24 @@ aln: english_link: origjinal anglisht text: Në ni ngjarje të ni konflikti me faqen e përkthyme dhe %{english_original_link}, faqja anglisht ka përparsi title: Rreth kti përkthimi - legal_babble: " <h2> Copyright </h2>\n<p>\n OpenStreetMap është <i> dhënat e hapur </ i>, të licencuar sipas <a\n href = \"http://creativecommons.org/licenses/by-sa/2.0/\"> Creative\n Commons Attribution-ShareAlike 2,0 </ a licencës> (CC-BY-SA).\n</ P>\n<p>\n Ju jeni të lirë ta kopjoni, shpërndani, përcjell dhe përshtatur hartat tona\n dhe të dhënat, për aq kohë sa ju e kreditit OpenStreetMap e saj\n kontribuesve. Nëse ju ndryshoni ose me ndërtimin e hartave tona ose të dhëna, ju\n mund të shpërndani rezultat vetëm në bazë të licencës të njëjtën.\n <Plotë një\n href = \"http://creativecommons.org/licenses/by-sa/2.0/legalcode\"> ligjore\n <Kod / a> shpjegon të drejtat tuaja dhe të përgjegjësive.\n</ P>\n\n> <h3> Si të kreditit OpenStreetMap </ h3\n<p>\n Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që\n kreditit tuaj lexon të paktën \"© OpenStreetMap\n kontribuesit, CC-BY-SA \". Nëse jeni duke përdorur të dhëna vetëm në hartë,\n ne kerkojme \"Organizimi i të dhënave © kontribuesit OpenStreetMap,\n CC-BY-SA \".\n</ P>\n<p>\n Ku të jetë e mundur, duhet të jetë OpenStreetMap hyperlinked në <a\n href = \"http://www.openstreetmap.org/\"> http://www.openstreetmap.org/ </ a>\n dhe CC-BY-SA për <a\n href = \"http://creativecommons.org/licenses/by-sa/2.0/\"> http://creativecommons.org/licenses/by-sa/2.0/ </ a>. Nëse\n ju jeni duke përdorur një të mesme, ku lidhjet nuk janë të mundshme (p.sh. një\n shtypura punë), ne ju sugjerojmë lexuesit tuaj të drejtpërdrejtë të\n www.openstreetmap.org (ndoshta duke zgjeruar\n 'OpenStreetMap' në këtë adresë të plotë) dhe të\n www.creativecommons.org.\n</ P>\n\n<h3> Gjetja <më shumë / h3>\n<p>\n Lexo më shumë lidhje me përdorimin e të dhënave tona në <a\n href = \"http://wiki.openstreetmap.org/wiki/Legal_FAQ\"> Ligjore\n FAQ </ a>.\n</ P>\n<p>\n OSM janë kontribuesit kujtoi kurrë për të shtuar të dhënat nga ndonjë\n Burime copyright (p.sh. Google Maps apo të shtypura harta) pa\n lejen shprehimisht nga mbajtësit të drejtën e autorit.\n</ P>\n<p>\n Edhe pse OpenStreetMap është e hapur të dhëna, ne nuk mund të sigurojë një\n pa-e-ngarkuar hartë API për zhvilluesit e palëve të treta.\n\n Shiko <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\"> tonë API Perdorimi Politika </ a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\"> tjegull Perdorimi Politika </ a>\n dhe <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\"> Nominatim Perdorimi Politika </ a>.\n</ P>\n\n<h3> kontribuesit tona </ h3>\n<p>\n licencë CC-BY-SA jonë kërkon që ju të \"japin origjinal\n Author kredi të arsyeshme për të mesëm ose të thotë Ti je\n shfrytëzuar \". Individuale mappers OSM nuk kërkojnë një\n kreditit mbi dhe më lart që të \"OpenStreetMap\n kontribuesit \", por kur të dhënat nga një hartës kombëtare\n agjenci ose burim kryesor ka qenë i përfshirë në\n OpenStreetMap, ai mund të jetë e arsyeshme për kredi nga ana e tyre direkt\n riprodhimin e kreditit e tyre apo duke i lidhur me të në këtë faqe.\n</ P>\n\n<! -\nInformacion për redaktorët faqe\n\nNë vijim lista vetëm ato organizata që kërkojnë pushtet\nsi kusht për të dhënat e tyre duke u përdorur në OpenStreetMap. Kjo nuk është një\nkatalogun e përgjithshme të importit, dhe nuk duhet të përdoret vetëm kur\natribuohet është e nevojshme në përputhje me licencën e importuar\ntë dhënave.\n\nÇdo Futjet këtu duhet të diskutohet me sysadmins OSM parë.\n->\n\nid=\"contributors\"> <ul\n <li> <strong> Australi </ strong>: Përmban të dhëna të bazuara periferi\n në Zyra Australiane e Statistikave të dhënave. </ li>\n <li> <strong> Kanada </ strong>: Përmban të dhëna nga\n GeoBase ®, GeoGratis (© Departamenti i Natyrore\n Burimet Kanada), CanVec (Departamenti i Natyrore ©\n Burimet Kanada), dhe StatCan (Divizioni Gjeografia,\n Statistika Kanada). </ Li>\n <li> <strong> Zelanda e Re </ strong>: Përmban të dhëna me burim nga\n Zelanda e Re Toka e informacionit. Crown Copyright rezervuara. </ Li>\n <li> <strong> Mbretëria e Bashkuar </ strong>: Përmban të pajisjeve\n Anketa të dhënat © Crown copyright bazës së të dhënave dhe të drejtë\n 2010. </ Li>\n</> Ul\n\n<p>\n Përfshirja e të dhënave në OpenStreetMap nuk do të thotë që origjinal\n dhënave miraton ofrues OpenStreetMap, ofron çdo garanci ose\n pranon ndonjë përgjegjësi.\n</ P>" + legal_babble: + contributors_au_html: "<strong> Australi </ strong>: Përmban të dhëna të bazuara periferi\n në Zyra Australiane e Statistikave të dhënave." + contributors_ca_html: "<strong> Kanada </ strong>: Përmban të dhëna nga\n GeoBase ®, GeoGratis (© Departamenti i Natyrore\n Burimet Kanada), CanVec (Departamenti i Natyrore ©\n Burimet Kanada), dhe StatCan (Divizioni Gjeografia,\n Statistika Kanada)." + contributors_footer_2_html: " Përfshirja e të dhënave në OpenStreetMap nuk do të thotë që origjinal\n dhënave miraton ofrues OpenStreetMap, ofron çdo garanci ose\n pranon ndonjë përgjegjësi." + contributors_gb_html: "<strong> Mbretëria e Bashkuar </ strong>: Përmban të pajisjeve\n Anketa të dhënat © Crown copyright bazës së të dhënave dhe të drejtë\n 2010." + contributors_intro_html: "licencë CC BY-SA jonë kërkon që ju të \"japin origjinal\n Author kredi të arsyeshme për të mesëm ose të thotë Ti je\n shfrytëzuar \". Individuale mappers OSM nuk kërkojnë një\n kreditit mbi dhe më lart që të \"OpenStreetMap\n kontribuesit \", por kur të dhënat nga një hartës kombëtare\n agjenci ose burim kryesor ka qenë i përfshirë në\n OpenStreetMap, ai mund të jetë e arsyeshme për kredi nga ana e tyre direkt\n riprodhimin e kreditit e tyre apo duke i lidhur me të në këtë faqe." + contributors_nz_html: "<strong> Zelanda e Re </ strong>: Përmban të dhëna me burim nga\n Zelanda e Re Toka e informacionit. Crown Copyright rezervuara." + contributors_title_html: kontribuesit tona + credit_1_html: "Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që\n kreditit tuaj lexon të paktën \"© OpenStreetMap\n kontribuesit, CC BY-SA \". Nëse jeni duke përdorur të dhëna vetëm në hartë,\n ne kerkojme \"Organizimi i të dhënave © kontribuesit OpenStreetMap,\n CC BY-SA \"." + credit_2_html: "Ku të jetë e mundur, duhet të jetë OpenStreetMap hyperlinked në <a\n href = \"http://www.openstreetmap.org/\"> http://www.openstreetmap.org/ </ a>\n dhe CC BY-SA për <a\n href = \"http://creativecommons.org/licenses/by-sa/2.0/\"> http://creativecommons.org/licenses/by-sa/2.0/ </ a>. Nëse\n ju jeni duke përdorur një të mesme, ku lidhjet nuk janë të mundshme (p.sh. një\n shtypura punë), ne ju sugjerojmë lexuesit tuaj të drejtpërdrejtë të\n www.openstreetmap.org (ndoshta duke zgjeruar\n 'OpenStreetMap' në këtë adresë të plotë) dhe të\n www.creativecommons.org." + credit_title_html: Si të kreditit OpenStreetMap + intro_1_html: "OpenStreetMap është <i> dhënat e hapur </ i>, të licencuar sipas <a\nhref = \"http://creativecommons.org/licenses/by-sa/2.0/\"> Creative\nCommons Attribution-ShareAlike 2,0</a> licencës (CC BY-SA)." + intro_2_html: "Ju jeni të lirë ta kopjoni, shpërndani, përcjell dhe përshtatur hartat tona\n dhe të dhënat, për aq kohë sa ju e kreditit OpenStreetMap e saj\n kontribuesve. Nëse ju ndryshoni ose me ndërtimin e hartave tona ose të dhëna, ju\n mund të shpërndani rezultat vetëm në bazë të licencës të njëjtën.\n <Plotë një\n href = \"http://creativecommons.org/licenses/by-sa/2.0/legalcode\"> ligjore\n <Kod / a> shpjegon të drejtat tuaja dhe të përgjegjësive." + more_1_html: "Lexo më shumë lidhje me përdorimin e të dhënave tona në <a\n href = \"http://wiki.openstreetmap.org/wiki/Legal_FAQ\"> Ligjore\n FAQ </ a>." + more_2_html: "OSM janë kontribuesit kujtoi kurrë për të shtuar të dhënat nga ndonjë\n Burime copyright (p.sh. Google Maps apo të shtypura harta) pa\n lejen shprehimisht nga mbajtësit të drejtën e autorit." + more_3_html: "Edhe pse OpenStreetMap është e hapur të dhëna, ne nuk mund të sigurojë një\n pa-e-ngarkuar hartë API për zhvilluesit e palëve të treta.\n\n Shiko <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\"> tonë API Perdorimi Politika </ a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\"> tjegull Perdorimi Politika </ a>\n dhe <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\"> Nominatim Perdorimi Politika </ a>." + more_title_html: Gjetja më shumë + title_html: Copyright native: mapping_link: fillo hartografimin native_link: THIS_LANGUAGE_NAME_HERE verzion @@ -957,10 +923,6 @@ aln: body: Me na fal por nuk ka asnjë mesazh me at id. heading: Nuk ka ksi mesazhi title: Nuk ka ksi mesazhi - no_such_user: - body: Na vjen keq nuk ka asnjë përdorues me atë emër. - heading: S'ka ksi shfrytëzuesi - title: S'ka ksi shfrytëzuesi outbox: date: Data inbox: postë @@ -1147,7 +1109,6 @@ aln: index: js_1: Ju jeni tuj e përdor naj shfletues që nuk e përkrah JavaScript, ose ju e keni ndalu JavaScript. js_2: OpenStreetMap përdor Java skriptet për planet e saj të rrëshqitshëm. - js_3: Ju mund të dëshironi të provoni <a href="http://tah.openstreetmap.org/Browse/">Faqja @ tjegull shfletuesin statike pllaka</a> në qoftë se ju nuk jeni në gjendje të mundësojë JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: E licencume nëpërmjet %{license_name} licenca prej %{project_name} dhe kontribuuesve të tij. @@ -1265,10 +1226,6 @@ aln: your_traces: Të dhanat e GPS-it make_public: made_public: Gjurma u ba publike - no_such_user: - body: Na fal, nuk ka shfrytëzues me emrin %{user}. Ju lutem shihni drejtshkrimin, ose lidhja që keni kliku asht gabim. - heading: Shfrytëzusi %{user} nuk ekziston - title: Ska ksi shfrytëzuesi offline: heading: Mbledhsi i GPX asht jasht linje message: Mbledhsi i skedareve GPX dhe sistemi i ngarkimit për momentin janë jasht funksionit. @@ -1306,8 +1263,6 @@ aln: trace_optionals: tags: Etiketat trace_paging_nav: - next: Vazhdo » - previous: « Paraprake showing_page: Duke shfaqun faqen %{page} view: delete_track: Fshij kët gjurm @@ -1548,7 +1503,6 @@ aln: filter: block_expired: Blloku ka skaduar dhe nuk mund të redaktohen. block_period: Periudha e bllokuar duhet të jetë një nga vlerat selectable në drop-down list. - not_a_moderator: Ju duhet të jeni moderator për ta kryer atë veprim. helper: time_future: Përfundon në %{time}. time_past: Përfundoi %{time} më parë. diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 9f7d32563..5ae78d5bb 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1,6 +1,7 @@ # Messages for Arabic (العربية) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Ali1 # Author: Aude # Author: Bassem JARKAS # Author: Grille chompa @@ -39,7 +40,7 @@ ar: user: المستخدم visible: ظاهر user: - active: فعال + active: نشط description: الوصف display_name: الاسم الظاهر email: البريد الإلكتروني @@ -88,7 +89,6 @@ ar: changeset: changeset: "حزمة التغييرات: %{id}" changesetxml: حزمة التغييرات إكس إم أل - download: نزّل %{changeset_xml_link} أو %{osmchange_xml_link} feed: title: حزمة التغييرات %{id} title_comment: حزمة التغييرات %{id} - %{comment} @@ -132,7 +132,7 @@ ar: node: اعرض العقدة على خريطة أكبر relation: اعرض العلاقة على خريطة أكبر way: اعرض الطريق على خريطة أكبر - loading: يُحمّل... + loading: جاري التحميل... navigation: all: next_changeset_tooltip: حزمة التغييرات التالية @@ -148,9 +148,8 @@ ar: next_changeset_tooltip: التغيير التالي من المستخدم %{user} prev_changeset_tooltip: آخر تغيير من قبل المستخدم %{user} node: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" download_xml: نزّل إكس إم أل - edit: عدّل + edit: تعديل العقدة node: عقدة node_title: "عقدة: %{node_name}" view_history: اعرض التاريخ @@ -158,7 +157,6 @@ ar: coordinates: "إحداثيات:" part_of: "جزء من:" node_history: - download: "%{download_xml_link} أو %{view_details_link}" download_xml: نزّل إكس إم أل node_history: تاريخ العقدة node_history_title: "تاريخ العقدة: %{node_name}" @@ -174,7 +172,6 @@ ar: of: من showing_page: إظهار الصفحة relation: - download: "%{download_xml_link} أو %{view_history_link}" download_xml: نزّل إكس إم إل relation: العلاقة relation_title: "العلاقة: %{relation_name}" @@ -183,7 +180,6 @@ ar: members: "الأعضاء:" part_of: "جزء من:" relation_history: - download: "%{download_xml_link} أو %{view_details_link}" download_xml: نزّل إكس إم أل relation_history: تاريخ العلاقة relation_history_title: "تاريخ العلاقة: %{relation_name}" @@ -199,7 +195,7 @@ ar: view_data: أظهر بيانات عرض الخريطة الحالي start_rjs: data_frame_title: البيانات - data_layer_name: البيانات + data_layer_name: تصفح بيانات الخريطة details: التفاصيل drag_a_box: اسحب مربع على الخريطة لاختيار منطقة edited_by_user_at_timestamp: عُدّل بواسطة [[user]] في [[timestamp]] @@ -207,7 +203,7 @@ ar: history_for_feature: تاريخ الــ[[feature]] load_data: تحميل البيانات loaded_an_area_with_num_features: "لقد قمت بتحميل منطقة تحتوي على [[num_features]] ميّزة. بصفة عامّة، بعض المتصفحات قد لا تتوافق بشكل جيد مع عرض هذه الكمية من البيانات. عمومًا، تعمل المتصفحات بشكل أفضل في عرض أقل من 100 ميّزة في وقت واحد: القيام بأي شيء آخر قد يجعل المتصفح بطيء أو لن يستجيب. إن كنت متأكدًا من أنك ترغب في عرض هذه البيانات، يمكنك القيام بذلك عن طريق النقر على الزر أدناه." - loading: يُحمّل... + loading: جاري التحميل... manually_select: اختر يدويًا منطقة أخرى object_list: api: استرد هذه المنطقة من الأي بي أي @@ -241,9 +237,8 @@ ar: relation: العلاقة way: الطريق way: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" download_xml: نزّل إكس إم إل - edit: عدّل + edit: تعديل الطريق view_history: اعرض التاريخ way: طريق way_title: "طريق: %{way_name}" @@ -255,7 +250,6 @@ ar: nodes: "العُقد:" part_of: "جزء من:" way_history: - download: "%{download_xml_link} أو %{view_details_link}" download_xml: نزّل إكس إم إل view_details: اعرض التفاصيل way_history: تاريخ الطريق @@ -276,7 +270,7 @@ ar: changesets: area: منطقة comment: التعليق - id: المعرّف + id: رقم saved_at: حُفظ في user: المستخدم list: @@ -342,7 +336,7 @@ ar: title: يوميات المستخدمين user_title: يومية %{user} location: - edit: عدّل + edit: تعديل location: "الموقع:" view: اعرض new: @@ -351,13 +345,9 @@ ar: body: عذرًا، لا يوجد مدخلة يومية أو تعليق بالمعرّف %{id}. يرجى تدقيق التهجئة، أو ربما يكون الرابط الذي تم النقر عليه خاطئ. heading: "لا يوجد مدخلة بالمعرّف: %{id}" title: مدخلة يومية غير موجودة - no_such_user: - body: عذرًا، لا يوجد مستخدم بالاسم %{user}. يرجى تدقيق الاسم، أو ربما يكون الرابط الذي تم النقر عليه خاطئ. - heading: المستخدم %{user} غير موجود - title: مستخدم غير موجود view: leave_a_comment: اترك تعليقًا - login: سجّل دخول + login: تسجيل الدخول login_to_leave_a_comment: "%{login_link} لترك تعليق" save_button: احفظ title: يوميات %{user} | %{title} @@ -534,36 +524,7 @@ ar: boundary: administrative: حدود إدارية building: - apartments: مجموعة شقق - block: مجمع مباني - bunker: ملجأ محصن - chapel: معبد/مصلى - church: كنيسة - city_hall: دار/قاعة البلدية - commercial: مبنى تجاري - dormitory: عنبر نوم - entrance: مدخل مبنى - faculty: مبنى كلية - farm: مبنى مزرعة - flats: شقق - garage: مرآب - hall: قاعة - hospital: مبنى مستشفى - hotel: فندق - house: منزل - industrial: مبنى صناعي - office: مبنى مكتب - public: مبنى عام - residential: مبنى سكني - retail: مبنى بيع بالمفرق - school: مبنى مدرسة - shop: متجر - stadium: مدرج ألعاب رياضية - store: مخزن - terrace: صف منازل - tower: برج - train_station: محطة قطار - university: مبنى جامعة + "yes": مبنى highway: bridleway: مسلك خيول bus_guideway: مسار خاص للحافلات @@ -571,11 +532,9 @@ ar: byway: طريق فرعي construction: طريق سريع قيد الإنشاء cycleway: مسار دراجات - distance_marker: إشارة مسافة emergency_access_point: نقطة دخول طوارئ footway: ممر للمشاة ford: مخاضة - gate: بوّابة living_street: شارع سكني minor: طريق غير هام motorway: طريق سريع @@ -614,7 +573,7 @@ ar: manor: عزبة memorial: نصب تذكاري mine: منجم - monument: ضريح + monument: أثر museum: متحف ruins: أطلال tower: برج @@ -640,11 +599,9 @@ ar: meadow: مرج military: منطقة عسكرية mine: منجم - mountain: جبل nature_reserve: محمية طبيعية park: منتزه piste: منطقة تزحلق - plaza: ساحة quarry: كسّارة railway: سكة حديدية recreation_ground: ميدان ألعاب @@ -682,7 +639,6 @@ ar: cave_entrance: مدخل كهف channel: قناة cliff: جرف - coastline: خط ساحلي crater: فوهة بركان feature: ميزة fell: منحدر @@ -727,9 +683,9 @@ ar: islet: جزيرة صغيرة locality: محلة moor: أرض جرداء - municipality: بلدية + municipality: البلدية postcode: الرمز البريدي - region: منطقة + region: المنطقة sea: بحر state: ولاية subdivision: التقسيم الفرعي @@ -762,7 +718,6 @@ ar: yard: فناء سكة حديد shop: alcohol: متجر كحول للبيع الخارجي - apparel: متجر ملابس art: متجر فن bakery: مخبز beauty: صالون تجميل @@ -771,7 +726,6 @@ ar: books: متجر كتب butcher: جزار car: متجر سيارات - car_dealer: تاجر سيارات car_parts: قطع غيار سيارات car_repair: مرآب سيارات carpet: معرض سجاد @@ -786,7 +740,6 @@ ar: department_store: متجر متعدد الأقسام discount: محل رخصة doityourself: براعة منزلية - drugstore: صيدلية dry_cleaning: تنظيف جاف electronics: متجر إلكترونيات estate_agent: وكيل عقاري @@ -894,7 +847,7 @@ ar: documentation_title: توثيق المشروع donate: ادعم خريطة الشارع المفتوحة ب%{link} لتمويل ترقية العتاد. donate_link_text: التبرع - edit: عدّل الخريطة + edit: تعديل edit_with: حرر بإستعمال %{editor} export: صدِّر export_tooltip: صدّر بيانات الخريطة @@ -908,7 +861,6 @@ ar: history: تاريخ home: الصفحة الرئيسية home_tooltip: اذهب إلى الصفحة الرئيسية - inbox: صندوق البريد (%{count}) inbox_tooltip: few: صندوق بريدك يحوي %{count} رسائل غير مقروءة one: صندوق بريدك يحوي رسالة واحدة غير مقروءة @@ -916,17 +868,14 @@ ar: two: صندوق بريدك يحوي رسالتين غير مقروءتين zero: صندوق بريدك لا يحوي رسائل غير مقروءة intro_1: خريطة الشارع المفتوحة هي خريطة للعالم كله قابلة للتحرير حرة ومجانية. قام بإنشائها أشخاص مثلك. - intro_2: خريطة الشارع المفتوحة تسمح لك بعرض وتعديل واستخدام البيانات الجغرافية بطريقة تعاونية من أي مكان على وجه الأرض. - intro_3: تفضل باستضافة خريطة الشارع المفتوحة كلًا من %{ucl}, %{ic} و %{bytemark}. داعمو المشروع الآخرون مسردون في %{partners}. - intro_3_partners: الويكي license: title: بيانات خريطة الشارع المفتوحة مرخصة تحت رخصة المشاع الإبداعي، النسبة، نسخة 2.0 - log_in: دخول + log_in: تسجيل الدخول log_in_tooltip: سجّل الدخول مع حساب موجود logo: alt_text: شعار خريطة الشارع المفتوحة logout: اخرج - logout_tooltip: خروج + logout_tooltip: تسجيل الخروج make_a_donation: text: تبرع title: ادعم خريطة الشارع المفتوحة بهبة نقدية @@ -967,7 +916,7 @@ ar: as_read: عُلّمت الرسالة مقروءة as_unread: عُلّمت الرسالة كغير مقروءة message_summary: - delete_button: احذف + delete_button: حذف read_button: علّم كمقروءة reply_button: رد unread_button: علّم كغير مقروءة @@ -984,10 +933,6 @@ ar: body: عذرًا لا يوجد أي رسالة بهذا المعرف. heading: لا توجد مثل هذه الرسالة title: لا توجد مثل هذه الرسالة - no_such_user: - body: عذرًا لا يوجد مستخدم أو رسالة بذلك الاسم. - heading: لا يوجد مثل هذا المستخدم - title: لا يوجد مثل هذا المستخدم outbox: date: التاريخ inbox: صندوق البريد الوارد @@ -1014,7 +959,7 @@ ar: reply: wrong_user: أنت مسجل دخول باسم '%{user}' ولكن الرسالة التي طلبت الرد عليها لم تكن مرسلة لذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد. sent_message_summary: - delete_button: احذف + delete_button: حذف notifier: diary_comment_notification: footer: يمكنك أيضًا قراءة التعليق على %{readurl} ويمكنك التعليق على %{commenturl} أو الرد على %{replyurl} @@ -1114,7 +1059,7 @@ ar: destroy: flash: دمّر تسجيل التطبيق edit: - submit: عدّل + submit: تعديل title: عدّل تطبيقك form: allow_read_gpx: قراءة آثاره للجي بي إس الخصوصية. @@ -1174,7 +1119,6 @@ ar: index: js_1: أنت إما تستخدم متصفح لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت. js_2: خريطة الشارع المفتوحة تستخدم جافا سكريبت لخريطتها المنزلقة. - js_3: قد ترغب بمحاولة <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> إذا كنت غير قادر على تمكين جافا سكريبت. license: license_name: المشاع الإبداعي، النسبة، نسخة 2.0 notice: مرخص بموجب رخصة %{license_name} بواسطة %{project_name} ومساهميه. @@ -1251,7 +1195,7 @@ ar: unsurfaced: طريق غير معبد wood: غابة search: - search: ابحث + search: بحث search_help: "أمثلة: 'الحرية'، 'شارع الحمراء, بيروت'، 'مدرسة, القاهرة' <a href='http://http://wiki.openstreetmap.org/wiki/Ar:Search?uselang=ar'>المزيد من الأمثلة...</a>" submit_text: اذهب where_am_i: أين أنا؟ @@ -1271,7 +1215,7 @@ ar: edit: description: "الوصف:" download: نزّل - edit: عدّل + edit: تعديل filename: "اسم الملف:" heading: تعديل الأثر %{name} map: خريطة @@ -1292,10 +1236,6 @@ ar: your_traces: آثار جي بي إس الخاصة بك make_public: made_public: تم جعل الأثر عمومي - no_such_user: - body: عذرًا، لا يوجد مستخدم بالاسم %{user}. يرجى تدقيق الاسم، أو ربما يكون الرابط الذي تم النقر عليه خاطئ. - heading: المستخدم %{user} غير موجود - title: مستخدم غير موجود offline: heading: مخزن جي بي إكس غير متصل message: مخزن ونظام رفع ملفات جي بي إكس غير متاح حاليًا. @@ -1305,7 +1245,7 @@ ar: ago: منذ %{time_in_words_ago} by: بواسطة count_points: "%{count} نقطة" - edit: عدّل + edit: تعديل edit_map: عدّل الخريطة identifiable: محدد الهوية in: في @@ -1319,10 +1259,10 @@ ar: view_map: اعرض الخريطة trace_form: description: "الوصف:" - help: المساعدة + help: مساعدة tags: "الوسوم:" tags_help: محدد بفواصل - upload_button: ارفع + upload_button: رفع upload_gpx: "ارفع ملف GPX:" visibility: "الرؤية:" visibility_help: ماذا يعني هذا؟ @@ -1334,15 +1274,13 @@ ar: trace_optionals: tags: الوسوم trace_paging_nav: - next: التالي » - previous: « السابق showing_page: إظهار الصفحة %{page} view: delete_track: احذف هذا الأثر description: "الوصف:" download: نزّل - edit: عدّل - edit_track: عدّل هذا الأثر + edit: تعديل + edit_track: عدل هذا الأثر filename: "اسم الملف:" heading: عرض الأثر %{name} map: خريطة @@ -1426,18 +1364,18 @@ ar: auth failure: آسف، لا يمكن الدخول بتلك التفاصيل. create account minute: أنشئ حساباّ. تحتاج فقط إلى دقيقة. email or username: "عنوان البريد الإلكتروني أو اسم المستخدم:" - heading: ولوج - login_button: لُج + heading: تسجيل الدخول + login_button: تسجيل الدخول lost password link: أنسيت كلمة المرور؟ new to osm: جديد لخريطة الشارع المفتوحة ؟ password: "كلمة السر:" register now: تسجل الآن remember: "تذكرني:" - title: ولوج + title: تسجيل الدخول logout: heading: الخروج من خريطة الشارع المفتوحة - logout_button: اخرج - title: اخرج + logout_button: تسجيل الخروج + title: تسجيل الخروج lost_password: email address: "عنوان البريد الإلكتروني:" heading: أنسيت كلمة المرور؟ @@ -1454,7 +1392,7 @@ ar: confirm email address: "تأكيد عنوان البريد الإلكتروني:" confirm password: "تأكيد كلمة المرور:" contact_webmaster: يرجى الاتصال <a href="mailto:webmaster@openstreetmap.org">بمسؤول الموقع</a> لترتيب الحساب المراد إنشاؤه - وسنحاول التعامل مع هذا الطلب بأسرع وقت ممكن. - continue: استمر + continue: استمرار display name: "اسم المستخدم:" display name description: اسم المستخدم الخاص بك الظاهر علنًا. يمكنك تغيير هذه التفضيلات في وقت لاحق. email address: "عنوان البريد الإلكتروني:" @@ -1474,7 +1412,7 @@ ar: popup: friend: صديق nearby mapper: مخطط بالجوار - your location: موقعك + your location: مكانك remove_friend: not_a_friend: "%{name} ليس من أحد أصدقائك." success: تم إزالة %{name} من قائمة أصدقائك. @@ -1579,7 +1517,6 @@ ar: filter: block_expired: العرقلة قد انتهت ولا يمكن تعديلها. block_period: فترة العرقلة يجب أن تكون واحدة من القيم الاختيارية في القائمة المنسدلة. - not_a_moderator: عليك أن تكون وسيط لتنفيذ هذا الإجراء. helper: time_future: ينتهي في %{time}. time_past: انتهى منذ %{time}. @@ -1608,7 +1545,7 @@ ar: confirm: هل أنت متأكد؟ creator_name: المنشئ display_name: مستخدم مُعرقل - edit: عدّل + edit: تعديل not_revoked: (لم تلغ) reason: السبب العرقلة revoke: ابطل! @@ -1631,7 +1568,7 @@ ar: show: back: اعرض كل العرقلات confirm: هل أنت متأكد؟ - edit: عدّل + edit: تعديل heading: "%{block_on} عُرقل بواسطة %{block_by}" needs_view: المستخدم يحتاج لتسجيل الدخول قبل أن يتم مسح هذه العرقلة. reason: "سبب العرقلة:" diff --git a/config/locales/arz.yml b/config/locales/arz.yml index 5b9ebef1d..4a51afc2f 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -80,7 +80,6 @@ arz: changeset: changeset: "حزمه التغييرات: %{id}" changesetxml: حزمه التغييرات إكس إم إل - download: نزّل %{changeset_xml_link} أو %{osmchange_xml_link} feed: title: حزمه التغييرات %{id} title_comment: حزمه التغييرات %{id} - %{comment} @@ -134,7 +133,6 @@ arz: next_changeset_tooltip: التعديل التالى بواسطه %{user} prev_changeset_tooltip: عُدّل سابقًا بواسطه %{user} node: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" download_xml: نزّل إكس إم أل edit: عدّل node: عقدة @@ -144,7 +142,6 @@ arz: coordinates: "إحداثيات:" part_of: "جزء من:" node_history: - download: "%{download_xml_link} أو %{view_details_link}" download_xml: نزّل إكس إم أل node_history: تاريخ العقدة node_history_title: "تاريخ العقدة: %{node_name}" @@ -160,7 +157,6 @@ arz: of: من showing_page: إظهار الصفحة relation: - download: "%{download_xml_link} أو %{view_history_link}" download_xml: نزّل إكس إم إل relation: العلاقة relation_title: "العلاقة: %{relation_name}" @@ -169,7 +165,6 @@ arz: members: "الأعضاء:" part_of: "جزء من:" relation_history: - download: "%{download_xml_link} أو %{view_details_link}" download_xml: نزّل إكس إم أل relation_history: تاريخ العلاقة relation_history_title: "تاريخ العلاقة: %{relation_name}" @@ -218,7 +213,6 @@ arz: tag_details: tags: "الوسوم:" way: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" download_xml: نزّل إكس إم إل edit: عدّل view_history: اعرض التاريخ @@ -232,7 +226,6 @@ arz: nodes: "العُقد:" part_of: "جزء من:" way_history: - download: "%{download_xml_link} أو %{view_details_link}" download_xml: نزّل إكس إم إل view_details: اعرض التفاصيل way_history: تاريخ الطريق @@ -324,10 +317,6 @@ arz: body: عذرًا، لا يوجد مدخله يوميه أو تعليق بالمعرّف %{id}. يرجى تدقيق التهجئه، أو ربما يكون الرابط الذى تم النقر عليه خاطئ. heading: "لا يوجد مدخله بالمعرّف: %{id}" title: مدخله يوميه غير موجودة - no_such_user: - body: عذرًا، لا يوجد مستخدم بالاسم %{user}. يرجى تدقيق الاسم، أو ربما يكون الرابط الذى تم النقر عليه خاطئ. - heading: المستخدم %{user} غير موجود - title: مستخدم غير موجود view: leave_a_comment: اترك تعليقًا login: سجّل دخول @@ -497,45 +486,15 @@ arz: boundary: administrative: حدود إدارية building: - apartments: مجموعه شقق - block: مجمع مباني - bunker: ملجأ محصن - chapel: معبد/مصلى - church: كنيسة - city_hall: دار/قاعه البلدية - commercial: مبنى تجاري - dormitory: عنبر نوم - entrance: مدخل مبنى - faculty: مبنى كلية - farm: مبنى مزرعة - flats: شقق - garage: مرآب - hall: قاعة - hospital: مبنى مستشفى - hotel: فندق - house: منزل - industrial: مبنى صناعي - office: مبنى مكتب - public: مبنى عام - residential: مبنى سكني - school: مبنى مدرسة - shop: متجر - stadium: مدرج ألعاب رياضية - store: مخزن - terrace: صف منازل - tower: برج - train_station: محطه قطار - university: مبنى جامعة + "yes": مبنى highway: bridleway: مسلك خيول bus_stop: موقف نزول/صعود من/إلى حافلات byway: طريق فرعي construction: طريق سريع قيد الإنشاء cycleway: مسار دراجات - distance_marker: إشاره مسافة emergency_access_point: نقطه دخول طوارئ footway: ممر للمشاة - gate: بوّابة living_street: شارع سكني minor: طريق غير هام motorway: طريق سريع @@ -594,10 +553,8 @@ arz: meadow: مرج military: منطقه عسكرية mine: منجم - mountain: جبل nature_reserve: محميه طبيعية park: منتزه - plaza: ساحة quarry: كسّارة railway: سكه حديدية recreation_ground: ميدان ألعاب @@ -634,7 +591,6 @@ arz: cave_entrance: مدخل كهف channel: قناة cliff: جرف - coastline: خط ساحلي crater: فوهه بركان feature: ميزة fell: منحدر @@ -703,7 +659,6 @@ arz: tram_stop: موقف ترام yard: فناء سكه حديد shop: - apparel: متجر ملابس art: متجر فن bakery: مخبز beauty: صالون تجميل @@ -712,7 +667,6 @@ arz: books: متجر كتب butcher: جزار car: متجر سيارات - car_dealer: تاجر سيارات car_parts: قطع غيار سيارات car_repair: مرآب سيارات carpet: معرض سجاد @@ -725,7 +679,6 @@ arz: cosmetics: بائع مستحضرات تجميل department_store: متجر متعدد الأقسام doityourself: براعه منزلية - drugstore: صيدلية dry_cleaning: تنظيف جاف electronics: متجر إلكترونيات estate_agent: وكيل عقاري @@ -821,7 +774,6 @@ arz: history: تاريخ home: الصفحه الرئيسية home_tooltip: اذهب إلى الصفحه الرئيسية - inbox: صندوق البريد (%{count}) inbox_tooltip: few: صندوق بريدك يحوى %{count} رسائل غير مقروءة one: صندوق بريدك يحوى رساله واحده غير مقروءة @@ -829,8 +781,6 @@ arz: two: صندوق بريدك يحوى رسالتين غير مقروءتين zero: صندوق بريدك لا يحوى رسائل غير مقروءة intro_1: خريطه الشارع المفتوحه هى خريطه للعالم كله قابله للتحرير حره ومجانيه. قام بإنشائها أشخاص مثلك. - intro_2: خريطه الشارع المفتوحه تسمح لك بعرض وتعديل واستخدام البيانات الجغرافيه بطريقه تعاونيه من أى مكان على وجه الأرض. - intro_3: تفضل باستضافه خريطه الشارع المفتوحه كلًا من %{ucl} و %{bytemark}. license: title: بيانات خريطه الشارع المفتوحه مرخصه تحت رخصه المشاع الإبداعى، النسبه، نسخه 2.0 log_in: دخول @@ -882,10 +832,6 @@ arz: send_message_to: أرسل رساله جديده إلى %{name} subject: الموضوع title: أرسل رسالة - no_such_user: - body: عذرًا لا يوجد مستخدم أو رساله بذلك الاسم أو المعرّف - heading: لا يوجد مستخدم أو رسالة - title: لا يوجد مستخدم أو رسالة outbox: date: التاريخ inbox: صندوق البريد الوارد @@ -1058,7 +1004,6 @@ arz: index: js_1: أنت إما تستخدم متصفح لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت. js_2: خريطه الشارع المفتوحه تستخدم جافا سكريبت لخريطتها المنزلقه. - js_3: قد ترغب بمحاوله <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> إذا كنت غير قادر على تمكين جافا سكريبت. license: license_name: المشاع الإبداعى، النسبه، نسخه 2.0 notice: مرخص بموجب رخصه %{license_name} بواسطه %{project_name} ومساهميه. @@ -1164,10 +1109,6 @@ arz: your_traces: آثار جى بى إس الخاصه بك make_public: made_public: تم جعل الأثر عمومي - no_such_user: - body: عذرًا، لا يوجد مستخدم بالاسم %{user}. يرجى تدقيق الاسم، أو ربما يكون الرابط الذى تم النقر عليه خاطئ. - heading: المستخدم %{user} غير موجود - title: مستخدم غير موجود offline: heading: مخزن جى بى إكس غير متصل message: مخزن ونظام رفع ملفات جى بى إكس غير متاح حاليًا. @@ -1395,7 +1336,6 @@ arz: filter: block_expired: العرقله قد انتهت ولا يمكن تعديلها. block_period: فتره العرقله يجب أن تكون واحده من القيم الاختياريه فى القائمه المنسدله. - not_a_moderator: عليك أن تكون وسيط لتنفيذ هذا الإجراء. helper: time_future: ينتهى فى %{time}. time_past: انتهى منذ %{time}. diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 082659b0d..bf620d2e9 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -1,4 +1,4 @@ -# Messages for Asturian (Asturianu) +# Messages for Asturian (asturianu) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Xuacu @@ -74,6 +74,8 @@ ast: application: require_cookies: cookies_needed: Paez que tienes les cookies desactivaes - activa les cookies nel restolador enantes de siguir. + require_moderator: + not_a_moderator: Has de ser moderador pa facer esa aición. setup_user_auth: blocked: Se bloquió el to accesu a la API. Por favor, coneuta pela interfaz web pa saber más. need_to_see_terms: El to accesu a la API ta torgáu de mou temporal. Por favor, coneuta pela interfaz web pa ver los Términos de Collaboración. Nun fai falta aceutalos, pero debes conocelos. @@ -81,7 +83,6 @@ ast: changeset: changeset: "Conxuntu de cambeos: %{id}" changesetxml: Conxuntu de cambeos XML - download: Descargar %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Conxuntu de cambeos %{id} title_comment: Conxuntu de cambeos %{id} - %{comment} @@ -119,7 +120,7 @@ ast: deleted: Desaniciáu edit: area: Editar área - node: Editar nodo + node: Editar nodiu relation: Editar rellación way: Editar vía larger: @@ -143,21 +144,19 @@ ast: next_changeset_tooltip: Siguiente edición de %{user} prev_changeset_tooltip: Edición anterior de %{user} node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Descargar XML - edit: editar + edit: Editar nodiu node: Nodiu node_title: "Nodiu: %{node_name}" - view_history: ver historial + view_history: Ver historial node_details: coordinates: "Coordenaes:" part_of: "Parte de:" node_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Descargar XML node_history: Historial del nodiu node_history_title: "Historial del nodiu: %{node_name}" - view_details: ver detalles + view_details: Ver detalles not_found: sorry: Perdón, el/la %{type} con id %{id} nun se pudo alcontrar. type: @@ -168,21 +167,26 @@ ast: paging_nav: of: de showing_page: Amosando páxina + redacted: + message_html: La versión %{version} de %{type} nun se pue amosar porque ta redactada. Por favor consulta %{redaction_link} pa más detalles. + redaction: Redaición de %{id} + type: + node: nodiu + relation: rellación + way: vía relation: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Descargar XML relation: Rellación relation_title: "Rellación: %{relation_name}" - view_history: ver historial + view_history: Ver historial relation_details: members: "Miembros:" part_of: "Parte de:" relation_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Descargar XML relation_history: Historial de rellación relation_history_title: "Historial de rellación: %{relation_name}" - view_details: ver detalles + view_details: Ver detalles relation_member: entry_role: "%{type} %{name} como %{role}" type: @@ -194,14 +198,14 @@ ast: view_data: Ver datos de la vista actual del mapa start_rjs: data_frame_title: Datos - data_layer_name: Datos + data_layer_name: Ver datos del mapa details: Detalles drag_a_box: Arrastra un cuadru nel mapa pa seleicionar un área edited_by_user_at_timestamp: Editao por [[user]] el [[timestamp]] hide_areas: Anubrir árees history_for_feature: Historial de [[feature]] load_data: Cargar datos - loaded_an_area_with_num_features: "Cargasti un área que contién [[num_features]] carauterístiques. Polo xeneral, los restoladores nun pueden amosar bien esta cantidá de datos. Normalmente los restoladores funcionen meyor amosando menos de 100 carauterístiques al tiempu: d'otra miente se tornen lentos/dexen de responder. Si tas seguru d'amosar los datos, pues facelo calcando nel botón d'abaxo." + loaded_an_area_with_num_features: "Cargasti un área que contién [[num_features]] carauterístiques. Polo xeneral, dellos restoladores nun pueden amosar bien esta cantidá de datos. Normalmente los restoladores funcionen meyor amosando menos de [[max_features]] carauterístiques al tiempu: d'otra miente se tornen lentos/dexen de responder. Si tas seguru d'amosar los datos, pues facelo calcando nel botón d'abaxo." loading: Cargando... manually_select: Seleiciona manualmente un área distinta object_list: @@ -240,10 +244,9 @@ ast: relation: rellación way: vía way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Descargar XML - edit: editar - view_history: ver historial + edit: Editar vía + view_history: Ver historial way: Vía way_title: "Vía: %{way_name}" way_details: @@ -253,9 +256,8 @@ ast: nodes: "Nodos:" part_of: "Parte de:" way_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Descargar XML - view_details: ver detalles + view_details: Ver detalles way_history: Historial de la vía way_history_title: "Historial de la vía: %{way_name}" changeset: @@ -284,6 +286,8 @@ ast: description_nearby: Conxuntos de cambios d'usuarios cercanos description_user: Conxuntos de cambeos de %{user} description_user_bbox: Conxuntos de cambeos de %{user} en %{bbox} + empty_anon_html: Entá nun se ficieron ediciones + empty_user_html: Paez qu'entá nun ficisti denguna edición. Pa comenzar, consulta la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Guía pa principiantes</a>. heading: Conxuntos de cambios heading_bbox: Conxuntos de cambios heading_friend: Conxuntos de cambios @@ -364,10 +368,6 @@ ast: body: Lo siento, nun hai denguna entrada del diariu cola id %{id}. Comprueba la escritura o si calcasti nun enllaz enquivocáu, seique. heading: "Nun esiste la entrada con id: %{id}" title: Nun esiste la entrada del diariu - no_such_user: - body: Lo siento, nun hai dengún usuariu col nome %{user}. Comprueba la escritura o si calcasti nun enllaz enquivocáu, seique. - heading: L'usuariu %{user} nun esiste - title: Nun esiste l'usuariu view: leave_a_comment: Dexar un comentariu login: Entrar @@ -461,16 +461,28 @@ ast: suffix_place: ", %{distance} al %{direction} de %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aeródromu + apron: Aparcaderu d'aviones + gate: Puerta + helipad: Helipuertu + runway: Pista + taxiway: Cai de rodaxe + terminal: Terminal amenity: + WLAN: Accesu WiFi airport: Aeropuertu arts_centre: Centru d'arte + artwork: Obra d'arte atm: Caxeru automáticu auditorium: Auditoriu bank: Bancu bar: Bar + bbq: Parrilla bench: Bancu bicycle_parking: Aparcaderu de bicicletes bicycle_rental: Alquiler de bicicletes + biergarten: Merenderu brothel: Taburdiu bureau_de_change: Troquéu de moneda bus_station: Estación d'autobús @@ -479,6 +491,7 @@ ast: car_sharing: Compartir coche car_wash: Llaváu de coches casino: Casino + charging_station: Estación de carga cinema: Cine clinic: Clínica club: Club @@ -497,6 +510,7 @@ ast: ferry_terminal: Terminal de ferry fire_hydrant: Boca d'incendios fire_station: Bomberos + food_court: Zona de restaurantes fountain: Fonte fuel: Combustible grave_yard: Cementeriu @@ -537,9 +551,12 @@ ast: shelter: Abellugu shop: Tienda shopping: Compres + shower: Ducha + social_centre: Centru social social_club: Club social studio: Estudiu supermarket: Supermercáu + swimming_pool: Piscina taxi: Taxi telephone: Teléfonu públicu theatre: Teatru @@ -554,37 +571,17 @@ ast: youth_centre: Centru de mocedá boundary: administrative: Llende alministrativa + census: Llende censal + national_park: Parque Nacional + protected_area: Área protexida + bridge: + aqueduct: Acueductu + suspension: Ponte colgante + swing: Ponte xiratoria + viaduct: Viaductu + "yes": Ponte building: - apartments: Bloque d'apartamentos - block: Bloque de viviendes - bunker: Bunker - chapel: Capiella - church: Ilesia - city_hall: Casa del conceyu - commercial: Edificiu comercial - dormitory: Dormitoriu - entrance: Accesu al edificiu - faculty: Facultá - farm: Casería - flats: Pisos - garage: Garaxe - hall: Centru de reuniones - hospital: Hospital - hotel: Hotel - house: Casa - industrial: Edificiu industrial - office: Edificiu d'oficines - public: Edificiu públicu - residential: Edificiu residencial - retail: Edificiu comercial - school: Edificiu escolar - shop: Tienda - stadium: Estadiu - store: Almacén - terrace: Terraza - tower: Torre - train_station: Estación de tren - university: Edificiu universitariu + "yes": Edificiu highway: bridleway: Caleya bus_guideway: Carril bus con guía @@ -592,12 +589,11 @@ ast: byway: Camín construction: Carretera en construcción cycleway: Sienda ciclista - distance_marker: Marca de distancia emergency_access_point: Puntu de llocalización d'emerxencia footway: Sienda ford: Vau - gate: Puerta living_street: Cai residencial + milestone: Finxu minor: Carretera menor motorway: Autopista motorway_junction: Enllaz d'autopista @@ -609,14 +605,17 @@ ast: primary_link: Enllaz de carretera primaria raceway: Pista de carreres residential: Residencial + rest_area: Área de descansu road: Carretera secondary: Carretera secundaria secondary_link: Enllaz de carretera secundaria service: Carretera de serviciu services: Servicios n'autopista + speed_camera: Radar steps: Escaleres stile: Pasera de muries tertiary: Carretera terciaria + tertiary_link: Carretera terciaria track: Pista trail: Camín trunk: Carretera nacional @@ -630,6 +629,7 @@ ast: building: Edificiu castle: Castiellu church: Ilesia + fort: Fuerte house: Casa icon: Iconu manor: Casona @@ -654,6 +654,7 @@ ast: farmland: Tierres de llabor farmyard: Corral forest: Área forestal + garages: Garaxes grass: Yerba greenfield: Plan d'espansión industrial: Área industrial @@ -661,25 +662,28 @@ ast: meadow: Prau military: Área militar mine: Mina - mountain: Monte nature_reserve: Reserva natural + orchard: Güerta park: Parque piste: Pista - plaza: Plaza quarry: Cantera railway: Ferrocarril recreation_ground: Campu recreativu reservoir: Banzáu + reservoir_watershed: Cuenca del banzáu residential: Área residencial retail: Área comercial + road: Área de carretera village_green: Prau municipal vineyard: Viña wetland: Llamuerga wood: Viesca leisure: beach_resort: Turismu de playa + bird_hide: Observatoriu d'aves common: Terrén común fishing: Área de pesca + fitness_station: Ximnasiu garden: Xardín golf_course: Campu de golf ice_rink: Pista de xelu @@ -690,12 +694,17 @@ ast: pitch: Campu deportivu playground: Xuegos infantiles recreation_ground: Campu recreativu + sauna: Sauna slipway: Rampla de botadura sports_centre: Centru deportivu stadium: Estadiu swimming_pool: Piscina track: Pista de carreres water_park: Parque acuáticu + military: + airfield: Aeródromu militar + barracks: Cuartel + bunker: Bunker natural: bay: Golfu beach: Playa @@ -703,11 +712,12 @@ ast: cave_entrance: Boca de cueva channel: Canal cliff: Cantil - coastline: Llinia de costa crater: Crater + dune: Duna feature: Carauterística fell: Braña fjord: Fiordu + forest: Área forestal geyser: Guéiser glacier: Glaciar heath: Berezal @@ -727,6 +737,7 @@ ast: scrub: Cotollal shoal: Baxu spring: Fonte + stone: Piedra strait: Estrechu tree: Árbol valley: Valle @@ -735,6 +746,19 @@ ast: wetland: Llamuerga wetlands: Llamuergues wood: Viesca + office: + accountant: Contable + architect: Arquitectu + company: Empresa + employment_agency: Oficina d'emplegu + estate_agent: Axencia inmobiliaria + government: Oficina gubernamental + insurance: Axencia de seguros + lawyer: Abogáu + ngo: Oficina d'ONG + telecommunication: Oficina de telecomunicaciones + travel_agent: Axencia de viaxes + "yes": Oficina place: airport: Aeropuertu city: Ciudá @@ -746,6 +770,7 @@ ast: houses: Cases island: Islla islet: Castru de mar + isolated_dwelling: Vivienda aisllada locality: Llocalidá moor: Amarradera municipality: Conceyu @@ -769,6 +794,7 @@ ast: junction: Disvíu de ferrocarril level_crossing: Pasu a nivel light_rail: Ferrocarril llixeru + miniature: Ferrocarril en miniatura monorail: Monorraíl narrow_gauge: Ferrocarril de vía estrecha platform: Andén de ferrocarril @@ -783,7 +809,7 @@ ast: yard: Apartaderu de clasificación shop: alcohol: Venta de bébores - apparel: Boutique + antiques: Antigüedaes art: Venta d'arte bakery: Panadería beauty: Cuidaos corporales @@ -792,7 +818,6 @@ ast: books: Llibrería butcher: Carnicería car: Automóvil - car_dealer: Concesionariu d'automóviles car_parts: Repuestos d'automóvil car_repair: Taller d'automóviles carpet: Alfombres @@ -807,7 +832,6 @@ ast: department_store: Grandes almacenes discount: Productos con descuentu doityourself: Bricolax - drugstore: Droguería dry_cleaning: Tintorería electronics: Tienda d'electrónica estate_agent: Axencia inmobiliaria @@ -873,7 +897,10 @@ ast: valley: Valle viewpoint: Mirador zoo: Zoo + tunnel: + "yes": Túnel waterway: + artificial: Vía acuática artificial boatyard: Astilleru canal: Canal connector: Regueru @@ -909,6 +936,7 @@ ast: history_tooltip: Ver ediciones nesti área history_zoom_alert: Tienes d'aumentar pa ver les ediciones d'esti área layouts: + community: Comunidá community_blogs: Blogues de la Comunidá community_blogs_title: Blogues de miembros de la comunidá d'OpenStreetMap copyright: Drechos d'autor y llicencia @@ -930,18 +958,17 @@ ast: history: Historial home: entamu home_tooltip: Dir al llugar d'entamu - inbox: buzón (%{count}) + inbox_html: buzón %{count} inbox_tooltip: one: El to buzón tien 1 mensax ensin lleer other: El to buzón tien %{count} mensaxes ensin lleer zero: El to buzón nun tien mensaxes ensin lleer intro_1: OpenStreetMap ye un mapa editable llibre del mundu enteru. Ta fechu por xente como tu. - intro_2: OpenStreetMap te permite ver, editar y usar datos xeográficos de mou collaborativu dende uquiera del mundu. - intro_3: L'agospiamientu d'OpenStreetMap's cunta col amable encontu de %{ucl}, %{ic} y %{bytemark}. Otros collaboradores del proyeutu tan llistaos en %{partners}. - intro_3_bytemark: bytemark - intro_3_ic: Imperial College de Londres - intro_3_partners: wiki - intro_3_ucl: Centru de VR de la UCL + intro_2_create_account: Crear una cuenta d'usuariu + intro_2_download: descargar + intro_2_html: Los datos son llibres pa %{download} y %{use} baxo la so %{license}. %{create_account} p'ameyorar el mapa. + intro_2_license: llicencia abierta + intro_2_use: usar license: title: Los datos d'OpenStreetMap tan llicenciaos baxo la Llicencia Xenérica Creative Commons Attribution-Share Alike 2.0 log_in: identificase @@ -955,9 +982,14 @@ ast: title: Sofita OpenStreetMap con un donativu económicu osm_offline: La base de datos d'OpenStreetMap anguaño ta desconectada mentanto se faen trabayos esenciales de mantenimientu de la base de datos. osm_read_only: La base de datos d'OpenStreetMap anguaño ta en mou de sólo llectura mentanto se faen trabayos esenciales de mantenimientu de la base de datos. + partners_bytemark: Bytemark Hosting + partners_html: L'agospiamientu tien l'encontu de %{ucl}, %{ic} y %{bytemark}, y otros %{partners}. + partners_ic: Imperial College de Londres + partners_partners: asociaos + partners_ucl: el Centru de RV de la UCL sign_up: dase d'alta sign_up_tooltip: Crear una cuenta pa editar - sotm2011: ¡Ven a la Conferencia OpenStreetMap 2011, The State of the Map, del 9 al 11 de setiembre en Denver! + sotm2012: ¡Ven a la Conferencia OpenStreetMap 2012, L'Estáu del Mapa, del 6 al 8 de setiembre en Tokio! tag_line: El wikimapamundi llibre user_diaries: Diarios d'usuariu user_diaries_tooltip: Ver los diarios d'usuariu @@ -972,7 +1004,30 @@ ast: english_link: l'orixinal n'inglés text: En casu d'haber un conflictu ente esta páxina traducida y %{english_original_link}, la páxina n'inglés tendrá prioridá title: Tocante a esta traducción - legal_babble: "<h2>Drechos d'autor y llicencia</h2>\n<p>\n OpenStreetMap son <i>datos abiertos (Open Data)</i>, con llicencia <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.es\">Creative Commons Reconocimientu - Compartir igual 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Puedes copiar, distribuir, tresmitir y adautar los nuesos mapes y datos de mou llibre, mentanto yos reconozas a OpenStreetMap y a los sos collaboradores. Si camudes o creas conteníu sobre los nuesos mapes o datos, podrás distribuir el resultáu baxo la mesma llicencia. El <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">códigu llegal completu</a> t'esplica los tos drechos y obligaciones.\n</p>\n\n<h3>Cómo dar reconocimientu a OpenStreetMap</h3>\n<p>\n Si uses les imaxes de mapes d'OpenStreetMap, te pidimos que'l testu de reconocimientu ponga polo menos “© Collaboradores d'OpenStreetMap, CC-BY-SA”. Si sólo vas usar datos del mapa, lo que pidimos ye “Datos del mapa © Collaboradores d'OpenstreetMap, CC-BY-SA”.\n</p>\n<p>\n Onde se pueda, OpenStreetMap tendría d'enllazase a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n y CC-BY-SA a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si tas usando un mediu que nun permita los enllaces (por casu, en trabayos imprentaos), t'encamentamos dirixir a los llectores a www.openstreetmap.org (por exemplu, ampliando ‘OpenStreetMap’ a esta direición completa) y a www.creativecommons.org.\n</p>\n\n<h3>Pa saber más</h3>\n<p>\n Llei más tocante a cómo utilizar los nuesos datos en <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Entrugues y rempuestes llegales</a> (n'inglés).\n</p>\n<p>\n Recordamos a los collaboradores d'OSM qu'enxamás amiesten datos que vengan d'una fonte con drechos d'autor acutaos (p. ex. de Google Maps o mapes impresos) ensin el permisu esplícitu de los dueños de los drechos d'autor.\n</p>\n<p>\n Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros.\n\n Llee la nuesa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política d'usu de la API</a> (n'inglés),\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política d'usu d'imaxes</a> (n'inglés)\n y <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Política d'usu de Nominatim</a> (n'inglés tamién).\n</p>\n\n<h3>Los nuesos collaboradores</h3>\n<p>\n La nuesa llicencia CC-BY-SA requier “reconocer al autor orixinal, de manera razonable pal mediu o los medios que teas utilizando”. Los mapeadores individuales d'OSM nun piden más créditu que “Collaboradores d'OpenStreetMap”, pero cuando s'incluye n'OpenStreetMap información d'un organismu nacional de cartografía o d'otra fuente importante, ye razonable reproducir el so créditu direutamente o enllazar al mesmu nesta páxina.\n</p>\n\n<!--\nInformación pa los editores de la páxina\n\nLa llista darréu incluye sólo les organizaciones que requieren atribución como condición para que los sos datos puedan utilizase n'OpenStreetMap. Nun ye un catálogu xeneral d'importaciones y nun se tien d'utilizar más que cuando se requiera atribución pa cumplir coles condiciones de la llicencia de los datos importaos.\n\n\nCualesquier amiestu a esta llista tien de discutise primero colos alministradores del sistema d'OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Contien datos de barrios basaos en datos de Australian Bureau of\n Statistics.</li>\n <li><strong>Austria</strong>: Contien datos de\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> baxo\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Canadá</strong>: Contien datos de GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), y StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Francia</strong>: Contien datos sacaos de Direction Générale des Impôts.</li>\n <li><strong>Nueva Zelanda</strong>: Contien datos sacaos de Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Polonia</strong>: Contien datos de <a\n href=\"http://ump.waw.pl/\">mapes UMP-pcPL</a>. Copyright collaboradores de\n UMP-pcPL.</li>\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Más tocante al usu n'OSM de datos UMP</a></li>\n <li><strong>South Africa</strong>: Contién datos sacaod de\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, State copyright reserved.</li>\n<li><strong>Reinu Xuníu</strong>: Contien datos de Ordnance Survey © Crown copyright and database right 2010.</li>\n</ul>\n\n<p>\n La inclusión de datos n'OpenStreetMap nun significa que'l fornidor de los datos orixinales sofite OpenStreetMap, ufra garantía dala o aceute dalguna responsabilidá.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: Contien datos de\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (baxo\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> y\nLand Tirol (baxo <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT con enmiendes</a>)." + contributors_au_html: "<strong>Australia</strong>: Contien datos de barrios basaos en datos de Australian Bureau of\nStatistics." + contributors_ca_html: "<strong>Canadá</strong>: Contien datos de GeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), y StatCan (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: "Pa más detalles d'estes, y otres fontes que s'usaron p'ayudar a\nameyorar OpenStreetMap, por favor, llei la <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Páxina\nde los collaboradores</a> na Wiki d'OpenStreetMap." + contributors_footer_2_html: La inclusión de datos n'OpenStreetMap nun significa que'l fornidor de los datos orixinales sofite OpenStreetMap, ufra garantía dala o aceute dalguna responsabilidá. + contributors_fr_html: "<strong>Francia</strong>: Contien datos sacaos de Direction Générale des Impôts." + contributors_gb_html: "<strong>Reinu Xuníu</strong>: Contien datos de Ordnance Survey © Crown copyright and database right 2010." + contributors_intro_html: La nuesa llicencia CC BY-SA requier “reconocer al autor orixinal, de manera razonable pal mediu o los medios que teas utilizando”. Los mapeadores individuales d'OSM nun piden más créditu que “Collaboradores d'OpenStreetMap”, pero cuando s'incluye n'OpenStreetMap información d'un organismu nacional de cartografía o d'otra fuente importante, ye razonable reproducir el so créditu direutamente o enllazar al mesmu nesta páxina. + contributors_nl_html: "<strong>Holanda</strong>: Contien datos © AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nueva Zelanda</strong>: Contien datos sacaos de Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polonia</strong>: Contien datos de <a\nhref=\"http://ump.waw.pl/\">mapes UMP-pcPL</a>. Copyright collaboradores de\nUMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nMás tocante al usu n'OSM de datos UMP</a>" + contributors_title_html: Los nuesos collaboradores + contributors_za_html: "<strong>Sudáfrica</strong>: Contién datos sacaos de\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: Si uses les imaxes de mapes d'OpenStreetMap, te pidimos que'l testu de reconocimientu ponga polo menos “© Collaboradores d'OpenStreetMap, CC BY-SA”. Si sólo vas usar datos del mapa, lo que pidimos ye “Datos del mapa © Collaboradores d'OpenstreetMap, CC BY-SA”. + credit_2_html: "Onde se pueda, OpenStreetMap tendría d'enllazase a <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\ny CC BY-SA a <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si tas usando un mediu que nun permita los enllaces (por casu, en trabayos imprentaos), t'encamentamos dirixir a los llectores a www.openstreetmap.org (por exemplu, ampliando ‘OpenStreetMap’ a esta direición completa) y a www.creativecommons.org." + credit_title_html: Cómo dar reconocimientu a OpenStreetMap + intro_1_html: "OpenStreetMap son <i>datos abiertos (Open Data)</i>, con llicencia <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.es\">Creative Commons Reconocimientu - Compartir igual 2.0</a> (CC BY-SA)." + intro_2_html: Pues copiar, distribuir, tresmitir y adautar los nuesos mapes y datos de mou llibre, mentanto des reconocimientu a OpenStreetMap y a los sos collaboradores. Si camudes o creas conteníu sobre los nuesos mapes o datos, podrás distribuir el resultáu baxo la mesma llicencia. El <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">códigu llegal completu</a> t'esplica los tos drechos y obligaciones. + more_1_html: "Llei más tocante a cómo utilizar los nuesos datos en <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Entrugues y rempuestes llegales</a> (n'inglés)." + more_2_html: Recordamos a los collaboradores d'OSM qu'enxamás amiesten datos que vengan d'una fonte con drechos d'autor acutaos (p. ex. de Google Maps o mapes impresos) ensin el permisu esplícitu de los dueños de los drechos d'autor. + more_3_html: "Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros.\nLlee la nuesa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política d'usu de la API</a> (n'inglés),\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política d'usu d'imaxes</a> (n'inglés)\ny <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Política d'usu de Nominatim</a> (n'inglés tamién)." + more_title_html: Pa saber más + title_html: Drechos d'autor y llicencia native: mapping_link: principiar col mapéu native_link: versión n'asturianu @@ -1018,10 +1073,6 @@ ast: body: Nun hai dengún mensaxe con esa id. heading: Esi mensaxe nun esiste title: Esi mensaxe nun esiste - no_such_user: - body: Nun hai dengún usuariu con esi nome. - heading: Nun esiste l'usuariu - title: Nun esiste l'usuariu outbox: date: Data inbox: buzón @@ -1193,6 +1244,8 @@ ast: allow_write_gpx: xubir traces GPS. allow_write_prefs: camudar les preferencies d'usuariu. authorize_url: "URL d'autorización:" + confirm: ¿Tas seguru? + delete: Desaniciar cliente edit: Editar los detalles key: "Clave del consumidor:" requests: "Pidir los permisos darréu al usuariu:" @@ -1202,6 +1255,37 @@ ast: url: "URL del Token de Solicitú:" update: flash: S'anovó la información del cliente correutamente + redaction: + create: + flash: Se creó la redaición. + destroy: + error: Hebo un error al destruir esta redaición. + flash: Redaición destruyía. + not_empty: La redaición nun ta balera. Por favor desanicia toles versiones que pertenecen a esta redaición enantes de destruila. + edit: + description: Descripción + heading: Editar redaición + submit: Guardar redaición + title: Editar redaición + index: + empty: Nun hai redaiciones qu'amosar + heading: Llista de redaiciones + title: Llista de redaiciones + new: + description: Descripción + heading: Escribir información de la redaición nueva + submit: Crear redaición + title: Crear una redaición nueva + show: + confirm: ¿Tas seguru? + description: "Descripción:" + destroy: Desaniciar esta redaición + edit: Editar esta redaición + heading: Amosando la redaición «%{title}» + title: Amosando redaición + user: "Creador:" + update: + flash: Cambios guardaos. site: edit: anon_edits_link_text: Descubri por qué ye'l casu. @@ -1216,7 +1300,6 @@ ast: index: js_1: O tas usando un restolador ensin sofitu pa JavaScript, o tienes JavaScript desactiváu. js_2: OpenStreetMap usa JavaScript pal so mapa eslizante. - js_3: Seique quieras probar el <a href="http://tah.openstreetmap.org/Browse/">visor de cuadros estáticos Tiles@Home</a> si nun pues activar JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Llicenciao baxo llicencia %{license_name} pol %{project_name} y los sos collaboradores. @@ -1273,7 +1356,7 @@ ast: retail: Área de tiendes runway: - Pista d'aeropuertu - - cai de rodadura + - cai de rodaxe school: - Escuela - universidá @@ -1293,6 +1376,23 @@ ast: unclassified: Carretera ensin clasificar unsurfaced: Carretera ensin asfaltar wood: Viesca + markdown_help: + alt: Testu alternativu + first: Primer elementu + heading: Cabecera + headings: Cabeceres + image: Imaxe + link: Enllaz + ordered: Llista ordenada + second: Segundu elementu + subheading: Cabecera secundaria + text: Testu + title_html: Analizáu con <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Llista ensin ordenar + url: URL + richtext_area: + edit: Editar + preview: Vista previa search: search: Guetar search_help: "exemplos: 'Xixón', 'Cai Uría, Uviéu', 'CB2 5AQ', o 'oficines de correos cerca de Llanes' <a href='http://wiki.openstreetmap.org/wiki/Search'>más exemplos...</a>" @@ -1329,16 +1429,13 @@ ast: visibility: "Visibilidá:" visibility_help: ¿qué ye esto? list: + empty_html: Entá nun hai nada equí. <a href='%{upload_link}'>Carga una nueva traza</a> o deprendi más tocante a cómo trazar col GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página de la wiki</a>. public_traces: Traces GPS públiques public_traces_from: Traces GPS públiques de %{user} tagged_with: " etiquetao con %{tags}" your_traces: Les tos traces GPS make_public: made_public: Traza fecha pública - no_such_user: - body: Lo siento, nun hai dengún usuariu col nome %{user}. Comprueba la escritura o si calcasti nun enllaz enquivocáu, seique. - heading: L'usuariu %{user} nun esiste - title: Nun esiste l'usuariu offline: heading: Almacenamientu GPX desconectáu message: El sistema d'almacenamientu y xuba de ficheros GPX nun ta disponible anguaño. @@ -1377,8 +1474,8 @@ ast: trace_optionals: tags: Etiquetes trace_paging_nav: - next: Siguiente » - previous: « Anterior + newer: Traces más nueves + older: Traces más antigües showing_page: Tas na páxina %{page} view: delete_track: Desaniciar esta traza @@ -1610,7 +1707,7 @@ ast: activate_user: activar esti usuariu add as friend: amestar como amigu ago: (hai %{time_in_words_ago}) - block_history: ver los bloqueos recibíos + block_history: bloqueos recibíos blocks by me: bloqueos puestos blocks on me: bloqueos recibíos comments: comentarios @@ -1636,7 +1733,7 @@ ast: latest edit: "Cabera edición %{ago}:" m away: a %{count}m de distancia mapper since: "Mapeador dende:" - moderator_history: ver los bloqueos puestos + moderator_history: bloqueos puestos my comments: los mios comentarios my diary: el mio diariu my edits: les mios ediciones @@ -1692,7 +1789,6 @@ ast: filter: block_expired: El bloquéu yá caducó y nun se pue editar. block_period: El periodu de bloquéu tien de ser un de los valores presentes na llista estenderexable. - not_a_moderator: Has de ser moderador pa facer esa aición. helper: time_future: Fina en %{time}. time_past: Finó hai %{time}. @@ -1722,11 +1818,14 @@ ast: creator_name: Creador display_name: Usuariu bloquiáu edit: Editar + next: Siguiente » not_revoked: (non desaniciáu) + previous: « Anterior reason: Motivu del bloquéu revoke: ¡Desaniciar! revoker_name: Desaniciáu por show: Amosar + showing_page: Tas na páxina %{page} status: Estáu period: one: 1 hora diff --git a/config/locales/be-TARASK.yml b/config/locales/be-Tarask.yml similarity index 89% rename from config/locales/be-TARASK.yml rename to config/locales/be-Tarask.yml index 5ddd4ccbd..8e53a81b7 100644 --- a/config/locales/be-TARASK.yml +++ b/config/locales/be-Tarask.yml @@ -1,11 +1,11 @@ -# Messages for Belarusian (TaraÅ¡kievica orthography) (‪Беларуская (тарашкевіца)‬) +# Messages for Belarusian (TaraÅ¡kievica orthography) (‪беларуская (тарашкевіца)‬) # Exported from translatewiki.net # Export driver: syck-pecl # Author: EugeneZelenko # Author: Jim-by # Author: Red Winged Duck # Author: Wizardist -be-TARASK: +be-Tarask: activerecord: attributes: diary_comment: @@ -84,7 +84,6 @@ be-TARASK: changeset: changeset: "Набор зьменаў: %{id}" changesetxml: Набор зьменаў у фармаце XML - download: Загрузіць %{changeset_xml_link} ці %{osmchange_xml_link} feed: title: Набор зьменаў %{id} title_comment: Набор зьменаў %{id} - %{comment} @@ -146,7 +145,6 @@ be-TARASK: next_changeset_tooltip: Наступнае рэдагаваньне %{user} prev_changeset_tooltip: Папярэдняе рэдагаваньне %{user} node: - download: "%{download_xml_link}, %{view_history_link} ці %{edit_link}" download_xml: Загрузіць XML edit: рэдагаваць node: Вузел @@ -156,7 +154,6 @@ be-TARASK: coordinates: "Каардынаты:" part_of: "Частка:" node_history: - download: "%{download_xml_link} ці %{view_details_link}" download_xml: Загрузіць XML node_history: Гісторыя вузла node_history_title: "Гісторыя пункту: %{node_name}" @@ -172,20 +169,18 @@ be-TARASK: of: з showing_page: Паказ старонкі relation: - download: "%{download_xml_link} ці %{view_history_link}" download_xml: Загрузіць XML relation: Адносіны relation_title: "Адносіны: %{relation_name}" - view_history: паказаць гісторыю + view_history: Праглядзець гісторыю relation_details: members: "Элемэнты:" part_of: "Частка:" relation_history: - download: "%{download_xml_link} ці %{view_details_link}" download_xml: Загрузіць XML relation_history: Гісторыя сувязі relation_history_title: "Гісторыя сувязі: %{relation_name}" - view_details: паказаць падрабязнасьці + view_details: Праглядзець падрабязнасьці relation_member: entry_role: "%{type} %{name} як %{role}" type: @@ -197,7 +192,7 @@ be-TARASK: view_data: Паказаць зьвесткі для цяперашняга выгляду мапы start_rjs: data_frame_title: Зьвесткі - data_layer_name: Зьвесткі + data_layer_name: Праглядзець зьвесткі мапы details: Падрабязнасьці drag_a_box: Расьцягніце рамку для выбару абшару edited_by_user_at_timestamp: Рэдагаваны [[user]] у [[timestamp]] @@ -243,7 +238,6 @@ be-TARASK: relation: адносіны way: дарога way: - download: "%{download_xml_link}, %{view_history_link} ці %{edit_link}" download_xml: Загрузіць XML edit: рэдагаваць view_history: паказаць гісторыю @@ -256,7 +250,6 @@ be-TARASK: nodes: "Вузлы:" part_of: "Частка:" way_history: - download: "%{download_xml_link} ці %{view_details_link}" download_xml: Загрузіць XML view_details: паказаць падрабязнасьці way_history: Гісторыя зьменаў дарогі @@ -360,10 +353,6 @@ be-TARASK: body: Прабачце, няма запісу ў дзёньніку ці камэнтара з ідэнтыфікатарам %{id}. Калі ласка, праверце дакладнасьць напісаньня, ці, магчыма, спасылка па якой Вы перайшлі, няслушная. heading: Няма запісу з ідэнтыфікатарам %{id} title: Няма такога запісу ў дзёньніку - no_such_user: - body: Прабачце, няма карыстальніка з іменем %{user}. Калі ласка, праверце дакладнасьць напісаньня, ці, магчыма, спасылка па якой Вы перайшлі, няслушная. - heading: Карыстальнік %{user} не існуе - title: Няма такога карыстальніка view: leave_a_comment: Пакінуць камэнтар login: Увайдзіце @@ -453,6 +442,7 @@ be-TARASK: search_osm_nominatim: prefix: amenity: + WLAN: Доступ да WiFi airport: Аэрапорт arts_centre: Мастацкі цэнтар atm: Банкамат @@ -545,37 +535,8 @@ be-TARASK: youth_centre: Моладзевы цэнтар boundary: administrative: Адміністрацыйная мяжа - building: - apartments: Шматкватэрны дом - block: Квартал - bunker: Бункер - chapel: Капліца - church: Царква - city_hall: Мэрыя - commercial: Камэрцыйны будынак - dormitory: Інтэрнат - entrance: Уваход у будынак - faculty: Факультэцкі будынак - farm: Фэрма - flats: Кватэры - garage: Гараж - hall: Хол - hospital: Будынак шпіталю - hotel: Гатэль - house: Дом - industrial: Прамысловы будынак - office: Офісны будынак - public: Грамадзкі будынак - residential: Жылы будынак - retail: Будынак розьнічнага гандлю - school: Школа - shop: Крама - stadium: Стадыён - store: Сховішча - terrace: Шэраг жылых дамоў - tower: Вежа - train_station: Чыгуначная станцыя - university: Унівэрсытэт + national_park: Нацыянальны парк + protected_area: Ахоўная зона highway: bridleway: Дарога для коней bus_guideway: Аўтобусная паласа @@ -583,11 +544,9 @@ be-TARASK: byway: Завулак construction: Будаўніцтва дарогі cycleway: Роварная дарожка - distance_marker: Кілямэтровы слуп emergency_access_point: Пункт хуткай дапамогі footway: Пешаходная сьцежка ford: Брод - gate: Брама living_street: Жыльлёвая зона minor: Другасная дарога motorway: Аўтастрада @@ -652,25 +611,26 @@ be-TARASK: meadow: Луг military: Вайсковая тэрыторыя mine: Капальня - mountain: Гара nature_reserve: Запаведнік park: Парк piste: Лыжня - plaza: Рынкавая плошча quarry: Кар’ер railway: Чыгунка recreation_ground: Зона адпачынку reservoir: Вадасховішча residential: Жылы раён retail: Тэрыторыя дробнага гандлю + road: Зона дарожнай сеткі village_green: Гарадзкі парк vineyard: Вінаграднік wetland: Забалочаная зямля wood: Лес leisure: beach_resort: Пляжны курорт + bird_hide: Пункт назіраньня за птушкамі common: Грамадзкая зямля fishing: Месца для рыбнай лоўлі + fitness_station: Фітнэс-станцыя garden: Сад golf_course: Поле для гольфу ice_rink: Коўзанка @@ -694,11 +654,12 @@ be-TARASK: cave_entrance: Уваход у пячору channel: Канал cliff: Абрыў - coastline: Узьбярэжжа crater: Кратэр + dune: Дзюна feature: Аб’ект fell: Узвышша fjord: Фіёрд + forest: Лес geyser: Гейзэр glacier: Ледавік heath: Пусташ @@ -718,6 +679,7 @@ be-TARASK: scrub: Хмызьняк shoal: Плыткаводзьдзе spring: Крыніца + stone: Камень strait: Пратока tree: Дрэва valley: Даліна @@ -726,6 +688,14 @@ be-TARASK: wetland: Забалочаная зямля wetlands: Забалочаныя землі wood: Лес + office: + accountant: Бугальтар + architect: Архітэктар + company: Кампанія + employment_agency: Служба занятасьці + estate_agent: Агет па продажу нерухомасьці + government: Дзяржаўная ўстанова + insurance: Страхавое бюро place: airport: Аэрапорт city: Горад @@ -737,6 +707,7 @@ be-TARASK: houses: Дамы island: Выспа islet: Выспачка + isolated_dwelling: Ізаляванае жытло locality: Населены пункт moor: Тарфянік municipality: Муніцыпалітэт @@ -760,6 +731,7 @@ be-TARASK: junction: Чыгуначны вузел level_crossing: Чыгуначны пераезд light_rail: Лінія для лёгкага чыгуначнага транспарту + miniature: Мініятурная чыгунка monorail: Манарэльс narrow_gauge: Вузкакалейка platform: Чыгуначная плятформа @@ -774,7 +746,7 @@ be-TARASK: yard: Чыгуначнае дэпо shop: alcohol: Алькагольная крама - apparel: Крама адзеньня + antiques: Антыкварыят art: Мастацкі салён bakery: Пякарня beauty: Салён прыгажосьці @@ -783,7 +755,6 @@ be-TARASK: books: Кніжная крама butcher: Мясная крама car: Аўтамабільны салён - car_dealer: Аўтамабільны салён car_parts: Крама аўтамабільных запчастак car_repair: Аўтамабільная майстэрня carpet: Дывановая крама @@ -798,7 +769,6 @@ be-TARASK: department_store: Унівэрсальная крама discount: Крама тавараў са зьніжкамі doityourself: Зрабі сам - drugstore: Аптэка dry_cleaning: Хімчыстка electronics: Крама электронікі estate_agent: Агенцтва нерухомасьці @@ -864,7 +834,10 @@ be-TARASK: valley: Даліна viewpoint: Аглядальная пляцоўка zoo: Заапарк + tunnel: + "yes": Тунэль waterway: + artificial: Штучны водны шлях boatyard: Майстэрня караблёў canal: Канал connector: Злучэньне водных шляхоў @@ -919,12 +892,12 @@ be-TARASK: history: Гісторыя home: дамоў home_tooltip: Паказаць маё месцазнаходжаньне - inbox: уваходныя (%{count}) intro_1: OpenStreetMap — вольная мапа ўсяго сьвету, якую магчыма рэдагаваць. Яе ствараюць такія ж людзі, як Вы. - intro_2: OpenStreetMap дазваляе Вам праглядаць, рэдагаваць і выкарыстоўваць геаграфічныя зьвесткі ў любым месцы на Зямлі. - intro_3: Хостынг для OpenStreetMap ветліва прадстаўлены %{ucl}, %{ic} і %{bytemark}. Іншыя партнэры праекту пералічаныя на %{partners}. - intro_3_ic: Імпэрскі Каледж Лёндана - intro_3_partners: вікі + intro_2_create_account: Стварыце рахунак + intro_2_download: загрузіць + intro_2_html: Зьвесткі зьяўляюцца вольнымі для %{download} і %{use} на ўмовах %{license}. %{create_account} каб зьмяняць мапу. + intro_2_license: вольнай ліцэнзіі + intro_2_use: выкарыстаньні license: title: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Creative Commons Attribution-Share Alike 2.0 Generic log_in: увайсьці @@ -938,9 +911,11 @@ be-TARASK: title: Падтрымаць OpenStreetMap грашовым ахвяраваньнем osm_offline: База зьвестак OpenStreetMap у цяперашні момант недаступная, таму што праводзяцца неабходныя тэхнічныя работы. osm_read_only: База зьвестак OpenStreetMap у цяперашні момант даступная толькі для чытаньня, таму што праводзяцца неабходныя тэхнічныя работы. + partners_html: Гостынг падтрымліваецца %{ucl}, %{ic} і %{bytemark}, і іншымі %{partners}. + partners_ic: Лёнданскім імпэрскім каледжам + partners_ucl: UCL VR Centre sign_up: зарэгістравацца sign_up_tooltip: Стварыць рахунак для рэдагаваньня - sotm2011: Наведайце канфэрэнцыю OpenStreetMap 2011 «The State of the Map», 9-11 верасьня ў Дэнвэры! tag_line: Вольная Wiki-мапа сьвету user_diaries: Дзёньнікі карыстальнікаў user_diaries_tooltip: Паказаць дзёньнікі карыстальнікаў @@ -955,7 +930,27 @@ be-TARASK: english_link: арыгінальная ангельская вэрсія text: У выпадку канфлікту паміж гэтай перакладзенай старонкай і %{english_original_link}, старонка на ангельскай мове павінна мець перавагу title: Пра гэты пераклад - legal_babble: "<h2>Аўтарскія правы і ліцэнзія</h2>\n<p>\n OpenStreetMap прадстаўляе <i>вольныя зьвесткі</i>, на ўмовах ліцэнзіі <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя мапы\n і зьвесткі, да той пары, пакуль Вы спасылаецеся на OpenStreetMap і яе\n ўдзельнікаў. Калі Вы зьмяняеце ці выкарыстоўваеце нашыя мапы і зьвесткі, Вы можаце \n распаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст ліцэнзіі\n <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n code</a> растлумачыць Вам правы і адказнасьці.\n</p>\n\n<h3>Як спасылацца на OpenStreetMap</h3>\n<p>\n Калі Вы выкарыстоўваеце выявы мапаў OpenStreetMap, мы патрабуем, каб\n Вы рабілі спасылку хаця б “© удзельнікі OpenStreetMap\n , CC-BY-SA”. Калі Вы выкарыстоўваеце толькі картаграфічныя зьвесткі,\n мы патрабуем наяўнасьць “Картаграфічныя зьвесткі © Удзельнікі OpenStreetMap,\n CC-BY-SA”.\n</p>\n\n<p>\n Дзе магчыма, павінна быць гіпэр-спасылка на OpenStreetMap <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n і на CC-BY-SA <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Калі\n Вы выкарыстоўваеце носьбіты, дзе выкарыстаньне спасылак немагчымае (напр. \n друкаваныя працы), мы прапануем накіроўваць Вашым чытачоў на\n www.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу\n ‘OpenStreetMap’) і на\n www.creativecommons.org.\n</p>\n\n<h3>Даведацца болей</h3>\n<p>\n Даведайцеся болей пра выкарыстаньне нашых зьвестак на <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">старонцы адказаў\n і пытаньняў</a>.\n</p>\n<p>\n Удзельнікі OSM павінны памятаць пра тое, што забаронена дадаваць зьвесткі\n з любых крыніцаў абароненых аўтарскім правам (напрыклад, Google Maps ці друкаваных мапаў)\n без папярэдняга дазволу ўладальнікаў аўтарскіх правоў.\n</p>\n<p>\n Ня гледзячы на тое, што OpenStreetMap утрымлівае вольныя зьвесткі, мы ня можам\n дазволіць бясплатны API да нашых мапаў для староньніх распрацоўшчыкаў.\n\n Глядзіце нашыя <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Умовы выкарыстаньня</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Умовы выкарыстаньня частак мапаў</a>\n і <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Умовы выкарыстаньня Nominatim</a>.\n</p>\n\n<h3>Нашыя ўдзельнікі</h3>\n<p>\n Нашая ліцэнзія CC-BY-SA патрабуе ад Вас “падаць арыгінальнага аўтара \n у адпаведнасьці з асаблівасьцямі носьбітаў інфармацыі ці іншых выкарыстоўваемых сродкаў\n ”. Звычайныя ўдзельнікі OSM не патрабуюць пазначэньня аўтарства\n болей чым “удзельнікі OpenStreetMap\n ”, але ў OpenStreetMap ёсьць зьвесткі з нацыянальных \n картаграфічных агенцтваў ці іншых падобных крыніцаў, \n таму, магчыма, мае сэнс спасылацца непасрэдна на іх\n як на крыніцу, ці дадаць спасылку на гэтую старонку.\n</p>\n\n<!--\nІнфармацыя для рэдактараў\n\nДалей знаходзяцца сьпісы толькі тых арганізацыяў, якія патрабуюць спасылкі\nна сваё аўтарства, як умова выкарыстаньня іх зьвестак у OpenStreetMap. \nГэта не агульны каталёг імпартаваных зьвестак, і ён не павінен выкарыстоўвацца,\nза выключэньнем калі паданьне аўтарства зьяўляецца ўмовай ліцэнзіі\nна імпартаваныя зьвесткі.\n\nЛюбыя дапаўненьні павінны быць абмеркаваныя, спачатку, з сыстэмнымі адміністратарамі OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Аўстралія</strong>: Утрымлівае зьвесткі пра прыгарады ад\n Аўстралійскага бюро статыстыкі.</li>\n <li><strong>Аўстрыя</strong>: Утрымлівае зьвесткі\n <a href=\"http://data.wien.gv.at/\">горада Вены</a> на ўмовах\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Канада</strong>: Утрымлівае зьвесткі\n GeoBase®, GeoGratis (© Дэпартамэнта прыродных рэсурсаў\n Канады), CanVec (© Дэпартамэнта прыродных рэсурсаў\n Канады), і StatCan (Статыстычнага падразьдзяленьня Канады).</li>\n <li><strong>Францыя</strong>: Утрымлівае зьвесткі\n Галоўнага падатковага ўпраўленьня.</li>\n <li><strong>Новая Зэляндыя</strong>: Утрымлівае зьвесткі пра\n зямельныя рэсурсы Новай Зэляндыі. Crown Copyright reserved.</li>\n <li><strong>Польшча</strong>: Утрымлівае зьвесткі з <a\n href=\"http://ump.waw.pl/\">мапы UMP-pcPL</a>. Copyright\n удзельнікі UMP-pcPL.</li>\n <li><strong>Вялікабрытанія</strong>: Утрымлівае зьвесткі Ordnance \n Survey © Crown copyright and database right\n 2010.</li>\n</ul>\n\n<p>\n Уключэньне зьвестак у OpenStreetMap не азначае, што пастаўшчыкі пачатковых зьвестак\n якім-небудзь чынам падтрымліваюць OpenStreetMap, прадстаўляюць гарантыі, ці\n прымаюць на сябе якую-небудзь адказнасьць.\n</p>" + legal_babble: + contributors_at_html: "<strong>Аўстрыя</strong>: Утрымлівае зьвесткі\n<a href=\"http://data.wien.gv.at/\">горада Вены</a> на ўмовах\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>." + contributors_au_html: "<strong>Аўстралія</strong>: Утрымлівае зьвесткі пра прыгарады ад\nАўстралійскага бюро статыстыкі." + contributors_ca_html: "<strong>Канада</strong>: Утрымлівае зьвесткі\nGeoBase®, GeoGratis (© Дэпартамэнта прыродных рэсурсаў\nКанады), CanVec (© Дэпартамэнта прыродных рэсурсаў\nКанады), і StatCan (Статыстычнага падразьдзяленьня Канады)." + contributors_footer_2_html: "Уключэньне зьвестак у OpenStreetMap не азначае, што пастаўшчыкі пачатковых зьвестак\nякім-небудзь чынам падтрымліваюць OpenStreetMap, прадстаўляюць гарантыі, ці\nпрымаюць на сябе якую-небудзь адказнасьць." + contributors_fr_html: "<strong>Францыя</strong>: Утрымлівае зьвесткі\nГалоўнага падатковага ўпраўленьня." + contributors_gb_html: "<strong>Вялікабрытанія</strong>: Утрымлівае зьвесткі Ordnance\nSurvey © Crown copyright and database right\n2010." + contributors_intro_html: "Нашая ліцэнзія CC BY-SA патрабуе ад Вас “падаць арыгінальнага аўтара\nу адпаведнасьці з асаблівасьцямі носьбітаў інфармацыі ці іншых выкарыстоўваемых сродкаў\n”. Звычайныя ўдзельнікі OSM не патрабуюць пазначэньня аўтарства\nболей чым “удзельнікі OpenStreetMap\n”, але ў OpenStreetMap ёсьць зьвесткі з нацыянальных\nкартаграфічных агенцтваў ці іншых падобных крыніцаў,\nтаму, магчыма, мае сэнс спасылацца непасрэдна на іх\nяк на крыніцу, ці дадаць спасылку на гэтую старонку." + contributors_nz_html: "<strong>Новая Зэляндыя</strong>: Утрымлівае зьвесткі пра\nзямельныя рэсурсы Новай Зэляндыі. Crown Copyright reserved." + contributors_pl_html: "<strong>Польшча</strong>: Утрымлівае зьвесткі з <a\nhref=\"http://ump.waw.pl/\">мапы UMP-pcPL</a>. Copyright\nудзельнікі UMP-pcPL." + contributors_title_html: Нашыя ўдзельнікі + credit_1_html: "Калі Вы выкарыстоўваеце выявы мапаў OpenStreetMap, мы патрабуем, каб\nВы рабілі спасылку хаця б “© удзельнікі OpenStreetMap\n, CC BY-SA”. Калі Вы выкарыстоўваеце толькі картаграфічныя зьвесткі,\nмы патрабуем наяўнасьць “Картаграфічныя зьвесткі © Удзельнікі OpenStreetMap,\nCC BY-SA”." + credit_2_html: "Дзе магчыма, павінна быць гіпэр-спасылка на OpenStreetMap <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nі на CC BY-SA <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Калі\nВы выкарыстоўваеце носьбіты, дзе выкарыстаньне спасылак немагчымае (напр.\nдрукаваныя працы), мы прапануем накіроўваць Вашым чытачоў на\nwww.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу\n‘OpenStreetMap’) і на\nwww.creativecommons.org." + credit_title_html: Як спасылацца на OpenStreetMap + intro_1_html: "OpenStreetMap прадстаўляе <i>вольныя зьвесткі</i>, на ўмовах ліцэнзіі <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC BY-SA)." + intro_2_html: "Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя мапы\nі зьвесткі, да той пары, пакуль Вы спасылаецеся на OpenStreetMap і яе\nўдзельнікаў. Калі Вы зьмяняеце ці выкарыстоўваеце нашыя мапы і зьвесткі, Вы можаце\nраспаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст ліцэнзіі\n<a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\ncode</a> растлумачыць Вам правы і адказнасьці." + more_1_html: "Даведайцеся болей пра выкарыстаньне нашых зьвестак на <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">старонцы адказаў\nі пытаньняў</a>." + more_2_html: "Удзельнікі OSM павінны памятаць пра тое, што забаронена дадаваць зьвесткі\nз любых крыніцаў абароненых аўтарскім правам (напрыклад, Google Maps ці друкаваных мапаў)\nбез папярэдняга дазволу ўладальнікаў аўтарскіх правоў." + more_3_html: "Ня гледзячы на тое, што OpenStreetMap утрымлівае вольныя зьвесткі, мы ня можам\nдазволіць бясплатны API да нашых мапаў для староньніх распрацоўшчыкаў.\nГлядзіце нашыя <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Умовы выкарыстаньня</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Умовы выкарыстаньня частак мапаў</a>\nі <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Умовы выкарыстаньня Nominatim</a>." + more_title_html: Даведацца болей + title_html: Аўтарскія правы і ліцэнзія native: mapping_link: пачаць стварэньне мапы native_link: беларускай вэрсіі @@ -995,10 +990,6 @@ be-TARASK: body: Прабачце, няма паведамленьня з такім ідэнтыфікатарам. heading: Няма такога паведамленьня title: Няма такога паведамленьня - no_such_user: - body: Прабачце, удзельніка з такім іменем няма. - heading: Няма такога ўдзельніка - title: Няма такога карыстальніка outbox: date: Дата inbox: уваходзячыя @@ -1190,7 +1181,6 @@ be-TARASK: index: js_1: Вы карыстаецеся браўзэрам, які не падтрымлівае ці мае забаронены JavaScript. js_2: OpenStreetMap выкарыстоўвае JavaScript для паказу мапы. - js_3: Вы можаце паспрабаваць <a href="http://tah.openstreetmap.org/Browse/">статычную мапу Tiles@Home</a>, калі ня можаце дазволіць JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Даступна на ўмовах ліцэнзіі %{license_name}, аўтарскія правы належаць %{project_name} і яго ўдзельнікам. @@ -1309,10 +1299,6 @@ be-TARASK: your_traces: Вашыя GPS-трэкі make_public: made_public: Трэк зроблены публічным - no_such_user: - body: Прабачце, няма ўдзельніка з імем %{user}. Калі ласка, праверце дакладнасьць напісаньня, ці, магчыма, спасылка па якой Вы перайшлі, няслушная. - heading: Удзельнік %{user} не існуе - title: Няма такога ўдзельніка offline: heading: GPX-сховішча адключанае message: Сховішча GPX-файлаў і сыстэма іх загрузкі, у цяперашні момант, недаступная. @@ -1351,8 +1337,6 @@ be-TARASK: trace_optionals: tags: Тэгі trace_paging_nav: - next: Наступная » - previous: « Папярэдняя showing_page: Паказаная старонка %{page} view: delete_track: Выдаліць гэты трэк @@ -1663,7 +1647,6 @@ be-TARASK: filter: block_expired: Блякаваньне ўжо скончылася і ня можа рэдагавацца. block_period: Час блякаваньня павінен быць выбраны са значэньняў з разгортваемага сьпісу. - not_a_moderator: Вам трэба быць мадэратарам каб выканаць гэтае дзеяньне. helper: time_future: Канчаецца ў %{time}. time_past: Скончылася %{time} таму. diff --git a/config/locales/br.yml b/config/locales/br.yml index 4c6d6dcfb..6c3a73d4f 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -1,8 +1,9 @@ -# Messages for Breton (Brezhoneg) +# Messages for Breton (brezhoneg) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Fohanno # Author: Fulup +# Author: Nemo bis # Author: Y-M D br: activerecord: @@ -76,6 +77,8 @@ br: application: require_cookies: cookies_needed: Diweredekaet eo an toupinoù ganeoc'h war a seblant - gweredekait an toupinoù en ho merdeer a-raok mont pelloc'h, mar plij. + require_moderator: + not_a_moderator: Ret eo deoc'h bezañ habaskaer evit kas an ober-mañ da benn. setup_user_auth: blocked: Stanket eo bet ho moned d'an API. Kevreit ouzh an etrefas web evit gouzout hiroc'h. need_to_see_terms: Evit ar mare n'oc'h ket aotreet da vont war an API ken. Kevreit d'an etrefas Web da sellet ouzh Termenoù an implijerien. Marteze ne viot ket a-du ganto met ret eo deoc'h bezañ lennet anezho. @@ -83,7 +86,6 @@ br: changeset: changeset: "Strollad kemmoù : %{id}" changesetxml: Strollad kemmoù XML - download: Pellgargañ %{changeset_xml_link} pe %{osmchange_xml_link} feed: title: Strollad kemmoù %{id} title_comment: Strollad kemmoù %{id} - %{comment} @@ -145,7 +147,6 @@ br: next_changeset_tooltip: Aozadenn da-heul gant %{user} prev_changeset_tooltip: Aozadenn gent gant %{user} node: - download: "%{download_xml_link}, %{view_history_link} pe %{edit_link}" download_xml: Pellgargañ XML edit: aozañ node: Skoulm @@ -155,7 +156,6 @@ br: coordinates: "Daveennoù :" part_of: "Lodenn eus :" node_history: - download: "%{download_xml_link} pe %{view_details_link}" download_xml: Pellgargañ XML node_history: Istor ar skoulmoù node_history_title: "Istor ar skoulm : %{node_name}" @@ -170,8 +170,12 @@ br: paging_nav: of: eus showing_page: O tiskouez ar bajenn + redacted: + type: + node: skoulm + relation: darempred + way: hent relation: - download: "%{download_xml_link} pe %{view_history_link}" download_xml: Pellgargañ XML relation: Darempred relation_title: "Darempred : %{relation_name}" @@ -180,7 +184,6 @@ br: members: "Izili :" part_of: "Lodenn eus :" relation_history: - download: "%{download_xml_link} pe %{view_details_link}" download_xml: Pellgargañ XML relation_history: Istor an darempred relation_history_title: "Istor an darempred : %{relation_name}" @@ -196,7 +199,7 @@ br: view_data: Gwelet ar roadennoù evit gwel red ar gartenn start_rjs: data_frame_title: Roadennoù - data_layer_name: Roadennoù + data_layer_name: Furchal e roadennoù ar gartenn details: Munudoù drag_a_box: Tresit ur voest war ar gartenn evit diuzañ un takad edited_by_user_at_timestamp: Aozet gant [[user]] da [[timestamp]] @@ -242,7 +245,6 @@ br: relation: darempred way: hent way: - download: "%{download_xml_link}, %{view_history_link} pe %{edit_link}" download_xml: Pellgargañ XML edit: aozañ view_history: gwelet an istor @@ -255,7 +257,6 @@ br: nodes: "Skoulmoù :" part_of: "Lodenn eus :" way_history: - download: "%{download_xml_link} pe %{view_details_link}" download_xml: Pellgargañ XML view_details: gwelet ar munudoù way_history: Istor an hent @@ -280,7 +281,7 @@ br: saved_at: Enrollet da user: Implijer list: - description: Kemmoù graet nevez zo + description: Kemmoù diwezhañ description_bbox: Strolladoù kemmoù e-barzh %{bbox} description_friend: Hollad ar c'hemmoù degaset gant ho mignoned description_nearby: Hollad kemmoù deuet gant an implijerien a-dost @@ -301,6 +302,13 @@ br: timeout: sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet. diary_entry: + comments: + ago: "%{ago} zo" + comment: Evezhiadenn + newer_comments: Evezhiadennoù nevesañ + older_comments: Evezhiadennoù koshañ + post: Postañ + when: Peur diary_comment: comment_from: Addispleg gant %{link_user} d'an %{comment_created_at} confirm: Kadarnaat @@ -358,10 +366,6 @@ br: body: Ho tigarez, n'eus enmoned deizlevr ebet nag addsiqpleg ebet gant an id %{id}. Gwiriit hag-eñ eo skrivet mat, pe marteze hoc'h eus kliket war ul liamm fall. heading: "Enmoned ebet gant an id : %{id}" title: Enmoned ebet evel-se en deizlevr - no_such_user: - body: Ho tigarez, n'eus implijer ebet en anv %{user}. Gwiriit hag-eñ eo skrivet mat, pe marteze hoc'h eus kliket war ul liamm fall. - heading: N'eus ket eus an implijer %{user} - title: N'eus implijer ebet evel-se view: leave_a_comment: Lezel un addispleg login: Kevreañ @@ -394,6 +398,7 @@ br: licence: Aotre implijout longitude: "Hed. :" manually_select: Diuzañ un takad disheñvel gant an dorn + map_image: Skeudenn gartenn (diskouez ur gwiskad boutin) max: d'ar muiañ options: Dibarzhioù osm_xml_data: Roadennoù XML OpenStreetMap @@ -454,16 +459,27 @@ br: suffix_place: " %{distance} %{direction} diouzh %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Nijva + gate: Dor + helipad: biñsporzh + runway: Pistenn + taxiway: Roudenn evit an taksioù + terminal: Termenva amenity: + WLAN: Moned WiFi airport: Aerborzh arts_centre: Kreizenn arz + artwork: Oberenn arz atm: Bilhedaouer auditorium: Selaouva bank: Ti-bank bar: Tavarn + bbq: Regezer bench: Skaoñ bicycle_parking: Parklec'h evit ar beloioù bicycle_rental: Feurmiñ beloioù + biergarten: Liorzh ar bier brothel: Bordel bureau_de_change: Burev eskemm bus_station: Arsav bus @@ -472,6 +488,7 @@ br: car_sharing: Leur genweturañ car_wash: Gwalc'hiñ kirri casino: Kazino + charging_station: Savlec'h adkargañ cinema: Sinema clinic: Klinikenn club: Klub @@ -530,9 +547,12 @@ br: shelter: Gwasked shop: Stal shopping: Prenadennoù + shower: Strinkadenn + social_centre: Kreizenn sokial social_club: Klub sokial studio: Studio supermarket: Gourmarc'had + swimming_pool: Poull-neuial taxi: Taksi telephone: Pellgomzer foran theatre: C'hoariva @@ -547,37 +567,16 @@ br: youth_centre: Kreizenn evit ar re yaouank boundary: administrative: Bevennoù melestradurel + national_park: Park broadel + protected_area: Takad gwarezet + bridge: + aqueduct: Dourbont + suspension: Pont-skourr + swing: Pont-tro + viaduct: Karrbont + "yes": Pont building: - apartments: Kendi - block: Kendi - bunker: Bunker - chapel: Chapel - church: Iliz - city_hall: Ti-kêr - commercial: Savadur kenwerzhel - dormitory: Kouskva - entrance: Antre ar savadur - faculty: Kevrenn skol-veur - farm: Ti feurm - flats: Ranndioù - garage: Karrdi - hall: Sal - hospital: Savadur ospital - hotel: Leti - house: Ti - industrial: Savadur greantel - office: Savadur burevioù - public: Savadur foran - residential: Savadur annez - retail: Stal - school: Savadur skol - shop: Stal - stadium: Stad - store: Stal - terrace: Savenn - tower: Tour - train_station: Porzh-houarn - university: Savadur Skol-Veur + "yes": Savadur highway: bridleway: Hent evit ar varc'hegerien bus_guideway: Roudenn vus heñchet @@ -585,11 +584,9 @@ br: byway: Hent eil renk construction: Chanter gourhent cycleway: Roudenn divrodegoù - distance_marker: Bonn kilometrek emergency_access_point: Poent moned trummadoù footway: Gwenodenn evit an droadeien ford: Roudour - gate: Dor living_street: Straed annez minor: Hent dister motorway: Gourhent @@ -602,14 +599,17 @@ br: primary_link: Pennhent raceway: Redva residential: Takad annezet + rest_area: Leur diskuizh road: Hent secondary: Hent eil renk secondary_link: Hent a eil renk service: Hent servij services: Servijoù gourhent + speed_camera: Radar tizh steps: Diri stile: Skalier tertiary: Hent trede renk + tertiary_link: Hent trede renk track: Roudenn trail: Roudenn trunk: Hent-tizh @@ -623,6 +623,7 @@ br: building: Savadur castle: Kastell church: Iliz + fort: Kreñv house: Ti icon: Arlun manor: Maner @@ -647,6 +648,7 @@ br: farmland: Douaroù-labour farmyard: Mereuri forest: Koadeg + garages: Karrdioù grass: Geot greenfield: Tachenn da sevel tiez industrial: Takad greantel @@ -654,23 +656,24 @@ br: meadow: Prad military: Takad milourel mine: Mengleuz - mountain: Menez nature_reserve: Gwarezva natur + orchard: Gwerje park: Park piste: Roudenn - plaza: Plasenn quarry: Mengleuz railway: Hent-houarn recreation_ground: Leur c'hoari reservoir: Mirlenn residential: Takad annez retail: Kenwerzhioù + road: Takad hent village_green: Takad natur foran vineyard: Gwinieg wetland: Takad gleborek wood: Koad leisure: beach_resort: Kêr-gouronkañ + bird_hide: Bod evned common: Tachennoù foran fishing: Takad pesketa garden: Liorzh @@ -683,12 +686,17 @@ br: pitch: Tachenn sport playground: Tachenn c'hoari recreation_ground: Tachenn c'hoari + sauna: Saona slipway: Kal sports_centre: Kreizenn sport stadium: Stad swimming_pool: Poull-neuial track: Roudenn redek water_park: Kreizenn dour + military: + airfield: Nijva milourel + barracks: Kazarn + bunker: Bunker natural: bay: Bae beach: Traezhenn @@ -696,11 +704,12 @@ br: cave_entrance: Treuzoù mougev channel: Kanol cliff: Tornaod - coastline: Arvor crater: Krater + dune: Tevenn feature: Elfenn fell: Fell fjord: Fjord + forest: Koadeg geyser: Geiser glacier: Skorneg heath: Brug @@ -720,6 +729,7 @@ br: scrub: Strouezh shoal: Klosenn spring: Lamm-dour + stone: Roc'h strait: Strizh-mor tree: Gwezenn valley: Traoñienn @@ -728,6 +738,19 @@ br: wetland: Takad gleborek wetlands: Takadoù gleborek wood: Koad + office: + accountant: Kontour + architect: Ti-savour + company: Embregerezh + employment_agency: Ajañs evit al labour + estate_agent: Kourater tiez + government: Ajañs c'houarnamantel + insurance: Ajañs asurañsoù + lawyer: Alvokad + ngo: Burev un AMG (aozadur e-maez gouarnamant) + telecommunication: Burev pellgehentiñ + travel_agent: Ajañs-veaj + "yes": Burev place: airport: Aerborzh city: Meurgêr @@ -739,6 +762,7 @@ br: houses: Tiez island: Enez islet: Enezennig + isolated_dwelling: Ti distro locality: Kêr moor: Lanneg municipality: Kumun @@ -762,6 +786,7 @@ br: junction: Kej hent-houarn level_crossing: Treuzenn hent-houarn light_rail: Hent-houarn bihan + miniature: Hentig-houarn monorail: Hent-houarn unroud narrow_gauge: Hent-houarn strizh platform: Savenn hent-houarn @@ -776,7 +801,7 @@ br: yard: Gar-dibab shop: alcohol: Gwezher alkool - apparel: Stal dilhad + antiques: Hendraezoù art: Stal arz bakery: Baraerezh beauty: Stal produioù kened @@ -785,7 +810,6 @@ br: books: Levrdi butcher: Kiger car: Stal girri - car_dealer: Gwerzher kirri car_parts: Pezhioù evit ar c'hirri car_repair: Dresañ kirri carpet: Stal pallennoù @@ -800,7 +824,6 @@ br: department_store: Gourstal discount: Stal discount doityourself: Stal bitellat - drugstore: Apotikerezh dry_cleaning: Naetaat ent sec'h electronics: Stal traoù eletronek estate_agent: Kourater tiez @@ -811,7 +834,7 @@ br: food: Stal voued funeral_directors: Kañvlidoù furniture: Stal arrebeuri - gallery: Palier + gallery: Skeudennaoueg garden_centre: Stal liorzhañ general: Stal hollek gift: Stal profoù @@ -866,7 +889,10 @@ br: valley: Traoñienn viewpoint: Gwelva zoo: Zoo + tunnel: + "yes": Riboul waterway: + artificial: Gwazh-dour artifisiel boatyard: Chanter bigi canal: Kanol connector: Kevreadur dourredennoù @@ -892,6 +918,7 @@ br: base: cycle_map: Kelc'hiad kartenn mapquest: MapQuest digor + standard: Standard transport_map: Kartenn treuzdougen site: edit_disabled_tooltip: Zoumañ da zegas kemmoù war ar gartenn @@ -901,6 +928,7 @@ br: history_tooltip: Gwelet ar c'hemmoù er zonenn-se history_zoom_alert: Ret eo deoc'h zoumañ evit gwelet istor an aozadennoù layouts: + community: Kumuniezh community_blogs: Blogoù ar gumuniezh community_blogs_title: Blogoù izili kumuniezh OpenStreetMap copyright: Copyright & Aotre-implijout @@ -922,16 +950,16 @@ br: history: Istor home: degemer home_tooltip: Mont da lec'h ar gêr - inbox: boest resev (%{count}) inbox_tooltip: one: 1 gemennadenn anlennet zo en ho poest resev other: E-barzh ho poest resev ez eus %{count} kemennadenn anlennet zero: N'eus kemennadenn anlennet ebet en ho poest resev intro_1: OpenStreetMap zo ur gartenn digoust eus ar bed a-bezh, a c'haller kemmañ. Graet eo gant tud eveldoc'h. - intro_2: Gant OpenStreetMap e c'hallit gwelet, aozañ hag implijout roadennoù douaroniel eus forzh pelec'h er bed. - intro_3: Herberc'hiet eo OpenStreetMap a drugarez da %{ucl} ha %{bytemark}. Skoazellerien all eus ar raktres zo rollet war ar %{partners}. - intro_3_ic: Skolaj impalaerel Londrez - intro_3_partners: wiki + intro_2_create_account: Krouiñ ur gont implijer + intro_2_download: pellgargañ + intro_2_license: Aotre digor + intro_2_use: implijout + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: title: OpenStreetMap data zo dindan an aotre-implijout Creative Commons Attribution-Share Alike 2.0 log_in: kevreañ @@ -945,9 +973,11 @@ br: title: Skoazellañ OpenStreetMap gant ur road arc'hant osm_offline: Ezlinenn eo diaz roadennoù OpenStreetMap evit bremañ e-pad ma pleder gant ul labour kempenn bras. osm_read_only: Diaz roadennoù OpenStreetMap zo da lenn hepken evit bremañ evit bremañ abalamour da labourioù kempenn bras. + partners_html: "%{ucl}, %{ic}, %{bytemark}, ha %{partners} all a ra war-dro an herberc'hiañ." + partners_ic: Skolaj impalaerel Londrez + partners_partners: Kevelourien sign_up: En em enskrivañ sign_up_tooltip: Krouiñ ur gont evit aozañ - sotm2011: Kemerit perzh e kendalc'h OpenStreetMap 2011, Stad ar gartenn, d'an 11 a viz Gwengolo e Denver ! tag_line: Kartenn digoust eus ar bed Wiki user_diaries: Deizlevrioù an implijer user_diaries_tooltip: Gwelet deizlevrioù an implijerien @@ -962,7 +992,29 @@ br: english_link: orin e Saozneg text: Ma vez digendalc'h etre ar bajenn troet-mañ hag %{english_original_link} e teuio ar bajenn saoznek da gentañ title: Diwar-benn an droidigezh-mañ - legal_babble: "<h2>Copyright hag aotre-implijout</h2>\n<p>\n OpenStreetMap zo un hollad <i>roadennoù digor</i>, a c'haller kaout dindan an aotre-implijout <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n genlabourerien. Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">destenn reolennoù\n klok</a> e kavot munudoù ho kwirioù hag ho teverioù.\n</p>\n\n<h3>Penaos reiñ kred da OpenStreetMap</h3>\n<p>\n Ma'z implijit skeudennoù OpenStreetMap, e c'houlennomp diganeoc'h\n lakaat en ho kred ar meneg “© kenlabourerien OpenStreetMap\n CC-BY-SA”. Ma ne implijit nemet roadennoù ar c'hartennoù,\n e c'houlennomp diganeoc'h lakaat “Roadennoù ar gartenn © kenlabourerien OpenStreetMap,\n CC-BY-SA”.\n</p>\n<p>\n Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n ha CC-BY-SA war-du <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :\n un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da\n www.openstreetmap.org (marteze en ur astenn\n ‘OpenStreetMap’ ar chomlec'h klok) ha da\n www.creativecommons.org.\n</p>\n\n<h3>Titouroù ouzhpenn</h3>\n<p>\n Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAG ar reolennoù</a>.\n</p>\n<p>\n Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\n eus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre\n ezpleg ar re zo ar gwirioù-azer ganto.\n</p>\n<p>\n Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas\n un API digoust evit an diorroerien diavaez.\n\n Sellit ouzh hor <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">reolennoù evit implijout an API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">reolennoù evit implijout ar gartenn</a>\n ha <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">reolennoù evit implijout Nominatim</a>.\n</p>\n\n<h3>Hor c'henlabourerien</h3>\n<p>\n Hervez hon aotre-implijout CC-BY-SA e tleit “reiñ kred a-walc'h \n d'an aozer orin diouzh ar media a implijit”.\n Kartennourien hiniennel OSM ne c'houlennont ket\n kred panevet “kenlabourerien OpenStreetMap”,\n met pa vez ebarzhet roadennoù eus un ajañs kartennañ broadel\n pe ur vammenn veur all en OpenStreetMap,\n e c'hall bezañ fur reiñ kred dezho war-eeun\n en doare a c'houlennont pe dre ul liamm war-du ar bajenn-mañ.\n</p>\n\n<!--\nTitouroù evit ar re a gemm ar bajenn-mañ\n\nEr roll-mañ ne gaver nemet an aozadurioù a c'houlenn an dereiñ\nevit ma vefe o roadennoù en OpenStreetMap. N'eo ket ur\nc'hatalog hollek eus an ouzhpennadennoù, ha ne zle ket bezañ implijet,\nnemet pa vez ret an dereiñ evit doujañ da aotre-implijout ar roadennoù enporzhiet.\n\nKement ouzhpennadenn graet amañ a zle bezañ breutaet a-raok gant merourien OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Ennañ ar roadennoù diwar-benn an bannlevioù\n diazezet war roadennoù Australian Bureau of Statistics.</li>\n <li><strong>Aostria</strong>: Ennañ roadennoù eus\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> dindan\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Kanada</strong>: Ennañ roadennoù eus\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), ha StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Frañs</strong>: Ennañ roadennoù eus Renerezh Hollek an Tailhoù.</li>\n <li><strong>Zeland-Nevez</strong>: Ennañ roadennoù eus\n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Polonia</strong>: Ennañ roadennoù eus <a\n href=\"http://ump.waw.pl/\">kartennoù UMP-pcPL</a>. Copyright\n kenlabourerien UMP-pcPL.</li>\n <li><strong>Rouantelezh-Unanet</strong>: Ennañ roadennoù eus Ordnance\n Survey data © Crown copyright and database right 2010.</li>\n</ul>\n\n<p>\n Ebarzhiñ roadennoù en OpenStreetMap ne dalvez ket eo aprouet OpenStreetMap gant ar bourchaserien orin na egasont tamm gwarant, atebegezh pe asant ebet.\n</p>" + legal_babble: + contributors_at_html: "<strong>Aostria</strong> : Ennañ roadennoù eus\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (dindan\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>.</li> \t\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), \n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> ha\nLand Tirol (dindan <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT gant enkemmadoù</a>)." + contributors_au_html: "<strong>Australia</strong>: Ennañ ar roadennoù diwar-benn an bannlevioù\n diazezet war roadennoù Australian Bureau of Statistics." + contributors_ca_html: "<strong>Kanada</strong> : Ennañ roadennoù eus\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), ha StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: Ebarzhiñ roadennoù en OpenStreetMap ne dalvez ket eo aprouet OpenStreetMap gant ar bourchaserien orin na zegasont tamm gwarant, atebegezh pe asant ebet. + contributors_fr_html: "<strong>Frañs</strong> : Ennañ roadennoù eus Renerezh Hollek an Tailhoù." + contributors_gb_html: "<strong>Rouantelezh-Unanet</strong> : Ennañ roadennoù eus Ordnance\n Survey data © Crown copyright and database right 2010." + contributors_intro_html: "Hervez hon aotre-implijout CC BY-SA e tleit “reiñ kred a-walc'h \n d'an aozer orin diouzh ar media a implijit”.\n Kartennourien hiniennel OSM ne c'houlennont ket\n kred panevet “kenlabourerien OpenStreetMap”,\n met pa vez ebarzhet roadennoù eus un ajañs kartennañ broadel\n pe ur vammenn veur all en OpenStreetMap,\n e c'hall bezañ fur reiñ kred dezho war-eeun\n en doare a c'houlennont pe dre ul liamm war-du ar bajenn-mañ." + contributors_nl_html: "<strong>Netherlands</strong> : Contains © AND data, 2007\n (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Zeland-Nevez</strong> : Ennañ roadennoù eus\n Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polonia</strong> : Ennañ roadennoù eus <a\n href=\"http://ump.waw.pl/\">kartennoù UMP-pcPL</a>. Copyright\nUMP-pcPL kenlabourerien.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nMuioc'h diwar-benn OSM's use of UMP data</a>" + contributors_title_html: Hor c'henlabourerien + contributors_za_html: "<strong>Afrika ar Su</strong> : Ennañ roadennoù eus\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: "Ma'z implijit skeudennoù OpenStreetMap, e c'houlennomp diganeoc'h\n lakaat en ho kred ar meneg “© kenlabourerien OpenStreetMap\n CC BY-SA”. Ma ne implijit nemet roadennoù ar c'hartennoù,\n e c'houlennomp diganeoc'h lakaat “Roadennoù ar gartenn © kenlabourerien OpenStreetMap,\n CC BY-SA”." + credit_2_html: "Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n ha CC BY-SA war-du <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :\n un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da\n www.openstreetmap.org (marteze en ur astenn\n ‘OpenStreetMap’ ar chomlec'h klok) ha da\n www.creativecommons.org." + credit_title_html: Penaos reiñ kred da OpenStreetMap + intro_1_html: " OpenStreetMap zo un hollad <i>roadennoù digor</i>, a c'haller kaout dindan an aotre-implijout <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC BY-SA)." + intro_2_html: " Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n genlabourerien. Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">destenn reolennoù\n klok</a> e kavot munudoù ho kwirioù hag ho teverioù." + more_1_html: "Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAG ar reolennoù</a>." + more_2_html: " Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\n eus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre\n ezpleg ar re zo ar gwirioù-azer ganto." + more_3_html: " Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas\n un API digoust evit an diorroerien diavaez.\n\n Sellit ouzh hor <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">reolennoù evit implijout an API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">reolennoù evit implijout ar gartenn</a>\n ha <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">reolennoù evit implijout Nominatim</a>." + more_title_html: Titouroù ouzhpenn + title_html: Copyright hag aotre-implijout native: mapping_link: kregiñ da gemer perzh native_link: Stumm brezhonek @@ -1008,10 +1060,6 @@ br: body: Ho tigarez, n'eus kemennadenn ebet gant an id-se. heading: N'eus ket eus ar gemennadenn-se title: N'eus ket eus ar gemennadenn-se - no_such_user: - body: Ho tigarez, n'eus implijer ebet gant an anv. - heading: N'eus implijer ebet evel-se - title: N'eus implijer ebet evel-se outbox: date: Deiziad inbox: boest resev @@ -1183,6 +1231,8 @@ br: allow_write_gpx: kas roudoù GPS. allow_write_prefs: kemmañ o fenndibaboù implijerien. authorize_url: "URL aotren :" + confirm: Ha sur oc'h ? + delete: Diverkañ an arval edit: Aozañ ar munudoù key: "Alc'hwez implijer :" requests: "O c'houlenn an aotreoù-mañ digant an implijer :" @@ -1192,6 +1242,37 @@ br: url: "URL ar jedouer reked :" update: flash: Hizivaet eo bet titouroù an arval + redaction: + create: + flash: Skridaozadenn krouet. + destroy: + error: Ur fazi a zo bet e-ser foeltrañ ar skridaozadenn-mañ + flash: Skridaozadenn foeltret. + not_empty: N'eo ket goullo ar skridaozadenn. Diverkit an holl stummoù eus ar skridaozadenn-mañ a-raok he distruj. + edit: + description: Deskrivadur + heading: Aozañ ar skridaozadenn + submit: Enrollañ ar skridaozadenn + title: Aozañ ar skridaozadenn + index: + empty: Skridaozadenn ebet da ziskouez. + heading: Roll ar skridaozadennoù + title: Roll skridaozadennoù + new: + description: Deskrivadur + heading: Merkit an titouroù evit ar skridaozadenn nevez + submit: Krouiñ ar skridaozadenn + title: O krouiñ ur skridaozadenn nevez + show: + confirm: Ha sur oc'h ? + description: "Deskrivadur :" + destroy: Diverkañ ar skridaozadenn-mañ + edit: Aozañ ar skridaozadenn-mañ + heading: O tiskouez "%{title}" ar skridaozadenn + title: O tiskouez ar skridaozadenn + user: "Krouer :" + update: + flash: Kemmoù enrollet. site: edit: anon_edits_link_text: Kavit perak. @@ -1206,7 +1287,6 @@ br: index: js_1: Pe emaoc'h oc'h implijout ur merdeer ha ne skor ket JavaScript, pe hoc'h eus diweredekaet JavaScript. js_2: OpenStreetMap a implij JavaScript evit e gartenn risklus. - js_3: Ma ne c'hallit ket gweredekaat JavaScrip e c'hallit esaeañ gant ar <a href="http://tah.openstreetmap.org/Browse/">merdeer statek Tiles@Home</a>. license: license_name: Creative Commons Deroadenn Kenrannañ heñvel 2.0 notice: Dindan aotre-implijout %{license_name} gant an %{project_name} hag e genobererien. @@ -1283,6 +1363,23 @@ br: unclassified: Hent n'eo ket rummet unsurfaced: Hent n'eo ket goloet wood: Koad + markdown_help: + alt: Testenn all + first: Elfenn gentañ + heading: Titl + headings: Titloù + image: Skeudenn + link: Liamm + ordered: Roll urzhiet + second: Eil elfenn + subheading: Istitl + text: Testenn + title_html: Dielfennet gant <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Roll en dizurzh + url: URL + richtext_area: + edit: Aozañ + preview: Rakwelet search: search: Klask search_help: "da skouer : 'Kemper', 'Straed Siam, Brest', 'CB2 5AQ', pe 'tiez-post tost da Roazhon' <a href='http://wiki.openstreetmap.org/wiki/Search'>muioc'h a skouerioù...</a>" @@ -1325,10 +1422,6 @@ br: your_traces: Ho roudoù GPS make_public: made_public: Roudenn lakaet da vezañ foran - no_such_user: - body: Ho tigarez, n'eus implijer ebet en anv %{user}. Gwiriit hag-eñ eo skrivet mar, pe marteze hoc'h eus kliket war ul liamm fall. - heading: N'eus ket eus an implijer %{user} - title: Implijer ebet evel-se offline: heading: Stokañ GPX ezlinenn message: Ne'z a ket ar sistem stokañ hag enporzhiañ GPX en-dro evit poent. @@ -1367,8 +1460,6 @@ br: trace_optionals: tags: Balizennoù trace_paging_nav: - next: War-lerc'h » - previous: « Kent showing_page: O tiskouez ar bajenn %{page} view: delete_track: Dilemel ar roudenn-mañ @@ -1484,6 +1575,7 @@ br: login_button: Kevreañ lost password link: Ankouaet ho ker-tremen ganeoc'h ? new to osm: Nevez war OpenStreetMap ? + no account: N'hoc'h eus kont ebet ? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Gouzout hiroc'h diwar-benn ar cheñchamant aotre-implijout da zont gant OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">troidigezhioù</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">kendiviz</a>) notice_terms: Embannet e vo OpenStreetMap dindan un aotre-implijout nevez adalek ar 1añ a viz Ebrel 2012. Ken frank a wirioù e vo hag an hini zo bremañ nemet e tegouezho gwelloc'h an termenoù gwir ouzh hon diaz roadennoù kartennaouel. Plijet e vefemp o virout ho tegasadennoù da OpenStreetMap, met n'hallimp en ober nemet mard embannit bezañ a-du d'hor lezel o skignañ diouzh termenoù an aotre nevez. A-hend-all e rankimp lemel anezho kuit eus an diaz.<br /><br />Kevreit evit gwelet an termenoù nevez hag asantiñ dezho. Ne dap nemet un un nebeud eilennoù. Ho trugarekaat ! openid: "%{logo} OpenID :" @@ -1602,6 +1694,7 @@ br: block_history: gwelet ar stankadurioù resevet blocks by me: stankadurioù graet ganin blocks on me: Stankadurioù evidon + comments: evezhiadennoù confirm: Kadarnaat confirm_user: kadarnaat an implijer-mañ create_block: stankañ an implijer-mañ @@ -1625,6 +1718,7 @@ br: m away: war-hed %{count} m mapper since: "Kartennour abaoe :" moderator_history: gwelet ar stankadurioù roet + my comments: ma evezhiadennoù my diary: ma deizlevr my edits: ma aozadennoù my settings: ma arventennoù @@ -1679,7 +1773,6 @@ br: filter: block_expired: Aet eo ar stankadur d'e dermen dija ha ne c'hall ket bezañ aozet. block_period: Ar prantad stankañ a rank bezañ unan eus an talvoudoù a c'haller dibab ar roll disac'hañ. - not_a_moderator: Ret eo deoc'h bezañ habaskaer evit kas an ober-mañ da benn. helper: time_future: Echuiñ a ray a-benn %{time}. time_past: Echuet %{time} zo. diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 9b5573180..580c8d3ca 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1,13 +1,15 @@ -# Messages for Catalan (Català) +# Messages for Catalan (català) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Aleator # Author: El libre # Author: Gemmaa +# Author: Grondin # Author: Jconstanti # Author: Jmontane # Author: Martorell # Author: McDutchie +# Author: Nemo bis # Author: PerroVerd # Author: SMP # Author: Sim6 @@ -47,7 +49,7 @@ ca: description: Descripció display_name: Nom en pantalla email: Adreça electrònica - languages: Idiomes + languages: Llengües pass_crypt: Contrasenya models: acl: Llista de control d'accés @@ -85,7 +87,7 @@ ca: way_tag: Etiqueta del camí application: require_cookies: - cookies_needed: Sembla tenir les galetes inhabilitats - heu d'habilitar les galetes al seu navegador abans de continuar. + cookies_needed: Sembla que teniu les galetes inhabilitades - habiliteu les galetes al navegador abans de continuar. setup_user_auth: blocked: S'ha blocat l'accés a l'API. Si us plau, log-in a la interfície de web per obtenir més informació. need_to_see_terms: L'accés a l'API és temporalment suspeses. Si us plau, log-in a la interfície de web per veure els termes de col. laborador. Vostè no necessita estar d'acord, però cal veure-les. @@ -93,7 +95,6 @@ ca: changeset: changeset: "Conjunt de canvis: %{id}" changesetxml: XML del conjunt de canvis - download: Baixa %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Conjunt de canvis %{id} title_comment: Conjunt de canvis %{id} - %{comment} @@ -155,7 +156,6 @@ ca: next_changeset_tooltip: Propera edició de %{user} prev_changeset_tooltip: Edició anterior de %{user} node: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Baixa l'XML edit: modificació node: Node @@ -165,7 +165,6 @@ ca: coordinates: "Coordenades:" part_of: "Part de:" node_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Baixa l'XML node_history: Historial del node node_history_title: "Historial del node: %{node_name}" @@ -180,8 +179,9 @@ ca: paging_nav: of: de showing_page: S'està mostrant pàgina + redacted: + redaction: Redacció %{id} relation: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Baixa l'XML relation: Relació relation_title: "Relació: %{relation_name}" @@ -190,7 +190,6 @@ ca: members: "Membres:" part_of: "Part de:" relation_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Baixa l'XML relation_history: Historial de la relació relation_history_title: "Historial de la relació: %{relation_name}" @@ -252,7 +251,6 @@ ca: relation: relació way: via way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Descarrega XML edit: modificació view_history: visualitza l'històric @@ -265,7 +263,6 @@ ca: nodes: "Nodes:" part_of: "Part de:" way_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Descarrega XML view_details: visualitza els detalls way_history: Historial de la via @@ -311,6 +308,8 @@ ca: timeout: sorry: La llista de conjunt de canvis que heu sol·licitat ha trigat massa a recuperar-se. diary_entry: + comments: + ago: fa %{ago} diary_comment: comment_from: Comentari de %{link_user} el %{comment_created_at} confirm: Confirma @@ -368,10 +367,6 @@ ca: body: Ho sentim, que no hi ha cap entrada del diari o comentari amb l'id %{id}. Si us plau, comproveu l'ortografia, o potser l'enllaç que es fa clic està malament. heading: No hi ha cap entrada amb la id %{id} title: No hi ha entrada al diari com - no_such_user: - body: Ho sentim, no hi ha cap usuari amb el nom %{user}. Si us plau, comproveu l'ortografia, o potser l'enllaç que es fa clic està malament. - heading: L'usuari/a %{user} no existeix - title: Aquest usuari/a no existeix view: leave_a_comment: Deixa un comentari login: Accés @@ -557,37 +552,11 @@ ca: youth_centre: Centre juvenil boundary: administrative: Administració de Fronteres + bridge: + viaduct: Viaducte + "yes": Pont building: - apartments: Bloc d'apartaments - block: Edifici en construcció - bunker: Búnker - chapel: Capella - church: Església - city_hall: Ajuntament - commercial: Edifici comercial - dormitory: Residència Universitària - entrance: Entrada de l'Edifici - faculty: Edifici facultatiu - farm: Instal·lacions agrícoles - flats: Pisos - garage: Garatge - hall: Ajuntament - hospital: Edifici hospitalari - hotel: Hotel - house: Casa - industrial: Edifici industrial - office: Edifici d'oficines - public: Edifici públic - residential: Edifici residencial - retail: Edifici de Venda al detall - school: Edifici escolar - shop: Botiga - stadium: Estadi - store: Magatzem - terrace: Terrassa - tower: Torre - train_station: Estació de tren - university: Edifici universitari + "yes": Edifici highway: bridleway: Ferradura bus_guideway: Carril Bus @@ -595,11 +564,9 @@ ca: byway: Ruta segregada construction: Autopista en construcció cycleway: Ruta per a bicicletes - distance_marker: Marcador de Distància emergency_access_point: Accés d'emergència footway: Sendera ford: Fiord - gate: Porta living_street: Carrer habitat minor: Camí secundari motorway: L'autopista @@ -664,11 +631,9 @@ ca: meadow: Prat military: Zona Militar mine: Mina - mountain: Muntanya nature_reserve: Reserva Natural park: Parc piste: Pista d'aterratge - plaza: Plaça quarry: Pedrera railway: Ferrocarril recreation_ground: Zona d'Esbarjo @@ -706,7 +671,6 @@ ca: cave_entrance: Entrada a cova channel: Canal cliff: Cingle - coastline: Litoral crater: Cràter feature: Característica fell: Forest @@ -786,7 +750,6 @@ ca: yard: Pati de ferrocarril shop: alcohol: De llicència - apparel: Roba de la botiga art: Galeria d'Art bakery: Fleca beauty: Saló de bellesa @@ -795,7 +758,6 @@ ca: books: Llibreria butcher: Carnisseria car: Venda de Cotxes - car_dealer: Compra-venda de cotxes car_parts: Peces de cotxes car_repair: Reparació d'automòbils carpet: Botiga de catifes @@ -810,7 +772,6 @@ ca: department_store: Department Store discount: Botiga d'articles de descompte doityourself: Bricolatge - drugstore: Farmàcia dry_cleaning: Tintoreria electronics: Botiga d'electrònica estate_agent: Immobiliària @@ -876,6 +837,8 @@ ca: valley: Vall viewpoint: Mirador zoo: Zoològic + tunnel: + "yes": Túnel waterway: boatyard: Drassana canal: Canal @@ -912,8 +875,9 @@ ca: history_tooltip: Mostra les modificacions de l'àrea history_zoom_alert: Heu d'ampliar el zoom per veure les modificacions de l'àrea layouts: + community: Comunitat community_blogs: Blocs de comunitat - community_blogs_title: Blogs dels membres de la comunitat OpenStreetMap + community_blogs_title: Blocs dels membres de la comunitat OpenStreetMap copyright: Drets d'autor i llicència documentation: Documentació documentation_title: Documentació del projecte @@ -933,31 +897,28 @@ ca: history: Historial home: Inici home_tooltip: Vés a la posició inicial - inbox: safata d'entrada (%{count}) inbox_tooltip: - other: one no llegits = el seu inbox conté 1 message - zero: el seu inbox conté cap messages + one: Teniu 1 missatge sense llegir + other: Teniu %{count} missatges sense llegir + zero: No teniu cap missatge sense llegir intro_1: L'OpenStreetMap és un mapa editable i lliure de tot el món. Està fet per gent com vós. - intro_2: OpenStreetMap us permet veure, editar i utilitzar informació geogràfica comunitària de qualsevol lloc del planeta - intro_3: OpenStreetMap hosting és amable amb el suport de %{ucl}, %{ic} i %{bytemark}. Altres partidaris del projecte s'enumeren en el %{partners}. - intro_3_ic: Imperial College de Londres - intro_3_partners: wiki + intro_2_create_account: Crea un compte d'usuari + intro_2_download: baixada license: - title: OpenStreetMap dades es concedeix una llicència sota la llicència Creative Commons Reconeixement-Compartir Igual 2.0 genèrica + title: Les dades de l'OpenStreetMap es troben sota la llicència Creative Commons Reconeixement-Compartir Igual 2.0 genèrica log_in: inicia una sessió log_in_tooltip: Inicia una sessió amb un compte existent logo: alt_text: logotip de l'OpenStreetMap - logout: sortir + logout: surt logout_tooltip: Sortir make_a_donation: text: Feu una donació - title: Ajuda OpenStreetMap amb una donació exonòmica - osm_offline: La base de dades OpenStreetMap està fora de línia, mentre que les actuacions de manteniment essencials de base de dades es porta a terme. + title: Ajudeu l'OpenStreetMap amb una donació econòmica + osm_offline: La base de dades OpenStreetMap és fora de línia, mentre es fan actuacions de manteniment necessàries. osm_read_only: La base de dades OpenStreetMap actualment és en el mode read-only mentre que les actuacions de manteniment essencials de base de dades es porta a terme. sign_up: registre sign_up_tooltip: Crea un usuari per editar - sotm2011: Vine a la conferència de OpenStreetMap de 2011, L'estat del mapa, 9-11 de setembre a Denver! tag_line: El mapa wiki lliure mundial user_diaries: DIaris de usuari user_diaries_tooltip: Mostra els diaris d'usuari @@ -972,11 +933,31 @@ ca: english_link: l'original en anglès text: En cas de conflicte entre aquesta pàgina traduïda i %{english_original_link}, la pàgina en anglès tindrà prioritat title: Quant a la traducció - legal_babble: "<h2>Drets d'autor i llicència</h2>\n<p>\n OpenStreetMap és <i>obrir dades</i>, concedeix una llicència sota el <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Llicència Commons Attribution-ShareAlike 2.0 (CC-BY-SA).\n<p>\n<p>\n Vostè és lliure de copiar, distribuir, transmetre i adaptar-se a nostres mapes\n i les dades, sempre que li doni crèdit OpenStreetMap i la seva\n col. laboradors. Si alterar o construir sobre els nostres mapes o dades, vostè\n distribuir el resultat només sota la mateixa llicència. La\n Full <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n codi explica els seus drets i responsabilitats.\n<p>\n\n<h3>Com a crèdit OpenStreetMap</h3>\n<p>\n Si està utilitzant imatges de mapa de OpenStreetMap, us preguem que\n el seu crèdit llegeix com a mínim \"© OpenStreetMap\n col. laboradors, CC-BY-SA\". Si està utilitzant les dades de mapa només\n demanem \"mapa dades © OpenStreetMap col·laboradors\n CC-BY-SA\".\n</p>\n<p>\n Sempre que sigui possible, OpenStreetMap ha de ser un hipervincle a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/\n i CC-BY-SA a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/. Si\n està utilitzant un mitjà on enllaços no són possibles (per exemple, un\n treball impresa), us suggerim que directa als seus lectors a\n www.OpenStreetMap.org (potser per l'ampliació\n 'OpenStreetMap' a aquesta adreça completa) i a\n www.creativecommons.org.\n<p>\n\n<h3>Saber-ne més</h3>\n<p>\n Llegiu més informació sobre com utilitzar les nostres dades a les <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n PREGUNTES MÉS FREQÜENTS.\n<p>\n<p>\n Col. laboradors OSM se li va recordar mai per afegir les dades des de qualsevol\n drets d'autor fonts (p. ex. Google Maps o mapes impreses) sense\n permís explícit dels titulars del copyright.\n</p>\n<p>\n Encara que OpenStreetMap és oberts les dades, no podem oferir un\n mapa de Free-of-charge API per a desenvolupadors de tercera festa.\n\n Consulti la nostra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política d'ús de l'API</a>\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política d'ús de rajoles</a>\n i <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">política d'ús de Nominatim</a>.\n</p>\n\n<h3>Nostres col. laboradors</h3>\n<p>\n La nostra llicència CC-BY-SA requereix que \"doni l'Original\n Autor de crèdit raonable per al suport i mitjà que ets\n utilització\". No tornis a sol·licitar individuals dibuixants de mapes de OSM un\n de crèdit més enllà de que a \"OpenStreetMap\n col. laboradors\", però on les dades des d'un mapatge Nacional\n Agència o l'altra font important ha estat inclòs en\n OpenStreetMap, pot ser raonable per crèdit per directament\n reproduir el seu crèdit o per vincular-hi d'aquesta pàgina.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n<li><strong>Austràlia</strong>: conté dades suburbi basats\n en les dades d'Austràlia Oficina d'estadístiques.</li>\n<li><strong>Àustria</strong>: conté dades de\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> sota\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n<li><strong>Canadà</strong>: conté dades de\n GeoBase ®, GeoGratis (© Departament de Natural\n Recursos Canadà), CanVec (© Departament de Natural\n Recursos Canadà) i StatCan (Divisió de Geografia,\n Canadà de Estadístiques).</li>\n<li><strong>França</strong>: conté dades d'origen de\n Direcció Générale des Impôts.</li>\n<li><strong>Nova Zelanda</strong>: conté dades d'origen de\n Informació Nova Zelanda de la terra. Corona de drets d'autor reservat.</li>\n<li><strong>Polònia</strong>: conté dades de mapes de <a\n href=\"http://ump.waw.pl/\">UMP-pcPL. Drets d'autor\n Col. laboradors de la UMP-pcPL.</a\n></li>\n<li><strong>Regne Unit</strong>: conté cartografia\n Enquesta dades © Crown copyright i base de dades correcte\n 2010.</li>\n</ul>\n\n<p>\n Inclusió de dades en OpenStreetMap no implica que l'original\n el proveïdor de dades recolza OpenStreetMap, proporciona cap garantia, o\n accepta qualsevol responsabilitat.\n</p></a\n></a\n></a\n></a\n></a\n>" + legal_babble: + contributors_at_html: "<strong>Àustria</strong>: conté dades de\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> sota\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>." + contributors_au_html: "<strong>Austràlia</strong>: conté dades suburbi basats\n en les dades d'Austràlia Oficina d'estadístiques." + contributors_ca_html: "<strong>Canadà</strong>: conté dades de\n GeoBase ®, GeoGratis (© Departament de Natural\n Recursos Canadà), CanVec (© Departament de Natural\n Recursos Canadà) i StatCan (Divisió de Geografia,\n Canadà de Estadístiques)." + contributors_footer_2_html: "Inclusió de dades en OpenStreetMap no implica que l'original\n el proveïdor de dades recolza OpenStreetMap, proporciona cap garantia, o\n accepta qualsevol responsabilitat." + contributors_fr_html: "<strong>França</strong>: conté dades d'origen de\n Direcció Générale des Impôts." + contributors_gb_html: "<strong>Regne Unit</strong>: conté cartografia\n Enquesta dades © Crown copyright i base de dades correcte\n 2010." + contributors_intro_html: "La nostra llicència CC BY-SA requereix que \"doni l'Original\n Autor de crèdit raonable per al suport i mitjà que ets\n utilització\". No tornis a sol·licitar individuals dibuixants de mapes de OSM un\n de crèdit més enllà de que a \"OpenStreetMap\n col. laboradors\", però on les dades des d'un mapatge Nacional\n Agència o l'altra font important ha estat inclòs en\n OpenStreetMap, pot ser raonable per crèdit per directament\n reproduir el seu crèdit o per vincular-hi d'aquesta pàgina." + contributors_nz_html: "<strong>Nova Zelanda</strong>: conté dades d'origen de\n Informació Nova Zelanda de la terra. Corona de drets d'autor reservat." + contributors_pl_html: "<strong>Polònia</strong>: conté dades de mapes de <a\n href=\"http://ump.waw.pl/\">UMP-pcPL. Drets d'autor\n Col. laboradors de la UMP-pcPL.</a\n>" + contributors_title_html: Nostres col. laboradors + credit_1_html: "Si està utilitzant imatges de mapa de OpenStreetMap, us preguem que\n el seu crèdit llegeix com a mínim \"© OpenStreetMap\n col. laboradors, CC BY-SA\". Si està utilitzant les dades de mapa només\n demanem \"mapa dades © OpenStreetMap col·laboradors\n CC BY-SA\"." + credit_2_html: "Sempre que sigui possible, OpenStreetMap ha de ser un hipervincle a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/\n i CC BY-SA a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/. Si\n està utilitzant un mitjà on enllaços no són possibles (per exemple, un\n treball impresa), us suggerim que directa als seus lectors a\n www.OpenStreetMap.org (potser per l'ampliació\n 'OpenStreetMap' a aquesta adreça completa) i a\n www.creativecommons.org." + credit_title_html: Com a crèdit OpenStreetMap + intro_1_html: "OpenStreetMap és <i>obrir dades</i>, concedeix una llicència sota el <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Llicència Commons Attribution-ShareAlike 2.0 (CC BY-SA)." + intro_2_html: "Vostè és lliure de copiar, distribuir, transmetre i adaptar-se a nostres mapes\n i les dades, sempre que li doni crèdit OpenStreetMap i la seva\n col. laboradors. Si alterar o construir sobre els nostres mapes o dades, vostè\n distribuir el resultat només sota la mateixa llicència. La\n Full <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n codi explica els seus drets i responsabilitats." + more_1_html: "Llegiu més informació sobre com utilitzar les nostres dades a les <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n PREGUNTES MÉS FREQÜENTS." + more_2_html: "Col. laboradors OSM se li va recordar mai per afegir les dades des de qualsevol\n drets d'autor fonts (p. ex. Google Maps o mapes impreses) sense\n permís explícit dels titulars del copyright." + more_3_html: "Encara que OpenStreetMap és oberts les dades, no podem oferir un\n mapa de Free-of-charge API per a desenvolupadors de tercera festa.\n\n Consulti la nostra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política d'ús de l'API</a>\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política d'ús de rajoles</a>\n i <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">política d'ús de Nominatim</a>." + more_title_html: Saber-ne més + title_html: Drets d'autor i llicència native: mapping_link: Inici d'assignació - native_link: Versió THIS_LANGUAGE_NAME_HERE - text: Estàs veient la versió anglesa de la pàgina de drets d'autor. Es pot tornar posterior al %{native_link} d'aquesta pàgina o vostè pot deixar de llegir sobre el copyright i %{mapping_link}. + native_link: versió THIS_LANGUAGE_NAME_HERE + text: Esteu veient la versió anglesa de la pàgina de drets d'autor. Podeu tornar a la %{native_link} d'aquesta pàgina o podeu deixar de llegir sobre el copyright i anar a %{mapping_link}. title: Sobre aquesta pàgina message: delete: @@ -989,12 +970,12 @@ ca: new_messages: one: "%{count} missatge nou" other: "%{count} missatges nous" - no_messages_yet: No tens missatges encara. Per què no entrar en contacte amb alguns dels %{people_mapping_nearby_link}? + no_messages_yet: No teniu cap missatge. Per què no entreu en contacte amb %{people_mapping_nearby_link}? old_messages: one: "%{count} missatge antic" other: "%{count} missatges antics" - outbox: sortida - people_mapping_nearby: Cartografia de prop la gent + outbox: Safata de sortida + people_mapping_nearby: gent propera que cartografia subject: Assumpte title: Safata d'entrada mark: @@ -1008,20 +989,16 @@ ca: new: back_to_inbox: Torna a la safata d'entrada body: Cos - limit_exceeded: He enviat un munt de missatges recentment. Si us plau, espereu una estona abans d'intentar d'enviar qualsevol més. + limit_exceeded: Heu enviat un munt de missatges recentment. Espereu una estona abans d'intentar d'enviar més missatges. message_sent: S'ha enviat el missatge send_button: Envia - send_message_to: Enviar un missatge nou per a %{name} + send_message_to: Envia un missatge nou per a %{name} subject: Assumpte title: Envia el missatge no_such_message: body: Trist que no hi ha cap missatge amb que id. heading: No existeix aquest missatge title: No existeix aquest missatge - no_such_user: - body: Trist que no hi ha cap usuari amb aquest nom. - heading: Aquest usuari no - title: Aquest usuari no outbox: date: Data inbox: Entrada @@ -1040,11 +1017,11 @@ ca: back_to_outbox: Torna a la safata de sortida date: Data from: De - reading_your_messages: Llegir els missatges + reading_your_messages: S'estan llegint els missatges reading_your_sent_messages: S'estan llegint els missatges enviats reply_button: Respon subject: Assumpte - title: Llegir missatge + title: Llegeix el missatge to: Per a unread_button: Marca com a no llegit wrong_user: Heu iniciat la sessió com "%{user}", però el missatge que han demanat a llegir a no va ser enviat o dirigit a aquest usuari. Si us plau connecti's com l'usuari correcte per a llegir-lo. @@ -1067,10 +1044,10 @@ ca: email_confirm_plain: click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç sota per confirmar el canvi. greeting: Hola, - hopefully_you_1: Algú (esperem que vostè) li agradaria canviar la seva adreça d'e-mail a + hopefully_you_1: Algú (esperem que vós mateix) vol canviar l'adreça de correu a hopefully_you_2: "%{server_url} a %{new_address}." friend_notification: - befriend_them: També el pots afegir com a amic a %{befriendurl}. + befriend_them: També el podeu afegir com a amic a %{befriendurl}. had_added_you: "%{user} t'ha afegit com a amic a OpenStreetMap." see_their_profile: Podeu veure el seu perfil a %{userurl}. subject: "[OpenStreetMap] %{user} t'ha afegit a la llista d'amics" @@ -1089,7 +1066,7 @@ ca: with_description: amb la descripció your_gpx_file: Sembla el vostre fitxer GPX lost_password: - subject: "[OpenStreetMap] Sol. licitud de reinicialització de contrasenya" + subject: "[OpenStreetMap] Sol·licitud de reinicialització de contrasenya" lost_password_html: click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç de sota per restaurar la seva contrasenya. greeting: Hola, @@ -1100,14 +1077,14 @@ ca: hopefully_you_1: Algú (possiblement vostè) ha demanat per a la contrasenya restaurar en això hopefully_you_2: adreces d'e-mail openstreetmap.org compte. message_notification: - footer1: També pots llegir el missatge a %{readurl} + footer1: També podeu llegir el missatge a %{readurl} footer2: i el pots replicar a %{replyurl} header: "%{from_user} ha enviat un missatge a través de OpenStreetMap amb el tema %{subject}:" hi: Hola %{to_user}, signup_confirm: subject: "[OpenStreetMap] Confirmeu la vostra adreça electrònica" signup_confirm_html: - ask_questions: Pot fer qualsevol pregunta que tingui sobre OpenStreetMap a la nostra <a href="http://help.openstreetmap.org/">pregunta i resposta lloc</a>. + ask_questions: Podeu fer qualsevol pregunta que tingueu sobre l'OpenStreetMap al nostre <a href="http://help.openstreetmap.org/">lloc de preguntes i respostes</a>. click_the_link: Si això és vostè, Benvingut! Si us plau, feu clic a l'enllaç de sota per confirmar que compte i seguiu llegint per obtenir més informació sobre OpenStreetMap current_user: "Una llista d'usuaris actuals en categories, basades en on en el món que són, està disponible des de <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region\">Categoria: Users_by_geographical_region</a>." get_reading: Obtenir de lectura sobre OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">al wiki</a>, posarà al dia amb les últimes notícies via <a href="http://blog.openstreetmap.org/">OpenStreetMap bloc</a> o <a href="http://twitter.com/openstreetmap">Twitter</a>o navegar a través de OpenStreetMap fundador Steve Costa <a href="http://www.opengeodata.org/">OpenGeoData blog</a> per a la breu història del projecte, que disposa de <a href="http://www.opengeodata.org/?cat=13">podcasts d'escoltar</a> ! @@ -1127,7 +1104,7 @@ ca: current_user_1: Una llista d'usuaris actuals en categories, basades en on en el món current_user_2: "ells són, està disponible des de:" greeting: Hola, què tal? - hopefully_you: Algú (esperem que vostè) would com crear un compte per a les + hopefully_you: Algú (creiem que vós mateix) vol crear un compte per a les introductory_video: "Podeu veure un vídeo d'introducció a OpenStreetMap aquí:" more_videos: "Hi ha més videos aquí:" opengeodata: "OpenGeoData.org és blog fundador OpenStreetMap Steve Costa, i té podcasts també:" @@ -1138,7 +1115,7 @@ ca: oauth: oauthorize: allow_read_gpx: llegir el seu privats traces GPS. - allow_read_prefs: llegir les seves preferències d'usuari. + allow_read_prefs: llegiu les vostres preferències d'usuari. allow_to: "Permet la sol·licitud de client per:" allow_write_api: modificar el mapa. allow_write_diary: crear entrades de diari, comentaris i fer amics. @@ -1176,8 +1153,8 @@ ca: my_tokens: Meves aplicacions autoritzada no_apps: Té una aplicació que li agradaria inscriure's per al seu ús amb nosaltres utilitzant l'estàndard %{oauth}? Heu de registrar la seva aplicació web abans que pugui fer peticions OAuth a aquest servei. register_new: Registrar-se l'aplicació - registered_apps: "Vostè té les següents aplicacions client registrats:" - revoke: Revocar! + registered_apps: "Teniu les següents aplicacions client registrades:" + revoke: Revoca! title: Les meves dades OAuth new: submit: Registrar-se @@ -1192,8 +1169,8 @@ ca: allow_write_diary: crear entrades de diari, comentaris i fer amics. allow_write_gpx: carregar traces GPS. allow_write_prefs: modificar les seves preferències d'usuari. - authorize_url: "Autoritzar URL:" - edit: Editar els detalls + authorize_url: "Autoritza URL:" + edit: Edita els detalls key: "Clau de consum:" requests: "Sol·licitar els permisos següents des de l'usuari:" secret: "Secret de consum:" @@ -1205,18 +1182,17 @@ ca: site: edit: anon_edits_link_text: Esbrina perquè aquest és el cas. - flash_player_required: Vostè necessita un intèrpret de flaix per utilitzar Potlatch, l'editor de OpenStreetMap Flash. Vostè pot <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Descarregar Flash Player des de Adobe.com</a>. També hi ha <a href="http://wiki.openstreetmap.org/wiki/Editing">diverses altres opcions</a> per editar-lo OpenStreetMap. - no_iframe_support: El seu navegador no suporta iframes HTML, que són necessàries per a aquest tret. + flash_player_required: Necessiteu intèrpret de Flash per utilitzar el Potlatch, l'editor de l'OpenStreetMap. Podeu <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">baixar el pluguin de Flash des del web Adobe.com</a>. També hi ha <a href="http://wiki.openstreetmap.org/wiki/Editing">altres opcions</a> per editar l'OpenStreetMap. + no_iframe_support: El navegador no suporta iframes HTML, que són necessàries per a aquesta funcionalitat. not_public: No ha posat les modificacions per ser públic. not_public_description: Ja no es pot editar el mapa a menys que vostè fer-ho. Pot configurar les modificacions com a públic del seu %{user_page}. - potlatch2_not_configured: No s'ha configurat Potlatch 2 - si us plau, veure http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 per a més informació - potlatch2_unsaved_changes: Vostè té canvis no desats. (D'estalviar en Potlatch 2, hauria de fer clic Salvar.) - potlatch_unsaved_changes: Vostè té canvis no desats. (Per salvar a Potlatch, vostè ha desseleccionar la manera actual o punt, si d'edició en mode en viu, o clic Salvar si vostè té un salvar botó.) + potlatch2_not_configured: No s'ha configurat el Potlatch 2 - vegeu http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 per a més informació + potlatch2_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al Potlatch 2, heu de fer clic a "desa".) + potlatch_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al Potlatch, heu de desseleccionar la via o el punt actual, si esteu en l'edicó en viu, o fer clic a "desa", si teniu un botó "desa".) user_page_link: pàgina d'usuari index: js_1: Tampoc està utilitzant un navegador que no suporta JavaScript o té deshabilitat JavaScript. - js_2: OpenStreetMap utilitza JavaScript per a la seva mapa slippy. - js_3: Pot voler provar el <a href="http://tah.openstreetmap.org/Browse/">navegador mosaic estàtica de Tiles@Home</a> si és incapaç d'activar JavaScript. + js_2: L'OpenStreetMap utilitza JavaScript per al mapa slippy. license: license_name: Creative Commons Reconeixement-Compartir Igual 2.0 notice: Llicenciat sota la llicència %{license_name} per %{project_name} i els seus contribuents. @@ -1225,8 +1201,8 @@ ca: remote_failed: Edició ha fallat - assegureu-vos que JOSM o Merkaartor es carrega i l'opció de comandament a distància és habilitat shortlink: Enllaç curt key: - map_key: Mapa clau - map_key_tooltip: Clau per al mapa + map_key: Llegenda + map_key_tooltip: Llegenda del mapa table: entry: admin: Límits administratius @@ -1249,7 +1225,7 @@ ca: - Comú - Prat construction: Carreteres en construcció - cycleway: Cycleway + cycleway: Carril bici destination: Accés de destinació farm: Granja footway: Footway @@ -1261,7 +1237,7 @@ ca: - Llac - Embassament military: Àrea militar - motorway: L'autopista + motorway: Autopista park: Parc permissive: Permissiva accés pitch: Camp d'esports @@ -1290,15 +1266,15 @@ ca: - tramvia trunk: Autovia de tunnel: Carcassa de guions = túnel - unclassified: Sense classificar road + unclassified: Carretera sense classificar unsurfaced: Unsurfaced road wood: Fusta search: search: Cerca - search_help: "exemples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' o 'oficines de CORREOS a prop Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>més exemples...</a>" + search_help: "exemples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' o 'oficines de correus a prop Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>més exemples...</a>" submit_text: Vés-hi where_am_i: On sóc? - where_am_i_title: Descriure la localització actual que utilitzen el motor de cerca + where_am_i_title: Descriu la localització actual fent servir el motor de cerca sidebar: close: Tanca search_results: Resultats de la cerca @@ -1332,13 +1308,9 @@ ca: public_traces: Traces GPS públiques public_traces_from: Públics traces GPS de %{user} tagged_with: " etiquetat amb %{tags}" - your_traces: Les teves traces GPS + your_traces: Les vosres traces GPS make_public: made_public: Water fet públic - no_such_user: - body: Ho sentim, no hi ha cap usuari amb el nom %{user}. Si us plau, comproveu l'ortografia, o potser l'enllaç que es fa clic està malament. - heading: No existeix l'usuari %{user} - title: No existeix l`usuari offline: heading: GPX emmagatzematge fora de línia message: Al GPX d'emmagatzematge i carregar sistema d'arxiu no està disponible actualment. @@ -1364,22 +1336,20 @@ ca: description: "Descripció:" help: Ajuda tags: "Etiquetes:" - tags_help: separat per comas - upload_button: Pujar + tags_help: separat per comes + upload_button: Puja upload_gpx: "Carregui l'arxiu GPX:" visibility: "Visibilitat:" visibility_help: què significa això? trace_header: see_all_traces: Mostra totes les traces see_your_traces: Mostra totes les vostres traces - traces_waiting: Vostè té %{count} traces d'espera per a carregar. Si us plau consideri espera per a aquests per acabar abans de pujar més, per tal de bloquejar la cua per a altres usuaris. - upload_trace: Carregar una traça + traces_waiting: Teniu %{count} traces esperant en cua per a pujar. Considereu esperar a que aquestes traces acabin abans de pujar-ne més, així no blocareu la cua per a altres usuaris. + upload_trace: Puja una traça trace_optionals: tags: Etiquetes trace_paging_nav: - next: Següent » - previous: « Anterior - showing_page: Mostrant pàgina %{page} + showing_page: S'està mostrant pàgina %{page} view: delete_track: Elimina aquesta traça description: "Descripció:" @@ -1487,19 +1457,20 @@ ca: login: account is suspended: Ho sentim, s'ha suspès el vostre compte per presentar una activitat sospitosa.<br />Contacteu amb el <a href="%{webmaster}">webmestre</a> si voleu parlar-ne. account not active: Ho sentim, el teu compte encara no està actiu.<br>Si us plau utilitzi l'enllaç a l'e-mail de confirmació de compte d'activar el seu compte, o <a href="%{reconfirm}">demanar un nou correu electrònic de confirmació</a>. - auth failure: Ho sentim, no pot registrar en amb els detalls. + auth failure: Ho sentim, no podeu registrar-vos amb aquesta informació. create account minute: Crear un compte. Només es triga un minut. email or username: "Adreça de correu o usuari:" heading: Accés login_button: Accés lost password link: Heu perdut la contrasenya? new to osm: Nou a OpenStreetMap? + no account: No teniu cap compte? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Esbrinar més sobre el canvi de llicència futura de OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traduccions</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussió</a>) notice_terms: "L'OpenStreetMap farà servir una altra llicència a partir de l'1 d'abril de 2012. És tan oberta com l'actual, però els seus detalls legals s'adeqüen millor a la nostra base de dades de mapes.\nEns agradaria conservar les vostres contribucions a l'OpenStreetMap, però només podem fer-ho si esteu d'acord en distribuir-les sota la llicència nova. Sinó, no podem fer altra cosa que suprimir-les de la base de dades.<br /><br />Inicieu una sessió i dediqueu uns pocs segons a revisar-ho i acceptar els nous termes. Moltes gràcies!" openid: "%{logo} OpenID:" openid invalid: Ho sentim, el seu OpenID sembla ser no vàlida openid missing provider: Ho sento, podria no en contacte amb el seu proveïdor d'OpenID - openid_logo_alt: Connecti's amb un OpenID + openid_logo_alt: Inicia sessió amb un compte OpenID openid_providers: aol: alt: Connecti's amb un AOL OpenID @@ -1525,7 +1496,7 @@ ca: title: Accés to make changes: Per fer canvis a les dades de OpenStreetMap, ha de tenir un compte. with openid: "Alternativament, si us plau utilitzi el seu OpenID per connectar-se:" - with username: "Ja teniu un compte de OpenStreetMap? Si us plau connecti's amb el seu nom d'usuari i contrasenya:" + with username: "Ja teniu un compte de l'OpenStreetMap? Incieu sessió amb el nom d'usuari i contrasenya:" logout: heading: Finalitza la sessió d'OpenStreetMap logout_button: Finalitza la sessió @@ -1543,31 +1514,31 @@ ca: failed: Ho sentim, no afegir %{name} com un amic. success: "%{name} ara és el vostre amic." new: - confirm email address: "Confirmar adreça de correu electrònic:" + confirm email address: "Confirmeu l'adreça de correu electrònic:" confirm password: "Confirmeu la contrasenya:" - contact_webmaster: Si us plau, contactar amb el <a href="mailto:webmaster@openstreetmap.org">webmaster</a> per organitzar un compte de ser creat - anem a provar i tractar amb la sol. licitud tan aviat com sigui possible. + contact_webmaster: Contacteu amb el <a href="mailto:webmaster@openstreetmap.org">webmestre</a> per gestionar la creació d'un compte - intentarem tractar la sol·licitud tan aviat com sigui possible. continue: Continua - display name: "Nom en pantalla:" - display name description: El vostre usuari mostrat públicament. Això pot canviar més tard en les preferències. + display name: "Nom visible:" + display name description: El nom d'usuari que es motrarà públicament. El podeu canviar més endavant a les preferències. email address: "Adreça de correu:" - fill_form: Ompli el formulari i us enviarem un correu electrònic ràpid per activar el seu compte. + fill_form: Ompliu el formulari i us enviarem un correu electrònic per activar el vostre compte. flash create success message: Gràcies per registrar-se. Hem enviat un bitllet de confirmació a %{email} i tan aviat com vostè confirmar el seu compte es podrà aconseguir d'assignació.<br><br>Si utilitzeu un sistema que envia les sol·licituds de confirmació llavors si us plau fer segur whitelist webmaster@openstreetmap.org com som capaços de respondre a qualsevol sol·licituds de confirmació. heading: Crea un compte d'usuari - license_agreement: Quan vostè confirmar el seu compte necessita estar d'acord amb els <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">termes de col. laborador</a>. - no_auto_account_create: Per desgràcia no som actualment capaços de crear un compte per a vostè automàticament. - not displayed publicly: No mostraran públicament (vegeu la <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">política de privacitat</a>) + license_agreement: Quan confirmeu el compte, heu d'acceptar els <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">termes de col·laboracio</a>. + no_auto_account_create: No us podem crear automàticament un compte. + not displayed publicly: No es mostrarà públicament (vegeu la <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">política de privacitat</a>) openid: "%{logo} OpenID:" - openid association: "<p>El seu OpenID encara no està associat a un compte de OpenStreetMap.</p>\n<ul>\n<li>Si sou nous a OpenStreetMap, si us plau, crear un compte nou utilitzant el formulari a continuació.</li>\n<li>\n Si ja teniu un compte, es pot connectar al seu compte\n utilitzant el seu nom d'usuari i contrasenya i llavors associat el compte\n amb el seu OpenID en les seves escenes d'usuari.\n</li>\n</ul>" - openid no password: Amb OpenID una contrasenya no és necessària, però algunes eines extres o servidor pot encara necessita un. + openid association: "<p>El seu OpenID encara no està associat a un compte de OpenStreetMap.</p>\n<ul>\n<li>Si sou nou a l'OpenStreetMap, creeu un compte utilitzant el formulari següent.</li>\n<li>\n Si ja teniu un compte, podeu iniciar sessió amb el vostre compte\n utilitzant el nom d'usuari i contrasenya i aleshores associeu el compte\n amb el vostre compte OpenID a les preferències d'usuari.\n</li>\n</ul>" + openid no password: Amb l'OpenID no es requereix contrasenya, però algunes eines extres o el servidor encara poden necessitar-la. password: "Contrasenya:" terms accepted: Gràcies per a l'acceptació de les condicions de col. laborador nou! terms declined: Lamentem que vostè ha decidit no acceptar els nous termes de col. laborador. Per a més informació, si us plau vegi <a href="%{url}">aquesta pàgina de wiki</a>. - title: Crear compte - use openid: Alternativament, utilitzi %{logo} OpenID per connectar-se + title: Crea un compte + use openid: Alternativament, utilitzeu %{logo} OpenID per iniciar sessió no_such_user: - body: Ho sentim, no hi ha cap usuari amb el nom %{user}. Si us plau, comproveu l'ortografia, o potser l'enllaç que es fa clic està malament. - heading: No existeix l'usuari %{user} - title: No existeix aquest usuari + body: No hi ha cap usuari amb el nom %{user}. Comproveu l'ortografia, o potser l'enllaç on heu fet clic és incorrecte. + heading: L'usuari %{user} no existeix + title: Aquest usuari no existeix popup: friend: Amic nearby mapper: L'Assignador proper @@ -1592,19 +1563,19 @@ ca: webmaster: per a administradors web terms: agree: D'acord - consider_pd: A més de l'acord de dalt, que considero el meu contribucions d'estar en el domini públic + consider_pd: A més de l'acord de dalt, considero que les meves contribucions han d'estar en el domini públic consider_pd_why: què és això? - decline: Declinar + decline: Ho rebutjo guidance: "Informació per ajudar a entendre aquestes condicions: un <a href=\"%{summary}\">resum llegible humà</a> i algunes <a href=\"%{translations}\">traduccions informals</a>" - heading: Termes de col. laborador + heading: "Termes de col·laboració:" legale_names: france: França italy: Itàlia rest_of_world: Resta del món - legale_select: "Si us plau seleccioni el seu país de residència:" - read and accept: Si us plau llegeixi l'acord de sota i premeu el botó d'acord per confirmar que vostè accepta els termes d'aquest acord per les seves contribucions existents i futures. - title: Termes de col. laborador - you need to accept or decline: Si us plau, llegiu i llavors acceptar o disminució de les condicions de col. laborador nou per continuar. + legale_select: "Seleccioneu el vostre estat de residència:" + read and accept: Llegeiu l'acord de sota i premeu el botó D'acord per confirmar que accepteu els termes d'aquest acord per a les vostres contribucions existents i futures. + title: "Termes de col·laboració:" + you need to accept or decline: Llegiu i després accepteu o rebutgeu els termes per a nous col·laboradors per continuar. view: activate_user: activa aquest usuari add as friend: afegeix com a amic @@ -1690,7 +1661,6 @@ ca: filter: block_expired: El bloc ja ha expirat i no es pot editar. block_period: El període de blocatge ha de ser un dels valors seleccionables de la llista desplegable. - not_a_moderator: Vostè necessita ser un moderador per dur a terme aquesta acció. helper: time_future: Finalitza en %{time}. time_past: Va acabar fa %{time}. diff --git a/config/locales/cs.yml b/config/locales/cs.yml index aa827b70c..98c6101eb 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1,13 +1,17 @@ -# Messages for Czech (Česky) +# Messages for Czech (česky) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Bilbo +# Author: Jezevec # Author: Jkjk # Author: Kuvaly # Author: Luk # Author: Masox # Author: Mormegil # Author: Mr. Richard Bolla +# Author: Nemo bis +# Author: Reaperman +# Author: Tchoř # Author: Veritaslibero cs: activerecord: @@ -81,6 +85,8 @@ cs: application: require_cookies: cookies_needed: Vypadá to, že máte zakázány cookies – před pokračováním si je v prohlížeči zapněte. + require_moderator: + not_a_moderator: K provedení této akce musíte být moderátor. setup_user_auth: blocked: Váš přístup k API byl zablokován. Další informace zjistíte přihlášením do webového rozhraní. need_to_see_terms: Váš přístup k API byl dočasně zablokován. PřihlaÅ¡te se prosím do webového rozhraní a přečtěte si Podmínky pro přispěvatele. Nemusíte je odsouhlasit, musíte si je ale zobrazit. @@ -88,7 +94,6 @@ cs: changeset: changeset: "Sada změn: %{id}" changesetxml: Soubor změn XML - download: Stáhnout %{changeset_xml_link} nebo %{osmchange_xml_link} feed: title: Sada změn %{id} title_comment: "Sada změn: %{id} - %{comment}" @@ -153,21 +158,19 @@ cs: next_changeset_tooltip: Další úprava od %{user} prev_changeset_tooltip: PředeÅ¡lá úprava od %{user} node: - download: "%{download_xml_link}, %{view_history_link} nebo %{edit_link}" download_xml: Stáhnout XML - edit: upravit + edit: Upravit uzel node: Uzel node_title: "Uzel: %{node_name}" - view_history: zobrazit historii + view_history: Zobrazit historii node_details: coordinates: "Souřadnice:" part_of: "Součást:" node_history: - download: "%{download_xml_link} nebo %{view_details_link}" download_xml: Stáhnout XML node_history: Historie uzlu node_history_title: "Historie uzlu: %{node_name}" - view_details: zobrazit detaily + view_details: Zobrazit detaily not_found: sorry: Promiňte, ale %{type} s id %{id} nebylo možné nalézt. type: @@ -178,21 +181,24 @@ cs: paging_nav: of: z showing_page: Zobrazuji stranu + redacted: + type: + node: uzel + relation: relace + way: cesta relation: - download: "%{download_xml_link} nebo %{view_history_link}" download_xml: Stáhnout XML relation: Relace relation_title: "Relace: %{relation_name}" - view_history: zobrazit historii + view_history: Zobrazit historii relation_details: members: "Členové:" part_of: "Součást:" relation_history: - download: "%{download_xml_link} nebo %{view_details_link}" download_xml: Stáhnout XML relation_history: Historie relace relation_history_title: "Historie relace: %{relation_name}" - view_details: zobrazit detaily + view_details: Zobrazit detaily relation_member: entry_role: "%{type} %{name} jako %{role}" type: @@ -204,14 +210,14 @@ cs: view_data: Ukázat data k zobrazené mapě start_rjs: data_frame_title: Data - data_layer_name: Data + data_layer_name: Procházet mapová data details: Detaily drag_a_box: Myší na mapě označte zvolenou oblast edited_by_user_at_timestamp: Upravil [[user]] dne [[timestamp]] hide_areas: Schovat oblasti history_for_feature: Historie pro [[feature]] load_data: Nahrát data - loaded_an_area_with_num_features: Máte načtenu oblast, která obsahuje [[num_features]] prvků. Některé prohlížeče mohou mít potíže při zobrazování takového množství dat. Obecně fungují prohlížeče nejlépe při zobrazování ne více než sta prvků současně – větší množství může způsobit, že bude prohlížeč reagovat pomalu či vůbec. Pokud jste si jisti, že chcete tato data zobrazit, klikněte na tlačítko níže. + loaded_an_area_with_num_features: Máte načtenu oblast, která obsahuje [[num_features]] prvků. Některé prohlížeče mohou mít potíže při zobrazování takového množství dat. Obecně fungují prohlížeče nejlépe při zobrazování ne více než [[max_features]] prvků současně – větší množství může způsobit, že bude prohlížeč reagovat pomalu či vůbec. Pokud jste si jisti, že chcete tato data zobrazit, klikněte na tlačítko níže. loading: Načítá se… manually_select: Ručně vybrat jinou oblast object_list: @@ -250,10 +256,9 @@ cs: relation: relace way: cesty way: - download: "%{download_xml_link}, %{view_history_link} nebo %{edit_link}" download_xml: Stáhnout XML - edit: upravit - view_history: zobrazit historii + edit: Upravit cestu + view_history: Zobrazit historii way: Cesta way_title: "Cesta: %{way_name}" way_details: @@ -263,9 +268,8 @@ cs: nodes: "Uzly:" part_of: "Součást:" way_history: - download: "%{download_xml_link} nebo %{view_details_link}" download_xml: Stáhnout XML - view_details: zobrazit detaily + view_details: Zobrazit detaily way_history: Historie cesty way_history_title: "Historie cesty: %{way_name}" changeset: @@ -294,6 +298,8 @@ cs: description_nearby: Sady změn uživatelů poblíž description_user: Sady změn uživatele %{user} description_user_bbox: Sady změn uživatele %{user} v %{bbox} + empty_anon_html: Zatím žádné editace + empty_user_html: Vypadá to, že jste zatím neprovedli žádné editace. Pokud chcete začít, podívejte se do <a href='http://wiki.openstreetmap.org/wiki/CS:Beginners_Guide_1.3'>Příručky pro začátečníka</a>. heading: Sady změn heading_bbox: Sady změn heading_friend: Sady změn @@ -309,6 +315,14 @@ cs: timeout: sorry: Omlouváme se, ale vámi požadovaný seznam sad změn se načítal příliÅ¡ dlouho. diary_entry: + comments: + ago: před %{ago} + comment: Komentář + has_commented_on: "%{display_name} okomentoval následující záznamy v deníčku" + newer_comments: Novější komentáře + older_comments: Starší komentáře + post: Záznam + when: Kdy diary_comment: comment_from: Komentář od %{link_user} z %{comment_created_at} confirm: Potvrdit @@ -367,10 +381,6 @@ cs: body: Je mi líto, ale žádný deníčkový záznam či komentář s ID %{id} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz. heading: Záznam s ID %{id} neexistuje title: Deníčkový záznam nenalezen - no_such_user: - body: Lituji, ale uživatel se jménem %{user} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz. - heading: Uživatel %{user} neexistuje - title: Uživatel nenalezen view: leave_a_comment: Zanechat komentář login: Přihlaste se @@ -403,6 +413,7 @@ cs: licence: Licence longitude: "Délka:" manually_select: Ručně vybrat jinou oblast + map_image: Obrázek mapy (zobrazuje standardní vrstvu) max: max. options: Nastavení osm_xml_data: Data OpenStreetMap XML @@ -464,9 +475,19 @@ cs: suffix_suburb: "%{parentname} - %{suffix}" search_osm_nominatim: prefix: + aeroway: + aerodrome: LetiÅ¡tě + apron: Odbavovací plocha + gate: LetiÅ¡tní brána + helipad: Heliport + runway: Dráha + taxiway: Pojezdová dráha + terminal: Terminál amenity: + WLAN: Přístup k WiFi airport: LetiÅ¡tě arts_centre: Kulturní centrum + artwork: Umělecké dílo atm: Bankomat auditorium: Posluchárna bank: Banka @@ -474,6 +495,7 @@ cs: bench: Lavička bicycle_parking: ParkoviÅ¡tě pro kola bicycle_rental: Půjčovna kol + biergarten: Zahradní hospoda brothel: Nevěstinec bureau_de_change: Směnárna bus_station: Autobusové nádraží @@ -482,6 +504,7 @@ cs: car_sharing: Sdílení aut car_wash: Automyčka casino: Kasino + charging_station: Nabíjecí stanice cinema: Kino clinic: Klinika club: Klub @@ -540,9 +563,11 @@ cs: shelter: Přístřeší shop: Obchod shopping: Nákupní centrum + shower: Sprchy social_club: Společenský klub studio: Studio supermarket: Supermarket + swimming_pool: Bazén taxi: Taxi telephone: Telefonní automat theatre: Divadlo @@ -557,37 +582,16 @@ cs: youth_centre: Centrum pro mládež boundary: administrative: Administrativní hranice + national_park: Národní park + protected_area: Chráněná oblast + bridge: + aqueduct: Akvadukt + suspension: Visutý most + swing: Otočný most + viaduct: Viadukt + "yes": Most building: - apartments: Bytový dům - block: Blok budov - bunker: Bunkr - chapel: Kaple - church: Kostel - city_hall: Radnice - commercial: Komerční budova - dormitory: Kolej - entrance: Vstup do objektu - faculty: Fakultní budova - farm: Hospodářská budova - flats: Byty - garage: Garáž - hall: Sál - hospital: Nemocniční budova - hotel: Hotel - house: Dům - industrial: Průmyslová budova - office: Kancelářská budova - public: Veřejná budova - residential: Obytná budova - retail: Maloobchodní budova - school: Å kolní budova - shop: Obchod - stadium: Stadion - store: Obchodní dům - terrace: Řadová zástavba - tower: Věž - train_station: Železniční stanice - university: Univerzitní budova + "yes": Budova highway: bridleway: Koňská stezka bus_guideway: Autobusová dráha @@ -595,12 +599,11 @@ cs: byway: Účelová komunikace construction: Silnice ve výstavbě cycleway: Cyklostezka - distance_marker: Kilometrovník emergency_access_point: Nouzový lokalizační bod footway: Chodník ford: Brod - gate: Brána living_street: Obytná zóna + milestone: Kilometrovník minor: Vedlejší silnice motorway: Dálnice motorway_junction: Dálniční křižovatka @@ -617,9 +620,11 @@ cs: secondary_link: Silnice druhé třídy service: Účelová komunikace services: Dálniční odpočívadlo + speed_camera: Radar steps: Schody stile: Schůdky přes ohradu tertiary: Silnice třetí třídy + tertiary_link: Silnice třetí třídy track: Cesta trail: Stezka trunk: Významná silnice @@ -633,6 +638,7 @@ cs: building: Budova castle: Hrad church: Kostel + fort: Pevnost house: Dům icon: Ikona manor: Panství @@ -657,6 +663,7 @@ cs: farmland: Zemědělská půda farmyard: Dvůr forest: Les + garages: Garáže grass: Trávník greenfield: Zelená plocha pro výstavbu industrial: Průmyslová zóna @@ -664,15 +671,15 @@ cs: meadow: Louka military: Vojenský prostor mine: Důl - mountain: Hory nature_reserve: Přírodní rezervace + orchard: Ovocný sad park: Park piste: Sjezdovka - plaza: Náměstí quarry: Lom railway: Železnice recreation_ground: Rekreační oblast reservoir: Zásobník na vodu + reservoir_watershed: Povodí nádrže residential: Rezidenční oblast retail: Maloobchody village_green: Náves @@ -681,6 +688,7 @@ cs: wood: Neudržovaný les leisure: beach_resort: Pobřežní letovisko + bird_hide: Ptačí pozorovatelna common: Obecní půda fishing: Rybářská oblast garden: Zahrada @@ -693,12 +701,17 @@ cs: pitch: HřiÅ¡tě playground: Dětské hřiÅ¡tě recreation_ground: Rekreační oblast + sauna: Sauna slipway: Skluzavka sports_centre: Sportovní centrum stadium: Stadion swimming_pool: Bazén track: Běžecká dráha water_park: Aquapark + military: + airfield: Vojenské letiÅ¡tě + barracks: Kasárna + bunker: Bunkr natural: bay: Záliv beach: Pláž @@ -706,11 +719,12 @@ cs: cave_entrance: Vstup do jeskyně channel: Kanál cliff: Útes - coastline: Pobřežní čára crater: Kráter + dune: Duna feature: Prvek fell: See http://wiki.openstreetmap.org/wiki/Tag:natural=fell fjord: Fjord + forest: Les geyser: Gejzír glacier: Ledovec heath: VřesoviÅ¡tě @@ -730,6 +744,7 @@ cs: scrub: RumiÅ¡tě shoal: Mělčina spring: Pramen + stone: Kámen strait: Úžina tree: Strom valley: Údolí @@ -738,6 +753,14 @@ cs: wetland: Mokřad wetlands: Mokřad wood: Neudržovaný les + office: + accountant: Účetní + estate_agent: Realitní kancelář + government: Vládní úřad + insurance: PojiÅ¡Å¥ovna + lawyer: Právnická kancelář + travel_agent: Cestovní kancelář + "yes": Kancelář place: airport: LetiÅ¡tě city: Velkoměsto @@ -749,6 +772,7 @@ cs: houses: Budovy island: Ostrov islet: Ostrůvek + isolated_dwelling: Samota locality: Oblast moor: Bažina municipality: Obecní úřad @@ -772,6 +796,7 @@ cs: junction: Kolejové rozvětvení level_crossing: Železniční přejezd light_rail: Rychlodráha + miniature: Zahradní železnice monorail: Monorail narrow_gauge: Úzkorozchodná dráha platform: Železniční nástupiÅ¡tě @@ -786,7 +811,7 @@ cs: yard: Přednádraží shop: alcohol: Prodej alkoholu - apparel: Prodej oděvů + antiques: Starožitnosti art: Prodej umění bakery: Pekařství beauty: Salón krásy @@ -795,7 +820,6 @@ cs: books: Knihkupectví butcher: Řeznictví car: Prodej automobilů - car_dealer: Prodej automobilů car_parts: Prodej autodílů car_repair: Autoservis carpet: Obchod s koberci @@ -810,7 +834,6 @@ cs: department_store: Obchodní dům discount: Diskontní prodejna doityourself: Obchod pro kutily - drugstore: Lékárna dry_cleaning: Chemická čistírna electronics: Prodej elektroniky estate_agent: Realitní kancelář @@ -876,7 +899,10 @@ cs: valley: Údolí viewpoint: Místo s dobrým výhledem zoo: Zoo + tunnel: + "yes": Tunel waterway: + artificial: Umělý vodní kanál/průplav boatyard: Loděnice canal: Kanál connector: Propojení vodních cest @@ -902,6 +928,7 @@ cs: base: cycle_map: Cyklomapa mapquest: MapQuest Open + standard: Standardní transport_map: Dopravní mapa site: edit_disabled_tooltip: Pro editaci mapy přejděte na větší měřítko @@ -911,6 +938,7 @@ cs: history_tooltip: Zobrazit editace této oblasti history_zoom_alert: Zobrazit editace této oblasti můžete jen ve větším přiblížení layouts: + community: Komunita community_blogs: Komunitní blogy community_blogs_title: Blogy členů komunity OpenStreetMap copyright: Copyright & licence @@ -932,19 +960,18 @@ cs: history: Historie home: domů home_tooltip: Přejít na polohu domova - inbox: zprávy (%{count}) + inbox_html: poÅ¡ta %{count} inbox_tooltip: few: Ve schránce máte %{count} nepřečtené zprávy one: Ve schránce máte 1 nepřečtenou zprávu other: Ve schránce máte %{count} nepřečtených zpráv zero: Nemáte žádné nepřečtené zprávy intro_1: OpenStreetMap je svobodná editovatelná mapa celého světa. Tvoří ji lidé jako vy. - intro_2: OpenStreetMap vám umožňuje společně si prohlížet, upravovat a používat geografická data z libovolného místa na Zemi. - intro_3: Hosting OpenStreetMap laskavě poskytují %{ucl}, %{ic} a %{bytemark}. Další partneři projektu jsou uvedeni na %{partners}. - intro_3_bytemark: Bytemark Hosting - intro_3_ic: Imperial College London - intro_3_partners: wiki - intro_3_ucl: středisko VR UCL + intro_2_create_account: si založíte uživatelský účet + intro_2_download: stáhnout + intro_2_html: Data si můžete volně %{download} a %{use} pod %{license}. Mapu můžete vylepÅ¡it, pokud %{create_account}. + intro_2_license: svobodnou licencí + intro_2_use: používat license: title: Data OpenStreetMap jsou k dispozici pod licencí Creative Commons Uveďte autora-Zachovejte licenci 2.0 Generic log_in: přihlásit se @@ -958,9 +985,14 @@ cs: title: Podpořte OpenStreetMap finančním příspěvkem osm_offline: Databáze OpenStreetMap je momentálně kvůli probíhající neodkladné údržbě mimo provoz. osm_read_only: Databáze OpenStreetMap je momentálně kvůli probíhající neodkladné údržbě pouze pro čtení. + partners_bytemark: Bytemark Hosting + partners_html: Hosting podporují %{ucl}, %{ic} a %{bytemark} a další %{partners}. + partners_ic: Imperial College London + partners_partners: partneři + partners_ucl: středisko VR UCL sign_up: zaregistrovat se sign_up_tooltip: Vytvořit si uživatelský účet pro editaci - sotm2011: NavÅ¡tivte konferenci OpenStreetMap 2011 „The State of the Map“ (Stav mapy) od 9. do 11. září v Denveru! + sotm2012: Přijeďte na letoÅ¡ní konferenci OpenStreetMap, The State of the Map, 6.–8. září v Tokiu! tag_line: Otevřená wiki-mapa světa user_diaries: Deníčky user_diaries_tooltip: Zobrazit deníčky uživatelů @@ -976,7 +1008,30 @@ cs: english_link: anglickým originálem text: V případě rozporů mezi touto přeloženou verzí a %{english_original_link} má přednost anglická stránka. title: O tomto překladu - legal_babble: "<h2>Autorská práva a licence</h2>\n<p>\n OpenStreetMap jsou <i>svobodná data</i>, nabízená za podmínek licence <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.cs\">Creative Commons Uveďte autora-Zachovejte licenci 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat naÅ¡e mapy i data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud naÅ¡e mapy nebo data budete upravovat nebo je použijete ve svém díle, musíte výsledek šířit pod stejnou licencí. VaÅ¡e práva a povinnosti jsou vysvětleny v plném <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">licenčním ujednání</a>.\n</p>\n\n<h3>Jak uvádět OpenStreetMap</h3>\n<p>\n Pokud používáte obrázky z mapy OpenStreetMap, žádáme, abyste uváděli přinejmenším „© Přispěvatelé OpenStreetMap, CC-BY-SA“. Pokud používáte pouze mapová data, požadujeme „Mapová data © Přispěvatelé OpenStreetMap, CC-BY-SA“.\n</p>\n<p>\n Pokud je to možné, OpenStreetMap by měl být hypertextový odkaz na <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> a CC-BY-SA na <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.cs\">http://creativecommons.org/licenses/by-sa/2.0/deed.cs</a>. Pokud používáte médium, které odkazy neumožňuje (např. v tiÅ¡těném díle), navrhujeme, abyste své čtenáře nasměrovali na www.openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy) a www.creativecommons.org.\n</p>\n\n<h3>Další informace</h3>\n<p>\n O používání naÅ¡ich dat se můžete dočíst více v naÅ¡em <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Právním FAQ</a>.\n</p>\n<p>\n Přispěvatelům OSM připomínáme, že by nikdy neměli přidávat data ze zdrojů chráněných autorským právem (např. Google Maps či tiÅ¡těné mapy) bez výslovného svolení držitelů práv.\n</p>\n<p>\n Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API.\n\n Vizte naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Pravidla použití API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Pravidla použití dlaždic</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Pravidla použití Nominatimu</a>.\n</p>\n\n<h3>NaÅ¡i přispěvatelé</h3>\n<p>\n NaÅ¡e licence CC-BY-SA vyžaduje, abyste „způsobem odpovídajícím danému nosiči a v přiměřené formě uváděli autora“. Jednotliví přispěvatelé nevyžadují uvádění svého autorství nad ono „Přispěvatelé OpenStreetMap“, ale tam, kde byla do OpenStreetMap zahrnuta data národních zeměměřických úřadů či jiných velkých zdrojů, může být přiměřené uznat jejich autorství uvedením jejich označení nebo odkázáním na tuto stránku.\n</p>\n<!--\nInformace pro editory této stránky\n\nNásledující seznamy obsahují pouze ty organizace, které vyžadují uvedení svého autorství jako podmínku použití svých dat v OpenStreetMap. Nejedná se o vÅ¡eobecný katalog importů a používá se jen v případě nutnosti uvedení autorství kvůli vyhovění licenci importovaných dat.\n\nVeÅ¡keré přídavky musí být nejprve prodiskutovány se správci systému OSM.\n-->\n<ul id=\"contributors\">\n <li><strong>Austrálie</strong>: Obsahuje data předměstí založená na datech Australského statistického úřadu.</li>\n <li><strong>Francie</strong>: Obsahuje data pocházející z Direction Générale des Impôts.</li>\n <li><strong>Kanada</strong>: Obsahuje data z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada).</li>\n <li><strong>Nový Zéland</strong>: Obsahuje data pocházející z Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Polsko</strong>: Obsahuje data z <a href=\"http://ump.waw.pl/\">map UMP-pcPL</a>. Copyright přispěvatelé UMP-pcPL.</li>\n <li><strong>Rakousko</strong>: Obsahuje data od <a href=\"http://data.wien.gv.at/\">města Vídně</a> pod <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Spojené království</strong>: Obsahuje data Ordnance Survey © Crown copyright a právo k databázi 2010.</li>\n</ul>\n\n<p>\n Zahrnutí dat do OpenStreetMap neznamená, že původní poskytovatel dat podporuje OpenStreetMap, nabízí jakoukoli záruku nebo přijímá jakoukoli zodpovědnost.\n</p>" + legal_babble: + contributors_at_html: "<strong>Rakousko</strong>: Obsahuje data od <a href=\"http://data.wien.gv.at/\">města Vídně</a> pod <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">země Vorarlbersko</a> a země Tyrolsko (pod <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC BY AT s dodatky</a>)." + contributors_au_html: "<strong>Austrálie</strong>: Obsahuje data předměstí založená na datech Australského statistického úřadu." + contributors_ca_html: "<strong>Kanada</strong>: Obsahuje data z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: "Další podrobnosti o těchto a dalších zdrojích, které se používaly pro vylepÅ¡ení OpenStreetMap, najdete na <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">stránce Contributors</a> na wiki OpenStreetMap." + contributors_footer_2_html: Zahrnutí dat do OpenStreetMap neznamená, že původní poskytovatel dat podporuje OpenStreetMap, nabízí jakoukoli záruku nebo přijímá jakoukoli zodpovědnost. + contributors_fr_html: "<strong>Francie</strong>: Obsahuje data pocházející z Direction Générale des Impôts." + contributors_gb_html: "<strong>Spojené království</strong>: Obsahuje data Ordnance Survey © Crown copyright a právo k databázi 2010." + contributors_intro_html: NaÅ¡e licence CC BY-SA vyžaduje, abyste „způsobem odpovídajícím danému nosiči a v přiměřené formě uváděli autora“. Jednotliví přispěvatelé nevyžadují uvádění svého autorství nad ono „Přispěvatelé OpenStreetMap“, ale tam, kde byla do OpenStreetMap zahrnuta data národních zeměměřických úřadů či jiných velkých zdrojů, může být přiměřené uznat jejich autorství uvedením jejich označení nebo odkázáním na tuto stránku. + contributors_nl_html: "<strong>Nizozemsko</strong>: Obsahuje © AND data, 2007 (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nový Zéland</strong>: Obsahuje data pocházející z Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polsko</strong>: Obsahuje data z <a href=\"http://ump.waw.pl/\">map UMP-pcPL</a>. Copyright přispěvatelé UMP-pcPL. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">Více o využití dat UMP na OSM</a>" + contributors_title_html: NaÅ¡i přispěvatelé + contributors_za_html: "<strong>Jihoafrická republika</strong>: Obsahuje data pocházející z <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: Pokud používáte obrázky z mapy OpenStreetMap, žádáme, abyste uváděli přinejmenším „© Přispěvatelé OpenStreetMap, CC BY-SA“. Pokud používáte pouze mapová data, požadujeme „Mapová data © Přispěvatelé OpenStreetMap, CC BY-SA“. + credit_2_html: Pokud je to možné, OpenStreetMap by měl být hypertextový odkaz na <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> a CC BY-SA na <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.cs">http://creativecommons.org/licenses/by-sa/2.0/deed.cs</a>. Pokud používáte médium, které odkazy neumožňuje (např. v tiÅ¡těném díle), navrhujeme, abyste své čtenáře nasměrovali na www.openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy) a www.creativecommons.org. + credit_title_html: Jak uvádět OpenStreetMap + intro_1_html: OpenStreetMap jsou <i>svobodná data</i>, nabízená za podmínek licence <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.cs">Creative Commons Uveďte autora-Zachovejte licenci 2.0</a> (CC BY-SA). + intro_2_html: Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat naÅ¡e mapy i data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud naÅ¡e mapy nebo data budete upravovat nebo je použijete ve svém díle, musíte výsledek šířit pod stejnou licencí. VaÅ¡e práva a povinnosti jsou vysvětleny v plném <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">licenčním ujednání</a>. + more_1_html: O používání naÅ¡ich dat se můžete dočíst více v naÅ¡em <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Právním FAQ</a>. + more_2_html: Přispěvatelům OSM připomínáme, že by nikdy neměli přidávat data ze zdrojů chráněných autorským právem (např. Google Maps či tiÅ¡těné mapy) bez výslovného svolení držitelů práv. + more_3_html: "Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API.\n\n Vizte naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Pravidla použití API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Pravidla použití dlaždic</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Pravidla použití Nominatimu</a>." + more_title_html: Další informace + title_html: Autorská práva a licence native: mapping_link: začít mapovat native_link: českou verzi @@ -1024,10 +1079,6 @@ cs: body: Je mi líto, ale žádná zpráva s tímto ID neexistuje. heading: Zpráva neexistuje title: Zpráva neexistuje - no_such_user: - body: Je mi líto, ale žádný uživatel s tímto jménem neexistuje. - heading: Uživatel nenalezen - title: Uživatel nenalezen outbox: date: Datum inbox: doručená poÅ¡ta @@ -1202,6 +1253,8 @@ cs: allow_write_gpx: nahrávat GPS stopy. allow_write_prefs: měnit jejich uživatelské nastavení. authorize_url: "Autorizační URL:" + confirm: Opravdu? + delete: Smazat klienta edit: Upravit podrobnosti key: "Uživatelský klíč:" requests: "Uživatelé se žádají o následující oprávnění:" @@ -1211,6 +1264,17 @@ cs: url: "URL tokenu požadavku:" update: flash: Klientské informace úspěšně aktualizovány + redaction: + edit: + description: Popis + new: + description: Popis + show: + confirm: Opravdu? + description: "Popis:" + user: "Autor:" + update: + flash: Změny uloženy. site: edit: anon_edits_link_text: Proč to tak je? @@ -1225,7 +1289,6 @@ cs: index: js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript zakázaný. js_2: OpenStreetMap používá pro svou interaktivní mapu JavaScript. - js_3: Pokud nemůžete JavaScript zapnout, můžete vyzkouÅ¡et <a href="http://tah.openstreetmap.org/Browse/">statický prohlížeč Tiles@Home</a>. license: license_name: Creative Commons Uveďte autora-Zachovejte licenci 2.0 Generic notice: Nabízeno pod licencí %{license_name}, vytvořeno přispěvateli %{project_name}. @@ -1302,6 +1365,23 @@ cs: unclassified: Silnice unsurfaced: Nezpevněná cesta wood: Les + markdown_help: + alt: Alternativní text + first: První položka + heading: Nadpis + headings: Nadpisy + image: Obrázek + link: Odkaz + ordered: Číslovaný seznam + second: Druhá položka + subheading: Podnadpis + text: Text + title_html: Zpracovává se <a href="http://daringfireball.net/projects/markdown/">Markdownem</a> + unordered: Neseřazený seznam + url: URL + richtext_area: + edit: Upravit + preview: Náhled search: search: Hledat search_help: "příklady: „Příbram“, „Havlíčkova, Plzeň“, „CB2 5AQ“, nebo „post offices near Mělník“ <a href='http://wiki.openstreetmap.org/wiki/Search'>další příklady…</a>" @@ -1338,16 +1418,13 @@ cs: visibility: "Viditelnost:" visibility_help: co tohle znamená? list: + empty_html: Nic tu jeÅ¡tě není. <a href='%{upload_link}'>Nahrajte novou stopu</a> nebo si něco o GPS stopách přečtěte na <a href='http://wiki.openstreetmap.org/wiki/CS:Beginners_Guide_1.2'>wiki</a>. public_traces: Veřejné GPS stopy public_traces_from: Veřejné GPS stopy uživatele %{user} tagged_with: " oÅ¡títkované jako %{tags}" your_traces: VaÅ¡e GPS stopy make_public: made_public: Stopa zveřejněna - no_such_user: - body: Lituji, ale uživatel %{user} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz. - heading: Uživatel %{user} neexistuje - title: Uživatel nenalezen offline: heading: GPX úložiÅ¡tě offline message: ÚložiÅ¡tě GPX souborů a systém pro nahrávání jsou momentálně mimo provoz. @@ -1386,8 +1463,8 @@ cs: trace_optionals: tags: Å títky trace_paging_nav: - next: Následující » - previous: « Předchozí + newer: Novější stopy + older: Starší stopy showing_page: Zobrazuji stranu %{page} view: delete_track: Smazat tuto stopu @@ -1504,6 +1581,7 @@ cs: login_button: Přihlásit lost password link: Ztratili jste heslo? new to osm: Jste na OpenStreetMap noví? + no account: Nemáte účet? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Zjistěte více o nadcházející změně licence OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">překlady</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskuse</a>) notice_terms: OpenStreetMap přechází 1. dubna 2012 na novou licenci. Je stejně otevřená jako ta stávající, ale právní řeÅ¡ení je pro naší mapovou databázi mnohem vhodnější. Velice rádi bychom v OpenStreetMap zachovali vaÅ¡e příspěvky, to ale můžeme jen v případě, že svolíte k jejich šíření pod novou licencí. V opačném případě je budeme muset z databáze odstranit.<br /><br />Prosíme, přihlaste se a věnujte chvilku k přečtení a odsouhlasení nových podmínek. Děkujeme! openid: "%{logo} OpenID:" @@ -1530,8 +1608,8 @@ cs: alt: Přihlášení pomocí Yahoo OpenID title: Přihlášení pomocí Yahoo password: "Heslo:" - register now: Zaregistrovat se - remember: "Zapamatuj si mě:" + register now: Zaregistrujte se + remember: Zapamatuj si mě title: Přihlásit se to make changes: Pokud chcete upravovat OpenStreetMap, musíte mít uživatelský účet. with openid: "Nebo se můžete přihlásit svým OpenID:" @@ -1616,14 +1694,15 @@ cs: legale_select: "Označte zemi, ve které sídlíte:" read and accept: Přečtěte si prosím níže zobrazenou dohodu a klikněte na tlačítko souhlasu, čímž potvrdíte, že přijímáte podmínky této dohody pro stávající i budoucí příspěvky. title: Podmínky pro přispěvatele - you need to accept or decline: Pro pokračování si prosím přečtětě a přijměte nebo odmítněte nové Podmínky pro přispěvatele. + you need to accept or decline: Pro pokračování si prosím přečtěte a přijměte nebo odmítněte nové Podmínky pro přispěvatele. view: activate_user: aktivovat tohoto uživatele add as friend: přidat jako přítele ago: (před %{time_in_words_ago}) - block_history: zobrazit zablokování + block_history: zablokování blocks by me: zablokování mnou blocks on me: moje zablokování + comments: komentáře confirm: Potvrdit confirm_user: potvrdit tohoto uživatele create_block: blokovat tohoto uživatele @@ -1646,7 +1725,8 @@ cs: latest edit: "Poslední editace %{ago}:" m away: "%{count} m" mapper since: "Účastník projektu od:" - moderator_history: zobrazit udělená zablokování + moderator_history: udělená zablokování + my comments: moje komentáře my diary: můj deníček my edits: moje editace my settings: moje nastavení @@ -1701,7 +1781,6 @@ cs: filter: block_expired: Tento blok již vyprÅ¡el, a proto ho nelze upravovat. block_period: Doba bloku musí být jedna z těch, které obsahuje rozevírací seznam. - not_a_moderator: K provedení této akce musíte být správce. helper: time_future: Končí v %{time}. time_past: Ukončeno před %{time}. @@ -1731,11 +1810,14 @@ cs: creator_name: Autor display_name: Zablokovaný uživatel edit: Upravit + next: Následující » not_revoked: (nezruÅ¡eno) + previous: « Předchozí reason: Důvod pro blok revoke: ZruÅ¡it ! revoker_name: ZruÅ¡no show: Zobrazit + showing_page: Zobrazuji stranu %{page} status: Stav period: one: 1 hodina @@ -1763,7 +1845,7 @@ cs: time_past: Ukončeno před %{time} title: "%{block_on} zablokován uživatelem %{block_by}" update: - only_creator_can_edit: Jen správce, který tento blok vytvořil, ho může upravovat. + only_creator_can_edit: Jen moderátor, který tento blok vytvořil, ho může upravovat. success: Blok aktualizován. user_role: filter: diff --git a/config/locales/da.yml b/config/locales/da.yml index 71b70b521..82ab89504 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1,4 +1,4 @@ -# Messages for Danish (Dansk) +# Messages for Danish (dansk) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Christian List @@ -7,6 +7,7 @@ # Author: Gnonthgol # Author: Gorbi # Author: Hylle +# Author: Nemo bis # Author: OleLaursen # Author: The real emj # Author: Winbladh @@ -47,15 +48,15 @@ da: pass_crypt: Adgangskode models: acl: Adgangskontrolliste - changeset: Ændring - changeset_tag: Ændringsegenskab + changeset: Ændringssæt + changeset_tag: Egenskab for ændringssæt country: Land diary_comment: Blogkommentar diary_entry: Blogindlæg friend: Ven language: Sprog message: Meddelelse - node: Punk + node: Punkt node_tag: Punktegenskab notifier: Underret old_node: Tidligere punkt @@ -82,6 +83,8 @@ da: application: require_cookies: cookies_needed: Du har tilsyneladende deaktiveret cookies i din browser. Aktivér cookies før du fortsætter. + require_moderator: + not_a_moderator: Du skal være moderator for at udføre denne handling. setup_user_auth: blocked: Din adgang til API'et er blokeret. Log ind pÃ¥ webinterfacet for a finde ud mere. need_to_see_terms: Din adgang til API-et er midlertidig stoppet. Log ind pÃ¥ netsiden for at læse bidragsydervilkÃ¥rene. Du behøver ikke at godkende vilkÃ¥rene, men du skal læse dem. @@ -89,11 +92,10 @@ da: changeset: changeset: "Ændringssæt: %{id}" changesetxml: XML for ændringssæt - download: Hent %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Ændringssæt %{id} title_comment: Ændringssæt %{id} - %{comment} - osmchangexml: osmChange XML + osmchangexml: XML for osmChange title: Ændringssæt changeset_details: belongs_to: "Tilhører:" @@ -135,7 +137,7 @@ da: node: Vis punkt pÃ¥ større kort relation: Vis relation pÃ¥ større kort way: Vis vej pÃ¥ større kort - loading: Indlæsning... + loading: Indlæser... navigation: all: next_changeset_tooltip: Næste ændringssæt @@ -151,21 +153,19 @@ da: next_changeset_tooltip: Næste ændring af %{user} prev_changeset_tooltip: Forrige ændring af %{user} node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Hent XML - edit: redigér + edit: Redigér punkt node: Punkt node_title: "Punkt: %{node_name}" - view_history: vis historik + view_history: Vis historik node_details: coordinates: "Koordinater:" part_of: "Del af:" node_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Hent XML node_history: Punkthistorik node_history_title: "Punkthistorik: %{node_name}" - view_details: vis detaljer + view_details: Vis detaljer not_found: sorry: Unskyld, %{type}'en med id %{id} kan ikke findes. type: @@ -176,21 +176,24 @@ da: paging_nav: of: af showing_page: Viser side + redacted: + type: + node: punkt + relation: relation + way: vej relation: - download: "%{download_xml_link} eller %{view_history_link}" - download_xml: Hent ned XML + download_xml: Hent XML relation: Relation relation_title: "Relation: %{relation_name}" - view_history: vis historik + view_history: Vis historik relation_details: members: "Medlemmer:" part_of: "Del af:" relation_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Hent XML relation_history: Relationshistorik relation_history_title: "Relationshistorik: %{relation_name}" - view_details: vis detaljer + view_details: Vis detaljer relation_member: entry_role: "%{type} %{name} som %{role}" type: @@ -202,15 +205,15 @@ da: view_data: Vis data for nuværende kortvisning start_rjs: data_frame_title: Data - data_layer_name: Data + data_layer_name: Gennemse kortdata details: Detaljer drag_a_box: Træk en kasse pÃ¥ kortet for at vælge et omrÃ¥de edited_by_user_at_timestamp: Redigeret af [[user]], [[timestamp]] hide_areas: Skjul omrÃ¥der history_for_feature: Historik for [[feature]] load_data: Indlæs data - loaded_an_area_with_num_features: "Du har indlæst et omrÃ¥de som indeholder [[num_features]] objekter. Nogle browsere kan have problemer ved hÃ¥ndtering af sÃ¥ meget data. Browsere fungerer generelt bedst med mindre end 100 objekter ad gangen: flere objekter kan gøre at din browser bliver langsom. Hvis du er sikker pÃ¥, at du vil se alle disse data, sÃ¥ klik pÃ¥ knappen nedenfor." - loading: Indlæsning... + loaded_an_area_with_num_features: "Du har indlæst et omrÃ¥de som indeholder [[num_features]] objekter. Nogle browsere kan have problemer ved hÃ¥ndtering af sÃ¥ meget data. Browsere fungerer generelt bedst med mindre end [[max_features]] objekter ad gangen: flere objekter kan gøre at din browser bliver langsom. Hvis du er sikker pÃ¥, at du vil se alle disse data, sÃ¥ klik pÃ¥ knappen nedenfor." + loading: Indlæser... manually_select: Vælg et andet omrÃ¥de manuelt object_list: api: Hent dette omrÃ¥de fra API'et @@ -237,8 +240,8 @@ da: tag_details: tags: "Egenskaber:" wiki_link: - key: Wikisiden med beskrivelsen af %{key} - tag: Wikisiden med beskrivelsen af %{key}=%{value} + key: Wikisiden med beskrivelse af %{key} egenskaben + tag: Wikisiden med beskrivelse af %{key}=%{value} egenskaben wikipedia_link: Artiklen %{page} pÃ¥ Wikipedia timeout: sorry: Beklager, data for %{type} med id %{id} tog for lang tid at hente @@ -248,22 +251,20 @@ da: relation: relation way: vej way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Hent XML - edit: redigér - view_history: vis historik + edit: Redigér vej + view_history: Vis historik way: Vej way_title: "Vej: %{way_name}" way_details: also_part_of: - one: ogsÃ¥ del af vej %{related_ways} - other: ogsÃ¥ del af veje %{related_ways} + one: ogsÃ¥ del af vejen %{related_ways} + other: ogsÃ¥ del af vejene %{related_ways} nodes: "Punkter:" part_of: "Del af:" way_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Hent XML - view_details: vis detaljer + view_details: Vis detaljer way_history: Vejhistorik way_history_title: "Vejhistorik: %{way_name}" changeset: @@ -288,35 +289,48 @@ da: list: description: Seneste ændringer description_bbox: Ændringer inden for %{bbox} - description_friend: Changesets af dine venner + description_friend: Ændringssæt af dine venner + description_nearby: Ændringssæt af nærliggende brugere description_user: Ændringssæt af %{user} description_user_bbox: Ændringssæt af %{user} inden for %{bbox} + empty_anon_html: Ingen redigeringer foretaget endnu + empty_user_html: Det ser ud til du endnu ikke har lavet nogen redigeringer. Tjek <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>begynderens' guide</a> for at komme i gang. heading: Ændringssæt heading_bbox: Ændringssæt - heading_friend: Changesets + heading_friend: Ændringssæt + heading_nearby: Ændringssæt heading_user: Ændringssæt heading_user_bbox: Ændringssæt title: Ændringssæt title_bbox: Ændringssæt inden for %{bbox} - title_friend: Changesets af dine venner + title_friend: Ændringssæt af dine venner + title_nearby: Ændringssæt af nærliggende brugere title_user: Ændringssæt af %{user} title_user_bbox: Ændringssæt af %{user} inden for %{bbox} timeout: - sorry: Desværre tog det for lang tid for at hente den ændringssætliste du har bedt om. + sorry: Desværre tog det for lang tid for at hente den liste af ændringssæt du har bedt om. diary_entry: + comments: + ago: "%{ago} siden" + comment: Kommentar + has_commented_on: "%{display_name} har kommenteret følgende blogindlæg" + newer_comments: Nyere kommentarer + older_comments: Ældre kommentarer + post: Skriv + when: HvornÃ¥r diary_comment: - comment_from: Kommentar fra %{link_user} %{comment_created_at} + comment_from: Kommentar fra %{link_user}, %{comment_created_at} confirm: Bekræft hide_link: Skjul denne kommentar diary_entry: comment_count: one: 1 kommentar other: "%{count} kommentarer" - comment_link: Kommentér pÃ¥ dette indlæg + comment_link: Kommentér dette indlæg confirm: Bekræft edit_link: Vis dette indlæg hide_link: Skjul dette indlæg - posted_by: Skrevet af %{link_user} %{created} pÃ¥ %{language_link} + posted_by: Skrevet af %{link_user} den %{created} pÃ¥ %{language_link} reply_link: Svar pÃ¥ dette indlæg edit: body: "Indhold:" @@ -324,7 +338,7 @@ da: latitude: "Breddegrad:" location: "Position:" longitude: "Længdegrad:" - marker_text: Position for blogindlæg + marker_text: Placering for blogindlæg save_button: Gem subject: "Emne:" title: Ret blogindlæg @@ -338,7 +352,7 @@ da: title: OpenStreetMap-blogindlæg pÃ¥ %{language_name} user: description: Seneste OpenStreetMap-blogindlæg fra %{user} - title: OpenStreetMap-blogindlæg for %{user} + title: OpenStreetMap-blogindlæg fra %{user} list: in_language_title: Blogindlæg pÃ¥ %{language} new: Nyt blogindlæg @@ -348,6 +362,8 @@ da: older_entries: Ældre indlæg recent_entries: "Seneste blogindlæg:" title: Brugerblogs + title_friends: Venners blogs + title_nearby: Blogs fra brugere i nærheden user_title: Blog for %{user} location: edit: Ret @@ -359,10 +375,6 @@ da: body: Beklager, fandt ikke et blogindlæg eller en kommentar med id'en %{id}. Kontroller stavningen, eller mÃ¥ske er den henvisning du klikkede pÃ¥ forkert. heading: "Intet indlæg med id'et: %{id}" title: Intet blogindlæg fundet - no_such_user: - body: Beklager, der findes ingen bruger med dette navn %{user}. Kontrollér venligst din stavning. Det kan ogsÃ¥ skyldes et forkert link. - heading: Brugeren %{user} eksisterer ikke - title: Ingen bruger fundet view: leave_a_comment: Tilføj en kommentar login: Log pÃ¥ @@ -384,32 +396,33 @@ da: export: start: add_marker: Tilføj en markør pÃ¥ kortet - area_to_export: OmrÃ¥de at eksportere - embeddable_html: HTML-kode + area_to_export: OmrÃ¥de som skal eksporteres + embeddable_html: HTML der kan indlejres export_button: Eksportér export_details: OpenStreetMaps data er licenseret under <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>-licensen. - format: "Format:" + format: Format format_to_export: Format for eksport image_size: "Billedestørrelse:" latitude: "Bredde:" licence: Licens longitude: "Længde:" manually_select: Vælg et andet omrÃ¥de manuelt + map_image: Kort billede (viser standard lag) max: maks options: Indstillinger osm_xml_data: OpenStreetMap XML-data output: Output - paste_html: Indsæt HTML som skal ind i siden + paste_html: Indsæt HTML som skal indlejres i siden scale: Skala too_large: - body: Dette omrÃ¥de er for stor for at blive eksporteret som OpenStreetMap XML data. Zoom ind eller vælg et mindre omrÃ¥de. + body: Dette omrÃ¥de er for stort til at blive eksporteret som OpenStreetMap XML-data. Zoom ind eller vælg et mindre omrÃ¥de. heading: OmrÃ¥de for stort zoom: Zoom start_rjs: add_marker: Tilføj en markør pÃ¥ kortet - change_marker: Skrift markørposition + change_marker: Skift markørposition click_add_marker: Klik pÃ¥ kortet for at tilføje en markør - drag_a_box: Træk en boks pÃ¥ kortet for at vælge et omrÃ¥de + drag_a_box: Træk en kasse pÃ¥ kortet for at vælge et omrÃ¥de export: Eksportér manually_select: Vælg et andet omrÃ¥de manuelt view_larger_map: Vis større kort @@ -436,7 +449,7 @@ da: west: vest distance: one: omkring 1 km - other: omkring %{count}km + other: omkring %{count} km zero: mindre end 1 km results: more_results: Flere resultater @@ -445,7 +458,7 @@ da: title: ca_postcode: Resultater fra <a href="http://geocoder.ca/">Geocoder.CA</a> geonames: Resultater fra <a href="http://www.geonames.org/">GeoNames</a> - latlon: Resultater for koordinater + latlon: Resultater fra <a href="http://openstreetmap.org/">interne</a> osm_namefinder: Resultater fra <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a> osm_nominatim: Resultater fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> uk_postcode: Resultater fra <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> @@ -455,13 +468,24 @@ da: suffix_place: ", %{distance} %{direction} for %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Flyveplads + apron: Forstykke + gate: Gate + helipad: Helikopterplads + runway: Landingsbane + taxiway: Rullevej + terminal: Terminal amenity: + WLAN: WiFi-adgangspunkt airport: Lufthavn arts_centre: Kunstcenter + artwork: Kunst atm: Pengeautomat auditorium: Auditorium bank: Bank bar: Bar + bbq: Grill bench: Bænk bicycle_parking: Cykelparkering bicycle_rental: Cykeludlejning @@ -473,11 +497,12 @@ da: car_sharing: Delebiler car_wash: Bilvask casino: Kasino + charging_station: Ladestation cinema: Biograf clinic: Klinik club: Klub - college: College - community_centre: Fællesskabscenter + college: VideregÃ¥ende uddanelsesinstitution + community_centre: Forsamlingshus / lokalcenter courthouse: Retsbygning crematorium: Krematorium dentist: Tandlæge @@ -507,17 +532,17 @@ da: marketplace: Markedsplads mountain_rescue: Bjergredning nightclub: Natklub - nursery: Børnehaveklasse + nursery: Førskole nursing_home: Plejehjem office: Kontor park: Park parking: Parkering pharmacy: Apotek - place_of_worship: Kultsted + place_of_worship: Sted for gudstjenester police: Politi post_box: Postkasse post_office: Postkontor - preschool: Børnehaveklasse + preschool: Før-børnehaveklasse prison: Fængsel pub: Pub public_building: Offentlig bygning @@ -531,9 +556,11 @@ da: shelter: Shelter shop: Forretning shopping: Indkøb + shower: Brusebad social_club: Social klub studio: Studie supermarket: Supermarked + swimming_pool: Swimmingpool taxi: Taxa telephone: Offentlig telefon theatre: Teater @@ -548,37 +575,17 @@ da: youth_centre: Ungdomscenter boundary: administrative: Administrativ grænse + census: Folketællingsgrænse + national_park: Nationalpark + protected_area: Beskyttet omrÃ¥de + bridge: + aqueduct: Akvædukt + suspension: Hængebro + swing: Drejebro + viaduct: Viadukt + "yes": Bro building: - apartments: Lejlighedsblok - block: Bygningsblok - bunker: Bunker - chapel: Kapel - church: Kirke - city_hall: RÃ¥dhus - commercial: Erhvervsbygning - dormitory: Kollegium - entrance: Bygningsindgang - faculty: Fakultetsbygning - farm: Landbrugsbygning - flats: Lejligheder - garage: Garage - hall: Hal - hospital: Sygehusbygning - hotel: Hotel - house: Hus - industrial: Industribygning - office: Kontorbygning - public: Offentlig bygning - residential: Beboelsesbygning - retail: Detailhandelbygning - school: Skolebygning - shop: Forretning - stadium: Stadion - store: Butik - terrace: Terrasse - tower: TÃ¥rn - train_station: Jernbanestation - university: Universitetsbygning + "yes": Bygning highway: bridleway: Ridesti bus_guideway: Styret busspor @@ -586,12 +593,11 @@ da: byway: Stikvej construction: Vej under konstruktion cycleway: Cykelsti - distance_marker: Afstandsmarkør emergency_access_point: Nødudgangspunkt footway: Gangsti ford: Vadested - gate: LÃ¥ge living_street: Vej med legende børn + milestone: Milepæl minor: Mindre vej motorway: Motorvej motorway_junction: Motorvejsafkørsel @@ -603,14 +609,17 @@ da: primary_link: Hovedvej (primærrute) raceway: Racerbane residential: Vej i byomrÃ¥der + rest_area: Rasteplads road: Vej secondary: Hovedvej (sekundærrute) secondary_link: Hovedvej (sekundærrute) service: Adgangsvej services: MotorvejsserviceomrÃ¥de + speed_camera: Fartkamera steps: Trappe stile: FÃ¥retrappe tertiary: Hovedvej + tertiary_link: Hovedvej track: Hjulspor trail: Spor trunk: Motortrafikvej @@ -624,6 +633,7 @@ da: building: Bygning castle: Slot church: Kirke + fort: Skanse house: Hus icon: Ikon manor: HerregÃ¥rd @@ -648,6 +658,7 @@ da: farmland: Landbrugsjord farmyard: GÃ¥rdsplads forest: Skov + garages: Garager grass: Græs greenfield: Ikke-udviklet omrÃ¥de industrial: IndustriomrÃ¥de @@ -655,23 +666,24 @@ da: meadow: Eng military: Militært omrÃ¥de mine: Mine - mountain: Bjerg nature_reserve: Naturreservat + orchard: Plantage park: Park piste: Piste - plaza: Torv quarry: Stenbrud/grusgrav railway: Jernbane recreation_ground: Idrætsplads reservoir: Reservoir residential: BoligomrÃ¥de retail: Detailhandel + road: VejomrÃ¥de village_green: Forte vineyard: VingÃ¥rd wetland: VÃ¥domrÃ¥de wood: Skov leisure: beach_resort: Badestrand + bird_hide: Fugleskjul common: Fælles arealer fishing: FiskeomrÃ¥de garden: Have @@ -684,12 +696,17 @@ da: pitch: Sportsarena playground: Legeplads recreation_ground: Idrætsplads + sauna: Sauna slipway: Bedding sports_centre: Sportscenter stadium: Stadion swimming_pool: Svømmebasin track: Løbebane water_park: Vandland + military: + airfield: Militær flyveplads + barracks: Kaserne + bunker: Bunker natural: bay: Bugt beach: Strand @@ -697,11 +714,12 @@ da: cave_entrance: Huleindgang channel: Kanal cliff: Forbjerg - coastline: Kystlinje crater: Krater + dune: Klit feature: Landskabsdetalje fell: Fjeld fjord: Fjord + forest: Skov geyser: Gejser glacier: Gletsjer heath: Hede @@ -721,6 +739,7 @@ da: scrub: Krat shoal: Sandbanke spring: Kilde + stone: Sten strait: Sund tree: Træ valley: Dal @@ -729,6 +748,19 @@ da: wetland: VÃ¥domrÃ¥de wetlands: VÃ¥domrÃ¥der wood: Skov + office: + accountant: Revisor + architect: Arkitekt + company: Firma + employment_agency: Arbejdsløshedskontor + estate_agent: Ejendomsmægler + government: Statligt kontor + insurance: Forsikringskontor + lawyer: Advokat + ngo: ikkestatsligt kontor (NGO) + telecommunication: Telekommunikationskontor + travel_agent: Rejsebureau + "yes": Kontor place: airport: Lufthavn city: Storby @@ -747,13 +779,13 @@ da: region: Region sea: Hav state: Stat - subdivision: Underafdeling + subdivision: Bydel suburb: Forstad town: By unincorporated_area: Kommunefrit omrÃ¥de village: Landsby railway: - abandoned: Forladt jernbane + abandoned: Nedlagt jernbane construction: Jernbane under konstruktion disused: Nedlagt jernbane disused_station: Nedlagt jernbanestation @@ -763,8 +795,9 @@ da: junction: Jernbaneovergang level_crossing: Jernbaneoverskæring light_rail: Bybane + miniature: Miniature jernbane monorail: Monorail - narrow_gauge: Smalsporjernbane + narrow_gauge: Smalsporsjernbane platform: Jernbaneperron preserved: Bevaret jernbane spur: Jernbanesidespor @@ -777,7 +810,7 @@ da: yard: Jernbaneterræn shop: alcohol: Spiritusforretning - apparel: Tøjbutik + antiques: Antikviteter art: Kunstbutik bakery: Bager beauty: Skønhedssalon @@ -786,7 +819,6 @@ da: books: Boghandel butcher: Slagter car: Bilforhandler - car_dealer: Bilforhandler car_parts: Bilreservedele car_repair: Bilværksted carpet: Tæppebutik @@ -801,7 +833,6 @@ da: department_store: Varehus discount: Tilbudsbutik doityourself: Gør-det-selv - drugstore: Apotek dry_cleaning: Renseri electronics: Elektronikforretning estate_agent: Ejendomsmægler @@ -867,7 +898,10 @@ da: valley: Dal viewpoint: Udsigtspunkt zoo: Zoologisk have + tunnel: + "yes": Tunnel waterway: + artificial: Kunstig vandvej boatyard: BÃ¥deværft canal: Kanal connector: Vandvejsforbindelse @@ -892,16 +926,18 @@ da: map: base: cycle_map: Cykelkort + standard: Standard transport_map: Transportkort site: - edit_disabled_tooltip: Zoom ind for at rette kortet - edit_tooltip: Ret kortet - edit_zoom_alert: Du skal zoome ind for at rette kortet + edit_disabled_tooltip: Zoom ind for at redigere kortet + edit_tooltip: Rediger kortet + edit_zoom_alert: Du skal zoome ind for at redigere kortet history_disabled_tooltip: Zoom ind for at se ændringer for dette omrÃ¥de history_tooltip: Vis ændringer for dette omrÃ¥de history_zoom_alert: Du skal zoome ind for at se ændringer for dette omrÃ¥de layouts: - community_blogs: Blogs fra bidragydere + community: Fællesskabet + community_blogs: Blogs fra bidragsydere community_blogs_title: Blogs fra medlemmer af OpenStreetMap-fællesskabet copyright: Ophavsret & licens documentation: Dokumentation @@ -910,7 +946,7 @@ da: donate_link_text: donation edit: Redigér edit_with: Redigér med %{editor} - export: Eksporter + export: Eksportér export_tooltip: Eksportér kortdata foundation: Fond foundation_title: OpenStreetMap-fonden @@ -922,16 +958,17 @@ da: history: Historik home: hjem home_tooltip: GÃ¥ til hjemmeposition - inbox: indbakke (%{count}) + inbox_html: indbakke %{count} inbox_tooltip: one: Din indbakke indeholder 1 ulæst besked other: Din indbakke indeholder %{count} ulæste beskeder zero: Din indbakke indeholder ingen ulæste beskeder - intro_1: OpenStreetMap er et frit, redigerbart kort over hele verden. Det er lavet af folk som dig. - intro_2: OpenStreetMap gør det muligt at se, redigere og bruge geografiske data i samarbejde med resten af verden hvor som helst pÃ¥ jorden. - intro_3: OpenStreetMaps hosting støttes venligst af %{ucl} og %{bytemark}. Andre partnere af projektet er skrevet op i %{partners}'en. - intro_3_ic: Imperial College London - intro_3_partners: wiki + intro_1: OpenStreetMap er et frit kort over hele verden, lavet af folk som dig. + intro_2_create_account: Opret en brugerkonto + intro_2_download: hent + intro_2_html: Dataene er gratis at %{download} og %{use} under sin %{license}. %{create_account} for at forbedre kortet. + intro_2_license: Ã¥ben licens + intro_2_use: brug license: title: OpenStreetMap data er licenseret under en Creative Commons Navngivelse-Del pÃ¥ samme vilkÃ¥r 2.0 Generisk Licens log_in: log pÃ¥ @@ -945,13 +982,18 @@ da: title: Støt OpenStreetMap med en donation osm_offline: OpenStreetMap-databasen er for øjeblikket offline pÃ¥ grund af nødvendig databasevedligeholdelse. osm_read_only: OpenStreetMap databasen er for øjeblikket ikke redigerbar pÃ¥ grund af database vedligeholdelse. + partners_bytemark: Bytemark Hosting + partners_html: Hosting understøttes af %{ucl}, %{ic} og %{bytemark} og andre %{partners}. + partners_ic: Imperial College London + partners_partners: partnere + partners_ucl: UCL VR centret sign_up: opret konto sign_up_tooltip: Opret en konto for at kunne redigere - sotm2011: Kom til 2011 OpenStreetMap-konferencen, Kortets tilstand, 11.-9. september i Denver! + sotm2012: Kom til 2012 OpenStreetMap-konferencen, Kortets tilstand, 6.-8. september i Tokyo! tag_line: Det frie Wiki-verdenskort - user_diaries: Brugerdagbøger - user_diaries_tooltip: Vis brugerdagbøger - view: Kort + user_diaries: Brugerblogs + user_diaries_tooltip: Vis brugerblogs + view: Vis view_tooltip: Vis kortet welcome_user: Velkommen, %{user_link} welcome_user_link_tooltip: Din brugerside @@ -962,7 +1004,30 @@ da: english_link: den engelske originaltekst text: I tilfælde af en konflikt mellem denne oversatte side og %{english_original_link} har den engelske tekst forrang title: Om denne oversættelse - legal_babble: "<h2>Ophavsret og licens</h2>\n<p>OpenStreetMap er <i>Ã¥ben data</i>, licenseret under <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a>-licensen (CC-BY-SA).</p>\n\n<p>Du kan frit kopiere, distribuere, overføre og tilpasse vores kort\nog data, sÃ¥ længe du angiver OpenStreetMap og dets\nbidragydere som kilde. Hvis du ændrer eller bygger pÃ¥ vores kort\neller data, mÃ¥ du kun distribuere resultatet under den samme licens. Den\nfulde <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiske tekst</a>\nforklarer dine rettigheder og pligter.</p>\n\n<h3>Kildeangivelse og OpenStreetMap</h3>\n<p>Hvis du bruger OpenStreetMaps kortbilleder, anmoder vi om at\ndin kildeangivelse mindst bestÃ¥r af “© OpenStreetMap-bidragydere,\nCC-BY-SA”. Hvis du kun bruger kortdata, anmoder vi om “Kortdata\n© OpenStreetMap-bidragydere, CC-BY-SA”.</p>\n\n<p>SÃ¥ vidt muligt bør OpenStreetMap være et hyperlink til\n<a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nog CC-BY-SA til \n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\nHvis du bruger et medium hvor hyperlinks ikke er mulige (f.eks. en tryksag), foreslÃ¥r\nvi at du sender dine læsere til www.openstreetmap.org (mÃ¥ske ved at ændre\n'OpenStreetMap' til denne fulde adresse) og til www.creativecommons.org.</p>\n\n<h3>Læs mere</h3>\n<p>Læs mere om brug af vores data pÃ¥ den\n<a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Juridiske FAQ</a>.</p>\n\n<p>OSM-bidragydere bliver mindet om aldrig at tilføje data fra nogen\nophavsretligt beskyttede kilder (f.eks.. Google Maps eller trykte kort) uden\neksplicit tilladelse fra ophavsret-indehaverne.</p>\n\n<p>Selvom OpenStreetMap er Ã¥bne data, kan vi ikke levere en\ngratis kort-API til tredjeparts-udviklere.\n\nSe vores <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politik for API-brug</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politik for brug af kortbilleder</a>\nog <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politik for brug af Nominatim</a>.</p>\n\n<h3>Vores bidragydere</h3>\n\n<p>\nVores CC-BY-SA licens kræver at du “giver den oprindelige\nforfatter kredit i rimeligt omfang i forhold til mediet eller de midler\ndu anvender”. Individuelle OSM-kortlæggere anmoder ikke om\nkildeangivelse ud over \"OpenStreetMap-bidragydere\", men hvor data\nfra et national kortlægningsagentur eller anden stor kilde er medtaget i\nOpenStreetMap, kan det være rimeligt at kreditere dem ved direkte\nkildeangivelse eller ved at linke til den pÃ¥ denne side.\n</p>\n\n<ul id=\"contributors\">\n<li><strong>Australien</strong>: indeholder forstadsdata baseret\npÃ¥ data fra Australian Bureau of Statistics.</li>\n<li><strong>Canada</strong>: indeholder data fra\nGeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada) og StatCan (Geography Division,\n Statistics Canada).</li>\n<li><strong>New Zealand</strong>: indeholder data fra Land Information New Zealand. Crown Copyright reserveret.</li>\n<li><strong>Polen</strong>: indeholder data fra <a\n href=\"http://ump.waw.pl/\">UMP-pcPL</a>-kort. Ophavsret\n UMP-pcPL-bidragydere.</li>\n<li><strong>Storbritannien</strong>: indeholder Ordnance\n Survey data © Crown copyright and database right\n 2010.</li>\n</ul>\n\n<p>\nOptagelse af data i OpenStreetMap indebærer ikke at den oprindelige\ndataudbyder siger god for OpenStreetMap, giver nogen garanti eller\naccepterer nogen form for erstatningspligt.\n</p>" + legal_babble: + contributors_at_html: "<strong>Østrig</strong>: Indeholder data fra\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (under\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Delstaten Vorarlberg</a> og\nDelstaten Tyrol (under <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT med tilføjelser</a>)." + contributors_au_html: "<strong>Australien</strong>: Indeholder forstadsdata baseret\npÃ¥ data fra Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canada</strong>: Indeholder data fra\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) og StatCan (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: "For yderligere oplysninger om disse og andre kilder, der er blevet brugt for at hjælpe med at forbedre OpenStreetMap, se venligst <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">siden med bidragydere</a> pÃ¥ OpenStreetMap Wiki." + contributors_footer_2_html: "Optagelse af data i OpenStreetMap indebærer ikke at den oprindelige\ndataudbyder siger god for OpenStreetMap, giver nogen garanti eller\naccepterer nogen form for erstatningspligt." + contributors_fr_html: "<strong>Frankrig</strong>: Indeholder data fra\nDirection Générale des Impôts." + contributors_gb_html: "<strong>Storbritannien</strong>: indeholder Ordnance\nSurvey data © Crown copyright and database right\n2010." + contributors_intro_html: "Vores CC BY-SA licens kræver at du “giver den oprindelige\nforfatter kredit i rimeligt omfang i forhold til mediet eller de midler\ndu anvender”. Individuelle OSM-kortlæggere anmoder ikke om\nkildeangivelse ud over “OpenStreetMap-bidragydere”, men hvor data\nfra et national kortlægningsagentur eller anden stor kilde er medtaget i\nOpenStreetMap, kan det være rimeligt at kreditere dem ved direkte\nkildeangivelse eller ved at linke til den pÃ¥ denne side." + contributors_nl_html: "<strong>Holland</strong>: Indeholder © AND data, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>New Zealand</strong>: Indeholder data fra \nLand Information New Zealand. Crown Copyright reserveret." + contributors_pl_html: "<strong>Polen</strong>: Indeholder data fra \n<a href=\"http://ump.waw.pl/\">UMP-pcPL</a>-kort. Ophavsret\nUMP-pcPL-bidragydere.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nMere om OSM's brug af UMP data</a>" + contributors_title_html: Vores bidragydere + contributors_za_html: "<strong>Syd Afrika</strong>: Indeholder data fra\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserveret." + credit_1_html: "Hvis du bruger OpenStreetMaps kortbilleder, anmoder vi om at\ndin kildeangivelse mindst bestÃ¥r af “© OpenStreetMap-bidragydere,\nCC BY-SA”. Hvis du kun bruger kortdata, anmoder vi om “Kortdata\n© OpenStreetMap-bidragydere, CC BY-SA”." + credit_2_html: "SÃ¥ vidt muligt bør OpenStreetMap være et hyperlink til\n<a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nog CC BY-SA til \n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\nHvis du bruger et medium hvor hyperlinks ikke er mulige (f.eks. en tryksag), foreslÃ¥r\nvi at du sender dine læsere til www.openstreetmap.org (mÃ¥ske ved at ændre\n‘OpenStreetMap’ til denne fulde adresse) og til www.creativecommons.org." + credit_title_html: Kildeangivelse og OpenStreetMap + intro_1_html: "OpenStreetMap er <i>Ã¥ben data</i>, licenseret under <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a>-licensen (CC BY-SA)." + intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores kort\nog data, sÃ¥ længe du angiver OpenStreetMap og dets\nbidragydere som kilde. Hvis du ændrer eller bygger pÃ¥ vores kort\neller data, mÃ¥ du kun distribuere resultatet under den samme licens. Den\nfulde <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiske tekst</a>\nforklarer dine rettigheder og pligter." + more_1_html: "Læs mere om brug af vores data pÃ¥ den\n<a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Juridiske FAQ</a>." + more_2_html: "OSM-bidragydere bliver mindet om aldrig at tilføje data fra nogen\nophavsretligt beskyttede kilder (f.eks.. Google Maps eller trykte kort) uden\neksplicit tilladelse fra ophavsret-indehaverne." + more_3_html: "Selvom OpenStreetMap er Ã¥bne data, kan vi ikke levere en\ngratis kort-API til tredjeparts-udviklere.\n\nSe vores <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politik for API-brug</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politik for brug af kortbilleder</a>\nog <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politik for brug af Nominatim</a>." + more_title_html: Læs mere + title_html: Ophavsret og licens native: mapping_link: begynde kortlægningen native_link: den danske udgave @@ -974,8 +1039,15 @@ da: inbox: date: Dato from: Fra + messages: Du har %{new_messages} og %{old_messages} my_inbox: Min indbakke + new_messages: + one: "%{count} nye besked" + other: "%{count} nye beskeder" no_messages_yet: Du har ingen beskeder endnu. Hvorfor ikke komme i kontakt med nogle af de %{people_mapping_nearby_link}? + old_messages: + one: "%{count} gammel besked" + other: "%{count} gamle beskeder" outbox: udbakke people_mapping_nearby: folk som kortlægger i nærheden subject: Emne @@ -1001,13 +1073,12 @@ da: body: Beklager, der er ingen besked med det id. heading: Ingen besked fundet title: Ingen besked fundet - no_such_user: - body: Beklager, der er ingen bruger med det navn. - heading: Ingen sÃ¥dan bruger - title: Ingen sÃ¥dan bruger outbox: date: Dato inbox: indbakke + messages: + one: Du har %{count} sendt besked + other: Du har %{count} sendte beskeder my_inbox: Min %{inbox_link} no_sent_messages: Du har ingen sendte beskeder endnu. Hvorfor ikke komme i kontakt med nogle af de %{people_mapping_nearby_link}? outbox: udbakke @@ -1027,6 +1098,9 @@ da: title: Læs besked to: Til unread_button: Marker som ulæst + wrong_user: Du er logget pÃ¥ som '%{user}', men den besked du har bedt om at læse er ikke sendt af eller til den pÃ¥gældende bruger. Log venligst pÃ¥ som den korrekte bruger for at svare. + reply: + wrong_user: Du er logget pÃ¥ som '%{user}', men den besked du har bedt om at svare pÃ¥ blev ikke sendt til den bruger. Log venligst pÃ¥ som den korrekte bruger for at svare. sent_message_summary: delete_button: Slet notifier: @@ -1047,13 +1121,13 @@ da: hopefully_you_1: En eller anden (forhÃ¥bentlig dig) vil gerne ændre sin emailadresse pÃ¥ hopefully_you_2: "%{server_url} til %{new_address}." friend_notification: - befriend_them: Du kan tilføje dem som ven ogsÃ¥ pÃ¥ %{befriendurl}. + befriend_them: Du kan ogsÃ¥ tilføje dem som ven pÃ¥ %{befriendurl}. had_added_you: "%{user} har tilføjet dig som ven pÃ¥ OpenStreetMap." see_their_profile: Du kan se deres profil pÃ¥ %{userurl}. subject: "[OpenStreetMap] %{user} tilføjede dig som ven" gpx_notification: - and_no_tags: og ingen tags. - and_the_tags: "og de følgende tags:" + and_no_tags: og ingen egenskaber. + and_the_tags: "og de følgende egenskaber:" failure: failed_to_import: "kunne ikke importeres. Her er fejlen:" more_info_1: Flere oplysninger om GPX-importeringsfejl og hvordan man undgÃ¥r @@ -1118,40 +1192,90 @@ da: allow_read_prefs: læse dine brugerindstillinger. allow_to: "Tillad klient-applikationen at:" allow_write_api: tilpas kortet. - allow_write_diary: oprette dagbogssider, kommentarer og lave venskaber. + allow_write_diary: oprette blogsider, kommentarer og lave venskaber. allow_write_gpx: Upload GPS-spor. allow_write_prefs: ændre dine brugerindstillinger. + request_access: Programmet %{app_name} anmoder om adgang til din konto, %{user}. Kontroller, om du vil tillade adgang til følgende funktioner. Du kan vælge lige sÃ¥ mange eller sÃ¥ fÃ¥, som du ønsker. + revoke: + flash: Du har tilbagekaldt adgang for %{application} oauth_clients: + create: + flash: Registrering af informationen lykkedes + destroy: + flash: Annulerede klient programmets registrering edit: submit: Redigér - title: Rediger din applikation + title: Redigere din applikation form: + allow_read_gpx: læs deres private GPS-spor. + allow_read_prefs: læs deres brugerindstillinger. allow_write_api: ændre kortet. + allow_write_diary: oprette blogindlæg, kommentarer og lave venskaber. + allow_write_gpx: upload GPS-spor. + allow_write_prefs: ændre deres brugerindstillinger. name: Navn + requests: "Anmod brugeren om følgende tilladelser:" required: PÃ¥krævet + url: Programmets hovedadresse + index: + application: Programnavn + issued_at: Udstedt + list_tokens: "De følgende nøgler er blevet udstedt til programmer i dit navn:" + my_apps: Mine klientprogrammer + my_tokens: Mine godkendte programmer + no_apps: Har du et program, du gerne vil registrere til brug med os ved hjælp af %{oauth} standarden? Du skal registrere dit Webprogram, før det kan foretage OAuth anmodninger til denne tjeneste. + register_new: Registrer dit program + registered_apps: "Du har registreret følgende klientprogrammer:" + revoke: Tilbagekald! + title: Mine OAuth detaljer new: submit: Registrér - title: Registrer en ny applikation + title: Registrere en ny applikation + not_found: + sorry: Beklager, men %{type} kunne ikke findes. show: + allow_read_gpx: læse deres private GPS-spor. allow_read_prefs: læs deres brugerindstillinger. allow_write_api: tilpas kortet. + allow_write_diary: oprette blogindlæg, kommentarer og lave venskaber. allow_write_gpx: upload GPS-spor. allow_write_prefs: ændre deres brugerindstillinger. authorize_url: "Godkend URL:" + confirm: Er du sikker? + delete: Slet klient edit: Redigér detaljer + key: "Forbrugernøgle:" + requests: "Anmoder brugeren om følgende tilladelser:" + secret: "Forbrugerhemmelighed:" + support_notice: Vi understøtter HMAC-SHA1 (anbefales) og almindelig tekst i SSL-tilstand. + title: OAuth detaljer for %{app_name} + update: + flash: Opdateret klientoplysninger + redaction: + edit: + description: Beskrivelse + new: + description: Beskrivelse + show: + confirm: Er du sikker? + description: "Beskrivelse:" + user: "Oprettet af:" + update: + flash: Ændringer gemt. site: edit: anon_edits_link_text: Find ud af hvorfor. + flash_player_required: Du har brug for en Flash afspiller for at bruge Potlatch, OpenStreetMap Flash editoren. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">hente Flash Player fra Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Flere andre indstillinger</a> er ogsÃ¥ tilgængelige til redigering af OpenStreetMap. no_iframe_support: Din browser understøtter ikke HTML-iframes som er nødvendige for denne funktion. not_public: Du har ikke angivet af dine ændringer skal være offentlige. not_public_description: Du kan ikke længere redigere kortet medmindre du gør dette. Du kan gøre dine ændringer offentlige fra din %{user_page}. + potlatch2_not_configured: Potlatch 2 er ikke blevet konfigureret - se venligst http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for flere oplysninger potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch 2 skal du trykke pÃ¥ gem-knappen). potlatch_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch skal du afmarkere den nuværende vej eller nuværende punkt hvis du retter i live-tilstand, eller klikke pÃ¥ gem-knappen hvis du har en). user_page_link: brugerside index: js_1: Du bruger enten en browser som ikke understøtter Javascript, eller du har deaktiveret Javascript. js_2: OpenStreetMap bruger JavaScript til det interaktive kort. - js_3: Du kan prøve <a href="http://tah.openstreetmap.org/Browse/">de statiske Tiles@Home kortsider</a> hvis du ikke kan aktivere Javascript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Licenseret under %{license_name}-licensen af %{project_name} og dets bidragydere. @@ -1228,12 +1352,29 @@ da: unclassified: Anden vej unsurfaced: Uasfalteret vej wood: Skov + markdown_help: + alt: Alt-tekst + first: Første objekt + heading: Overskrift + headings: Overskrifter + image: Billede + link: Link + ordered: Sorteret liste + second: Andet objekt + subheading: Underoverskrift + text: Tekst + title_html: Parset med <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Usorteret liste + url: URL + richtext_area: + edit: Redigér + preview: ForhÃ¥ndsvisning search: search: Søg search_help: "eksempler: 'Alkmaar', 'RÃ¥dhuspladsen, København', 'CB2 5AQ' eller 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>flere eksempler...</a>" submit_text: Søg where_am_i: Hvor er jeg? - where_am_i_title: Beskriv den nuværende position med søgemaskinen + where_am_i_title: Beskriv den nuværende position ved hjælp af søgemaskinen sidebar: close: Luk search_results: Søgeresultater @@ -1264,16 +1405,13 @@ da: visibility: "Synlighed:" visibility_help: hvad betyder det her? list: + empty_html: Der er ingenting her endnu. <a href='%{upload_link}'>Upload et nyt spor</a> eller lær mere om GPS sporing pÃ¥ <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki siden</a>. public_traces: Offentlige GPS-spor public_traces_from: Offentlige GPS-spor fra %{user} tagged_with: " med egenskaberne %{tags}" your_traces: Dine GPS-spor make_public: made_public: Spor gjort offentlig - no_such_user: - body: Beklager, der er ingen bruger med navnet %{user}. Kontroller stavningen, eller mÃ¥ske er linket du fulgte forkert. - heading: Brugeren %{user} eksisterer ikke - title: Ingen bruger fundet offline: heading: GPX-lagring ikke tilgængelig message: Systemet der hÃ¥ndterer upload og lagring af GPX-filer er pÃ¥ nuværende tidspunkt ikke tilgængelig @@ -1298,7 +1436,7 @@ da: trace_form: description: "Beskrivelse:" help: Hjælp - tags: "Mærker:" + tags: "Egenskaber:" tags_help: kommasepareret upload_button: Upload upload_gpx: "Upload GPX-fil:" @@ -1312,8 +1450,8 @@ da: trace_optionals: tags: Egenskaber trace_paging_nav: - next: Næste » - previous: « Forrige + newer: Nyere spor + older: Ældre spor showing_page: Viser side %{page} view: delete_track: Slet dette spor @@ -1342,12 +1480,12 @@ da: user: account: contributor terms: - agreed: Du har accepteret de nye bidragyder-betingelser. + agreed: Du har accepteret de nye vilkÃ¥r for bidragydere. agreed_with_pd: Du har ogsÃ¥ erklæret at du anser dine ændringer for at være fælleseje/uden ophavsret. - heading: "Bidragyder-betingelser:" + heading: "VilkÃ¥r for bidragydere:" link text: hvad er dette? - not yet agreed: Du har endnu ikke accepteret de nye bidragyder-betingelser. - review link text: Følg dette link nÃ¥r det er bekvemt for dig for at gennemse og acceptere de nye bidragyder-betingelser. + not yet agreed: Du har endnu ikke accepteret de nye vilkÃ¥r for bidragydere. + review link text: Følg dette link nÃ¥r det er bekvemt for dig for at gennemse og acceptere de nye vilkÃ¥r for bidragydere. current email address: "Nuværende emailadresse:" delete image: Fjern det nuværende billede email never displayed publicly: (vises aldrig offentligt) @@ -1382,7 +1520,7 @@ da: heading: Offentlig redigering text: I øjeblikket er dine ændringer anonyme og andre kan ikke sende dig beskeder eller se hvor du er. Klik pÃ¥ knappen nedenfor for at vise hvad du har ændret og lade folk kontakte dig gennem siden. <b>Siden 0.6 API blev sat i drift kan kun offentlige brugere rette i kortdata</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">se hvorfor</a>).<ul><li>Din emailadresse bliver ikke afsløret ved at skifte til offentlig.</li><li>Den handling kan ikke omgøres, og alle nye brugere er nu offentlige som standard.</li></ul> replace image: Erstat det aktuelle billede - return to profile: Tilbage til pofil + return to profile: Tilbage til profil save changes button: Gem ændringer title: Rediger konto update home location on click: Opdater hjemmeposition nÃ¥r jeg klikker pÃ¥ kortet? @@ -1407,7 +1545,7 @@ da: filter: not_an_administrator: Du skal være administrator for at gøre dette. go_public: - flash success: Alle dine rettelser er nu offentlige, og du har lov til at rette. + flash success: Alle dine redigeringer er nu offentlige, og du har lov til at redigere. list: confirm: Bekræft valgte brugere empty: Ingen brugere fundet @@ -1420,39 +1558,44 @@ da: summary_no_ip: "%{name} oprettet pÃ¥ %{date}" title: Brugere login: + account is suspended: Beklager, din konto er suspenderet pÃ¥ grund af mistænkelig aktivitet.<br />Kontakt <a href="%{webmaster}">webmasteren</a> , hvis du ønsker at drøfte dette. account not active: Din konto er ikke aktiveret endnu.<br />Klik pÃ¥ linket i bekræftelsesemailen for at aktivere din konto eller <a href="%{reconfirm}">fÃ¥ sendt en ny bekræftelsesemail</a>. auth failure: Kunne ikke logge pÃ¥ med disse oplysninger. create account minute: Opret en konto. Det tager kun et minut. email or username: "E-mail-adresse eller brugernavn:" heading: Log pÃ¥ login_button: Log pÃ¥ - lost password link: Glemt adgangskode? + lost password link: Glemt din adgangskode? new to osm: Ny pÃ¥ OpenStreetMap? + no account: Har du ingen konto? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Læs mere om OpenStreetMaps kommende licensændring</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">oversættelser</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskussion</a>) + notice_terms: OpenStreetMap flytter til en ny licens 1. april 2012. Den er lige sÃ¥ Ã¥ben som vores nuværende licens, men de juridiske dele er meget bedre egnede til vores kortdatabase. Vi vil meget gerne beholde dine bidrag til OpenStreetMap, men vi kan kun gøre det, hvis du accepterer at lade os distribuere dem under den nye licens. Ellers mÃ¥ vi fjerne dem fra databasen.<br /><br />Log pÃ¥, og brug et par sekunder pÃ¥ at gennemgÃ¥ og acceptere de nye betingelser. Tak! openid: "%{logo} OpenID:" - openid_logo_alt: Log i med et OpenID + openid invalid: Beklager, din OpenID synes at være forkert formateret + openid missing provider: Kunne ikke kontakte din OpenID-leverandør + openid_logo_alt: Log pÃ¥ med et OpenID openid_providers: aol: - alt: Log ind med et AOL OpenID - title: Log ind med AOL + alt: Log pÃ¥ med et AOL OpenID + title: Log pÃ¥ med AOL google: - alt: Log ind med et Google OpenID - title: Log ind med Google + alt: Log pÃ¥ med et Google OpenID + title: Log pÃ¥ med Google myopenid: - alt: Log ind med et myOpenID OpenID - title: Log ind med OpenID + alt: Log pÃ¥ med et myOpenID OpenID + title: Log pÃ¥ med myOpenID openid: - alt: Log ind med et OpenID - title: Log ind med OpenID + alt: Log pÃ¥ med en OpenID-URL + title: Log pÃ¥ med OpenID wordpress: - alt: Log ind med et Wordpress OpenID - title: Log ind med Wordpress + alt: Log pÃ¥ med et Wordpress OpenID + title: Log pÃ¥ med Wordpress yahoo: - alt: Log ind med et Yahoo OpenID - title: Log ind med Yahoo + alt: Log pÃ¥ med et Yahoo OpenID + title: Log pÃ¥ med Yahoo password: "Adgangskode:" register now: Opret nu - remember: "Husk mig:" + remember: Husk mig title: Log pÃ¥ to make changes: For at ændre i OpenStreetMaps data skal du have en konto. with openid: "Alternativt kan du bruge din OpenID til at logge ind:" @@ -1466,7 +1609,7 @@ da: heading: Glemt adgangskode? help_text: Indtast e-mail-adressen du brugte da du oprettede kontoen. Vi sender et link til den som du kan bruge til at nulstille din adgangskode. new password button: Nulstil adgangskode - notice email cannot find: Kunne ikke finde din e-mail. Beklager. + notice email cannot find: Kunne ikke finde den e-mail-adresse. Beklager. notice email on way: Synd du har glemt den, men en e-mail er pÃ¥ vej sÃ¥ du kan snart indstille en ny. title: Glemt adgangskode make_friend: @@ -1483,16 +1626,18 @@ da: email address: "E-mail-adresse:" fill_form: Udfyld felterne, og vi sender dig en hurtig email til at aktivere din konto. flash create success message: Tak for din tilmelding. Vi har sendt en bekræftelses-email til %{email}, og sÃ¥ snart du har bekræftet din konto, kan du gÃ¥ i gang med kortlægningen.<br /><br />Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler, sÃ¥ sørg for at du har hvidlistet webmaster@openstreetmap.org da vi ikke kan svare pÃ¥ den slags forespørgsler. - heading: Opret konto - license_agreement: NÃ¥r du bekræfter din konto, skal du acceptere <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">bidragyder-betingelserne</a>. + heading: Opret en brugerkonto + license_agreement: NÃ¥r du bekræfter din konto, skal du acceptere <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">vilkÃ¥rene for bidragydere</a>. no_auto_account_create: Vi kan desværre ikke oprette en konto automatisk for dig pt. not displayed publicly: Vises ikke offentligt (se <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Privatlivspolitik for wikien inklusiv sektion om emailadresser">privatlivspolitik</a>) openid: "%{logo} OpenID:" - openid no password: Med OpenID kræves ikke en adgangskode, men nogle ekstraværktøjer eller en server kan der stadig være brug for. + openid association: "<p>Din OpenID er endnu ikke tilknyttet en OpenStreetMap konto.</p>\n<ul>\n<li>Hvis du er ny pÃ¥ OpenStreetMap, skal du oprette en ny konto ved hjælp af formularen nedenfor.</li>\n<li>\n Hvis du allerede har en konto, kan du logge ind pÃ¥ din konto\n ved hjælp af dit brugernavn og adgangskode og derefter knytte kontoen\n med din OpenID i dine brugerindstillinger.\n</li>\n</ul>" + openid no password: Med OpenID kræves ikke en adgangskode, men nogle ekstraværktøjer eller en server kan muligvis stadig have brug for en. password: "Adgangskode:" - terms accepted: Tak for at du accepterer de nye bidragyder-betingelser! + terms accepted: Tak for at du accepterede de nye vilkÃ¥r for bidragydere! + terms declined: Vi er kede af, at du har besluttet at du ikke kan acceptere de nye vilkÃ¥r for bidragydere. Yderligere oplysninger, se venligst <a href="%{url}">denne wiki side</a>. title: Opret konto - use openid: Alternativt kan du bruge %{logo} OpenID til at logge ind + use openid: Alternativt kan du bruge %{logo} OpenID til at logge pÃ¥ no_such_user: body: Der findes desværre ingen bruger ved navn %{user}. Tjek venligst stavningen, ellers kan linket du trykkede pÃ¥ være forkert. heading: Brugeren %{user} findes ikke @@ -1524,6 +1669,7 @@ da: consider_pd: I tillæg til ovennævnte aftale anser jeg mit bidrag for at være fælleseje/frit for ophavsret consider_pd_why: hvad er dette? decline: AfslÃ¥ + guidance: "Oplysninger til at hjælpe med at forstÃ¥ disse udtryk: et <a href=\"%{summary}\">menneskeligt læsbart sammendrag</a> og nogle <a href=\"%{translations}\">uformelle oversættelser</a>" heading: VilkÃ¥r for bidragydere legale_names: france: Frankrig @@ -1532,14 +1678,15 @@ da: legale_select: "Vælg dit bopælsland:" read and accept: Læs aftalen nedenfor og tryk pÃ¥ "Accepter" for at bekræfte at du accepterer betingelserne i denne aftale for dine eksisterende og fremtidige bidrag. title: VilkÃ¥r for bidragydere - you need to accept or decline: Læs og godkend eller afvis de nye bidragyder-betingelser for at fortsætte. + you need to accept or decline: Læs og godkend eller afvis de nye vilkÃ¥r for bidragydere for at fortsætte. view: activate_user: aktiver denne bruger add as friend: tilføj som ven ago: (%{time_in_words_ago} siden) - block_history: vis tildelte blokeringer + block_history: tildelte blokeringer blocks by me: blokeringer udført af mig blocks on me: mine blokeringer + comments: kommentarer confirm: Bekræft confirm_user: bekræft denne bruger create_block: bloker denne bruger @@ -1554,19 +1701,23 @@ da: diary: blog edits: ændringer email address: "E-mail-adresse:" - friends_changesets: Gennemse alle changesets af venner + friends_changesets: Gennemse alle ændringssæt af venner + friends_diaries: Gennemse alle blogindlæg af venner hide_user: skjul denne bruger if set location: Hvis du indstiller din position, viser der sig et pænt kort her. Du kan indstille din hjemmeposition pÃ¥ din %{settings_link}-side. km away: "%{count}km væk" latest edit: "Seneste ændring %{ago}:" - m away: "%{count} m væk" + m away: "%{count}m væk" mapper since: "Kortlægger siden:" - moderator_history: vis uddelte blokeringer + moderator_history: uddelte blokeringer + my comments: mine kommentarer my diary: min blog my edits: mine redigeringer my settings: mine indstillinger my traces: mine GPS-spor nearby users: "Andre brugere i nærheden:" + nearby_changesets: Gennemse alle ændringssæt af brugere i nærheden + nearby_diaries: Gennemse alle blogindlæg af brugere i nærheden new diary entry: nyt blogindlæg no friends: Du har ikke tilføjet nogle venner endnu. no nearby users: Der er ingen andre brugere der har angivet at de kortlægger i nærheden. @@ -1590,45 +1741,93 @@ da: user location: Brugerposition your friends: Dine venner user_block: + blocks_by: + empty: "%{name} har ikke foretaget nogen blokeringer endnu." + heading: Liste over blokeringer af %{name} + title: Blokeringer af %{name} + blocks_on: + empty: "%{name} er endnu ikke blevet blokeret." + heading: Liste over blokeringer af % {name} + title: Blokeringer af %{name} + create: + flash: Oprettet en blokering af brugeren %{name}. + try_contacting: Prøv at kontakte brugeren før blokering og giv dem en rimelig frist til at reagere. + try_waiting: Prøv at give brugeren en rimelig tid til at besvare før du blokere dem. edit: - back: Vis alle blokke - show: Vis denne blok + back: Vis alle blokeringer + heading: Redigerer blokering af %{name} + needs_view: Skal brugeren logge pÃ¥, før denne blokering vil blive fjernet? + period: Hvor længe, fra og med nu, brugeren vil blive blokeret fra API. + reason: Årsagen hvorfor % {name} er blokeret. Vær venligst sÃ¥ rolig og sÃ¥ fornuftig som muligt, giv sÃ¥ mange detaljer, som kan du om situationen. Tænk pÃ¥, at ikke alle brugerer forstÃ¥r fællesskabsjargonen, sÃ¥ prøv at bruge hverdags udtryk. + show: Vis denne blokering submit: Opdater blokering + title: Redigerer blokering af %{name} filter: - not_a_moderator: Du skal være en moderator for at udføre den handling. + block_expired: Blokeringen er allerede udløbet og kan ikke redigeres. + block_period: Blokeringsperioden skal være en af de værdier der er valgbar i listen over værdier. helper: time_future: Slutter om %{time}. time_past: Sluttede %{time} siden. + until_login: Aktiv, indtil brugeren logger pÃ¥. index: empty: Ingen blokeringer er blevet udført endnu. heading: Liste over brugerblokeringer title: Brugerblokeringer + model: + non_moderator_revoke: Skal være moderator for at tilbagekalde en blokering. + non_moderator_update: Skal være en moderator for at oprette eller opdatere en blokering. new: - back: Vis alle blokke + back: Vis alle blokeringer heading: Opretter blokering af %{name} - submit: Opret blok + needs_view: Brugeren skal logge pÃ¥, før denne blokering vil blive fjernet + period: Hvor længe, fra og med nu, brugeren vil blive blokeret fra API. + reason: Årsagen hvorfor % {name} er blokeret. Vær venligst sÃ¥ rolig og sÃ¥ fornuftig som muligt, giv sÃ¥ mange detaljer, som kan du om situationen. Husk pÃ¥, at meddelelsen bliver offentligt synlig. Tænk pÃ¥, at ikke alle brugerer forstÃ¥r fællesskabsjargonen, sÃ¥ prøv at bruge hverdags udtryk. + submit: Opret blokering title: Opretter blokering af %{name} + tried_contacting: Jeg har kontaktet brugeren og bedt dem stoppe. + tried_waiting: Jeg har givet en rimelig tidsfrist for brugeren til at reagere pÃ¥ disse meddelelser. not_found: back: Tilbage til indeks + sorry: Beklager, brugerblokeringen med ID %{id} kunne ikke findes. partial: confirm: Er du sikker? creator_name: Oprettet af display_name: Blokkeret bruger edit: Redigér + next: Næste » + not_revoked: (ikke tilbagekaldt) + previous: « Forrige reason: Årsag til blokering revoke: Tilbagekald! + revoker_name: Tilbagekaldt af show: Vis + showing_page: Viser side %{page} status: Status + period: + one: 1 time + other: "%{count} timer" + revoke: + confirm: Er du sikker pÃ¥ du vil tilbagekalde denne blokering? + flash: Denne blokering er blevet tilbagekaldt. + heading: Tilbagekalder blokering pÃ¥ %{block_on} af %{block_by} + past: Denne blokering endte for %{time} siden og kan ikke tilbagekaldes nu. + revoke: Tilbagekald! + time_future: Denne blokering vil ende om %{time}. + title: Tilbagekalder blokering af %{block_on} show: back: Vis alle blokeringer confirm: Er du sikker? edit: Redigér + heading: "%{block_on} blokeret af %{block_by}" + needs_view: Brugeren skal logge pÃ¥, før denne blokering vil blive fjernet reason: "Årsag til blokering:" revoke: Tilbagekald! + revoker: "Tilbagekalder:" show: Vis status: Status time_future: Slutter om %{time} time_past: Sluttede %{time} siden + title: "%{block_on} blokeret af %{block_by}" update: only_creator_can_edit: Kun moderatoren som oprettede denne blokering kan ændre den. success: Blokering opdateret. @@ -1636,12 +1835,12 @@ da: filter: already_has_role: Brugeren har allerede rollen %{role}. doesnt_have_role: Brugeren har ikke rollen %{role}. - not_a_role: String'en "%{role}" er ikke en gyldig rolle. + not_a_role: Strengen "%{role}" er ikke en gyldig rolle. not_an_administrator: Kun administratorer kan forvalte brugerroller, og du er ikke en administrator. grant: - are_you_sure: Er du sikker pÃ¥ du vil tildele rollen "%{role}" til brugeren "%{name}"? + are_you_sure: Er du sikker pÃ¥ du vil tildele rollen '%{role}' til brugeren '%{name}'? confirm: Bekræft - fail: Kunne ikke give rollen %{role} til brugeren %{name}. Kontroller at brugeren og rollen begge er gyldige. + fail: Kunne ikke give rollen '%{role}' til brugeren '%{name}'. Kontroller at brugeren og rollen begge er gyldige. heading: Bekræft rolletildeling title: Bekræft rolletildeling revoke: diff --git a/config/locales/de.yml b/config/locales/de.yml index 3f196feed..48e10aaba 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -17,6 +17,7 @@ # Author: Kghbln # Author: Markobr # Author: McDutchie +# Author: Metalhead64 # Author: Michi # Author: Pill # Author: Purodha @@ -96,6 +97,8 @@ de: application: require_cookies: cookies_needed: Es scheint als hättest du Cookies ausgeschaltet. Bitte aktiviere Cookies bevor du weiter gehst. + require_moderator: + not_a_moderator: Du musst Moderator sein, um diese Aktion durchführen zu können. setup_user_auth: blocked: Dein Zugriff auf die API wurde gesperrt. Bitte melde dich auf der Web-Oberfläche an, um mehr zu erfahren. need_to_see_terms: Dein Zugriff auf die API wurde vorübergehend ausgesetzt. Bitte melde Dich in Deinem Benutzerkonto an, um die „Bedingungen für Mitwirkende“ einzusehen. Du musst nicht einverstanden sein, aber Du musst sie gesehen haben. @@ -103,7 +106,6 @@ de: changeset: changeset: "Änderungssatz: %{id}" changesetxml: Änderungssatz-XML - download: Als %{changeset_xml_link} oder %{osmchange_xml_link} herunterladen. feed: title: "Änderungssatz: %{id}" title_comment: Änderungssatz %{id} - %{comment} @@ -149,7 +151,7 @@ de: node: Knoten auf größerer Karte relation: Relation auf größerer Karte way: Weg auf größerer Karte - loading: Am Laden … + loading: Lade … navigation: all: next_changeset_tooltip: Nächster Änderungssatz @@ -165,9 +167,8 @@ de: next_changeset_tooltip: Nächste Änderung von %{user} prev_changeset_tooltip: Vorherige Änderung von %{user} node: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" download_xml: XML herunterladen - edit: Bearbeiten + edit: Knoten bearbeiten node: Knoten node_title: "Knoten: %{node_name}" view_history: Chronik anzeigen @@ -175,11 +176,10 @@ de: coordinates: "Koordinaten:" part_of: "Teil von:" node_history: - download: "%{download_xml_link} oder %{view_details_link}" download_xml: XML herunterladen node_history: Knoten-Chronik node_history_title: "Knoten-Chronik: %{node_name}" - view_details: Detailseite anzeigen + view_details: Einzelheiten ansehen not_found: sorry: "%{type} mit der Nummer %{id} konnte leider nicht gefunden werden. Du hast dich möglicherweise vertippt oder bist einem ungültigem Link gefolgt." type: @@ -190,8 +190,14 @@ de: paging_nav: of: von showing_page: Zeige Seite + redacted: + message_html: "Version %{version} dieses %{type}s kann nicht angezeigt werden. Weitere Informationen sind hier angegeben: %{redaction_link}." + redaction: Ausgabe %{id} + type: + node: Knoten + relation: Relation + way: Weg relation: - download: "%{download_xml_link} oder %{view_history_link}" download_xml: XML herunterladen relation: Relation relation_title: "Relation: %{relation_name}" @@ -200,11 +206,10 @@ de: members: "Mitglieder:" part_of: "Mitglied von:" relation_history: - download: "%{download_xml_link} oder %{view_details_link}" download_xml: XML herunterladen relation_history: Relations-Chronik relation_history_title: "Relations-Chronik: %{relation_name}" - view_details: Details anzeigen + view_details: Einzelheiten anzeigen relation_member: entry_role: "%{type} %{name} als %{role}" type: @@ -216,15 +221,15 @@ de: view_data: Daten des aktuellen Kartenausschnitts anzeigen start_rjs: data_frame_title: Daten - data_layer_name: Daten + data_layer_name: Kartendaten durchsuchen details: Details drag_a_box: Einen Rahmen über die Karte aufziehen, um einen Bereich auszuwählen edited_by_user_at_timestamp: Bearbeitet von [[user]] am [[timestamp]] hide_areas: Gebiete ausblenden history_for_feature: Chronik für [[feature]] load_data: Daten laden - loaded_an_area_with_num_features: Du hast einen Bereich geladen, der [[num_features]] Elemente enthält. Manche Browser haben Probleme bei der Darstellung einer so großen Datenmenge. Normalerweise ist es am besten, nur weniger als 100 Elemente zu betrachten; alles andere macht deinen Browser langsam bzw. lässt ihn nicht mehr auf Eingaben reagieren. Wenn du sicher bist, dass du diese Daten darstellen willst, klicke auf „Daten laden“ unten. - loading: Am Laden … + loaded_an_area_with_num_features: Du hast einen Bereich geladen, der [[num_features]] Elemente enthält. Manche Browser haben Probleme bei der Darstellung einer solch großen Datenmenge. Normalerweise ist es am besten, nur weniger als [[max_features]] Elemente zu betrachten. Alles andere macht deinen Browser langsam bzw. lässt ihn nicht mehr auf Eingaben reagieren. Sofern du dir sicher bist, dass du dir diese Daten anzeigen lassen möchtest, klicke unten auf „Daten laden“. + loading: Lade … manually_select: Einen anderen Kartenausschnitt manuell auswählen object_list: api: Diesen Bereich von der API abfragen @@ -262,9 +267,8 @@ de: relation: die Relation way: den Weg way: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" download_xml: Als XML herunterladen - edit: Bearbeiten + edit: Weg bearbeiten view_history: Chronik anzeigen way: Weg way_title: "Weg: %{way_name}" @@ -275,9 +279,8 @@ de: nodes: "Knoten:" part_of: "Teil von:" way_history: - download: "%{download_xml_link} oder %{view_details_link}" download_xml: Als XML herunterladen - view_details: Detailseite anzeigen + view_details: Einzelheiten anzeigen way_history: Wege-Chronik way_history_title: "Chronik des Wegs: %{way_name}" changeset: @@ -306,6 +309,8 @@ de: description_nearby: Änderungssätze von Benutzern in der Nähe description_user: Letzte Änderungen von %{user} description_user_bbox: Letzte Änderungen von %{user} in %{bbox} + empty_anon_html: Bislang wurden keine Bearbeitungen gemacht. + empty_user_html: Bislang hast du noch keine Bearbeitungen gemacht. Lies die <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Anleitung für Einsteiger</a> für Informationen hierzu. heading: Änderungssätze heading_bbox: Änderungssätze heading_friend: Änderungssätze @@ -386,10 +391,6 @@ de: body: Wir konnten leider keinen Blogeintrag oder Kommentar mit der Nummer %{id} finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt. heading: Kein Blogeintrag mit der Nummer %{id} title: Blogeintrag nicht gefunden - no_such_user: - body: Wir konnten leider keinen Benutzer mit dem Namen %{user} finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt. - heading: Der Benutzer %{user} existiert nicht - title: Benutzer nicht gefunden view: leave_a_comment: Schreibe einen Kommentar login: Anmelden @@ -483,16 +484,28 @@ de: suffix_place: ", %{distance} %{direction} von %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Flugplatz + apron: Flugvorfeld + gate: Flugsteig + helipad: Hubschrauberlandeplatz + runway: Start- und Landebahn + taxiway: Rollbahn + terminal: Terminal amenity: + WLAN: WLAN-Zugangspunkt airport: Flughafen arts_centre: Kunstcenter + artwork: Kunstwerk atm: Geldautomat auditorium: Hörsaal bank: Bank bar: Bar + bbq: Grillplatz bench: Bank bicycle_parking: Fahrrad-Stellplatz bicycle_rental: Fahrradverleih + biergarten: Biergarten brothel: Bordell bureau_de_change: Wechselstube bus_station: Busbahnhof @@ -501,6 +514,7 @@ de: car_sharing: Carsharing car_wash: Autowaschanlage casino: Casino + charging_station: Ladestation cinema: Kino clinic: Krankenhaus club: Club @@ -519,6 +533,7 @@ de: ferry_terminal: Fähren-Anlaufstelle fire_hydrant: Hydrant fire_station: Feuerwehr + food_court: Food-Court fountain: Springbrunnen fuel: Tankstelle grave_yard: Friedhof @@ -559,9 +574,12 @@ de: shelter: Unterkunft shop: Geschäft shopping: Einkaufszentrum + shower: Dusche + social_centre: Sozialzentrum social_club: Geselligkeitsverein studio: Studio supermarket: Supermarkt + swimming_pool: Schwimmbad taxi: Taxi telephone: Telefonzelle theatre: Theater @@ -572,41 +590,21 @@ de: veterinary: Tierarzt village_hall: Gemeindezentrum waste_basket: Mülleimer - wifi: WiFi-Zugang + wifi: WLAN-Zugangspunkt youth_centre: Jugendhaus boundary: administrative: Verwaltungsgrenze + census: Grenze des Volkszählungsgebiets + national_park: Nationalpark + protected_area: Schutzgebiet + bridge: + aqueduct: Aquädukt + suspension: Hängebrücke + swing: Drehbrücke + viaduct: Viadukt + "yes": Brücke building: - apartments: Wohnblock - block: Gebäudeblock - bunker: Bunker - chapel: Kapelle - church: Kirche - city_hall: Rathaus - commercial: Gewerbegebäude - dormitory: Studentenwohnheim - entrance: Eingang - faculty: Ausbildungsgebäude - farm: Bauernhof - flats: Wohnungen - garage: Garage - hall: Halle - hospital: Spital - hotel: Hotel - house: Haus - industrial: Industriegebäude - office: Bürogebäude - public: Öffentliches Gebäude - residential: Wohngebäude - retail: Einzelhandelsgebäude - school: Schulgebäude - shop: Geschäft - stadium: Stadion - store: Geschäft - terrace: Terrasse - tower: Turm - train_station: Bahnhof - university: Universitätsgebäude + "yes": Gebäude highway: bridleway: Reitweg bus_guideway: Busspur @@ -614,12 +612,11 @@ de: byway: Seitenweg construction: Straße im Bau cycleway: Radweg - distance_marker: Kilometerstein emergency_access_point: Notrufpunkt footway: Fußweg ford: Furt - gate: Gatter living_street: Spielstraße + milestone: Meilenstein minor: Nebenstraße motorway: Autobahn motorway_junction: Autobahnkreuz @@ -631,14 +628,17 @@ de: primary_link: Primärauffahrt raceway: Rennweg residential: Wohnstraße + rest_area: Rastplatz road: Straße secondary: Landstraße secondary_link: Landstraße service: Anliegerstraße services: Autobahnraststätte + speed_camera: Blitzer steps: Treppe stile: Zaunübertritt tertiary: Tertiärstraße + tertiary_link: Tertiärstraße track: Feldweg trail: Pfad trunk: Fernverkehrsstraße @@ -652,6 +652,7 @@ de: building: Historisches Gebäude castle: Schloss church: Kirche + fort: Fort house: Historisches Haus icon: Zeichen manor: Gut @@ -676,6 +677,7 @@ de: farmland: Ackerland farmyard: Hof forest: Wald + garages: Autoreparaturwerkstatt grass: Wiese greenfield: unbebaute Fläche industrial: Industriegebiet @@ -683,25 +685,28 @@ de: meadow: Wiese military: Militärgebiet mine: Mine - mountain: Berg nature_reserve: Naturschutzgebiet + orchard: Obstgarten park: Park piste: Piste - plaza: Plaza quarry: Steinbruch railway: Eisenbahn recreation_ground: Freizeitgebiet reservoir: Reservoir + reservoir_watershed: Reservoir-Einzugsgebiet residential: Siedlung retail: Einzelhandel + road: Straßengebiet village_green: Dorfwiese vineyard: Weingut wetland: Feuchtgebiet wood: Wald leisure: beach_resort: Badeort + bird_hide: Vogelversteck common: Gemeindeland fishing: Fischereigrund + fitness_station: Fitnessstudio garden: Garten golf_course: Golfplatz ice_rink: Eislaufplatz @@ -712,12 +717,17 @@ de: pitch: Sportplatz playground: Spielplatz recreation_ground: Freizeitbereich + sauna: Sauna slipway: Gleitbahn sports_centre: Sportzentrum stadium: Stadion swimming_pool: Schwimmbad track: Rennstrecke water_park: Wasserpark + military: + airfield: Militärflugplatz + barracks: Kaserne + bunker: Bunker natural: bay: Bucht beach: Strand @@ -725,11 +735,12 @@ de: cave_entrance: Höhleneingang channel: Kanal cliff: Klippe - coastline: Küstenlinie crater: Krater + dune: Düne feature: Merkmal fell: Kahler Berg fjord: Fjord + forest: Wald geyser: Geysir glacier: Gletscher heath: Heide @@ -749,6 +760,7 @@ de: scrub: Busch shoal: Untiefe spring: Quelle + stone: Findling strait: Straße tree: Baum valley: Tal @@ -757,10 +769,23 @@ de: wetland: Feuchtgebiet wetlands: Feuchtgebiet wood: Wald + office: + accountant: Buchhaltungsbüro + architect: Architekturbüro + company: Unternehmen + employment_agency: Arbeitsamt + estate_agent: Immobilienhändler + government: Amt + insurance: Krankenversicherungsbüro + lawyer: Rechtsanwaltsbüro + ngo: NGO-Büro + telecommunication: Postamt + travel_agent: Reisebüro + "yes": Büro place: airport: Flughafen city: Stadt - country: Land + country: Staat county: Bezirk farm: Gehöft hamlet: Weiler @@ -768,6 +793,7 @@ de: houses: Häuser island: Insel islet: Inselchen + isolated_dwelling: Einzeln stehende Behausung locality: Ortschaft moor: Moor municipality: Gemeinde @@ -791,6 +817,7 @@ de: junction: Bahnknotenpunkt level_crossing: Eisenbahnkreuzung light_rail: Straßenbahn + miniature: Miniatureisenbahn monorail: Einschienenbahn narrow_gauge: Schmalspurbahn platform: Bahnsteig @@ -805,7 +832,7 @@ de: yard: Rangierbahnhof shop: alcohol: Spirituosenladen - apparel: Bekleidungsgeschäft + antiques: Antiquitätengeschäft art: Kunstladen bakery: Bäckerei beauty: Parfümerie @@ -814,7 +841,6 @@ de: books: Buchgeschäft butcher: Metzgerei car: Autohaus - car_dealer: Autohaus car_parts: Autoteilehändler car_repair: Autowerkstatt carpet: Teppichladen @@ -829,7 +855,6 @@ de: department_store: Kaufhaus discount: Diskontladen doityourself: Baumarkt - drugstore: Drogerie dry_cleaning: Textilreinigung electronics: Elektronikgeschäft estate_agent: Imobilienhändler @@ -895,7 +920,10 @@ de: valley: Tal viewpoint: Aussichtspunkt zoo: Zoo + tunnel: + "yes": Tunnel waterway: + artificial: Künstliche Wasserstraße boatyard: Werft canal: Kanal connector: Wasserstraßenverbindung @@ -947,6 +975,7 @@ de: Create: Anlegeeen Permalink: Permalink layouts: + community: Gemeinschaft community_blogs: Blogs community_blogs_title: Blogs von Mitwirkenden bei OpenStreetMap copyright: Urheberrecht + Lizenz @@ -968,16 +997,18 @@ de: history: Chronik home: Standort home_tooltip: Eigener Standort - inbox: Posteingang (%{count}) + inbox_html: Posteingang %{count} inbox_tooltip: one: Dein Posteingang enthält 1 ungelesene Nachricht other: Dein Posteingang enthält %{count} ungelesene Nachrichten zero: Dein Posteingang enthält keine ungelesenen Nachrichten intro_1: OpenStreetMap ist eine freie, editierbare Karte der gesamten Welt, die von Menschen wie dir erstellt wird. - intro_2: OpenStreetMap ermöglicht es geographische Daten gemeinschaftlich von überall auf der Welt anzuschauen und zu bearbeiten. - intro_3: Das Hosting der OpenStreetMap-Server wird freundlicherweise von %{ucl}, %{ic} und %{bytemark} unterstützt. Weitere Unterstützer sind im %{partners} aufgelistet. - intro_3_ic: Imperial College London - intro_3_partners: Wiki + intro_2_create_account: Erstelle ein Benutzerkonto + intro_2_download: heruntergeladen + intro_2_html: Die Daten können gemäß der entsprechenden %{license} frei %{download} und %{use} werden. %{create_account}, um die Karte zu verbessern. + intro_2_license: Freien Lizenz + intro_2_use: genutzt + intro_2_use_url: http://wiki.openstreetmap.org/wiki/DE:Using_OpenStreetMap license: title: Daten von OpenStreetMap stehen unter der „Creative Commons Attribution-Share Alike 2.0 Generic“-Lizenz log_in: Anmelden @@ -991,11 +1022,17 @@ de: title: Unterstütze OpenStreetMap mit einer Geldspende osm_offline: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten nicht verfügbar. osm_read_only: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten im „Nur-Lesen-Modus“. + partners_bytemark: Bytemark Hosting + partners_html: Das Hosting wird %{ucl}, %{ic}, %{bytemark} sowie von anderen %{partners} unterstützt. + partners_ic: dem Imperial College London + partners_partners: Partnern + partners_ucl: vom UCL VR Centre + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: Registrieren sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen - sotm2011: Besuche die OpenStreetMap-Konferenz 201 „The State of the Map“ vom 9. bis 11. September in Denver! + sotm2012: Komm zur OpenStreetMap-Konferenz „The State of the Map“ 2012 vom 6. bis 8. September in Tokio! tag_line: Die freie Wiki-Weltkarte - user_diaries: Blogs + user_diaries: Benutzer-Blogs user_diaries_tooltip: Benutzer-Blogs lesen view: Karte view_tooltip: Karte anzeigen @@ -1009,7 +1046,30 @@ de: english_link: dem englischsprachigen Original text: Für den Fall einer Abweichung zwischen der vorliegenden Übersetzung und %{english_original_link}, ist die englischsprachige Seite maßgebend. title: Über diese Übersetzung - legal_babble: "<h2>Urheberrecht und Lizenz</h2>\n\n<p>\nOpenStreetMap ist <i>„Open Data“</i>, die gemäß der Lizenz <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA) verfügbar sind.\n</p>\n<p>\n Es steht dir frei unsere Daten und Karten zu kopieren, weiterzugeben, zu übermittelt sowie anzupassen, sofern du OpenStreetMap und die Mitwirkenden als Quelle angibst. Für den Fall, dass du auf Basis unserer Daten und Karten Anpassungen vornimmst, oder sie als Basis für weitere Bearbeitungen verwendest, kannst du das Ergebnis auch nur gemäß der selben Lizenz weitergeben. Der vollständige Lizenztext ist unter <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Lizenz</a> einsehbar und erläutert deine Rechte und Pflichten.\n</p>\n\n<h3>So ist auf die Urheberschaft von OpenStreetMap hinzuweisen</h3>\n<p>\n Sofern du Bilder von OpenStreetMap verwendest, so ist mindestens „© OpenStreetMap und Mitwirkende, CC BY-SA“ als Quelle anzugeben. Werden hingegen ausschließlich Geodaten genutzt, so ist mindestens „Geodaten © OpenStreetMap und Mitwirkende, CC BY-SA“ anzugeben.\n</p>\n<p>\n Wo möglich, muss ein Hyperlink auf OpenStreetMap <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> und die Lizenz CC BY-SA <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> gesetzt werden. Für den Fall, dass du ein Medium einsetzt, bei dem keine derartigen Verweise möglich sind (z. B. ein gedrucktes Buch), schlagen wir vor, dass du deine Leser auf www.openstreetmap.org und www.creativecommons.org hinweist.\n</p>\n\n<h3>Mehr hierzu in Erfahrung bringen</h3>\n<p>\n Mehr dazu, wie unsere Daten verwendet werden können, ist unter <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Häufige rechtliche Fragen</a> nachzulesen.\n</p>\n<p>\n Die Mitwirkenden von OpenStreetMap weisen wir darauf hin, dass du keinesfalls Daten aus urheberrechtlich geschützten Quellen verwenden darfst (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben.\n</p>\n<p>\n Obwohl OpenStreetMap aus freien Daten besteht, können wir Dritten keine kostenfreie Programmierschnittstelle (API) für Karten bereitstellen.\n \n Siehe hierzu die <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Richtlinie zur Nutzung einer API</a>, die <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Richtlinie zur Nutzung von Kachelgrafiken</a> und die <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nutzungsrichtlinie bezüglich Daten von Nominatim</a>.\n</p>\n\n<h3>Unsere Mitwirkenden</h3>\n<p>\n Die von uns verwendete Lizenz CC BY-SA verlangt, dass du „für das betreffende Medium oder Mittel in angemessener Weise, auf die ursprünglichen Bearbeiter hinweist.“ Einige an OpenStreetMap Mitwirkende verlangen keine über den Vermerk „OpenStreetMap und Mitwirkende“ hinausgehende Hinweise. Wo allerdings Daten von nationalen Kartografierungsinstitutionen oder aus anderen umfangreichen Quellen einbezogen wurden, ist es sinnvoll, deren Lizenzhinweise direkt wiederzugeben oder auf diese auf dieser Website zu verlinken.\n</p>\n\n<ul id=\"contributors\">\n <li><strong>Australien</strong>: Enthält Daten zu Siedlungen, die auf Daten des <i>Australian Bureau of Statistics</i> basieren.</li>\n <li><strong>Frankreich</strong>: Enthält Daten der <i>Direction Générale des Impôts</i>.</li>\n <li><strong>Kanada</strong>: Enthält Daten von GeoBase®, GeoGratis (© <i>Department of Natural Resources Canada</i>), CanVec (© <i>Department of Natural Resources Canada</i>) und StatCan (<i>Geography Division, Statistics Canada</i>).</li>\n <li><strong>Neuseeland</strong>: Enthält Daten aus <i>Land Information New Zealand</i>. Urheberrecht vorbehalten.</li>\n <li><strong>Österreich</strong>: Enthält Daten der <a href=\"http://data.wien.gv.at/\">Stadt Wien</a>. Lizenziert gemäß <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>.</li>\n <li><strong>Polen</strong>: Enthält Daten aus <a href=\"http://ump.waw.pl/\">UMP-pcPL Karten</a>. Urheberrechtlich geschützt, UMP-pcPL und Mitwirkende. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">Mehr zur Nutzung der UMP-Daten durch OSM</a></li>\n <li><strong>Südafrika</strong>: Enthält Daten von <i><a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a></i>, Staatliches Urheberrecht vorbehalten.</li>\n <li><strong>Vereinigtes Königreich</strong>: Enthält Daten des <i>Ordnance Survey</i> © Urheber- und Datenbankrecht 2010.</li>\n</ul>\n\n<p>\n Die Einbeziehung von Daten bei OpenStreetMap impliziert nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt, Gewährleistung gibt, noch Haftung übernimmt.\n</p>" + legal_babble: + contributors_at_html: "<strong>Österreich</strong>: Enthält Daten der <a href=\"http://data.wien.gv.at/\">Stadt Wien</a>, lizenziert gemäß <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY AT</a>, <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">des Lands Vorarlberg</a> und des Lands Tirol (<a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">lizenziert gemäß CC BY AT mit Anpassungen zur Lizenz</a>)." + contributors_au_html: "<strong>Australien</strong>: Enthält Daten zu Siedlungen, die auf Daten des <i>Australian Bureau of Statistics</i> basieren." + contributors_ca_html: "<strong>Kanada</strong>: Enthält Daten von GeoBase®, GeoGratis (© <i>Department of Natural Resources Canada</i>), CanVec (© <i>Department of Natural Resources Canada</i>) und StatCan (<i>Geography Division, Statistics Canada</i>)." + contributors_footer_1_html: Für weitere diesbezügliche Einzelheiten sowie anderer Datenquellen, die zur Verbesserung von OpenStreetMap genutzt wurden, besuche bitte <a href="http://wiki.openstreetmap.org/wiki/Contributors">die Seite über die Mitwirkenden</a> im Wiki von OpenStreetMap. + contributors_footer_2_html: Die Einbeziehung von Daten bei OpenStreetMap impliziert nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt, Gewährleistung gibt, noch Haftung übernimmt. + contributors_fr_html: "<strong>Frankreich</strong>: Enthält Daten der <i>Direction Générale des Impôts</i>." + contributors_gb_html: "<strong>Vereinigtes Königreich</strong>: Enthält Daten des <i>Ordnance Survey</i> © Urheber- und Datenbankrecht 2010." + contributors_intro_html: Die von uns verwendete Lizenz CC BY-SA verlangt, dass du „in dem betreffenden Medium in angemessener Weise, auf die ursprünglichen Bearbeiter hinweist.“ Einige an OpenStreetMap Mitwirkende verlangen keine über den Vermerk „OpenStreetMap und Mitwirkende“ hinausgehende Hinweise. Wo allerdings Daten von nationalen Kartografierungsinstitutionen oder aus anderen umfangreichen Quellen einbezogen wurden, ist es sinnvoll, deren Lizenzhinweise direkt wiederzugeben oder auf diese auf dieser Website zu verlinken. + contributors_nl_html: "<strong>Niederlande</strong>: Enthält, © AND-Daten, 2007 (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Neuseeland</strong>: Enthält Daten aus <i>Land Information New Zealand</i>. Urheberrecht vorbehalten." + contributors_pl_html: "<strong>Polen</strong>: Enthält Daten aus <a href=\"http://ump.waw.pl/\">UMP-pcPL Karten</a>. Urheberrechtlich geschützt, UMP-pcPL und Mitwirkende. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">Mehr zur Nutzung der UMP-Daten durch OSM</a>" + contributors_title_html: Unsere Mitwirkenden + contributors_za_html: "<strong>Südafrika</strong>: Enthält Daten von <i><a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a></i>, Staatliches Urheberrecht vorbehalten." + credit_1_html: Sofern du Bilder von OpenStreetMap verwendest, so ist mindestens „© OpenStreetMap und Mitwirkende, CC BY-SA“ als Quelle anzugeben. Werden hingegen ausschließlich Geodaten genutzt, so ist mindestens „Geodaten © OpenStreetMap und Mitwirkende, CC BY-SA“ anzugeben. + credit_2_html: Wo möglich, muss ein Hyperlink auf OpenStreetMap <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> und die Lizenz CC BY-SA <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a> gesetzt werden. Für den Fall, dass du ein Medium einsetzt, bei dem keine derartigen Verweise möglich sind (z. B. ein gedrucktes Buch), schlagen wir vor, dass du deine Leser auf www.openstreetmap.org und www.creativecommons.org hinweist. + credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen ist + intro_1_html: OpenStreetMap ist <i>„Open Data“</i>, die gemäß der Lizenz <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons „Namensnennung-Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA) verfügbar sind. + intro_2_html: Es steht dir frei unsere Daten und Karten zu kopieren, weiterzugeben, zu übermittelt sowie anzupassen, sofern du OpenStreetMap und die Mitwirkenden als Quelle angibst. Für den Fall, dass du auf Basis unserer Daten und Karten Anpassungen vornimmst, oder sie als Basis für weitere Bearbeitungen verwendest, kannst du das Ergebnis auch nur gemäß der selben Lizenz weitergeben. Der vollständige Lizenztext ist unter <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">Lizenz</a> einsehbar und erläutert deine Rechte und Pflichten. + more_1_html: Mehr dazu, wie unsere Daten verwendet werden können, kann man unter <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Häufige rechtliche Fragen</a> nachlesen. + more_2_html: Die Mitwirkenden von OpenStreetMap weisen wir darauf hin, dass du keinesfalls Daten aus urheberrechtlich geschützten Quellen verwenden darfst (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben. + more_3_html: Obwohl OpenStreetMap aus freien Daten besteht, können wir Dritten keine kostenfreie Programmierschnittstelle (API) für Karten bereitstellen. Siehe hierzu die <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Richtlinie zur Nutzung einer API</a>, die <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Richtlinie zur Nutzung von Kachelgrafiken</a> und die <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Richtlinie zur Nutzung von Daten von Nominatim</a>. + more_title_html: Mehr hierzu in Erfahrung bringen + title_html: Urheberrecht und Lizenz native: mapping_link: mit dem Kartieren anfangen native_link: deutschen Sprachversion @@ -1055,10 +1115,6 @@ de: body: Leider gibt es keine Nachricht mit dieser ID. heading: Nachricht nicht vorhanden title: Nachricht nicht vorhanden - no_such_user: - body: Leider gibt es kein Benutzer mit diesem Namen. - heading: Benutzer nicht gefunden - title: Benutzer nicht gefunden outbox: date: Datum inbox: Posteingang @@ -1232,7 +1288,9 @@ de: allow_write_gpx: GPS-Spuren hochladen allow_write_prefs: Nutzereinstellungen verändern. authorize_url: "Berechtigungs-URL:" - edit: Details bearbeiten + confirm: Bist du sicher? + delete: Client löschen + edit: Einzelheiten bearbeiten key: "Schlüssel:" requests: "Die Benutzer werden um Folgendes um Erlaubnis gebeten:" secret: "Geheimnis:" @@ -1241,6 +1299,37 @@ de: url: "Tokenanfrage-URL:" update: flash: Client-Informationen erfolgreich aktualisiert + redaction: + create: + flash: Ausgabe wurde erstellt. + destroy: + error: Beim Löschen dieser Ausgabe ist ein Fehler aufgetreten. + flash: Ausgabe wurde gelöscht. + not_empty: Die Ausgabe ist nicht leer. Bitte entferne alle Versionen dieser Ausgabe, bevor du sie löschst. + edit: + description: Beschreibung + heading: Ausgabe bearbeiten + submit: Ausgabe speichern + title: Ausgabe bearbeiten + index: + empty: Es ist nichts zum Ausgeben vorhanden. + heading: Liste der Ausgaben + title: Liste der Ausgaben + new: + description: Beschreibung + heading: Informationenen für eine neue Ausgabe eingeben + submit: Ausgabe erstellen + title: Eine neue Ausgabe erstellen + show: + confirm: Bist du sicher? + description: "Beschreibung:" + destroy: Diese Ausgabe löschen + edit: Diese Ausgabe bearbeiten + heading: Ausgabe „%{title}“ wird angezeigt + title: Eine Ausgabe anzeigen + user: "Urheber:" + update: + flash: Änderungen wurden gespeichert. site: edit: anon_edits_link_text: Hier findest du mehr Infos dazu. @@ -1255,7 +1344,6 @@ de: index: js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert. js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung. - js_3: Solltest bei dir kein JavaScript möglich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne JavaScript benutzen. license: license_name: Creative Commons „Namensnennung, Weitergabe unter gleichen Bedingungen 2.0“ notice: Lizenziert unter %{license_name} Lizenz durch das %{project_name} und seine Mitwirkenden. @@ -1312,7 +1400,7 @@ de: retail: Einkaufszentrum runway: - Start- und Landebahn - - Rollweg + - Rollbahn school: - Schule - Universität @@ -1332,6 +1420,23 @@ de: unclassified: Straße unsurfaced: Unbefestigte Straße wood: Naturwald + markdown_help: + alt: Alternativer Text + first: Erstes Element + heading: Überschrift + headings: Überschriften + image: Bild + link: Link + ordered: Nummerierte Liste + second: Zweites Element + subheading: Untergeordnete Überschrift + text: Text + title_html: Analysiert mit <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Aufgezählte Liste + url: URL + richtext_area: + edit: Bearbeiten + preview: Vorschau search: search: Suchen search_help: "Beispiele: „München“, „Heinestraße, Würzburg“, „CB2 5AQ“, oder „post offices near Lünen“ <a href='http://wiki.openstreetmap.org/wiki/Search'>mehr Beispiele …</a>" @@ -1368,16 +1473,13 @@ de: visibility: "Sichtbarkeit:" visibility_help: Was heißt das? list: + empty_html: Bislang ist hier noch nichts vorhanden. <a href='%{upload_link}'>Lade eine neue Spur hoch</a> oder informiere dich auf folgender <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>Wikiseite</a> über das Aufzeichnen von GPS-Spuren. public_traces: Öffentliche GPS-Tracks public_traces_from: Öffentliche GPS-Tracks von %{user} tagged_with: " gekennzeichnet mit %{tags}" your_traces: Eigene GPS-Tracks make_public: made_public: veröffentlichter Track - no_such_user: - body: Entschuldige, wir konnten keinen Benutzer mit dem Namen %{user} finden. Du hast dich möglicherweise vertippt, oder du bist einem ungültigem Link gefolgt. - heading: Der Benutzer %{user} existiert nicht - title: Benutzer nicht gefunden offline: heading: GPX Speicher Offline message: Das Upload-System und der Speicher für GPX-Dateien ist derzeit nicht verfügbar @@ -1417,8 +1519,8 @@ de: trace_optionals: tags: Tags trace_paging_nav: - next: nächste - previous: vorherige + newer: Neuere Spuren + older: Ältere Spuren showing_page: Seite %{page} view: delete_track: Diesen Track löschen @@ -1581,7 +1683,9 @@ de: title: Passwort vergessen make_friend: already_a_friend: Du bist bereits mit %{name} befreundet. + button: Als Freund hinzufügen failed: Sorry, %{name} konnte nicht als dein Freund hinzugefügt werden. + heading: "%{user} als Freund hinzufügen?" success: "%{name} ist nun dein Freund." new: confirm email address: "Bestätige deine E-Mail-Adresse:" @@ -1614,6 +1718,8 @@ de: nearby mapper: Mapper in der Nähe your location: Eigener Standort remove_friend: + button: Als Freund entfernen + heading: "%{user} als Freund entfernen?" not_a_friend: "%{name} ist nicht dein Freund." success: "%{name} wurde als Freund entfernt." reset_password: @@ -1650,7 +1756,7 @@ de: activate_user: Benutzer aktivieren add as friend: Als Freund hinzufügen ago: (%{time_in_words_ago} her) - block_history: Erhaltene Sperren anzeigen + block_history: Erhaltene Sperren blocks by me: Selbst vergebene Sperren blocks on me: Erhaltene Sperren comments: Kommentare @@ -1676,7 +1782,7 @@ de: latest edit: "Letzte Änderung %{ago}:" m away: "%{count} m entfernt" mapper since: "Mapper seit:" - moderator_history: Vergebene Sperren anzeigen + moderator_history: Vergebene Sperren my comments: Eigene Kommentare my diary: Eigener Blog my edits: Eigene Bearbeitungen @@ -1732,7 +1838,6 @@ de: filter: block_expired: Die Sperre kann nicht bearbeitet werden, da die Sperrdauer bereits abgelaufen ist. block_period: Die Sperrdauer muss einem der Werte aus der Drop-Down-Liste entsprechen. - not_a_moderator: Du musst Moderator sein um diese Aktion durchzuführen. helper: time_future: Endet in %{time}. time_past: Endete vor %{time} @@ -1762,11 +1867,14 @@ de: creator_name: Urheber display_name: Gesperrter Benutzer edit: Bearbeiten + next: Nächste » not_revoked: (nicht aufgehoben) + previous: « Vorige reason: Grund der Sperre revoke: Aufheben! revoker_name: Aufgehoben von show: Anzeigen + showing_page: Seite %{page} status: Status period: one: 1 Stunde diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 821e9a82b..92efe7cba 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -1,4 +1,4 @@ -# Messages for Lower Sorbian (Dolnoserbski) +# Messages for Lower Sorbian (dolnoserbski) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Michawiki @@ -74,6 +74,8 @@ dsb: application: require_cookies: cookies_needed: Zda se, až cookieje su znjemóžnjone - pÅ¡osym zmóžni cookieje w swójom wobglědowaku, nježli až pókÅ¡acujoÅ¡. + require_moderator: + not_a_moderator: MusyÅ¡ moderator byś, aby wuwjadł tutu akciju. setup_user_auth: blocked: Twój pśistup k API jo se zablokěrował. PÅ¡osym pśizjaw se do webpówjercha, aby wěcej zgónił. need_to_see_terms: Twój pśistup na API jo nachylu wusajźony. PÅ¡osym pśizjaw se k webpówjerchoju, aby se wužywarske wuměnjenja woglědał. NjetrjebaÅ¡ zwóliś do nich, musyÅ¡ se je jano woglědaś. @@ -81,7 +83,6 @@ dsb: changeset: changeset: "Sajźba změnow: %{id}" changesetxml: Sajźbu změnow XML - download: "%{changeset_xml_link} abo %{osmchange_xml_link} ześěgnuś" feed: title: Sajźba změnow %{id} title_comment: Sajźba změnow %{id} - %{comment} @@ -149,21 +150,19 @@ dsb: next_changeset_tooltip: Pśiduca změna wót %{user} prev_changeset_tooltip: PjerwjejÅ¡na změna wót %{user} node: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" download_xml: XML ześěgnuś - edit: wobźěłaś + edit: Suk wobźěłaś node: Nuk node_title: "Suk: %{node_name}" - view_history: historiju pokazaś + view_history: Historiju pokazaś node_details: coordinates: "Koordinaty:" part_of: "Źěl wót:" node_history: - download: "%{download_xml_link} abo %{view_details_link}" download_xml: XML ześěgnuś node_history: Historija suka node_history_title: "Historija suka: %{node_name}" - view_details: drobnostki pokazaś + view_details: Drobnostki pokazaś not_found: sorry: Bóžko %{type} z ID %{id} njejo se dał namakaś. type: @@ -174,21 +173,26 @@ dsb: paging_nav: of: z showing_page: Pokazujo se bok + redacted: + message_html: Wersija %{version} toś togo %{type}a njedajo se pokazaś, dokulaž jo se južo redigěrowała. PÅ¡osym, glědaj %{redaction_link} za drobnostki. + redaction: Redakcija %{id} + type: + node: suk + relation: relacija + way: puś relation: - download: "%{download_xml_link} abo %{view_history_link}" download_xml: XML ześěgnuś relation: Relacija relation_title: "Relacija: %{relation_name}" - view_history: historiju pokazaś + view_history: Historiju pokazaś relation_details: members: "Cłonki:" part_of: "Źěl wót:" relation_history: - download: "%{download_xml_link} abo %{view_details_link}" download_xml: XML ześěgnuś relation_history: Historija relacije relation_history_title: "Historija relacije: %{relation_name}" - view_details: drobnostki pokazaś + view_details: Drobnostki pokazaś relation_member: entry_role: "%{type} %{name} ako %{role}" type: @@ -200,14 +204,14 @@ dsb: view_data: Daty aktualnego kórtowego wurězka zwobrazniś start_rjs: data_frame_title: Daty - data_layer_name: Daty + data_layer_name: Kórtowe daty pśepytaś details: Drobnostki drag_a_box: Wobłuk nad kórtu rozćěgnuś, aby se wurězk wubrał edited_by_user_at_timestamp: Wobźěłany wót [[user]] [[timestamp]] hide_areas: Wobcerki schowaś history_for_feature: Historija za [[feature]] load_data: Daty zacytaś - loaded_an_area_with_num_features: "Sy zacytał wurězk, kótaryž wopśimujo [[num_features]] elementow. Někotare wobglědowaki maju śěžkosći pśi zwobraznjowanju takeje kopice datow. ZwětÅ¡ego wobglědowaki źěłaju nejlěpjej pśi zwobraznjowanju mjenjej ako 100 elementow naraz: howac twój wobglědowak spomałšujo se abo samo wěcej njereagěrujo. Jolic sy se wěsty, až coÅ¡ toś te daty zwobrazniś, móžoÅ¡ dołojce na tłocaÅ¡k kliknuś." + loaded_an_area_with_num_features: "Sy zacytał wurězk, kótaryž wopśimujo [[num_features]] elementow. Někotare wobglědowaki maju śěžkosći pśi zwobraznjowanju takeje kopice datow. ZwětÅ¡ego wobglědowaki źěłaju nejlěpjej pśi zwobraznjowanju mjenjej ako [[num_features]] elementow naraz: howac twój wobglědowak spomałšujo se abo samo wěcej njereagěrujo. Jolic sy se wěsty, až coÅ¡ toś te daty zwobrazniś, móžoÅ¡ dołojce na tłocaÅ¡k kliknuś." loading: Zacytujo se... manually_select: Drugi wurězk wubraś object_list: @@ -246,9 +250,8 @@ dsb: relation: relacija way: puś way: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" download_xml: XML ześěgnuś - edit: wobźěłaś + edit: Puś wobźěłaś view_history: Historiju pokazaś way: Puś way_title: "Puś: %{way_name}" @@ -261,9 +264,8 @@ dsb: nodes: "Suki:" part_of: "Źěl wót:" way_history: - download: "%{download_xml_link} abo %{view_details_link}" download_xml: XML ześěgnuś - view_details: drobnostki pokazaś + view_details: Drobnostki pokazaś way_history: Historija puśa way_history_title: "Historija puśa: %{way_name}" changeset: @@ -292,6 +294,8 @@ dsb: description_nearby: Sajźby změnow wužywarjow w bliskosći description_user: Sajźby změnow wót %{user} description_user_bbox: Sajźby změnow wót %{user} w %{bbox} + empty_anon_html: Doněnta žedne změny njecynjone + empty_user_html: Zda se, až hyšći njejsy žedne změny pśewjadł. Aby zachopił, pśecytaj <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide (wjednik za zachopjeńkarjow)</a>. heading: Sajźby změnow heading_bbox: Sajźby změnow heading_friend: Sajźby změnow @@ -374,10 +378,6 @@ dsb: body: Bóžko njejo zapisk dnjownika abo komentar z ID %{id}. PÅ¡osym pśekontrolěruj pÅ¡awopis, abo wótkaz, na kótaryž sy kliknuł, jo njepłaśiwy. heading: Žeden zapisk z ID %{id} title: Zapisk dnjownika njeeksistěrujo - no_such_user: - body: Bóžko njejo wužywaŕ z mjenim %{user}. PÅ¡osym pśekontrolěruj pÅ¡awopis, abo wótkaz, na kótaryž sy kliknuł, jo płaśiwy. - heading: Wužywaŕ %{user} njeeksistěrujo. - title: Wužywaŕ njeeksistěrujo view: leave_a_comment: Komentar zawóstajiś login: Pśizjawjenje @@ -451,8 +451,10 @@ dsb: south_west: krotki wjacor west: pódwjacor distance: + few: něźi %{count} km one: wokoło 1 km - other: mjenjej ako %{count} km + other: něźi %{count} km + two: něźi %{count} km zero: mjenjej ako 1 km results: more_results: DalÅ¡ne wuslědki @@ -471,16 +473,28 @@ dsb: suffix_place: ", %{distance} %{direction} wót %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Lětanišćo + apron: Lětańske pśedpólo + gate: Wrota + helipad: Helikoptrowe pśizemišćo + runway: Startowa a pśizemjeńska pista + taxiway: Lětadłowa cera + terminal: Terminal amenity: + WLAN: WLAN-pśistup airport: Lětanišćo arts_centre: Kulturny centrum + artwork: Wuměłska twórba atm: Pjenjezny awtomat auditorium: Awditorium bank: Banka bar: Bara + bbq: Grilowanišćo bench: Ławka bicycle_parking: Zmakanišćo za kólasa bicycle_rental: Pśepóžycarnja kólasow + biergarten: Piwowa zagroda brothel: Bordel bureau_de_change: Zaměnjarnja bus_station: Busowe dwórnišćo @@ -489,6 +503,7 @@ dsb: car_sharing: Centrala za sobujězdźenje car_wash: Awtomyjarnja casino: Kasino + charging_station: Napołnjowańska stacija cinema: Kino clinic: Klinika club: Klub @@ -507,6 +522,7 @@ dsb: ferry_terminal: Pśewózny pśistaw fire_hydrant: Hydrant fire_station: Wognjarnja + food_court: Food Court fountain: Studnja fuel: Tankownja grave_yard: Kjarchob @@ -547,9 +563,12 @@ dsb: shelter: Pódstup shop: Pśekupnica shopping: Nakupowanišćo + shower: DuÅ¡a + social_centre: Socialny centrum social_club: TowariÅ¡liwostny klub studio: Studijo supermarket: Supermark + swimming_pool: Plěwarnja taxi: Taksijowe městno telephone: Zjawny telefon theatre: Źiwadło @@ -564,37 +583,17 @@ dsb: youth_centre: Młoźinski centrum boundary: administrative: Zastojnstwowa granica + census: Granica ludlićeńskego wobcerka + national_park: Narodny park + protected_area: Šćitane strony + bridge: + aqueduct: Akwedukt + suspension: Wisaty móst + swing: Zawjertny móst + viaduct: Wiadukt + "yes": Móst building: - apartments: Bydleński blok - block: Blok twarjenjow - bunker: Bunker - chapel: Kapałka - church: Cerkwja - city_hall: Radnica - commercial: Źěłarstwowe twarjenje - dormitory: Internat - entrance: Zachod do twarjenja - faculty: Twarjenje fakulty - farm: Burski dom - flats: Bydlenja - garage: Garaža - hall: Hala - hospital: Chórownja - hotel: Hotel - house: Dom - industrial: Industrijowe twarjenje - office: Běrowowe twarjenje - public: Zjawne twarjenje - residential: Bydleńske twarjenje - retail: Twarjenje drobnego wikowanja - school: Å ulske twarjenje - shop: Wobchod - stadium: Stadion - store: Wobchod - terrace: Terasa - tower: Torm - train_station: Dwórnišćo - university: Uniwersitne twarjenje + "yes": Twarjenje highway: bridleway: Rejtarska drožka bus_guideway: Jězdna kólej kólejowego busa @@ -602,12 +601,11 @@ dsb: byway: Pódlańska droga construction: Dalokowobchadowa droga se twari cycleway: Sćažka za kólasowarjow - distance_marker: Kilometrownik emergency_access_point: Nuzowa słužba footway: Chódnik ford: Brod - gate: Wrota living_street: Droga z pómjeńšonym wobchadom + milestone: Kilometrownik minor: Bocna droga motorway: Awtodroga motorway_junction: Kśica awtodrogi @@ -619,14 +617,17 @@ dsb: primary_link: Droga prědnego rěda raceway: Wuběgowanišćo residential: Bydleńska droga + rest_area: Wótpócywanišćo road: Droga secondary: Droga drugego rěda secondary_link: Droga drugego rěda service: Paralelna droga services: Gósćeńc pśi awtodroze + speed_camera: Błyskowak steps: Stupy stile: Płotowy pśestup tertiary: Droga tśeśego rěda + tertiary_link: Droga tśeśego rěda track: Pólna drožka trail: Sćažka trunk: Dalokowobchadowa droga @@ -640,6 +641,7 @@ dsb: building: Twarjenje castle: Grod church: Cerkwja + fort: Fort house: Dom icon: Ikona manor: Kubło @@ -664,6 +666,7 @@ dsb: farmland: Rola farmyard: Žywnosć forest: Góla + garages: Pórěźarnja awtow grass: Błomje greenfield: njewobtwarjona zemja industrial: Industrijowy wobcerk @@ -671,25 +674,28 @@ dsb: meadow: Łuka military: Militarny wobcerk mine: Pódkopy - mountain: Góra nature_reserve: Strony šćitaneje pśirody + orchard: Sadownja park: Park piste: Pista - plaza: Naměstno quarry: Skała railway: Zeleznica recreation_ground: Wódychańske strony reservoir: Gaśeński jazor + reservoir_watershed: Wódowe pśitocnišćo residential: Bydleński wobcerk retail: Drobne wikowanje + road: Drogowy wobcerk village_green: Wejsny najs vineyard: Winowe kubło wetland: MokÅ¡y teren wood: Lěs leisure: beach_resort: Mórske kupjele + bird_hide: Schow za ptaÅ¡ki common: Almenda fishing: Wuźišćo + fitness_station: Fitnesstudio garden: Zagroda golf_course: Golfowišćo ice_rink: Lodowa hala @@ -700,12 +706,17 @@ dsb: pitch: Sportnišćo playground: Grajkanišćo recreation_ground: Wódychańske strony + sauna: Sawna slipway: Łoźowa suwanka sports_centre: Sportowy centrum stadium: Stadion swimming_pool: Swimmingpool track: Wuběgowánska cera water_park: Wódowy park + military: + airfield: Wójarske lětanišćo + barracks: Kazerna + bunker: Bunker natural: bay: Zalew beach: Pśibrjog @@ -713,11 +724,12 @@ dsb: cave_entrance: Jamowy zachod channel: Kanal cliff: Skalina - coastline: Pśibrjozna linija crater: Krater + dune: Změt pěska feature: Funkcija fell: Fjel fjord: Fjord + forest: Góla geyser: Geysir glacier: Lodojc heath: Wrjosate strony @@ -737,6 +749,7 @@ dsb: scrub: Krě shoal: Měłkosć spring: Žrědło + stone: Kamjeń strait: Mórska wuscyna tree: Bom valley: Doł @@ -745,6 +758,19 @@ dsb: wetland: Ługowe łuki wetlands: Ługowe łuki wood: Lěs + office: + accountant: Knigływjeźeński běrow + architect: Architektowy běrow + company: Zawod + employment_agency: Źěłowy amt + estate_agent: Maklaŕ gruntow + government: Amt + insurance: Zawěsćeński běrow + lawyer: PÅ¡awizniski běrow + ngo: Běrow njekněžarstwoweje organizacije + telecommunication: Telekomunikaciski amt + travel_agent: Drogowański běrow + "yes": Běrow place: airport: Lětanišćo city: Wjelike město @@ -756,6 +782,7 @@ dsb: houses: Domy island: Kupa islet: Mała kupa + isolated_dwelling: Jadnotliwe bydło locality: Sedlišćo moor: Bagno municipality: Gmejna @@ -779,6 +806,7 @@ dsb: junction: Zeleznicowe kśicnišćo level_crossing: Zeleznicowy pśechod light_rail: Měsćańska zeleznica + miniature: Miniaturna zeleznica monorail: Jadnokólejowa zeleznica narrow_gauge: Wuskokólejata zeleznica platform: Pśistupnišćo @@ -793,7 +821,7 @@ dsb: yard: Ranžěrowańske dwórnišćo shop: alcohol: Wobchod za spirituoze - apparel: Woblekarnja + antiques: Wobchod za starobki art: Wobchod wuměłskich twórbow bakery: Pjakarnja beauty: Parfimerija @@ -802,7 +830,6 @@ dsb: books: Knigłarnja butcher: Rěznik car: Awtownja - car_dealer: Awtownja car_parts: Awtowe narownanki car_repair: Pórěźarnja awtow carpet: Tepichowy wobchod @@ -817,7 +844,6 @@ dsb: department_store: Kupnica discount: Discounter doityourself: Wobchod za baslarsku pótrjebu - drugstore: Drogerija dry_cleaning: Cysćarnja electronics: Elektronikowy wobchod estate_agent: Maklaŕ gruntow @@ -883,7 +909,10 @@ dsb: valley: Doł viewpoint: Rozglědanišćo zoo: Coo + tunnel: + "yes": Tunel waterway: + artificial: KumÅ¡tna wódna droga boatyard: Ä¿oźnica canal: Kanal connector: Zwisk mjazy wódnymi drogami @@ -919,6 +948,7 @@ dsb: history_tooltip: Změny za toś ten wobcerk pokazaś history_zoom_alert: MusyÅ¡ powětÅ¡yś, aby wiźeł wobźěłowańsku historiju layouts: + community: Zgromaźeństwo community_blogs: Blogi zgromaźeństwa community_blogs_title: Blogi cłonkow zgromaźeństwa OpenStreetMap copyright: Awtorske pÅ¡awo a licenca @@ -940,7 +970,7 @@ dsb: history: Historija home: domoj home_tooltip: K stojnišćoju - inbox: post (%{count}) + inbox_html: post (%{count}) inbox_tooltip: few: Twój postowy kašćik wopśimujo %{count} njepśecytane powěsći one: Twój postowy kašćik wopśimujo 1 njepśecytanu powěsć @@ -948,10 +978,11 @@ dsb: two: Twój postowy kašćik wopśimujo %{count} njepśecytanej powěsći zero: Twój postowy kašćik njewopśimujo žedne njepśecytane powěsći intro_1: OpenStreetMap jo licho wobźěłujobna kórta cełego swěta. Jo se za luźi ako ty napórała. - intro_2: OpenStreetMap śi dowólujo, geografiske daty wóte wÅ¡uźi na zemi zgromadnje se woglědaś, wobźěłaś a wužywaś. - intro_3: Hostowanje serwerow OpenStreetMap pśijaznosću pódpěra se wót %{ucl}, %{ic} a %{bytemark}. Druge pódpěrarje projekta su w %{partners} nalicone. - intro_3_ic: Imperial College London - intro_3_partners: wiki + intro_2_create_account: Załož wužywarske konto + intro_2_download: ześěgnuś + intro_2_html: MóžoÅ¡ daty dermo %{download} a pód %{license} %{use}. %{create_account}, aby kórtu pólěpÅ¡ył. + intro_2_license: zjawneju licencu + intro_2_use: wužywaś license: title: Daty OpenStreetMap licencěruju se pód licencu Creative Commons Attribution-Share Alike 2.0 Generic log_in: pśizjawiś @@ -965,9 +996,14 @@ dsb: title: Pódprěj OpenStreetMap z pjenjezneju pósćiwanku osm_offline: Datowa banka OpenStreetMap jo tuchylu offline, dokulaž se wažne źěło za wótglědowanje datoweje banki pśewjedujo. osm_read_only: Datowa banka OpenStreetMap jo tuchylu w modusu "Jano cytaś", dokulaž se wažne źěło za wótglědowanje datoweje banki pśewjedujo. + partners_bytemark: Bytemark Hosting + partners_html: Hostowanje pódpěra se wót %{ucl}, %{ic}, %{bytemark} a drugich %{partners}. + partners_ic: Imperial College London + partners_partners: partnerow + partners_ucl: z UCL VR Centre sign_up: registrěrowaś sign_up_tooltip: Konto za wobźěłowanje załožyś - sotm2011: Dojź ku konference OpenStreetMap 2011, "the State of the Map", 9 - 11. septembra w Denverje! + sotm2012: Dojěź ku konference OpenStreetMap 2012, "the State of the Map", 6 - 8. septembra w Tokiju! tag_line: Licha wikikórta swěta user_diaries: Dnjowniki user_diaries_tooltip: Wužywarske dnjowniki cytaś @@ -982,7 +1018,30 @@ dsb: english_link: engelskim originalom text: W paźe konflikta mjazy pśełožonym bokom a %{english_original_link}, engelski bok ma prědnosć měś title: Wó toś tom pśełožku - legal_babble: "<h2>Awtorske pÅ¡awo a licenca</h2>\n<p> \nOpenStreetMap wobstoj ze <i>zjawnych datow</i>, licencěrowanych pód licencu <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA). </p> <p> MóžoÅ¡ naÅ¡e kórty a daty kopěrowaś, rozdźěliś, pśenjasć a pśiměriś, tak dłujko ako naspomnjejoÅ¡ OpenStreetMap a jich sobustatkujucych. Jolic změnijoÅ¡ naÅ¡e kórty abo daty abo zepěraÅ¡ se na nje, móžoÅ¡ wuslědk jano pód teju sameju licencu rozdźěliś. Dopołny <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">pÅ¡awniski code</a> wujasnjujo twóje pÅ¡awa a zagronitosći.</p>\n\n<h3>Kak naspomnjeś awtorstwo OpenStreetMap</h3>\n<p> Jolic wužywaÅ¡ kórtowe wobraze z OpenStreetMap, pominamy se, až nanejmjenjej pódawaÅ¡ “© OpenStreetMap a sobustatkujucych, CC BY-SA”. Jolic wužywaÅ¡ jano kórtowe daty, musyÅ¡ “kórtowe daty © OpenStreetMap a sobustatkujucych, CC BY-SA” pódaś. </p> <p> Źož jo móžno, OpenStreetMap by měł wótkaz do <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> a CC BY-SA do <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> měś. Jolic wužywaÅ¡ medij, źož wótkaze njejsu móžno (na pś. wuśišćane źěło), naraźujomy, až pokazujoÅ¡ swójich cytarjow na www.openstreetmap.org a na www.creativecommons.org.</p>\n\n<h3>DalÅ¡ne informacije</h3>\n<p>Cytaj wěcej wó wužywanju naÅ¡ych datow <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Ceste pÅ¡awniske pÅ¡aÅ¡enja</a>.</p><p> Sobustatkujucych OSM napominamy, až njedodawaju nigda daty ze žrědłow, kótarež su pśez awtorske pÅ¡awo šćitane (na pś. z Google Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow. </p> <p> Lěcrownož OpenStreetMap wobstoj ze zjawnych datow, njamóžomy dermotny kórtowy API za wuwiwarjow třeśich póbitowaś. \n\nGlědaj naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">pÅ¡awidła za wužywanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">PÅ¡awidła za wužywanje pólow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">PÅ¡awidła za wužywanje Nominatim</a>. </p> \n\n<h3>NaÅ¡e sobustatkujuce</h3>\n<p> NaÅ¡a licenca CC BY-SA pomina se, až “dajoÅ¡ spócetnemu awtoroju źěk pśiměrjonemu medijoju abo srědkoju, kótaryž wužywaÅ¡”. Jadnotliwe kartěrowarje OSM njepominaju se pśidatne źěkowanje k “sobustatkujucym OpenStreetMap”, ale gaž se daty z narodnego kartěrowańskego předewześa abo z drugego wuznamnego žrědła w OpenStreetMap zapśimuju, jo pśiměrjone, jim pśez direktne pśewzeće jich źěkowanja abo pśez wótkazowanje na njo na toś tom boku wuźěkowaś. </p>\n\n<!-- Information for page editors The following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data. Any additions here must be discussed with OSM sysadmins first. --> \n<ul id=\"contributors\"><li><strong>Awstralska</strong>: Wopśimujo pśedměsćańske daty na zakłaźe datow awstralskego amta za statistiku (Australian Bureau of Statistics).</li>\n<li><strong>Awstriska</strong>: Wopśimujo daty z <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> pód <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>.</li>\n <li><strong>Kanada</strong>: Wopśimujo daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada).</li>\n<li><strong>Francojska</strong>: Wopśimujo daty z Direction Générale des Impôts.</li>\n<li><strong>Nowoseelandska</strong>: Wopśimujo daty ze žrědłow wót Land Information New Zealand. Awtorske pÅ¡awo wuměnjone.</li> \n<li><strong>Pólska</strong>: Wopśimujo daty z <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske pÅ¡awo sobustatkujucych UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Wěcej wó wužywanju UMP-datow w OSM</a></li>\n <li><strong>South Africa</strong>: Wopśimujo daty z <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, Statne awtorske pÅ¡awo wuměnjone.</li>\n <li><strong>United Kingdom</strong>: Wopśimujo daty wót Ordnance\n Survey © Crown copyright and database right\n 2010.</li>\n<li><strong>Zjadnośone kralojstwo</strong>: Wopśimujo daty z Ordnance Survey (Amtske rozměrjenje kraja) © Awtorske pÅ¡awo a pÅ¡awo za datowe banki 2010.</li> </ul>\n\n<p> Zapśimowanje datow do OpenStreetMap njegroni, až póbitowaŕ originalnych datow pśipóznawa OpenStreetMap, dawa někaku garantiju abo pśewzejo rukowanje. </p>" + legal_babble: + contributors_at_html: "<strong>Awstriska</strong>: Wopśimujo daty z <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (pód <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> a Land Tirol (pod <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT ze změnami</a>)." + contributors_au_html: "<strong>Awstralska</strong>: Wopśimujo pśedměsćańske daty na zakłaźe datow awstralskego amta za statistiku (Australian Bureau of Statistics)." + contributors_ca_html: "<strong>Kanada</strong>: Wopśimujo daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: Za dalÅ¡ne drobnostki za to a druge žrědła, kótarež su se wužyli, aby OpenStreetMap pólěpÅ¡yli, glědaj pÅ¡oÅ¡ym <a href="http://wiki.openstreetmap.org/wiki/Contributors">bok sobustatkujucych</a> na wikiju OpenStreetMap. + contributors_footer_2_html: Zapśimowanje datow do OpenStreetMap njegroni, až póbitowaŕ originalnych datow pśipóznawa OpenStreetMap, dawa někaku garantiju abo pśewzejo rukowanje. + contributors_fr_html: "<strong>Francojska</strong>: Wopśimujo daty z Direction Générale des Impôts." + contributors_gb_html: "<strong>Zjadnośone kralojstwo</strong>: Wopśimujo daty z Ordnance Survey (Amtske rozměrjenje kraja) © Awtorske pÅ¡awo a pÅ¡awo za datowe banki 2010." + contributors_intro_html: NaÅ¡a licenca CC BY-SA pomina se, až “dajoÅ¡ spócetnemu awtoroju źěk pśiměrjonemu medijoju abo srědkoju, kótaryž wužywaÅ¡”. Jadnotliwe kartěrowarje OSM njepominaju se pśidatne źěkowanje k “sobustatkujucym OpenStreetMap”, ale gaž se daty z narodnego kartěrowańskego předewześa abo z drugego wuznamnego žrědła w OpenStreetMap zapśimuju, jo pśiměrjone, jim pśez direktne pśewzeće jich źěkowanja abo pśez wótkazowanje na njo na toś tom boku wuźěkowaś. + contributors_nl_html: "<strong>Nižozemska</strong>: Wopsimujo daty © AND, 2007 (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nowoseelandska</strong>: Wopśimujo daty ze žrědłow wót Land Information New Zealand. Awtorske pÅ¡awo wuměnjone." + contributors_pl_html: "<strong>Pólska</strong>: Wopśimujo daty z <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske pÅ¡awo sobustatkujucych UMP-pcPL. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\"> Wěcej wó wužywanju UMP-datow w OSM</a>" + contributors_title_html: NaÅ¡e sobustatkujuce + contributors_za_html: "<strong>Pódpołdnjowa Afrika</strong>: Wopśimujo daty z <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, Statne awtorske pÅ¡awo wuměnjone." + credit_1_html: Jolic wužywaÅ¡ kórtowe wobraze z OpenStreetMap, pominamy se, až nanejmjenjej pódawaÅ¡ “© OpenStreetMap a sobustatkujucych, CC BY-SA”. Jolic wužywaÅ¡ jano kórtowe daty, musyÅ¡ “kórtowe daty © OpenStreetMap a sobustatkujucych, CC BY-SA” pódaś. + credit_2_html: Źož jo móžno, OpenStreetMap by měł wótkaz do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> a CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a> měś. Jolic wužywaÅ¡ medij, źož wótkaze njejsu móžno (na pś. wuśišćane źěło), naraźujomy, až pokazujoÅ¡ swójich cytarjow na www.openstreetmap.org a na www.creativecommons.org. + credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap + intro_1_html: OpenStreetMap wobstoj ze <i>zjawnych datow</i>, licencěrowanych pód licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA). + intro_2_html: MóžoÅ¡ naÅ¡e kórty a daty kopěrowaś, rozdźěliś, pśenjasć a pśiměriś, tak dłujko ako naspomnjejoÅ¡ OpenStreetMap a jich sobustatkujucych. Jolic změnijoÅ¡ naÅ¡e kórty abo daty abo zepěraÅ¡ se na nje, móžoÅ¡ wuslědk jano pód teju sameju licencu rozdźěliś. Dopołny <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">pÅ¡awniski code</a> wujasnjujo twóje pÅ¡awa a zagronitosći. + more_1_html: Cytaj wěcej wó wužywanju naÅ¡ych datow <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Ceste pÅ¡awniske pÅ¡aÅ¡enja</a>. + more_2_html: Sobustatkujucych OSM napominamy, až njedodawaju nigda daty ze žrědłow, kótarež su pśez awtorske pÅ¡awo šćitane (na pś. z Google Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow. + more_3_html: "Lěcrownož OpenStreetMap wobstoj ze zjawnych datow, njamóžomy dermotny kórtowy API za wuwiwarjow třeśich póbitowaś. \nGlědaj naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">pÅ¡awidła za wužywanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">PÅ¡awidła za wužywanje pólow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">PÅ¡awidła za wužywanje Nominatim</a>." + more_title_html: DalÅ¡ne informacije + title_html: Awtorske pÅ¡awo a licenca native: mapping_link: kartěrowanje zachopiś native_link: dolnoserbskej wersiji @@ -997,12 +1056,16 @@ dsb: messages: MaÅ¡ %{new_messages} a %{old_messages} my_inbox: Mój post new_messages: + few: "%{count} nowe powěsći" one: "%{count} nowa powěsć" - other: "%{count} nowej powěsći" + other: "%{count} nowych powěsćow" + two: "%{count} nowej powěsći" no_messages_yet: Hyšći njamaÅ¡ powěsći. Cogodla njestajaÅ¡ se z %{people_mapping_nearby_link} do zwiska? old_messages: + few: "%{count} stare powěsći" one: "%{count} stara powěsć" - other: "%{count} starej powěsći" + other: "%{count} starych powěsćow" + two: "%{count} starej powěsći" outbox: pósłany people_mapping_nearby: Luźe, kótarež kartěruju w bliskosći subject: Temowe nadpismo @@ -1028,16 +1091,14 @@ dsb: body: Bóžko powěźeńka z tym ID njeeksistěrujo. heading: Powěsć njeeksistěrujo title: Powěsć njeeksistěrujo - no_such_user: - body: Bóžko njejo žeden wužywaŕ z tym mjenim. - heading: Wužywaŕ njeeksistěrujo - title: Wužywaŕ njeeksistěrujo outbox: date: Datum inbox: post messages: + few: Sy %{count} powěsći pósłał one: Sy %{count} powěsć pósłał - other: Sy %{count} powěsći pósłał + other: Sy %{count} powěsćow pósłał + two: Sy %{count} powěsći pósłał my_inbox: Mój %{inbox_link} no_sent_messages: Hyšći njejsy powěsći rozpósłał. Cogodla njestajaÅ¡ se z jadnym z %{people_mapping_nearby_link}, do zwiska? outbox: pósłany @@ -1203,6 +1264,8 @@ dsb: allow_write_gpx: GPS-slědy nagraś. allow_write_prefs: wužywarske nastajenja změniś. authorize_url: "URL awtorizěrowaś:" + confirm: Sy se wěsty? + delete: Klient wulaÅ¡owaś edit: Drobnostki wobźěłaś key: "Kluc pśetrjebowarja:" requests: "Pominaju se slědujuce pÅ¡awa wót wužywarja:" @@ -1212,6 +1275,37 @@ dsb: url: "URL za napÅ¡aÅ¡owański token:" update: flash: Informacije wó klienśe wuspěšnje zaktualizěrowane + redaction: + create: + flash: Redakcija jo se napórała. + destroy: + error: Pśi laÅ¡owanju toś teje redakcije jo zmólka nastała. + flash: Redakcija jo se wulaÅ¡owała. + not_empty: Redakcija njejo prozna. PÅ¡osym wótpóraj wÅ¡ykne wersije toś teje redakcije, nježli až ju wulaÅ¡ujoÅ¡. + edit: + description: Wopisanje + heading: Redakciju wobźěłaś + submit: Redakciju składowaś + title: Redakciju wobźěłaś + index: + empty: Žedne redakcije njejsu. + heading: Lisćina redakcijow + title: Lisćina redakcijow + new: + description: Wopisanje + heading: Informacije za nowu redakciju zapódaś + submit: Redakciju napóraś + title: Nowa redakcija se napórajo + show: + confirm: Sy se wěsty? + description: "Wopisanje:" + destroy: Toś tu redakciju wótpóraś + edit: Toś tu redakciju wobźěłaś + heading: Redakcija "%{title}" se pokazujo + title: Redakcija se pokazujo + user: "Stwóriśel:" + update: + flash: Změny skłaźone. site: edit: anon_edits_link_text: Wuslěź, cogodla tomu tak jo. @@ -1226,7 +1320,6 @@ dsb: index: js_1: Pak wužywaÅ¡ wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił JavaScript. js_2: OpenStreetMap wužywa JavaScript za suwatu kórtu. - js_3: MóžoÅ¡ teke <a href="http://tah.openstreetmap.org/Browse/">statiski kachlowy wobglědowak Tiles@Home</a> wužywaś, jolic njamóžoÅ¡ JavaScript zmóžniś. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Licencěrowany pód licencu %{license_name} pśez %{project_name} a jogo sobustatkujucych. @@ -1303,6 +1396,23 @@ dsb: unclassified: Njeklasificěrowana droga unsurfaced: Njewobtwarźona droga wood: Lěs + markdown_help: + alt: Alternatiwny tekst + first: Prědny element + heading: Nadpismo + headings: Nadpisma + image: Wobraz + link: Wótkaz + ordered: Numerěrowana lisćina + second: Drugi element + subheading: Pódnapismo + text: Tekst + title_html: Z <a href="http://daringfireball.net/projects/markdown/">Markdown</a> analyzěrowany + unordered: Nalicenje + url: URL + richtext_area: + edit: Wobźěłaś + preview: Pśeglěd search: search: Pytaś search_help: "pśikłady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', abo 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>dalÅ¡ne pśikłady...</a>" @@ -1339,16 +1449,13 @@ dsb: visibility: "Widobnosć:" visibility_help: Co to groni? list: + empty_html: How njejo nic. <a href='%{upload_link}'>Nagraj nowy slěd</a> abo wukni wěcej wó GPS-slědowanju na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikijowem boku</a>. public_traces: Zjawne GPS-slědy public_traces_from: Zjawne GPS-slědy wót %{user} tagged_with: " wobznamjenjony pśez %{tags}" your_traces: Twóje GPS-slědy make_public: made_public: Wózjawjona cera - no_such_user: - body: Bóžko njejo wužywaŕ z mjenim %{user}. PÅ¡osym pśekontrolěruj swój pÅ¡awopis, abo wótkaz, na kótaryž sy kliknuł, jo njepłaśiwy. - heading: Wužywaŕ %{user} njeeksistěrujo - title: Toś ten wužywaŕ njeeksistěrujo offline: heading: Składowanje GPX offline message: Składowanje a nagrawański system GPX-datajow njestoj tuchylu k dispoziciji. @@ -1387,8 +1494,8 @@ dsb: trace_optionals: tags: Atributy trace_paging_nav: - next: Pśiducy » - previous: « PjerwjejÅ¡ny + newer: NowÅ¡e slědy + older: StarÅ¡e slědy showing_page: Pokazujo se bok %{page} view: delete_track: Toś tu ceru wulaÅ¡owaś @@ -1490,7 +1597,7 @@ dsb: hide: Wubranych wužywarjow schowaś showing: one: Pokazujo se bok %{page} (%{first_item} z %{items}) - other: Pokazujo se bok %{page} (%{first_item}-%{last_item} z%{items}) + other: Pokazujo se bok %{page} (%{first_item}-%{last_item} z %{items}) summary: "%{name} wót %{ip_address} dnja %{date} napórany" summary_no_ip: "%{name} dnja %{date} napórany" title: Wužywarje @@ -1702,7 +1809,6 @@ dsb: filter: block_expired: Blokěrowanje jo južo pśepadnuło a njedajo se wobźěłaś. block_period: Cas blokěrowanja musy jadna z gódnotow byś, kótarež daju se z padajuceje lisćiny wubraś. - not_a_moderator: MusyÅ¡ moderator byś, aby wuwjadł tutu akciju. helper: time_future: Kóńcy se %{time}. time_past: Jo se pśed %{time} skóńcyło. @@ -1732,11 +1838,14 @@ dsb: creator_name: Blokěrowaŕ display_name: Zablokěrowany wužywaŕ edit: Wobźěłaś + next: Pśiducy » not_revoked: (nic wótpórany) + previous: « PjerwjejÅ¡ny reason: Pśicyna za blokěrowanje revoke: Wótpóraś! revoker_name: Wótpórany wót show: Pokazaś + showing_page: Pokazujo se bok %{page} status: Status period: few: "%{count} góźiny" diff --git a/config/locales/el.yml b/config/locales/el.yml index 050cd985e..633cb6119 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -5,9 +5,11 @@ # Author: Consta # Author: Crazymadlover # Author: Evropi +# Author: Geraki # Author: Kiriakos # Author: Logictheo # Author: Omnipaedista +# Author: Protnet # Author: Zserdx el: activerecord: @@ -85,7 +87,6 @@ el: changeset: changeset: "Ομάδα αλλαγών: %{id}" changesetxml: Ομάδας αλλαγών XML - download: Λήψη %{changeset_xml_link} ή %{osmchange_xml_link} feed: title: Ομάδα αλλαγών %{id} title_comment: Ομάδα αλλαγών %{id} - %{comment} @@ -143,7 +144,6 @@ el: next_changeset_tooltip: Επόμενη επεξεργασία από τον %{user} prev_changeset_tooltip: Προηγούμενη επεξεργασία από τον %{user} node: - download: "%{download_xml_link}, %{view_history_link} ή %{edit_link}" download_xml: Λήψη XML edit: επεξεργασία node: Κόμβος @@ -153,7 +153,6 @@ el: coordinates: "Συντεταγμένες:" part_of: "Κομμάτι του:" node_history: - download: "%{download_xml_link} ή %{view_details_link}" download_xml: Λήψη XML node_history: Ιστορικό Κόμβου node_history_title: "Ιστορικό Κόμβου: %{node_name}" @@ -168,8 +167,12 @@ el: paging_nav: of: από showing_page: Εμφάνιση σελίδας + redacted: + type: + node: Κόμβος + relation: σχέση + way: διαδρομή relation: - download: "%{download_xml_link} ή %{view_history_link}" download_xml: Λήψη XML relation: Σχέση relation_title: "Σχέση: %{relation_name}" @@ -178,7 +181,6 @@ el: members: "Μέλη:" part_of: "Μέρος του:" relation_history: - download: "%{download_xml_link} ή %{view_details_link}" download_xml: Λήψη XML relation_history: Ιστορικό Σχέσης relation_history_title: "Ιστορικό σχέσης: %{relation_name}" @@ -194,14 +196,14 @@ el: view_data: Προβολή δεδομένων για την τρέχουσα προβολή χάρτη start_rjs: data_frame_title: Δεδομένα - data_layer_name: Δεδομένα + data_layer_name: Περιήγηση Δεδομένων Χάρτη details: Λεπτομέρειες drag_a_box: Σύρε ένα πλαίσιο στο χάρτη για να επιλέξεις μια περιοχή edited_by_user_at_timestamp: Επεξεργάστηκε από τον [[user]] στις [[timestamp]] hide_areas: Απόκρυψη περιοχών history_for_feature: Ιστορικό για [[feature]] load_data: Φόρτωση δεδομένων - loaded_an_area_with_num_features: "Έχεις φορτώσει μια περιοχή που περιέχει [[num_features]] χαρακτηριστικά. Γενικά, μερικοί browsers μπορεί να μην αντέχουν να δείξουν τόσα πολλά στοιχεία. Γενικά, οι browsers δουλεύουν καλύτερα δείχνοντας λιγότερα από 100 χαρακτηριστικά τη φορά: με οτιδήποτε άλλο ο browser μπορεί να γίνει αργός ή να μην αντιδρά. Αν είσαι σίγουρος ότι θες να δεις αυτά τα δεδομένα, κάνε κλικ στο επόμενο κουμπί." + loaded_an_area_with_num_features: "Έχεις φορτώσει μια περιοχή που περιέχει [[num_features]] χαρακτηριστικά. Γενικά, μερικοί browsers μπορεί να μην αντέχουν να δείξουν τόσα πολλά στοιχεία. Γενικά, οι browsers δουλεύουν καλύτερα δείχνοντας λιγότερα από [[max_features]] χαρακτηριστικά τη φορά: με οτιδήποτε άλλο ο browser μπορεί να γίνει αργός ή να μην αντιδρά. Αν είσαι σίγουρος ότι θες να δεις αυτά τα δεδομένα, κάνε κλικ στο παρακάτω κουμπί." loading: Φόρτωση... manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής object_list: @@ -240,7 +242,6 @@ el: relation: σχέση way: Διαδρομή way: - download: "%{download_xml_link}, %{view_history_link} ή %{edit_link}" download_xml: Λήψη XML edit: επεξεργασία view_history: Προβολή ιστορικού @@ -253,7 +254,6 @@ el: nodes: "Κόμβοι:" part_of: "Μέρος του:" way_history: - download: "%{download_xml_link} ή %{view_details_link}" download_xml: Λήψη XML view_details: Προβολή λεπτομερειών way_history: Ιστορικό Διαδρομής @@ -299,6 +299,14 @@ el: timeout: sorry: Λυπάμαι, ο κατάλογος των ομάδων αλλαγών που ζήτησες χρειάστηκε πολύ χρόνο για να ανακτηθεί. diary_entry: + comments: + ago: "%{ago} πριν" + comment: Σχόλιο + has_commented_on: Ο {display_name} % έχει σχολιάσει στις ακόλουθες καταχωρήσεις στο ημερολόγιο + newer_comments: Νεότερα Σχόλια + older_comments: Παλαιότερα Σχόλια + post: Καταχώρηση + when: Πότε diary_comment: comment_from: Σχόλιο από τον %{link_user} στις %{comment_created_at} confirm: Επιβεβαίωση @@ -356,10 +364,6 @@ el: body: Συγγνώμη, δεν υπάρχει καταχώρηση ημερολογίου ή σχόλιο με τη ταυτότητα %{id}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος μέσο του οπίου φτάσατε σε αυτήν την σελίδα. heading: "Καμία καταχώρηση με τη ταυτότητα: %{id}" title: Δεν υπάρχει τέτοια εγγραφή ημερολογίου - no_such_user: - body: Λυπούμαστε, δεν υπάρχει χρήστης με το όνομα %{user}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος μέσο του οπίου φτάσατε σε αυτήν την σελίδα. - heading: Ο χρήστης %{user} δεν υπάρχει - title: Άγνωστος χρήστης view: leave_a_comment: Αφήστε ένα σχόλιο login: Σύνδεση @@ -392,6 +396,7 @@ el: licence: Άδεια longitude: "Γεω. Μη.:" manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής + map_image: Εικόνα Χάρτη (δείχνει τυπικό επίπεδο) max: μεγ options: Επιλογές osm_xml_data: Δεδομένα OpenStreetMap XML @@ -451,13 +456,22 @@ el: suffix_place: ", %{distance} %{direction} από %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Αεροδρόμιο + gate: Πύλη + helipad: Ελικοδρόμιο + runway: Διάδρομος + taxiway: Τροχόδρομος + terminal: Τερματικός σταθμός amenity: + WLAN: Πρόσβαση WiFi airport: Αεροδρόμιο arts_centre: Κέντρο Τεχνών atm: ATM auditorium: Αμφιθέατρο bank: Τράπεζα bar: Μπαρ + bbq: Ψησταριά bench: Πάγκος bicycle_parking: Στάθμευση Ποδηλάτων bicycle_rental: Ενοικίαση Ποδηλάτων @@ -469,6 +483,7 @@ el: car_sharing: Κοινή χρήση αυτοκινήτων car_wash: Πλύσιμο Αυτοκινήτων casino: Καζίνο + charging_station: Σταθμός Φόρτισης cinema: Κινηματογράφος clinic: Κλινική club: Club @@ -518,13 +533,16 @@ el: reception_area: Χώρος Υποδοχής recycling: Σημείο Ανακύκλωσης restaurant: Εστιατόριο + retirement_home: Γηροκομείο sauna: Σάουνα school: Σχολείο shelter: Καταφύγιο shop: Κατάστημα shopping: Αγορές + social_centre: Κοινωνικό κέντρο studio: Στούντιο supermarket: Σουπερμάρκετ + swimming_pool: Πισίνα taxi: Ταξί telephone: Δημόσιο Τηλέφωνο theatre: Θέατρο @@ -538,39 +556,23 @@ el: youth_centre: Κέντρο Νεολαίας boundary: administrative: Διοικητικό Όριο + census: Όριο απογραφής + national_park: Εθνικό πάρκο + protected_area: Προστατευόμενη Περιοχή + bridge: + aqueduct: Υδραγωγείο + suspension: Κρεμαστή Γέφυρα + "yes": Γέφυρα building: - block: Οικοδομικό Τετράγωνο - bunker: Οχυρό - chapel: Παρεκκλήσι - church: Εκκλησία - city_hall: Δημαρχείο - dormitory: Κοιτώνας - entrance: Είσοδος Κτιρίου - flats: Διαμερίσματα - garage: Γκαράζ - hospital: Κτήριο Νοσοκομείου - hotel: Ξενοδοχείο - house: Σπίτι - industrial: Βιομηχανικό Κτήριο - office: Κτήριο Γραφείων - public: Δημόσιο κτήριο - residential: Πολυκατοικία - school: Σχολικό Κτήριο - shop: Κατάστημα - stadium: Στάδιο - store: Κατάστημα - tower: Πύργος - train_station: Σιδηροδρομικός Σταθμός - university: Κτήριο Πανεπιστημίου + "yes": Κτίριο highway: bridleway: Μονοπάτι για άλογα bus_stop: Στάση Λεωφορείου construction: Δρόμος υπό κατασκευή - distance_marker: Δείκτης Απόστασης emergency_access_point: Σημείο Πρόσβασης Έκτακτης Ανάγκης footway: Μονοπάτι ford: Κοιτόστρωση - gate: Πύλη + milestone: Ορόσημο motorway: Αυτοκινητόδρομος motorway_junction: Διασταύρωση Αυτοκινητόδρομου motorway_link: Αυτοκινητόδρομος @@ -581,13 +583,18 @@ el: primary_link: Κύρια Οδός raceway: Αυτοκινητοδρόμιο residential: Κατοικίες + rest_area: Περιοχή Ανάπαυσης road: Δρόμος secondary: Δευτερεύουσα Οδός secondary_link: Δευτερεύουσα Οδός + service: Δρόμος Εξυπηρέτησης services: Υπηρεσίες Αυτοκινητοδρόμου + speed_camera: Κάμερα ταχύτητας steps: Σκαλοπάτια + stile: Στήλη track: Χωματόδρομος - trail: Διαδρομή + trail: Μονοπάτι + trunk_link: Εθνική Οδός unclassified: Αταξινόμητη Οδός unsurfaced: Δρόμος χωρίς Επίστρωση historic: @@ -596,6 +603,7 @@ el: building: Κτίριο castle: Κάστρο church: Εκκλησία + fort: Οχυρό house: Σπίτι icon: Εικονίδιο memorial: Μνημείο @@ -604,8 +612,10 @@ el: museum: Μουσείο ruins: Ερείπια tower: Πύργος + wayside_shrine: Εκκλησάκι δρόμου wreck: Ναυάγιο landuse: + allotments: Λαχανόκηποι basin: Λεκανοπέδιο cemetery: Κοιμητήριο commercial: Εμπορική Περιοχή @@ -614,15 +624,17 @@ el: farmland: Γεωργική γη farmyard: Αγρόκτημα forest: Δάσος + garages: Κλειστοί χώροι στάθμευσης grass: Γρασίδι industrial: Βιομηχανική Περιοχή landfill: Χωματερή meadow: Λιβάδι military: Στρατιωτική Περιοχή mine: Ορυχείο - mountain: Βουνό + nature_reserve: Φυσικό Καταφύγιο + orchard: Περιβόλι park: Πάρκο - plaza: Πλατεία + piste: Πίστα σκι quarry: Λατομείο railway: Σιδηρόδρομος recreation_ground: Χώρος Αναψυχής @@ -633,17 +645,28 @@ el: wood: Μη προσεγμένο δάσος leisure: beach_resort: Παραθαλάσσιο θέρετρο + bird_hide: Καταφύγιο Πουλιών + common: Κοινόχρηστη γη fishing: Αλιευτική Περιοχή garden: Κήπος golf_course: Γήπεδο Γκολφ ice_rink: Παγοδρόμιο + marina: Μαρίνα miniature_golf: Μίνι Γκολφ + nature_reserve: Φυσικό Καταφύγιο park: Πάρκο + pitch: Γήπεδο Αθλητισμού playground: Παιδική Χαρά recreation_ground: Χώρος Αναψυχής + sauna: Σάουνα + slipway: Γλίστρα sports_centre: Αθλητικό Κέντρο stadium: Στάδιο swimming_pool: Πισίνα + military: + airfield: Στρατιωτικό αεροδρόμιο + barracks: Στρατώνας + bunker: Οχυρό natural: bay: Κόλπος beach: Παραλία @@ -651,10 +674,10 @@ el: cave_entrance: Είσοδος Σπηλιάς channel: Κανάλι cliff: Γκρεμός - coastline: Ακτογραμμή crater: Κρατήρας feature: Χαρακτηριστικό fjord: Φιόρδ + forest: Δάσος geyser: Θερμοπίδακας glacier: Παγετώνας hill: Λόφος @@ -669,6 +692,8 @@ el: river: Ποτάμι rock: Βράχος scrub: Θαμνότοπος + spring: Πηγή + stone: Πέτρα strait: Πορθμός tree: Δέντρο valley: Κοιλάδα @@ -677,6 +702,17 @@ el: wetland: Υγρότοπος wetlands: Υγρότοποι wood: Δάσος + office: + accountant: Λογιστής + architect: Αρχιτέκτονας + company: Εταιρεία + employment_agency: Οργανισμός Απασχόλησης + estate_agent: Κτηματομεσιτικό γραφείο + lawyer: Δικηγόρος + ngo: Γραφείο ΜΚΟ + telecommunication: Γραφείο τηλεπικοινωνιών + travel_agent: Ταξιδιωτικό Πρακτορείο + "yes": Γραφείο place: airport: Αεροδρόμιο city: Πόλη @@ -688,7 +724,9 @@ el: houses: Σπίτια island: Νησί islet: Νησίδα + isolated_dwelling: Απομονωμένη οικεία locality: Τοποθεσία + moor: Δέστρα municipality: Δήμος postcode: Ταχυδρομικός Κώδικας region: Περιοχή @@ -707,6 +745,7 @@ el: historic_station: Ιστορική Σιδηροδρομικός Σταθμός junction: Σιδηροδρομικός Κόμβος level_crossing: Ισόπεδη Διάβαση + light_rail: Ελαφρύ τρένο narrow_gauge: Σιδηρόδρομος Στενής Τροχιάς station: Σιδηροδρομικός Σταθμός subway: Σταθμός Μετρό @@ -718,7 +757,6 @@ el: bicycle: Κατάστημα Ποδηλάτων books: Βιβλιοπωλείο butcher: Κρεοπωλείο - car_dealer: Μεταπωλητής Αυτοκινήτων car_parts: Εξαρτήματα Αυτοκινήτου car_repair: Επισκευή Αυτοκινήτων carpet: Κατάστημα Χαλιών @@ -731,7 +769,6 @@ el: cosmetics: Κατάστημα Καλλυντικών department_store: Πολυκατάστημα doityourself: Ιδιοκατασκευές - drugstore: Φαρμακείο dry_cleaning: Στεγνό Καθάρισμα electronics: Κατάστημα Ηλεκτρονικών estate_agent: Κτηματομεσίτης @@ -762,6 +799,7 @@ el: travel_agency: Ταξιδιωτικό Πρακτορείο tourism: camp_site: Χώρος Κατασκήνωσης + chalet: Σαλέ guest_house: Ξενώνας hostel: Ξενώνας hotel: Ξενοδοχείο @@ -771,6 +809,8 @@ el: theme_park: Θεματικό Πάρκο valley: Κοιλάδα zoo: Ζωολογικός κήπος + tunnel: + "yes": Σήραγγα waterway: boatyard: Ναυπηγείο canal: Κανάλι @@ -789,6 +829,7 @@ el: history_tooltip: Προβολή αλλαγών για αυτή την περιοχή history_zoom_alert: Πρέπει να μεγεθύνεις για να δεις τις αλλαγές για αυτή την περιοχή layouts: + community: Κοινότητα community_blogs: Ιστολόγια της Κοινότητας community_blogs_title: Blogs από τα μέλη της κοινότητας του OpenStreetMap copyright: Πνευματικά δικαιώματα & Άδεια χρήσης @@ -810,16 +851,16 @@ el: history: Ιστορικό home: σπίτι home_tooltip: Μετάβαση στην τοποθεσία σπιτιού - inbox: εισερχόμενα (%{count}) inbox_tooltip: one: Τα εισερχόμενα σας περιέχουν 1 αδιάβαστο μήνυμα other: Τα εισερχόμενα σας περιέχουν %{count} αδιάβαστα μηνύματα zero: Τα εισερχόμενα σας δεν περιέχουν κανένα αδιάβαστο μήνυμα intro_1: Ο OpenStreetMap είναι δωρεάν, επεξεργάσιμος χάρτης ολόκληρου του κόσμου. Είναι κατασκευασμένος από ανθρώπους σαν κι εσάς. - intro_2: Το OpenStreetMap σάς επιτρέπει να προβάλετε, να επεξεργαστείτε και να χρησιμοποιήσετε τα γεωγραφικά δεδομένα με ένα συνεργατικό τρόπο από οπουδήποτε στη Γη. - intro_3: Η φιλοξενία του OpenStreetMap υποστηρίζεται από το %{ucl}, %{ic} και %{bytemark}. Άλλοι υποστηρικτές του εγχειρήματος αναφέρονται στους %{partners}. - intro_3_ic: Κολέγιο Imperial του Λονδίνου - intro_3_partners: βίκι + intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη + intro_2_download: λήψη + intro_2_html: Τα δεδομένα είναι ελεύθερα για %{download} και %{use} κάτω από την %{license}. %{create_account} για να αναβαθμίσετε τον χάρτη. + intro_2_license: ανοικτή του άδεια + intro_2_use: χρήση license: title: Τα δεδομένα του OpenStreetMap τελούν υπό την Creative Commons Attribution-Share Alike 2.0 Γενική Άδεια log_in: είσοδος @@ -833,17 +874,21 @@ el: title: Υποστήριξε το OpenStreetMap με δωρεά χρημάτων osm_offline: Η βάση δεδομένων του OpenStreetMap είναι προσωρινά εκτός λειτουργίας λόγω εργασιών συντήρησης της βάσης δεδομένων. osm_read_only: Η βάση δεδομένων του OpenStreetMap είναι προσωρινά σε λειτουργία "μόνο για ανάγνωση" λόγω εργασιών συντήρησης της βάσης δεδομένων. + partners_html: Η φιλοξενία υποστηρίζεται από το %{ucl}, %{ic} και %{bytemark}, και άλλους %{partners}. + partners_ic: Κολέγιο Imperial του Λονδίνου + partners_partners: συνεργάτες + partners_ucl: UCL VR Centre sign_up: εγγραφή sign_up_tooltip: Δημιουργήστε λογαριασμό για επεξεργασία - tag_line: Ο Ελεύθ. Παγκ. Χάρτης Βίκι + tag_line: O Ελεύθερος Wiki Παγκόσμιος Χάρτης user_diaries: Ημερολόγια Χρηστών user_diaries_tooltip: Προβολή ημερολογίων χρηστών view: Προβολή view_tooltip: Προβολή του χάρτη welcome_user: Καλώς ορίσατε, %{user_link} welcome_user_link_tooltip: Η προσωπική σας σελίδα - wiki: Βίκι - wiki_title: Ιστοσελίδα βίκι για το έργο + wiki: Wiki + wiki_title: Ιστοσελίδα wiki για το έργο license_page: foreign: english_link: της πρωτότυπης Αγγλικής @@ -887,10 +932,6 @@ el: body: Λυπάμαι δεν υπάρχει μήνυμα με αυτό το αναγνωριστικό. heading: Κανένα τέτοιο μήνυμα title: Κανένα τέτοιο μήνυμα - no_such_user: - body: Συγνώμη, δεν υπάρχει κανένας χρήστης με αυτό το όνομα. - heading: Άγνωστος χρήστης - title: Άγνωστος χρήστης outbox: date: Ημ/νία inbox: εισερχόμενα @@ -950,7 +991,9 @@ el: your_gpx_file: Μοιάζει με δικό σας αρχείο GPX lost_password_html: greeting: Γεια, + hopefully_you: Κάποιος (πιθανότατα εσείς) έχει ζητήσει επαναφορά του κωδικού πρόσβασης του λογαριασμού στο openstreetmap.org που αντιστοιχεί σε αυτή τη διεύθυνση email. lost_password_plain: + click_the_link: Εάν πρόκειται για σας, κάντε κλικ στον παρακάτω σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας. greeting: Γεια, message_notification: footer1: Μπορείτε επίσης να διαβάσετε το μήνυμα στο %{readurl} @@ -1000,6 +1043,15 @@ el: printable_name: with_id: "%{id}" with_name: "%{name} (%{id})" + redaction: + edit: + description: Περιγραφή + new: + description: Περιγραφή + show: + confirm: Είσαι σίγουρος? + description: "Περιγραφή:" + user: "Δημιουργός:" site: edit: anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό. @@ -1033,6 +1085,7 @@ el: 1: λιβάδι construction: Δρόμοι υπό κατασκευή farm: Αγρόκτημα + footway: Μονοπάτι forest: Δάσος golf: Γήπεδο γκολφ industrial: Βιομηχανική περιοχή @@ -1060,10 +1113,20 @@ el: summit: 1: κορυφή tourist: Τουριστικό αξιοθέατο + track: Χωματόδρομος tram: 1: τραμ tunnel: Διακεκομμένο περίβλημα = σήραγγα + unsurfaced: Δρόμος χωρίς άσφαλτο wood: Φυσικό Δάσος + markdown_help: + image: Εικόνα + link: Σύνδεσμος + text: Κείμενο + url: Διεύθυνση URL + richtext_area: + edit: Επεξεργασία + preview: Προεπισκόπηση search: search: Αναζήτηση search_help: "παραδείγματα: «Alkmaar», «Regent Street, Cambridge», «CB2 5AQ», ή «ταχυδρομεία κοντά στο Lünen» <a href='http://wiki.openstreetmap.org/wiki/Search'>περισσότερα παραδείγματα...</a>" @@ -1100,10 +1163,6 @@ el: public_traces_from: Δημόσια ίχνη GPS από τον %{user} tagged_with: σεσημασμένα με %{tags} your_traces: Τα δικά σου ίχνη GPS - no_such_user: - body: Λυπούμαστε, δεν υπάρχει κανένας χρήστης με το όνομα %{user}. Παρακαλούμε ελέγξτε την ορθογραφία, ή ίσως ο σύνδεσμος ήταν λάθος. - heading: Ο χρήστης %{user} δεν υπάρχει - title: Άγνωστος χρήστης trace: ago: "%{time_in_words_ago} πριν" by: από @@ -1111,6 +1170,7 @@ el: edit: επεξεργασία edit_map: Επεξεργασία Χάρτη map: χάρτης + more: περισσότερα pending: ΕΚΚΡΕΜΕΙ private: ΙΔΙΩΤΙΚΟ public: ΔΗΜΟΣΙΟ @@ -1127,8 +1187,6 @@ el: trace_optionals: tags: Ετικέτες trace_paging_nav: - next: Επόμενο » - previous: « Προηγούμενο showing_page: Εμφάνιση σελίδας %{page} view: delete_track: Διαγραφή αυτού του ίχνους @@ -1319,6 +1377,7 @@ el: block_history: εμφάνιση φραγών που λήφθηκαν blocks by me: φραγές από εμένα blocks on me: φραγές σε εμένα + comments: σχόλια confirm: Επιβεβαίωση confirm_user: επιβεβαίωση αυτού το χρήστη create_block: φραγή αυτού του χρήστη @@ -1341,6 +1400,7 @@ el: m away: "%{count}μ μακριά" mapper since: "Χαρτογράφος από:" moderator_history: εμφάνιση φραγών που δόθηκαν + my comments: τα σχόλιά μου my diary: το ημερολόγιό μου my edits: οι επεξεργασίες μου my settings: οι ρυθμίσεις μου diff --git a/config/locales/en.yml b/config/locales/en.yml index 3e9908bb5..8bc0992bb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -94,7 +94,6 @@ en: changeset: title: "Changeset" changeset: "Changeset: %{id}" - download: "Download %{changeset_xml_link} or %{osmchange_xml_link}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -170,16 +169,14 @@ en: node_history: node_history: "Node History" node_history_title: "Node History: %{node_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" node: node: "Node" node_title: "Node: %{node_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit node" not_found: sorry: "Sorry, the %{type} with the id %{id}, could not be found." type: @@ -197,15 +194,21 @@ en: paging_nav: showing_page: "Showing page" of: "of" + redacted: + redaction: "Redaction %{id}" + message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details." + type: + node: "node" + way: "way" + relation: "relation" relation_details: members: "Members:" part_of: "Part of:" relation_history: relation_history: "Relation History" relation_history_title: "Relation History: %{relation_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} as %{role}" @@ -216,21 +219,20 @@ en: relation: relation: "Relation" relation_title: "Relation: %{relation_name}" - download: "%{download_xml_link} or %{view_history_link}" download_xml: "Download XML" - view_history: "view history" + view_history: "View history" start: view_data: "View data for current map view" manually_select: "Manually select a different area" start_rjs: - data_layer_name: "Data" + data_layer_name: "Browse Map Data" data_frame_title: "Data" zoom_or_select: "Zoom in or select an area of the map to view" drag_a_box: "Drag a box on the map to select an area" manually_select: "Manually select a different area" hide_areas: "Hide areas" show_areas: "Show areas" - loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." + loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than [[max_features]] features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." load_data: "Load Data" unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})" loading: "Loading..." @@ -274,16 +276,14 @@ en: way_history: way_history: "Way History" way_history_title: "Way History: %{way_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" way: way: "Way" way_title: "Way: %{way_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit way" note: open_title: "Unresolved issue: %{note_name}" closed_title: "Resolved issue: %{note_name}" @@ -332,6 +332,8 @@ en: description_user_bbox: "Changesets by %{user} within %{bbox}" description_friend: "Changesets by your friends" description_nearby: "Changesets by nearby users" + empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>." + empty_anon_html: "No edits made yet" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -371,10 +373,6 @@ en: title: "No such diary entry" heading: "No entry with the id: %{id}" body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." - no_such_user: - title: "No such user" - heading: "The user %{user} does not exist" - body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." diary_entry: posted_by: "Posted by %{link_user} on %{created} in %{language_link}" comment_link: Comment on this entry @@ -408,7 +406,7 @@ en: post: Post when: When comment: Comment - ago: %{ago} ago + ago: "%{ago} ago" newer_comments: "Newer Comments" older_comments: "Older Comments" export: @@ -462,16 +460,27 @@ en: search_osm_nominatim: prefix_format: "%{name}" prefix: + aeroway: + aerodrome: "Aerodrome" + apron: "Apron" + gate: "Gate" + helipad: "Helipad" + runway: "Runway" + taxiway: "Taxiway" + terminal: "Terminal" amenity: airport: "Airport" arts_centre: "Arts Centre" + artwork: "Artwork" atm: "ATM" auditorium: "Auditorium" bank: "Bank" bar: "Bar" + bbq: "BBQ" bench: "Bench" bicycle_parking: "Cycle Parking" bicycle_rental: "Cycle Rental" + biergarten: "Beer Garden" brothel: "Brothel" bureau_de_change: "Bureau de Change" bus_station: "Bus Station" @@ -480,6 +489,7 @@ en: car_sharing: "Car Sharing" car_wash: "Car Wash" casino: "Casino" + charging_station: "Charging Station" cinema: "Cinema" clinic: "Clinic" club: "Club" @@ -498,6 +508,7 @@ en: ferry_terminal: "Ferry Terminal" fire_hydrant: "Fire Hydrant" fire_station: "Fire Station" + food_court: "Food Court" fountain: "Fountain" fuel: "Fuel" grave_yard: "Grave Yard" @@ -538,9 +549,12 @@ en: shelter: "Shelter" shop: "Shop" shopping: "Shopping" + shower: "Shower" + social_centre: "Social Centre" social_club: "Social Club" studio: "Studio" supermarket: "Supermarket" + swimming_pool: "Swimming Pool" taxi: "Taxi" telephone: "Public Telephone" theatre: "Theatre" @@ -552,41 +566,21 @@ en: village_hall: "Village Hall" waste_basket: "Waste Basket" wifi: "WiFi Access" + WLAN: "WiFi Access" youth_centre: "Youth Centre" boundary: administrative: "Administrative Boundary" + census: "Census Boundary" + national_park: "National Park" + protected_area : "Protected Area" + bridge: + aqueduct: "Aqueduct" + suspension: "Suspension Bridge" + swing: "Swing Bridge" + viaduct: "Viaduct" + "yes": "Bridge" building: - apartments: "Apartment Block" - block: "Building Block" - bunker: "Bunker" - chapel: "Chapel" - church: "Church" - city_hall: "City Hall" - commercial: "Commercial Building" - dormitory: "Dormitory" - entrance: "Building Entrance" - faculty: "Faculty Building" - farm: "Farm Building" - flats: "Flats" - garage: "Garage" - hall: "Hall" - hospital: "Hospital Building" - hotel: "Hotel" - house: "House" - industrial: "Industrial Building" - office: "Office Building" - public: "Public Building" - residential: "Residential Building" - retail: "Retail Building" - school: "School Building" - shop: "Shop" - stadium: "Stadium" - store: "Store" - terrace: "Terrace" - tower: "Tower" - train_station: "Railway Station" - university: "University Building" - yes: "Building" + "yes": "Building" highway: bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" @@ -594,12 +588,11 @@ en: byway: "Byway" construction: "Highway under Construction" cycleway: "Cycle Path" - distance_marker: "Distance Marker" emergency_access_point: "Emergency Access Point" footway: "Footpath" ford: "Ford" - gate: "Gate" living_street: "Living Street" + milestone: "Milestone" minor: "Minor Road" motorway: "Motorway" motorway_junction: "Motorway Junction" @@ -611,14 +604,17 @@ en: primary_link: "Primary Road" raceway: "Raceway" residential: "Residential" + rest_area: "Rest Area" road: "Road" secondary: "Secondary Road" secondary_link: "Secondary Road" service: "Service Road" services: "Motorway Services" + speed_camera: "Speed Camera" steps: "Steps" stile: "Stile" tertiary: "Tertiary Road" + tertiary_link: "Tertiary Road" track: "Track" trail: "Trail" trunk: "Trunk Road" @@ -632,6 +628,7 @@ en: building: "Building" castle: "Castle" church: "Church" + fort: "Fort" house: "House" icon: "Icon" manor: "Manor" @@ -656,6 +653,7 @@ en: farmland: "Farmland" farmyard: "Farmyard" forest: "Forest" + garages: "Garages" grass: "Grass" greenfield: "Greenfield Land" industrial: "Industrial Area" @@ -663,25 +661,28 @@ en: meadow: "Meadow" military: "Military Area" mine: "Mine" - mountain: "Mountain" + orchard: "Orchard" nature_reserve: "Nature Reserve" park: "Park" piste: "Piste" - plaza: "Plaza" quarry: "Quarry" railway: "Railway" recreation_ground: "Recreation Ground" reservoir: "Reservoir" + reservoir_watershed: "Reservoir Watershed" residential: "Residential Area" retail: "Retail" + road: "Road Area" village_green: "Village Green" vineyard: "Vineyard" wetland: "Wetland" wood: "Wood" leisure: beach_resort: "Beach Resort" + bird_hide: "Bird Hide" common: "Common Land" fishing: "Fishing Area" + fitness_station: "Fitness Station" garden: "Garden" golf_course: "Golf Course" ice_rink: "Ice Rink" @@ -692,12 +693,17 @@ en: pitch: "Sports Pitch" playground: "Playground" recreation_ground: "Recreation Ground" + sauna: "Sauna" slipway: "Slipway" sports_centre: "Sports Centre" stadium: "Stadium" swimming_pool: "Swimming Pool" track: "Running Track" water_park: "Water Park" + military: + airfield: "Military Airfield" + barracks: "Barracks" + bunker: "Bunker" natural: bay: "Bay" beach: "Beach" @@ -705,11 +711,12 @@ en: cave_entrance: "Cave Entrance" channel: "Channel" cliff: "Cliff" - coastline: "Coastline" crater: "Crater" + dune: "Dune" feature: "Feature" fell: "Fell" fjord: "Fjord" + forest: "Forest" geyser: "Geyser" glacier: "Glacier" heath: "Heath" @@ -729,6 +736,7 @@ en: scrub: "Scrub" shoal: "Shoal" spring: "Spring" + stone: "Stone" strait: "Strait" tree: "Tree" valley: "Valley" @@ -737,6 +745,19 @@ en: wetland: "Wetland" wetlands: "Wetlands" wood: "Wood" + office: + accountant: "Accountant" + architect: "Architect" + company: "Company" + employment_agency: "Employment Agency" + estate_agent: "Estate Agent" + government: "Governmental Office" + insurance: "Insurance Office" + lawyer: "Lawyer" + ngo: "NGO Office" + telecommunication: "Telecommunication Office" + travel_agent: "Travel Agency" + "yes": "Office" place: airport: "Airport" city: "City" @@ -748,6 +769,7 @@ en: houses: "Houses" island: "Island" islet: "Islet" + isolated_dwelling: "Isolated Dwelling" locality: "Locality" moor: "Moor" municipality: "Municipality" @@ -771,6 +793,7 @@ en: junction: "Railway Junction" level_crossing: "Level Crossing" light_rail: "Light Rail" + miniature: "Miniature Rail" monorail: "Monorail" narrow_gauge: "Narrow Gauge Railway" platform: "Railway Platform" @@ -785,7 +808,7 @@ en: yard: "Railway Yard" shop: alcohol: "Off License" - apparel: "Apparel Shop" + antiques: "Antiques" art: "Art Shop" bakery: "Bakery" beauty: "Beauty Shop" @@ -794,7 +817,6 @@ en: books: "Book Shop" butcher: "Butcher" car: "Car Shop" - car_dealer: "Car Dealer" car_parts: "Car Parts" carpet: "Carpet Shop" car_repair: "Car Repair" @@ -809,7 +831,6 @@ en: department_store: "Department Store" discount: "Discount Items Shop" doityourself: "Do-It-Yourself" - drugstore: "Drugstore" dry_cleaning: "Dry Cleaning" electronics: "Electronics Shop" estate_agent: "Estate Agent" @@ -875,7 +896,10 @@ en: valley: "Valley" viewpoint: "Viewpoint" zoo: "Zoo" + tunnel: + "yes": "Tunnel" waterway: + artificial: "Artificial Waterway" boatyard: "Boatyard" canal: "Canal" connector: "Waterway Connector" @@ -935,7 +959,7 @@ en: welcome_user_link_tooltip: Your user page home: home home_tooltip: Go to home location - inbox: "inbox (%{count})" + inbox_html: "inbox %{count}" inbox_tooltip: zero: Your inbox contains no unread messages one: Your inbox contains 1 unread message @@ -958,14 +982,19 @@ en: user_diaries_tooltip: View user diaries edit_with: Edit with %{editor} tag_line: The Free Wiki World Map - intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you." - intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth." - intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}." - intro_3_ucl: "the UCL VR Centre" - intro_3_ic: "Imperial College London" - intro_3_bytemark: "Bytemark Hosting" - intro_3_partners: "wiki" - intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners" + intro_1: "OpenStreetMap is a free worldwide map, created by people like you." + intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map." + intro_2_create_account: "Create a user account" + intro_2_license: "open license" + intro_2_use: "use" + intro_2_download: "download" + intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap" + partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}." + partners_ucl: "the UCL VR Centre" + partners_ic: "Imperial College London" + partners_bytemark: "Bytemark Hosting" + partners_partners: "partners" + partners_url: "http://wiki.openstreetmap.org/wiki/Partners" osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." @@ -980,11 +1009,12 @@ en: documentation: Documentation documentation_title: Documentation for the project copyright: "Copyright & License" + community: Community community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" foundation: Foundation foundation_title: The OpenStreetMap Foundation - sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!' + sotm2012: 'Come to the 2012 OpenStreetMap Conference, The State of the Map, September 6-8th in Tokyo!' license: alt: CC BY-SA 2.0 title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License @@ -1002,14 +1032,13 @@ en: text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping - legal_babble: | - <h2>Copyright and License</h2> - <p> - OpenStreetMap is <i>open data</i>, licensed under the <a - href="http://creativecommons.org/licenses/by-sa/2.0/">Creative - Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA). - </p> - <p> + legal_babble: + title_html: Copyright and License + intro_1_html: | + OpenStreetMap is <i>open data</i>, licensed under the <a + href="http://creativecommons.org/licenses/by-sa/2.0/">Creative + Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA). + intro_2_html: | You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our maps or data, you @@ -1017,17 +1046,14 @@ en: full <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code</a> explains your rights and responsibilities. - </p> - - <h3>How to credit OpenStreetMap</h3> - <p> + credit_title_html: How to credit OpenStreetMap + credit_1_html: | If you are using OpenStreetMap map images, we request that your credit reads at least “© OpenStreetMap contributors, CC BY-SA”. If you are using map data only, we request “Map data © OpenStreetMap contributors, CC BY-SA”. - </p> - <p> + credit_2_html: | Where possible, OpenStreetMap should be hyperlinked to <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> and CC BY-SA to <a @@ -1037,30 +1063,23 @@ en: www.openstreetmap.org (perhaps by expanding ‘OpenStreetMap’ to this full address) and to www.creativecommons.org. - </p> - - <h3>Finding out more</h3> - <p> + more_title_html: Finding out more + more_1_html: | Read more about using our data at the <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>. - </p> - <p> + more_2_html: | OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders. - </p> - <p> + more_3_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. - See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a> and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>. - </p> - - <h3>Our contributors</h3> - <p> + contributors_title_html: Our contributors + contributors_intro_html: | Our CC BY-SA licence requires you to “give the Original Author credit reasonable to the medium or means You are utilising”. Individual OSM mappers do not request a @@ -1069,53 +1088,53 @@ en: agency or other major source has been included in OpenStreetMap, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page. - </p> - - <!-- - Information for page editors - - The following lists only those organisations who require attribution - as a condition of their data being used in OpenStreetMap. It is not a - general catalogue of imports, and must not be used except when - attribution is required to comply with the licence of the imported - data. - - Any additions here must be discussed with OSM sysadmins first. - --> - - <ul id="contributors"> - <li><strong>Australia</strong>: Contains suburb data based - on Australian Bureau of Statistics data.</li> - <li><strong>Austria</strong>: Contains data from - <a href="http://data.wien.gv.at/">Stadt Wien</a> under - <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.</li> - <li><strong>Canada</strong>: Contains data from - GeoBase®, GeoGratis (© Department of Natural - Resources Canada), CanVec (© Department of Natural - Resources Canada), and StatCan (Geography Division, - Statistics Canada).</li> - <li><strong>France</strong>: Contains data sourced from - Direction Générale des Impôts.</li> - <li><strong>New Zealand</strong>: Contains data sourced from - Land Information New Zealand. Crown Copyright reserved.</li> - <li><strong>Poland</strong>: Contains data from <a - href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright - UMP-pcPL contributors. - <a href="http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing"> - More about OSM's use of UMP data</a></li> - <li><strong>South Africa</strong>: Contains data sourced from - <a href="http://www.ngi.gov.za/">Chief Directorate: - National Geo-Spatial Information</a>, State copyright reserved.</li> - <li><strong>United Kingdom</strong>: Contains Ordnance - Survey data © Crown copyright and database right - 2010.</li> - </ul> - - <p> + contributors_au_html: | + <strong>Australia</strong>: Contains suburb data based + on Australian Bureau of Statistics data. + contributors_at_html: | + <strong>Austria</strong>: Contains data from + <a href="http://data.wien.gv.at/">Stadt Wien</a> (under + <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), + <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and + Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>). + contributors_ca_html: | + <strong>Canada</strong>: Contains data from + GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), and StatCan (Geography Division, + Statistics Canada). + contributors_fr_html: | + <strong>France</strong>: Contains data sourced from + Direction Générale des Impôts. + contributors_nl_html: | + <strong>Netherlands</strong>: Contains © AND data, 2007 + (<a href="http://www.and.com">www.and.com</a>) + contributors_nz_html: | + <strong>New Zealand</strong>: Contains data sourced from + Land Information New Zealand. Crown Copyright reserved. + contributors_pl_html: | + <strong>Poland</strong>: Contains data from <a + href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright + UMP-pcPL contributors. + <a href="http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing"> + More about OSM's use of UMP data</a> + contributors_za_html: | + <strong>South Africa</strong>: Contains data sourced from + <a href="http://www.ngi.gov.za/">Chief Directorate: + National Geo-Spatial Information</a>, State copyright reserved. + contributors_gb_html: | + <strong>United Kingdom</strong>: Contains Ordnance + Survey data © Crown copyright and database right + 2010. + contributors_footer_1_html: | + For further details of these, and other sources that have been used + to help improve OpenStreetMap, please see the <a + href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors + page</a> on the OpenStreetMap Wiki. + contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability. - </p> notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1243,10 +1262,6 @@ en: back_to_inbox: "Back to inbox" message_sent: "Message sent" limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more." - no_such_user: - title: "No such user" - heading: "No such user" - body: "Sorry there is no user with that name." no_such_message: title: "No such message" heading: "No such message" @@ -1278,7 +1293,7 @@ en: reading_your_sent_messages: "Reading your sent messages" to: "To" back_to_outbox: "Back to outbox" - wrong_user: "You are logged in as `%{user}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it." + wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it." sent_message_summary: delete_button: "Delete" mark: @@ -1290,7 +1305,6 @@ en: index: js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map." - js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable JavaScript.' permalink: Permalink shortlink: Shortlink license: @@ -1390,6 +1404,23 @@ en: permissive: "Permissive access" destination: "Destination access" construction: "Roads under construction" + richtext_area: + edit: Edit + preview: Preview + markdown_help: + title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + headings: Headings + heading: Heading + subheading: Subheading + unordered: Unordered list + ordered: Ordered list + first: First item + second: Second item + link: Link + text: Text + image: Image + alt: Alt text + url: URL trace: visibility: private: "Private (only shared as anonymous, unordered points)" @@ -1417,10 +1448,6 @@ en: visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" - no_such_user: - title: "No such user" - heading: "The user %{user} does not exist" - body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." trace_form: upload_gpx: "Upload GPX File:" description: "Description:" @@ -1460,8 +1487,8 @@ en: visibility: "Visibility:" trace_paging_nav: showing_page: "Showing page %{page}" - next: "Next »" - previous: "« Previous" + older: "Older Traces" + newer: "Newer Traces" trace: pending: "PENDING" count_points: "%{count} points" @@ -1483,6 +1510,7 @@ en: your_traces: "Your GPS traces" public_traces_from: "Public GPS traces from %{user}" tagged_with: " tagged with %{tags}" + empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>." delete: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -1495,6 +1523,8 @@ en: application: require_cookies: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." + require_moderator: + not_a_moderator: "You need to be a moderator to perform that action." setup_user_auth: blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." @@ -1526,6 +1556,8 @@ en: authorize_url: "Authorise URL:" support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode." edit: "Edit Details" + delete: "Delete Client" + confirm: "Are you sure?" requests: "Requesting the following permissions from the user:" allow_read_prefs: "read their user preferences." allow_write_prefs: "modify their user preferences." @@ -1730,8 +1762,8 @@ en: revoke: administrator: "Revoke administrator access" moderator: "Revoke moderator access" - block_history: "view blocks received" - moderator_history: "view blocks given" + block_history: "blocks received" + moderator_history: "blocks given" comments: "comments" create_block: "block this user" activate_user: "activate this user" @@ -1819,10 +1851,14 @@ en: go_public: flash success: "All your edits are now public, and you are now allowed to edit." make_friend: + heading: "Add %{user} as a friend?" + button: "Add as friend" success: "%{name} is now your friend." failed: "Sorry, failed to add %{name} as a friend." already_a_friend: "You are already friends with %{name}." remove_friend: + heading: "Remove %{user} as a friend?" + button: "Remove as friend" success: "%{name} was removed from your friends." not_a_friend: "%{name} is not one of your friends." filter: @@ -1896,7 +1932,6 @@ en: back: "View all blocks" needs_view: "Does the user need to log in before this block will be cleared?" filter: - not_a_moderator: "You need to be a moderator to perform that action." block_expired: "The block has already expired and cannot be edited." block_period: "The blocking period must be one of the values selectable in the drop-down list." create: @@ -1932,6 +1967,9 @@ en: status: "Status" revoker_name: "Revoked by" not_revoked: "(not revoked)" + showing_page: "Showing page %{page}" + next: "Next »" + previous: "« Previous" helper: time_future: "Ends in %{time}." until_login: "Active until the user logs in." @@ -2013,3 +2051,34 @@ en: create_help2: and descripe it as accurate as possible report: Report Problem edityourself: You can also edit the map directly your self + redaction: + edit: + description: "Description" + heading: "Edit redaction" + submit: "Save redaction" + title: "Edit redaction" + index: + empty: "No redactions to show." + heading: "List of redactions" + title: "List of redactions" + new: + description: "Description" + heading: "Enter information for new redaction" + submit: "Create redaction" + title: "Creating new redaction" + show: + description: "Description:" + heading: "Showing redaction \"%{title}\"" + title: "Showing redaction" + user: "Creator:" + edit: "Edit this redaction" + destroy: "Remove this redaction" + confirm: "Are you sure?" + create: + flash: "Redaction created." + update: + flash: "Changes saved." + destroy: + not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it." + flash: "Redaction destroyed." + error: "There was an error destroying this redaction." diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 4b91c667d..68b996605 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -67,7 +67,6 @@ eo: changeset: changeset: "Ŝanĝaro: %{id}" changesetxml: Ŝanĝaro XML - download: Elŝuti %{changeset_xml_link} aÅ­ %{osmchange_xml_link} feed: title: Ŝanĝaro %{id} title_comment: Ŝanĝaro %{id} - %{comment} @@ -116,7 +115,6 @@ eo: next_changeset_tooltip: Sekvanta redakto de %{user} prev_changeset_tooltip: AntaÅ­a redakto de %{user} node: - download: "%{download_xml_link}, %{view_history_link} au %{edit_link}" download_xml: Elŝuti XML edit: redakti node: Nodo @@ -126,7 +124,6 @@ eo: coordinates: "Koordinatoj:" part_of: "Parto de:" node_history: - download: "%{download_xml_link} aÅ­ %{view_details_link}" download_xml: Elŝuti XML node_history: Historio de la nodo node_history_title: "Historio de la nodo: %{node_name}" @@ -142,7 +139,6 @@ eo: of: de showing_page: Montrante paĝon relation: - download: "%{download_xml_link} aÅ­ %{view_history_link}" download_xml: Elŝuti XML relation: Rilato relation_title: "Rilato: %{relation_name}" @@ -151,7 +147,6 @@ eo: members: "Anoj:" part_of: "Parto de:" relation_history: - download: "%{download_xml_link} aÅ­ %{view_details_link}" download_xml: Elŝuti XML relation_history: Historio de la rilato relation_history_title: "Historio de la rilato: %{relation_name}" @@ -205,7 +200,6 @@ eo: relation: rilato way: vojo way: - download: "%{download_xml_link}, %{view_history_link} aÅ­ %{edit_link}" download_xml: Elŝuti XML edit: redakti view_history: vidi historion @@ -218,7 +212,6 @@ eo: nodes: "Nodoj:" part_of: "Parto de:" way_history: - download: "%{download_xml_link} aÅ­ %{view_details_link}" download_xml: Elŝuti XML view_details: vidi detalojn way_history: Historio de vojo @@ -264,9 +257,6 @@ eo: older_entries: Pli malnovaj enskriboj title: Uzantĵurnaloj user_title: Ä´urnalo de %{user} - no_such_user: - heading: Uzanto %{user} ne ekzistas - title: Tiu uzanto ne ekzistas view: login: Ensaluti save_button: Konservi @@ -393,9 +383,6 @@ eo: send_button: Sendi send_message_to: Sendi novan mesaĝon al %{name} title: Sendi mesaĝon - no_such_user: - heading: Tiu uzanto aÅ­ mesaĝo ne ekzistas - title: Tiu uzanto aÅ­ mesaĝo ne ekzistas outbox: date: Dato inbox: Alvenkesto @@ -550,9 +537,6 @@ eo: your_traces: Viaj GPS spuroj make_public: made_public: Publikigita spuro - no_such_user: - body: BedaÅ­rinde, ne ekzistas uzanto nomita %{user}. Bonvolu kontroli la literumadon aÅ­ la ligon kion vi sekvis. - heading: La uzanto %{user} ne ekzistas trace: ago: AntaÅ­ %{time_in_words_ago} by: de diff --git a/config/locales/es.yml b/config/locales/es.yml index d9b042185..ef84c961e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,15 +1,19 @@ -# Messages for Spanish (Español) +# Messages for Spanish (español) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Armando-Martin # Author: Crazymadlover +# Author: Invadinado # Author: Johnarupire # Author: Jynus +# Author: Larjona # Author: Locos epraix # Author: McDutchie # Author: Mor +# Author: Nemo bis # Author: PerroVerd # Author: Peter17 +# Author: Remux # Author: Toliño # Author: Translationista # Author: VegaDark @@ -87,6 +91,8 @@ es: application: require_cookies: cookies_needed: Parece que tienes las cookies deshabilitadas. Por favor, habilita las cookies en tu navegador antes de continuar. + require_moderator: + not_a_moderator: Tienes que ser un moderador para ejecutar esa acción. setup_user_auth: blocked: Su acceso a la API ha sido bloqueado. Por favor, inicie sesión en la interfaz web para obtener más información. need_to_see_terms: Su acceso a la API está temporalmente suspendido. Por favor, accede a la web para ver los Términos de Contribución. No es necesario aceptar, pero debes conocerlos. @@ -94,7 +100,6 @@ es: changeset: changeset: Conjunto de cambios %{id} changesetxml: XML del conjunto de cambios - download: Descargar %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Conjunto de cambios %{id} title_comment: Conjunto de cambios %{id} - %{comment} @@ -154,21 +159,19 @@ es: next_changeset_tooltip: Siguiente edición hecha por %{user} prev_changeset_tooltip: Edición previa hecha por %{user} node: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Descargar XML - edit: editar + edit: Editar nodo node: Nodo node_title: "Nodo: %{node_name}" - view_history: ver historial + view_history: Ver historial node_details: coordinates: "Coordenadas:" part_of: "Parte de:" node_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Descargar XML node_history: Historial del nodo node_history_title: "Historial del nodo: %{node_name}" - view_details: ver detalles + view_details: Ver detalles not_found: sorry: Lo sentimos, %{type} con ID %{id} no fue encontrado type: @@ -179,21 +182,26 @@ es: paging_nav: of: de showing_page: Mostrando página + redacted: + message_html: La versión %{version} de este %{type} no se puede mostrar tal como ha sido redactada. Consulte %{redaction_link} para obtener más detalles. + redaction: Redacción %{id} + type: + node: nodo + relation: relación + way: vía relation: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Descargar XML relation: Relación relation_title: "Relación %{relation_name}:" - view_history: ver historial + view_history: Ver historial relation_details: members: "Miembros:" part_of: "Parte de:" relation_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Descargar XML relation_history: Historial de la relación relation_history_title: "Historial de la relación %{relation_name}:" - view_details: ver detalles + view_details: Ver detalles relation_member: entry_role: "%{type} %{name} como %{role}" type: @@ -205,14 +213,14 @@ es: view_data: Ver datos para el encuadre actual start_rjs: data_frame_title: Datos - data_layer_name: Datos + data_layer_name: Examinar datos del mapa details: Detalles drag_a_box: Arrastre en el mapa para dibujar un área de encuadre edited_by_user_at_timestamp: Editado por [[user]] el [[timestamp]] hide_areas: Ocultar áreas history_for_feature: Historial de [[feature]] load_data: Cargar datos - loaded_an_area_with_num_features: Ha cargado un área que contiene [[num_features]] objetos. Por lo general, algunos navegadores web no aguantan bien el mostrar esta candidad de información vectorial. Generalmente, el funcionamiento óptimo se da cuando se muestran menos de 100 objetos al mismo tiempo; de otra manera, su navegador puede volverse lento o no responder. Si está seguro de que quiere mostrar todos estos datos, puede hacerlo pulsando el botón que aparece debajo. + loaded_an_area_with_num_features: Has cargado un área que contiene [[num_features]] objetos. Por lo general, algunos navegadores web no aguantan bien el mostrar esta cantidad de información vectorial. Generalmente, el funcionamiento óptimo se da cuando se muestran menos de [[max_features]] objetos al mismo tiempo; de otra manera, tu navegador puede volverse lento o no responder. Si estás seguro de que quieres mostrar todos estos datos, puedes hacerlo pulsando el botón que aparece debajo. loading: Cargando... manually_select: Seleccionar manualmente un área diferente object_list: @@ -251,10 +259,9 @@ es: relation: relación way: vía way: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Descargar XML - edit: editar - view_history: ver historial + edit: Editar vía + view_history: Ver historial way: Vía way_title: "Vía %{way_name}:" way_details: @@ -264,9 +271,8 @@ es: nodes: "Nodos:" part_of: "Parte de:" way_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Descargar XML - view_details: ver detalles + view_details: Ver detalles way_history: Historial de la vía way_history_title: "Historial del camino %{way_name}:" changeset: @@ -295,6 +301,8 @@ es: description_nearby: Conjuntos de cambios realizados por usuarios cercanos description_user: Conjunto de cambios por %{user} description_user_bbox: Conjunto de cambios por %{user} dentro de %{bbox} + empty_anon_html: No se han realizado ediciones todavía + empty_user_html: Parece que no has hecho ninguna edición todavía. Para comenzar, consulta la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Guía para principiantes</a>. heading: Conjuntos de cambios heading_bbox: Conjuntos de cambios heading_friend: Conjuntos de cambios @@ -310,6 +318,14 @@ es: timeout: sorry: Lo sentimos, la lista del conjunto de cambios que has solicitado ha tardado mucho tiempo en recuperarse. diary_entry: + comments: + ago: hace %{ago} + comment: Comentario + has_commented_on: "%{display_name} dejó un comentario en las siguientes entradas de diario" + newer_comments: Comentarios más recientes + older_comments: Comentarios más antiguos + post: Publicar + when: Cuando diary_comment: comment_from: Comentario de %{link_user} el %{comment_created_at} confirm: Confirmar @@ -367,10 +383,6 @@ es: body: Lo sentimos, no hay ninguna entrada del diario para la ID %{id}. Por favor, comprueba que la dirección esté correctamente escrita. heading: No hay entrada con la ID %{id} title: No existe esa entrada de diario - no_such_user: - body: Lo sentimos, no hay ningún usuario llamado %{user}. Por favor, comprueba que la dirección es correcta. - heading: El usuario %{user} no existe - title: No existe ese usuario view: leave_a_comment: Dejar un comentario login: Identifíquese @@ -403,6 +415,7 @@ es: licence: Licencia longitude: "Lon:" manually_select: Seleccionar a mano otra área + map_image: Imagen de mapa (muestra una capa normal) max: max options: Opciones osm_xml_data: Datos formato OpenStreetMap XML @@ -463,16 +476,28 @@ es: suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aeródromo + apron: Pista + gate: Puerta + helipad: Helipuerto + runway: Pista + taxiway: Calle de rodaje + terminal: Terminal amenity: + WLAN: Acceso WiFi airport: Aeropuerto arts_centre: Centro artístico + artwork: Ilustración atm: Cajero automático auditorium: Auditorio bank: Banco bar: Bar + bbq: Barbacoa bench: Banco bicycle_parking: Aparcamiento de bibicletas bicycle_rental: Alquiler de bicicletas + biergarten: Terraza brothel: Burdel bureau_de_change: Casa de cambio bus_station: Estación de autobuses @@ -481,6 +506,7 @@ es: car_sharing: Vehículo compartido car_wash: Autolavado casino: Casino + charging_station: Estación de carga cinema: Cine clinic: Clínica club: Club @@ -499,6 +525,7 @@ es: ferry_terminal: Terminal de ferrys fire_hydrant: Hidrante fire_station: Parque de bomberos + food_court: Zona de restaurantes fountain: Fuente fuel: Gasolinera grave_yard: Cementerio @@ -539,9 +566,12 @@ es: shelter: Refugio shop: Tienda shopping: Compras + shower: Ducha + social_centre: Centro social social_club: Club social studio: Estudio supermarket: Supermercado + swimming_pool: Piscina taxi: Taxi telephone: Teléfono público theatre: Teatro @@ -556,37 +586,17 @@ es: youth_centre: Centro juvenil boundary: administrative: Frontera administrativa + census: Límite de censo + national_park: Parque Nacional + protected_area: Área protegida + bridge: + aqueduct: Acueducto + suspension: Puente colgante + swing: Puente giratorio + viaduct: Viaducto + "yes": Puente building: - apartments: Bloque de apartamentos - block: Bloque de edificios - bunker: Búnker - chapel: Capilla - church: Iglesia - city_hall: Ayuntamiento - commercial: Edificio comercial - dormitory: Residencia de estudiantes, colegio mayor - entrance: Entrada a edificio - faculty: Edificio de facultad - farm: Granja - flats: Apartamentos - garage: Garaje - hall: Mansión - hospital: Edificio hospitalario - hotel: Hotel - house: Casa - industrial: Edificio industrial - office: Edificio de oficinas - public: Edificio público - residential: Edificio residencial - retail: Edificio comercial - school: Edificio escolar - shop: Tienda - stadium: Estadio - store: Almacén - terrace: Terraza - tower: Torre - train_station: Estación de tren - university: Edificio universitario + "yes": Edificio highway: bridleway: Camino prioritario para peatones y caballos bus_guideway: Canal guiado de autobuses @@ -594,12 +604,11 @@ es: byway: Camino construction: Vía en construcción cycleway: Carril bici - distance_marker: Hito kilométrico emergency_access_point: Acceso de emergencia footway: Sendero ford: Vado - gate: Puerta living_street: Calle residencial + milestone: Hito minor: Carretera secundaria motorway: Autovía motorway_junction: Cruce de autovías @@ -611,14 +620,17 @@ es: primary_link: Enlace de carretera principal raceway: Pista de carreras residential: Calle + rest_area: Área de descanso road: Carretera secondary: Carretera secundaria secondary_link: Enlace de carretera secundaria service: Vía de servicio services: Vía de servicio + speed_camera: Radar steps: Escaleras stile: Escalera para atravesar verjas tertiary: Carretera terciaria + tertiary_link: Carretera terciaria track: Pista trail: Sendero trunk: Vía rápida @@ -632,6 +644,7 @@ es: building: Edificio histórico castle: Castillo church: Iglesia + fort: Fuerte house: Casa icon: Icono manor: Casa señorial @@ -656,6 +669,7 @@ es: farmland: Tierra de labranza farmyard: Corral forest: Bosque + garages: Garajes grass: Césped greenfield: Terreno urbanizable industrial: Zona industrial @@ -663,25 +677,28 @@ es: meadow: Pradera military: Zona militar mine: Mina - mountain: Montaña nature_reserve: Reserva natural + orchard: Huerto park: Parque piste: Pista de esquí - plaza: Plaza quarry: Cantera railway: Vía de ferrocarril recreation_ground: Área recreacional reservoir: Embalse + reservoir_watershed: Cuenca del embalse residential: Área residencial retail: Zona comercial + road: Área de carretera village_green: Parque municipal vineyard: Viñedo wetland: Pantano wood: Madera leisure: beach_resort: Complejo en la playa + bird_hide: Observatorio de aves common: Terreno común fishing: Área de pesca + fitness_station: Gimnasio garden: Jardín golf_course: Campo de golf ice_rink: Pista de patinaje sobre hielo @@ -692,12 +709,17 @@ es: pitch: Cancha deportiva playground: Área de juegos recreation_ground: Área recreativa + sauna: Sauna slipway: Grada sports_centre: Centro deportivo stadium: Estadio swimming_pool: Piscina track: Pista de carreras water_park: Parque acuático + military: + airfield: Aeródromo militar + barracks: Barracas + bunker: Búnker natural: bay: Bahía beach: Playa @@ -705,11 +727,12 @@ es: cave_entrance: Entrada a cueva channel: Canal cliff: Acantilado - coastline: Costa crater: Cráter + dune: Duna feature: Característica fell: Monte fjord: Fiordo + forest: Bosque geyser: Géiser glacier: Glaciar heath: Brezal @@ -729,6 +752,7 @@ es: scrub: Matorrales shoal: Banco de arena spring: Manantial + stone: Piedra strait: Estrecho tree: Árbol valley: Valle @@ -737,6 +761,19 @@ es: wetland: Pantano wetlands: Pantano wood: Bosque + office: + accountant: Contable + architect: Arquitecto + company: Empresa + employment_agency: Agencia de empleo + estate_agent: Inmobiliaria + government: Oficina gubernamental + insurance: Oficina de seguros + lawyer: Abogado + ngo: Oficina de ONG + telecommunication: Oficina de telecomunicaciones + travel_agent: Agencia de viajes + "yes": Oficina place: airport: Aeropuerto city: Ciudad @@ -748,6 +785,7 @@ es: houses: Casas island: Isla islet: Islote + isolated_dwelling: Vivienda aislada locality: Localidad moor: Páramo municipality: Municipio @@ -771,6 +809,7 @@ es: junction: Encrucijada de vías ferroviarias level_crossing: Paso a nivel light_rail: Metro ligero + miniature: Ferrocarril en miniatura monorail: Monorail narrow_gauge: Ferrocarril de vía estrecha platform: Andén @@ -785,7 +824,7 @@ es: yard: Estación de clasificación shop: alcohol: Licorería - apparel: Tienda de ropa + antiques: Antigüedades art: Tienda de artículos de arte bakery: Panadería beauty: Tienda de productos de belleza @@ -794,7 +833,6 @@ es: books: Librería butcher: Carnicería car: Concesionario - car_dealer: Concesionario de automóviles car_parts: Repuestos automotrices car_repair: Taller mecánico carpet: Tienda de alfombras @@ -809,7 +847,6 @@ es: department_store: Grandes almacenes discount: Tienda de descuento doityourself: Tienda de bricolaje - drugstore: Parafarmacia dry_cleaning: Tintorería electronics: Tienda de electrónica estate_agent: Inmobiliaria @@ -875,7 +912,10 @@ es: valley: Valle viewpoint: Mirador zoo: Zoológico + tunnel: + "yes": Túnel waterway: + artificial: Vía fluvial artificial boatyard: Astillero canal: Canal connector: Esclusa @@ -901,6 +941,7 @@ es: base: cycle_map: Mapa ciclista mapquest: MapQuest Open + standard: Estándar transport_map: Mapa de transporte site: edit_disabled_tooltip: Haga zoom para editar el mapa @@ -910,6 +951,7 @@ es: history_tooltip: Ver ediciones para esta área history_zoom_alert: Debe hacer más zoom para ver el histórico de ediciones layouts: + community: Comunidad community_blogs: Blogs de la comunidad community_blogs_title: Blogs de miembros de la comunidad de OpenStreetMap copyright: Copyright y licencia @@ -931,16 +973,18 @@ es: history: Historial home: inicio home_tooltip: Ir a la página inicial - inbox: bandeja de entrada (%{count}) + inbox_html: bandeja de entrada %{count} inbox_tooltip: one: Tu bandeja de entrada contiene un mensaje sin leer other: Tu bandeja de entrada contiene %{count} mensajes sin leer zero: Tu bandeja de entrada no tiene mensajes sin leer intro_1: OpenStreetMap es un mapa libremente editable de todo el mundo. Está hecho por personas como usted. - intro_2: OpenStreetMap te permite ver, editar y usar información geográfica de manera colaborativa desde cualquier lugar del mundo. - intro_3: El alojamiento de OpenStreetMap es amablemente proporcionado por %{ucl}, %{ic} y %{bytemark}. Otros patrocinadores del proyecto se encuentran listados en el %{partners}. - intro_3_ic: Imperial College de Londres - intro_3_partners: wiki + intro_2_create_account: Crear una cuenta de usuario + intro_2_download: descargar + intro_2_html: Los datos son libres de %{download} y %{use} bajo su %{license}. %{create_account} para mejorar el mapa. + intro_2_license: licencia abierta + intro_2_use: usar + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: title: Los datos de OpenStreetMap se encuentran bajo la licencia Creative Commons Attribution-Share Alike 2.0 Generic License log_in: identificarse @@ -954,9 +998,15 @@ es: title: Apoye a OpenStreetMap con una donación monetaria osm_offline: La base de datos de OpenStreetMap no está disponible en estos momentos debido a trabajos de mantenimiento. osm_read_only: La base de datos de OpenStreetMap se encuentra en modo de sólo lectura debido a trabajos de mantenimiento. + partners_bytemark: Alojamiento de bytemark + partners_html: El alojamiento está apoyado por %{ucl}, %{ic} and %{bytemark}, y otros %{partners}. + partners_ic: Imperial College de Londres + partners_partners: socios + partners_ucl: el centro de UCL VR + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: registrarse sign_up_tooltip: Cree una cuenta para editar - sotm2011: ¡Ven a la Conferencia de OpenStreetMap 2011, El Estado del Mapa, del 09 al 11 de septiembre en Denver! + sotm2012: ¡Ven a la Conferencia de OpenStreetMap 2012, El Estado del Mapa, del 06 al 11 de septiembre en Tokio! tag_line: El WikiMapaMundi libre user_diaries: Diarios de usuario user_diaries_tooltip: Ver diarios de usuario @@ -971,7 +1021,30 @@ es: english_link: el original en Inglés text: En el caso de un conflicto entre esta página traducida y %{english_original_link}, la versión inglesa prevalecerá title: Acerca de esta traducción - legal_babble: "<h2>Derechos de autor y licencia</h2>\n<p>\n OpenStreetMap es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Reconocimiento-CompartirIgual 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Puedes copiar, distribuir, transmitir y adaptar nuestros mapas e información libremente siempre y cuando des reconocimiento a OpenStreetMap y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e información, podrás distribuir estos cambios bajo la misma licencia. El <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">código legal completo</a> explica tus derechos y obligaciones.\n</p>\n\n<h3>Cómo dar reconocimiento a OpenStreetMap</h3>\n<p>\n Si usas imágenes de mapas de OpenStreetMap, solicitamos que tu texto dándonos reconocimiento se lea al menos así: “© Colaboradores de OpenStreetMap, CC-BY-SA”. Si sólo utilizas información del mapa, solicitamos que muestres “Información del mapa © Colaboradores de OpenstreetMap, CC-BY-SA”.\n</p>\n<p>\n Donde sea posible, OpenStreetMap debería vincularse a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n y CC-BY-SA a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si estás usando un medio donde los enlaces no son posibles (como es el caso de obras impresas), te sugerimos que dirigas a tus lectores a www.openstreetmap.org (por ejemplo, expandiendo ‘OpenStreetMap’ a su dirección completa) y a www.creativecommons.org.\n</p>\n\n<h3>Para saber más...</h3>\n<p>\n Encontrarás más información acerca de cómo utilizar nuestros datos en <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Preguntas y respuestas legales</a> (en inglés).\n</p>\n<p>\n Se le recuerda a los colaboradores de OSM que no deberán añadir información procedente de ninguna fuente con derechos de autor reservados (como por ejemplo de Google Maps o mapas impresos) sin el consentimiento explícito de los poseedores de los derechos de autor.\n</p>\n<p>\n A pesar de que OpenStreetMap es contenido abierto, no podemos proveer una API de mapas gratuita para desarrolladores de aplicaciones para terceros.\n\n Por favor, lee nuestra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso del API</a> (en inglés),\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de uso de <i>tiles</i></a> (en inglés)\n y <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Políticas de uso de Nominatim</a> (en inglés también).\n</p>\n\n<h3>Nuestros colaboradores</h3>\n<p>\n Nuestra licencia CC-BY-SA requiere “reconocer al autor original, de manera razonable conforme al medio o a los medios que usted esté utilizando”. Las persona que hacen contribuciones individualmente a OSM no solicitan la mención de un crédito adicional al de “Colaboradores de OpenStreetMap”, pero en casos donde se ha incluido en OpenStreetMap información de una agencia nacional de cartografía u otra fuente mayor, es razonable reproducir su crédito directamente o añadir su vínculo a esta página.\n</p>\n\n<!--\nInformación para los editores de la página\n\nLa siguiente lista incluye sólo las organizaciones que requieren atribución como condición para que sus datos puedan ser uitlizados en OpenStreetMap. No es un catálogo general de importaciones y no debe ser utilizada sino sólo cuando la atribución se requiera para cumplir con las condiciones de la licencia de la información importada.\n\n\nCualquier adición a esta lista debe discutirse primero con los administradores de sistema de OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Contiene datos suburbanos cuya base es la información provista por Australian Bureau of\n Statistics.</li>\n <li><strong>Austria</strong>: Contiene datos de\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> bajo\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Canadá</strong>: Contiene datos de GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Francia</strong>: Contiene datos extraídos de Direction Générale des Impôts.</li>\n <li><strong>Nueva Zelanda</strong>: Contiene datos extraídos de Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Polonia</strong>: Contiene datos de <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright contribuidores de\n UMP-pcPL. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Aprenda más sobre el uso de UMP por parte de OSM</a></li>\n<li><strong>Reino Unido</strong>: Contiene datos de Ordnance Survey © Crown copyright and database right\n 2010.</li>\n<li><strong>Sudáfrica</strong>: Contiene datos extraídos de \t\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate: Información \n Nacional Geoespacial</a>, State copyright reserved.</li>\n</ul>\n\n<p>\n La inclusión de información en OpenStreetMap no implica que el proveedor de la información original apoya a OpenStreetMap, ofrece alguna garantía o acepta alguna responsabilidad.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: Contiene datos de\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (bajo\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> y Land Tirol (bajo licencia <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT con modificaciones</a>)." + contributors_au_html: "<strong>Australia</strong>: Contiene datos suburbanos cuya base es la información provista por Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canadá</strong>: Contiene datos de GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: Para obtener más detalles sobre estas y otras fuentes que se han utilizado para ayudar a mejorar OpenStreetMap, por favor vea la <a href="http://wiki.openstreetmap.org/wiki/Contributors">página de colaboradores</a> en el Wiki de OpenStreetMap. + contributors_footer_2_html: La inclusión de información en OpenStreetMap no implica que el proveedor de la información original apoya a OpenStreetMap, ofrece alguna garantía o acepta alguna responsabilidad. + contributors_fr_html: "<strong>Francia</strong>: Contiene datos extraídos de Direction Générale des Impôts." + contributors_gb_html: "<strong>Reino Unido</strong>: Contiene datos de Ordnance Survey © Crown copyright and database right\n 2010." + contributors_intro_html: Nuestra licencia CC BY-SA requiere “reconocer al autor original, de manera razonable conforme al medio o a los medios que usted esté utilizando”. Las persona que hacen contribuciones individualmente a OSM no solicitan la mención de un crédito adicional al de “Colaboradores de OpenStreetMap”, pero en casos donde se ha incluido en OpenStreetMap información de una agencia nacional de cartografía u otra fuente mayor, es razonable reproducir su crédito directamente o añadir su vínculo a esta página. + contributors_nl_html: "<strong>Holanda</strong>: Contiene datos de © AND, 2007\n (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nueva Zelanda</strong>: Contiene datos extraídos de Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polonia</strong>: Contiene datos de <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright contribuidores de\n UMP-pcPL. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Aprenda más sobre el uso de UMP por parte de OSM</a>" + contributors_title_html: Nuestros colaboradores + contributors_za_html: "<strong>Sudáfrica</strong>: Contiene datos extraídos de \t\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate: Información \n Nacional Geoespacial</a>, State copyright reserved." + credit_1_html: "Si usas imágenes de mapas de OpenStreetMap, solicitamos que tu texto dándonos reconocimiento se lea al menos así: “© Colaboradores de OpenStreetMap, CC BY-SA”. Si sólo utilizas información del mapa, solicitamos que muestres “Información del mapa © Colaboradores de OpenstreetMap, CC BY-SA”" + credit_2_html: "Donde sea posible, OpenStreetMap debería vincularse a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n y CC BY-SA a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si estás usando un medio donde los enlaces no son posibles (como es el caso de obras impresas), te sugerimos que dirigas a tus lectores a www.openstreetmap.org (por ejemplo, expandiendo ‘OpenStreetMap’ a su dirección completa) y a www.creativecommons.org." + credit_title_html: Cómo dar reconocimiento a OpenStreetMap + intro_1_html: "OpenStreetMap es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Reconocimiento-CompartirIgual 2.0</a> (CC BY-SA)." + intro_2_html: Puedes copiar, distribuir, transmitir y adaptar nuestros mapas e información libremente siempre y cuando des reconocimiento a OpenStreetMap y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e información, solo podrás distribuir estos cambios bajo la misma licencia. El <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">código legal completo</a> explica tus derechos y obligaciones. + more_1_html: "Encontrarás más información acerca de cómo utilizar nuestros datos en <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Preguntas y respuestas legales</a> (en inglés)." + more_2_html: Se le recuerda a los colaboradores de OSM que no deberán añadir información procedente de ninguna fuente con derechos de autor reservados (como por ejemplo de Google Maps o mapas impresos) sin el consentimiento explícito de los poseedores de los derechos de autor. + more_3_html: "A pesar de que OpenStreetMap es contenido abierto, no podemos proveer una API de mapas gratuita para desarrolladores de aplicaciones para terceros.\n\n Por favor, lee nuestra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso del API</a> (en inglés),\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de uso de <i>tiles</i></a> (en inglés)\n y <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Políticas de uso de Nominatim</a> (en inglés también)." + more_title_html: Para saber más... + title_html: Derechos de autor y licencia native: mapping_link: comenzar a mapear native_link: Versión en español @@ -1017,10 +1090,6 @@ es: body: Lo sentimos, no hay ningún mensaje con este identificador. heading: Este mensaje no existe. title: Este mensaje no existe. - no_such_user: - body: Lo sentimos, no hay ningún usuario con ese nombre. - heading: Este usuario no existe - title: Este usuario no existe outbox: date: Fecha inbox: entrada @@ -1194,6 +1263,8 @@ es: allow_write_gpx: subir trazas de GPS allow_write_prefs: modificar sus preferencias de usuario. authorize_url: "URL de autorización:" + confirm: ¿Estás seguro? + delete: Eliminar cliente edit: Editar Detalles key: "Clave de Consumidor:" requests: "Solicitando los siguientes permisos del usuario:" @@ -1203,6 +1274,37 @@ es: url: "URL de Token de Solicitud:" update: flash: Actualizada la información del cliente exitosamente + redaction: + create: + flash: Redacción creada. + destroy: + error: Se produjo un error al destruir esta redacción + flash: Redacción destruida. + not_empty: La redacción no está vacía. Por favor, elimine todas las versiones previas pertenecientes a esta redacción antes de destruirla. + edit: + description: Descripción + heading: Editar redacción + submit: Guardar redacción + title: Editar redacción + index: + empty: No hay ninguna redacción que mostrar. + heading: Lista de redacciones + title: Lista de redacciones + new: + description: Descripción + heading: Introduzca la información de la nueva redacción + submit: Crear redacción + title: Creando nueva redacción + show: + confirm: ¿Estás seguro? + description: "Descripción:" + destroy: Eliminar esta redacción + edit: Editar esta redacción + heading: Mostrando redacción "%{title}" + title: Mostrando redacción + user: "Creador:" + update: + flash: Cambios grabados site: edit: anon_edits_link_text: Descubra a que se debe @@ -1217,7 +1319,6 @@ es: index: js_1: Está usando un navegador que no soporta o tiene desactivado JavaScript js_2: OpenStreetMap utiliza JavaScript para mostrar su mapa - js_3: Podría intentar el <a href="http://tah.openstreetmap.org/Browse/">navegador de teselas estáticas de Tiles@Home</a> si no es capaz de activar JavaScript. license: license_name: Creative Commons Reconocimiento- Compartir bajo la misma licencia 2.0 notice: Bajo la licencia %{license_name} a nombre de %{project_name} y sus colaboradores. @@ -1294,6 +1395,23 @@ es: unclassified: Carretera sin clasificar unsurfaced: Carretera sin asfaltar wood: Madera + markdown_help: + alt: Texto alternativo + first: Primer elemento + heading: Encabezado + headings: Encabezados + image: Imagen + link: Enlace + ordered: Lista ordenada + second: Segundo elemento + subheading: Subcabecera + text: Texto + title_html: Analizado con <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Lista sin ordenar + url: Dirección URL + richtext_area: + edit: Editar + preview: Vista previa search: search: Buscar search_help: "ejemplos: 'Soria', 'Calle Mayor, Lugo', 'CB2 5AQ', o 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>más ejemplos...</a>" @@ -1330,16 +1448,13 @@ es: visibility: "Visibilidad:" visibility_help: ¿Qué significa esto? list: + empty_html: No hay nada aquí todavía. <a href='%{upload_link}'>Carga una nueva traza</a> o aprende más acerca de cómo hacer trazas con el GPS en la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página wiki</a>. public_traces: Trazas GPS públicas public_traces_from: Trazas GPS públicas de %{user} tagged_with: etiquetado con %{tags} your_traces: Tus trazas GPS make_public: made_public: Traza hecha pública - no_such_user: - body: Lo sentimos, no hay un usuario con el nombre %{user}. Por favor, revise la ortografía o quizás el enlace en el que hizo click está equivocado. - heading: El usuario %{user} no existe - title: No existe este usuario offline: heading: Almacenamiento GPX desconectado message: El sistema de almacenamiento y subida de archivos GPX no se encuentra disponible en este momento. @@ -1378,8 +1493,8 @@ es: trace_optionals: tags: Etiquetas trace_paging_nav: - next: Siguiente » - previous: « Anterior + newer: Trazas más recientes + older: Trazas más antiguas showing_page: Mostrando página %{page} view: delete_track: Borrar esta traza @@ -1495,6 +1610,7 @@ es: login_button: Iniciar sesión lost password link: ¿Ha perdido su contraseña? new to osm: ¿Nuevo en OpenStreetMap? + no account: ¿No está registrado? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Descubre más acerca del próximo cambio de licencia de OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traducciones</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discusión</a>) notice_terms: OpenStreetMap cambiará a una nueva licencia el 1 de abril de 2012. Es tan abierta como nuestra licencia actual, pero los términos legales están mucho mejor adaptados a nuestra base de datos del mapa. Nos encantaría conservar sus contribuciones en OpenStreetMap, pero sólo podremos hacerlo si está de acuerdo en permitirnos distribuirlas bajo la nueva licencia. De lo contrario, tendremos que eliminarlas de la base de datos.<br /><br />Inicie sesión y, a continuación, tómese unos segundos para revisar y aceptar los nuevos términos. ¡Gracias! openid: "%{logo} OpenID:" @@ -1610,9 +1726,10 @@ es: activate_user: activar este usuario add as friend: añadir como amigo ago: (hace %{time_in_words_ago}) - block_history: ver los bloqueos recibidos + block_history: Bloqueos recibidos blocks by me: bloqueados por mi blocks on me: bloqueos sobre mi + comments: comentarios confirm: Confirmar confirm_user: confirmar este usuario create_block: bloquear a este usuario @@ -1635,7 +1752,8 @@ es: latest edit: "Última edición %{ago}:" m away: "%{count} m de distancia" mapper since: "Mapeando desde:" - moderator_history: ver los bloqueos impuestos + moderator_history: Bloqueos impuestos + my comments: Mis comentarios my diary: mi diario my edits: mis ediciones my settings: mis preferencias @@ -1690,7 +1808,6 @@ es: filter: block_expired: Este bloqueo ya ha expirado y no puede ser editado. block_period: El periodo de bloqueo debe de ser uno de los valores seleccionables de la lista desplegable. - not_a_moderator: Tienes que ser un moderador para ejecutar esa acción. helper: time_future: Termina en %{time}. time_past: Finalizado hace %{time}. @@ -1720,11 +1837,14 @@ es: creator_name: Creador display_name: Usuario bloqueado edit: Editar + next: Siguiente » not_revoked: (no revocado) + previous: « Anterior reason: Razón del bloqueo revoke: Revocar revoker_name: Revocado por show: Mostrar + showing_page: Mostrando la página %{page} status: Estado period: one: 1 hora diff --git a/config/locales/et.yml b/config/locales/et.yml index cfb27fc9d..6de11d6d3 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1,6 +1,7 @@ -# Messages for Estonian (Eesti) +# Messages for Estonian (eesti) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: AivoK # Author: Avjoska # Author: Kanne # Author: RM87 @@ -57,7 +58,6 @@ et: browse: changeset: changeset: "Muutustekogu: %{id}" - download: Laadi %{changeset_xml_link} või %{osmchange_xml_link} title: Muutustekogu changeset_details: belongs_to: "Kuulub:" @@ -100,7 +100,6 @@ et: next_changeset_tooltip: Kasutaja %{user} järgmine muudatus prev_changeset_tooltip: Kasutaja %{user} eelmine muudatus node: - download: "%{download_xml_link}, %{view_history_link} või %{edit_link}" download_xml: Laadi XML edit: redigeeri node: sõlm @@ -110,7 +109,6 @@ et: coordinates: "koordinaadid:" part_of: "Osa joonest:" node_history: - download: "%{download_xml_link} või %{view_details_link}" download_xml: Laadi XML node_history: Punkti muudatusteajalugu node_history_title: Punkti %{node_name} ajalugu @@ -125,7 +123,6 @@ et: of: " /" showing_page: Näitan lehte relation: - download: "%{download_xml_link} või %{view_history_link}" download_xml: Laadi XML relation: relatsioon relation_title: "Relatsioon: %{relation_name}" @@ -133,7 +130,6 @@ et: relation_details: members: "Liikmed:" relation_history: - download: "%{download_xml_link} või %{view_details_link}" download_xml: Laadi XML relation_history: Relatsiooni muudatuste ajalugu relation_history_title: Relatsiooni %{relation_name} ajalugu @@ -187,9 +183,8 @@ et: type: node: sõlme relation: relatsiooni - way: joont + way: joone way: - download: "%{download_xml_link}, %{view_history_link} või %{edit_link}" download_xml: Lae XML edit: redigeeri view_history: vaata ajalugu @@ -202,7 +197,6 @@ et: nodes: "Sõlmed:" part_of: "Osa:" way_history: - download: "%{download_xml_link} või %{view_details_link}" download_xml: Lae alla XML-fail. view_details: vaata detaile way_history: Joone muudatuste ajalugu @@ -226,6 +220,9 @@ et: list: description: Viimased muudatused diary_entry: + comments: + newer_comments: Uuemad kommentaarid + older_comments: Vanemad kommentaarid diary_comment: confirm: Kinnita hide_link: Peida see kommentaar @@ -233,7 +230,11 @@ et: comment_count: one: 1 kommentaar other: "%{count} kommentaari" + comment_link: Kommenteeri seda päeviku sissekannet confirm: Kinnita + edit_link: Muuda seda sissekannet + hide_link: Peida see sissekanne + reply_link: Vasta sellele sissekandele edit: body: "Tekst:" language: "Keel:" @@ -242,6 +243,7 @@ et: longitude: "Pikkuskraad:" save_button: Salvesta subject: "Teema:" + title: Muuda päeviku sissekannet use_map_link: kasuta kaarti list: new: Uus päeviku sissekanne @@ -256,9 +258,11 @@ et: edit: muuda location: "Asukoht:" view: Vaata - no_such_user: - body: Kahjuks ei ole meil kasutajat %{user}. Nimes võib olla kirjaviga või link võib olla vigane. - heading: Kasutajat %{user} ei ole olemas + new: + title: Uus päeviku sissekanne + no_such_entry: + heading: Sissekannet id'ga %{id} pole olemas + title: Sellist päeviku sissekannet pole olemas view: leave_a_comment: Kommenteeri login: Logi sisse @@ -333,6 +337,9 @@ et: suffix_place: ", %{distance} %{direction} kohast %{placename}" search_osm_nominatim: prefix: + aeroway: + gate: Värav + terminal: Terminal amenity: airport: Lennujaam atm: Pangaautomaat @@ -358,6 +365,7 @@ et: drinking_water: Joogivesi driving_school: Autokool embassy: Saatkond + emergency_phone: Hädaabi telefon fast_food: Kiirtoit fire_station: Tuletõrjedepoo fountain: Purskkaev @@ -397,45 +405,32 @@ et: youth_centre: Noortekeskus boundary: administrative: Halduspiir + national_park: Rahvuspark + bridge: + aqueduct: Akvedukt + suspension: Rippsild + swing: Pöördsild + viaduct: Viadukt + "yes": Sild building: - bunker: Punker - chapel: Kabel - church: Kirik - commercial: Ärihoone - dormitory: Ühiselamu - faculty: Õppehoone - farm: Talumaja - flats: Korruselamu - garage: Garaaž - hall: Hall - hospital: Haigla hoone - hotel: Hotell - house: Maja - industrial: Tööstushoone - office: Kontorihoone - public: Avalik hoone - school: Koolihoone - shop: Kauplus - stadium: Staadion - store: Kauplus - tower: Torn - train_station: Raudteejaam - university: Ülikoolihoone + "yes": Hoone highway: bridleway: Ratsatee bus_stop: Bussipeatus cycleway: Jalgrattatee footway: Jalgrada ford: Koolmekoht - gate: Värav living_street: Õueala motorway: Kiirtee path: Rada pedestrian: Jalakäijatele tee platform: Platvorm + primary: Põhimaantee road: Tee secondary: Tugimaantee + speed_camera: Kiiruskaamera steps: Trepp + tertiary: Kohalik maantee unsurfaced: Katteta tee historic: battlefield: Lahinguväli @@ -443,6 +438,7 @@ et: building: Hoone castle: Kindlus church: Kirik + fort: Kindlus house: Maja icon: Ikoon manor: Mõis @@ -456,16 +452,18 @@ et: landuse: cemetery: Surnuaed forest: Mets + garages: Garaažid grass: Muru + industrial: Tööstuspiirkond landfill: Prügimägi meadow: Niit mine: Kaevandus - mountain: Mägi nature_reserve: Looduskaitseala park: Park quarry: Karjäär railway: Raudtee reservoir: Veehoidla + residential: Elamurajoon vineyard: Viinamarjaistandus wetland: Soo wood: Mets @@ -478,11 +476,16 @@ et: park: park pitch: Spordiväljak playground: Mänguväljak + sauna: Saun slipway: Slipp sports_centre: Spordikeskus stadium: Saadion swimming_pool: Ujula water_park: Veepark + military: + airfield: Sõjaväe lennuväli + barracks: Kasarmud + bunker: Punker natural: bay: Laht beach: Rand @@ -490,9 +493,10 @@ et: cave_entrance: Koopa sissepääs channel: Kanal cliff: Kalju - coastline: Rannajoon crater: Kraater + dune: Düün fjord: Fjord + forest: Mets geyser: Geiser glacier: Liustik heath: Nõmm @@ -506,6 +510,7 @@ et: river: Jõgi rock: Kivi spring: Allikas + stone: Kivi strait: Väin tree: Puu valley: Org @@ -514,13 +519,15 @@ et: wetland: Märgala wetlands: Soo wood: Mets + office: + architect: Arhitekt place: - airport: lennujaam + airport: Lennujaam city: Linn - country: riik + country: Riik county: Maakond - farm: talu - house: maja + farm: Talu + house: Maja houses: Majad island: Saar islet: Saareke @@ -529,6 +536,7 @@ et: postcode: Sihtnumber sea: meri state: Osariik + suburb: Linnaosa town: Linn village: Küla railway: @@ -543,6 +551,7 @@ et: platform: Raudteeperroon station: Raudteejaam subway: Metroojaam + switch: Pöörangud tram: Trammitee tram_stop: Trammipeatus shop: @@ -554,7 +563,6 @@ et: clothes: Riidepood computer: Arvutikauplus cosmetics: Kosmeetikapood - drugstore: Apteek dry_cleaning: Keemiline puhastus fish: Kalapood florist: Lillepood @@ -580,7 +588,7 @@ et: alpine_hut: Alpimaja attraction: Turismiatraktsioon camp_site: Laagriplats - guest_house: külalistemaja + guest_house: Külalistemaja hostel: Hostel hotel: Hotell information: informatsioon @@ -593,6 +601,8 @@ et: canal: Kanal dam: Tamm ditch: Kraav + mineral_spring: Mineraalvee allikas + rapids: Kärestik river: Jõgi riverbank: Jõekallas stream: Oja @@ -607,28 +617,32 @@ et: edit_tooltip: Töötle kaarti history_tooltip: Vaata tehtud muudatusi layouts: - community_blogs: Kogukonna Blogid - community_blogs_title: OpenStreetMap'i kogukonna liikmete blogid + community: Kogukond + community_blogs: Kogukonna blogid + community_blogs_title: OpenStreetMapi kogukonna liikmete blogid copyright: Autoriõigused ja litsents documentation: Dokumentatsioon documentation_title: Projekti dokumentatsioon - donate: Toeta OpenStreetMap'i %{link} Riistvara Uuendamise Fondi. + donate: Toeta OpenStreetMapi %{link} Riistvara Uuendamise Fondi. donate_link_text: annetades edit: Redigeeri edit_with: Redigeeri %{editor}-ga export: Ekspordi export_tooltip: Ekspordi kaardiandmed + foundation: Sihtasutus + foundation_title: OpenStreetMapi Sihtasutus gps_traces: GPS rajad help: Juhend + help_title: Projekti abiinfo history: Ajalugu home: kodu home_tooltip: Mine kodupaika - inbox: postkast (%{count}) inbox_tooltip: one: Sul on üks lugemata sõnum other: Sul on %{count} lugemata sõnumit zero: Sul ei ole lugemata sõnumeid - intro_3_partners: wiki + intro_2_create_account: loo oma konto + intro_2_html: Andmeid võib olemasoleva %{license} alusel tasuta %{download} ja %{use}. Kaardi täiendamiseks %{create_account}. log_in: logi sisse log_in_tooltip: Logi sisse oma kasutajanimega logo: @@ -637,9 +651,10 @@ et: logout_tooltip: Logi välja make_a_donation: text: Anneta - title: Toeta OpenStreetMappi rahaliselt + title: Toeta OpenStreetMapi rahaliselt sign_up: registreeru sign_up_tooltip: Redigeerimiseks loo omale konto + sotm2012: Tule 2012 OpenStreetMapi konverentsile The State of the Map 6.-8. septembril Tokyos! tag_line: Vaba viki-maailmakaart user_diaries: Kasutajate päevikud user_diaries_tooltip: Vaata kasutajate päevikuid @@ -655,7 +670,7 @@ et: native: mapping_link: alustada kaardistamist native_link: eestikeelse versiooni - text: Sa vaatad ingliskeelset versiooni autoriõiguste leheküljest. Sa võid minna tagasi %{native_link} juurde sellest lehest või lõpetada autoriõigustest lugemise ja %{mapping_link}. + text: Sa vaatad ingliskeelset versiooni autoriõiguste leheküljest. Sa võid minna tagasi selle lehe %{native_link} juurde või lõpetada autoriõiguste lugemise ja %{mapping_link}. message: delete: deleted: Sõnum kustutatud @@ -696,10 +711,6 @@ et: body: Vabandust kuid sellise id'ga sõnumit ei ole olemas. heading: Sellist sõnumit ei ole olemas title: Sellist sõnumit ei ole olemas - no_such_user: - body: Vabandust kuid sellise nimega kasutajat ei ole olemas. - heading: Kasutajat ei leitud - title: Kasutajat ei leitud outbox: date: Kuupäev inbox: saabunud kirjad @@ -709,7 +720,7 @@ et: my_inbox: "%{inbox_link}" no_sent_messages: Sul ei ole veel saadetud sõnumeid. Miks mitte kontakteeruda mõne %{people_mapping_nearby_link}? outbox: saadetud sõnumid - people_mapping_nearby: lähedalolevad kaardistajad + people_mapping_nearby: lähedaloleva kaardistajaga subject: Teema title: Saadetud sõnumid to: Kellele @@ -718,6 +729,7 @@ et: back_to_outbox: Tagasi saadetud sõnumite juurde date: Kuupäev from: Kellelt + reading_your_messages: Sissetulnud kirjad reply_button: Vasta subject: Teema title: Loe sõnumit @@ -840,6 +852,23 @@ et: unclassified: Klassifitseerimata tee unsurfaced: Katteta tee wood: Mets + markdown_help: + alt: Alternatiivne tekst + first: Esimene kirje + heading: Pealkiri + headings: Pealkirjad + image: Pilt + link: Link + ordered: Nummerdatud loetelu + second: Teine kirje + subheading: Alapealkiri + text: Tekst + title_html: Parsitud <a href="http://daringfireball.net/projects/markdown/">Markdowniga</a> + unordered: Nummerdamata loetelu + url: URL + richtext_area: + edit: Muuda + preview: Eelvaade search: search: Otsi search_help: "näit.: 'Laagri', 'Pargi, Tartu' või 'ATM near Kohila' <a href='http://wiki.openstreetmap.org/wiki/Search'>veel näiteid...</a> (ingl. k)" @@ -868,9 +897,6 @@ et: uploaded_at: "Üles laaditud:" visibility: "Nähtavus:" visibility_help: Mida see tähendab? - no_such_user: - heading: Kasutajat %{user} ei eksisteeri - title: Sellist kasutajat ei ole trace: ago: "%{time_in_words_ago} tagasi" count_points: @@ -887,7 +913,7 @@ et: help: Abi tags: "Sildid:" upload_button: Laadi üles - upload_gpx: "Laadi GPX-fail üles:" + upload_gpx: "Laadi üles GPX-fail:" visibility: Nähtavus visibility_help: mida see tähendab? trace_header: @@ -897,8 +923,6 @@ et: trace_optionals: tags: Sildid trace_paging_nav: - next: Järgmine » - previous: « Eelmine showing_page: Näitan lehekülge %{page} view: delete_track: Kustuta see jälg @@ -951,7 +975,7 @@ et: public editing note: heading: Avalik toimetamine replace image: Asenda praegune pilt - return to profile: Tagasi profiili + return to profile: Tagasi profiili juurde save changes button: Salvesta muudatused title: Redigeeri kasutajakontot confirm: @@ -977,10 +1001,13 @@ et: heading: Logi sisse login_button: Logi sisse lost password link: Salasõna ununes? + no account: Sa ei ole veel registreerinud kasutaja? openid: "%{logo} OpenID:" password: "Parool:" + register now: "Registreeru:" remember: "Jäta mind meelde:" title: Sisselogimise lehekülg + with openid: "Või kasuta sisse logimiseks oma OpenID kasutajat:" logout: heading: Välju OpenStreetMap -st logout_button: Logi välja @@ -1032,15 +1059,18 @@ et: agree: Nõustun consider_pd_why: Mis see on? decline: Ei nõustu + heading: "Kaastöötingimused:" legale_names: france: Prantsusmaa italy: Itaalia rest_of_world: Muu maailm legale_select: "Palun valige oma elukohariik:" + title: "Kaastöötingimused:" view: activate_user: aktiveeri see kasutaja add as friend: lisa sõbraks ago: (%{time_in_words_ago} tagasi) + comments: kommentaarid confirm: Kinnita create_block: blokeeri see kasutaja ct accepted: Vastu võetud %{ago} tagasi @@ -1054,6 +1084,7 @@ et: latest edit: "Viimane muudatus %{ago}:" m away: "%{count} meetri kaugusel" mapper since: "Kaardistaja alates:" + my comments: minu kommentaarid my diary: minu päevik my edits: minu muutmised my settings: minu seaded @@ -1078,8 +1109,6 @@ et: user_block: edit: back: Vaata kõiki blokeeringuid - filter: - not_a_moderator: Selle tegevuse sooritamiseks pead sa olema moderaator. helper: time_future: Lõppeb %{time}. time_past: Lõppes %{time} tagasi. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 23b6b7cbf..e78145bee 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1,4 +1,4 @@ -# Messages for Basque (Euskara) +# Messages for Basque (euskara) # Exported from translatewiki.net # Export driver: syck-pecl # Author: 9and3r @@ -53,8 +53,6 @@ eu: way: Bidea way_tag: Bidearen etiketa browse: - changeset: - download: "%{changeset_xml_link} edo %{osmchange_xml_link} jaitsi" changeset_details: box: kutxa closed_at: "Noiz itxita:" @@ -70,7 +68,6 @@ eu: deleted: Ezabatua loading: Kargatzen... node: - download: "%{download_xml_link}, %{view_history_link} edo %{edit_link}" download_xml: XML jaitsi edit: aldatu node: Nodo @@ -79,7 +76,6 @@ eu: node_details: coordinates: "Koordenatuak:" node_history: - download: "%{download_xml_link} edo %{view_details_link}" download_xml: XML jaitsi view_details: xehetasunak ikusi not_found: @@ -88,7 +84,6 @@ eu: relation: erlazio way: bide relation: - download: "%{download_xml_link} edo %{view_history_link}" download_xml: XML jaitsi relation: Erlazio relation_title: "%{relation_name} erlazioa" @@ -96,7 +91,6 @@ eu: relation_details: members: "Kideak:" relation_history: - download: "%{download_xml_link} edo %{view_details_link}" download_xml: XML jaitsi view_details: xehetasunak ikusi relation_member: @@ -133,7 +127,6 @@ eu: type: relation: erlazio way: - download: "%{download_xml_link}, %{view_history_link} edo %{edit_link}" download_xml: XML jaitsi edit: aldatu view_history: historia ikusi @@ -142,7 +135,6 @@ eu: way_details: nodes: "Nodoak:" way_history: - download: "%{download_xml_link} edo %{view_details_link}" download_xml: XML jaitsi view_details: xehetasunak ikusi changeset: @@ -312,29 +304,12 @@ eu: boundary: administrative: Muga Administratiboa building: - bunker: Bunker - chapel: Kapera - church: Eliza - city_hall: Udaletxea - garage: Garajea - hospital: Ospitale erakina - hotel: Hotela - house: Etxe - industrial: Eraikin industriala - public: Eraikin publiko - school: Eskola eraikina - shop: Denda - stadium: Estadio - store: Denda - tower: Dorre - train_station: Tren Geltokia - university: Unibertsitate eraikina + "yes": Eraikina highway: bus_stop: Autobus-geraleku construction: Eraikitze-lanetan dagoen Autopista emergency_access_point: Larrialdi Sarbide Gunea footway: Oinezkoen bide - gate: Ate motorway: Autobide motorway_link: Autobidea platform: Nasa @@ -369,10 +344,8 @@ eu: meadow: Larre military: Eremu Militarra mine: Meategi - mountain: Mendi nature_reserve: Natura-erreserba park: Parke - plaza: Enparantza quarry: Harrobi railway: Trenbide reservoir: Urtegi @@ -398,7 +371,6 @@ eu: cape: Lurmutur cave_entrance: Kobazulo Sarrera channel: Kanal - coastline: Itsasertz crater: Crater fjord: Fiordo geyser: Geiser @@ -526,8 +498,6 @@ eu: help_centre: Laguntza Zentroa history: Historia home: hasiera - inbox: sarrera-ontzia (%{count}) - intro_3_partners: wiki license: title: OpenStreetMap-eko datuak Creative Commons Aitortu-Partekatu 2.0 Generiko baimen baten mende daude. log_in: Saioa hasi @@ -709,9 +679,6 @@ eu: visibility_help: Zer esan nahi du honek? trace_optionals: tags: Etiketak - trace_paging_nav: - next: Hurrengoa » - previous: « Aurrekoa view: description: "Deskribapena:" download: jaitsi diff --git a/config/locales/fa.yml b/config/locales/fa.yml index fd1a5c277..2c449ac38 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Grille chompa +# Author: Hooshmand.hasannia # Author: Huji # Author: Leyth # Author: Reza1615 @@ -54,6 +55,7 @@ fa: node: گره node_tag: تگ گره notifier: آگاه‌گردان + old_way: راه قدیمی relation: ارتباط session: نشست trace: ردیابی @@ -68,7 +70,6 @@ fa: changeset: changeset: "مجموعه تغییرات: %{id}" changesetxml: مجموعه تغییرات XML - download: بارگیری %{changeset_xml_link} یا %{osmchange_xml_link} feed: title: مجموعه تغییرات %{id} title_comment: مجموعه تغییرات %{id} - %{comment} @@ -127,7 +128,6 @@ fa: next_changeset_tooltip: "%{user} ویرایش بعدی توسط" prev_changeset_tooltip: "%{user} قبلی ویرایش توسط" node: - download: "%{download_xml_link}، %{view_history_link} یا %{edit_link}" download_xml: بارگیری XML edit: ویرایش node: گره @@ -137,7 +137,6 @@ fa: coordinates: "مختصات:" part_of: "بخشی از:" node_history: - download: "%{download_xml_link} یا %{view_details_link}" download_xml: بارگیری XML node_history: تاریخچه منطقه node_history_title: "تاریخچه منطقه: %{node_name}" @@ -153,7 +152,6 @@ fa: of: از showing_page: صفحه نمایش relation: - download: "%{download_xml_link} یا %{view_history_link}" download_xml: بارگیری XML relation: ارتباط relation_title: "ارتباطات: %{relation_name}" @@ -162,7 +160,6 @@ fa: members: "اعضا:" part_of: "بخشی از:" relation_history: - download: "%{download_xml_link} یا %{view_details_link}" download_xml: بارگیری XML relation_history: تاریخچه ارتباطات relation_history_title: "تاریخچه ارتباطات: %{relation_name}" @@ -224,7 +221,6 @@ fa: relation: ارتباط way: راه way: - download: "%{download_xml_link}، %{view_history_link} یا %{edit_link}" download_xml: بارگیری XML edit: ویرایش view_history: نمایش تاریخچه @@ -236,7 +232,6 @@ fa: nodes: "گره‌ها:" part_of: "بخشی از:" way_history: - download: "%{download_xml_link} یا %{view_details_link}" download_xml: بارگیری XML view_details: نمایش جزئیات way_history: تاریخچهٔ راه @@ -262,6 +257,9 @@ fa: list: description: تغییرات اخیر diary_entry: + comments: + newer_comments: نظرات جدیدتر + older_comments: نظرات قدیمی‌تر diary_comment: confirm: تأیید diary_entry: @@ -285,8 +283,6 @@ fa: edit: ویرایش location: "مکان:" view: نمایش - no_such_user: - title: چنین کاربری وجود ندارد view: leave_a_comment: ارسال نظر login: ورود به سیستم @@ -311,7 +307,7 @@ fa: export_details: اطلاعات نقشه‌باز‌شهری تحت مجوز <a href="http://creativecommons.org/licenses/by-sa/2.0/"> کریتیو کانز اشتراک‌یکسان 2 است format: قالب format_to_export: قالب برای خروجی‌سازی - image_size: اندازه تصویر + image_size: اندازهٔ تصویر latitude: "عرض:" licence: اجازه‌نامه longitude: "طول:" @@ -355,6 +351,9 @@ fa: one: تقریباً 1کیلومتر other: تقریباً %{count}کیلومتر zero: کمتر از 1کیلومتر + results: + more_results: نتایج بیشتر + no_results: نتیجه‌ای پیدا نشد search: title: ca_postcode: نتایج <a href="http://geocoder.ca/">Geocoder.CA</a> @@ -369,9 +368,15 @@ fa: suffix_place: ", %{distance} %{direction} %{placename}" search_osm_nominatim: prefix: + aeroway: + gate: ورودی + runway: باند + terminal: پایانه amenity: + WLAN: دسترسی به وای‌فای airport: فرودگاه arts_centre: هنرکده + artwork: اثر هنری atm: عابربانک auditorium: سالن bank: بانک @@ -448,6 +453,7 @@ fa: social_club: باشگاه اجتماعی studio: استودیو supermarket: سوپرمارکت + swimming_pool: استخر شنا taxi: تاکسی telephone: تلفن عمومی theatre: تئاتر @@ -462,46 +468,20 @@ fa: youth_centre: مرکز جوانان boundary: administrative: مرز کشوری + national_park: پارک ملی + protected_area: منطقه حفاظت‌شده + bridge: + "yes": پل building: - apartments: بلوک آپارتمان - block: بلوک ساختمان - bunker: پناهگاه - chapel: کلیسا - church: کلیسا - city_hall: سالن شهر - commercial: ساختمان تجاری - dormitory: خوابگاه دانشجویی - entrance: ورودی ساختمان - faculty: ساختمان دانشکده - farm: ساختمان در مزرعه - flats: آپارتمان - garage: گاراژ - hall: سالن - hospital: ساختمان بیمارستان - hotel: هتل - house: خانه - industrial: ساختمان صنعتی - office: ساختمان اداری - public: ساختمان عمومی - residential: ساختمان مسکونی - retail: معاملات املاک - school: ساختمان مدرسه - shop: فروشگاه - stadium: ورزشگاه - store: فروشگاه - terrace: تراس - tower: برج - train_station: ایستگاه راه‌آهن - university: ساختمان دانشگاه + "yes": ساختمان highway: bus_stop: ایستگاه اتوبوس construction: بزرگراه در دست ساخت - cycleway: مسیر چرخه - distance_marker: نشانگر مسافت + cycleway: مسیر دوچرخه emergency_access_point: نقطهٔ دسترسی اضطراری footway: پیاده رو ford: فورد - gate: دروازه + living_street: خیابان محل سکونت minor: جادهٔ فرعی motorway: اتوبان motorway_junction: اتصال بزرگراه‌ها @@ -512,10 +492,12 @@ fa: primary: جادهٔ اصلی primary_link: جادهٔ اصلی residential: مسکونی + rest_area: استراحتگاه road: جاده secondary: جادهٔ فرعی secondary_link: جادهٔ فرعی services: خدمات بزرگراه‌ها + speed_camera: دوربین کنترل سرعت steps: پله track: ردیابی trunk: بزرگراه @@ -547,12 +529,14 @@ fa: grass: چمن greenfield: فضای سبز industrial: ناحیهٔ صنعتی + meadow: علفزار military: منطقهٔ نظامی mine: معدن - mountain: کوه + orchard: باغ park: پارک railway: راه‌آهن reservoir: مخزن + residential: منطقهٔ مسکونی retail: خرده‌فروشی vineyard: تاکستان wetland: تالاب @@ -561,6 +545,7 @@ fa: beach_resort: تفریحگاه ساحلی common: سرزمین مشترک fishing: منطقهٔ ماهی‌گیری + fitness_station: ایستگاه تناسب اندام garden: باغ golf_course: زمین گلف marina: تفریح‌گاه ساحلی @@ -572,13 +557,18 @@ fa: stadium: ورزشگاه swimming_pool: استخر شنا water_park: پارک آبی + military: + airfield: فرودگاه نظامی + barracks: پادگان natural: bay: خلیج beach: ساحل cave_entrance: ورودی غار channel: کانال - coastline: خط ساحلی + cliff: صخره + dune: ریگ روان fell: قطع کردن + forest: جنگل glacier: یخچال طبیعی hill: تپه island: جزیره @@ -593,6 +583,7 @@ fa: river: رود خانه rock: صخره spring: بهار + stone: سنگ strait: تنگه tree: درخت valley: دره @@ -601,6 +592,16 @@ fa: wetland: تالاب wetlands: تالاب‌ها wood: جنگل + office: + architect: معمار + company: شرکت + government: دفتر دولتی + insurance: دفتر بیمه + lawyer: وکیل + ngo: دفتر سازمان غیر دولتی + telecommunication: دفتر مخابرات + travel_agent: آژانس مسافرتی + "yes": دفتر place: airport: فرودگاه city: شهر بزرگ @@ -641,7 +642,6 @@ fa: subway_entrance: ورودی مترو tram: تراموای shop: - apparel: فروشگاه پوشاک art: فروشگاه لوازم هنری bakery: نانوایی beauty: فروشگاه لوازم آرایشی @@ -660,7 +660,12 @@ fa: greengrocer: سبزی فروش kiosk: کیوسک laundry: خشکشویی + mall: بازار market: بازار + mobile_phone: فروشگاه تلفن همراه + motorcycle: فروشگاه موتورسیکلت + organic: فروشگاه مواد غذایی ارگانیک + pet: فروشگاه حیوانات خانگی supermarket: سوپرمارکت toys: اسباب‌بازی‌فروشی travel_agency: آژانس مسافرتی @@ -679,10 +684,13 @@ fa: museum: موزه valley: دره zoo: باغ وحش + tunnel: + "yes": تونل waterway: canal: کانال dam: سد lock: قفل + mineral_spring: چشمهٔ آب معدنی river: رودخانه waterfall: ابشار html: @@ -691,13 +699,22 @@ fa: copyright: حق تکثیر و مجوز documentation: مستندات documentation_title: مستندات برای پروژه + donate_link_text: حمایت مالی edit: ویرایش + edit_with: با {editor} % ویرایش کن export: صدور + foundation: بنیاد foundation_title: بنیاد OpenStreetMap help: راهنما + help_centre: مرکز کمک + help_title: سایت راهنما برای پروژه history: تاریخچه + home: خانه home_tooltip: رفتن به مکان خانگی - intro_3_partners: ویکی‌ + intro_2_create_account: ایجاد حساب کاربری + intro_2_download: بارگیری + intro_2_license: مجوز آزاد + intro_2_use: استفاده کن log_in: ورود به سیستم logo: alt_text: لوگوی OpenStreetMap @@ -706,13 +723,17 @@ fa: make_a_donation: text: کمک مالی title: OpenStreetMap پشتیبانی با اهداء پولی + partners_ic: کالج سلطنتی لندن sign_up: ثبت نام sign_up_tooltip: ایجاد یک حساب کاربری برای ویرایش + tag_line: ویکی رایگان نقشهٔ جهان user_diaries: یادداشت کاربر view: نمایش view_tooltip: نمایش نقشه welcome_user: خوش آمدید، %{user_link} + welcome_user_link_tooltip: صفحهٔ کاربری شما wiki: ویکی‌ + wiki_title: سایت ویکی برای پروژه license_page: foreign: english_link: اصل انگلیسی @@ -746,9 +767,6 @@ fa: title: فرستادن پیام no_such_message: title: چنین پیغامی وجود ندارد - no_such_user: - heading: چنین کاربری وجود ندارد - title: چنین کاربری وجود ندارد outbox: date: تاریخ inbox: صندوق دریافتی @@ -859,10 +877,6 @@ fa: your_traces: آثار جی‌پی‌اس شما make_public: made_public: رسم‌کردن عمومی - no_such_user: - body: شرمند کاربری با نام %{user} وجود ندارد. لطفا اسم کاربر را از نو وارد کنید یا ممکن است لینکی را که شما انتخاب کرده‌اید اشتباه باشد - heading: کاربر %{user} وجود ندارد - title: چنین کاربری وجود ندارد offline: heading: ذخیره بدون اینترنت جی‌پی‌اس message: ذخیره جی‌پی‌اس و بارگذاری سامانه غیرقابل دسترس می‌باشد @@ -900,8 +914,6 @@ fa: trace_optionals: tags: برچسب‌ها trace_paging_nav: - next: بعدی » - previous: « قبلی showing_page: نمایش صفحه %{page} view: delete_track: حذف این رهگیری @@ -990,14 +1002,14 @@ fa: list: confirm: تایید کاربران انتخاب شده empty: هیچ کاربر مشابهی یافت نشد - heading: کاربرها + heading: کاربران hide: پنهان کردن کاربران انتخاب شده showing: one: "نمایش صفحه %{page} (%{first_item} از %{items}) " other: " نمایش صفحه صفحه %{page} (%{first_item}-%{last_item} از %{items})" summary: "%{name} ایجاد شده از %{ip_address} در %{date}" summary_no_ip: " %{name}در %{date} ایجاد شد" - title: کاربرها + title: کاربران login: email or username: "رایانامه یا نام کاربری:" heading: ورود به سیستم diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 8730c137c..b70de23ed 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1,13 +1,18 @@ -# Messages for Finnish (Suomi) +# Messages for Finnish (suomi) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Alluk. +# Author: Centerlink # Author: Crt # Author: Daeron +# Author: Lliehu +# Author: Nemo bis # Author: Nike # Author: Olli # Author: Ramilehti # Author: Silvonen # Author: Str4nd +# Author: Tomi Toivio # Author: Usp # Author: ZeiP fi: @@ -48,7 +53,7 @@ fi: models: acl: Pääsyoikeuslista changeset: Muutoskokoelma - changeset_tag: Muutoskokoelman tägi + changeset_tag: Muutoskokoelman tunniste country: Maa diary_comment: Päiväkirjan kommentti diary_entry: Päiväkirjamerkintä @@ -56,32 +61,41 @@ fi: language: Kieli message: Viesti node: Piste - node_tag: Pisteen tägi + node_tag: Pisteen tunniste notifier: Ilmoitus old_node: Vanha piste + old_node_tag: Vanha pisteen tunniste. old_relation: Vanha relaatio + old_relation_member: Vanha relaation jäsen + old_relation_tag: Vanha relaation tunniste. old_way: Vanha polku + old_way_node: Vanha tien piste + old_way_tag: Vanha tien tunniste relation: Relaatio relation_member: Relaation jäsen - relation_tag: Relaation tägi + relation_tag: Relaation tunniste session: Istunto trace: Jälki tracepoint: Jälkipiste - tracetag: Jäljen tägi + tracetag: Jäljen tunniste user: Käyttäjä user_preference: Käyttäjän asetus user_token: Käyttäjän tunnus - way: Polku - way_node: Polun piste - way_tag: Polun tägi + way: Viiva + way_node: Viivan piste + way_tag: Viivan tunniste application: + require_cookies: + cookies_needed: Selaimen evästeet on otettu pois päältä - salli evästeiden käyttö selaimessasi ennen jatkamista. + require_moderator: + not_a_moderator: Tämän toiminnon suorittamiseksi sinun on oltava ylläpitäjä. setup_user_auth: blocked: Pääsysi APIin on estetty. Lisätietoja saat kirjautumalla web-käyttöliittymään. + need_to_see_terms: API:n käyttöoikeutesi on tilapäisesti hyllytetty. Kirjaudu sisään verkkokäyttöliittymään nähdäksesi osallistujien ehdot. Niihin ei tarvitse suostua, mutta ne täytyy lukea. browse: changeset: changeset: "Muutoskokoelma: %{id}" changesetxml: muutoskokoelman XML - download: Lataa %{changeset_xml_link} tai %{osmchange_xml_link} feed: title: Muutoskokoelma %{id} title_comment: Muutoskokoelma %{id} - %{comment} @@ -117,6 +131,11 @@ fi: entry_role: Relaatio %{relation_name} (rooli %{relation_role}) map: deleted: Poistettu + edit: + area: Muokkaa aluetta + node: Muokkaa pistettä + relation: Muokkaa relaatiota + way: Muokkaa tietä larger: area: Näytä alue suurella kartalla node: Näytä piste suurella kartalla @@ -138,7 +157,6 @@ fi: next_changeset_tooltip: Käyttäjän %{user} seuraava muutos prev_changeset_tooltip: Käyttäjän %{user} edellinen muutos node: - download: "%{download_xml_link}, %{view_history_link} tai %{edit_link}" download_xml: Lataa XML edit: muokkaa node: Piste @@ -146,9 +164,8 @@ fi: view_history: näytä muokkaushistoria node_details: coordinates: "Koordinaatit:" - part_of: "Osana polkuja:" + part_of: "Osana teitä:" node_history: - download: "%{download_xml_link} tai %{view_details_link}" download_xml: Lataa muokkaushistorian XML node_history: Pisteen muokkaushistoria node_history_title: Pisteen %{node_name} historia @@ -163,8 +180,14 @@ fi: paging_nav: of: " /" showing_page: Nykyinen sivu + redacted: + message_html: Tämän %{type}-tyypin versiota ei voi näyttää koska se on laitostettu. Katso lisätietoja %{redaction_link}. + redaction: Laitos %{id} + type: + node: piste + relation: relaatio + way: polku relation: - download: "%{download_xml_link} tai %{view_history_link}" download_xml: Lataa XML relation: Relaatio relation_title: "Relaatio: %{relation_name}" @@ -173,7 +196,6 @@ fi: members: "Jäsenet:" part_of: "Relaatiojäsenyydet:" relation_history: - download: "%{download_xml_link} tai %{view_details_link}" download_xml: Lataa XML relation_history: Relaation muokkaushistoria relation_history_title: Relaation %{relation_name} historia @@ -189,7 +211,7 @@ fi: view_data: Näytä tiedot nykyisestä karttanäkymästä start_rjs: data_frame_title: Tiedot - data_layer_name: Data + data_layer_name: Selaa karttatietoja details: Tarkemmin drag_a_box: Valitse alue kartalta hiirellä maalaamalla edited_by_user_at_timestamp: Viimeinen muokkaaja [[user]] kello [[timestamp]] @@ -218,10 +240,11 @@ fi: private_user: käyttäjä show_areas: Näytä alueet show_history: Näytä historia + unable_to_load_size: "Ei voi ladata: Laatikon rajojen koko [[bbox_size]] on liian suuri (täytyy olla pienempi kuin %{max_bbox_size})" wait: Odota... zoom_or_select: Katso pienempää aluetta tai valitse kartalta alue, jonka tiedot haluat tag_details: - tags: "Tägit:" + tags: "Tunnisteet:" wiki_link: key: Wikisivu tietueelle %{key} tag: Wikisivu tietueelle %{key}=%{value} @@ -234,7 +257,6 @@ fi: relation: relaatio way: polku way: - download: "%{download_xml_link}, %{view_history_link} tai %{edit_link}" download_xml: Lataa XML edit: muokkaa view_history: näytä historia @@ -247,7 +269,6 @@ fi: nodes: "Pisteet:" part_of: "Relaatiojäsenyydet:" way_history: - download: "%{download_xml_link} tai %{view_details_link}" download_xml: Lataa XML view_details: näytä tiedot way_history: Polun muokkaushistoria @@ -274,17 +295,35 @@ fi: list: description: Tuoreet muutokset description_bbox: Muutoskokoelmat alueelle %{bbox} + description_friend: Ystäviesi muutoskokoelmat + description_nearby: Lähellä olevien käyttäjien muutoskokoelmat description_user: Käyttäjän %{user} muutoskokoelmat description_user_bbox: Käyttäjän %{user} muutoskokoelmat %{bbox} sisällä + empty_anon_html: Muutoksia ei ole vielä tehty + empty_user_html: Et ole tehnyt vielä mitään muutoksia. Lisätietoja kartan muokkaamisesta saa <a href='http://wiki.openstreetmap.org/wiki/Fi:Beginners_Guide_1.3'>Aloittelijan oppaasta</a>. heading: Muutoskokoelmat heading_bbox: Muutoskokoelmat + heading_friend: Muutoskokoelmat + heading_nearby: Muutoskokoelma heading_user: Muutoskokoelmat heading_user_bbox: Muutoskokoelmat title: Muutoskokoelmat title_bbox: Muutoskokoelmat alueelle %{bbox} + title_friend: Ystäviesi muutoskokoelmat + title_nearby: Lähellä olevien käyttäjien muutoskokoelmat title_user: Käyttäjän %{user} muutoskokoelmat title_user_bbox: Käyttäjän %{user} muutoskokoelmat %{bbox} sisällä + timeout: + sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian kauan. diary_entry: + comments: + ago: "%{ago} sitten" + comment: Kommentti + has_commented_on: "%{display_name} on kommentoinut seuraavia päiväkirjamerkintöjä" + newer_comments: Uudemmat kommentit + older_comments: Vanhemmat kommentit + post: Kommentti + when: Milloin diary_comment: comment_from: Kommentti käyttäjältä %{link_user} %{comment_created_at} confirm: Vahvista @@ -329,6 +368,8 @@ fi: older_entries: Vanhempia... recent_entries: Uusimmat päiväkirjamerkinnät title: Käyttäjien päiväkirjamerkinnät + title_friends: Ystäviesi päiväkirjat + title_nearby: Lähellä olevien käyttäjien päiväkirjat user_title: Käyttäjän %{user} päiväkirja location: edit: Muokkaa @@ -340,10 +381,6 @@ fi: body: Tunnuksella %{id} ei ole päiväkirjamerkintää. Joko saamasi linkki oli virheellinen tai kirjoitit sen väärin. heading: Tunnuksella %{id} ei ole päiväkirjamerkintää. title: Päiväkirjamerkintää ei ole - no_such_user: - body: "Tuntematon käyttäjätunnus: %{user}. Joko saamasi linkki oli virheellinen tai kirjoitit sen väärin." - heading: Käyttäjää %{user} ei ole - title: Ei sellaista käyttäjää view: leave_a_comment: Kommentoi tätä kirjoitusta login: Kirjaudu sisään @@ -376,6 +413,7 @@ fi: licence: Lisenssi longitude: "Pit:" manually_select: Valitse pienempi alue + map_image: Karttakuva (näyttää standarditason) max: enintään options: Asetukset osm_xml_data: OpenStreetMapin XML-muoto @@ -393,7 +431,7 @@ fi: drag_a_box: Valitse alue kartalta hiirellä vetämällä export: Vienti manually_select: Valitse pienempi alue - view_larger_map: Näytä suurempi kartta + view_larger_map: Näytä suurempi kartta geocoder: description: title: @@ -436,16 +474,28 @@ fi: suffix_place: ", %{distance} %{direction} paikasta %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Lentokenttä + apron: Asemataso + gate: Portti + helipad: Helikopterikenttä + runway: Kiitorata + taxiway: Rullaustie + terminal: Terminaali amenity: + WLAN: Langaton Internet airport: Lentokenttä arts_centre: Taidekeskus + artwork: Taideteos atm: Pankkiautomaatti auditorium: Auditorio bank: Pankki bar: Baari + bbq: Grillauskatos bench: Penkki bicycle_parking: Pyöräparkki bicycle_rental: Pyörävuokraamo + biergarten: Terassi brothel: Bordelli bureau_de_change: Rahanvaihto bus_station: Linja-autoasema @@ -454,6 +504,7 @@ fi: car_sharing: Kimppakyyti car_wash: Autopesu casino: Kasino + charging_station: Latausasema cinema: Elokuvateatteri clinic: Klinikka club: Klubi @@ -472,6 +523,7 @@ fi: ferry_terminal: Lauttaterminaali fire_hydrant: Paloposti fire_station: Paloasema + food_court: Elintarviketori fountain: Lähde fuel: Polttoaine grave_yard: Hautausmaa @@ -512,9 +564,12 @@ fi: shelter: Väestönsuoja shop: Kauppa shopping: Ostokset + shower: Suihku + social_centre: Sosiaalikeskus social_club: Sosiaalinen kerho studio: Studio supermarket: Supermarketti + swimming_pool: Uima-allas taxi: Taksi telephone: Puhelinkoppi theatre: Teatteri @@ -529,50 +584,29 @@ fi: youth_centre: Nuorisokeskus boundary: administrative: Hallinnollinen raja + census: Väestönlaskenta-alueen raja + national_park: Kansallispuisto + protected_area: Suojelualue + bridge: + aqueduct: Akvedukti + suspension: Riippusilta + swing: Riippusilta + viaduct: Maasilta + "yes": Silta building: - apartments: Talo - block: Rakennusosa - bunker: Bunkkeri - chapel: Kappeli - church: Kirkko - city_hall: Kaupungintalo - commercial: Liikerakennus - dormitory: Asuntola - entrance: Rakennuksen sisäänkäynti - faculty: Tiedekunnan rakennus - farm: Maatilan rakennus - flats: Kerrostalo - garage: Autotalli - hall: Halli - hospital: Sairaalarakennus - hotel: Hotelli - house: Talo - industrial: Teollisuusrakennus - office: Toimistorakennus - public: Julkinen rakennus - residential: Asuinrakennus - retail: Liikerakennus - school: Koulurakennus - shop: Kauppa - stadium: Stadion - store: Kauppa - terrace: Terassi - tower: Torni - train_station: Rautatieasema - university: Yliopistorakennus + "yes": Rakennus highway: - bridleway: Ratsastuspolku + bridleway: Ratsastustie bus_guideway: Ohjattu linja-autokaista bus_stop: Bussipysäkki byway: Sivutie construction: Rakenteilla oleva tie cycleway: Pyörätie - distance_marker: Etäisyysmerkki emergency_access_point: Hätätilapaikka footway: Polku ford: Kahluupaikka - gate: Portti living_street: Asuinkatu + milestone: Virstanpylväs minor: Sivutie motorway: Moottoritie motorway_junction: Moottoritien liittymä @@ -584,14 +618,17 @@ fi: primary_link: Kantatie raceway: Kilparata residential: Asuinkatu + rest_area: Lepoalue road: Tie secondary: Seututie secondary_link: Seututie service: Huoltotie services: Moottoritiepalvelut + speed_camera: Nopeuskamera steps: Portaat stile: Aidanylitys tertiary: Yhdystie + tertiary_link: Yhdystie track: Metsätie trail: Vaelluspolku trunk: Valtatie @@ -605,6 +642,7 @@ fi: building: Rakennus castle: Linna church: Kirkko + fort: Linnake house: Talo icon: Ikoni manor: Kartano @@ -614,10 +652,13 @@ fi: museum: Museo ruins: Rauniot tower: Torni + wayside_cross: Tieristi + wayside_shrine: Tienvarsialttari wreck: Hylky landuse: allotments: Siirtolapuutarha basin: Syvänne + brownfield: Viljelysmaa cemetery: Hautausmaa commercial: Kaupallinen alue conservation: Suojeltu kohde @@ -625,31 +666,37 @@ fi: farm: Maatila farmland: Viljelysmaa farmyard: Maatilan piha - forest: Metsä + forest: Talousmetsä + garages: Autotalleja grass: Nurmikko + greenfield: Viheralue industrial: Teollisuusalue landfill: Kaatopaikka meadow: Niitty military: Sotilasalue mine: Kaivos - mountain: Vuori nature_reserve: Luonnonsuojelualue + orchard: Puutarha park: Puisto piste: Latu - plaza: Aukio quarry: Avolouhos railway: Rautatie recreation_ground: Virkistysalue reservoir: Tekojärvi + reservoir_watershed: Tekoaltaan vedenjakaja residential: Asuinalue retail: Vähittäiskauppa + road: Tiealue + village_green: Puisto vineyard: Viinitarha wetland: Kosteikko wood: Metsä leisure: beach_resort: Rantakohde + bird_hide: Linnunpesä common: Yhteinen maa fishing: Kalastusalue + fitness_station: Kuntosali garden: Puutarha golf_course: Golf-kenttä ice_rink: Luistelurata @@ -660,12 +707,17 @@ fi: pitch: Urheilukenttä playground: Leikkikenttä recreation_ground: Virkistysalue + sauna: Sauna slipway: Vesillelaskuramppi sports_centre: Urheilukeskus stadium: Stadioni swimming_pool: Uima-allas track: Juoksurata water_park: Vesipuisto + military: + airfield: Sotilaskenttä + barracks: Kasarmi + bunker: Bunkkeri natural: bay: Lahti beach: Hiekkaranta @@ -673,11 +725,12 @@ fi: cave_entrance: Luolan sisäänkäynti channel: Kanava cliff: Jyrkänne - coastline: Rantaviiva crater: Kraatteri + dune: Dyyni feature: Erikoispiirre fell: Tunturi fjord: Vuono + forest: Metsä geyser: Geysir glacier: Jäätikkö heath: Nummi @@ -697,6 +750,7 @@ fi: scrub: Pensaikko shoal: Matalikko spring: Lähde + stone: Kivi strait: Salmi tree: Puu valley: Laakso @@ -705,6 +759,19 @@ fi: wetland: Kosteikko wetlands: Kosteikko wood: Metsä + office: + accountant: Kirjanpitäjä + architect: Arkkitehti + company: Yritys + employment_agency: Työnvälitystoimisto + estate_agent: Kiinteistönvälittäjä + government: Virasto + insurance: Vakuutusyhtiö + lawyer: Asianajotoimisto + ngo: Kansalaisjärjestö + telecommunication: Tietoliikenneyritys + travel_agent: Matkatoimisto + "yes": Toimisto place: airport: Lentokenttä city: Kaupunki @@ -716,6 +783,7 @@ fi: houses: Taloja island: Saari islet: Saareke + isolated_dwelling: Erakkomaja locality: Paikkakunta moor: Nummi municipality: Kunta @@ -739,6 +807,7 @@ fi: junction: Rautatien risteys level_crossing: Tasoristeys light_rail: Pikaraitiotie + miniature: Pienoisrautatie monorail: Yksikiskoinen raide narrow_gauge: Kapearaiteinen rautatie platform: Asemalaituri @@ -752,25 +821,34 @@ fi: tram_stop: Raitiovaunupysäkki yard: Ratapiha shop: + alcohol: Alkoholikauppa + antiques: Antiikkia art: Taidekauppa bakery: Leipomo + beauty: Kosmetiikkakauppa + beverages: Juomakauppa bicycle: Polkupyöräkauppa books: Kirjakauppa butcher: Lihakauppa car: Autokauppa - car_dealer: Autokauppa car_parts: Auton osia car_repair: Autokorjaamo carpet: Mattokauppa + charity: Hyväntekeväisyyskauppa chemist: Apteekki clothes: Vaatekauppa computer: Tietokonekauppa + confectionery: Makeiskauppa convenience: Lähikauppa + copyshop: Kopiointipalvelu cosmetics: Kosmetiikkakauppa department_store: Tavaratalo + discount: Alennusmyymälä doityourself: Tee-se-itse dry_cleaning: Kuivapesula electronics: Elektroniikkakauppa + estate_agent: Kiinteistönvälittäjä + farm: Maatalouskauppa fashion: Muotikauppa fish: Kalakauppa florist: Kukkakauppa @@ -778,14 +856,20 @@ fi: funeral_directors: Hautausurakoitsija furniture: Huonekaluliike gallery: Galleria + garden_centre: Puutarhakeskus + general: Sekatavarakauppa gift: Lahjakauppa + greengrocer: Vihanneskauppa + grocery: Ruokakauppa hairdresser: Kampaamo hardware: Rautakauppa + hifi: Elektroniikkakauppa insurance: Vakuutus jewelry: Korukauppa kiosk: Kioski laundry: Pesula mall: Ostoskeskus + market: Tori mobile_phone: Matkapuhelinkauppa motorcycle: Moottoripyöräkauppa music: Musiikkikauppa @@ -799,10 +883,12 @@ fi: shoes: Kenkäkauppa shopping_centre: Ostoskeskus sports: Urheilukauppa + stationery: Paperikauppa supermarket: Supermarketti toys: Lelukauppa travel_agency: Matkatoimisto video: Videokauppa + wine: Alkoholikauppa tourism: alpine_hut: Alppimaja artwork: Taideteos @@ -812,9 +898,11 @@ fi: camp_site: Leirintäalue caravan_site: Leirintäalue chalet: Alppimaja + guest_house: Vierasmaja hostel: Hostelli hotel: Hotelli information: Infopiste + lean_to: Laavu motel: Motelli museum: Museo picnic_site: Piknik-paikka @@ -822,28 +910,45 @@ fi: valley: Laakso viewpoint: Näköalapaikka zoo: Eläintarha + tunnel: + "yes": Tunneli waterway: + artificial: Kanava boatyard: Telakka canal: Kanaali + connector: Kanava dam: Pato + derelict_canal: Hylätty kanava ditch: Oja dock: Märkätelakka drain: Oja lock: Sulku lock_gate: Sulkuportti + mineral_spring: Mineraalivesilähde + mooring: Rantautumispaikka rapids: Koski river: Joki riverbank: Joki stream: Puro + wadi: Vadi + water_point: Vedenottopaikka waterfall: Vesiputous weir: Pato javascripts: map: base: cycle_map: Pyöräilykartta + standard: Perinteinen + transport_map: Joukkoliikenne site: + edit_disabled_tooltip: Aloita kartan muokkaaminen suurentamalla karttaa edit_tooltip: Muokkaa karttaa + edit_zoom_alert: Aloita kartan muokkaaminen suurentamalla karttaa + history_disabled_tooltip: Zoomaa lähemmäs nähdäksesi tämän alueen muokkaukset + history_tooltip: Tarkastele tämän alueen muutoksia + history_zoom_alert: Sinun täytyy zoomata lähemmäs nähdäksesi tämän alueen muokkaukset layouts: + community: Yhteisö community_blogs: Yhteisöblogit community_blogs_title: OpenStreetMap-yhteisön jäsenten blogit copyright: Tekijänoikeudet ja lisenssit @@ -863,17 +968,18 @@ fi: help_centre: Ohjekeskus help_title: Projektin ohjesivusto history: Historia - home: koti - home_tooltip: Siirry kotisijaintiin - inbox: viestit (%{count}) + home: kotipaikka + home_tooltip: Siirry kotipaikkaan inbox_tooltip: one: Sinulla on yksi lukematon viesti. other: Sinulla on %{count} lukematonta viestiä. zero: Sinulla ei ole lukemattomia viestejä. intro_1: OpenStreetMap on avoin ja vapaasti muokattava maailmankartta. Kuka vain voi osallistua. - intro_2: Voit selata, muokata ja käyttää yhteistyössä luotua karttatietoa kaikista maailman kolkista. - intro_3: OpenStreetMapin verkkoliikenteen tarjoavat %{ucl}, %{ic} ja %{bytemark}. Muut projektin tukijat on listattu %{partners}. - intro_3_partners: wikissä + intro_2_create_account: luomalla ensin käyttäjätunnuksen + intro_2_download: ladattavissa + intro_2_html: Kartat ovat vapaasti %{download} ja %{use} %{license} mukaisesti. Voit auttaa meitä parantamaan karttaa %{create_account}. + intro_2_license: avoimen lisenssimme + intro_2_use: käytettävissä license: title: OpenStreetMap-tiedot lisensoidaan Creative Commons Attribution-Share Alike 2.0 Generic -lisenssillä log_in: kirjaudu sisään @@ -887,28 +993,51 @@ fi: title: Tue OpenStreetMapia rahallisella lahjoituksella. osm_offline: OpenStreetMapin tietokantaan ei toistaiseksi ole pääsyä välttämättömien ylläpitotöiden takia. osm_read_only: OpenStreetMapin tietokantaan ei toistaiseksi voi lähettää mitään välttämättömien ylläpitotöiden takia. + partners_bytemark: Bytemark Hosting + partners_html: Palvelinta ylläpitää %{ucl}, %{ic} ja %{bytemark} sekä muut %{partners}. + partners_ic: Imperial College London + partners_partners: kumppanimme + partners_ucl: UCL VR Centre sign_up: rekisteröidy sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta - sotm2011: Tule vuoden 2011 OpenStreetMap-konferenssiin, 9. - 11. syyskuuta Denveriin! tag_line: Vapaa wikimaailmankartta user_diaries: Päiväkirjamerkinnät user_diaries_tooltip: Näytä käyttäjän päiväkirjat view: Kartta view_tooltip: Näytä kartta - welcome_user: Tervetuloa, %{user_link} + welcome_user: Tervetuloa, %{user_link}! welcome_user_link_tooltip: Käyttäjäsivusi wiki: Wiki wiki_title: Projektin wikisivusto license_page: foreign: english_link: englanninenkielisen alkuperäisversion - text: Siinä tapauksessa, että tämän käännetyn sivun ja %{english_original_link} välillä on ristiriita englanninkielinen sivu on etusijalla. + text: Jos tämän käännetyn sivun ja %{english_original_link} välillä on eroja, englanninkielinen sivu on aina etusijalla. title: Tietoja tästä käännöksestä - legal_babble: "<h2>Tekijänoikeus ja lisenssi</h2>\n<p>\nOpenStreetMap on <i>avointa dataa</i>, joka on lisensoitu <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.fi/\">\nCreative Commonsin Nimeä-Tarttuva 2.0 Raakaversio</a> -lisenssilllä (CC-BY-SA).\n</p>\n<p>\nVoit kopioida, levittää, välittää ja mukauttaa karttojamme\nja tietojamme, kunhan OpenStreetMap ja sen tekijät mainitaan.\nJos muutat tai kehität karttojamme tai tietoja, voit\njakaa teosta vain saman lisenssin nojalla.\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Legal codessa</a>\nkerrotaan oikeutesi ja velvollisuutesi.\n</p>\n\n\n<h3>OpenStreetMapin mainitseminen</h3>\n<p>\nJos käytät OpenStreetMapin karttakuvia, pyydämme että\nmainitset ainakin ”© OpenStreetMapin tekijät, CC-BY-SA”.\nJos käytät vain karttatietoja,\nmainitse ”Karttatiedot © OpenStreetMapin tekijät, CC-BY-SA”.\n</p>\n<p>\nAina kun se on mahdollista, linkitä OpenStreetMap osoitteeseen\n<a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nja CC-BY-SA osoitteeseen\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\nJos hyperlinkit eivät ole mahdollisia (esimerkiksi\ntulostettu työ), suosittelemme, että ohjaat lukijat osoitteisiin\nwww.openstreetmap.org ja\nwww.creativecommons.org.\n</p>\n\n<h3>Lisätietoja</h3>\n<p>\nLue lisää\n<a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal FAQ:sta</a>.\n</p>\n<p>\nOSM:n tekijöitä muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista\n(esimerkiksi Google Maps tai painetut kartat) ilman\ntekijänoikeuden haltijan nimenomaista lupaa on kielletty.\n</p>\n<p>\nVaikka OpenStreetMap on avointa dataa, emme voi tarjota\nmaksutonta karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nKatso <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">APIn käyttösäännöt</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">karttakuvien käyttösäännöt</a>\n<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">ja Nominatimin käyttösäännöt</a>.\n</p>\n\n<h3>Tekijät</h3>\n<p>\nKäyttämämme CC-BY-SA-lisenssi vaatii ”alkuperäisten tekijöiden\nmainintaa” käyttömediaan ja käyttötapaan sopivalla tavalla.\nYksittäisiä OSM-kartoittajia ei tarvitse mainita muuten kuin \nmaininnalla ”OpenStreetMapin tekijät”. Kun kyseessä on\npaikallinen maanmittauslaitos tai muu merkittävä lähde,\njonka tietoja käytetään OpenStreetMapissa, voi olla\nperusteltua nimetä myös kyseiset tahot suoraan tai viitata\nsiihen tällä sivulla.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Sisältää lähiötietoja\n Australian Bureau of Statisticsilta.</li>\n <li><strong>Kanada</strong>: Sisältää tietoja\n GeoBasesta ®, GeoGratisista (© Department of Natural\n Resources Canada), CanVecista (© Department of Natural\n Resources Canada), ja StatCanista (Geography Division,\n Statistics Canada).</li>\n <li><strong>France</strong>: Contains data sourced from\n Direction Générale des Impôts.</li>\n <li><strong>Uusi-Seelanti</strong>: Sisältää tietoja Land Information New Zealandista. Crown Copyright.\n <li><strong>Puola</strong>: Sisältää tietoja\n <a href=\"http://ump.waw.pl/\">UMP-pcPL-kartoista</a>. Tekijänoikeus\n UMP-pcPL:n tekijät.</li>\n <li><strong>Yhdistyneet kuningaskunnat</strong>: Sisältää Ordnance\n Surveyn keräämiä tietoja © Crown Copyright ja tietokantojen käyttöoikeus\n 2010.\n</ul>\n\n\n<p>\nTietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja\nottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta.\n</p>" + legal_babble: + contributors_au_html: "<strong>Australia</strong>: Sisältää lähiötietoja\n Australian Bureau of Statisticsilta." + contributors_ca_html: "<strong>Kanada</strong>: Sisältää tietoja\n GeoBasesta ®, GeoGratisista (© Department of Natural\n Resources Canada), CanVecista (© Department of Natural\n Resources Canada), ja StatCanista (Geography Division,\n Statistics Canada)." + contributors_footer_2_html: "Tietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja\nottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta." + contributors_fr_html: "<strong>France</strong>: Contains data sourced from\n Direction Générale des Impôts." + contributors_gb_html: "<strong>Yhdistyneet kuningaskunnat</strong>: Sisältää Ordnance\n Surveyn keräämiä tietoja © Crown Copyright ja tietokantojen käyttöoikeus\n 2010." + contributors_intro_html: "Käyttämämme CC BY-SA-lisenssi vaatii ”alkuperäisten tekijöiden\nmainintaa” käyttömediaan ja käyttötapaan sopivalla tavalla.\nYksittäisiä OSM-kartoittajia ei tarvitse mainita muuten kuin \nmaininnalla ”OpenStreetMapin tekijät”. Kun kyseessä on\npaikallinen maanmittauslaitos tai muu merkittävä lähde,\njonka tietoja käytetään OpenStreetMapissa, voi olla\nperusteltua nimetä myös kyseiset tahot suoraan tai viitata\nsiihen tällä sivulla." + contributors_nz_html: "<strong>Uusi-Seelanti</strong>: Sisältää tietoja Land Information New Zealandista. Crown Copyright." + contributors_pl_html: "<strong>Puola</strong>: Sisältää tietoja\n <a href=\"http://ump.waw.pl/\">UMP-pcPL-kartoista</a>. Tekijänoikeus\n UMP-pcPL:n tekijät." + contributors_title_html: Tekijät + credit_1_html: "Jos käytät OpenStreetMapin karttakuvia, pyydämme että\nmainitset ainakin ”© OpenStreetMapin tekijät, CC BY-SA”.\nJos käytät vain karttatietoja,\nmainitse ”Karttatiedot © OpenStreetMapin tekijät, CC BY-SA”." + credit_2_html: "Aina kun se on mahdollista, linkitä OpenStreetMap osoitteeseen\n<a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nja CC BY-SA osoitteeseen\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\nJos hyperlinkit eivät ole mahdollisia (esimerkiksi\ntulostettu työ), suosittelemme, että ohjaat lukijat osoitteisiin\nwww.openstreetmap.org ja\nwww.creativecommons.org." + credit_title_html: OpenStreetMapin mainitseminen + intro_1_html: "OpenStreetMapin sisältö on <i>avointa tietoa</i>, joka on lisensoitu <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.fi/\">\nCreative Commonsin Nimeä-Tarttuva 2.0 Raakaversio</a> -lisenssilllä (CC BY-SA)." + intro_2_html: "Karttojamme ja tietojamme voi kopioida, levittää, välittää ja mukauttaa, \nkunhan OpenStreetMap ja sen tekijät mainitaan.\nJos muutat tai kehität karttojamme tai tietoja, voit\njakaa teosta vain saman lisenssin nojalla.\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Legal codessa</a>\nkerrotaan oikeutesi ja velvollisuutesi." + more_1_html: "Lue lisää\n<a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal FAQ:sta</a>." + more_2_html: "OSM:n tekijöitä muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista\n(esimerkiksi Google Maps tai painetut kartat) ilman\ntekijänoikeuden haltijan nimenomaista lupaa on kielletty." + more_3_html: "Vaikka OpenStreetMap on avointa dataa, emme voi tarjota\nmaksutonta karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nKatso <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">APIn käyttösäännöt</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">karttakuvien käyttösäännöt</a>\n<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">ja Nominatimin käyttösäännöt</a>." + more_title_html: Lisätietoja + title_html: Tekijänoikeus ja lisenssi native: mapping_link: aloittaa kartoituksen - native_link: suomenkieliseen versioon - text: Tarkastelet on tekijänoikeussivun englanninkielistä versiota. Voit siirtyä takaisin %{native_link} tai voit lopettaa lukemisen tekijänoikeuksista ja %{mapping_link}. + native_link: suomenkielinen versio + text: Tällä sivulla on englanninkielinen ja alkuperäinen versio tekijäoikeuksista. Saatavilla on myös %{native_link} tai lopettaa tekijänoikeuksien lukemisen ja %{mapping_link}. title: Tietoja sivusta message: delete: @@ -916,8 +1045,15 @@ fi: inbox: date: Päiväys from: Lähettäjä + messages: Sinulla on %{new_messages} ja %{old_messages} my_inbox: Saapuneet + new_messages: + one: "%{count} uusi viesti" + other: "%{count} uutta viestiä" no_messages_yet: Ei viestejä. %{people_mapping_nearby_link} + old_messages: + one: "%{count} vanha viesti" + other: "%{count} vanhaa viestiä" outbox: lähetetyt people_mapping_nearby: Lähellä kartoittavia ihmisiä subject: Otsikko @@ -939,12 +1075,16 @@ fi: send_message_to: Lähetä viesti käyttäjälle %{name} subject: Otsikko title: Lähetä viesti - no_such_user: - heading: Käyttäjää ei löydy - title: Käyttäjää ei löydy + no_such_message: + body: Valitettavasti tällä ID-tunnuksella ei ole viestiä. + heading: Ei sellaista viestiä + title: Ei sellaista viestiä outbox: date: Päiväys inbox: saapuneet + messages: + one: Sinulla on %{count} lähetetty viesti + other: Sinulla on %{count} lähetettyä viestiä my_inbox: "%{inbox_link}" no_sent_messages: Et ole lähettänyt vielä viestejä. Miksi et ottaisi yhteyttä joihinkin %{people_mapping_nearby_link}? outbox: lähetetyt @@ -964,6 +1104,9 @@ fi: title: Lue viesti to: "Vastaanottaja:" unread_button: Merkitse lukemattomaksi + wrong_user: Olet kirjautunut sisään tunnuksella `%{user}' mutta viestiä, jonka tahdot lukea, ei ole lähetetty kyseiselle käyttäjälle. Ole hyvä ja kirjaudu sisään oikealla käyttäjätunnukselle lukeaksesi sen. + reply: + wrong_user: Olet kirjautunut sisään tunnuksella `%{user}' mutta viestiä, johon tahdot vastata, ei ole lähetetty kyseiselle käyttäjälle. Ole hyvä ja kirjaudu sisään oikealla käyttäjätunnuksella vastataksesi. sent_message_summary: delete_button: Poista notifier: @@ -975,9 +1118,14 @@ fi: email_confirm: subject: "[OpenStreetMap] Vahvista sähköpostiosoitteesi" email_confirm_html: + click_the_link: Jos tämä olet sinä, napsauta linkkiä alla vahvistaaksesi muutoksen. greeting: Hei, + hopefully_you: Joku (toivottavasti sinä) tahtoo muuttaa sähköpostiosoitteensa sivulla %{server_url} osoitteeksi %{new_address}. email_confirm_plain: + click_the_link: Jos tämä olet sinä, napsauta linkkiä alla vahvistaaksesi muutoksen. greeting: Hei, + hopefully_you_1: Joku (toivottavasti sinä) tahtoo muuttaa sähköpostiosoitteensa osoitteessa + hopefully_you_2: "%{server_url} osoitteeseen %{new_address}." friend_notification: befriend_them: Voit myös lisätä lähettäjän ystäväksi osoitteessa %{befriendurl}. had_added_you: Käyttäjä %{user} lisäsi sinut kaverikseen OpenStreetMap:ssa. @@ -993,15 +1141,21 @@ fi: subject: "[OpenStreetMap] GPX-tuonti epäonnistui" greeting: Hei, success: + loaded_successfully: "%{trace_points} pistettä ladattu onnistuneesti mahdollisista %{possible_points} pisteestä." subject: "[OpenStreetMap] GPX-tuonti onnistui" with_description: kuvauksen kanssa your_gpx_file: Näyttää siltä, että GPX-tiedostosi lost_password: subject: "[OpenStreetMap] Salasanan vaihtopyyntö" lost_password_html: + click_the_link: Jos olet pyytänyt uutta salasanaa, palauta salasanasi napsauttamalla alapuolella olevaa linkkiä. greeting: Hei, + hopefully_you: Tähän sähköpostiosoitteeseen linkitetyn OpenStreetMap.org-käyttäjätilin salasanaa on pyydetty vaihdettavan. lost_password_plain: - greeting: Hei, + click_the_link: Jos tämä olet sinä, napsauta linkkiä alla nollataksesi salasanasi. + greeting: Hei! + hopefully_you_1: Joku (ehkä sinä) pyysi nollaamaan salasanan + hopefully_you_2: openstreetmap.org-käyttäjätilin sähköpostiosoitteet. message_notification: footer1: Voit lukea viestin myös osoitteessa %{readurl} footer2: ja voit vastata siihen osoitteessa %{replyurl} @@ -1010,15 +1164,25 @@ fi: signup_confirm: subject: "[OpenStreetMap] Sähköpostiosoitteen vahvistus" signup_confirm_html: + ask_questions: OpenStreetMapista voi esittää kysymyksiä <a href="http://help.openstreetmap.org/">kysymyksiä ja vastauksia -sivulla</a>. + click_the_link: Jos se olet sinä, tervetuloa! Ole hyvä ja napsauta linkkiä alla vahvistaaksesi käyttäjätilin ja lukeaksesi tietoa OpenStreetMapista + current_user: Lista nykyisistä käyttäjistä eri kategorioissa, perustuen heidän sijaintiinsa maailmassa, löytyy sivulta <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>. + get_reading: <a href="http://wiki.openstreetmap.org/wiki/Fi:Beginners%27_guide">Wikissä on tietoa</a> OpenStreetMapista, uusimmat uutiset löytyvät <a href="http://blog.openstreetmap.org/">OpenStreetMap-blogista</a> tai <a href="http://twitter.com/openstreetmap">Twitteristä</a>, lisäksi OpenStreetMapin perustaneen Steve Coastin <a href="http://www.opengeodata.org/">OpenGeoData-blogi</a> käsittelee projektin historiaa, kuunneltavissa on myös <a href="http://www.opengeodata.org/?cat=13">podcasteja</a>! greeting: Hei! + hopefully_you: Joku (toivottavasti sinä) tahtoo luoda käyttäjätilin osoitteessa + introductory_video: Voit katsella %{introductory_video_link}. + more_videos: On olemassa %{more_videos_link}. more_videos_here: lisää videoita täällä + user_wiki_page: On suositeltavaa, että luot käyttäjän wikisivun, jossa on kategoriatagit, jotka ilmaisevat sijaintisi, esimerkiksi <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>. video_to_openstreetmap: OpenStreetMapin esittelyvideo + wiki_signup: Haluat ehkä myös <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">rekisteröityä OpenStreetMap-wikiin</a>. signup_confirm_plain: ask_questions: "Voit kysyä kysymyksiä OpenStreetMapiin liittyen kysymys-ja-vastaus -sivustollamme:" blog_and_twitter: "Katso viimeisimmät uutiset OpenStreetMap-blogista tai Twitteristä:" click_the_link_1: Jos se olit sinä, tervetuloa! Napsauta linkkiä alla vahvistaaksesi click_the_link_2: tilisi ja lukeaksesi lisätietoja OpenStreetMapista. current_user_1: Luettelo tämänhetkisistä käyttäjistä luokissa, pohjautuen heidän sijaintiin + current_user_2: "ne ovat, on saatavilla täältä:" greeting: Hei! hopefully_you: Joku (toivottavasti sinä) haluaa luoda tilin introductory_video: "Voit katsoa OpenStreetMap-esittelyvideon täällä:" @@ -1037,21 +1201,38 @@ fi: allow_write_diary: luo päiväkirjamerkintöjä, kommentteja ja ystävysty. allow_write_gpx: tallenna GPS-jälkiä. allow_write_prefs: muokata käyttäjäsi asetuksia + request_access: Sovellus %{app_name} pyytää pääsyä käyttäjätiliisi %{user}. Tarkasta oikeudet, jotka tahdot antaa sovellukselle. Voit valita mielestäsi sopivat oikeudet. + revoke: + flash: Olet poistanut sovelluksen %{application} avaimen oauth_clients: + create: + flash: Tiedot on lähetetty hyväksyttäväksi. edit: submit: Muokkaa + title: Muokkaa sovellustasi form: - allow_read_gpx: lukea heidän yksityisiä GPS-jälkiä - allow_write_api: muokata karttaa - allow_write_diary: luoda päiväkirjamerkintöjä, kommentteja ja merkitä ystäväksi - allow_write_gpx: tallentaa GPS-jälkiä - allow_write_prefs: muokata heidän käyttäjäasetuksiaan + allow_read_gpx: yksityisten GPS-jälkien näkeminen. + allow_read_prefs: käyttäjäasetusten näkeminen. + allow_write_api: kartan muokkaaminen. + allow_write_diary: päiväkirjamerkintöjen luominen ja kommentointi sekä kaveripyynnöt. + allow_write_gpx: GPS-jälkien tallentaminen. + allow_write_prefs: käyttäjäasetusten muuttaminen. + callback_url: Takaisinsoiton verkko-osoite name: Nimi - requests: "Pyydä seuraavia oikeuksia käyttäjältä:" + requests: "Sovellus pyytää käyttäjältä seuraavia tietoja:" required: vaadittu + support_url: Tuen osoite (URL) + url: Sovelluksen osoite (URL) index: application: Sovelluksen nimi + issued_at: Käytetty viimeksi + list_tokens: "Seuraavat sovellukset ovat käyttäneet tätä käyttäjätunnusta:" + my_apps: Itse kehittämäni sovellukset + my_tokens: Valtuutetut sovellukset + no_apps: Oletko kehittänyt sovelluksen, jonka haluaisit käyttävän %{oauth}-kirjautumismenetelmää? Sovellus on rekisteröitävä, ennen kuin se voi lähettää kirjautumispyyntöjä tähän palveluun. register_new: Rekisteröi sovelluksesi + revoke: Peruuta! + title: Omat OAuth-tietoni new: submit: Rekisteröi title: Rekisteröi uusi sovellus @@ -1059,24 +1240,71 @@ fi: allow_read_gpx: lukea heidän yksityisiä GPS-jälkiään allow_read_prefs: lukea heidän käyttäjäasetuksiaan allow_write_api: muokata karttaa + allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä ystäviä. allow_write_gpx: tallentaa GPS-jälkiä allow_write_prefs: muokata heidän käyttäjäasetuksiaan + confirm: Oletko varma? + delete: Poista asiakas + edit: Muokkaa yksityiskohtia + key: "Kuluttajan avain:" + requests: "Pyydetään seuraavia oikeuksia käyttäjältä:" + secret: "Kuluttajan salaisuus:" + support_notice: Tuettuja ovat HMAC-SHA1 (suositeltu) ja pelkkä teksti SSL-tilassa. + title: OAuth-tiedot sovellukselle %{app_name} + url: "Pyynnön URL-avain:" + update: + flash: Sovelluksen tiedot on päivitetty. + redaction: + create: + flash: Laitos luotu. + destroy: + error: Laitosta tuhottaessa tapahtui virhe. + flash: Laitos tuhottu. + not_empty: Laitos ei ole tyhjä. Poista laitostiedot kaikista tähän laitokseen liittyvistä versioista ennen sen tuhoamista. + edit: + description: Kuvaus + heading: Muokkaa laitosta + submit: Tallenna laitos + title: Muokkaa laitosta + index: + empty: Ei ole näytettävää laitosta + heading: Laitosten luettelo + title: Laitosten luettelo + new: + description: Kuvaus + heading: Kirjoita tietoja uudesta laitoksesta + submit: Luo laitos + title: Luodaan uusi laitos + show: + confirm: Oletko varma? + description: "Kuvaus:" + destroy: Poista tämä laitos + edit: Muokkaa tätä laitosta + heading: Näytetään laitos "%{title}" + title: Näytetään laitos + user: "Luoja:" + update: + flash: Muutokset on tallennettu. site: edit: anon_edits_link_text: Perustelut (englanniksi) julkisuusvaatimukselle. flash_player_required: Potlatch-editori tarvitsee Flash player -laajennuksen. Saat sen <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Adobe.comin download Flash Player</a> -sivulta. Kartan muokkaamiseen on <a href="http://wiki.openstreetmap.org/wiki/Editing">useita muitakin ohjelmia</a>. + no_iframe_support: Selaimesi ei tue HTML iframeja, joita tähän ominaisuuteen tarvitaan. not_public: Muokkauksesi eivät ole julkisia. not_public_description: Et voi enää muokata karttaa ennen kuin vaihdat muokkauksesi julkisiksi. Voit vaihtaa asetuksen %{user_page}-sivulta. + potlatch2_not_configured: Potlatch 2 ei ole määritetty - Katso lisätietoja http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_unsaved_changes: Olet tehnyt tallentamattomia muutoksia. (Tallentaaksesi Potlatch 2 -editorissa voit napsauttaa.) potlatch_unsaved_changes: Tallentamattomia muutoksia. Tallentaaksesi muutokset Potlatchissa, poista valinta nykyiseltä karttakohteelta; tai paina Tallenna -nappia jos sellainen on käytössä. user_page_link: käyttäjätiedot index: js_1: Selaimesi ei tue JavaScriptiä tai sen suoritus on estetty. js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan. - js_3: Jos et voi sallia JavaScriptiä, kokeile <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home karttakuvaselailinta</a>. license: license_name: Creative Commons Nimeä-Tarttuva 2.0 + notice: Lisensoitu %{license_name} lisenssillä projektin %{project_name} ja sen osallistujien toimesta. project_name: OpenStreetMap-projekti permalink: Ikilinkki + remote_failed: Muokkaus epäonnistui - varmista, että JOSM tai Merkaartor on ladattu ja etähallinta-asetus on käytössä shortlink: Lyhytosoite key: map_key: Karttamerkit @@ -1090,6 +1318,7 @@ fi: - terminaali bridge: Musta kehys = silta bridleway: Ratsastustie + brownfield: Purettujen rakennusten alue building: Merkittävä rakennus byway: Sivutie cable: @@ -1146,6 +1375,23 @@ fi: unclassified: Luokittelematon tie unsurfaced: Päällystämätön tie wood: Metsä + markdown_help: + alt: Vaihtoehtoinen teksti + first: Ensimmäinen kohta + heading: Otsikko + headings: Otsikot + image: Kuva + link: Linkki + ordered: Numeroitu lista + second: Toinen kohta + subheading: Alaotsikko + text: Teksti + title_html: Jäsennä <a href="http://daringfireball.net/projects/markdown/">Wikitekstinä</a> + unordered: Numeroimaton lista + url: Osoite + richtext_area: + edit: Muokkaa + preview: Esikatselu search: search: Haku search_help: "esim.: 'Munkkivuori', 'Karttatie, Oulu' tai 'post offices near Helsinki' <a href='http://wiki.openstreetmap.org/wiki/Search'>lisää esimerkkejä...</a> (englanniksi)" @@ -1175,23 +1421,20 @@ fi: points: "Pisteet:" save_button: Tallenna muutokset start_coord: "Alun koordinaatit:" - tags: "Tägit:" + tags: "Tunnisteet:" tags_help: pilkuilla erotettu lista title: Muokataan jälkeä %{name} uploaded_at: "Lähetetty:" visibility: "Näkyvyys:" visibility_help: mitä tämä tarkoittaa? list: + empty_html: Sivu on tyhjä. <a href='%{upload_link}'>Lähetä uusi GPS-jälki</a> tai lue lisätietoja GPS-jälkien keräämisestä <a href='http://wiki.openstreetmap.org/wiki/Fi:Beginners_Guide_1.2'>wikisivulta</a>. public_traces: Julkiset GPS-jäljet public_traces_from: Käyttäjän %{user} julkiset GPS-jäljet - tagged_with: ", joilla on tägi %{tags}" + tagged_with: ", joilla on tunniste %{tags}" your_traces: Omat GPS-jäljet make_public: made_public: Jäljestä tehtiin julkinen - no_such_user: - body: Valitettavasti käyttäjää %{user} ei ole. Tarkista oikeinkirjoitus tai ehkä napsauttamasi linkki on väärä. - heading: Käyttäjää %{user} ei ole olemassa - title: Käyttäjää ei löydy offline: heading: GPX-jälkien tallennus ei ole käytettävissä message: GPX-jälkien tallennusjärjestelmä ei ole tällä hetkellä käytettävissä @@ -1218,10 +1461,10 @@ fi: trace_form: description: "Kuvaus:" help: Ohje - tags: Tägit + tags: "Tagit:" tags_help: pilkuilla erotettu lista upload_button: Tallenna - upload_gpx: Tallenna GPX-jälki + upload_gpx: "Tallenna GPX-tiedosto:" visibility: "Näkyvyys:" visibility_help: mitä tämä tarkoittaa? trace_header: @@ -1230,10 +1473,10 @@ fi: traces_waiting: Lähettämiäsi jälkiä on jo %{count} käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan. upload_trace: Lisää GPS-jälki trace_optionals: - tags: Tägit + tags: Tunnisteet trace_paging_nav: - next: Seuraava » - previous: « Edellinen + newer: Uudet jäljet + older: Vanhat jäljet showing_page: Sivu %{page} view: delete_track: Poista tämä jälki @@ -1249,7 +1492,7 @@ fi: pending: ODOTTAA KÄSITTELYÄ points: "Pisteitä:" start_coordinates: "Alkupisteen koordinaatit:" - tags: Tägit + tags: Tunnisteet title: Näytetään jälkeä %{name} trace_not_found: Jälkeä ei löydy! uploaded: "Lähetetty:" @@ -1262,15 +1505,19 @@ fi: user: account: contributor terms: - link text: mikä tämä on? + agreed: Olet hyväksynyt Kartoittajan ehdot. + heading: "Kartoittajan ehdot:" + link text: Mitä tämä tarkoittaa? + not yet agreed: Et ole vielä hyväksynyt Kartoittajan ehtoja. + review link text: Lue ja hyväksy uudistuneet Kartoittajan ehdot napsauttamalla tätä linkkiä. current email address: "Nykyinen sähköpostiosoite:" delete image: Poista nykyinen kuva email never displayed publicly: (ei näy muille) - flash update success: Käyttäjätiedot on päivitetty onnistuneesti. - flash update success confirm needed: Käyttäjätiedot on päivitetty onnistuneesti. Vahvista sähköpostiosoitteesi sinulle lähetettyjen ohjeiden mukaisesti. - home location: "Kodin sijainti:" + flash update success: Käyttäjätietojen muutokset on tallennettu. + flash update success confirm needed: Käyttäjätietojen muutokset on tallennettu. Vahvista uusi sähköpostiosoite siihen lähetettyjen ohjeiden mukaisesti. + home location: "Kotipaikka:" image: "Kuva:" - image size hint: (parhaiten toimivat neliöt kuvat, joiden koko on vähintään 100x100) + image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään 100x100) keep image: Säilytä nykyinen kuva latitude: "Leveyspiiri:" longitude: "Pituuspiiri:" @@ -1278,9 +1525,12 @@ fi: my settings: Käyttäjän asetukset new email address: "Uusi sähköpostiosoite:" new image: Lisää kuva - no home location: Et ole määrittänyt kodin sijaintia. + no home location: Kotipaikkaa ei ole vielä määritetty. openid: + link: http://wiki.openstreetmap.org/wiki/Fi:OpenID + link text: Mitä tämä tarkoittaa? openid: "OpenID:" + preferred editor: "Ensisijainen muokkausohjelma:" preferred languages: "Kielivalinnat:" profile description: "Kuvaustekstisi:" public editing: @@ -1296,8 +1546,9 @@ fi: return to profile: Palaa profiilisivulle save changes button: Tallenna muutokset title: Asetusten muokkaus - update home location on click: Aktivoi kodin sijainnin päivitys karttaa napsautettaessa? + update home location on click: Päivitä kotipaikka karttaa napsauttaessa confirm: + already active: Tämä tunnus on jo vahvistettu. button: Vahvista heading: Vahvista käyttäjätunnuksen luominen press confirm button: Aktivoi uusi käyttäjätunnuksesi valitsemalla Vahvista. @@ -1308,24 +1559,58 @@ fi: heading: Vahvista sähköpostiosoitteen muutos press confirm button: Varmenna sähköpostiosoitteesi valitsemalla Vahvista. success: Sähköpostiosoite on vahvistettu. Kiitos liittymisestä! + confirm_resend: + failure: Käyttäjää %{name} ei löytynyt. filter: not_an_administrator: Tähän toimintoon tarvitaan ylläpitäjän oikeudet. go_public: flash success: Kaikki tekemäsi muokkaukset ovat nyt julkisia. list: + confirm: Vahvista valitut käyttäjät + empty: Käyttäjiä ei löytynyt. heading: Käyttäjät hide: Piilota valitut käyttäjät title: Käyttäjät login: - account not active: Käyttäjätunnustasi ei ole vielä aktivoitu.<br />Aktivoi käyttäjätunnuksesi napsauttamalla sähköpostitse saamaasi vahvistuslinkkiä. + account not active: Käyttäjätunnustasi ei ole vielä aktivoitu.<br />Aktivoi käyttäjätunnuksesi napsauttamalla sähköpostitse saamaasi vahvistuslinkkiä, tai <a href="%{reconfirm}">pyydä uusi varmistusviesti</a>. auth failure: Kirjautuminen epäonnistui. + create account minute: Luo käyttäjätunnus. Se kestää vain hetken. email or username: "Sähköpostiosoite tai käyttäjätunnus:" heading: Kirjaudu login_button: Kirjaudu sisään lost password link: Unohditko salasanasi? + new to osm: Oletko uusi OpenStreetMapin käyttäjä? + no account: Eikö sinulla vielä ole käyttäjätunnusta? + notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Lisätietoja tulevasta OpenStreetMapin lisenssinmuutoksesta</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">käännetyt versiot</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">keskustelu</a>) + openid invalid: Valitettavasti OpenID-tunnuksesi vaikuttaa olevan virheellinen. + openid missing provider: Yhteyden muodostaminen OpenID-palvelimeen epäonnistui + openid_logo_alt: Kirjaudu sisään OpenID-tunnuksella + openid_providers: + aol: + alt: Kirjaudu sisään AOL OpenID-tunnuksella + title: Kirjaudu sisään AOL-tunnuksella + google: + alt: Kirjaudu sisään Googlen OpenID-tunnuksella + title: Kirjaudu sisään Google-tunnuksella + myopenid: + alt: Kirjaudu sisään myOpenID OpenID-tunnuksella + title: Kirjaudu sisään myOpenID-tunnuksella + openid: + alt: Kirjaudu sisään OpenID-tunnuksen URL-osoitteella + title: Kirjaudu sisään OpenID-tunnuksella + wordpress: + alt: Kirjaudu sisään Wordpressin OpenID-tunnuksella + title: Kirjaudu sisään Wordpress-tunnuksella + yahoo: + alt: Kirjaudu sisään Yahoon OpenID-tunnuksella + title: Kirjaudu sisään Yahoo-tunnuksella password: "Salasana:" + register now: Rekisteröidy remember: "Muista minut:" title: Kirjautumissivu + to make changes: OpenStreetMapin karttatietojen muuttaminen vaatii käyttäjätunnuksen. + with openid: "Vaihtoehtoisesti kirjautuminen voidaan suorittaa OpenID-tunnuksella:" + with username: "Onko sinulla jo OpenStreetMap-tunnus? Kirjaudu sillä sisään:" logout: heading: Kirjaudu ulos OpenStreetMapista logout_button: Kirjaudu ulos @@ -1333,9 +1618,10 @@ fi: lost_password: email address: "Sähköpostiosoite:" heading: Unohditko salasanasi? + help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen lähetetään salasanan palautusohjeet. new password button: Lähetä minulle uusi salasana - notice email cannot find: Antamallasi sähköpostiosoitteella ei löytynyt käyttäjää. - notice email on way: Antamaasi osoitteeseen lähetettiin ohjeet salasanan uusimiseksi. + notice email cannot find: Annettu sähköpostiosoite ei ole käytössä. + notice email on way: Salasanan palautusohjeet on lähetetty annettuun sähköpostiosoitteeseen. title: Unohtunut salasana make_friend: already_a_friend: "%{name} on jo kaverisi." @@ -1347,16 +1633,22 @@ fi: contact_webmaster: Voit ottaa yhteyttä <a href="mailto:webmaster@openstreetmap.org">webmaster</a>iin (englanniksi) saadaksesi oman käyttäjätunnuksen. Pyrimme vastaamaan pyyntöihin mahdollisimman pikaisesti. continue: Jatka display name: "Käyttäjätunnus:" - display name description: Julkisesti näkyvä käyttäjänimesi. Voit muuttaa tätä myöhemmin asetuksista. + display name description: Julkisesti näkyvä käyttäjänimesi. Tätä voi myöhemmin muuttaa asetuksista. email address: "Sähköpostiosoite:" - fill_form: Täytä lomakkeen tiedot niin saat varmistussähköpostin tunnuksen luomiseksi. - flash create success message: Käyttäjätunnuksen luominen onnistui. Seuraa ohjeita sähköpostiisi tulleessa vahvistusviestissä, niin pääset aloittamaan palvelun käytön. <br /><br />Et voi kirjautua sisään ennen kuin sähköpostiosoite on vahvistettu saamasi viestin ohjeilla.<br /><br />Varmista että sähköpostisuodattimesi sallii aina viestit osoitteesta webmaster@openstreetmap.org. + fill_form: Lomakkeen täyttämisen jälkeen annettuun sähköpostiosoitteeseen lähetetään vahvistusviesti, jolla aktivoidaan käyttäjätunnus. + flash create success message: Kiitos rekisteröitymisestä. Olemme lähettäneet vahvistusviestin osoitteeseen %{email}. Vahvistettuasi käyttäjätunnuksesi voit aloittaa kartoittamisen.<br /><br />Jos käytät roskapostit suodattavaa ohjelmaa, joka lähettää vahvistusviestejä, laita webmaster@openstreetmap.org sallittujen osoitteiden listalle, sillä emme voi vastata vahvistusviesteihin. heading: Luo uusi käyttäjätunnus license_agreement: Luomalla tunnuksen sallit kaiken openstreetmap.org-palvelimelle lähetetyn tiedon sekä kaikkien openstreetmap.org-palvelimeen yhteydessä olevilla työkaluilla tuotetun tiedon hyödyntämisen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons by-sa 2.0</a> -lisenssin mukaisin ehdoin. Tämä ei rajoita oikeuttasi levittää edellämainittuja tietoja myös muiden lisenssien ehdoilla. no_auto_account_create: Automaattinen käyttäjätunnuksen luonti ei ole juuri nyt käytössä. - not displayed publicly: Ei näytetä palvelussa kenellekään. (Sivulla <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="tietosuojakäytäntö wikisivulla, ml. osio sähköpostiosoitteiden käsittelystä">privacy policy</a> on englanniksi lisätietoa tietosuojakäytännöistä.) + not displayed publicly: Sähköpostia ei näytetä palvelussa julkisesti. (Sivulla <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="tietosuojakäytäntö wikisivulla, ml. osio sähköpostiosoitteiden käsittelystä">tietosuojakäytäntö</a> on englanniksi lisätietoa tietosuojakäytännöistä.) + openid: "%{logo} OpenID:" + openid association: "<p>OpenID-tunnustasi ei ole vielä yhdistetty OpenStreetMap-käyttäjätiliin.</p>\n<ul>\n <li>Jos olet uusi OpenStreetMapin käyttäjä, luo uusi tunnus käyttäen lomaketta, joka näkyy alla.</li>\n <li>\n Jos sinulla on jo käyttäjätunnus, voit kirjautua sisään\n käyttäen käyttäjätunnustasi ja salasanaasi, jonka \n jälkeen voit liittää OpenID-tunnuksesi käyttäjätiliin\n käyttäjäasetuksistasi. \n </li>\n</ul>" + openid no password: OpenID:iä käytettäessä salasana ei ole pakollinen, mutta jotkut erikoistyökalut ja -palvelimet saattavat vaatia sen. password: "Salasana:" + terms accepted: Kiitos uusien osallistujaehtojen hyväksymisestä! + terms declined: Olemme pahoillamme, ettet hyväksynyt uusia osallistujaehtoja. Katso lisätietoja <a href="%{url}">tältä wikisivulta</a>. title: Uusi käyttäjätunnus + use openid: Rekisteröidy %{logo} OpenID-tunnuksella no_such_user: body: Käyttäjää %{user} ei löytynyt. Tarkista oikeikirjoitus. heading: Käyttäjää %{user} ei ole olemassa @@ -1372,20 +1664,28 @@ fi: confirm password: "Vahvista salasana:" flash changed: Salasanasi on vaihdettu. flash token bad: Tuntematon tunniste. Tarkista että URL on sama kuin postissasi. - heading: Salasanan vaihto käyttäjälle %{user} + heading: Vaihda käyttäjän %{user} salasana password: "Salasana:" reset: Vaihda salasana title: Salasanan vaihto set_home: flash success: Kodin sijainnin tallennus onnistui + suspended: + webmaster: webmaster terms: agree: Hyväksyn + consider_pd: Edellisen sopimuksen lisäksi katson lisäyksieni olevan Public Domainissa + consider_pd_why: mikä tämä on? decline: En hyväksy + heading: Osallistujaehdot legale_names: france: Ranska italy: Italia rest_of_world: Muu maailma + legale_select: "Ole hyvä ja valitse asuinmaasi:" read and accept: Lue alla oleva sopimus ja varmista, että hyväksyt sopimuksen ehdot nykyisille ja tuleville muokkauksillesi valitsemalla »Hyväksyn». + title: Osallistujaehdot + you need to accept or decline: Ennen jatkamista lue läpi Kartoittajan ehdot ja hyväksy tai hylkää se. view: activate_user: aktivoi tämä käyttäjä add as friend: lisää kaveriksi @@ -1393,25 +1693,38 @@ fi: block_history: näytä estot blocks by me: tekemäni estot blocks on me: saadut estot + comments: kommentit confirm: Vahvista + confirm_user: vahvista tämä käyttäjä create_block: estä tämä käyttäjä - deactivate_user: deaktivoi tämä käyttäjä + created from: "Tekijä:" + ct accepted: Hyväksytty %{ago} sitten + ct declined: Hylätty + ct status: "Kartoittajan ehdot:" + ct undecided: Ei valittu + deactivate_user: poista tämän käyttäjän aktivointi delete_user: poista käyttäjä description: Kuvaus diary: päiväkirja edits: muokkaukset email address: "Sähköpostiosoite:" + friends_changesets: Selaa kaikkia ystävien muutoskokoelmia + friends_diaries: Selaa kaikkia ystävien päiväkirjamerkintöjä hide_user: piilota käyttäjä if set location: Jos määrittelet sijaintisi, alle ilmestyy nätti kartta. Voit määritellä sijaintisi %{settings_link}. km away: "%{count} kilometrin päässä" + latest edit: "Viimeisin muutos %{ago}:" m away: "%{count} metrin päässä" mapper since: "Liittyi palveluun:" moderator_history: näytä tehdyt estot + my comments: omat kommentit my diary: oma päiväkirja my edits: omat muokkaukset my settings: asetukset my traces: omat jäljet nearby users: Muut lähialueen käyttäjät + nearby_changesets: Selaa lähialueen käyttäjien muutoskokoelmia + nearby_diaries: Selaa lähialueen käyttäjien päiväkirjamerkintöjä new diary entry: uusi päiväkirjamerkintä no friends: Sinulla ei ole vielä kavereita. no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä. @@ -1428,7 +1741,9 @@ fi: moderator: Poista moderaattorin oikeudet send message: lähetä viesti settings_link_text: asetussivulla + status: "Tila:" traces: jäljet + unhide_user: piilota tämä käyttäjä user location: Käyttäjän sijainti your friends: Kaverit user_block: @@ -1448,9 +1763,14 @@ fi: back: Näytä kaikki estot heading: Käyttäjän %{name} esto needs_view: Pitääkö tämän käyttäjän kirjautua sisään ennen kuin esto poistetaan? + period: Kuinka pitkäksi aikaa käyttäjää estetään käyttämästä APIa, laskettuna tästä hetkestä. + reason: Syy käyttäjän %{name} estoon. Ole mahdollisimman rauhallinen ja järkevä, anna tilanteesta mahdollisimman paljon yksityiskohtia. Muista, että kaikki käyttäjät eivät ymmärrä yhteisön erikoissanastoa, joten yritä käyttää yleisesti ymmärrettäviä sanoja. show: Näytä tämä esto submit: Päivitä esto title: Käyttäjän %{name} esto + filter: + block_expired: Esto on jo vanhentunut, eikä sitä voi muokata. + block_period: Eston ajanjakson täytyy olla yksi pudotusvalikossa olevista arvoista. helper: time_future: Päättyy %{time} kuluttua. time_past: Päättyi %{time} sitten. @@ -1461,22 +1781,28 @@ fi: title: Estetyt käyttäjät new: back: Näytä kaikki estot + needs_view: Käyttäjän tulee kirjautua sisään ennen tämän eston poistumista period: Kuinka kauan käyttäjä on estetty käyttämästä APIa. Esto alkaa heti. reason: Syy käyttäjän %{name} estoon. Ole mahdollisimman rauhallinen ja järkevä. Anna niin paljon yksityiskohtia tilanteesta kuin voit. Muista, että viesti tulee olemaan esillä julkisesti. Muista myös, että kaikki käyttäjät eivät ymmärrä yhteisön slangia. Käytä siis maallikkojen termejä. submit: Luo esto tried_contacting: Olen ottanut yhteyttä käyttäjään ja pyytänyt heitä lopettamaan. + tried_waiting: Olen antanut käyttäjälle kohtuullisen ajan vastata näihin viesteihin. not_found: back: Takaisin hakemistoon sorry: Estotunnusta %{id} ei löytynyt. partial: confirm: Oletko varma? + creator_name: Tekijä display_name: Estetty käyttäjä edit: Muokkaa + next: Seuraava » not_revoked: (ei kumottu) + previous: « Edellinen reason: Eston syy revoke: Estä! revoker_name: Eston tehnyt show: Näytä + showing_page: Näytetään sivu %{page} status: Tila period: one: 1 tunti @@ -1486,7 +1812,9 @@ fi: flash: Tämä esto on poistettu heading: Poistetaan käyttäjän %{block_on} esto, jonka oli tehnyt %{block_by} past: Tämä esto päättyi %{time} sitten ja sitä ei voida poistaa. + revoke: Poista! time_future: Tämä esto päättyy %{time} kuluttua. + title: Esto %{block_on} poistetaan show: back: Näytä kaikki estot confirm: Oletko varma? @@ -1502,6 +1830,7 @@ fi: time_past: Loppui %{time} sitten title: "%{block_on} estetty käyttäjän %{block_by} toimesta" update: + only_creator_can_edit: Vain tämän eston luonut moderaattori voi muokata sitä. success: Esto päivitetty. user_role: filter: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 457ce2654..b8b7200af 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,19 +1,24 @@ -# Messages for French (Français) +# Messages for French (français) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Alno +# Author: Boniface # Author: Crochet.david # Author: Damouns +# Author: DavidL # Author: EtienneChove # Author: F.rodrigo # Author: Gomoko # Author: Hashar # Author: IAlex # Author: Jean-Frédéric +# Author: Jiremek # Author: Litlok # Author: Ljubinka # Author: McDutchie +# Author: Nemo bis # Author: Od1n +# Author: Olasd # Author: Peter17 # Author: Phoenamandre # Author: Quentinv57 @@ -93,6 +98,8 @@ fr: application: require_cookies: cookies_needed: Il semble que les cookies soient désactivés sur votre navigateur. Veuillez les activer avant de continuer. + require_moderator: + not_a_moderator: Vous devez être modérateur pour effectuer cette action. setup_user_auth: blocked: Votre accès à l'API a été bloqué. Connectez-vous sur l'interface web pour plus d'informations. need_to_see_terms: Votre accès à l’API est temporairement suspendu. Veuillez vous connecter à l’interface web pour afficher les conditions de contributions. Vous n'avez pas besoin d’accord, mais vous devez les visualiser. @@ -100,7 +107,6 @@ fr: changeset: changeset: "Groupe de modifications : %{id}" changesetxml: Groupe de modifications XML - download: Télécharger %{changeset_xml_link} ou %{osmchange_xml_link} feed: title: Groupe de modifications %{id} title_comment: Groupe de modifications %{id} – %{comment} @@ -162,21 +168,19 @@ fr: next_changeset_tooltip: Modifications suivantes par %{user} prev_changeset_tooltip: Modifications précédentes par %{user} node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" download_xml: Télécharger en XML - edit: modifier + edit: Modifier la note node: Nœud node_title: "Nœud : %{node_name}" - view_history: afficher l’historique + view_history: Afficher l’historique node_details: coordinates: "Coordonnées :" part_of: "Faisant partie de :" node_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Télécharger en XML node_history: Historique du nœud node_history_title: "Historique du nœud : %{node_name}" - view_details: voir les détails + view_details: Voir les détails not_found: sorry: Désolé, l’objet de type %{type} avec l’identifiant %{id} n’a pas pu être trouvé. type: @@ -187,21 +191,26 @@ fr: paging_nav: of: de showing_page: Page en cours + redacted: + message_html: La version %{version} de ce(tte) %{type} ne peut être affichée car elle a été masquée. Veuillez consulter %{redaction_link} pour plus d'informations. + redaction: Masquage %{id} + type: + node: nœud + relation: relation + way: chemin relation: - download: "%{download_xml_link} ou %{view_history_link}" download_xml: Télécharger en XML relation: Relation relation_title: "Relation : %{relation_name}" - view_history: afficher l’historique + view_history: Afficher l’historique relation_details: members: "Membres :" part_of: "Faisant partie de :" relation_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Télécharger en XML relation_history: Historique de la relation relation_history_title: "Historique de la relation : %{relation_name}" - view_details: afficher les détails + view_details: Afficher les détails relation_member: entry_role: "%{type} %{name} avec le rôle %{role}" type: @@ -213,7 +222,7 @@ fr: view_data: Voir les données sur la carte actuelle start_rjs: data_frame_title: Données - data_layer_name: Données + data_layer_name: Parcourir les données de la carte details: Détails drag_a_box: Cliquez et tirez un cadre sur la carte pour sélectionner une zone edited_by_user_at_timestamp: Modifié par [[user]] le [[timestamp]] @@ -259,10 +268,9 @@ fr: relation: relation way: chemin way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" download_xml: Télécharger en XML - edit: modifier - view_history: afficher l’historique + edit: Modifier la route + view_history: Afficher l’historique way: Chemin way_title: "Chemin : %{way_name}" way_details: @@ -272,9 +280,8 @@ fr: nodes: "Nœuds :" part_of: "Faisant partie de :" way_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Télécharger en XML - view_details: afficher les détails + view_details: Afficher les détails way_history: Historique du chemin way_history_title: "Historique du chemin : %{way_name}" changeset: @@ -287,8 +294,8 @@ fr: still_editing: (en cours de modification) view_changeset_details: Afficher les détails du groupe de modifications changeset_paging_nav: - next: Objets suivants » - previous: « Objets précédents + next: Suivants » + previous: « Précédents showing_page: Affichage de la page %{page} changesets: area: Zone @@ -303,6 +310,8 @@ fr: description_nearby: Groupes de modifications par les utilisateurs à proximité description_user: Groupes de modifications par %{user} description_user_bbox: Groupes de modifications par %{user} dans %{bbox} + empty_anon_html: Aucune modification encore faite + empty_user_html: Il semble que vous n'avez pas encore fait de modification. Pour commencer, regardez le <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Guide du débutant</a>. heading: Groupes de modifications heading_bbox: Groupes de modifications heading_friend: Groupes de modifications @@ -311,8 +320,8 @@ fr: heading_user_bbox: Groupes de modifications title: Groupes de modifications title_bbox: Groupes de modifications dans %{bbox} - title_friend: Ensemble des modifications par vos amis - title_nearby: Ensembles de modifications par les utilisateurs à proximité + title_friend: Groupes de modifications par vos amis + title_nearby: Groupes de modifications des utilisateurs à proximité title_user: Groupes de modifications par %{user} title_user_bbox: Groupes de modifications par %{user} dans %{bbox} timeout: @@ -383,10 +392,6 @@ fr: body: Desolé, il n'y a aucune entrée dans le journal ou commentaires avec l'id %{id}. Veuillez vérifier l'orthographe, ou le lien que vous avez cliqué n'est pas valide. heading: "Aucune entrée avec l'id : %{id}" title: Aucune entrée du journal n'a été trouvé - no_such_user: - body: Desolé, il n'y pas d'utilisateur avec le nom %{user}. Veuillez vérifier l'orthographe, ou le lien que vous avez cliqué n'est pas valide. - heading: L’utilisateur %{user} n’existe pas - title: Aucun utilisateur trouvé view: leave_a_comment: Ajouter un commentaire login: Connectez-vous @@ -480,16 +485,28 @@ fr: suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aérodrome + apron: Tablier + gate: Porte + helipad: Héliport + runway: Piste + taxiway: Voie de manœuvre + terminal: Terminal amenity: + WLAN: Accès WiFi airport: Aéroport arts_centre: Centre artistique + artwork: Œuvre d’art atm: Distributeur automatique de billets auditorium: Auditorium bank: Banque bar: Bar + bbq: Barbecue bench: Banc bicycle_parking: Parking à vélos bicycle_rental: Location de vélos + biergarten: Brasserie en plein air brothel: Bordel bureau_de_change: Bureau de change bus_station: Arrêt de bus @@ -498,6 +515,7 @@ fr: car_sharing: Covoiturage car_wash: Lavage de voiture casino: Casino + charging_station: Station de recharge cinema: Cinéma clinic: Clinique club: Club @@ -516,6 +534,7 @@ fr: ferry_terminal: Terminal de ferry fire_hydrant: Bouche d'incendie fire_station: Caserne des pompiers + food_court: Aire de restauration fountain: Fontaine fuel: Carburant grave_yard: Cimetière @@ -556,9 +575,12 @@ fr: shelter: Refuge shop: Magasin shopping: Commerce + shower: Douche + social_centre: Centre social social_club: Club social studio: Studio supermarket: Supermarché + swimming_pool: Piscine taxi: Taxi telephone: Téléphone public theatre: Théâtre @@ -573,37 +595,17 @@ fr: youth_centre: Centre pour la jeunesse boundary: administrative: Limite administrative + census: Frontière statistique + national_park: Parc national + protected_area: Zone protégée + bridge: + aqueduct: Aqueduc + suspension: Pont suspendu + swing: Pont tournant + viaduct: Viaduc + "yes": Pont building: - apartments: Immeuble - block: Immeuble - bunker: Bunker - chapel: Chapelle - church: Église - city_hall: Hôtel de ville - commercial: Bâtiment de bureaux - dormitory: Dortoir - entrance: Entrée de bâtiment - faculty: Bâtiment de faculté - farm: Bâtiment de ferme - flats: Appartements - garage: Garage - hall: Salle - hospital: Bâtiment hospitalier - hotel: Hôtel - house: Maison - industrial: Bâtiment industriel - office: Bâtiment de bureaux - public: Bâtiment public - residential: Bâtiment résidentiel - retail: Magasin - school: Bâtiment d'école - shop: Magasin - stadium: Stade - store: Magasin - terrace: Terrasse - tower: Tour - train_station: Gare ferroviaire - university: Bâtiment d'université + "yes": Bâtiment highway: bridleway: Chemin pour cavaliers bus_guideway: Voie de bus guidée @@ -611,12 +613,11 @@ fr: byway: Route secondaire construction: Autoroute en construction cycleway: Piste cyclable - distance_marker: Borne kilométrique emergency_access_point: Point d'accès d'urgence footway: Chemin piéton ford: Gué - gate: Porte living_street: Rue en zone de rencontre + milestone: Borne kilométrique minor: Route mineure motorway: Autoroute motorway_junction: Jonction d'autoroute @@ -628,14 +629,17 @@ fr: primary_link: Route principale raceway: Circuit residential: Rue résidentielle + rest_area: Aire de repos road: Route secondary: Route secondaire secondary_link: Route secondaire service: Route de service services: Services autoroutiers + speed_camera: Radar de vitesse steps: Escalier stile: Échalier tertiary: Route tertiaire + tertiary_link: Route tertiaire track: Piste trail: Piste trunk: Voie express @@ -649,6 +653,7 @@ fr: building: Bâtiment castle: Château church: Église + fort: Fort house: Maison icon: Icône manor: Manoir @@ -673,6 +678,7 @@ fr: farmland: Terrains agricoles farmyard: Bâtiments de ferme forest: Forêt + garages: Garages grass: Herbe greenfield: Zone de construction future industrial: Zone industrielle @@ -680,25 +686,28 @@ fr: meadow: Prairie military: Zone militaire mine: Mine - mountain: Montagne nature_reserve: Réserve naturelle + orchard: Verger park: Parc piste: Piste - plaza: Plaza quarry: Carrière railway: Voie ferrée recreation_ground: Aire de jeux reservoir: Réservoir + reservoir_watershed: Bassin versant de réservoir residential: Zone résidentielle retail: Zone commerciale + road: Zone routière village_green: Zone publique herborée vineyard: Vignoble wetland: Zone humide wood: Bois leisure: beach_resort: Station balnéaire + bird_hide: Observatoire ornithologique common: Terrains communaux fishing: Zone de pêche + fitness_station: Atelier de parcours de santé garden: Jardin golf_course: Terrain de golf ice_rink: Patinoire @@ -709,12 +718,17 @@ fr: pitch: Terrain de sport playground: Aire de jeux recreation_ground: Terrain de jeux + sauna: Sauna slipway: Cale de lancement sports_centre: Centre sportif stadium: Stade swimming_pool: Piscine track: Piste water_park: Parc aquatique + military: + airfield: Terrain d'aviation militaire + barracks: Caserne + bunker: Bunker natural: bay: Baie beach: Plage @@ -722,11 +736,12 @@ fr: cave_entrance: Entrée de grotte channel: Canal cliff: Falaise - coastline: Littoral crater: Cratère + dune: Dune feature: Élément fell: Lande fjord: Fjord + forest: Forêt geyser: Geyser glacier: Glacier heath: Bruyère @@ -746,6 +761,7 @@ fr: scrub: Broussailles shoal: Haut-fond spring: Source + stone: Pierre strait: Détroit tree: Arbre valley: Vallée @@ -754,6 +770,19 @@ fr: wetland: Zone humide wetlands: Zones humides wood: Forêt + office: + accountant: Comptable + architect: Architecte + company: Société + employment_agency: Agence pour l'emploi + estate_agent: Agent immobilier + government: Agence gouvernementale + insurance: Bureau d'assurance + lawyer: Avocat + ngo: Bureau d'une ONG + telecommunication: Bureaux de télécommunication + travel_agent: Agence de voyage + "yes": Bureau place: airport: Aéroport city: Ville @@ -765,6 +794,7 @@ fr: houses: Maisons island: Île islet: Îlot + isolated_dwelling: Habitation isolée locality: Localité moor: Maure municipality: Municipalité @@ -788,6 +818,7 @@ fr: junction: Jonction ferroviaire level_crossing: Passage à niveau light_rail: Petite voie ferrée + miniature: Voie ferrée miniature monorail: Monorail narrow_gauge: Chemin de fer à voie étroite platform: Plateforme ferroviaire @@ -802,7 +833,7 @@ fr: yard: Voie de triage shop: alcohol: Magasin officiel d'alcool - apparel: Magasin d'habillement + antiques: Antiquaire art: Boutique d'art bakery: Boulangerie beauty: Magasin de produits de beauté @@ -811,7 +842,6 @@ fr: books: Librairie butcher: Boucher car: Magasin de voitures - car_dealer: Vendeur de voitures car_parts: Pièces d'automobile car_repair: Réparation de voitures carpet: Magasin de tapis @@ -826,7 +856,6 @@ fr: department_store: Grand magasin discount: Magasin discount doityourself: Magasin de bricolage - drugstore: Pharmacie dry_cleaning: Nettoyage à sec electronics: Magasin d'électronique estate_agent: Agent immobilier @@ -892,7 +921,10 @@ fr: valley: Vallée viewpoint: Point de vue zoo: Zoo + tunnel: + "yes": Tunnel waterway: + artificial: Cours d'eau artificiel boatyard: Chantier naval canal: Canal connector: Connexion hydrographique @@ -928,6 +960,7 @@ fr: history_tooltip: Voir les modifications dans cette zone history_zoom_alert: Vous devez zoomer pour voir l’historique des modifications layouts: + community: Communauté community_blogs: Blogs de la communauté community_blogs_title: Blogs de membres de la communauté OpenStreetMap copyright: Copyright & Licence @@ -949,16 +982,18 @@ fr: history: Historique home: Chez moi home_tooltip: Aller à l'emplacement de mon domicile - inbox: Boîte aux lettres (%{count}) + inbox_html: message(s) reçu(s) %{count} inbox_tooltip: one: Votre boîte aux lettres contient 1 message non lu other: Votre boîte aux lettres contient %{count} messages non lus zero: Votre boîte aux lettres ne contient pas de messages non lus intro_1: OpenStreetMap est une carte du monde entier librement modifiable, faite par des gens comme vous. - intro_2: OpenStreetMap vous permet de voir, modifier et utiliser des données géographiques de n'importe quel endroit dans le monde. - intro_3: OpenStreetMap est gracieusement hébergé par %{ucl}, %{ic} et %{bytemark}. D’autres sponsors du projet sont listés dans les %{partners}. - intro_3_ic: Imperial College London - intro_3_partners: wiki + intro_2_create_account: Créer un compte d'utilisateur + intro_2_download: télécharger + intro_2_html: Les données sont libres pour être %{download} et %{use} sous sa %{license}. %{create_account} pour améliorer la carte. + intro_2_license: licence ouverte + intro_2_use: utiliser + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: title: Les données d’OpenStreetMap sont publiées sous licence <em>Creative Commons paternité – partage à l’identique 2.0 générique</em>. log_in: Connexion @@ -972,9 +1007,15 @@ fr: title: Soutenez OpenStreetMap avec un don financier osm_offline: La base de données de OpenStreetMap est actuellement hors ligne; une maintenance essentielle à son bon fonctionnement est en cours. osm_read_only: La base de données de OpenStreetMap est actuellement en mode lecture seule ; une maintenance essentielle à son bon fonctionnement est en cours. + partners_bytemark: Hébergement Bytemark + partners_html: L'hébergement est pris en charge par %{ucl}, %{ic} et %{bytemark}, et d'autres %{partners}. + partners_ic: le Collège Impérial de Londres + partners_partners: partenaires + partners_ucl: le VR Centre de l'UCL + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: S'inscrire sign_up_tooltip: Créer un compte pour la modification - sotm2011: Venez à la Conférence d'OpenStreetMap 2011, L’État de la Carte, du 9 au 11 septembre à Denver ! + sotm2012: Venez à la Conférence OpenStreetMap 2012, L’État de la Carte, du 6 au 8 septembre à Tokyo ! tag_line: La carte coopérative libre user_diaries: Journaux user_diaries_tooltip: Voir les journaux d'utilisateurs @@ -989,7 +1030,30 @@ fr: english_link: original en anglais text: En cas de conflit entre cette page et la page %{english_original_link}, la version anglaise prime title: À propos de cette traduction - legal_babble: "<h2>Copyright et licence</h2>\n<p>\n OpenStreetMap est un ensemble de <i>données ouvertes</i>, disponibles sous la licence <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons\n paternité – partage à l’identique 2.0</a> (CC BY-SA).\n</p>\n<p>\n Vous êtes libre de copier, distribuer, transmettre et adapter nos cartes\n et données, à condition que vous créditiez OpenStreetMap et ses\n contributeurs. Si vous modifiez ou utilisez nos cartes ou données dans d’autres œuvres dérivées, vous\n ne pouvez distribuer celles-ci que sous la même licence. Le\n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">texte\n légal</a> complet détaille vos droits et responsabilités.\n</p>\n\n<h3>Comment créditer OpenStreetMap</h3>\n<p>\n Si vous utilisez les images d’OpenStreetMap, nous demandons que\n votre crédit comporte au moins la mention « © les contributeurs d’OpenStreetMap,\n CC BY-SA ». Si vous n’utilisez que les données des cartes,\n nous demandons « Données cartographiques © les contributeurs d’OpenStreetMap,\n CC BY-SA ».\n</p>\n<p>\n Là où cela est possible, OpenStreetMap doit être mentionné avec un lien hypertexte vers <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n et CC-BY-SA vers <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si\n vous utilisez un support qui ne permet pas de créer des liens hypertextes (par ex. un\n imprimé), nous suggérons que vous dirigiez vos lecteurs vers\n www.openstreetmap.org (en étendant éventuellement\n « OpenStreetMap » à cette adresse complète) et vers\n www.creativecommons.org.\n</p>\n\n<h3>Pour trouver plus d’informations</h3>\n<p>\n Si vous voulez obtenir plus d’informations sur la réutilisation de nos données, lisez la <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n légale</a>.\n</p>\n<p>\n Nous rappelons aux contributeurs d’OSM qu’ils ne doivent jamais ajouter de données provenant de\n sources protégées par le droit d’auteur (copyright) ou des droits voisins (par ex. Google Maps ou des cartes imprimées) sans\n autorisation explicite de la part des détenteurs des droits d’auteur.\n</p>\n<p>\n Bien qu’OpenStreetMap soit un ensemble de données ouvertes, nous ne pouvons pas fournir\n d’API cartographique libre de frais pour les développeurs tiers.\n\n Consultez nos <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">règles d’utilisation de l’API</a>, nos\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">règles d’utilisation des tuiles graphiques</a>\n et nos <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">règles d’utilisation de Nominatim</a>.\n</p>\n\n<h3>Nos contributeurs</h3>\n<p>\n Notre licence CC BY-SA nécessite que vous « donniez à l’auteur d’origine\n un crédit raisonnable selon les support et moyens que vous\n utilisez ». Les cartographes individuels d’OSM ne demandent pas\n d’autre crédit supplémentaire que « les contributeurs\n d’OpenStreetMap », mais lorsque des données venant d’une agence nationale\n de cartographie ou d’une autre source majeure ont été incluses dans\n OpenStreetMap, il peut être raisonnable de les créditer directement\n de la manière qu’ils demandent ou en établissant un lien vers cette page.\n</p>\n\n<!--\nInformation pour ceux qui modifient cette page\n\nLa liste suivante ne contient que les organisations qui requièrent l’attribution de paternité\ncomme condition de la présence de leur données dans OpenStreetMap. Ce n’est pas un\ncatalogue général des données importées, et elle ne doit pas être utilisée, sauf lorsque\nl’attribution est nécessaire pour respecter la licence des\ndonnées importées.\n\nTout ajout fait ici doit d’abord être discuté avec les administrateurs système d’OSM.\n-->\n<ul id=\"contributors\">\n <li><strong>Australie</strong> : contient des données sur les quartiers\n basées sur les données de l’<em>Australian Bureau of Statistics</em>.</li>\n <li><strong>Autriche</strong> : contient des données sur la\n <a href=\"http://data.wien.gv.at/\">Ville de Vienne</a> sous licence\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY 3.0 Autriche</a>.</li>\n <li><strong>Canada</strong> : contient des données de\n <em>GeoBase</em>®, <em>GeoGratis</em> (© Département des Ressources\n naturelles du Canada), <em>CanVec</em> (© Département des Ressources\n naturelles du Canada) et <em>StatCan</em> (Division Géographie,\n Statistiques du Canada).</li>\n <li><strong>France</strong> : contient des données de la\n <em>Direction générale des impôts</em>.</li>\n <li><strong>Nouvelle-Zélande</strong> : contient des données provenant du\n <em>Land Information New Zealand</em>. © Copyright de la Couronne réservé.</li>\n <li><strong>Pologne</strong> : contient des données provenant des <a\n href=\"http://ump.waw.pl/\">cartes <em>UMP-pcPL</em></a>. © Copyright\n les contributeurs de UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n En savoir davantage sur l’utilisation par OSM des données UMP</a></li>\n <li><strong>Afrique du Sud</strong> :contient des données provenant du\n <a href=\"http://www.ngi.gov.za/\"><em>Chief Directorate:\n National Geo-Spatial Information</em></a>, copyright de l’État réservé.</li>\n <li><strong>Royaume-Uni</strong> : contient des données provenant des <em>Ordnance\n Survey data</em>. © Copyright de la Couronne et droits de base de données 2010.</li>\n</ul>\n\n<p>\n L’inclusion de données dans OpenStreetMap n’implique pas que les\n fournisseurs d’origine du contenu approuvent OpenStreetMap, ni ne fournissent, ne garantissent ou\n n’acceptent quelque responsabilité que ce soit.\n</p>" + legal_babble: + contributors_at_html: "<strong>Autriche</strong>: Contient des données sur\n <a href=\"http://data.wien.gv.at/\">la ville de Vienne</a> (sous licence\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY 3.0 Autriche</a>),\n <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">la région du Vorarlberg.</a> et la région du Tyrol (sous licence <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT avec amendements</a>)." + contributors_au_html: "<strong>Australie</strong> : contient des données sur les quartiers\n basées sur les données de l’<em>Australian Bureau of Statistics</em>." + contributors_ca_html: "<strong>Canada</strong> : contient des données de\n <em>GeoBase</em>®, <em>GeoGratis</em> (© Département des Ressources\n naturelles du Canada), <em>CanVec</em> (© Département des Ressources\n naturelles du Canada) et <em>StatCan</em> (Division Géographie,\n Statistiques du Canada)." + contributors_footer_1_html: "Pour plus de détails sur ceux-ci, et les autres sources utilisées pour aider à améliorer OpenStreetMap, voyez la <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">page des Contributeurs</a> sur le wiki de OpenStreetMap." + contributors_footer_2_html: "L’inclusion de données dans OpenStreetMap n’implique pas que les\n fournisseurs d’origine du contenu approuvent OpenStreetMap, ni ne fournissent, ne garantissent ou\n n’acceptent quelque responsabilité que ce soit." + contributors_fr_html: "<strong>France</strong> : contient des données de la\n <em>Direction générale des impôts</em>." + contributors_gb_html: "<strong>Ryaume Uni</strong>: Contient des données de l'Institut Géographique National © Droits de la couronne et de la base de données 2010." + contributors_intro_html: "Notre licence CC BY-SA nécessite que vous « donniez à l’auteur d’origine\n un crédit raisonnable selon les support et moyens que vous\n utilisez ». Les cartographes individuels d’OSM ne demandent pas\n d’autre crédit supplémentaire que « les contributeurs\n d’OpenStreetMap », mais lorsque des données venant d’une agence nationale\n de cartographie ou d’une autre source majeure ont été incluses dans\n OpenStreetMap, il peut être raisonnable de les créditer directement\n de la manière qu’ils demandent ou en établissant un lien vers cette page." + contributors_nl_html: "<strong>Pays-Bas</strong>: Contient © ET données, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nouvelle-Zélande</strong> : contient des données provenant du\n <em>Land Information New Zealand</em>. © Copyright de la Couronne réservé." + contributors_pl_html: "<strong>Pologne</strong> : contient des données provenant des <a\n href=\"http://ump.waw.pl/\">cartes <em>UMP-pcPL</em></a>. © Copyright\n les contributeurs de UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n En savoir davantage sur l’utilisation par OSM des données UMP</a></li>\n <li><strong>Afrique du Sud</strong> :contient des données provenant du\n <a href=\"http://www.ngi.gov.za/\"><em>Chief Directorate:\n National Geo-Spatial Information</em></a>, copyright de l’État réservé.</li>\n <li><strong>Royaume-Uni</strong> : contient des données provenant des <em>Ordnance\n Survey data</em>. © Copyright de la Couronne et droits de base de données 2010." + contributors_title_html: Nos contributeurs + contributors_za_html: "<strong>Afrique du Sud</strong>: Contient des données issues de\n<a href=\"http://www.ngi.gov.za/\">Direction principale:\nInformation Géospatiale Nationale</a>, tous droits de l'État réservés." + credit_1_html: "Si vous utilisez les images d’OpenStreetMap, nous demandons que\n votre crédit comporte au moins la mention « © les contributeurs d’OpenStreetMap,\n CC BY-SA ». Si vous n’utilisez que les données des cartes,\n nous demandons « Données cartographiques © les contributeurs d’OpenStreetMap,\n CC BY-SA »." + credit_2_html: "Là où cela est possible, OpenStreetMap doit être mentionné avec un lien hypertexte vers <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n et CC BY-SA vers <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si\n vous utilisez un support qui ne permet pas de créer des liens hypertextes (par ex. un\n imprimé), nous suggérons que vous dirigiez vos lecteurs vers\n www.openstreetmap.org (en étendant éventuellement\n « OpenStreetMap » à cette adresse complète) et vers\n www.creativecommons.org." + credit_title_html: Comment créditer OpenStreetMap + intro_1_html: "OpenStreetMap est un ensemble de <i>données ouvertes</i>, disponibles sous la licence <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons\n paternité – partage à l’identique 2.0</a> (CC BY-SA)." + intro_2_html: "Vous êtes libre de copier, distribuer, transmettre et adapter nos cartes\n et données, à condition que vous créditiez OpenStreetMap et ses\n contributeurs. Si vous modifiez ou utilisez nos cartes ou données dans d’autres œuvres dérivées, vous\n ne pouvez distribuer celles-ci que sous la même licence. Le\n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">texte\n légal</a> complet détaille vos droits et responsabilités." + more_1_html: "Si vous voulez obtenir plus d’informations sur la réutilisation de nos données, lisez la <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n légale</a>." + more_2_html: "Nous rappelons aux contributeurs d’OSM qu’ils ne doivent jamais ajouter de données provenant de\n sources protégées par le droit d’auteur (copyright) ou des droits voisins (par ex. Google Maps ou des cartes imprimées) sans\n autorisation explicite de la part des détenteurs des droits d’auteur." + more_3_html: "Bien qu’OpenStreetMap soit un ensemble de données ouvertes, nous ne pouvons pas fournir\n d’API cartographique libre de frais pour les développeurs tiers.\n\n Consultez nos <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">règles d’utilisation de l’API</a>, nos\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">règles d’utilisation des tuiles graphiques</a>\n et nos <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">règles d’utilisation de Nominatim</a>." + more_title_html: Pour trouver plus d’informations + title_html: Copyright et Licence native: mapping_link: commencer à contribuer native_link: version française @@ -1035,10 +1099,6 @@ fr: body: Désolé, il n'y a aucun message avec cet identifiant. heading: Message introuvable title: Message introuvable - no_such_user: - body: Désolé, aucun utilisateur ne porte ce nom. - heading: Utilisateur inexistant - title: Utilisateur inexistant outbox: date: Date inbox: boîte de réception @@ -1169,7 +1229,7 @@ fr: create: flash: Informations enregistrées avec succès destroy: - flash: Enregistrements de l'application clientes détruits + flash: Enregistrement de l'application cliente supprimé edit: submit: Modifier title: Modifier votre application @@ -1211,6 +1271,8 @@ fr: allow_write_gpx: envoi trace GPS. allow_write_prefs: modifier ses préférences utilisateur. authorize_url: "URL d'autorisation :" + confirm: Êtes-vous sûr? + delete: Supprimer le client edit: Modifier les détails key: "Clé de l'utilisateur :" requests: "Demande des permission suivantes de l'utilisateur :" @@ -1220,6 +1282,37 @@ fr: url: "URL du jeton de requête :" update: flash: Informations du client enregistrées avec succès + redaction: + create: + flash: Masquage créé. + destroy: + error: Il y a eu une erreur en supprimant ce masquage. + flash: Masquage supprimé. + not_empty: Ce masquage n'est pas vide. Veuillez dé-masquer toutes les versions appartenant à ce masquage avant de le supprimer. + edit: + description: Description + heading: Modifier le masquage + submit: Enregistrer le masquage + title: Modifier le masquage + index: + empty: Aucun masquage à afficher. + heading: Liste des masquages + title: Liste des masquages + new: + description: Description + heading: Saisissez les informations sur le nouveau masquage + submit: Créer le masquage + title: Créer unn nouveau masquage + show: + confirm: Êtes-vous certain ? + description: "Description:" + destroy: Supprimer ce masquage + edit: Modifier ce masquage + heading: Masquage "%{title}" + title: Affichage du masquage + user: "Créateur :" + update: + flash: Modifications enregistrées. site: edit: anon_edits_link_text: Trouvez pourquoi ici. @@ -1234,7 +1327,6 @@ fr: index: js_1: Vous utilisez soit un navigateur qui ne supporte pas Javascript soit vous avez désactivé Javascript. js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes. - js_3: Si vous êtes dans l'incapacité d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>. license: license_name: Creative Commons paternité – partage à l’identique 2.0 notice: Sous license %{license_name} par le %{project_name} et ses contributeurs. @@ -1311,6 +1403,23 @@ fr: unclassified: Route non classifiée unsurfaced: Route non revêtue wood: Bois + markdown_help: + alt: Texte Alternatif + first: Premier élément + heading: Titre + headings: Titres + image: Image + link: Lien + ordered: Liste ordonnée + second: Second élément + subheading: Sous-titre + text: Texte + title_html: Analysé avec <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Liste non ordonnée + url: URL + richtext_area: + edit: Modifier + preview: Aperçu search: search: Recherche search_help: "exemples : « Ouagadougou », « Place Grenette, Grenoble », « H2Y 1C6 », ou « post office near Alger »<a href='http://wiki.openstreetmap.org/wiki/Search'>Autres exemples...</a>" @@ -1347,16 +1456,13 @@ fr: visibility: "Visibilité :" visibility_help: que signifie ceci ? list: + empty_html: Rien à voir par ici. <a href='%{upload_link}'>Télécharger une nouvelle trace</a> ou pour en savoir plus sur le traçage GPS, consultez la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>page wiki</a>. public_traces: Traces GPS publiques public_traces_from: Traces GPS publiques de %{user} tagged_with: " balisé avec %{tags}" your_traces: Vos traces GPS make_public: made_public: Piste rendue publique - no_such_user: - body: Désolé, aucun utilisateur ne porte le nom %{user}. Veuillez vérifier l'orthographe. Si vous avez cliqué sur un lien, celui-ci est faux. - heading: L’utilisateur %{user} n’existe pas - title: Utilisateur inexistant offline: heading: Stockage GPX hors ligne message: Le système de stockage et d'envoi des GPX est actuellement indisponible. @@ -1395,8 +1501,8 @@ fr: trace_optionals: tags: Balises trace_paging_nav: - next: Objets suivants » - previous: « Objets précédents + newer: Nouvelles traces + older: Anciennes traces showing_page: Affichage de la page %{page} view: delete_track: Supprimer cette piste @@ -1646,23 +1752,23 @@ fr: diary: journal edits: modifications email address: "Adresse email :" - friends_changesets: Parcourir tous les ensembles de modifications par des amis - friends_diaries: Parcourir toutes les entrées du journal personnel par ses amis + friends_changesets: Parcourir tous les groupes de modifications des amis + friends_diaries: Parcourir toutes les entrées de journal des amis hide_user: masquer cet utilisateur if set location: Si vous définissez un lieu, une jolie carte va apparaître en dessous. Vous pouvez définir votre lieu sur votre page %{settings_link}. km away: "%{count} km" latest edit: "Dernière modification %{ago} :" m away: distant de %{count} m mapper since: "Mappeur depuis:" - moderator_history: voir les blocages donnés + moderator_history: blocages fournis my comments: mes commentaires my diary: mon journal my edits: mes modifications my settings: mes options my traces: mes traces nearby users: Autres utilisateurs à proximité - nearby_changesets: Parcourir tous les ensembles de modifications par les utilisateurs à proximité - nearby_diaries: Parcourir toutes les entrées du journal personnel par des utilisateurs à proximité + nearby_changesets: Parcourir tous les groupes de modifications des utilisateurs à proximité + nearby_diaries: Parcourir toutes les entrées de journal des utilisateurs à proximité new diary entry: nouvelle entrée dans le journal no friends: Vous n'avez pas encore ajouté d'ami no nearby users: Aucun utilisateur n'a encore signalé qu'il cartographiait à proximité. @@ -1710,7 +1816,6 @@ fr: filter: block_expired: Le blocage a déjà expiré et ne peut pas être modifié. block_period: La période de blocage doit être choisie dans la liste déroulante. - not_a_moderator: Vous devez être modérateur pour effectuer cette action. helper: time_future: Termine à %{time}. time_past: Terminé il y a %{time}. @@ -1740,11 +1845,14 @@ fr: creator_name: Créateur display_name: Utilisateur Bloqué edit: Modifier + next: Suivant » not_revoked: (non révoqué) + previous: « Précédent reason: Motif du blocage revoke: Révoquer ! revoker_name: Révoqué par show: Afficher + showing_page: Affichage de la page %{page} status: État period: one: 1 heure diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 17704bf86..37828d5f3 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -1,4 +1,4 @@ -# Messages for Friulian (Furlan) +# Messages for Friulian (furlan) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Klenje @@ -65,7 +65,6 @@ fur: changeset: changeset: "Grup di cambiaments: %{id}" changesetxml: Grup di cambiaments XML - download: Discjame %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Grup di cambiaments %{id} title_comment: Grup di cambiaments %{id} - %{comment} @@ -124,7 +123,6 @@ fur: next_changeset_tooltip: Cambiament sucessîf di %{user} prev_changeset_tooltip: Cambiament precedent di %{user} node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Discjame XML edit: cambie node: Grop @@ -134,7 +132,6 @@ fur: coordinates: "Coordenadis:" part_of: "Part di:" node_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Discjame XML node_history: Storic dal grop node_history_title: "Storic dal grop: %{node_name}" @@ -150,7 +147,6 @@ fur: of: su showing_page: Mostrant la pagjine relation: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Discjame XML relation: Relazion relation_title: "Relazion: %{relation_name}" @@ -159,7 +155,6 @@ fur: members: "Membris:" part_of: "Part di:" relation_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Discjame XML relation_history: Storic relazion relation_history_title: "Storic de relazion: %{relation_name}" @@ -219,7 +214,6 @@ fur: relation: relazion way: vie way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Discjame XML edit: cambie view_history: cjale storic @@ -232,7 +226,6 @@ fur: nodes: "Grops:" part_of: "Part di:" way_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Discjame XML view_details: cjale i detais way_history: Storic de vie @@ -326,10 +319,6 @@ fur: no_such_entry: body: No esist une vôs dal diari o un coment cun id %{id}. Controle par plasê la grafie o che tu vedis seguît il leam just. title: La vôs dal diari no esist - no_such_user: - body: Nol esist un utent di non %{user}. Controle par plasê la grafie o che tu vedis seguît il leam just. - heading: L'utent %{user} nol esist - title: Utent no cjatât view: leave_a_comment: Lasse un coment login: Jentre @@ -487,25 +476,7 @@ fur: boundary: administrative: Confin aministratîf building: - chapel: Capele - church: Glesie - city_hall: Municipi - commercial: Edifici comerciâl - dormitory: Dormitori - entrance: Jentrade dal edifici - garage: Garage - hospital: Edifici dal ospedâl - hotel: Hotel - house: Cjase - industrial: Edifici industriâl - public: Edifici public - residential: Edifici residenziâl - school: Edifici scolastic - shop: Buteghe - stadium: Stadi - tower: Tor - train_station: Stazion de ferade - university: Edifici universitari + "yes": Edifici highway: bus_stop: Fermade autobus construction: Strade in costruzion @@ -534,7 +505,6 @@ fur: industrial: Aree industriâl military: Aree militâr mine: Miniere - mountain: Montagne nature_reserve: Riserve naturâl park: Parc quarry: Gjave @@ -558,7 +528,6 @@ fur: bay: Rade beach: Splaze channel: Canâl - coastline: Litorâl crater: Cratêr fjord: Fiort glacier: Glaçâr @@ -637,6 +606,7 @@ fur: map: base: cycle_map: Cycle Map + standard: Standard transport_map: Mape dai traspuarts site: edit_disabled_tooltip: Cres il zoom par cambiâ la mape @@ -646,6 +616,7 @@ fur: history_tooltip: Cjale i cambiaments in cheste aree history_zoom_alert: Tu scugnis cressi il zoom par viodi il storic dai cambiaments layouts: + community: Comunitât community_blogs: Blogs de comunitât community_blogs_title: Blogs di bande dai membris de comunitât OpenStreetMap copyright: Copyright & Licence @@ -667,16 +638,16 @@ fur: history: Storic home: lûc iniziâl home_tooltip: Va al lûc iniziâl - inbox: "%{count} in jentrade" inbox_tooltip: one: Al è un messaç di lei te pueste in jentrade other: A son %{count} messaçs di lei te pueste in jentrade zero: Nol è nissun messaç di lei te pueste in jentrade intro_1: OpenStreetMap al è une mape libare e modificabile dal marimont. Al è fat di int come te. - intro_2: OpenStreetMap al permet a ogni persone su la Tiere di viodi, cambiâ e doprâ i dâts gjeografics intune forme colaborative. - intro_3: "L'hosting di OpenStreetMap al è sostignût cun gjenerositât di %{ucl}, %{ic} e %{bytemark}.\nAltris sostignidôrs a son elencâts te %{partners}." - intro_3_ic: Imperial College London - intro_3_partners: vichi + intro_2_create_account: Cree il to profîl utent + intro_2_download: discjamâ + intro_2_html: I dâts si puedin liberementri %{download} e %{use} sot de lôr %{license}. %{create_account} par miorâ la mape. + intro_2_license: licence vierte + intro_2_use: doprâ license: title: I dâts di OpenStreetMap a son dâts fûr sot de Creative Commons Attribution-Share Alike 2.0 Generic License log_in: jentre @@ -690,9 +661,11 @@ fur: title: Sosten OpenStreetMap fasint une donazion monetarie osm_offline: La base di dâts di OpenStreetMap e je par cumò fûr linie parcè che o sin daûr a fâ lavôrs essenziâi di manutenzion de base di dâts. osm_read_only: La base di dâts di OpenStreetMap e je par cumò dome in leture dilunc la esecuzion di lavôrs essenziâi di manutenzion de base di dâts. + partners_html: L'hosting al è sostignût di %{ucl}, %{ic}, %{bytemark} e altris %{partners}. + partners_ic: Imperial College di Londre + partners_ucl: UCL VR Centre sign_up: regjistriti sign_up_tooltip: Cree un profîl par colaborâ - sotm2011: Ven ae Conference OpenStreetMap 2011, The State of the Map, dal 9 al 11 di Setembar a Denver! tag_line: Il WikiMapeMont libar user_diaries: Diaris dai utents user_diaries_tooltip: Viôt i diaris dai utents @@ -744,9 +717,6 @@ fur: no_such_message: heading: Messaç no cjatât title: Messaç no cjatât - no_such_user: - heading: Utent no cjatât - title: Utent no cjatât outbox: date: Date inbox: in jentrade @@ -846,7 +816,6 @@ fur: index: js_1: Tu stâs doprant un sgarfadôr che nol supuarte JavaScript o ben JavaScript al è stât disativât. js_2: OpenStreetMap al dopre JavaScript par mostrâ la sô mape. - js_3: Tu puedis provâ il <a href="http://tah.openstreetmap.org/Browse/">broser static di tiles Tiles@Home</a> se no tu rivis a ativâ JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Dât fûr sot de licence %{license_name} di %{project_name} e i siei utents che a àn contribuît. @@ -931,9 +900,6 @@ fur: public_traces_from: Percors GPS publics di %{user} tagged_with: " etichetât cun %{tags}" your_traces: Percors GPS personâi - no_such_user: - heading: L'utent %{user} nol esist - title: Utent no cjatât trace: ago: "{time_in_words_ago} indaûr" by: di @@ -964,8 +930,6 @@ fur: trace_optionals: tags: Etichetis trace_paging_nav: - next: Sucessîf » - previous: « Precedent showing_page: Daûr a mostrâ la pagjine %{page} view: delete_track: Elimine chest percors @@ -1064,6 +1028,7 @@ fur: login_button: Jentre lost password link: Password pierdude? new to osm: Sêstu gnûf su OpenStreetMap? + no account: No âstu ancjemò un profîl? openid: "%{logo} OpenID:" openid_logo_alt: Jentre cuntun OpenID openid_providers: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 2684e3bd9..93391b9c3 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1,7 +1,8 @@ -# Messages for Galician (Galego) +# Messages for Galician (galego) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Gallaecio +# Author: Nemo bis # Author: Toliño gl: activerecord: @@ -75,6 +76,8 @@ gl: application: require_cookies: cookies_needed: Semella que ten as cookies do navegador desactivadas. Actíveas antes de continuar. + require_moderator: + not_a_moderator: Cómpre ser un moderador para poder levar a cabo esa acción. setup_user_auth: blocked: O seu acceso á API foi bloqueado. Acceda ao sistema para atopar máis información na interface web. need_to_see_terms: O seu acceso á API está suspendido temporalmente. Acceda ao sistema para ollar os termos do colaborador. Non ten que aceptalos, pero debe coñecelos. @@ -82,7 +85,6 @@ gl: changeset: changeset: "Conxunto de cambios: %{id}" changesetxml: Conxunto de cambios XML - download: Descargar %{changeset_xml_link} ou %{osmchange_xml_link} feed: title: Conxunto de cambios %{id} title_comment: Conxunto de cambios %{id} - %{comment} @@ -144,21 +146,19 @@ gl: next_changeset_tooltip: Seguinte edición de %{user} prev_changeset_tooltip: Edición anterior de %{user} node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" download_xml: Descargar en XML - edit: editar + edit: Editar o nodo node: Nodo node_title: "Nodo: %{node_name}" - view_history: ver o historial + view_history: Ver o historial node_details: coordinates: "Coordenadas:" part_of: "Forma parte de:" node_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Descargar en XML node_history: Historial do nodo node_history_title: "Historial do nodo: %{node_name}" - view_details: ver os detalles + view_details: Ver os detalles not_found: sorry: Sentímolo, non se puido atopar o %{type} co id %{id}. type: @@ -169,21 +169,26 @@ gl: paging_nav: of: de showing_page: Mostrando a páxina + redacted: + message_html: A versión %{version} deste %{type} non se pode mostrar tal como foi redactada. Consulte %{redaction_link} para obter máis detalles. + redaction: Redacción %{id} + type: + node: nodo + relation: relación + way: camiño relation: - download: "%{download_xml_link} ou %{view_history_link}" download_xml: Descargar en XML relation: Relación relation_title: "Relación: %{relation_name}" - view_history: ver o historial + view_history: Ver o historial relation_details: members: "Membros:" part_of: "Forma parte de:" relation_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Descargar en XML relation_history: Historial da relación relation_history_title: "Historial da relación: %{relation_name}" - view_details: ver os detalles + view_details: Ver os detalles relation_member: entry_role: "%{type} %{name} como %{role}" type: @@ -195,14 +200,14 @@ gl: view_data: Ver os datos para a vista do mapa actual start_rjs: data_frame_title: Datos - data_layer_name: Datos + data_layer_name: Explorar os datos do mapa details: Detalles drag_a_box: Arrastre unha caixa sobre o mapa para escoller unha zona edited_by_user_at_timestamp: Editado por [[user]] o [[timestamp]] hide_areas: Agochar as zonas history_for_feature: Historial de [[feature]] load_data: Cargar os datos - loaded_an_area_with_num_features: Cargou unha zona que contén [[num_features]] funcionalidades. Pode que algúns navegadores teñan problemas para mostrar correctamente esta cantidade de datos. Xeralmente, os navegadores traballan mellor mostrando menos de 100 funcionalidades á vez. Utilizar máis pode provocar que o navegador vaia lento ou non responda. Se está seguro de que quere mostrar estes datos, pode facelo premendo no seguinte botón. + loaded_an_area_with_num_features: Cargou unha zona que contén [[num_features]] funcionalidades. Pode que algúns navegadores teñan problemas para mostrar correctamente esta cantidade de datos. Xeralmente, os navegadores traballan mellor mostrando menos de [[max_features]] funcionalidades á vez. Utilizar máis pode provocar que o navegador vaia lento ou non responda. Se está seguro de que quere mostrar estes datos, pode facelo premendo no seguinte botón. loading: Cargando... manually_select: Escoller manualmente unha zona distinta object_list: @@ -241,10 +246,9 @@ gl: relation: relación way: camiño way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" download_xml: Descargar en XML - edit: editar - view_history: ver o historial + edit: Editar o camiño + view_history: Ver o historial way: Camiño way_title: "Camiño: %{way_name}" way_details: @@ -254,9 +258,8 @@ gl: nodes: "Nodos:" part_of: "Parte de:" way_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Descargar en XML - view_details: ver os detalles + view_details: Ver os detalles way_history: Historial do camiño way_history_title: "Historial co camiño: %{way_name}" changeset: @@ -285,6 +288,8 @@ gl: description_nearby: Conxuntos de cambios dos usuarios de lugares próximos description_user: Conxuntos de cambios por %{user} description_user_bbox: Conxuntos de cambios por %{user} en %{bbox} + empty_anon_html: Aínda non se fixo ningunha edición + empty_user_html: Semella que aínda non fixo ningunha edición. Para comezar, bote unha ollada á <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>guía para principiantes</a>. heading: Conxuntos de cambios heading_bbox: Conxuntos de cambios heading_friend: Conxuntos de cambios @@ -300,6 +305,14 @@ gl: timeout: sorry: Sentímolo, a lista do conxunto de cambios solicitada tardou demasiado tempo en ser recuperada. diary_entry: + comments: + ago: hai %{ago} + comment: Comentario + has_commented_on: "%{display_name} deixou un comentario nas seguintes entradas de diario" + newer_comments: Comentarios máis recentes + older_comments: Comentarios máis vellos + post: Publicar + when: Cando diary_comment: comment_from: Comentario de %{link_user} o %{comment_created_at} confirm: Confirmar @@ -357,10 +370,6 @@ gl: body: Non existe ningunha entrada no diario ou comentario co id %{id}. Comprobe a ortografía ou que a ligazón que seguiu estea ben. heading: "Non hai ningunha entrada co id: %{id}" title: Non hai tal entrada de diario - no_such_user: - body: Non existe ningún usuario co nome "%{user}". Comprobe a ortografía ou que a ligazón que seguiu estea ben. - heading: O usuario "%{user}" non existe - title: Non existe tal usuario view: leave_a_comment: Deixar un comentario login: Acceda ao sistema @@ -393,6 +402,7 @@ gl: licence: Licenza longitude: "Lon:" manually_select: Seleccionar manualmente outra zona + map_image: Imaxe de mapa (mostra unha capa normal) max: máx. options: Opcións osm_xml_data: Datos XML do OpenStreetMap @@ -453,16 +463,28 @@ gl: suffix_place: ", %{distance} ao %{direction} de %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aeródromo + apron: Plataforma + gate: Porta + helipad: Heliporto + runway: Pista + taxiway: Vía de circulación do aeroporto + terminal: Terminal amenity: + WLAN: Acceso WiFi airport: Aeroporto arts_centre: Centro artístico + artwork: Obra de arte atm: Caixeiro automático auditorium: Auditorio bank: Banco bar: Bar + bbq: Barbacoa bench: Banco bicycle_parking: Aparcadoiro de bicicletas bicycle_rental: Aluguer de bicicletas + biergarten: Terraza brothel: Prostíbulo bureau_de_change: Casa de cambio bus_station: Estación de autobuses @@ -471,6 +493,7 @@ gl: car_sharing: Aluguer de automóbiles car_wash: Lavadoiro de coches casino: Casino + charging_station: Estación de carga cinema: Cine clinic: Clínica club: Club @@ -489,6 +512,7 @@ gl: ferry_terminal: Terminal de transbordadores fire_hydrant: Boca de incendios fire_station: Parque de bombeiros + food_court: Área de restauración fountain: Fonte fuel: Combustible grave_yard: Cemiterio @@ -529,9 +553,12 @@ gl: shelter: Abeiro shop: Tenda shopping: Comercio + shower: Ducha + social_centre: Centro social social_club: Club social studio: Estudio supermarket: Supermercado + swimming_pool: Piscina taxi: Taxi telephone: Teléfono público theatre: Teatro @@ -546,37 +573,17 @@ gl: youth_centre: Casa da xuventude boundary: administrative: Límite administrativo + census: Fronteira administrativa + national_park: Parque nacional + protected_area: Zona protexida + bridge: + aqueduct: Acueduto + suspension: Ponte colgante + swing: Ponte xiratoria + viaduct: Viaduto + "yes": Ponte building: - apartments: Bloque de apartamentos - block: Bloque de edificios - bunker: Búnker - chapel: Capela - church: Igrexa - city_hall: Concello - commercial: Edificio comercial - dormitory: Residencia universitaria - entrance: Entrada do edificio - faculty: Edificio de facultade - farm: Granxa - flats: Apartamentos - garage: Garaxe - hall: Sala de reunións - hospital: Edificio hospitalario - hotel: Hotel - house: Casa - industrial: Edificio industrial - office: Edificio de oficinas - public: Edificio público - residential: Edificio residencial - retail: Edificio comercial - school: Edificio escolar - shop: Tenda - stadium: Estadio - store: Comercio - terrace: Terraza - tower: Torre - train_station: Estación de ferrocarril - university: Complexo universitario + "yes": Construción highway: bridleway: Pista de cabalos bus_guideway: Liña de autobuses guiados @@ -584,12 +591,11 @@ gl: byway: Camiño secundario construction: Autoestrada en construción cycleway: Pista de bicicletas - distance_marker: Indicador quilométrico emergency_access_point: Punto de acceso de emerxencia footway: Carreiro ford: Vao - gate: Porta living_street: Rúa residencial + milestone: Miliario minor: Estrada lateral motorway: Autoestrada motorway_junction: Cruzamento de autovías @@ -601,14 +607,17 @@ gl: primary_link: Estrada principal raceway: Circuíto residential: Residencial + rest_area: Área de lecer road: Estrada secondary: Estrada secundaria secondary_link: Estrada secundaria service: Estrada de servizo services: Área de servizo + speed_camera: Radar steps: Chanzos stile: Escada tertiary: Estrada terciaria + tertiary_link: Estrada terciaria track: Pista trail: Pista trunk: Estrada nacional @@ -622,6 +631,7 @@ gl: building: Construción castle: Castelo church: Igrexa + fort: Forte house: Casa icon: Icona manor: Casa señorial @@ -646,6 +656,7 @@ gl: farmland: Terra de labranza farmyard: Curral forest: Bosque + garages: Garaxes grass: Herba greenfield: Terreo verde industrial: Zona industrial @@ -653,25 +664,28 @@ gl: meadow: Pradaría military: Zona militar mine: Mina - mountain: Montaña nature_reserve: Reserva natural + orchard: Horta park: Parque piste: Pista - plaza: Praza quarry: Canteira railway: Ferrocarril recreation_ground: Área recreativa reservoir: Encoro + reservoir_watershed: Conca do encoro residential: Zona residencial retail: Zona comercial + road: Zona de estrada village_green: Parque municipal vineyard: Viñedo wetland: Pantano wood: Madeira leisure: beach_resort: Balneario + bird_hide: Observatorio de aves common: Terreo común fishing: Área de pesca + fitness_station: Ximnasio garden: Xardín golf_course: Campo de golf ice_rink: Pista de patinaxe sobre xeo @@ -682,12 +696,17 @@ gl: pitch: Cancha deportiva playground: Patio de recreo recreation_ground: Área recreativa + sauna: Sauna slipway: Varadoiro sports_centre: Centro deportivo stadium: Estadio swimming_pool: Piscina track: Pista de carreiras water_park: Parque acuático + military: + airfield: Aeródromo militar + barracks: Barracas + bunker: Búnker natural: bay: Baía beach: Praia @@ -695,12 +714,13 @@ gl: cave_entrance: Entrada de cova channel: Canal cliff: Cantil - coastline: Litoral crater: Cráter + dune: Duna feature: Elemento fell: Brañal fjord: Fiorde - geyser: Géiser + forest: Bosque + geyser: Geyser glacier: Glaciar heath: Breixeira hill: Outeiro @@ -719,6 +739,7 @@ gl: scrub: Matogueira shoal: Cardume spring: Primavera + stone: Pedra strait: Estreito tree: Árbore valley: Val @@ -727,6 +748,19 @@ gl: wetland: Pantano wetlands: Pantano wood: Bosque + office: + accountant: Contable + architect: Arquitecto + company: Empresa + employment_agency: Axencia de emprego + estate_agent: Axencia inmobiliaria + government: Oficina gobernamental + insurance: Oficina de seguros + lawyer: Avogado + ngo: Oficina dunha ONG + telecommunication: Oficina de telecomunicacións + travel_agent: Axencia de viaxes + "yes": Oficina place: airport: Aeroporto city: Cidade @@ -738,6 +772,7 @@ gl: houses: Casas island: Illa islet: Illote + isolated_dwelling: Vivenda illada locality: Localidade moor: Páramo municipality: Municipio @@ -761,6 +796,7 @@ gl: junction: Unión de vías ferroviarias level_crossing: Paso a nivel light_rail: Metro lixeiro + miniature: Ferrocarril en miniatura monorail: Monorraíl narrow_gauge: Vía ferroviaria estreita platform: Plataforma ferroviaria @@ -775,7 +811,7 @@ gl: yard: Estación de clasificación shop: alcohol: Tenda de licores - apparel: Tenda de roupa + antiques: Tenda de antigüidades art: Tenda de arte bakery: Panadaría beauty: Tenda de produtos de beleza @@ -784,7 +820,6 @@ gl: books: Libraría butcher: Carnizaría car: Concesionario - car_dealer: Concesionario de automóbiles car_parts: Recambios de automóbil car_repair: Taller mecánico carpet: Tenda de alfombras @@ -799,7 +834,6 @@ gl: department_store: Gran almacén discount: Tenda de descontos doityourself: Tenda de bricolaxe - drugstore: Farmacia dry_cleaning: Limpeza en seco electronics: Tenda de electrónica estate_agent: Axencia inmobiliaria @@ -865,7 +899,10 @@ gl: valley: Val viewpoint: Miradoiro zoo: Zoolóxico + tunnel: + "yes": Túnel waterway: + artificial: Vía fluvial artificial boatyard: Estaleiro canal: Canal connector: Conexión de vía de auga @@ -891,6 +928,7 @@ gl: base: cycle_map: Mapa ciclista mapquest: MapQuest Open + standard: Estándar transport_map: Mapa de transporte site: edit_disabled_tooltip: Achegue para editar o mapa @@ -900,6 +938,7 @@ gl: history_tooltip: Ollar as edicións feitas nesta zona history_zoom_alert: Debe achegarse para ollar as edicións nesta zona layouts: + community: Comunidade community_blogs: Blogues da comunidade community_blogs_title: Blogues de membros da comunidade do OpenStreetMap copyright: Dereitos de autor e licenza @@ -921,16 +960,17 @@ gl: history: Historial home: inicio home_tooltip: Ir ao meu domicilio - inbox: caixa de entrada (%{count}) + inbox_html: caixa de entrada %{count} inbox_tooltip: one: A súa caixa de entrada contén 1 mensaxe sen ler other: A súa caixa de entrada contén %{count} mensaxes sen ler zero: Non hai mensaxes novas na súa caixa de entrada intro_1: O OpenStreetMap é un mapa libre de todo o mundo que se pode editar. Está feito por xente coma vostede. - intro_2: O OpenStreetMap permítelle ver, editar e usar datos xeográficos de xeito colaborativo de calquera lugar do mundo. - intro_3: O almacenamento do OpenStreetMap é proporcionado amablemente por %{ucl}, %{ic} e %{bytemark}. O resto de patrocinadores están listados no %{partners}. - intro_3_ic: Imperial College London - intro_3_partners: wiki + intro_2_create_account: Cree unha conta de usuario + intro_2_download: descargar + intro_2_html: Os datos pódense %{download} e %{use} de xeito libre baixo unha %{license}. %{create_account} para mellorar o mapa. + intro_2_license: licenza aberta + intro_2_use: utilizar license: title: Os datos do OpenStreetMap están licenciados baixo a licenza Creative Commons recoñecemento xenérico 2.0 log_in: rexistro @@ -944,9 +984,14 @@ gl: title: Apoie o OpenStreetMap cunha doazón osm_offline: A base de datos do OpenStreetMap atópase desconectada mentres realizamos traballos de mantemento nela. osm_read_only: A base de datos do OpenStreetMap atópase en modo de só lectura mentres realizamos traballos de mantemento nela. + partners_bytemark: Bytemark Hosting + partners_html: O aloxamento é posible grazas ao %{ucl}, %{ic} e %{bytemark}, e outros %{partners}. + partners_ic: Imperial College London + partners_partners: socios + partners_ucl: centro de realidade virtual do UCL sign_up: rexistrarse sign_up_tooltip: Crear unha conta para editar - sotm2011: Veña á conferencia do OpenStreetMap de 2011, O estado do mapa, do 9 ao 11 de setembro en Denver! + sotm2012: Veña á conferencia do OpenStreetMap de 2012, O estado do mapa, do 6 ao 8 de setembro en Toquio! tag_line: O mapa mundial libre user_diaries: Diarios de usuario user_diaries_tooltip: Ollar os diarios do usuario @@ -961,7 +1006,30 @@ gl: english_link: a orixinal en inglés text: En caso de conflito entre esta páxina traducida e %{english_original_link}, a páxina en inglés prevalecerá title: Acerca desta tradución - legal_babble: "<h2>Dereitos de autor e licenza</h2>\n<p>\n O OpenStreetMap é de <i>datos abertos</i> e atópase baixo a licenza <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons recoñecemento compartir igual 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos mapas\n e datos, na medida en que acredite o OpenStreetMap e mais os seus\n colaboradores. Se altera ou constrúe a partir dos nosos mapas ou datos, terá\n que distribuír o resultado baixo a mesma licenza. O\n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">texto\n legal</a> ao completo explica os seus dereitos e responsabilidades.\n</p>\n\n<h3>Como acreditar o OpenStreetMap</h3>\n<p>\n Se está a empregar imaxes dos mapas do OpenStreetMap, pedímoslle que\n acredite o traballo con, polo menos: “© dos colaboradores do\n OpenStreetMap, CC-BY-SA”. Se tan só emprega datos dos mapas,\n pedímoslle que inclúa: “Datos do mapa © dos colaboradores do OpenStreetMap,\n CC-BY-SA”.\n</p>\n<p>\n Onde sexa posible, debe haber unha ligazón ao OpenStreetMap cara a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n e ao CC-BY-SA cara a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Se\n fai uso dun medio que non permite as ligazóns (por exemplo, unha\n obra impresa), suxerimos que dirixa os lectores cara a\n www.openstreetmap.org (quizais expandindo\n “OpenStreetMap“ ao enderezo ao completo) e cara a\n www.creativecommons.org.\n</p>\n\n<h3>Máis información</h3>\n<p>\n Descubra máis sobre como empregar os nosos datos nas <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">preguntas máis frecuentes\n sobre asuntos legais</a>.\n</p>\n<p>\n Lembramos aos colaboradores do OSM que nunca engadan datos de\n fontes con dereitos de autor (por exemplo, o Google Maps ou mapas impresos) sen\n o permiso explícito dos posuidores deses dereitos.\n</p>\n<p>\n Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un\n mapa API gratuíto aos desenvolvedores.\n\n Vexa a <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">política de uso da API</a>,\n a <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">política de uso de cuadrantes</a>\n e a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">política de uso do Nominatim</a>.\n</p>\n\n<h3>Os nosos colaboradores</h3>\n<p>\n A nosa licenza CC-BY-SA necesita que “dea crédito ao autor\n orixinal de xeito razoable segundo o medio ou medios que estea a\n utilizar”. Os usuarios individuais do OSM non solicitan outro\n crédito ca “colaboradores do OpenStreetMap”,\n pero en caso de inclusión de datos dunha axencia nacional ou\n outra fonte maior, pode ser razoable acreditalos reproducindo\n directamente o seu crédito ou ligando cara a el nesta páxina.\n</p>\n\n<!--\nInformación para os editores da páxina\n\nNa seguinte lista aparecen aquelas organizacións que necesitan\nrecoñecemento como condición para que se usen os seus datos no\nOpenStreetMap. Non se trata dun catálogo xeral de importacións,\ne non se debe empregar agás cando o recoñecemento se necesite\npara cumprir coa licenza dos datos importados.\n\nAs adicións deben debaterse primeiro cos administradores do OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia:</strong> Contén datos de barrios baseados\n nos datos do Australian Bureau of Statistics.</li>\n <li><strong>Austria:</strong> Contén datos de\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> baixo a licenza\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Canadá:</strong> Contén datos de\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada) e StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Francia:</strong> Contén datos con orixe na\n Direction Générale des Impôts.</li>\n <li><strong>Nova Zelandia:</strong> Contén datos con orixe no\n Land Information New Zealand. Dereitos de autor da coroa.</li>\n <li><strong>Polonia:</strong> Contén datos dos <a\n href=\"http://ump.waw.pl/\">mapas UMP-pcPL</a>. Dereitos de autor\n dos colaboradores do UMP-pcPL.</li>\n <li><strong>Reino Unido:</strong> Contén datos da Ordnance\n Survey © Dereitos de autor da coroa e dereitos da base de datos\n 2010.</li>\n</ul>\n\n<p>\n A inclusión de datos no OpenStreetMap non implica que o que\n orixinalmente proporcionou os datos apoie o OpenStreetMap,\n dea calquera garantía ou acepte calquera responsabilidade.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria:</strong> Contén datos de\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (baixo a licenza\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> e\nLand Tirol (baixo a licenza <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT con emendas</a>)." + contributors_au_html: "<strong>Australia:</strong> Contén datos de barrios baseados\nnos datos do Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canadá:</strong> Contén datos de\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) e StatCan (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: "Para obter máis información sobre estas e outras fontes usadas\npara axudar na mellora do OpenStreetMap, bote unha ollada á <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">páxina dos\ncolaboradores</a> no wiki do OpenStreetMap." + contributors_footer_2_html: "A inclusión de datos no OpenStreetMap non implica que o que\norixinalmente proporcionou os datos apoie o OpenStreetMap,\ndea calquera garantía ou acepte calquera responsabilidade." + contributors_fr_html: "<strong>Francia:</strong> Contén datos con orixe na\nDirection Générale des Impôts." + contributors_gb_html: "<strong>Reino Unido:</strong> Contén datos da Ordnance\nSurvey © Dereitos de autor da coroa e dereitos da base de datos\n2010." + contributors_intro_html: "A nosa licenza CC BY-SA necesita que “dea crédito ao autor\norixinal de xeito razoable segundo o medio ou medios que estea a\nutilizar”. Os usuarios individuais do OSM non solicitan outro\ncrédito ca “colaboradores do OpenStreetMap”,\npero en caso de inclusión de datos dunha axencia nacional ou\noutra fonte maior, pode ser razoable acreditalos reproducindo\ndirectamente o seu crédito ou ligando cara a el nesta páxina." + contributors_nl_html: "<strong>Países Baixos:</strong> Contén datos de © AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nova Zelandia:</strong> Contén datos con orixe no\nLand Information New Zealand. Dereitos de autor da coroa." + contributors_pl_html: "<strong>Polonia:</strong> Contén datos dos <a\nhref=\"http://ump.waw.pl/\">mapas UMP-pcPL</a>. Dereitos de autor\ndos colaboradores do UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nMáis información sobre o uso que fai o OSM dos datos do UMP</a>" + contributors_title_html: Os nosos colaboradores + contributors_za_html: "<strong>Sudáfrica:</strong> Contén datos con orixe no\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, dereitos de autor do estado reservados." + credit_1_html: "Se está a empregar imaxes dos mapas do OpenStreetMap, pedímoslle que\nacredite o traballo con, polo menos: “© dos colaboradores do\nOpenStreetMap, CC BY-SA”. Se tan só emprega datos dos mapas,\npedímoslle que inclúa: “Datos do mapa © dos colaboradores do OpenStreetMap,\nCC BY-SA”." + credit_2_html: "Onde sexa posible, debe haber unha ligazón ao OpenStreetMap cara a <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\ne ao CC BY-SA cara a <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Se\nfai uso dun medio que non permite as ligazóns (por exemplo, unha\nobra impresa), suxerimos que dirixa os lectores cara a\nwww.openstreetmap.org (quizais expandindo\n“OpenStreetMap“ ao enderezo ao completo) e cara a\nwww.creativecommons.org." + credit_title_html: Como acreditar o OpenStreetMap + intro_1_html: "O OpenStreetMap é de <i>datos abertos</i> e atópase baixo a licenza <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons recoñecemento compartir igual 2.0</a> (CC BY-SA)." + intro_2_html: "Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos mapas\ne datos, na medida en que acredite o OpenStreetMap e mais os seus\ncolaboradores. Se altera ou constrúe a partir dos nosos mapas ou datos, terá\nque distribuír o resultado baixo a mesma licenza. O\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">texto\nlegal</a> ao completo explica os seus dereitos e responsabilidades." + more_1_html: "Descubra máis sobre como empregar os nosos datos nas <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">preguntas máis frecuentes\nsobre asuntos legais</a>." + more_2_html: "Lembramos aos colaboradores do OSM que nunca engadan datos de\nfontes con dereitos de autor (por exemplo, o Google Maps ou mapas impresos) sen\no permiso explícito dos posuidores deses dereitos." + more_3_html: "Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un\nmapa API gratuíto aos desenvolvedores.\nVexa a <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">política de uso da API</a>,\na <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">política de uso de cuadrantes</a>\ne a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">política de uso do Nominatim</a>." + more_title_html: Máis información + title_html: Dereitos de autor e licenza native: mapping_link: comezar a contribuír native_link: versión en galego @@ -1007,10 +1075,6 @@ gl: body: Non hai ningunha mensaxe con esa id. heading: Non se atopou a mensaxe title: Non se atopou a mensaxe - no_such_user: - body: Non hai ningún usuario con ese nome. - heading: Non se atopou o usuario - title: Non se atopou o usuario outbox: date: Data inbox: caixa de entrada @@ -1182,6 +1246,8 @@ gl: allow_write_gpx: cargar pistas GPS. allow_write_prefs: modificar as súas preferencias de usuario. authorize_url: "Autorizar o URL:" + confirm: Está seguro? + delete: Borrar o cliente edit: Editar os detalles key: "Clave do consumidor:" requests: "Solicitar os seguintes permisos ao usuario:" @@ -1191,6 +1257,37 @@ gl: url: "Solicitar un URL de pase:" update: flash: Actualizou correctamente a información do cliente + redaction: + create: + flash: Redacción creada. + destroy: + error: Houbo un erro ao destruír esta redacción. + flash: Redacción destruída. + not_empty: A redacción non está baleira. Elimine todas as versións previas pertencentes a esta redacción antes de destruíla. + edit: + description: Descrición + heading: Editar a redacción + submit: Gardar a redacción + title: Editar a redacción + index: + empty: Non hai ningunha redacción que mostrar. + heading: Lista de redaccións + title: Lista de redaccións + new: + description: Descrición + heading: Escriba a información da nova redacción + submit: Crear a redacción + title: Creando unha nova redacción + show: + confirm: Está seguro? + description: "Descrición:" + destroy: Eliminar esta redacción + edit: Editar esta redacción + heading: Mostrando a redacción "%{title}" + title: Mostrando a redacción + user: "Creador:" + update: + flash: Gardáronse os cambios. site: edit: anon_edits_link_text: Descubra aquí o motivo. @@ -1205,7 +1302,6 @@ gl: index: js_1: Está a usar un navegador que non soporta o JavaScript ou teno desactivado. js_2: O OpenStreetMap emprega JavaScript para o seu mapa estático e dinámico. - js_3: Quizais queira probar o <a href="http://tah.openstreetmap.org/Browse/">navegador estático Tiles@Home</a> se non consegue activar o JavaScript. license: license_name: Creative Commons recoñecemento compartir igual 2.0 notice: Baixo a licenza %{license_name} polo %{project_name} e os seus colaboradores. @@ -1282,6 +1378,23 @@ gl: unclassified: Estrada sen clasificar unsurfaced: Estrada non pavimentada wood: Bosque + markdown_help: + alt: Texto alternativo + first: Primeiro elemento + heading: Cabeceira + headings: Cabeceiras + image: Imaxe + link: Ligazón + ordered: Lista ordenada + second: Segundo elemento + subheading: Subcabeceira + text: Texto + title_html: Analizado con <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Lista sen ordenar + url: URL + richtext_area: + edit: Editar + preview: Vista previa search: search: Procurar search_help: "exemplos: \"Santiago de Compostela\", \"rúa Rosalía de Castro, Vigo\" ou \"oficinas postais preto de Mondoñedo\" <a href='http://wiki.openstreetmap.org/wiki/Search'>máis exemplos...</a>" @@ -1293,7 +1406,7 @@ gl: search_results: Resultados da procura time: formats: - friendly: "%e %B %Y ás %H:%M" + friendly: "%e de %B de %Y ás %H:%M" trace: create: trace_uploaded: O seu ficheiro GPX foi cargado e está pendente de inserción na base de datos. Isto adoita ocorrer nun período de tempo de media hora. Recibirá un correo electrónico cando remate. @@ -1318,16 +1431,13 @@ gl: visibility: "Visibilidade:" visibility_help: que significa isto? list: + empty_html: Aínda non hai nada por aquí. <a href='%{upload_link}'>Cargue unha nova pista</a> ou obteña máis información sobre as pistas GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina do wiki</a>. public_traces: Pistas GPS públicas public_traces_from: Pistas GPS públicas de %{user} tagged_with: " etiquetadas con %{tags}" your_traces: As súas pistas GPS make_public: made_public: Pista feita pública - no_such_user: - body: Non existe ningún usuario co nome "%{user}". Comprobe a ortografía ou que a ligazón que seguiu estea ben. - heading: O usuario "%{user}" non existe - title: Non existe tal usuario offline: heading: Almacenamento GPX fóra de liña message: O sistema de carga e almacenamento de ficheiros GPX non está dispoñible. @@ -1366,9 +1476,9 @@ gl: trace_optionals: tags: Etiquetas trace_paging_nav: - next: Seguinte » - previous: « Anterior - showing_page: Mostrando a páxina "%{page}" + newer: Pistas máis novas + older: Pistas máis antigas + showing_page: Mostrando a páxina %{page} view: delete_track: Borrar esta pista description: "Descrición:" @@ -1483,6 +1593,7 @@ gl: login_button: Acceder ao sistema lost password link: Perdeu o seu contrasinal? new to osm: É novo no OpenStreetMap? + no account: Non está rexistrado? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Máis información acerca do cambio na licenza do OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traducións</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">conversa</a>) notice_terms: OpenStreetMap pasa a usar unha licenza nova o 1 de abril de 2012. É igual de aberta que a actual, pero algunhas partes desta nova licenza acáenlle mellor á nosa base de datos. Gustaríanos manter as súas contribucións, pero unicamente podemos facelo se acepta que as distribuamos baixo esta nova licenza. En caso contrario, teremos que eliminalos da base de datos.<br /><br />Acceda ao sistema, revise con calma e acepte os novos termos. Grazas! openid: "%{logo} OpenID:" @@ -1601,6 +1712,7 @@ gl: block_history: ver os bloqueos recibidos blocks by me: bloqueos efectuados blocks on me: os meus bloqueos + comments: comentarios confirm: Confirmar confirm_user: confirmar este usuario create_block: bloquear este usuario @@ -1624,6 +1736,7 @@ gl: m away: a %{count}m de distancia mapper since: "Cartógrafo desde:" moderator_history: ver os bloqueos dados + my comments: os meus comentarios my diary: o meu diario my edits: as miñas edicións my settings: os meus axustes @@ -1678,7 +1791,6 @@ gl: filter: block_expired: O bloqueo xa caducou. Non se pode editar. block_period: O período de bloqueo debe elixirse de entre os valores presentes na lista despregable. - not_a_moderator: Cómpre ser un moderador para poder levar a cabo esa acción. helper: time_future: Remata en %{time}. time_past: Rematou hai %{time}. @@ -1708,11 +1820,14 @@ gl: creator_name: Creador display_name: Usuario bloqueado edit: Editar + next: Seguinte » not_revoked: (non revogado) + previous: « Anterior reason: Motivo para o bloqueo revoke: Revogar! revoker_name: Revogado por show: Mostrar + showing_page: Mostrando a páxina %{page} status: Estado period: one: 1 hora diff --git a/config/locales/he.yml b/config/locales/he.yml index b9627b432..8ba680ce7 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -4,8 +4,11 @@ # Author: Amire80 # Author: Aude # Author: Deror avi +# Author: Ex-Diktator # Author: GilCahana +# Author: Inkbug # Author: Itay naor +# Author: Nemo bis # Author: YaronSh # Author: תומר ט he: @@ -80,6 +83,8 @@ he: application: require_cookies: cookies_needed: נראה שהעוגיות כבויות אצלך – נא להפעיל עוגיות בדפדפן שלך כדי להמשיך. + require_moderator: + not_a_moderator: צריל להיות מנחה כדי לבצע את הפעולה הזאת. setup_user_auth: blocked: גישתך ל־API נחסמה. נא להיכנס לממשק הווב למידע נוסף. need_to_see_terms: גישתך ל־API מושעית זמנית. נא להיכנס לאתר כדי לצפות בתנאי התרומה. אין צורך לקבל אותם, אבל חובה להציג אותם. @@ -87,7 +92,6 @@ he: changeset: changeset: "ערכת שינויים: %{id}" changesetxml: XML של ערכת שינויים - download: הורדת %{changeset_xml_link} או %{osmchange_xml_link} feed: title: ערכת שינויים %{id} title_comment: ערכת שינויים %{id} – %{comment} @@ -100,13 +104,13 @@ he: closed_at: "נסגרה ב:" created_at: "נוצר בתאריך:" has_nodes: - one: מחזיק בצומת אחד + one: "מחזיק בצומת אחד:" other: "מחזיק ב־%{count} צמתים:" has_relations: - one: מחזיק ביחס אחד + one: "מחזיק ביחס אחד:" other: "מחזיק ב־%{count} יחסים:" has_ways: - one: מחזיק בדרך אחת + one: "מחזיק בדרך אחת:" other: "מחזיק ב־%{count} דרכים:" no_bounding_box: לא נשמרה תיבה תוחמת עבור ערכת השינויים הזאת. show_area_box: הצגת תיבת אזור @@ -149,9 +153,8 @@ he: next_changeset_tooltip: העריכה הבאה של %{user} prev_changeset_tooltip: העריכה הקודמת של %{user} node: - download: "%{download_xml_link} או %{view_history_link}" download_xml: הורדת XML - edit: עריכה + edit: עריכת צומת node: צומת node_title: "צומת: %{node_name}" view_history: צפייה בהיסטוריה @@ -159,7 +162,6 @@ he: coordinates: "נקודות ציון:" part_of: "חלק מתוך:" node_history: - download: "%{download_xml_link} או %{view_details_link}" download_xml: הורדת XML node_history: היסטוריית הצומת node_history_title: "היסטוריית הצומת: %{node_name}" @@ -174,17 +176,22 @@ he: paging_nav: of: מתוך showing_page: הצגת דף + redacted: + message_html: "לא ניתן להציג את הגרסה %{version} של %{type} מכיוון שהיא נחתכה. למידע נוסף: %{redaction_link}." + redaction: חיתוך %{id} + type: + node: צומת + relation: יחס + way: דרך relation: - download: "%{download_xml_link} או %{view_history_link}" download_xml: הורדת XML relation: יחס relation_title: "יחס: %{relation_name}" - view_history: לצפייה בהיסטוריה + view_history: צפייה בהיסטוריה relation_details: members: "איברים:" part_of: "חלק מתוך:" relation_history: - download: "%{download_xml_link} או %{view_details_link}" download_xml: הורדת XML relation_history: היסטוריית היחס relation_history_title: "היסטוריית היחס: %{relation_name}" @@ -200,14 +207,14 @@ he: view_data: לצפייה במידע עבור התצוגה הנוכחית של המפה start_rjs: data_frame_title: נתונים - data_layer_name: נתונים + data_layer_name: עיון בנתוני מפה details: פרטים drag_a_box: נא לגרור את התיבה על המפה כדי לבחור אזור edited_by_user_at_timestamp: נערך על־ידי [[user]] ב־[[timestamp]] hide_areas: להסתרת אזורים history_for_feature: ההיסטוריה של [[feature]] load_data: טעינת נתונים - loaded_an_area_with_num_features: "האזור שנטען מכיל [[num_features]] תכונות. באופן כללי, חלק מהדפדפנים לא יוכלו להתמודד עם הצגה של כזו כמות של נתונים. לרוב, דפדפנים עובדים באופן מיטבי בהצגת פחות מ־100 תכונות בו־זמנית: ביצוע משימות נוספות עלול לגרום לדפדפן לפעול באופן איטי או להיתקע. אם ברצונך בכל זאת להציג מידע זה, באפשרותך להציג אותו בלחיצה על הכפתור למטה." + loaded_an_area_with_num_features: "האזור שנטען מכיל [[num_features]] תכונות. באופן כללי, חלק מהדפדפנים לא יוכלו להתמודד עם הצגה של כזו כמות של נתונים. לרוב, דפדפנים עובדים באופן מיטבי בהצגת פחות מ־[[max_features]] תכונות בו־זמנית: ביצוע משימות נוספות עלול לגרום לדפדפן לפעול באופן איטי או להיתקע. אם ברצונך בכל זאת להציג מידע זה, באפשרותך להציג אותו בלחיצה על הכפתור למטה." loading: בטעינה... manually_select: בחירת אזור אחר ידנית object_list: @@ -246,9 +253,8 @@ he: relation: קשר way: דרך way: - download: "%{download_xml_link} או %{view_history_link}" download_xml: הורדת XML - edit: עריכה + edit: עריכת דרך view_history: צפייה בהיסטוריה way: דרך way_title: "דרך: %{way_name}" @@ -259,7 +265,6 @@ he: nodes: "צמתים:" part_of: "חלק מתוך:" way_history: - download: "%{download_xml_link} או %{view_details_link}" download_xml: הורדת XML view_details: צפייה בפרטים way_history: היסטוריית הדרך @@ -290,6 +295,8 @@ he: description_nearby: ערכות שינויים של משתמשים בסביבה description_user: ערכות שינויים של %{user} description_user_bbox: ערכות שינויים של %{user} בתוך %{bbox} + empty_anon_html: עוד לא נעשו עריכות + empty_user_html: נראה שעוד לא ערכת דבר. כדי להתחיל, ר' <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>מדריך למתחילים</a>. heading: ערכות שינויים heading_bbox: ערכות שינויים heading_friend: ערכות שינויים @@ -370,10 +377,6 @@ he: body: סליחה, עדיין אין רשומת יומן או תגובה עם המזהה %{id}. אולי האיות לא נכון ואולי לחצת על קישור שגוי. heading: "אין רשומה עם המזהה: %{id}" title: אין כזו רשומה ביומן - no_such_user: - body: סליחה, אין חשבון בשם %{user}. אולי האיות לא נכון ואולי לחצת על קישור שגוי. - heading: המשתמש %{user} אינו קיים - title: אין משתמש כזה view: leave_a_comment: הוספת תגובה login: להיכנס @@ -467,16 +470,28 @@ he: suffix_place: ", %{distance} מ%{direction} ל־%{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: מנחת + apron: רחבת חניה + gate: שער + helipad: מנחת מסוקים + runway: מסלול המראה + taxiway: מסלול נסיעת מטוס + terminal: מסוף amenity: + WLAN: גישת WiFi airport: שדה תעופה arts_centre: מרכז אמנויות + artwork: יצירת אמנות atm: כספומט auditorium: אודיטוריום bank: בנק bar: בר + bbq: מנגל bench: ספסל bicycle_parking: חניית אופניים bicycle_rental: השכרת אופניים + biergarten: גינת בירה brothel: בית בושת bureau_de_change: חלפן כספים bus_station: תחנת אוטובוס @@ -485,6 +500,7 @@ he: car_sharing: נקודת שיתוף רכבים car_wash: שטיפת מכוניות casino: קזינו + charging_station: תחנת הטענה cinema: בית קולנוע clinic: מרפאה club: מועדון @@ -503,6 +519,7 @@ he: ferry_terminal: מסוף מעבורת fire_hydrant: ברז כיבוי אש fire_station: תחנת כיבוי אש + food_court: אזור מזון מהיר fountain: מזרקה fuel: דלק grave_yard: בית קברות @@ -543,9 +560,12 @@ he: shelter: מחסה shop: חנות shopping: קניות + shower: מקלחת + social_centre: מרכז חברתי social_club: מועדון studio: סטודיו supermarket: סופרמרקט + swimming_pool: ברֵכת שחייה taxi: מונית telephone: טלפון ציבורי theatre: תיאטרון @@ -560,37 +580,17 @@ he: youth_centre: מרכז נוער boundary: administrative: גבול שטח שיפוט + census: גבול מפקד אוכלוסין + national_park: פארק לאומי + protected_area: אזור מוגן + bridge: + aqueduct: אמת מים + suspension: גשר תלוי + swing: גשר סובב + viaduct: אובל + "yes": גשר building: - apartments: בית דירות - block: אבן בניין - bunker: בונקר - chapel: קפלה - church: כנסייה - city_hall: בניין עירייה - commercial: בניין מסחרי - dormitory: מעונות - entrance: כניסה לבניין - faculty: בניין פקולטה - farm: חווה - flats: דירות - garage: מוסך - hall: בניין - hospital: בית חולים - hotel: מלון - house: בית - industrial: בניין תעשייתי - office: בניין משרדים - public: בניין ציבורי - residential: בניין מגורים - retail: בניין מסחרי - school: בית ספר - shop: חנות - stadium: אצטדיון - store: חנות - terrace: מרפסת פתוחה - tower: מגדל - train_station: תחנת רכבת - university: אוניברסיטה + "yes": בניין highway: bridleway: שביל עבור סוסים bus_guideway: נתיב תחבורה ציבורית מונחית @@ -598,12 +598,11 @@ he: byway: דרך צדית construction: דרך ראשית בבנייה cycleway: נתיב אופניים - distance_marker: סמן מרחק emergency_access_point: נקודת גישה לשירותי חירום footway: שביל להולכי רגל ford: מעברה (נקודת חציית נהר) - gate: שער living_street: רחוב + milestone: אבן דרך minor: דרך צדית motorway: כביש motorway_junction: צומת כבישים @@ -615,14 +614,17 @@ he: primary_link: כביש ראשי raceway: מסלול מרוצים residential: מגורים + rest_area: אזור מנוחה road: דרך secondary: דרך משנית secondary_link: דרך משנית service: כביש שירות services: שירותי דרך + speed_camera: מצלמת מהירות steps: מדרגות stile: מעבר מעל גדר tertiary: דרך צדית + tertiary_link: דרך שלישונית track: מסלול מרוצים trail: שביל trunk: דרך ראשית @@ -636,6 +638,7 @@ he: building: בניין castle: טירה church: כנסייה + fort: מעוז house: בית icon: איקונין manor: אחוזה @@ -660,6 +663,7 @@ he: farmland: שטח חקלאי farmyard: חצר חווה forest: יער + garages: מוסכים grass: דשא greenfield: שטחים ירוקים industrial: אזור תעשייה @@ -667,25 +671,28 @@ he: meadow: אחו military: שטח צבאי mine: מכרה - mountain: הר nature_reserve: שמורת טבע + orchard: פרדס park: פארק piste: מסלול סקי - plaza: רחבה quarry: מחצבה railway: מסילת ברזל recreation_ground: שטחי נופש ופנאי reservoir: מאגר + reservoir_watershed: פרשת מים של מאגר residential: אזור מגורים retail: קמעונאי + road: אזור דרך village_green: כיכר הכפר vineyard: כרם wetland: מלחה wood: חורשה leisure: beach_resort: אתר נופש לחוף ים + bird_hide: מצפור common: שטח משותף fishing: אזור דיג + fitness_station: תחנת כושר garden: גן golf_course: מגרש גולף ice_rink: גלישה על הקרח @@ -696,12 +703,17 @@ he: pitch: מגרש ספורט playground: מגרש משחקים recreation_ground: שטחי נופש ופנאי + sauna: סאונה slipway: ממשה sports_centre: מרכז ספורט stadium: אצטדיון - swimming_pool: ברֵכת שחיה + swimming_pool: ברֵכת שחייה track: מסלול ריצה water_park: פארק מים + military: + airfield: מנחת צבאי + barracks: מגורי חיילים + bunker: בונקר natural: bay: מפרץ beach: חוף רחצה @@ -709,11 +721,12 @@ he: cave_entrance: כניסה למערה channel: תעלה cliff: מצוק - coastline: קו חוף crater: מכתש + dune: חולית feature: תכונה fell: הר המתנשא מעל היערות סביבו fjord: פיורד + forest: יער geyser: גייזר glacier: קרחון heath: בתה @@ -733,6 +746,7 @@ he: scrub: ערבה shoal: שרטון spring: מעיין + stone: אבן strait: מצר tree: ×¢×¥ valley: עמק @@ -741,6 +755,19 @@ he: wetland: מלחה wetlands: מלחות wood: יער + office: + accountant: רואה חשבון + architect: אדריכל + company: חברה + employment_agency: סוכנות תעסוקה + estate_agent: מתווך נדל״ן + government: לשכה ממשלתית + insurance: משרד ביטוח + lawyer: עורך דין + ngo: משרד מוסד לא ממשלתי + telecommunication: משרד תקשורת אלקטרונית + travel_agent: סוכנות נסיעות + "yes": משרד place: airport: נמל תעופה city: עיר @@ -752,6 +779,7 @@ he: houses: בתים island: אי islet: איוֹן + isolated_dwelling: מגורים מבודדים locality: יישוב moor: אדמת כבול municipality: עירייה @@ -775,6 +803,7 @@ he: junction: מפגש מסילות ברזל level_crossing: מפגש מסילת ברזל וכביש light_rail: רכבת קלה + miniature: רכבת זעירה monorail: רכבת חד־פסית narrow_gauge: מסילת רכבת צרה platform: רציף רכבת @@ -789,7 +818,7 @@ he: yard: מוסך רכבות shop: alcohol: חנות לממכר משקאות אלכוהוליים - apparel: חנות בגדים + antiques: עתיקות art: חנות חפצי אמנות bakery: מאפייה beauty: סלון יופי @@ -798,7 +827,6 @@ he: books: חנות ספרים butcher: קצב car: חנות כלי רכב - car_dealer: סוחר כלי רכב car_parts: חלקי רכב car_repair: מוסך carpet: חנות שטיחים @@ -813,7 +841,6 @@ he: department_store: כלבו discount: חנות מוזלת doityourself: חנות עשה־זאת־בעצמך - drugstore: בית מרקחת dry_cleaning: ניקוי יבש electronics: חנות אלקטרוניקה estate_agent: מתווך נדל״ן @@ -879,7 +906,10 @@ he: valley: עמק viewpoint: נקודת תצפית zoo: גן חיות + tunnel: + "yes": מנהרה waterway: + artificial: נתיב מים מלאכותי boatyard: מספנה canal: תעלה connector: נקודת חיבור בין נתיבי מים @@ -916,6 +946,7 @@ he: history_tooltip: הצגת עריכות עבור אזור זה history_zoom_alert: יש לקרב כדי להציג עריכות עבור אזור זה layouts: + community: קהילה community_blogs: בלוגים של הקהילה community_blogs_title: בלוגים של חברי קהילת OpenStreetMap copyright: זכויות יוצרים ורישיון @@ -937,16 +968,18 @@ he: history: היסטוריה home: הביתה home_tooltip: מעבר למיקום הבית - inbox: תיבת דואר נכנס (%{count}) + inbox_html: דואר נכנס %{count} inbox_tooltip: one: תיבת הדואר הנכנס שלכם מכילה הודעה אחת שלא נקראה other: תיבת הדואר הנכנס שלכם מכילה %{count} הודעות שלא נקראו zero: תיבת הדואר הנכנס שלכם אינה מכילה הודעות שלא נקראו intro_1: OpenStreetMap היא מפה חופשית של כל העולם, שכל אחד יכול לערוך. יוצרים אותה אנשים כמוך. - intro_2: מיזם OpenStreetMap מאפשר לך לצפות בנתונים גאוגרפיים וכן לערוך אותם ולהשתמש בהם בצורה שיתופית מכל מקום בעולם. - intro_3: "אתר OpenStreetMap מוצג בחסות %{ucl}‏, %{ic} ו־%{bytemark}. למידע על נותני חסות נוספים של הפרויקט ראו: %{partners}." - intro_3_ic: המכללה הקיסרית לונדון - intro_3_partners: ויקי + intro_2_create_account: נא ליצור חשבון משתמש + intro_2_download: להוריד + intro_2_html: יש לך חופש %{download} את הנתונים ו%{use} בהם בהתאם ל%{license} שהם מתפרסמים לפיו. %{create_account} כדי לשפר את המפה. + intro_2_license: רישיון פתוח + intro_2_use: להשתמש + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: title: מידע בֹ־OpenStreetMap מתפרסם לפי תנאי רישיון Creative Commons–ייחוס–שיתוף זהה 2.0 כללי log_in: כניסה לחשבון @@ -960,9 +993,15 @@ he: title: תִמכו במיזם OpenStreetMap על־ידי מתן תרומה כספית osm_offline: מסד הנתונים של אתר OpenStreetMap אינו מקוון כעת בשל עבודות תחזוקה המבוצעות בו. osm_read_only: מסד הנתונים של אתר OpenStreetMap נתון כעת במצב קריאה בלבד בשל עבודות תחזוקה המבוצעות בו. + partners_bytemark: בייטמארק + partners_html: האירוח נתמך על־ידי מרכז %{ucl}‏, %{ic} ו%{bytemark}, ועל־ידי %{partners} אחרים. + partners_ic: המכללה המלכותית של לונדון + partners_partners: שותפים + partners_ucl: מרכז UCL VR + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: הרשמה sign_up_tooltip: יצירת חשבון לעריכה - sotm2011: בואו לכנס אופן סטריט מאפ 2011, מצב המפה, ספטמבר 9–11 בדנוור! + sotm2012: בואו לוועידת OpenStreetMap 2012, „מצב המפה”, 6–8 בספטמבר, בטוקיו! tag_line: מפת עולם חופשית בשיטת הוויקי user_diaries: יומני משתמשים user_diaries_tooltip: צפייה ביומני המשתמש @@ -977,7 +1016,30 @@ he: english_link: העמוד המקורי באנגלית text: במקרה של חוסר תאימות בין עמוד מתורגם זה ובין %{english_original_link}, יש לתת עדיפות לעמוד באנגלית title: אודות תרגום זה - legal_babble: "<h2>זכויות יוצרים ורישיון</h2>\n<p>\n אתר OpenStreetMap הוא <i>נותנים פתוחים</i>, המופצים לפי רישיון <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">קריאייטיב\n קומונז ייחוס–שיתוף־זהה 2.0</a> (CC BY-SA).\n</p>\n<p>\n אתם חופשיים להעתיק, להפיץ, לשדר ולהתאים את המפות שלנו\n ואת הנתונים שלנו, כל עוד אתם נותנים ייחוס ל־OpenStreetMap\n ולתורמי המיזם. אם אתם משנים או בונים מידע חדש על גבי המפות או הנתונים שלנו,\n מותר לכם להפיץ את התוצאות רק לפי תנאי אותו הרישיון.\n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">המסמך\n המשפטי</a> המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם.\n</p>\n\n<h3>איך לתת ייחוס ל־OpenStreetMap</h3>\n<p>\n אם אתם משתמשים בתמונות של מפות מ־OpenStreetMap, אנו מבקשים\n שבנתונים על היוצר יהיה כתוב לכל הפחות „© תורמי OpenStreetMap,\n רישיון CC BY-SA”. אם אתם משתמשים רק בנתוני מפות,\n אנו מבקשים „נתוני מפות © תורמי OpenStreetMap,\n רישיון CC BY-SA”.\n</p>\n<p>\n כשזה אפשרי, המילה OpenStreetMap צריכה להיות מקושרת אל הכתובת\n <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n ו־CC BY-SA אל <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. אם\n אתם משתמשים באמצעי תקשורת שבו אין אפשרות להשתמש בקישורים (למשל\n בדפוס), אנו ממליצים שתַפנו את קוראיכם לאתר\n www.openstreetmap.org (אולי על־ידי\n כתיבת הכתובת המלאה הזאת במקום „OpenStreetMap”) ואל\n www.creativecommons.org.\n</p>\n\n<h3>איך למצוא מידע נוסף</h3>\n<p>\n קִראו עוד על שימוש בנתונים שלנו בדף <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">שו״ת\n משפטי</a>.\n</p>\n<p>\n אנו מזכירים לתורמי OSM לעולם לא להוסיף נתונים משום מקור\n שמוגבל בזכויות יוצרים (למשל מפות גוגל או מפות מודפסות) ללא\n אישור מפורש מבעלי הזכויות.\n</p>\n<p>\n אף־על־פי ש־OpenStreetMap הוא מיזם נתונים פתוחים, איננו יכולים לספק\n API מפות בחינם למפתחי צד שלישי.\n\n ר׳ את דפי המדיניות שלנו: <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">המדיניות השימוש ב־API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">מדיניות השימוש באריחים</a>\n ו<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">מדיניות השימוש בנומינטים</a>.\n</p>\n\n<h3>התורמים שלנו</h3>\n<p>\n מדיניות CC BY-SA שלנו דורשת מכם „לייחס את היצירה (לתת קרדיט) ליוצר\n באופן הסביר באמצעי התקשורת שאתם\n משתמשים בו”. מְמַפֵּי OSM פרטניים אינם מבקשים ייחוס ייחודי מעבר\n ל„תורמי OpenStreetMap”, אבל כאשר נתונים מסוכנות מיפוי\n לאומית או ממקור גדול אחר נכללים ב־OpenStreetMap,\n יכול להיות סביר לתת להם ייחוס ישיר באמצעות העתקת המידע עליהם\n או באמצעות קישור לדף הזה.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n <li><strong>אוסטרליה</strong>: מכיל מנתוני פרוורים המבוססים על\n נתוני הלשכה האוסטרלית לסטטיסטיקה (Australian Bureau of Statistics).</li>\n <li><strong>אוסטריה</strong>: מכיל נתונים\n מ־<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> לפי תנאי\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>.</li>\n <li><strong>קנדה</strong>: מכיל נתונים\n מ־GeoBase®‏, GeoGratis‏ (©‏ Department of Natural\n Resources Canada)‏, CanVec‏ (©‏ Department of Natural\n Resources Canada), ו־StatCan‏ (Geography Division,\n Statistics Canada).</li>\n <li><strong>צרפת</strong>: מכיל נתונים שהגיעו במקור\n ממנהלת המסים הכללית (Direction Générale des Impôts).</li>\n <li><strong>ניו זילנד</strong>: מכיל נתונים שהגיעו במקור\n מ־Land Information New Zealand. זכויות הכתר.</li>\n <li><strong>פולין</strong>: מכיל נתונים מתוך <a\n href=\"http://ump.waw.pl/\">מפות UMP-pcPL</a>. זכויות היוצרים:\n תורמי UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n מידע נוסף על השימוש של OSM במידע של UMP.</a></li>\n <li><strong>דרום אפריקה</strong>: מכיל נתונים שהגיעו במקור\n <a href=\"http://www.ngi.gov.za/\">מ־Chief Directorate:\n National Geo-Spatial Information</a>‏, State copyright reserved.</li>\n <li><strong>הממלכה המאוחדת</strong>: מכיל נתוני סקר מדידות\n © זכויות הכתר וזכויות מסדי נתונים\n 2010.</li>\n</ul>\n\n<p>\n הכללה של נתונים ב־OpenStreetMap אינה אומרת שהספק\n המקורי של הנתוהים תומך ב־OpenStreetMap, נותן אחריות כלשהי, או\n מקבל חבות כלשהי.\n</p>" + legal_babble: + contributors_at_html: "<strong>אוסטריה</strong>: מכיל נתונים\nמ<a href=\"http://data.wien.gv.at/\">עיריית וינה</a> לפי תנאי\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>,\nמ<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">מדינת פורארלברג</a>\nוממדינת טירול (לפי <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT עם תיקונים</a>)." + contributors_au_html: "<strong>אוסטרליה</strong>: מכיל מנתוני פרוורים המבוססים על\nנתוני הלשכה האוסטרלית לסטטיסטיקה (Australian Bureau of Statistics)." + contributors_ca_html: "<strong>קנדה</strong>: מכיל נתונים\nמ־GeoBase®‏, GeoGratis‏ (©‏ Department of Natural\nResources Canada)‏, CanVec‏ (©‏ Department of Natural\nResources Canada), ו־StatCan‏ (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: "למידע נוסף על מקורות אלה ואחרים ששימשו\nלשיפור OpenStreetMap, נא לראות את <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">דף\nהתורמים</a> בוויקי של OpenStreetMap." + contributors_footer_2_html: "הכללה של נתונים ב־OpenStreetMap אינה אומרת שהספק המקורי\nשל הנתוהים תומך ב־OpenStreetMap, לוקח על עצמו אחריות כלשהי, או\nמקבל חבות כלשהי." + contributors_fr_html: "<strong>צרפת</strong>: מכיל נתונים שהגיעו במקור\nממנהלת המסים הכללית (Direction Générale des Impôts)." + contributors_gb_html: "<strong>הממלכה המאוחדת</strong>: מכיל נתוני סקר מדידות\n© זכויות הכתר וזכויות מסדי נתונים\n2010." + contributors_intro_html: "מדיניות CC BY-SA שלנו דורשת מכם „לייחס את היצירה (לתת קרדיט) ליוצר\nבאופן הסביר באמצעי התקשורת שאתם\nמשתמשים בו”. ממפים פרטניים של OSM אינם מבקשים ייחוס ייחודי מעבר\nל„תורמי OpenStreetMap”, אבל כאשר נתונים מסוכנות מיפוי\nלאומית או ממקור גדול אחר נכללים ב־OpenStreetMap,\nיכול להיות סביר לתת להם ייחוס ישיר באמצעות העתקת המידע עליהם\nאו באמצעות קישור לדף הזה." + contributors_nl_html: "<strong>הולנד</strong>: מכיל © נתונים מ־ AND‏, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>ניו זילנד</strong>: מכיל נתונים שהגיעו במקור\nמ־Land Information New Zealand. זכויות היוצרים של הכתר שמורות." + contributors_pl_html: "<strong>פולין</strong>: מכיל נתונים מתוך <a\nhref=\"http://ump.waw.pl/\">מפות UMP-pcPL</a>. זכויות היוצרים:\nתורמי UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nמידע נוסף על השימוש של OSM במידע של UMP.</a></li>" + contributors_title_html: התורמים שלנו + contributors_za_html: "<strong>דרום אפריקה</strong>: מכיל נתונים שהגיעו\nמ־<a href=\"http://www.ngi.gov.za/\">מִנהל כללי:\nמידע גאו־מרחבי לאומי</a>, זכות יוצרים ממלכתית שמורה." + credit_1_html: "אם אתם משתמשים בתמונות של מפות מ־OpenStreetMap, אנו מבקשים\nשבנתונים על היוצר יהיה כתוב לכל הפחות „© תורמי OpenStreetMap,\nרישיון CC BY-SA”. אם אתם משתמשים רק בנתוני מפות,\nאנו מבקשים „נתוני מפות © תורמי OpenStreetMap,\nרישיון CC BY-SA”." + credit_2_html: "כשזה אפשרי, המילה OpenStreetMap צריכה להיות מקושרת אל הכתובת\n<a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nו־CC BY-SA אל <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. אם\nאתם משתמשים באמצעי תקשורת שבו אין אפשרות להשתמש בקישורים (למשל\nבדפוס), אנו ממליצים שתַפנו את קוראיכם לאתר\nwww.openstreetmap.org (אולי על־ידי\nכתיבת הכתובת המלאה הזאת במקום „OpenStreetMap”) ואל\nwww.creativecommons.org." + credit_title_html: איך לתת ייחוס ל־OpenStreetMap + intro_1_html: "אתר OpenStreetMap הוא <i>נותנים פתוחים</i>, המופצים לפי רישיון <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">קריאייטיב\nקומונז ייחוס–שיתוף־זהה 2.0</a> (CC BY-SA)." + intro_2_html: "אתם חופשיים להעתיק, להפיץ, לשדר ולהתאים את המפות שלנו\nואת הנתונים שלנו, כל עוד אתם נותנים ייחוס ל־OpenStreetMap\nולתורמים למיזם. אם אתם משנים את הנתונים או את המפות שלנו או מסתמכים עליהם כדי ליצור משהו חדש,\nמותר לכם להפיץ את התוצאות רק לפי תנאי אותו הרישיון.\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">המסמך\nהמשפטי</a> המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם." + more_1_html: "קִראו עוד על שימוש בנתונים שלנו ב<a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">דף שו״ת\nמשפטי</a>." + more_2_html: "אנו מזכירים לתורמי OSM לעולם לא להוסיף נתונים משום מקור\nשמוגבל בזכויות יוצרים (למשל מפות גוגל או מפות מודפסות) ללא\nאישור מפורש מבעלי הזכויות." + more_3_html: "אף־על־פי ש־OpenStreetMap הוא מיזם נתונים פתוחים, איננו יכולים לספק\nAPI מפות בחינם למפתחי צד שלישי.\n\nר׳ את דפי המדיניות שלנו: <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">המדיניות השימוש ב־API</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">מדיניות השימוש באריחים</a>\nו<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">מדיניות השימוש בנומינטים</a>." + more_title_html: איך למצוא מידע נוסף + title_html: זכויות יוצרים ורישיון native: mapping_link: להתחיל למפות native_link: גרסה העברית @@ -1023,10 +1085,6 @@ he: body: אנו מצטערים, אין הודעה עם מזהה זה. heading: אין הודעה כזו title: אין הודעה כזו - no_such_user: - body: מצטערים. אין משתמש בשם זה. - heading: אין משתמש בשם זה - title: אין משתמש בשם זה outbox: date: תאריך inbox: תיבת הדואר הנכנס @@ -1198,6 +1256,8 @@ he: allow_write_gpx: להעלות מסלולי GPS. allow_write_prefs: לשנות את ההעדפות שלהם. authorize_url: "כתובת אישור:" + confirm: באמת? + delete: מחיקת לקוח edit: עריכת פרטים key: "מפתח צרכן:" requests: "מבקש את ההרשאות הבאות מהמשתמש:" @@ -1207,6 +1267,37 @@ he: url: "כתובת אסימון בקשה:" update: flash: מידע הלקוח עודכן בהצלחה + redaction: + create: + flash: נוצר חיתוך + destroy: + error: אירעה שגיאה בעת הריסת החיתוך הזה. + flash: החיתוך נהרס. + not_empty: החיתוך אינו ריק. נא לבטל את החיתוכים של הגרסאות ששיכות לחיתוך הזה לפני הריסתו. + edit: + description: תיאור + heading: עריכת חיתוך + submit: שמירת חיתוך + title: עריכת חיתוך + index: + empty: אין חיתוכים שאפשר להציג + heading: רשימת חיתוכים + title: רשימת חיתוכים + new: + description: תיאור + heading: הזנת מידע לחיתוך חדש + submit: יצירת חיתוך + title: מתבצעת יצירת חיתוך חדש + show: + confirm: באמת? + description: "תיאור:" + destroy: הסרת החיתוך הזה + edit: עריכת החיתוך הזה + heading: הצגת החיתוך "%{title}" + title: הצגת חיתוך + user: "יוצר:" + update: + flash: השינויים שנשמרו. site: edit: anon_edits_link_text: גלה מדוע זה כך. @@ -1221,7 +1312,6 @@ he: index: js_1: הדפדפן שבו אתה משתמש אינו תומך ב־JavaScript, או שהשבתת את השימוש ב־JavaScript. js_2: אתר OpenStreetMap משתמש ב־JavaScript למפה המחליקה. - js_3: אם אין לך אפשרות להפעיל JavaScript, אפשר לנסות את <a href="http://tah.openstreetmap.org/Browse/">דפדפן האריחים הסטטי Tiles@Home</a>. license: license_name: CC ייחוס–שיתוף זהה 2.0 notice: מוגש בכפוף לרישיון %{license_name}, על ידי מיזם %{project_name} ועורכיו. @@ -1298,6 +1388,23 @@ he: unclassified: דרך לא מסווגת unsurfaced: דרך לא סלולה wood: חורשה + markdown_help: + alt: טקסט חלופי + first: הפריט הראשון + heading: כותרת + headings: כותרות + image: תמונה + link: קישור + ordered: רשימה ממוינת + second: הפריט השני + subheading: כותרת משנה + text: טקסט + title_html: מפוענח עם <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: רשימה בלתי־ממוינת + url: כתובת + richtext_area: + edit: עריכה + preview: תצוגה מקדימה search: search: לחיפוש search_help: "למשל: ‚נתניה’, ‚רחוב רחל המשוררת, ירושלים’, ‚90880’, או 'סניפי דואר באזור שפרעם' <a href='http://wiki.openstreetmap.org/wiki/Search'>דוגמאות נוספות...</a>" @@ -1334,16 +1441,13 @@ he: visibility: "נִראוּת:" visibility_help: מה זה אומר? list: + empty_html: אין פה עדיין שום דבר. אפשר <a href='%{upload_link}'>להעלות מידע חדש</a> או ללמוד עוד על מעקב מסלולים ב־GPS ב<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>דף הוויקי</a>. public_traces: מסלולי GPS ציבוריים public_traces_from: מסלולי GPS ציבוריים מאת %{user} tagged_with: " מתויג עם %{tags}" your_traces: מסלולי GPS שלך make_public: made_public: מסלול שהוגדר ציבורי - no_such_user: - body: אנו מצטערים, אין משתמש בשם %{user}. אולי האיות לא נכון ואולי לחצת על קישור שגוי. - heading: המשתמש %{user} אינו קיים - title: אין משתמש כזה offline: heading: אחסון GPX בלתי־מקוון message: מערכת האחסון וההעלאה של קובצי GPX אינה זמינה עכשיו. @@ -1382,8 +1486,8 @@ he: trace_optionals: tags: תגים trace_paging_nav: - next: הבא » - previous: « הקודם + newer: מסלולים חדשים יותר + older: מסלולים ישנים יותר showing_page: הצגת הדף %{page} view: delete_track: מחיקת המסלול הזה @@ -1615,7 +1719,7 @@ he: activate_user: להפעלת משתמש זה add as friend: הוספה כחבר ago: (לפני %{time_in_words_ago}) - block_history: הצגת חסימות שהתקבלו + block_history: חסימות שהתקבלו blocks by me: מתי חסמתי blocks on me: מתי חסמו אותי comments: הערות @@ -1636,12 +1740,12 @@ he: friends_changesets: עיון בכל ערכות השינויים של חברים friends_diaries: עיון בכל רשומות היומן של חברים hide_user: להסתרת משתמש זה - if set location: אם הגדרת את מיקומך, מפה יפה ועוד דפרים יופיעו פה. אפשר להגדיר את מיקומך הראשי בדף %{settings_link}. + if set location: אם הגדרת את מיקומך, מפה יפה ועוד דברים יופיעו פה. אפשר להגדיר את מיקומך הראשי בדף %{settings_link}. km away: במרחק %{count} ק״מ latest edit: "עריכה אחרונה %{ago}:" m away: במרחק %{count} מ׳ mapper since: "ממפה מאז:" - moderator_history: הצגת חסימות שניתנו + moderator_history: חסימות שניתנו my comments: ההערות שלי my diary: היומן שלי my edits: העריכות שלי @@ -1697,7 +1801,6 @@ he: filter: block_expired: ייתכן שהחסימה כבר פקעה ואי־אפשר לערוך אותה. block_period: תקופת החסימה צריכה להיות אחד הערכים שאפשר לבחור ברשימה הנפתחת. - not_a_moderator: צריך להיות מנהל כדי לבצע את הפעולה הזאת. helper: time_future: יסתיים תוך %{time} time_past: הסתיימה לפני %{time}. @@ -1727,11 +1830,14 @@ he: creator_name: יוצר display_name: משתמש חסום edit: עריכה + next: הבא » not_revoked: (לא בוטלה) + previous: « הקודם reason: סיבה לחסימה revoke: לבטל! revoker_name: בוטלה על־ידי show: הצגה + showing_page: הצגת הדף %{page} status: מצב period: one: שעה אחת diff --git a/config/locales/hr.yml b/config/locales/hr.yml index d32d0071d..2dc40ffec 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1,9 +1,10 @@ -# Messages for Croatian (Hrvatski) +# Messages for Croatian (hrvatski) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Ex13 # Author: Mnalis # Author: Mvrban +# Author: Nemo bis # Author: SpeedyGonsales hr: activerecord: @@ -83,7 +84,6 @@ hr: changeset: changeset: "Changeset: %{id}" changesetxml: XLM Changeset - download: Preuzmi %{changeset_xml_link} ili %{osmchange_xml_link} feed: title: Changeset %{id} title_comment: Changeset %{id} - %{comment} @@ -142,7 +142,6 @@ hr: next_changeset_tooltip: Slijedeća promjena od %{user} prev_changeset_tooltip: Prethodno uredio %{user} node: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" download_xml: Preuzimanje XML edit: uredi node: Točka @@ -152,7 +151,6 @@ hr: coordinates: "Koordinate:" part_of: "Dio od:" node_history: - download: "%{download_xml_link} ili %{view_details_link}" download_xml: Preuzimanje XML node_history: Povijest točke node_history_title: "Povijest točke: %{node_name}" @@ -168,7 +166,6 @@ hr: of: od showing_page: Prikazujem stranicu relation: - download: "%{download_xml_link} ili %{view_history_link}" download_xml: Preuzimanje XML relation: Relacija relation_title: "Relacija: %{relation_name}" @@ -177,7 +174,6 @@ hr: members: "Članovi:" part_of: "Dio:" relation_history: - download: "%{download_xml_link} ili %{view_details_link}" download_xml: Preuzimanje XML relation_history: Povijest relacije relation_history_title: "Povijest relacije: %{relation_name}" @@ -239,7 +235,6 @@ hr: relation: relacija way: put way: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" download_xml: Preuzimanje XML edit: uredi view_history: prikaži povijest @@ -252,7 +247,6 @@ hr: nodes: "Točke:" part_of: "Dio od:" way_history: - download: "%{download_xml_link} ili %{view_details_link}" download_xml: Preuzimanje XML view_details: prikaži detalje way_history: Povijest puta @@ -347,10 +341,6 @@ hr: body: Žao mi je, ne postoji zapis u dnevniku ili komentar sa id %{id}. Provjerite ispravnost upisa, ili linka na koji ste kliknuli. heading: "Nema zapisa sa id: %{id}" title: Nema takvog zapisa u dnevnik - no_such_user: - body: Žao mi je, ne postoji korisnik s imenom %{user}. Provjerite ispravnost upisa, ili linka na koji ste kliknuli. - heading: Korisnik %{user} ne postoji - title: Nema takvog korisnika view: leave_a_comment: Ostavi komentar login: Prijava @@ -537,36 +527,7 @@ hr: boundary: administrative: Administrativna granica building: - apartments: Stambeni blok - block: Blok zgrada - bunker: Bunker - chapel: Kapelica - church: Crkva - city_hall: Gradska vjećnica - commercial: Poslovna zgrada - dormitory: Studentski dom - entrance: Ulaz - faculty: Zgrada fakulteta - farm: Farma (zgrada) - flats: Stanovi - garage: Garaža - hall: Dvorana - hospital: Bolnica - hotel: Hotel - house: Kuća - industrial: Industrijska zgrada - office: Uredska zgrada - public: Javna zgrada - residential: Stambena zgrada - retail: Maloprodajna zgrada - school: Å kolska zgrada - shop: Trgovina - stadium: Stadion - store: Trgovina - terrace: Terasa - tower: Toranj - train_station: Željeznički kolodvor - university: Zgrada SveučiliÅ¡ta + "yes": Zgrada highway: bridleway: Konjička staza bus_guideway: Autobusna traka @@ -574,11 +535,9 @@ hr: byway: Prečica construction: Autocesta u izgradnji cycleway: Biciklistička staza - distance_marker: Oznaka km emergency_access_point: S.O.S. točka footway: PjeÅ¡ačka staza ford: Ford - gate: Kapija living_street: Ulica smirenog prometa minor: Drugorazredna cesta motorway: Autocesta @@ -643,11 +602,9 @@ hr: meadow: Livada military: Vojno područje mine: Rudnik - mountain: Planina nature_reserve: Rezervat prirode park: Park piste: Pista - plaza: Plaza quarry: Kamenolom railway: Željeznica recreation_ground: Rekreacijsko područje @@ -685,7 +642,6 @@ hr: cave_entrance: Pećina (ulaz) channel: Kanal cliff: Litica - coastline: Obala crater: Krater feature: Obilježje fell: Brdo @@ -765,7 +721,6 @@ hr: yard: Ranžirni kolodvor shop: alcohol: Trgovina pićem - apparel: Trgovina odjećom art: Atelje bakery: Pekara beauty: Parfumerija @@ -774,7 +729,6 @@ hr: books: Knjižara butcher: Mesnica car: Autokuća - car_dealer: Autokuća car_parts: Autodijelovi car_repair: Autoservis carpet: Trgovina tepisima @@ -789,7 +743,6 @@ hr: department_store: Robna kuća discount: Diskont doityourself: Uradi sam - drugstore: Drogerija dry_cleaning: Kemijska čistionica electronics: Trgovina elektronikom estate_agent: Agencija za nekretnine @@ -909,17 +862,11 @@ hr: history: Povijest home: dom home_tooltip: Idi na lokaciju svog doma - inbox: poÅ¡ta (%{count}) inbox_tooltip: one: Imate 1 nepročitanu poruku other: Imate %{count} nepročitane(ih) poruke(a) zero: Nema nepročitanih poruka intro_1: OpenStreetMap je slobodna, promjenjiva karta cijelog svijeta. Napravili su je ljudi slični tebi. - intro_2: OpenStreetMap omogućava pregledavanje, uređivanje i koriÅ¡tenje geografskih podataka u suradničkom načinu od bilo gdje sa Zemlje. - intro_3: SmjeÅ¡taj OpenStreetMapa je ljubazno podržan od %{ucl} i %{bytemark}. Ostali podržavatelji projekta su navedeni u %{partners}. - intro_3_bytemark: bytemarka - intro_3_partners: wiki - intro_3_ucl: UCL VR Centra license: title: OpenStreetMap podaci su objavljeni pod licencom Creative Commons Attribution-Share Alike 2.0 Generic License log_in: prijava @@ -935,7 +882,6 @@ hr: osm_read_only: Zbog radova na održavanju baze podataka OpenStreetMapa, istu trenutačno nije moguće mijenjati. sign_up: otvori račun sign_up_tooltip: Otvori korisnički račun za uređivanje - sotm2011: Dođite na Konferenciju OpenStreetMap 2011., The State of the Map, 9.-11. rujna u Denveru! tag_line: Slobodna wiki karta Svijeta user_diaries: Dnevnik user_diaries_tooltip: Prikaži korisničke dnevnike @@ -951,7 +897,25 @@ hr: english_link: Engleski izvornik text: U slučaju konflikta između ove prevedene stranice i %{english_original_link}, Engleski stranice imaju prednost title: O ovom prijevodu - legal_babble: "<h2>Autorska prava i Dozvola</h2>\n<p>\n OpenStreetMap su <i>otvoreni podaci</i>, licencirani pod <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> dozvolom (CC-BY-SA).\n</p>\n<p>\n Slobodni ste kopirati, distribuirati, prenositi i adaptirati naÅ¡e karte\n i podatke, sve dok navodite OpenStreetMap kao izvor i doprinositelje. Ako izmjenite \n ili nadogradite naÅ¡e karte ili podatke, možete distribuirati rezultate\n samo pod istom licencom. Potpuni <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">tekst</a> objaÅ¡njava prava i odgovornosti.\n</p>\n\n<h3>Kako navoditi OpenStreetMap kao izvor</h3>\n<p>\n Ako koristite slike OpenstreetMap karte, zahtjevamo da\n se navede najmanje “© OpenStreetMap\n contributors, CC-BY-SA”. Ako koristite samo podatke,\n zahtjevamo “Map data © OpenStreetMap contributors,\n CC-BY-SA”.\n</p>\n<p>\n Gdje je moguće, OpenStreetMap treba biti kao hyperlink na <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n and CC-BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Ako\n koristite medij gdje linkovi nisu mogući (npr. tiskane\n karte), predlažemo da uputite vaÅ¡e čitatelje na\n www.openstreetmap.org (proÅ¡irenjem na\n ‘OpenStreetMap’ za ovo punu adresu) i na\n www.creativecommons.org.\n</p>\n\n<h3>ViÅ¡e o</h3>\n<p>\n Čitajte viÅ¡e o koriÅ¡tenju naÅ¡ih podataka na <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>.\n</p>\n<p>\n OSM korisnici - doprinostielji se podsjećaju da nikada ne dodaju podakte iz bilo kojeg\n izvora zaÅ¡tićenog autorskim pravima (npr. Google Maps ili tiskane karte) bez izričite dozvole\n vlasnika autorskih prava.\n</p>\n<p>\n Iako su OpenstreetMap otvoreni podaci, ne možemo pružiti\n besplatni API za kartu za ostale developere.\n\n Vidi naÅ¡u <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Politiku koriÅ¡tenja API-a</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politiku koriÅ¡tenja pločica</a>\n and <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Politiku koriÅ¡tenja Nominatim-a</a>.\n</p>\n\n<h3>NaÅ¡i korisnici - doprinostielji</h3>\n<p>\n NaÅ¡a CC-BY-SA licenca zahtjeva od vas da “ navedete izvor Originala\n razumno prema mediju ili načinima koje koristite”. \n Pojedini OSM maperi ne traže navođenje njih preko ili viÅ¡e od\n “OpenStreetMap korisnici - doprinostielja”, ali gdje su podaci\n iz nacionalne agencije za kartiranje ili nekog drugog glavnog izvora uključeni u\n OpenStreetMap, razumno je navesti i njih direktno\n navodeći ime ili link na njihovu stranicu.\n</p>\n\n<!--\nInformacije za urednike stranica\n\nSlijedeće popisuje samo one organizacije koje zahtjevaju navođenje/ \npripisivanje kao uvjet da se njihovi podaci koriste u OpenStreetMap. \nOvo nije cjeloviti katalog \"uvoza\" podataka, i ne smije se koristiti osim\nkada se pripisivanje zahtjeva da bude u skladu s dozvolom uvezenih podataka.\n\nBilo koje dodavanje ovdje, najprije se mora raspraviti s OSM sistemskim administratorima.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australija</strong>: Sadrži podatke o predgrađima na osnovu podataka Australian Bureau of Statistics.</li>\n <li><strong>Kanada</strong>: Sadrži podatke iz\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), i StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Novi Zeland</strong>: Sadrži podatke izvorno iz\n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Poljska</strong>: Sadrži podatke iz <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL contributors.</li>\n <li><strong>Velika Britanija</strong>: Sadrži podatke Ordnance\n Survey data © Crown copyright and database right\n 2010.</li>\n</ul>\n\n<p>\n UvrÅ¡tenje podataka u OpenStreetMap ne podrazumjeva da se izvorni\n davatelj podataka podržava OpenStreetMap, pruža bilo kakovo jamstvo, ili \n prihvaća bilo kakve obveze.\n</p>" + legal_babble: + contributors_au_html: "<strong>Australija</strong>: Sadrži podatke o predgrađima na osnovu podataka Australian Bureau of Statistics." + contributors_ca_html: "<strong>Kanada</strong>: Sadrži podatke iz\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), i StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_2_html: " UvrÅ¡tenje podataka u OpenStreetMap ne podrazumjeva da se izvorni\n davatelj podataka podržava OpenStreetMap, pruža bilo kakovo jamstvo, ili \n prihvaća bilo kakve obveze." + contributors_gb_html: "<strong>Velika Britanija</strong>: Sadrži podatke Ordnance\n Survey data © Crown copyright and database right\n 2010." + contributors_intro_html: "NaÅ¡a CC BY-SA licenca zahtjeva od vas da “ navedete izvor Originala\n razumno prema mediju ili načinima koje koristite”. \n Pojedini OSM maperi ne traže navođenje njih preko ili viÅ¡e od\n “OpenStreetMap korisnici - doprinostielja”, ali gdje su podaci\n iz nacionalne agencije za kartiranje ili nekog drugog glavnog izvora uključeni u\n OpenStreetMap, razumno je navesti i njih direktno\n navodeći ime ili link na njihovu stranicu." + contributors_nz_html: "<strong>Novi Zeland</strong>: Sadrži podatke izvorno iz\n Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Poljska</strong>: Sadrži podatke iz <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL contributors." + contributors_title_html: NaÅ¡i korisnici - doprinostielji + credit_1_html: "Ako koristite slike OpenstreetMap karte, zahtjevamo da\n se navede najmanje “© OpenStreetMap\n contributors, CC BY-SA”. Ako koristite samo podatke,\n zahtjevamo “Map data © OpenStreetMap contributors,\n CC BY-SA”." + credit_2_html: "Gdje je moguće, OpenStreetMap treba biti kao hyperlink na <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n and CC BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Ako\n koristite medij gdje linkovi nisu mogući (npr. tiskane\n karte), predlažemo da uputite vaÅ¡e čitatelje na\n www.openstreetmap.org (proÅ¡irenjem na\n ‘OpenStreetMap’ za ovo punu adresu) i na\n www.creativecommons.org." + credit_title_html: Kako navoditi OpenStreetMap kao izvor + intro_1_html: " OpenStreetMap su <i>otvoreni podaci</i>, licencirani pod <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> dozvolom (CC BY-SA)." + intro_2_html: " Slobodni ste kopirati, distribuirati, prenositi i adaptirati naÅ¡e karte\n i podatke, sve dok navodite OpenStreetMap kao izvor i doprinositelje. Ako izmjenite \n ili nadogradite naÅ¡e karte ili podatke, možete distribuirati rezultate\n samo pod istom licencom. Potpuni <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">tekst</a> objaÅ¡njava prava i odgovornosti." + more_1_html: "Čitajte viÅ¡e o koriÅ¡tenju naÅ¡ih podataka na <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>." + more_2_html: "OSM korisnici - doprinostielji se podsjećaju da nikada ne dodaju podakte iz bilo kojeg\n izvora zaÅ¡tićenog autorskim pravima (npr. Google Maps ili tiskane karte) bez izričite dozvole\n vlasnika autorskih prava." + more_3_html: "Iako su OpenstreetMap otvoreni podaci, ne možemo pružiti\n besplatni API za kartu za ostale developere.\n\n Vidi naÅ¡u <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Politiku koriÅ¡tenja API-a</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politiku koriÅ¡tenja pločica</a>\n and <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Politiku koriÅ¡tenja Nominatim-a</a>." + more_title_html: ViÅ¡e o + title_html: Autorska prava i Dozvola native: mapping_link: počnite kartirati native_link: HRVATSKI verzija @@ -990,10 +954,6 @@ hr: body: Nažalost nema poruka s tim id. heading: Nema takve poruke title: Nema takve poruke - no_such_user: - body: Nažalost ne postoji korisnik s tim imenom. - heading: Nema takvog korisnika - title: Nema takvog korisnika outbox: date: Datum inbox: dolazna poÅ¡ta @@ -1185,7 +1145,6 @@ hr: index: js_1: Koristite internet preglednik koji ne podržava JavaScript, ili vam je isključen JavaScript. js_2: OpenStreetMap koristi JavaScript for za slippy kartu. - js_3: Možete probati <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home preglednih statičnih pločica </a> ako ne možete omogućiti JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Licencirano pod %{license_name} licenca %{project_name} i njenih suradnika. @@ -1304,10 +1263,6 @@ hr: your_traces: VaÅ¡e GPS trase make_public: made_public: Trase za javnost - no_such_user: - body: Žao mi je, ali ne postoji korisnik s imenom %{user}. Provjerite svoj upis, ili link kojeg ste kliknuli. - heading: Korisnik %{user} ne postoji - title: Nema takvog korisnika offline: heading: GPX spremiÅ¡te Offline message: Sustav za GPX spremanje i upload trenutno nisu u funkciji. @@ -1346,8 +1301,6 @@ hr: trace_optionals: tags: Oznake trace_paging_nav: - next: Slijedeća » - previous: « Prethodna showing_page: Prikazujem stranicu %{page} view: delete_track: IzbriÅ¡i ovu trasu @@ -1612,7 +1565,6 @@ hr: filter: block_expired: Blokada je već istekla i ne može se uređivati. block_period: period blokade mora biti jedna od vrijednosti iz drop-down liste. - not_a_moderator: Morate biti moderator da možete izvestu tu akciju. helper: time_future: ZavrÅ¡ava u %{time}. time_past: ZavrÅ¡eno prije %{time}. diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 549d62be8..cd751838b 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -1,4 +1,4 @@ -# Messages for Upper Sorbian (Hornjoserbsce) +# Messages for Upper Sorbian (hornjoserbsce) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Michawiki @@ -74,6 +74,8 @@ hsb: application: require_cookies: cookies_needed: Zda so, zo maÅ¡ placki znjemóžnjene - proÅ¡u zmóžń placki w swojim wobhladowaku, prjedy hač pokročujeÅ¡. + require_moderator: + not_a_moderator: DyrbiÅ¡ moderator być, zo by móhł tutu akciju wuwjesć. setup_user_auth: blocked: Twój přistup k API je so blokował. ProÅ¡u přizjew so do webpowjercha, zo by wjace zhonił. need_to_see_terms: Twój přistup na API je nachwilu wusadźeny. ProÅ¡u přizjew so k webpowjerchej, zo by sej wuměnjenja za sobuskutkowacych wobhladał. NjetrjebaÅ¡ přezjedny być, dyrbiÅ¡ sej je jenož wobhladać. @@ -81,7 +83,6 @@ hsb: changeset: changeset: "Sadźba změnow: %{id}" changesetxml: Sadźba změnow XML - download: "%{changeset_xml_link} abo %{osmchange_xml_link} sćahnyć" feed: title: Sadźba změnow %{id} title_comment: Sadźba změnow %{id} - %{comment} @@ -149,21 +150,19 @@ hsb: next_changeset_tooltip: Přichodna změna wot wužiwarja %{user} prev_changeset_tooltip: Předchadna změna wot wužiwarja %{user} node: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" download_xml: XML sćahnyć - edit: wobdźěłać + edit: Suk wobdźěłać node: Suk node_title: "Suk: %{node_name}" - view_history: historiju pokazać + view_history: Stawizny pokazać node_details: coordinates: "Koordinaty:" part_of: "Dźěl wot:" node_history: - download: "%{download_xml_link} abo %{view_details_link}" download_xml: XML sćahnyć node_history: Sukata historija node_history_title: "Sukata historija: %{node_name}" - view_details: podrobnosće pokazać + view_details: Podrobnosće pokazać not_found: sorry: Wodaj, %{type} z id %{id} njebu namakany. type: @@ -174,21 +173,26 @@ hsb: paging_nav: of: wot showing_page: Pokazuje so strona + redacted: + message_html: Wersija %{version} tutoho %{type}a njeda so pokazać, dokelž je so hižo redigowała. ProÅ¡u, hlej %{redaction_link} za podronosće. + redaction: Redakcija %{id} + type: + node: suk + relation: relacija + way: puć relation: - download: "%{download_xml_link} abo %{view_history_link}" download_xml: XML sćahnyć relation: Relacija relation_title: "Relacija: %{relation_name}" - view_history: historiju pokazać + view_history: Stawizny pokazać relation_details: members: "Čłonojo:" part_of: "Dźěl wot:" relation_history: - download: "%{download_xml_link} abo %{view_details_link}" download_xml: XML sćahnyć relation_history: Relaciska historija relation_history_title: "Relaciska historija: %{relation_name}" - view_details: podrobnosće pokazać + view_details: Podrobnosće pokazać relation_member: entry_role: "%{type} %{name} jako %{role}" type: @@ -200,14 +204,14 @@ hsb: view_data: Daty za aktualny kartowy napohlad pokazać start_rjs: data_frame_title: Daty - data_layer_name: Daty + data_layer_name: Kartowe daty přepytać details: Podrobnosće drag_a_box: Ramik na kartu ćahnyć, zo by so wobłuk wubrał edited_by_user_at_timestamp: Wobdźěłany wot wužiwarja [[user]] dnja [[timestamp]] hide_areas: Kónčiny schować history_for_feature: Historija za [[feature]] load_data: Daty začitać - loaded_an_area_with_num_features: Sy wobłuk začitał, kotryž [[num_features]] přiznamjenjow wobsahuje. PowÅ¡itkownje někotre wobhladowaki maja problemy ze zwobraznjenju tajkeho mnóstwa datow. PowÅ¡itkownje wobhladowaki najlěpje funguja, hdyž mjenje hač 100 přiznamjenjow naraz zwobraznjeja; hewak so wobhladowak spomali abo samo hižo njereaguje. Jeli chceÅ¡ tute daty woprawdźe zwobraznić, klikń deleka na tłóčatko. + loaded_an_area_with_num_features: Sy wobłuk začitał, kotryž [[num_features]] elementow wobsahuje. PowÅ¡itkownje někotre wobhladowaki maja problemy ze zwobraznjenju tajkeho mnóstwa datow. PowÅ¡itkownje wobhladowaki najlěpje funguja, hdyž mjenje hač [[num_features]] elementow naraz zwobraznjeja; hewak so wobhladowak spomali abo samo hižo njereaguje. Jeli chceÅ¡ tute daty woprawdźe zwobraznić, klikń deleka na tłóčatko. loading: Začituje so... manually_select: Druhi wobłuk manuelnje wubrać object_list: @@ -246,10 +250,9 @@ hsb: relation: relacija way: puć way: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" download_xml: XML sćahnyć - edit: wobdźěłać - view_history: historiju pokazać + edit: Puć wobdźěłać + view_history: Stawizny pokazać way: Puć way_title: "Puć: %{way_name}" way_details: @@ -261,9 +264,8 @@ hsb: nodes: "Suki:" part_of: "Dźěl wot:" way_history: - download: "%{download_xml_link} abo %{view_details_link}" download_xml: XML sćahnyć - view_details: podrobnosće pokazać + view_details: Podrobnosće pokazać way_history: Pućna historija way_history_title: "Pućna historija: %{way_name}" changeset: @@ -292,6 +294,8 @@ hsb: description_nearby: Sadźby změnow wužiwarjow w bliskosći description_user: Sadźby změnow wot %{user} description_user_bbox: Sadźby změnow wot %{user} znutřka %{bbox} + empty_anon_html: Dotal žane změny nječinjene + empty_user_html: Zda so, zo hišće njejsy žane změny přewjedł. Zo by započał, přečitaj <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide (přewodnik za započatkarjow)</a>. heading: Sadźby změnow heading_bbox: Sadźby změnow heading_friend: Sadźby změnow @@ -374,10 +378,6 @@ hsb: body: Wodaj, dźenikowy zapisk abo komentar z id %{id} njeeksistuje. ProÅ¡u skontroluj swój prawopis abo snano je wotkaz, na kotryž sy kliknył, je njepłaćiwy. heading: Žadyn zapisk z id %{id} title: Dźenikowy zapisk njeeksistuje - no_such_user: - body: Wodaj, wužiwar z mjenom %{user} njeje. ProÅ¡u skontroluj prawopis abo snano wotkaz, na kotryž sy kliknył, je njepłaćiwy. - heading: Wužiwar %{user} njeeksistuje - title: Wužiwar njeeksistuje view: leave_a_comment: Spisaj komentar login: Přizjew so @@ -471,16 +471,28 @@ hsb: suffix_place: ", %{distance} %{direction} z %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Lětanišćo + apron: Lětanske předpolo + gate: Wrota + helipad: Helikoptrowe přizemišćo + runway: Startowa a přizemjenska čara + taxiway: Lětadłowa jězdnja + terminal: Terminal amenity: + WLAN: WLAN-přistup airport: Lětanišćo arts_centre: Kulturny centrum + artwork: Wuměłska twórba atm: Bankomat auditorium: Awditorij bank: Banka bar: Bara + bbq: Grilowanišćo bench: Ławka bicycle_parking: Wotstajenišćo za kolesa bicycle_rental: Wupožcowarnja za kolesa + biergarten: Piwowa zahroda brothel: Bordel bureau_de_change: Měnjernja bus_station: Busowe dwórnišćo @@ -489,6 +501,7 @@ hsb: car_sharing: Centrala za sobujěducych car_wash: Awtomyjernja casino: Kazino + charging_station: Napjelnjenska stacija cinema: Kino clinic: Klinika club: Klub @@ -507,6 +520,7 @@ hsb: ferry_terminal: Přewozny přistaw fire_hydrant: Wohnjowy hydrant fire_station: Wohnjostraža + food_court: Food Court fountain: Studnja fuel: Tankownja grave_yard: Kěrchow @@ -547,9 +561,12 @@ hsb: shelter: Podstup shop: Wobchod shopping: Nakup + shower: DuÅ¡a + social_centre: Socialne srjedźišćo social_club: Towarstwo studio: Studijo supermarket: Superwiki + swimming_pool: Płuwanišćo taxi: Taksijowe zastanišćo telephone: Zjawny telefon theatre: Dźiwadło @@ -564,37 +581,17 @@ hsb: youth_centre: Centrum za młodostnych boundary: administrative: Zarjadniska hranica + census: Mjeza ludličenskeho wobwoda + national_park: Narodny park + protected_area: Å kitane pasmo + bridge: + aqueduct: Akwedukt + suspension: Wisaty móst + swing: Wobwjertny móst + viaduct: Wiadukt + "yes": Móst building: - apartments: Bydlenski blok - block: Bydlenski blok - bunker: Bunker - chapel: Kapałka - church: Cyrkej - city_hall: Radnica - commercial: Wobchodniske twarjenje - dormitory: Studentski internat - entrance: Twarjenjowy zachod - faculty: Fakultowe twarjenje - farm: Hospodarske twarjenje - flats: Bydlenja - garage: Garaža - hall: Hala - hospital: Chorownja - hotel: Hotel - house: Dom - industrial: Industrijowe twarjenje - office: Běrowowe twarjenje - public: Zjawne twarjenje - residential: Bydlenske twarjenje - retail: Priwatne twarjenje - school: Å ulske twarjenje - shop: Wobchod - stadium: Stadion - store: Wobchod - terrace: Terasa - tower: Wěža - train_station: Dwórnišćo - university: Uniwersitne twarjenje + "yes": Twarjenje highway: bridleway: Jěchanski puć bus_guideway: Trolejbusowy milinowód @@ -602,12 +599,11 @@ hsb: byway: Pódlanski puć construction: Dróha so twari cycleway: Kolesowarska šćežka - distance_marker: Kilometernik emergency_access_point: Přijimarnja njezbožow footway: Pućik ford: Bród - gate: Wrota living_street: Hasa z pomjeńšenym wobchadom + milestone: Kilometrowy kamjeń minor: Pódlanska hasa motorway: Awtodróha motorway_junction: Awtodróhowe křižnišćo @@ -619,14 +615,17 @@ hsb: primary_link: Dróha prěnjeho rjada raceway: Pista residential: Bydlenska hasa + rest_area: Wotpočnišćo road: Dróha secondary: Dróha druheho rjada secondary_link: Dróha druheho rjada service: Dróha za přidróžnych services: Awtodróhowy wotpočny hosćenc + speed_camera: Błyskadło steps: Schodźenki stile: Płótne stupadło tertiary: Dróha třećeho rjada + tertiary_link: Dróha třećeho rjada track: Pólny puć trail: Šćežka trunk: Dalokodróha @@ -640,6 +639,7 @@ hsb: building: Twarjenje castle: Hród church: Cyrkej + fort: Fort house: Dom icon: Ikona manor: Knježi dwór @@ -664,6 +664,7 @@ hsb: farmland: Pola farmyard: Statok forest: Wužitny lěs + garages: Awtowa porjedźernja grass: Trawa greenfield: Njewobtwarjena zemja industrial: Industrijowa kónčina @@ -671,25 +672,28 @@ hsb: meadow: Łuka military: Wojerska kónčina mine: Podkopki - mountain: Hora nature_reserve: PřirodoÅ¡kitne pasmo + orchard: Sadowa zahroda park: Park piste: Pista - plaza: Naměsto quarry: Skała railway: Železnica recreation_ground: Wočerstwjenska krajina reservoir: Zběranski basenk + reservoir_watershed: Wódny rozwod reservoira residential: Bydlenski wobwod retail: Wobchody + road: Dróhowe pasmo village_green: Nawjes vineyard: Winicy wetland: Łučina wood: Lěs leisure: beach_resort: Mórske kupjele + bird_hide: Ptači schow common: Gmejnski kraj fishing: Rybnišćo + fitness_station: Fitnesowy center garden: Zahroda golf_course: Golfownišćo ice_rink: Smykanišćo @@ -700,12 +704,17 @@ hsb: pitch: Sportnišćo playground: Hrajkanišćo recreation_ground: Wočerstwjenišćo + sauna: Sawna slipway: Helling sports_centre: Sportowy centrum stadium: Stadion swimming_pool: Swimmingpool track: Běhanišćo water_park: Wodowy park + military: + airfield: Wojerske lětanišćo + barracks: Kaserna + bunker: Bunker natural: bay: Zaliw beach: Přibrjóh @@ -713,11 +722,12 @@ hsb: cave_entrance: Prózdnjeński zachod channel: Kanal cliff: Wuskała - coastline: Pobrjóžna linija crater: Krater + dune: Nawěw feature: Funkcija fell: Fjeld fjord: Fjord + forest: Lěs geyser: Geiser glacier: Lodowc heath: Hola @@ -737,6 +747,7 @@ hsb: scrub: Kerki shoal: Niłčina, pěsčišćo spring: Žórło + stone: Kamjeń strait: Mórska wužina tree: Å tom valley: Doł @@ -745,6 +756,19 @@ hsb: wetland: Łučina wetlands: Łučiny wood: Lěs + office: + accountant: Knihiwjedniski běrow + architect: Architektny běrow + company: Zawod + employment_agency: Dźěłowy zarjad + estate_agent: Makler ležownosćow + government: Zarjad + insurance: Zawěsćenski běrow + lawyer: Běrow prawiznika + ngo: Běrow njeknježerstwoweje organizacije + telecommunication: Dalokopowěsćowy zarjad + travel_agent: Pućowanski běrow + "yes": Běrow place: airport: Lětanišćo city: Wulkoměsto @@ -756,6 +780,7 @@ hsb: houses: Domy island: Kupa islet: Kupka + isolated_dwelling: Jednotliwe bydło locality: Sydlišćo moor: Bahno municipality: Gmejna @@ -779,6 +804,7 @@ hsb: junction: Železniske křižnišćo level_crossing: Železniski přechod light_rail: Měšćanska železnica + miniature: Miniaturna železnica monorail: Jednokolijowa železnica narrow_gauge: Wuskokolijata železnica platform: Železniske nastupišćo @@ -793,7 +819,7 @@ hsb: yard: Ranžěrowanske dwórnišćo shop: alcohol: Wobchod za spirituozy - apparel: Drastowy wobchod + antiques: Wobchod starožitnosćow art: Wuměłski wobchod bakery: Pjekarnja beauty: Kosmetikowy salon @@ -802,7 +828,6 @@ hsb: books: Kniharnja butcher: Rěznik car: Awtosalon - car_dealer: Wikowar awtow car_parts: Awtowe narunanki car_repair: Awtowa porjedźernja carpet: Přestrjencowy wobchod @@ -817,7 +842,6 @@ hsb: department_store: Kupnica discount: Wobchod za tunje artikle doityourself: Paslerska potrjeba - drugstore: Drogerija dry_cleaning: Čisćernja electronics: Wobchod za elektroniku estate_agent: Makler z imobilijemi @@ -883,7 +907,10 @@ hsb: valley: Doł viewpoint: Wuhladnišćo zoo: Coo + tunnel: + "yes": Tunl waterway: + artificial: KumÅ¡tna wodowa dróha boatyard: Łódźnica canal: Kanal connector: Zwisk mjez wódnymi pućemi @@ -919,6 +946,7 @@ hsb: history_tooltip: Změny za tutón wobłuk pokazać history_zoom_alert: DyrbiÅ¡ powjetÅ¡ić, zo by wobdźěłowansku historiju widźał layouts: + community: Zhromadźenstwo community_blogs: Blogi zhromadźenstwa community_blogs_title: Blogi čłonow zhromadźenstwa OpenStreetMap copyright: Awtorske prawo a licenca @@ -940,7 +968,7 @@ hsb: history: Historija home: domoj home_tooltip: Domoj hić - inbox: póst (%{count}) + inbox_html: póstowy dochad (%{count}) inbox_tooltip: few: Twój póstowy kašćik wobsahuje %{count} njepřečitane powěsće one: Twój póstowy kašćik 1 njepřečitanu powěsć wobsahuje @@ -948,10 +976,12 @@ hsb: two: Twój póstowy kašćik wobsahuje %{count} njepřečitanej powěsći zero: Twój póstowy kašćik žane njepřečitane powěsće njewobsahuje. intro_1: OpenStreetMap je swobodna wobdźěłujomna karta cyłeho swěta. Bu za ludźi kaž wy wutworjena. - intro_2: OpenStreetMap ći dowola geografiske daty na zhromadne waÅ¡nje wot něhdźe na zemi pokazać, wobdźěłać a wužiwać. - intro_3: Hospodowanje OpenStreetMap so přećelnje wot %{ucl}, %{ic} a %{bytemark} podpěruje. DalÅ¡i podpěraćeljo projekta su w %{partners} nalistowani. - intro_3_ic: Imperial College London - intro_3_partners: wiki + intro_2_create_account: Załož wužiwarske konto + intro_2_download: sćahnyć + intro_2_html: MóžeÅ¡ daty darmo %{download} a pod %{license} %{use}. %{create_account}, zo by kartu polěpÅ¡ił. + intro_2_license: zjawnej licencu + intro_2_use: wužiwać + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: alt: CC by-sa 2.0 title: Daty OpenStreetMap licencuja so pod licencu Creative Commons Attribution-Share Alike 2.0 Generic @@ -966,9 +996,15 @@ hsb: title: OpenStreetMap z pjenježnym darom podpěrać osm_offline: Datowa banka OpenStreetMap je tuchwilu offline, dokelž so wažne wobhladowankse dźěła na datowej bance přewjedu. osm_read_only: Datowa banka OpenStreetMap je tuchwilu jenož čitajomna, dokelž so wažne wothladowanske dźěła na datowej bance přewjedu. + partners_bytemark: Bytemark Hosting + partners_html: Hostowanje so wot %{ucl}, %{ic}, %{bytemark} a druhich %{partners} podpěruje. + partners_ic: Imperial College London + partners_partners: partnerow + partners_ucl: z UCL VR Centre + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: registrować sign_up_tooltip: Konto za wobdźěłowanje załožić - sotm2011: Dojědźće do konferency OpenStreetMap 2011, "The State of the Map", 9. - 11. septembra w Denverje! + sotm2012: Dojědźće do konferency OpenStreetMap 2012, "The State of the Map", 6. - 8. septembra w Tokiju! tag_line: Swobodna swětowa karta user_diaries: Dźeniki user_diaries_tooltip: Wužiwarske dźeniki čitać @@ -983,7 +1019,30 @@ hsb: english_link: jendźelskim originalom text: W padźe konflikta mjez přełoženej stronje a %{english_original_link}, jendźelska strona dyrbi prioritatu měć title: Wo tutym přełožku - legal_babble: "<h2>Awtorske prawo a licenca</h2>\n<p> \nOpenStreetMap wobsteji ze <i>zjawnych datow</i>, licencowanych pod licencu <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).\n</p>\n<p>\nMóžeÅ¡ naÅ¡e karty a daty kopěrować, rozdźělić, přenjesć a přiměrić, tak dołho kaž OpenStreetMap a jich sobuskutkowacych naspominaÅ¡. Jeli změniÅ¡ naÅ¡e karty abo daty abo zepěraÅ¡ so na nje, móžeÅ¡ wuslědk jenož pod samsnej licencu rozdźělić. Dospołny <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">prawniski kod</a> wujasnja twoje prawa a zamołwitosće.</p>\n\n<h3>Kak awtorstwo OpenStreetMap naspomnić</h3>\n<p>\nJeli kartowe wobrazy z OpenStreetMap wužiwaÅ¡, žadamy sej, zo znajmjeńša podawaÅ¡ “© OpenStreetMap a sobuskutkowacych, CC BY-SA”. Jeli jenož kartowe daty wužiwaÅ¡, dyrbiÅ¡ “kartowe daty © OpenStreetMap a sobuskutkowacych, CC BY-SA” podać.\n</p>\n<p>Hdźež je móžno, OpenStreetMap měł wotkaz do <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> a CC BY-SA do <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> měć. Jeli medij wužiwaÅ¡, hdźež wotkazy móžno njejsu (na př. wućišćane dźěło), namjetujemy, zo pokazujeÅ¡ swojich čitarjow na www.openstreetmap.org a na www.creativecommons.org.\n</p>\n\n<h3>DalÅ¡e informacije</h3>\n<p>\nČitaj wjace wo wužiwanju naÅ¡ich datow <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Huste prawniske praÅ¡enja</a>.\n</p>\n<p>\nSobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow, kotrež su přez awtorske prawo Å¡kitane (na př. z Google Maps abo z wućišćanych kartow) bjez wurazneje dowolnosće awtorow njepřidawaja.</p>\n<p>\nHačrunjež OpenStreetMap wobsteji ze zjawnych datow, njemóžemy darmotny kartowy API za wuwiwarjow třećich poskićić. \n\nHlej naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">prawidła za wužiwanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Prawidła za wužiwanje polow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Prawidła za wužiwanje Nominatim</a>. </p> \n\n<h3>NaÅ¡i sobuskutkowacy</h3>\n<p>\nNaÅ¡a licenca CC BY-SA žada sej, zo “daÅ¡ prěnjotnemu awtorej dźak přiměrjeny medijej abo srědkej, kotryž wužiwaÅ¡”. Jednotliwi kartěrowarjo OSM nježadaja sej přidatne dźakprajenje k “sobuskutkowarjam OpenStreetMap”, ale hdyž so daty z narodneho kartěrowanskeho předewzaća abo z druheho wuznamneho žórła w OpenStreetMap zapřijimaja, je přiměrjene, jim přez direktne přewzaće jich dźakprajenja abo přez wotkazowanje na njo na tutej stronje dźak prajić.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n \n<ul id=\"contributors\">\n <li><strong>Awstralska</strong>: Wobsahuje předměšćanske daty na zakładźe datow Awstralskeho zarjada za statistiku (Australian Bureau of Statistics).</li>\n <li><strong>Awstriska</strong>: Wobsahuje daty z <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> pod <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>.</li>\n <li><strong>Kanada</strong>: Wobsahuje daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada).</li>\n <li><strong>Francoska</strong>: Wobsahuje daty z Direction Générale des Impôts.</li>\n <li><strong>Nowoseelandska</strong>: Wobsahuje daty ze žórłow wot Land Information New Zealand. Awtorske prawo wuměnjene.</li> \n <li><strong>Pólska</strong>: Wobsahuje daty z <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske prawo sobuskutkowacych UMP-pcPL. \n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Wjace wo wužiwanju UMP-datow w OSM</a></li>\n <li><strong>South Africa</strong>: Wobsahuje daty z <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, Statne awtorske prawo wuměnjene.</li>\n <li><strong>United Kingdom</strong>: Wobsahuje daty z Ordnance\n Survey © Crown copyright and database right\n 2010.</li></li>\n <li><strong>Zjednoćene kralestwo</strong>: Wobsahuje daty z Ordnance Survey (Zarjadniske krajměrjenstwo) © Awtorske prawo a prawo za datowe banki 2010.</li>\n</ul>\n\n<p>\nZapřijimanje datow do OpenStreetMap njerěka, zo poskićowar originalnych datow OpenStreetMap připóznawa, někajku garantiju dodawa abo rukowanje přewozmje.\n</p>" + legal_babble: + contributors_at_html: "<strong>Awstriska</strong>: Wobsahuje daty z <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (pod <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> a Land Tirol (pod <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT ze změnami</a>)." + contributors_au_html: "<strong>Awstralska</strong>: Wobsahuje předměšćanske daty na zakładźe datow Awstralskeho zarjada za statistiku (Australian Bureau of Statistics)." + contributors_ca_html: "<strong>Kanada</strong>: Wobsahuje daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: Za dalÅ¡e podrobnosće za to a druhe žórła, kotrež su so wužili, zo bychu OpenStreetMap polěpÅ¡ili, hlej proÅ¡u <a href="http://wiki.openstreetmap.org/wiki/Contributors">stronu sobuskutkowarjow</a> na wikiju OpenStreetMap. + contributors_footer_2_html: Zapřijimanje datow do OpenStreetMap njerěka, zo poskićowar originalnych datow OpenStreetMap připóznawa, někajku garantiju dodawa abo rukowanje přewozmje. + contributors_fr_html: "<strong>Francoska</strong>: Wobsahuje daty z Direction Générale des Impôts." + contributors_gb_html: "<strong>Zjednoćene kralestwo</strong>: Wobsahuje daty z Ordnance Survey (Zarjadniske krajměrjenstwo) © Awtorske prawo a prawo za datowe banki 2010." + contributors_intro_html: NaÅ¡a licenca CC BY-SA žada sej, zo “daÅ¡ prěnjotnemu awtorej dźak přiměrjeny medijej abo srědkej, kotryž wužiwaÅ¡”. Jednotliwi kartěrowarjo OSM nježadaja sej přidatne dźakprajenje k “sobuskutkowarjam OpenStreetMap”, ale hdyž so daty z narodneho kartěrowanskeho předewzaća abo z druheho wuznamneho žórła w OpenStreetMap zapřijimaja, je přiměrjene, jim přez direktne přewzaće jich dźakprajenja abo přez wotkazowanje na njo na tutej stronje dźak prajić. + contributors_nl_html: "<strong>Nižozemska</strong>: Wobsahuje daty © AND data, 2007 (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nowoseelandska</strong>: Wobsahuje daty ze žórłow wot Land Information New Zealand. Awtorske prawo wuměnjene." + contributors_pl_html: "<strong>Pólska</strong>: Wobsahuje daty z <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske prawo sobuskutkowacych UMP-pcPL. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\"> Wjace wo wužiwanju UMP-datow w OSM</a>" + contributors_title_html: NaÅ¡i sobuskutkowacy + contributors_za_html: "<strong>Južna Afrika</strong>: Wobsahuje daty z <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, Statne awtorske prawo wuměnjene." + credit_1_html: Jeli kartowe wobrazy z OpenStreetMap wužiwaÅ¡, žadamy sej, zo znajmjeńša podawaÅ¡ “© OpenStreetMap a sobuskutkowacych, CC BY-SA”. Jeli jenož kartowe daty wužiwaÅ¡, dyrbiÅ¡ “kartowe daty © OpenStreetMap a sobuskutkowacych, CC BY-SA” podać. + credit_2_html: Hdźež je móžno, OpenStreetMap měł wotkaz do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> a CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a> měć. Jeli medij wužiwaÅ¡, hdźež wotkazy móžno njejsu (na př. wućišćane dźěło), namjetujemy, zo pokazujeÅ¡ swojich čitarjow na www.openstreetmap.org a na www.creativecommons.org. + credit_title_html: Kak awtorstwo OpenStreetMap naspomnić + intro_1_html: OpenStreetMap wobsteji ze <i>zjawnych datow</i>, licencowanych pod licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA). + intro_2_html: MóžeÅ¡ naÅ¡e karty a daty kopěrować, rozdźělić, přenjesć a přiměrić, tak dołho kaž OpenStreetMap a jich sobuskutkowacych naspominaÅ¡. Jeli změniÅ¡ naÅ¡e karty abo daty abo zepěraÅ¡ so na nje, móžeÅ¡ wuslědk jenož pod samsnej licencu rozdźělić. Dospołny <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">prawniski kod</a> wujasnja twoje prawa a zamołwitosće. + more_1_html: Čitaj wjace wo wužiwanju naÅ¡ich datow <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Huste prawniske praÅ¡enja</a>. + more_2_html: Sobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow, kotrež su přez awtorske prawo Å¡kitane (na př. z Google Maps abo z wućišćanych kartow) bjez wurazneje dowolnosće awtorow njepřidawaja. + more_3_html: "Hačrunjež OpenStreetMap wobsteji ze zjawnych datow, njemóžemy darmotny kartowy API za wuwiwarjow třećich poskićić. \nHlej naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">prawidła za wužiwanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Prawidła za wužiwanje polow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Prawidła za wužiwanje Nominatim</a>." + more_title_html: DalÅ¡e informacije + title_html: Awtorske prawo a licenca native: mapping_link: kartěrowanje započeć native_link: hornjoserbskej wersiji @@ -998,12 +1057,16 @@ hsb: messages: MaÅ¡ %{new_messages} a %{old_messages} my_inbox: Mój póst new_messages: + few: "%{count} nowe powěsće" one: "%{count} nowa powěsć" - other: "%{count} nowej powěsći" + other: "%{count} nowych powěsćow" + two: "%{count} nowej powěsći" no_messages_yet: Hišće nimaÅ¡ powěsće. Staj da so z jednym z %{people_mapping_nearby_link}, do zwiska. old_messages: + few: "%{count} stare powěsće" one: "%{count} stara powěsć" - other: "%{count} starej powěsći" + other: "%{count} starych powěsćow" + two: "%{count} starej powěsći" outbox: pósłany people_mapping_nearby: ludźi, kotřiž w bliskosći kartěruja subject: Temowe nadpismo @@ -1029,16 +1092,14 @@ hsb: body: Bohužel powěsć z tutym ID njeje. heading: Powěsć njeeksistuje title: Powěsć njeeksistuje - no_such_user: - body: Bohužel wužiwar z tym mjenom njeeksistuje. - heading: Wužiwar njeeksistuje - title: Wužiwar njeeksistuje outbox: date: Datum inbox: póstowy kašćik messages: + few: Sy %{count} powěsće pósłał one: Sy %{count} powěsć pósłał - other: Sy %{count} powěsći pósłał + other: Sy %{count} powěsćow pósłał + two: Sy %{count} powěsći pósłał my_inbox: Mój %{inbox_link} no_sent_messages: Hišće njejsy powěsće pósłał. Staj da so z jednym z %{people_mapping_nearby_link}, do zwiska. outbox: pósłany @@ -1204,6 +1265,8 @@ hsb: allow_write_gpx: GPS-ćěrje nahrać. allow_write_prefs: jich wužiwarske nastajenja změnić. authorize_url: "URL awtorizować:" + confirm: Sy sej wěsty? + delete: Klient zhaÅ¡eć edit: Podrobnosće wobdźěłać key: "Kluč přetrjebowarja:" requests: "Požadanje slědowacych prawow wot wužiwarja:" @@ -1213,6 +1276,37 @@ hsb: url: URL za napraÅ¡owanski token update: flash: Klientowe informacije wuspěšnje zaktualizowane + redaction: + create: + flash: Redakcija je so wutworiła. + destroy: + error: Při haÅ¡enju tuteje redakcije je zmylk wustupił. + flash: Redakcija je so zhaÅ¡ała. + not_empty: Redakcija njeje prózdna. ProÅ¡u wotstroń wšě wersije tuteje redakcije, prjedy hač ju zhaÅ¡eÅ¡. + edit: + description: Wopisanje + heading: Redakciju wobdźěłać + submit: Redakciju składować + title: Redakciju wobdźěłać + index: + empty: Žane redakcije njejsu. + heading: Lisćina redakcijow + title: Lisćina redakcijow + new: + description: Wopisanje + heading: Informacije za nowu redakciju zapodać + submit: Redakciju wutworić + title: Nowa redakcija so wutworja + show: + confirm: Sy sej wěsty? + description: "Wopisanje:" + destroy: Tutu redakciju wotstronić + edit: Tutu redakciju wobdźěłać + heading: Redakcija "%{title}" so pokazuje + title: Redakcija so pokazuje + user: "Tworićel:" + update: + flash: Změny składowane. site: edit: anon_edits_link_text: Zwěsćić, čehoždla je tomu tak. @@ -1227,7 +1321,6 @@ hsb: index: js_1: Pak wužiwaÅ¡ wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript znjemóžnił. js_2: OpenStreetMap JavaScript za slippy map wužiwa. - js_3: MóžeÅ¡ <a href="http://tah.openstreetmap.org/Browse/">wobhladowak Tiles@Home</a> wužiwać, jeli njemóžeÅ¡ JavaScript znóžnić. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Licencowany pod licencu %{license_name} přez %{project_name} a jeho sobuskutkowacych. @@ -1304,6 +1397,23 @@ hsb: unclassified: Njeklasifikowana dróha unsurfaced: Njewobtwjerdźena dróha wood: Lěs + markdown_help: + alt: Alternatiwny tekst + first: Prěni element + heading: Nadpis + headings: Nadpisy + image: Wobraz + link: Wotkaz + ordered: Čisłowana lisćina + second: Druhi element + subheading: Podnapis + text: Tekst + title_html: Z <a href="http://daringfireball.net/projects/markdown/">Markdown</a> analyzowany + unordered: Naličenje + url: URL + richtext_area: + edit: Wobdźěłać + preview: Přehlad search: search: Pytać search_help: "přikłady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', abo 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>dalÅ¡e přikłady...</a>" @@ -1315,7 +1425,7 @@ hsb: search_results: Pytanske wuslědki time: formats: - friendly: "%e %B %Y %H:%M" + friendly: "%e. %B %Y %H:%M" trace: create: trace_uploaded: Twoja GPX-dataja je so nahrała a čaka na zasunjenje do datoweje banki. To so zwjetÅ¡a za poł hodźiny stawa a po dokónčenju budźe so ći e-mejl słać. @@ -1340,16 +1450,13 @@ hsb: visibility: "Widźomnosć:" visibility_help: Å¡to to woznamjenja? list: + empty_html: Ničo tu njeje. <a href='%{upload_link}'>Nahraj nowu ćěr</a> abo wukń wjace wo GPS-slědowanju na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikijowej stronje</a>. public_traces: Zjawne GPS-ćěrje public_traces_from: Zjawne GPS-ćěrje wot %{user} tagged_with: Markěrowane přez %{tags} your_traces: Twoje GPS-ćěrje make_public: made_public: Čara wozjewjena - no_such_user: - body: Wodaj, wužiwar z mjneom %{user} njeeksistuje. ProÅ¡u skontroluj swój prawopis abo snano wotkaz, na kotryž sy kliknył, je njepłaćiwy. - heading: Wužiwar %{user} njeeksistuje - title: Wužiwar njeeksistuje offline: heading: Składowanje offline GPX message: Składowanje a nahrawanski system GPX-datajow tuchwilu k dispoziciji steji. @@ -1388,8 +1495,8 @@ hsb: trace_optionals: tags: Atributy trace_paging_nav: - next: Přichodny » - previous: « Předchadny + newer: NowÅ¡e ćěrje + older: StarÅ¡e ćěrje showing_page: Pokazuje so strona %{page} view: delete_track: Tutu čaru zničić @@ -1703,7 +1810,6 @@ hsb: filter: block_expired: Blokowanje je hižo spadnjene a njeda so wobdźěłać. block_period: Doba blokowanja dyrbi jedna z hódnotow być, kotrež hodźa so z padaceho menija wubrać. - not_a_moderator: DyrbiÅ¡ moderator być, zo by móhł tutu akciju wuwjesć. helper: time_future: Kónči so %{time}. time_past: Je so před %{time} skónčiło. @@ -1733,11 +1839,14 @@ hsb: creator_name: Blokowar display_name: Zablokowany wužiwar edit: Wobdźěłać + next: Přichodny » not_revoked: (njezběhnjeny) + previous: « Předchadny reason: Přičina za blokowanje revoke: Zběhnyć! revoker_name: Zběhnjene wot show: Pokazać + showing_page: Pokazuje so strona %{page} status: Status period: few: "%{count} hodźiny" diff --git a/config/locales/hu.yml b/config/locales/hu.yml index def1bf63f..6987b2185 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1,12 +1,15 @@ -# Messages for Hungarian (Magyar) +# Messages for Hungarian (magyar) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: BáthoryPéter # Author: City-busz # Author: Dani # Author: Dj # Author: Glanthor Reviol # Author: Leiric # Author: Misibacsi +# Author: Nemo bis +# Author: R-Joe # Author: Sucy hu: activerecord: @@ -80,6 +83,8 @@ hu: application: require_cookies: cookies_needed: Úgy tűnik, hogy a böngésződben le vannak tiltva a sütik – a folytatás előtt engedélyezd azokat. + require_moderator: + not_a_moderator: A művelet végrehajtásához moderátornak kell lenned. setup_user_auth: blocked: Az API-hoz való hozzáférésed blokkolva lett. Jelentkezz be a webes felületen a részletek megtekintéséhez. need_to_see_terms: Az API-hoz való hozzáférésed ideiglenesen felfüggesztésre került. Jelentkezz be a webes felületen a közreműködési feltételek megtekintéséhez. Ezt nem kell elfogadnod, de meg kell tekintened. @@ -87,7 +92,6 @@ hu: changeset: changeset: "Módosításcsomag: %{id}" changesetxml: Changeset XML - download: "%{changeset_xml_link} vagy %{osmchange_xml_link} letöltése" feed: title: "Módosításcsomag: %{id}" title_comment: "Módosításcsomag: %{id} - %{comment}" @@ -149,21 +153,19 @@ hu: next_changeset_tooltip: "%{user} következő szerkesztése" prev_changeset_tooltip: "%{user} előző szerkesztése" node: - download: "%{download_xml_link}, %{view_history_link} vagy %{edit_link}" download_xml: XML letöltése - edit: szerkesztés + edit: Pont szerkesztése node: Pont node_title: "Pont: %{node_name}" - view_history: előzmények megtekintése + view_history: Előzmények megtekintése node_details: coordinates: "Koordináták:" part_of: "Része:" node_history: - download: "%{download_xml_link} vagy %{view_details_link}" download_xml: XML letöltése node_history: Pont előzményei node_history_title: "Pont előzményei: %{node_name}" - view_details: részletek megtekintése + view_details: Részletek megtekintése not_found: sorry: Sajnálom, a(z) %{id} azonosítójú %{type} nem található. type: @@ -174,21 +176,24 @@ hu: paging_nav: of: "összesen:" showing_page: "Jelenlegi oldal:" + redacted: + type: + node: pont + relation: kapcsolat + way: vonal relation: - download: "%{download_xml_link} vagy %{view_history_link}" download_xml: XML letöltése relation: Kapcsolat relation_title: "Kapcsolat: %{relation_name}" - view_history: előzmények megtekintése + view_history: Előzmények megtekintése relation_details: members: "Tagok:" part_of: "Része:" relation_history: - download: "%{download_xml_link} vagy %{view_details_link}" download_xml: XML letöltése relation_history: Kapcsolat előzményei relation_history_title: "Kapcsolat előzményei: %{relation_name}" - view_details: részletek megtekintése + view_details: Részletek megtekintése relation_member: entry_role: "%{type} %{name} mint %{role}" type: @@ -200,14 +205,14 @@ hu: view_data: Adatok megtekintése a térkép jelenlegi nézetéhez start_rjs: data_frame_title: Adatok - data_layer_name: Adatok + data_layer_name: Térképadatok böngészése details: Részletek drag_a_box: Terület kijelöléséhez rajzolj egy négyzetet a térképen edited_by_user_at_timestamp: "[[user]] szerkesztette ekkor: [[timestamp]]" hide_areas: Területek elrejtése history_for_feature: "[[feature]] előzményei" load_data: Adatok betöltése - loaded_an_area_with_num_features: "Olyan területet töltöttél be, amely [[num_features]] elemet tartalmaz. Néhány böngésző lehet, hogy nem birkózik meg ekkora mennyiségű adattal. Általában a böngészők egyszerre kevesebb mint 100 elem megjelenítésével működnek a legjobban: minden más esetben a böngésző lelassulhat/nem válaszolhat. Ha biztos vagy benne, hogy meg szeretnéd jeleníteni ezeket az adatokat, megteheted ezt az alábbi gombra kattintva." + loaded_an_area_with_num_features: "Olyan területet töltöttél be, amely [[num_features]] elemet tartalmaz. Néhány böngésző lehet, hogy nem birkózik meg ekkora mennyiségű adattal. Általában a böngészők egyszerre legfeljebb [[max_features]] elemet tudnak megjeleníteni: minden más esetben a böngésző lelassulhat/nem válaszolhat. Ha biztos vagy benne, hogy meg szeretnéd jeleníteni ezeket az adatokat, megteheted ezt az alábbi gombra kattintva." loading: Betöltés… manually_select: Más terület kézi kijelölése object_list: @@ -246,10 +251,9 @@ hu: relation: kapcsolat way: vonal way: - download: "%{download_xml_link}, %{view_history_link} vagy %{edit_link}" download_xml: XML letöltése - edit: szerkesztés - view_history: előzmények megtekintése + edit: Szerkesztés + view_history: Előzmények megtekintése way: Vonal way_title: "Vonal: %{way_name}" way_details: @@ -259,9 +263,8 @@ hu: nodes: "Pontok:" part_of: "Része:" way_history: - download: "%{download_xml_link} vagy %{view_details_link}" download_xml: XML letöltése - view_details: részletek megtekintése + view_details: Részletek megtekintése way_history: Vonal előzményei way_history_title: "Vonal előzményei: %{way_name}" changeset: @@ -290,6 +293,8 @@ hu: description_nearby: Közeli felhasználók módosításcsomagjai description_user: "%{user} módosításcsomagjai" description_user_bbox: "%{user} módosításcsomagjai ezen belül: %{bbox}" + empty_anon_html: Még nincs szerkesztése + empty_user_html: Úgy tűnik, még nincsen szerkesztésed. Kezdetnek javasoljuk, hogy olvasd el a <a href='http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide_1.3'>Kezdők Kézikönyvét</a>. heading: Módosításcsomagok heading_bbox: Módosításcsomagok heading_friend: Módosításcsomagok @@ -305,6 +310,14 @@ hu: timeout: sorry: Sajnálom, az általad kért módosításcsomagok listájának lekérése túl sokáig tartott. diary_entry: + comments: + ago: "%{ago}" + comment: Megjegyzés + has_commented_on: "%{display_name} hozzászólt az alábbi naplóbejegyzésekhez" + newer_comments: Úabb hozzászólások + older_comments: Régebbi hozzászólások + post: Hozzászólás + when: Mikor diary_comment: comment_from: "%{link_user} hozzászólása ekkor: %{comment_created_at}" confirm: Megerősítés @@ -362,10 +375,6 @@ hu: body: Sajnálom, de nincs naplóbejegyzés vagy hozzászólás %{id} azonosítóval. Ellenőrizd a helyességét, vagy lehet, hogy a link, amire kattintottál, rossz. heading: "Nincs naplóbejegyzés ezzel az azonosítóval: %{id}" title: Nincs ilyen naplóbejegyzés - no_such_user: - body: Sajnálom, nincs %{user} nevű felhasználó. Ellenőrizd a helyességét, vagy lehet, hogy a link, amire kattintottál, rossz. - heading: "%{user} felhasználó nem létezik" - title: Nincs ilyen felhasználó view: leave_a_comment: Hozzászólás írása login: Jelentkezz be @@ -398,6 +407,7 @@ hu: licence: Licenc longitude: "Földrajzi hosszúság:" manually_select: Más terület kézi kijelölése + map_image: Térkép (Alapértelmezett réteg) max: max. options: Beállítások osm_xml_data: OpenStreetMap XML adat @@ -460,16 +470,28 @@ hu: suffix_suburb: "%{suffix} (%{parentname})" search_osm_nominatim: prefix: + aeroway: + aerodrome: Repülőtér + apron: Forgalmi előtér + gate: Kapu + helipad: Helikopter-leszálló + runway: Kifutópálya + taxiway: gurulóút + terminal: Utasterminál amenity: + WLAN: WiFi hozzáférés airport: Repülőtér arts_centre: Művészeti központ + artwork: Műalkotás atm: Bankautomata auditorium: Auditórium bank: Bank bar: Bár + bbq: Grillsütő bench: Pad bicycle_parking: Kerékpártároló bicycle_rental: Kerékpárkölcsönző + biergarten: Sörkert brothel: Bordélyház bureau_de_change: Pénzváltó bus_station: Autóbusz-állomás @@ -478,6 +500,7 @@ hu: car_sharing: Autómegosztás car_wash: Autómosó casino: Kaszinó + charging_station: Elektromos töltőállomás cinema: Mozi clinic: Klinika club: Klub @@ -499,7 +522,7 @@ hu: fountain: Szökőkút fuel: Benzinkút grave_yard: Kis temető - gym: Fitness- / Tornaterem + gym: Fitnesz- / Tornaterem hall: Csarnok health_centre: Egészségügyi központ hospital: Kórház @@ -536,9 +559,12 @@ hu: shelter: Esőház shop: Bolt shopping: Bevásárlás + shower: Zuhanyzó + social_centre: Szociális központ social_club: Társasági klub studio: Stúdió supermarket: Szupermarket + swimming_pool: Úszómedence taxi: Taxi telephone: Nyilvános telefon theatre: Színház @@ -553,37 +579,17 @@ hu: youth_centre: Ifjúsági központ boundary: administrative: Közigazgatási határ + census: Népszámlálási határ + national_park: Nemzeti Park + protected_area: Védett terület + bridge: + aqueduct: Vízvezeték + suspension: Függőhíd + swing: Nyitható híd + viaduct: Viadukt + "yes": Híd building: - apartments: Társasház - block: Háztömb - bunker: Bunker - chapel: Kápolna - church: Templom - city_hall: Városháza - commercial: Kereskedelmi épület - dormitory: Kollégium - entrance: Épületbejárat - faculty: Egyetemi épület - farm: Tanyaépület - flats: Lakások - garage: Garázs - hall: Csarnok - hospital: Kórházépület - hotel: Szálloda - house: Ház - industrial: Ipari épület - office: Irodaház - public: Középület - residential: Lakóház - retail: Kereskedelmi épület - school: Iskolaépület - shop: Bolt - stadium: Stadion - store: Áruház - terrace: Sorház - tower: Torony - train_station: Vasútállomás - university: Egyetemi épület + "yes": Épület highway: bridleway: Lovaglóút bus_guideway: Buszsín @@ -591,12 +597,11 @@ hu: byway: Kiépítetlen ösvény construction: Építés alatt álló közút cycleway: Kerékpárút - distance_marker: Távolságjelölő emergency_access_point: Vészhelyzeti hozzáférési pont footway: Gyalogút ford: Gázló - gate: Kapu living_street: Pihenőút + milestone: Kilométerkő minor: Alárendelt út motorway: Autópálya motorway_junction: Autópálya-csomópont @@ -608,14 +613,17 @@ hu: primary_link: Főút raceway: Versenypálya residential: Lakóövezeti út + rest_area: Pihenési terület road: Út secondary: Összekötő út secondary_link: Összekötő út service: Szervizút services: Autópálya-pihenőhely + speed_camera: Sebességmérő kamera steps: Lépcső stile: Lépcsős átjáró tertiary: Bekötőút + tertiary_link: Bekötőút track: Földút trail: Túraút trunk: Autóút @@ -629,6 +637,7 @@ hu: building: Épület castle: Vár church: Templom + fort: Erőd house: Ház icon: Ikon manor: Majorság @@ -653,6 +662,7 @@ hu: farmland: Mezőgazdasági terület farmyard: Tanya épületei forest: Erdő + garages: Garázs grass: Füves terület greenfield: Zöldmező industrial: Ipari terület @@ -660,15 +670,15 @@ hu: meadow: Rét military: Katonai terület mine: Bánya - mountain: Hegy nature_reserve: Természetvédelmi terület + orchard: Gyümölcsös park: Park piste: Sípálya - plaza: Tér quarry: Kőfejtő railway: Vasúti terület recreation_ground: Szabadidőpark reservoir: Víztározó + reservoir_watershed: Víztározó residential: Lakóövezet retail: Kereskedelmi terület village_green: Közös mező @@ -677,8 +687,10 @@ hu: wood: Erdő leisure: beach_resort: Tengerparti üdülőhely + bird_hide: Madárles common: Közös terület fishing: Horgászterület + fitness_station: Fitneszterem garden: Kert golf_course: Golfpálya ice_rink: Műjégpálya @@ -689,12 +701,17 @@ hu: pitch: Labdarúgópálya playground: Játszótér recreation_ground: Szabadidőpark + sauna: Szauna slipway: Sólya sports_centre: Sportközpont stadium: Stadion swimming_pool: Uszoda track: Futópálya water_park: Vízipark + military: + airfield: Katonai repülőtér + barracks: Laktanya + bunker: Bunker natural: bay: Öböl beach: Part @@ -702,11 +719,12 @@ hu: cave_entrance: Barlangbejárat channel: Csatorna cliff: Szikla - coastline: Tengerpart crater: Kráter + dune: Dűne feature: Tereptárgy fell: Kopár fjord: Fjord + forest: Erdő geyser: Gejzír glacier: Gleccser heath: Puszta @@ -726,6 +744,7 @@ hu: scrub: Cserjés shoal: Zátony spring: Forrás + stone: Kő strait: Tengerszoros tree: Fa valley: Völgy @@ -734,6 +753,19 @@ hu: wetland: Láp wetlands: Láp wood: Erdő + office: + accountant: Könyvelő + architect: Építész + company: Cég + employment_agency: Foglalkoztatási Ügynökség + estate_agent: Ingatlanügynök + government: Kormányzati hivatal + insurance: Biztosítási iroda + lawyer: Ügyvéd + ngo: Nem kormányzati iroda + telecommunication: Távközlési iroda + travel_agent: Utazási iroda + "yes": Iroda place: airport: Repülőtér city: Nagyváros @@ -745,6 +777,7 @@ hu: houses: Házak island: Sziget islet: Kis sziget + isolated_dwelling: Elszigetelt épület locality: Hely moor: Mocsár municipality: Település @@ -768,6 +801,7 @@ hu: junction: Vasúti csomópont level_crossing: Vasúti átjáró light_rail: HÉV + miniature: Miniatűr vasút monorail: Egysínű vasút narrow_gauge: Keskeny nyomközű vasút platform: Vasúti peron @@ -782,7 +816,7 @@ hu: yard: Rendező-pályaudvar shop: alcohol: Alkoholos italbolt - apparel: Ruházati bolt + antiques: Régiségek art: Művészeti bolt bakery: Pékség beauty: Szépészeti bolt @@ -791,7 +825,6 @@ hu: books: Könyvesbolt butcher: Hentesbolt car: Autókereskedés - car_dealer: Autókereskedés car_parts: Autóalkatrészbolt car_repair: Autószerviz carpet: Szőnyegbolt @@ -806,7 +839,6 @@ hu: department_store: Áruház discount: Diszkontárubolt doityourself: Barkácsbolt - drugstore: Illatszerbolt dry_cleaning: Ruhatisztító electronics: Elektronikai bolt estate_agent: Ingatlankereskedés @@ -872,7 +904,10 @@ hu: valley: Völgy viewpoint: Kilátó zoo: Állatkert + tunnel: + "yes": Alagút waterway: + artificial: Mesterséges víziút boatyard: Hajóhangár canal: Csatorna connector: Vízi csatlakozó @@ -898,6 +933,7 @@ hu: base: cycle_map: Kerékpártérkép mapquest: MapQuest Open + standard: Alapértelmezett transport_map: Tömegközlekedési térkép site: edit_disabled_tooltip: Közelíts a térkép szerkesztéséhez @@ -907,6 +943,7 @@ hu: history_tooltip: Szerkesztések megtekintése ezen a területen history_zoom_alert: Közelítened kell a szerkesztési előzmények megtekintéséhez layouts: + community: Közösség community_blogs: Közösségi blogok community_blogs_title: Blogok az OpenStreetMap közösség tagjaitól copyright: Szerzői jog és licenc @@ -928,17 +965,17 @@ hu: history: Előzmények home: otthon home_tooltip: Ugrás otthonra - inbox: postaláda (%{count}) + inbox_html: postaláda %(count) inbox_tooltip: one: A postaláda 1 olvasatlan üzenetet tartalmaz other: A postaláda %{count} olvasatlan üzenetet tartalmaz zero: A postaláda nem tartalmaz olvasatlan üzenetet intro_1: Az OpenStreetMap egy szabadon szerkeszthető térkép az egész világról. Olyan emberek készítik, mint Te. - intro_2: Az OpenStreetMap lehetővé teszi neked, hogy szabadon megtekintsd, szerkeszd és használd a földrajzi adatokat, bárhol is vagy a Földön. - intro_3: "Az OpenStreetMap hostingját szívélyesen támogatják: %{ucl}, %{ic} és %{bytemark}. A projekt további támogatói a %{partners} találhatók." - intro_3_bytemark: Bytemark - intro_3_ic: Imperial College London - intro_3_partners: wikiben + intro_2_create_account: Felhasználói fiók létrehozása + intro_2_download: letöltés + intro_2_html: Az adatok %{download} és%{use} ingyenes és korlátozásoktól mentes. Hozzon létre %{create_account} a térképek szerkesztéséhez. + intro_2_license: open license + intro_2_use: használata license: title: Az OpenStreetMap adatokra a Creative Commons Nevezd meg!-Így add tovább! 2.0 Általános Licenc vonatkozik log_in: bejelentkezés @@ -952,9 +989,14 @@ hu: title: Támogasd az OpenStreetMapot pénzadománnyal osm_offline: Az OpenStreetMap-adatbázis jelenleg offline, miközben alapvető adatbázis-karbantartási munkát végzeznek. osm_read_only: Az OpenStreetMap-adatbázis jelenleg csak olvasható, miközben alapvető adatbázis-karbantartási munkát végzeznek. + partners_bytemark: Bytemark Hosting + partners_html: A szerver üzemeltetését támogatja az %{ucl}, %{ic} és %{bytemark}, valamint további %{partners}. + partners_ic: Imperial College London + partners_partners: partnerek + partners_ucl: az UCL VR központ sign_up: regisztráció sign_up_tooltip: Új felhasználói fiók létrehozása szerkesztéshez - sotm2011: Gyere a 2011-es OpenStreetMap Konferenciára, a The State of the Mapra, szeptember 9-11. között Denverbe! + sotm2012: Gyere a 2012-es OpenStreetMap, The State of the Map konferenciára, szeptember 6 és 8 között Tokióba! tag_line: A szabad világtérkép user_diaries: Naplók user_diaries_tooltip: Felhasználói naplók megtekintése @@ -969,7 +1011,27 @@ hu: english_link: az eredeti angol nyelvű text: Abban az esetben, ha ez a lefordított oldal és %{english_original_link} eltér egymástól, akkor az angol nyelvű oldal élvez elsőbbséget title: Erről a fordításról - legal_babble: "<h2>Szerzői jog és licenc</h2>\n<p>\n Az OpenStreetMap egy <i>szabad adathalmaz</i>, amelyre a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Nevezd meg! - Így add tovább! 2.0</a> licenc (CC-BY-SA) vonatkozik.\n</p>\n<p>\n Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod térképünket\n és adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és\n közreműködőit. Ha módosítod vagy felhasználod térképünket vagy adatainkat, akkor\n az eredményt is csak azonos licenccel terjesztheted. A\n teljes <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">jogi\n szöveg</a> ismerteti a jogaidat és kötelezettségeidet.\n</p>\n\n<h3>Hogyan kell feltüntetned az OpenStreetMapot?</h3>\n<p>\n Ha az OpenStreetMap térkép képeit használod, kérünk, hogy\n legyen feltüntetve legalább az “© OpenStreetMap\n közreműködői, CC-BY-SA” szöveg. Ha csak a térkép adatait használod,\n akkor a “Térképadatok © OpenStreetMap közreműködői,\n CC-BY-SA” feltüntetését kérjük.\n</p>\n<p>\n Ahol lehetséges, ott az OpenStreetMapnak hiperhivatkoznia kell a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>,\n a CC-BY-SA-nak pedig a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> webhelyre. Ha\n olyan médiumot használsz, ahol a hivatkozás nem lehetséges (pl. egy\n nyomtatott munka), javasoljuk, hogy irányítsd az olvasóidat a\n www.openstreetmap.org (esetleg az\n ‘OpenStreetMap’ szöveg kibővítésével erre a teljes címre) és a\n www.creativecommons.org webhelyre.\n</p>\n\n<h3>Tudj meg többet!</h3>\n<p>\n További információ adataink használatáról a <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Jogi\n GYIK</a>-ben.\n</p>\n<p>\n Az OSM közreműködői emlékeztetve lettek arra, hogy soha ne adjanak hozzá adatokat egyetlen\n szerzői jogvédett forrásból (pl. Google Térkép vagy nyomtatott térképek) se a\n szerzői jog tulajdonosának kifejezett engedélye nélkül.\n</p>\n<p>\n Bár az OpenStreetMap szabad adathalmaz, nem tudunk biztosítani\n ingyenes térkép API-t külső fejlesztőknek.\n\n Lásd a <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-használati irányelveket</a>,\n a <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Csempehasználati irányelveket</a>\n és a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim használati irányelveit</a>.\n</p>\n\n<h3>Közreműködőink</h3>\n<p>\n A CC-BY-SA licencünk előírja, hogy “az eredeti szerzőt\n a médiumnak vagy a használt eszköznek megfelelően fel kell\n tüntetni”. Az egyéni térképszerkesztők nem kérik\n feltüntetésüket az “OpenStreetMap közreműködői” szövegen\n felül, de ahol az OpenStreetMap nemzeti térképészeti\n ügynökségtől vagy más jelentős forrásból származó adatokat tartalmaz,\n ott ésszerű lehet feltüntetni azokat közvetlenül,\n vagy hivatkozva erre az oldalra.\n</p>\n\n<!--\nInformáció az oldalszerkesztőknek\n\nAz alábbi listában csak azok a szervezetek szerepelnek, amelyek igénylik megnevezésüket\nadataik OpenStreetMapban történő használata feltételeként. Ez nem az\nimportálások általános katalógusa, és nem kell alkalmazni, kivéve, ha\na megnevezés szükséges ahhoz, hogy eleget tegyünk az importált adatok\nlicencfeltételeinek.\n\nBármilyen hozzáadás előtt először meg kell beszélni azt az OSM rendszer-adminisztrátorokkal.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Ausztrália</strong>: tartalmaz külvárosi adatokat az\n Ausztrál Statisztikai Hivatal adatain alapulva.</li>\n <li><strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a>\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a> licenc alatt.</li>\n <li><strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>France</strong>: adatokat tartalmaz a következő forrásból:\n Direction Générale des Impôts.</li>\n <li><strong>Új-Zéland</strong>: adatokat tartalmaz a következő forrásból:\n Land Information New Zealand. Szerzői jog fenntartva.</li>\n <li><strong>Lengyelország</strong>: adatokat tartalmaz a következő forrásból: <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL közreműködői.</li>\n <li><strong>Egyesült Királyság</strong>: tartalmaz Ordnance\n Survey adatokat © Szerzői és adatbázisjog\n 2010.</li>\n</ul>\n\n<p>\n Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti\n adatszolgáltató támogatja az OpenStreetMapot, nyújt garanciát vagy\n vállal rá felelősséget.\n</p>" + legal_babble: + contributors_at_html: "<strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a>\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a> licenc alatt." + contributors_au_html: "<strong>Ausztrália</strong>: tartalmaz külvárosi adatokat az\n Ausztrál Statisztikai Hivatal adatain alapulva." + contributors_ca_html: "<strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_2_html: " Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti\n adatszolgáltató támogatja az OpenStreetMapot, nyújt garanciát vagy\n vállal rá felelősséget." + contributors_fr_html: "<strong>France</strong>: adatokat tartalmaz a következő forrásból:\n Direction Générale des Impôts." + contributors_gb_html: "<strong>Egyesült Királyság</strong>: tartalmaz Ordnance\n Survey adatokat © Szerzői és adatbázisjog\n 2010." + contributors_intro_html: "A CC BY-SA licencünk előírja, hogy “az eredeti szerzőt\n a médiumnak vagy a használt eszköznek megfelelően fel kell\n tüntetni”. Az egyéni térképszerkesztők nem kérik\n feltüntetésüket az “OpenStreetMap közreműködői” szövegen\n felül, de ahol az OpenStreetMap nemzeti térképészeti\n ügynökségtől vagy más jelentős forrásból származó adatokat tartalmaz,\n ott ésszerű lehet feltüntetni azokat közvetlenül,\n vagy hivatkozva erre az oldalra." + contributors_nz_html: "<strong>Új-Zéland</strong>: adatokat tartalmaz a következő forrásból:\n Land Information New Zealand. Szerzői jog fenntartva." + contributors_pl_html: "<strong>Lengyelország</strong>: adatokat tartalmaz a következő forrásból: <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL közreműködői.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nBővebben az OSM UMP használatáról</a>" + contributors_title_html: Közreműködőink + credit_1_html: "Ha az OpenStreetMap térkép képeit használod, kérünk, hogy\n legyen feltüntetve legalább az “© OpenStreetMap\n közreműködői, CC BY-SA” szöveg. Ha csak a térkép adatait használod,\n akkor a “Térképadatok © OpenStreetMap közreműködői,\n CC BY-SA” feltüntetését kérjük." + credit_2_html: "Ahol lehetséges, ott az OpenStreetMapnak hiperhivatkoznia kell a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>,\n a CC BY-SA-nak pedig a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> webhelyre. Ha\n olyan médiumot használsz, ahol a hivatkozás nem lehetséges (pl. egy\n nyomtatott munka), javasoljuk, hogy irányítsd az olvasóidat a\n www.openstreetmap.org (esetleg az\n ‘OpenStreetMap’ szöveg kibővítésével erre a teljes címre) és a\n www.creativecommons.org webhelyre." + credit_title_html: Hogyan kell feltüntetned az OpenStreetMapot? + intro_1_html: " Az OpenStreetMap egy <i>szabad adathalmaz</i>, amelyre a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Nevezd meg! - Így add tovább! 2.0</a> licenc (CC BY-SA) vonatkozik." + intro_2_html: " Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod térképünket\n és adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és\n közreműködőit. Ha módosítod vagy felhasználod térképünket vagy adatainkat, akkor\n az eredményt is csak azonos licenccel terjesztheted. A\n teljes <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">jogi\n szöveg</a> ismerteti a jogaidat és kötelezettségeidet." + more_1_html: " További információ adataink használatáról a <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Jogi\n GYIK</a>-ben." + more_2_html: " Az OSM közreműködői emlékeztetve lettek arra, hogy soha ne adjanak hozzá adatokat egyetlen\n szerzői jogvédett forrásból (pl. Google Térkép vagy nyomtatott térképek) se a\n szerzői jog tulajdonosának kifejezett engedélye nélkül." + more_3_html: " Bár az OpenStreetMap szabad adathalmaz, nem tudunk biztosítani\n ingyenes térkép API-t külső fejlesztőknek.\n\n Lásd a <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-használati irányelveket</a>,\n a <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Csempehasználati irányelveket</a>\n és a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim használati irányelveit</a>." + more_title_html: Tudj meg többet! + title_html: Szerzői jog és licenc native: mapping_link: kezdheted a térképezést native_link: magyar nyelvű változatára @@ -1015,10 +1077,6 @@ hu: body: Sajnálom, nincs üzenet ezzel az azonosítóval. heading: Nincs ilyen üzenet title: Nincs ilyen üzenet - no_such_user: - body: Sajnálom, nincs felhasználó ezzel a névvel. - heading: Nincs ilyen felhasználó - title: Nincs ilyen felhasználó outbox: date: Elküldve inbox: Beérkezett üzenetek @@ -1191,6 +1249,8 @@ hu: allow_write_gpx: GPS nyomvonalak feltöltése. allow_write_prefs: felhasználó beállításainak módosítása. authorize_url: "Felhatalmazási URL:" + confirm: Biztos vagy benne? + delete: Ügyfél törlése edit: Részletek szerkesztése key: "Fogyasztói kulcs:" requests: "A következő engedélyek kérése a felhasználótól:" @@ -1203,6 +1263,16 @@ hu: printable_name: with_id: "%{id}" with_name: "%{name} (%{id})" + redaction: + edit: + description: Leírás + new: + description: Leírás + show: + confirm: Biztos vagy benne? + user: "Készítő:" + update: + flash: Változtatások elmentve. site: edit: anon_edits_link_text: Nézz utána, miért van ez. @@ -1217,7 +1287,6 @@ hu: index: js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet, vagy letiltottad a JavaScriptet. js_2: Az OpenStreetMap JavaScriptet használ a slippy maphoz. - js_3: Megpróbálhatod a <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statikus csempeböngésző</a>t, ha nem tudod engedélyezni a JavaScriptet. license: license_name: Creative Commons Nevezd meg!-Így add tovább! 2.0 license_url: http://creativecommons.org/licenses/by-sa/2.0/deed.hu @@ -1296,6 +1365,23 @@ hu: unclassified: Egyéb út unsurfaced: Burkolatlan út wood: Erdő + markdown_help: + alt: ALT szöveg + first: Első tétel + heading: Címsor + headings: Címsorok + image: Kép + link: Hivatkozás + ordered: Rendezett lista + second: Második tétel + subheading: Alcím + text: Szöveg + title_html: "Megjelenítés: <a href=\"http://daringfireball.net/projects/markdown/\">Markdown</a>" + unordered: Rendezetlen lista + url: URL + richtext_area: + edit: Szerkeszt + preview: Előnézet search: search: Keresés search_help: "példák: 'Szeged', 'Piac utca, Debrecen', 'CB2 5AQ' vagy 'post offices near Kaposvár' <a href='http://wiki.openstreetmap.org/wiki/Search'>további példák...</a>" @@ -1332,16 +1418,13 @@ hu: visibility: "Láthatóság:" visibility_help: Mit jelent ez? list: + empty_html: Még nincs mit megjeleníteni. <a href='%{upload_link}'>Tölts fel új nyomvonalat</a>, vagy olvass bővebben a GPS nyomvonalrögzítésről a <a href='http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide_1.2'>wiki lapon</a>. public_traces: Nyilvános GPS nyomvonalak public_traces_from: "%{user} nyilvános GPS nyomvonalai" tagged_with: " %{tags} címkével" your_traces: Saját GPS nyomvonalak make_public: made_public: A nyomvonal nyilvános lett - no_such_user: - body: Sajnálom, nincs %{user} nevű felhasználó. Ellenőrizd a helyességét, vagy lehet, hogy a link, amire kattintottál, rossz. - heading: "%{user} felhasználó nem létezik" - title: Nincs ilyen felhasználó offline: heading: A GPX-tároló offline message: A GPX-fájltároló és -feltöltő rendszer jelenleg nem érhető el. @@ -1380,8 +1463,8 @@ hu: trace_optionals: tags: Címkék trace_paging_nav: - next: Következő » - previous: « Előző + newer: Újabb nyomvonalak + older: Régebbi nyomvonalak showing_page: "Jelenlegi oldal: %{page}" view: delete_track: Ezen nyomvonal törlése @@ -1488,6 +1571,7 @@ hu: summary_no_ip: "%{name} letrejött ekkor: %{date}" title: Felhasználók login: + account is suspended: "Sajnáljuk, a fiókodat felfüggesztettük gyanús tevékenység miatt.<br>Lépj kapcsolatba ezen a címen: <a href=\"%{webmaster}\">a webmasterrel</a> a kérdés tisztázásához." account not active: Sajnálom, a felhasználói fiókod még nincs aktiválva.<br />Fiókod aktiválásához kérlek, használd a fiókodat megerősítő emailben található hivatkozást, vagy <a href="%{reconfirm}">kérj egy új megerősítő emailt</a>. auth failure: Sajnálom, ilyen adatokkal nem tudsz bejelentkezni. create account minute: Hozz létre egy felhasználói fiókot. Csak egy percet vesz igénybe. @@ -1496,6 +1580,7 @@ hu: login_button: Bejelentkezés lost password link: Elfelejtetted a jelszavad? new to osm: Új vagy az OpenStreetMapnál? + no account: Nem rendelkezel még felhasználói fiókkal? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Tudj meg többet az OpenStreetMap közelgő licencváltozásáról</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">fordítások</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">vita</a>) notice_terms: Az OpenStreetMap 2012. április 1-jén új licencre vált. Ez pont olyan szabad lesz, mint a jelenlegi licencünk, de a jogi részek sokkal jobban illeszkednek a mi térképi adatbázisunkhoz. Mi szeretnénk, ha megtartanád hozzájárulásaidat az OpenStreetMapban, de ez csak akkor lehetséges, ha beleegyezel abba, hogy hozzájárulásaidat az új licenc alatt terjesszük. Különben el kell távolítanunk azokat az adatbázisból.<br /><br />Kérünk, jelenkezz be, majd szánj néhány percet az új feltételek áttekintésére és elfogadására. Köszönjük! openid: "%{logo} OpenID:" @@ -1542,7 +1627,7 @@ hu: title: Elvesztett jelszó make_friend: already_a_friend: "%{name} már a barátod." - failed: Sajnálom, %{name} felvétele barátnak sikertelen. + failed: Sajnáljuk, sikertelen volt %{name} felvétele barátnak. success: "%{name} mostantól a barátod." new: confirm email address: "E-mail cím megerősítése:" @@ -1588,7 +1673,7 @@ hu: set_home: flash success: Otthon helye sikeresen mentve suspended: - body: "<p>\n Sajnálom, felhasználói fiókod automatikusan felfüggesztésre került\n gyanús tevékenységed miatt.\n</p>\n<p>\n Ezt a döntést rövidesen felül fogja vizsgálni egy adminisztrátor, vagy\n kapcsolatba léphetsz a %{webmaster}rel, ha meg szeretnéd vitatni ezt.\n</p>" + body: "<p>\n Sajnáljuk, a felhasználói fiókodat automatikusan felfüggesztették\n gyanús tevékenységed miatt.\n</p>\n<p>\n Ezt a döntést rövidesen felül fogja vizsgálni egy adminisztrátor, vagy\n kapcsolatba léphetsz a %{webmaster}rel, ha meg szeretnéd vitatni ezt.\n</p>" heading: Felhasználói fiók felfüggesztve title: Felhasználói fiók felfüggesztve webmaster: webmester @@ -1614,6 +1699,7 @@ hu: block_history: kapott blokkolások megjelenítése blocks by me: általam kiosztott blokkolások blocks on me: saját blokkolásaim + comments: Megjegyzések confirm: Megerősítés confirm_user: felhasználó megerősítése create_block: ezen felhasználó blokkolása @@ -1629,6 +1715,7 @@ hu: edits: szerkesztések email address: "E-mail cím:" friends_changesets: Ismerőseid módosításcsomagjainak tallózása + friends_diaries: A barátok által írt naplóbejegyzések böngészése hide_user: ezen felhasználó elrejtése if set location: Ha beállítod a helyedet, egy szép térkép fog megjelenni alább. Az otthonodat a %{settings_link}nál állíthatod be. km away: "%{count} km-re innen" @@ -1636,11 +1723,14 @@ hu: m away: "%{count} m-re innen" mapper since: "Térképszerkesztő ezóta:" moderator_history: kiosztott blokkolások megjelenítése + my comments: Saját megjegyzések my diary: naplóm my edits: szerkesztéseim my settings: beállításaim my traces: saját nyomvonalak nearby users: Egyéb közeli felhasználók + nearby_changesets: A közeli felhasználók módosításainak böngészése + nearby_diaries: A közeli felhasználók naplóbejegyzéseinek böngészése new diary entry: új naplóbejegyzés no friends: Még nem adtál meg egyetlen barátot sem. no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben szerkesztenek. @@ -1688,7 +1778,6 @@ hu: filter: block_expired: A blokkolás már lejárt, és nem szerkeszthető. block_period: A blokkolási időszaknak egy, a legördülő listából kiválasztható értéknek kell lennie. - not_a_moderator: A művelet végrehajtásához moderátornak kell lenned. helper: time_future: Véget ér %{time} múlva. time_past: Véget ért %{time} óta. @@ -1718,7 +1807,9 @@ hu: creator_name: Készítő display_name: Blokkolt felhasználó edit: Szerkesztés + next: Következő » not_revoked: (nincs visszavonva) + previous: « Előző reason: Blokkolás indoklása revoke: Visszavonás! revoker_name: "Visszavonta:" diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 21aa88511..3f48b5a38 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1,7 +1,8 @@ -# Messages for Interlingua (Interlingua) +# Messages for Interlingua (interlingua) # Exported from translatewiki.net # Export driver: syck-pecl # Author: McDutchie +# Author: Nemo bis ia: activerecord: attributes: @@ -74,6 +75,8 @@ ia: application: require_cookies: cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies in tu navigator ante de continuar. + require_moderator: + not_a_moderator: Tu debe esser moderator pro executar iste action. setup_user_auth: blocked: Tu accesso al API ha essite blocate. Per favor aperi un session al interfacie web pro plus informationes. need_to_see_terms: Vostre accesso al API ha essite temporarimente suspendite. Per favor aperi session in le interfacie web pro vider le Conditiones de contributor. Non es necessari declarar se de accordo, ma es obligatori haber legite los. @@ -81,7 +84,6 @@ ia: changeset: changeset: "Gruppo de modificationes: %{id}" changesetxml: XML del gruppo de modificationes - download: Discargar %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Gruppo de modificationes %{id} title_comment: Gruppo de modificationes %{id} - %{comment} @@ -143,21 +145,19 @@ ia: next_changeset_tooltip: Modification sequente per %{user} prev_changeset_tooltip: Modification precedente per %{user} node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Discargar XML - edit: modificar + edit: Modificar nodo node: Nodo node_title: "Nodo: %{node_name}" - view_history: vider historia + view_history: Vider historia node_details: coordinates: "Coordinatas:" part_of: "Parte de:" node_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Discargar XML node_history: Historia del nodo node_history_title: "Historia del nodo: %{node_name}" - view_details: vider detalios + view_details: Vider detalios not_found: sorry: Pardono, le %{type} con le ID %{id} non ha essite trovate. type: @@ -168,21 +168,26 @@ ia: paging_nav: of: de showing_page: Monstrante pagina + redacted: + message_html: Le version %{version} de iste %{type} non pote esser monstrate perque illo ha essite obscurate. Vide %{redaction_link} pro detalios. + redaction: Obscuration %{id} + type: + node: nodo + relation: relation + way: via relation: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Discargar XML relation: Relation relation_title: "Relation: %{relation_name}" - view_history: vider historia + view_history: Vider historia relation_details: members: "Membros:" part_of: "Parte de:" relation_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Discargar XML relation_history: Historia del relation relation_history_title: "Historia del relation: %{relation_name}" - view_details: vider detalios + view_details: Vider detalios relation_member: entry_role: "%{type} %{name} como %{role}" type: @@ -194,14 +199,14 @@ ia: view_data: Vider datos pro le vista actual del carta start_rjs: data_frame_title: Datos - data_layer_name: Datos + data_layer_name: Percurrer datos cartographic details: Detalios drag_a_box: Designa un quadro super le carta pro seliger un area edited_by_user_at_timestamp: Modificate per [[user]] le [[timestamp]] hide_areas: Celar areas history_for_feature: Historia de [[feature]] load_data: Cargar datos - loaded_an_area_with_num_features: Tu ha cargate un area que contine [[num_features]] elementos. In general, alcun navigatores del web pote haber problemas de presentar un tal quantitate de datos. Generalmente, un navigator functiona melio monstrante minus de 100 elementos a un vice; alteremente, illo pote devenir lente o non responder. Si tu es secur de voler visualisar iste datos, tu pote cliccar super le button ci infra. + loaded_an_area_with_num_features: Tu ha cargate un area que contine [[num_features]] elementos. In general, alcun navigatores del web pote haber problemas in presentar un tal quantitate de datos. Generalmente, un navigator functiona melio monstrante minus de [[max_features]] elementos per vice; alteremente, illo pote devenir lente o non responder. Si tu es secur de voler visualisar iste datos, tu pote cliccar super le button a basso. loading: Cargamento... manually_select: Seliger manualmente un altere area object_list: @@ -240,10 +245,9 @@ ia: relation: relation way: via way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Discargar XML - edit: modificar - view_history: vider historia + edit: Modificar via + view_history: Vider historia way: Via way_title: "Via: %{way_name}" way_details: @@ -253,9 +257,8 @@ ia: nodes: "Nodos:" part_of: "Parte de:" way_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Discargar XML - view_details: vider detalios + view_details: Vider detalios way_history: Historia del via way_history_title: "Historia del via: %{way_name}" changeset: @@ -284,6 +287,8 @@ ia: description_nearby: Gruppos de modificationes per usatores vicin description_user: Gruppos de modificationes per %{user} description_user_bbox: Gruppos de modificationes per %{user} intra %{bbox} + empty_anon_html: Nulle modification ancora facite + empty_user_html: Il pare que tu non ha ancora facite modificationes. Pro comenciar, consulta le <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Guida pro principiantes</a>. heading: Gruppos de modificationes heading_bbox: Gruppos de modificationes heading_friend: Gruppos de modificationes @@ -299,6 +304,14 @@ ia: timeout: sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo de tempore pro esser recuperate. diary_entry: + comments: + ago: "%{ago} retro" + comment: Commento + has_commented_on: "%{display_name} ha commentate le sequente entratas de diario" + newer_comments: Commentos plus recente + older_comments: Commentos plus ancian + post: Publicar + when: Quando diary_comment: comment_from: Commento de %{link_user} a %{comment_created_at} confirm: Confirmar @@ -356,10 +369,6 @@ ia: body: Pardono, il non ha un entrata de diario o commento con le ID %{id}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte. heading: "Nulle entrata con le ID: %{id}" title: Nulle tal entrata de diario - no_such_user: - body: Pardono, il non ha un usator con le nomine %{user}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte. - heading: Le usator %{user} non existe - title: Iste usator non existe view: leave_a_comment: Lassar un commento login: Aperir session @@ -392,6 +401,7 @@ ia: licence: Licentia longitude: "Lon:" manually_select: Seliger manualmente un altere area + map_image: Imagine de carta (monstra le strato standard) max: max options: Optiones osm_xml_data: Datos XML de OpenStreetMap @@ -452,16 +462,28 @@ ia: suffix_place: ", %{distance} al %{direction} de %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodromo + apron: Pista + gate: Porta + helipad: Heliporto + runway: Pista + taxiway: Via de circulation pro aviones + terminal: Terminal amenity: + WLAN: Accesso WiFi airport: Aeroporto arts_centre: Centro artistic + artwork: Obra de arte atm: Cassa automatic auditorium: Auditorio bank: Banca bar: Bar + bbq: Barbecue bench: Banco bicycle_parking: Stationamento pro bicyclettas bicycle_rental: Location de bicyclettas + biergarten: Terrassa brothel: Bordello bureau_de_change: Officio de cambio bus_station: Station de autobus @@ -470,6 +492,7 @@ ia: car_sharing: Repartition de autos car_wash: Lavage de automobiles casino: Casino + charging_station: Station de cargamento cinema: Cinema clinic: Clinica club: Club @@ -488,6 +511,7 @@ ia: ferry_terminal: Terminal de ferry fire_hydrant: Hydrante de incendio fire_station: Caserna de pumperos + food_court: Zona de restaurantes fountain: Fontana fuel: Carburante grave_yard: Cemeterio @@ -528,9 +552,12 @@ ia: shelter: Refugio shop: Boteca shopping: Compras + shower: Ducha + social_centre: Centro social social_club: Club social studio: Appartamento de un camera supermarket: Supermercato + swimming_pool: Piscina taxi: Taxi telephone: Telephono public theatre: Theatro @@ -545,37 +572,17 @@ ia: youth_centre: Centro pro le juventute boundary: administrative: Limite administrative + census: Limite de censo + national_park: Parco national + protected_area: Area protegite + bridge: + aqueduct: Aqueducto + suspension: Ponte suspendite + swing: Ponte giratori + viaduct: Viaducto + "yes": Ponte building: - apartments: Bloco de appartamentos - block: Bloco de edificios - bunker: Bunker - chapel: Cappella - church: Ecclesia - city_hall: Casa municipal - commercial: Edificio commercial - dormitory: Dormitorio - entrance: Entrata de edificio - faculty: Edificio de facultate - farm: Edificio agricole - flats: Appartamentos - garage: Garage - hall: Sala - hospital: Edificio hospitalari - hotel: Hotel - house: Casa - industrial: Edificio industrial - office: Edificio de officio - public: Edificio public - residential: Edificio residential - retail: Magazin - school: Edificio de schola - shop: Boteca - stadium: Stadio - store: Magazin - terrace: Terrassa - tower: Turre - train_station: Station ferroviari - university: Edificio de universitate + "yes": Edificio highway: bridleway: Sentiero pro cavallos bus_guideway: Via guidate de autobus @@ -583,12 +590,11 @@ ia: byway: Via minor construction: Strata in construction cycleway: Pista cyclabile - distance_marker: Marcator de distantia emergency_access_point: Puncto de accesso de emergentia footway: Sentiero pro pedones ford: Vado - gate: Porta a cancello living_street: Strata residential + milestone: Petra milliari minor: Via minor motorway: Autostrata motorway_junction: Junction de autostrata @@ -600,14 +606,17 @@ ia: primary_link: Via principal raceway: Circuito residential: Residential + rest_area: Area de reposo road: Via secondary: Via secundari secondary_link: Via secundari service: Via de servicio services: Servicios de autostrata + speed_camera: Detector de velocitate steps: Scalones stile: Scalon o apertura de passage tertiary: Via tertiari + tertiary_link: Via tertiari track: Pista trail: Pista trunk: Via national @@ -621,6 +630,7 @@ ia: building: Edificio castle: Castello church: Ecclesia + fort: Forte house: Casa icon: Icone manor: Casa seniorial @@ -645,6 +655,7 @@ ia: farmland: Terra arabile farmyard: Corte de ferma forest: Foreste + garages: Garages grass: Herba greenfield: Terreno sin edificios industrial: Area industrial @@ -652,25 +663,28 @@ ia: meadow: Pastura military: Area militar mine: Mina - mountain: Montania nature_reserve: Reserva natural + orchard: Verdiero park: Parco piste: Pista de ski - plaza: Placia quarry: Petreria railway: Ferrovia recreation_ground: Area recreative reservoir: Reservoir + reservoir_watershed: Bassino interfluvial residential: Area residential retail: Magazines + road: Area de cammino village_green: Parco de village vineyard: Vinia wetland: Terra humide wood: Bosco leisure: beach_resort: Loco de vacantias al plagia + bird_hide: Observatorio de aves common: Terreno commun fishing: Area de pisca + fitness_station: Gymnasio garden: Jardin golf_course: Campo de golf ice_rink: Patinatorio @@ -681,12 +695,17 @@ ia: pitch: Campo sportive playground: Area de jocos recreation_ground: Terreno de recreation + sauna: Sauna slipway: Rampa de barca sports_centre: Centro sportive stadium: Stadio swimming_pool: Piscina track: Pista de athletismo water_park: Parco aquatic + military: + airfield: Aerodromo militar + barracks: Barracas + bunker: Bunker natural: bay: Baia beach: Plagia @@ -694,11 +713,12 @@ ia: cave_entrance: Entrata de caverna channel: Canal cliff: Precipitio - coastline: Linea de costa crater: Crater + dune: Duna feature: Attraction fell: Montania fjord: Fiord + forest: Foreste geyser: Geyser glacier: Glaciero heath: Landa @@ -718,6 +738,7 @@ ia: scrub: Arbusto shoal: Banco de sablo spring: Fontana + stone: Petra strait: Stricto tree: Arbore valley: Vallea @@ -726,6 +747,19 @@ ia: wetland: Terra humide wetlands: Terreno paludose wood: Bosco + office: + accountant: Contabile + architect: Architecto + company: Compania + employment_agency: Agentia de empleo + estate_agent: Agentia immobiliari + government: Officio governamental + insurance: Officio de assecurantia + lawyer: Advocato + ngo: Officio de un ONG + telecommunication: Officio de telecommunication + travel_agent: Agentia de viages + "yes": Officio place: airport: Aeroporto city: Citate @@ -737,6 +771,7 @@ ia: houses: Casas island: Insula islet: Insuletta + isolated_dwelling: Habitation isolate locality: Localitate moor: Landa municipality: Municipalitate @@ -760,6 +795,7 @@ ia: junction: Junction ferroviari level_crossing: Passage a nivello light_rail: Metro legier + miniature: Ferrovia in miniatura monorail: Monorail narrow_gauge: Ferrovia stricte platform: Platteforma ferroviari @@ -774,7 +810,7 @@ ia: yard: Station de manovras shop: alcohol: Magazin de bibitas alcoholic - apparel: Boteca de vestimentos + antiques: Antiquitates art: Magazin de arte bakery: Paneteria beauty: Salon de beltate @@ -783,7 +819,6 @@ ia: books: Libreria butcher: Macelleria car: Magazin de automobiles - car_dealer: Venditor de automobiles car_parts: Partes de automobiles car_repair: Reparation de automobiles carpet: Magazin de tapetes @@ -798,7 +833,6 @@ ia: department_store: Grande magazin discount: Boteca de disconto doityourself: Magazin de bricolage - drugstore: Drogeria dry_cleaning: Lavanderia a sic electronics: Boteca de electronica estate_agent: Agentia immobiliari @@ -864,7 +898,10 @@ ia: valley: Valle viewpoint: Puncto de vista zoo: Jardin zoologic + tunnel: + "yes": Tunnel waterway: + artificial: Via aquatic artificial boatyard: Cantier naval canal: Canal connector: Connexion aquatic @@ -890,6 +927,7 @@ ia: base: cycle_map: Carta cyclista mapquest: MapQuest Open + standard: Standard transport_map: Carta de transporto site: edit_disabled_tooltip: Face zoom avante pro modificar le carta @@ -899,6 +937,7 @@ ia: history_tooltip: Vider le modificationes de iste area history_zoom_alert: Tu debe facer zoom avante pro vider le historia de modification layouts: + community: Communitate community_blogs: Blogs del communitate community_blogs_title: Blogs de membros del communitate de OpenStreetMap copyright: Copyright & Licentia @@ -920,18 +959,18 @@ ia: history: Historia home: initio home_tooltip: Ir al position de origine - inbox: cassa de entrata (%{count}) + inbox_html: cassa de entrata %{count} inbox_tooltip: one: Tu cassa de entrata contine 1 message non legite other: Tu cassa de entrata contine %{count} messages non legite zero: Tu cassa de entrata non contine messages non legite - intro_1: OpenStreetMap es un carta libere e modificabile del mundo integre. Illo es facite per gente como te. - intro_2: OpenStreetMap permitte vider, modificar e usar datos geographic de modo collaborative desde ubique in le mundo. - intro_3: Le albergamento de OpenStreetMap es gratiosemente supportate per %{ucl}, %{ic} e %{bytemark}. Altere sponsores del projecto es listate in le %{partners}. - intro_3_bytemark: Bytemark - intro_3_ic: Imperial College London - intro_3_partners: wiki - intro_3_ucl: Centro VR del UCL + intro_1: OpenStreetMap es un carta libere e modificabile del mundo integre. Illo es facite per gente como tu. + intro_2_create_account: Crea un conto de usator + intro_2_download: discargar + intro_2_html: Le datos es libere pro %{download} e %{use} sub lor %{license}. %{create_account} pro meliorar le carta. + intro_2_license: licentia aperte + intro_2_use: usar + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: title: Le datos de OpenStreetMap es disponibile sub le licentia Attribution-Share Alike 2.0 Generic de Creative Commons log_in: aperir session @@ -945,9 +984,15 @@ ia: title: Supporta OpenStreetMap con un donation monetari osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite a operationes de mantenentia essential. osm_read_only: Le base de datos de OpenStreetMap es al momento in modo de solmente lectura durante le execution de mantenentia essential. + partners_bytemark: Bytemark Hosting + partners_html: Le allogiamento web es supportate per %{ucl}, %{ic} e %{bytemark}, e altere %{partners}. + partners_ic: Imperial College London + partners_partners: partners + partners_ucl: le Centro de Realitate Virtual del UCL + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: inscriber se sign_up_tooltip: Crear un conto pro modification - sotm2011: Veni al conferentia de OpenStreetMap de 2011, "Le stato del carta", del 9 al 11 de septembre in Denver! + sotm2012: Veni al conferentia de OpenStreetMap de 2012, "Le stato del carta", del 6 al 8 de septembre in Tokyo! tag_line: Le wiki-carta libere del mundo user_diaries: Diarios de usatores user_diaries_tooltip: Leger diarios de usatores @@ -962,7 +1007,30 @@ ia: english_link: le original in anglese text: In caso de un conflicto inter iste pagina traducite e %{english_original_link}, le pagina in anglese prevalera. title: A proposito de iste traduction - legal_babble: "<h2>Copyright e Licentia</h2>\n<p>\n OpenStreetMap es <i>datos aperte</i>, disponibile sub le licentia\n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n contributores. Si vos altera o extende nostre cartas e datos, vos\n pote distribuer le resultato solmente sub le mesme licentia. Le\n complete <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">codice\n legal</a> explica vostre derectos e responsabilitates.\n</p>\n\n<h3>Como dar recognoscentia a OpenStreetMap</h3>\n<p>\n Si vos usa imagines cartographic de OpenStreetMap, nos requesta que\n vostre recognoscentia indica al minus “© Contributores de\n OpenStreetMap, CC-BY-SA”. Si vos usa solmente datos cartographic,\n nos requesta “Datos cartographic © Contributores de OpenStreetMap,\n CC-BY-SA”.\n</p>\n<p>\n Si possibile, le parola OpenStreetMap debe esser un hyperligamine a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n e le termino CC-BY-SA debe ligar a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si\n vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un\n obra imprimite), nos suggere que vos dirige vostre lectores a\n www.openstreetmap.org (possibilemente per expander\n ‘OpenStreetMap’ a iste adresse complete) e a\n www.creativecommons.org.\n</p>\n\n<h3>Pro saper plus</h3>\n<p>\n Lege plus super le uso de nostre datos al <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n Legal</a>.\n</p>\n<p>\n Nos rememora al contributores de OSM de nunquam adder datos de alcun\n fonte subjecte al derecto de autor (p.ex. Google Maps o cartas imprimite)\n sin explicite permission del titulares del derecto de autor.\n</p>\n<p>\n Ben que OpenStreetMap es datos aperte, nos non pote fornir un\n API cartographic gratuite pro altere disveloppatores.\n\n Vide nostre <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politica pro le uso del API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politica pro le uso de tegulas</a>\n e <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politica pro le uso de Nominatim</a>.\n</p>\n\n<h3>Nostre contributores</h3>\n<p>\n Nostre licentia CC-BY-SA require que vos “recognosce le Autor\n Original de maniera rationabile pro le medio que Vos\n utilisa”. Le cartographos individual de OSM non requesta un\n recognoscentia excedente illo del “Contributores de\n OpenStreetMap”, sed ubi datos de un agentia cartographic\n national o altere fonte major ha essite includite in\n OpenStreetMap, il pote esser rationabile recognoscer les per\n directemente reproducer lor recognoscentia o per ligar a illo in iste pagina.\n</p>\n\n<!--\nInformation pro redactores de iste pagina\n\nIn le sequente lista figura solmente le organisationes que require attribution\ncomo condition pro le uso de lor datos in OpenStreetMap. Isto non es un\ncatalogo general de datos importate, e non debe esser usate salvo si\nattribution es requirite pro conformitate con le licentia del datos\nimportate.\n\nOmne additiones hic debe esser discutite primo con le administratores de OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Contine datos de suburbios a base\n de datos del Australian Bureau of Statistics.</li>\n <li><strong>Austria</strong>: Contine datos ab le\n <a href=\"http://data.wien.gv.at/\">Citate de Vienna</a> licentiate sub\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Canada</strong>: Contine datos ab\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), e StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Francia</strong>: Contine datos colligite del\n Direction Générale des Impôts.</li>\n <li><strong>Nove Zelandia</strong>: Contine datos obtenite ex\n Land Information New Zealand. Crown Copyright reservate.</li>\n <li><strong>Polonia</strong>: Contine datos cartographic ex <a\n href=\"http://ump.waw.pl/\">UMP-pcPL</a>. Copyright\n contributores de UMP-pcPL.</li>\n <li><strong>Regno Unite</strong>: Contine datos de Ordnance\n Survey © Crown copyright e derecto de base de datos\n 2010.</li>\n</ul>\n\n<p>\n Le inclusion de datos in OpenStreetMap non implica que le fornitor\n original del datos indorsa OpenStreetMap, forni alcun garantia, o\n accepta alcun responsabilitate.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: Contine datos ab le\n <a href=\"http://data.wien.gv.at/\">Citate de Vienna</a> licentiate sub\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>." + contributors_au_html: "<strong>Australia</strong>: Contine datos de suburbios a base\n de datos del Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canada</strong>: Contine datos ab\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), e StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: "Pro ulterior detalios de iste e altere fontes que ha essite usate\npro adjutar a meliorar OpenStreetMap, vide le <a\nhref=\"\"http://wiki.openstreetmap.org/wiki/Contributors\">pagina\nde contributores</a> in le wiki de OpenStreetMap." + contributors_footer_2_html: " Le inclusion de datos in OpenStreetMap non implica que le fornitor\n original del datos indorsa OpenStreetMap, forni alcun garantia, o\n accepta alcun responsabilitate." + contributors_fr_html: "<strong>Francia</strong>: Contine datos fornite per le\n Direction Générale des Impôts." + contributors_gb_html: "<strong>Regno Unite</strong>: Contine datos de Ordnance\n Survey © copyright del Corona e derecto de base de datos\n 2010." + contributors_intro_html: " Nostre licentia CC BY-SA require que vos “recognosce le Autor\n Original de maniera rationabile pro le medio que Vos\n utilisa”. Le cartographos individual de OSM non requesta un\n recognoscentia excedente illo del “Contributores de\n OpenStreetMap”, sed ubi datos de un agentia cartographic\n national o altere fonte major ha essite includite in\n OpenStreetMap, il pote esser rationabile recognoscer les per\n directemente reproducer lor recognoscentia o per ligar a illo in iste pagina." + contributors_nl_html: "<strong>Nederlandia</strong>: Contine datos © AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nove Zelandia</strong>: Contine datos proveniente de\n Land Information New Zealand. Crown Copyright reservate." + contributors_pl_html: "<strong>Polonia</strong>: Contine datos cartographic ex <a\n href=\"http://ump.waw.pl/\">UMP-pcPL</a>. Copyright\n contributores de UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Information super como OSM usa le datos de UMP</a>" + contributors_title_html: Nostre contributores + contributors_za_html: "<strong>Africa del Sud</strong>: Contine datos proveniente del\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, copyright del Stato reservate." + credit_1_html: " Si vos usa imagines cartographic de OpenStreetMap, nos requesta que\n vostre recognoscentia indica al minus “© Contributores de\n OpenStreetMap, CC BY-SA”. Si vos usa solmente datos cartographic,\n nos requesta “Datos cartographic © Contributores de OpenStreetMap,\n CC BY-SA”." + credit_2_html: " Si possibile, le parola OpenStreetMap debe esser un hyperligamine a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n e le termino CC BY-SA debe ligar a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si\n vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un\n obra imprimite), nos suggere que vos dirige vostre lectores a\n www.openstreetmap.org (forsan per inserer iste adresse\n complete in loco del parola ‘OpenStreetMap’) e a\n www.creativecommons.org." + credit_title_html: Como dar recognoscentia a OpenStreetMap + intro_1_html: " OpenStreetMap es <i>datos aperte</i>, disponibile sub le licentia\n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC BY-SA)." + intro_2_html: " Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n contributores. Si vos altera o extende nostre cartas e datos, vos\n pote distribuer le resultato solmente sub le mesme licentia. Le\n complete <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">codice\n legal</a> explica vostre derectos e responsabilitates." + more_1_html: " Lege plus super le uso de nostre datos al <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n Legal</a>." + more_2_html: " Nos rememora al contributores de OSM de nunquam adder datos de alcun\n fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)\n sin explicite permission del titulares del derecto de autor." + more_3_html: " Ben que OpenStreetMap es datos aperte, nos non pote fornir un\n API cartographic gratuite pro altere disveloppatores.\n\n Vide nostre <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politica pro le uso del API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politica pro le uso de tegulas</a>\n e <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politica pro le uso de Nominatim</a>." + more_title_html: Pro saper plus + title_html: Copyright e Licentia native: mapping_link: comenciar le cartographia native_link: version in interlingua @@ -1008,10 +1076,6 @@ ia: body: Non existe un message con iste ID. heading: Message non existe title: Message non existe - no_such_user: - body: Regrettabilemente, il non ha un usator o message con iste nomine. - heading: Iste usator non existe - title: Iste usator non existe outbox: date: Data inbox: cassa de entrata @@ -1183,6 +1247,8 @@ ia: allow_write_gpx: incargar tracias GPS. allow_write_prefs: modificar su preferentias de usator. authorize_url: "URL de autorisation:" + confirm: Es tu secur? + delete: Deler cliente edit: Modificar detalios key: "Clave de consumitor:" requests: "Le sequente permissiones es requestate del usator:" @@ -1192,6 +1258,37 @@ ia: url: "URL del indicio de requesta:" update: flash: Le information del cliente ha essite actualisate con successo + redaction: + create: + flash: Obscuration create. + destroy: + error: Un error occurreva durante le destruction de iste obscuration. + flash: Obscuration destruite. + not_empty: Le obscuration non es vacue. Per favor disobscura tote le versiones pertinente a iste obscuration ante de destruer lo. + edit: + description: Description + heading: Modificar obscuration + submit: Salveguardar obscuration + title: Modificar obscuration + index: + empty: Il non ha obscurationes a monstrar. + heading: Lista de obscurationes + title: Lista de obscurationes + new: + description: Description + heading: Specifica information pro nove obscuration + submit: Crear obscuration + title: Creation de nove obscuration + show: + confirm: Es tu secur? + description: "Description:" + destroy: Remover iste obscuration + edit: Modificar iste obscuration + heading: Es monstrate le obscuration "%{title}" + title: Presentation de obscuration + user: "Creator:" + update: + flash: Cambios salveguardate. site: edit: anon_edits_link_text: Lege proque isto es le caso. @@ -1206,7 +1303,6 @@ ia: index: js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate JavaScript. js_2: OpenStreetMap usa JavaScript pro su carta glissante. - js_3: Tu pote probar le <a href="http://tah.openstreetmap.org/Browse/">navigator de tegulas static Tiles@Home</a> si tu non succede a activar JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Publicate sub licentia %{license_name} per le %{project_name} e su contributores. @@ -1283,6 +1379,23 @@ ia: unclassified: Via non classificate unsurfaced: Cammino de terra wood: Bosco + markdown_help: + alt: Texto alternative + first: Prime elemento + heading: Titulo + headings: Titulos + image: Imagine + link: Ligamine + ordered: Lista ordinate + second: Secunde elemento + subheading: Subtitulo + text: Texto + title_html: Processate con <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Lista non ordinate + url: URL + richtext_area: + edit: Modificar + preview: Previsualisation search: search: Cercar search_help: "exemplos: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', o 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>altere exemplos...</a>" @@ -1319,16 +1432,13 @@ ia: visibility: "Visibilitate:" visibility_help: que significa isto? list: + empty_html: Ancora nihil a vider hic. <a href='%{upload_link}'>Incarga un nove tracia</a> o lege plus sur le traciamento GPS in le <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina wiki</a>. public_traces: Tracias GPS public public_traces_from: Tracias GPS public de %{user} tagged_with: " etiquettate con %{tags}" your_traces: Tu tracias GPS make_public: made_public: Tracia rendite public - no_such_user: - body: Pardono, il non ha un usator con le nomine %{user}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte. - heading: Le usator %{user} non existe - title: Iste usator non existe offline: heading: Immagazinage GPX foras de linea message: Le systema pro immagazinar e incargar files GPX es actualmente indisponibile. @@ -1367,8 +1477,8 @@ ia: trace_optionals: tags: Etiquettas trace_paging_nav: - next: Sequente » - previous: « Precedente + newer: Tracias plus nove + older: Tracias plus ancian showing_page: Pagina %{page} monstrate view: delete_track: Deler iste tracia @@ -1484,6 +1594,7 @@ ia: login_button: Aperir session lost password link: Tu perdeva le contrasigno? new to osm: Nove a OpenStreetMap? + no account: Non ha un conto? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Informa te super le imminente cambio de licentia de OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traductiones</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussion</a>) notice_terms: OpenStreetMap cambia a un nove licentia le 1 de april 2012. Iste licentia es tanto aperte como le actual, ma le stipulationes legal es multo plus apte pro nostre base de datos cartographic. Nos appreciarea multo poter retener tu contributiones in OpenStreetMap, ma nos pote facer isto solmente si tu consenti a lor distribution sub le nove licentia. Alteremente, nos debera remover los del base de datos.<br /><br />Per favor aperi session, e prende alcun secundas pro revider e acceptar le nove conditiones. Gratias! openid: "OpenID de %{logo}:" @@ -1599,9 +1710,10 @@ ia: activate_user: activar iste usator add as friend: adder como amico ago: (%{time_in_words_ago} retro) - block_history: vider blocadas recipite + block_history: blocadas recipite blocks by me: blocadas per me blocks on me: blocadas super me + comments: commentos confirm: Confirmar confirm_user: confirmar iste usator create_block: blocar iste usator @@ -1624,7 +1736,8 @@ ia: latest edit: "Ultime modification %{ago}:" m away: a %{count} m de distantia mapper since: "Cartographo depost:" - moderator_history: vider blocadas date + moderator_history: blocadas date + my comments: mi commentos my diary: mi diario my edits: mi modificationes my settings: mi configurationes @@ -1679,7 +1792,6 @@ ia: filter: block_expired: Le blocada ha ja expirate e non pote esser modificate. block_period: Le periodo de blocada debe esser un del valores seligibile in le lista disrolante. - not_a_moderator: Tu debe esser moderator pro executar iste action. helper: time_future: Expira in %{time}. time_past: Expirava %{time} retro. @@ -1709,11 +1821,14 @@ ia: creator_name: Creator display_name: Usator blocate edit: Modificar + next: Sequente » not_revoked: (non revocate) + previous: « Precedente reason: Motivo del blocada revoke: Revocar! revoker_name: Revocate per show: Monstrar + showing_page: Pagina %{page} monstrate status: Stato period: one: 1 hora diff --git a/config/locales/is.yml b/config/locales/is.yml index 3e2df8b7b..3e56459f8 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1,6 +1,7 @@ -# Messages for Icelandic (Íslenska) +# Messages for Icelandic (íslenska) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Nemo bis # Author: Snævar # Author: Ævar Arnfjörð Bjarmason is: @@ -81,7 +82,6 @@ is: changeset: changeset: "Breytingarsett: %{id}" changesetxml: Breytingarsetts XML sniði - download: Sækja breytinguna á %{changeset_xml_link} eða á %{osmchange_xml_link} feed: title: Breytingarsett %{id} title_comment: Breytingarsett %{id} - %{comment} @@ -136,7 +136,6 @@ is: next_changeset_tooltip: Næsta breytingarsett eftir %{user} prev_changeset_tooltip: Fyrri breytingarsett eftir %{user} node: - download: "%{download_xml_link} eða %{view_history_link} eða %{edit_link}" download_xml: Sækja hnútinn á XML sniði edit: breyta node: Hnútur @@ -146,7 +145,6 @@ is: coordinates: "Hnit:" part_of: "Hluti af:" node_history: - download: "%{download_xml_link} eða %{view_details_link}" download_xml: Sækja hnútinn ásamt breytingaskrá á XML sniði node_history: Breytingarskrá hnúts node_history_title: "Breytingarskrá hnúts: %{node_name}" @@ -162,7 +160,6 @@ is: of: af showing_page: Sýni síðu relation: - download: "%{download_xml_link} eða %{view_history_link}" download_xml: Sækja á XML sniði relation: Vensl relation_title: "Vensl: %{relation_name}" @@ -171,7 +168,6 @@ is: members: "Stök:" part_of: "Hluti af:" relation_history: - download: "%{download_xml_link} eða %{view_details_link}" download_xml: Sækja venslin ásamt breytingaskrá á XML sniði relation_history: Breytingarskrá vensla relation_history_title: "Breytingarskrá vensla: %{relation_name}" @@ -231,7 +227,6 @@ is: relation: venslin way: veginn way: - download: "%{download_xml_link} eða %{view_history_link} eða %{edit_link}" download_xml: Sækja veginn á XML sniði edit: breyta view_history: sýna breytingarsögu @@ -244,7 +239,6 @@ is: nodes: "Hnútar:" part_of: "Hluti af:" way_history: - download: "%{download_xml_link} eða %{view_details_link}" download_xml: Sækja veginn ásamt breytingaskrá á XML sniði view_details: sýna breytingarsögu way_history: Breytingarskrá vegs @@ -337,10 +331,6 @@ is: body: Bloggfærsla númer er ekki til %{id}. Kannski slóstu slóðina vitlaust inn eða fylgdir ógildum tengli. heading: Bloggfærsla númer %{id} er ekki til title: Þessi bloggfærsla er ekki til - no_such_user: - body: Það er ekki til notandi með nafninu %{user}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli. - heading: Notandinn %{user} er ekki til - title: Notandi ekki til view: leave_a_comment: Bæta við athugasemd login: Innskráðu þig @@ -493,32 +483,11 @@ is: vending_machine: Sjálfsali veterinary: Dýraspítali waste_basket: Ruslafata - building: - apartments: Háhýsi - chapel: Kapellan - church: Kirkjan - city_hall: Ráðhús borgarinnar - commercial: Verslunarhús - dormitory: Heimavist - entrance: Inngangur - farm: Bóndabær - garage: Bílskúr - hospital: Sjúkrahús - hotel: Hótel - house: Hús - industrial: Iðnaðarhús - office: Skrifstofuhús - public: Opinber bygging - residential: Íbúðarhús - school: Skóli - shop: Verslun - stadium: Íþróttavöllur highway: bus_stop: Stoppustöð cycleway: Hjólastígur footway: Göngustígur ford: Vaðið - gate: Hlið living_street: Vistgata motorway: Hraðbraut primary: Stofnvegur @@ -542,7 +511,6 @@ is: bay: Flóinn beach: Ströndin cave_entrance: Hellisop - coastline: Strandlengjan crater: Gígurinn fell: Fellið fjord: Fjörðurinn @@ -633,17 +601,14 @@ is: export_tooltip: Niðurhala kortagögnum á hinum ýmsu sniðum gps_traces: GPS ferlar gps_traces_tooltip: Sjá alla GPS ferla - history: Breytingarskrá + history: Breytingaskrá home: heim home_tooltip: Færa kortasýnina á þína staðsetningu - inbox: innhólf (%{count}) inbox_tooltip: one: Það eru ein skilaboð í innhólfinu þínu other: Það eru %{count} skilaboð í innhólfinu þínu zero: Það eru engin skilaboð í innhólfinu þínu intro_1: OpenStreetMap er frjálst heimskort sem hver sem er getur breytt. Líka þú! - intro_2: OpenStreetMap gerir þér kleift að skoða, breyta og nota kortagögn í samvinnu við aðra. - intro_3: Hýsing verkefnisins er studd af %{ucl}, %{ic} og %{bytemark}. Aðrir stuðningsaðilar verkefnisins eru skráðir í %{partners}. license: title: OpenStreetMap gögnin eru gefin út undir Creative Commons Attribution-Share Alike 2.0 leyfinu log_in: innskrá @@ -671,7 +636,10 @@ is: english_link: ensku útgáfuna text: "Stangist þessi þýðing á við %{english_original_link} gildir\nhin síðari fram yfir íslenskuna." title: Um þessa þýðingu - legal_babble: "<h2>Höfundaréttur og leyfi</h2>\n<p>\n OpenStreetMap er <i>frjáls kortagrunnur</i> undir <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> leyfi. (CC-BY-SA).\n</p>\n<p>\n  Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninnn\n  og gögn hans, gegn því að þú viðurkennir rétt OpenStreetMap\n og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum\n eða gögnum hans, þá verður þú að gefa niðurstöðuna út með\n sama leyfi. <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Leyfistextinn</a>\n útskýrir réttindi þín og skyldur.\n</p>\n<h2>Frekari upplýsingar</h2>\n\n<p>\n Frekari upplýsingar má nálgast <a href=\"/copyright/en\">í ensku\n útgáfu</a> þessa skjals.\n</p>" + legal_babble: + intro_1_html: "OpenStreetMap er <i>frjáls kortagrunnur</i> undir <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> leyfi. (CC BY-SA)." + intro_2_html: " Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninnn\n og gögn hans, gegn því að þú viðurkennir rétt OpenStreetMap\n og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum\n eða gögnum hans, þá verður þú að gefa niðurstöðuna út með\n sama leyfi. <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Leyfistextinn</a>\n útskýrir réttindi þín og skyldur." + title_html: Höfundaréttur og leyfi native: mapping_link: farið að kortleggja native_link: íslensku útgáfuna @@ -710,10 +678,6 @@ is: body: Því miður er ekkert skilaboð með þetta auðkenni. heading: Engin slík skilaboð til title: Engin slík skilaboð til - no_such_user: - body: Það er enginn notandi til með þessu nafni. - heading: Notandi ekki til - title: Notandi ekki til outbox: date: Dags inbox: innhólf @@ -878,7 +842,6 @@ is: index: js_1: Þú ert annaðhvort að nota vafra sem styður ekki JavaScript eða hefur slökkt á JavaScript stuðning. js_2: OpenStreetMap notar JavaScript til að útfæra gagnvirk kort. - js_3: Þú getur einnig notað <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasýnina</a> sem krefst ekki JavaScript stuðnings. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Gefið út undir %{license_name} leyfinu af þáttakendum í %{project_name}. @@ -996,10 +959,6 @@ is: your_traces: Þínir ferlar make_public: made_public: Ferilinn var gerður sjáanlegur - no_such_user: - body: Það er ekki til notandi með nafninu %{user}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli. - heading: Notandinn %{user} er ekki til - title: Notandi ekki til offline: heading: Ekki hægt að hlaða upp GPX message: Ekki er hægt að hlaða upp GPX í augnablikinu vegna viðhalds. @@ -1038,8 +997,6 @@ is: trace_optionals: tags: Tögg trace_paging_nav: - next: Næsta » - previous: « Fyrri showing_page: Sýni síðu %{page} view: delete_track: Eyða @@ -1280,7 +1237,6 @@ is: title: Breyti banni gegn %{name} filter: block_period: Banntíminn verður að vera í forstillingunum. - not_a_moderator: Þú þarft að vera stjórnandi til að framkvæma þessa aðgerð. helper: time_future: Endar eftir %{time} time_past: Endaði fyrir %{time} síðan diff --git a/config/locales/it.yml b/config/locales/it.yml index 498d6c379..cd88d51df 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1,17 +1,24 @@ -# Messages for Italian (Italiano) +# Messages for Italian (italiano) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Alessioz # Author: Bellazambo # Author: Beta16 +# Author: Darth Kule # Author: Davalv +# Author: Davio # Author: Gianfranco # Author: Karika # Author: LucioGE # Author: McDutchie +# Author: Nemo bis # Author: Od1n +# Author: Paolopoz # Author: Raoli # Author: Rippitippi +# Author: Simone +# Author: SimoneSVC +# Author: Ximo17 # Author: ZioNicco it: activerecord: @@ -59,7 +66,7 @@ it: language: Lingua message: Messaggio node: Nodo - node_tag: Etichetta nodo + node_tag: Etichetta del nodo notifier: Promemoria old_node: Vecchio nodo old_node_tag: Vecchia etichetta del nodo @@ -85,6 +92,8 @@ it: application: require_cookies: cookies_needed: Pare che tu abbia i cookie non abilitati - abilita i cookie nel tuo browser prima di continuare. + require_moderator: + not_a_moderator: Devi essere un moderatore per eseguire questa operazione. setup_user_auth: blocked: Il tuo accesso alle API è stato bloccato. Si prega di fare log-in all'interfaccia web per saperne di più. need_to_see_terms: Il tuo accesso alle API è temporaneamente sospeso. Si prega di accedere all'interfaccia web per visualizzare i termini di contribuzione. Non c'è bisogno che tu aderisca, però è necessario che tu li legga. @@ -92,7 +101,6 @@ it: changeset: changeset: "Gruppo di modifiche: %{id}" changesetxml: gruppo di modifiche XML - download: Scarica il %{changeset_xml_link} oppure le %{osmchange_xml_link} feed: title: Gruppo di modifiche %{id} title_comment: Gruppo di modifiche %{id} - %{comment} @@ -130,7 +138,7 @@ it: larger: area: Visualizza l'area in una mappa più grande node: Visualizza il nodo in una mappa più grande - relation: Visualizza la relation in una mappa più grande + relation: Visualizza la relazione in una mappa più grande way: Visualizza la way in una mappa più grande loading: Caricamento in corso... navigation: @@ -148,21 +156,19 @@ it: next_changeset_tooltip: Modifica successiva di %{user} prev_changeset_tooltip: Modifica precedente di %{user} node: - download: "%{download_xml_link} oppure %{view_history_link}" download_xml: Scarica XML - edit: modifica + edit: Modifica nodo node: Nodo node_title: "Nodo: %{node_name}" - view_history: visualizza lo storico + view_history: Visualizza storico node_details: coordinates: "Coordinate:" part_of: "Parte di:" node_history: - download: "%{download_xml_link} oppure %{view_details_link}" download_xml: Scarica XML node_history: Storico del nodo node_history_title: "Storico del nodo: %{node_name}" - view_details: visualizza i dettagli + view_details: Visualizza dettagli not_found: sorry: Spiacenti, non è stato possibile trovare il %{type} con l'identificativo %{id}. type: @@ -173,21 +179,26 @@ it: paging_nav: of: di showing_page: Visualizzata la pagina + redacted: + message_html: La versione %{version} di questo %{type} non può essere mostrata in quanto è stata redatta. Per favore, fai riferimento a %{redaction_link} per i dettagli. + redaction: Redazione %{id} + type: + node: nodo + relation: relazione + way: percorso relation: - download: "%{download_xml_link} oppure %{view_history_link}" download_xml: Scarica XML relation: Relazione relation_title: "Relazione: %{relation_name}" - view_history: visualizza lo storico + view_history: Visualizza storico relation_details: members: "Membri:" part_of: "Parte di:" relation_history: - download: "%{download_xml_link} oppure %{view_details_link}" download_xml: Scarica XML relation_history: Storico della relazione relation_history_title: "Storico della relazione: %{relation_name}" - view_details: visualizza dettagli + view_details: Visualizza dettagli relation_member: entry_role: "%{type} %{name} come %{role}" type: @@ -196,17 +207,17 @@ it: way: Percorso start: manually_select: Seleziona manualmente un'area differente - view_data: Visualizza i dati per la visualizzazione corrente della mappa + view_data: Mostra i dati per la visualizzazione attuale della mappa start_rjs: data_frame_title: Dati - data_layer_name: Dati + data_layer_name: Esplora Dati Mappa details: Dettagli drag_a_box: Tracciare un riquadro sulla mappa per selezionare un'area edited_by_user_at_timestamp: Modificato da [[user]] il [[timestamp]] hide_areas: Nascondi le aree history_for_feature: Storico per [[feature]] load_data: Carica dati - loaded_an_area_with_num_features: "E' stata caricata un'area che contiene [[num_features]] caratteristiche. In generale, alcuni browser potrebbero non visualizzare correttamente questa quantità di dati. Generalmente i browser lavorano al meglio se si visualizzano meno di 100 caratteristiche alla volta: se si fa qualcos'altro il proprio browser potrebbe diventare lento o non rispondere più. Se si è sicuri di voler visualizzare questi dati, allora si può premere il pulsante sottostante." + loaded_an_area_with_num_features: "E' stata caricata un'area che contiene [[num_features]] caratteristiche. In generale, alcuni browser potrebbero non visualizzare correttamente questa quantità di dati. Generalmente i browser lavorano al meglio se si visualizzano meno di [[max_features]] caratteristiche alla volta: se si fa qualcos'altro il proprio browser potrebbe diventare lento o non rispondere più. Se si è sicuri di voler visualizzare questi dati, allora si può premere il pulsante sottostante." loading: Caricamento in corso... manually_select: Seleziona manualmente un'area differente object_list: @@ -245,10 +256,9 @@ it: relation: relazione way: percorso way: - download: "%{download_xml_link} oppure %{view_history_link}" download_xml: Scarica XML - edit: modifica - view_history: visualizza lo storico + edit: Modifica percorso + view_history: Visualizza storico way: Percorso way_title: "Percorso: %{way_name}" way_details: @@ -258,9 +268,8 @@ it: nodes: "Nodi:" part_of: "Parte di:" way_history: - download: "%{download_xml_link} oppure %{view_details_link}" download_xml: Scarica XML - view_details: visualizza i dettagli + view_details: Visualizza dettagli way_history: Storico del percorso way_history_title: "Storico del percorso: %{way_name}" changeset: @@ -283,12 +292,14 @@ it: saved_at: Salvato il user: Utente list: - description: Modifiche recenti + description: Ultime modifiche description_bbox: Gruppi di modifiche all'interno di %{bbox} description_friend: Insieme di modifiche dei tuoi amici description_nearby: Gruppi di modifiche da parte di utenti nelle vicinanze description_user: Modifiche dell'utente %{user} description_user_bbox: Gruppi di modifiche dell'utente %{user} all'interno di %{bbox} + empty_anon_html: Non sono state fatte modifiche ancora + empty_user_html: Sembra che tu non abbia mai fatto modifiche ancora. Per iniziare, controlla la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>guida per principianti</a>. heading: Gruppi di modifiche heading_bbox: Gruppi di modifiche heading_friend: Gruppi di modifiche @@ -304,6 +315,14 @@ it: timeout: sorry: Siamo spiacenti, l'elenco delle modifiche che hai richiesto necessitava di troppo tempo per poter essere recuperato. diary_entry: + comments: + ago: "%{ago} fa" + comment: Commento + has_commented_on: "% {display_name} ha commentato le seguenti voci di diario" + newer_comments: Commenti più recenti + older_comments: Commenti più vecchi + post: Scrivi + when: Quando diary_comment: comment_from: Commento di %{link_user} il %{comment_created_at} confirm: Conferma @@ -361,10 +380,6 @@ it: body: Spiacenti, non c'è alcuna voce del diario o commento con l'identificativo %{id}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato. heading: "Nessuna voce con l'identificativo: %{id}" title: Nessuna voce del diario - no_such_user: - body: Spiacenti, non c'è alcun utente con il nome %{user}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato. - heading: L'utente %{user} non esiste - title: Nessun utente view: leave_a_comment: Lascia un commento login: Login @@ -397,6 +412,7 @@ it: licence: Licenza longitude: "Lon:" manually_select: Seleziona manualmente un'area differente + map_image: Immagine Mappa (mostra livello standard) max: max options: Opzioni osm_xml_data: Dati XML OpenStreetMap @@ -457,16 +473,28 @@ it: suffix_place: ", %{distance} a %{direction} di %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodromo + apron: Grembiule + gate: Gate aeroportuale + helipad: Elisuperficie + runway: Pista + taxiway: Pista di rullaggio + terminal: Terminal aeroportuale amenity: + WLAN: Punto di accesso WiFi airport: Aeroporto arts_centre: Centro d'arte + artwork: Opera d'arte atm: Cassa automatica auditorium: Auditorium bank: Banca bar: Bar + bbq: Barbecue bench: Panchina bicycle_parking: Parcheggio per biciclette bicycle_rental: Noleggio biciclette + biergarten: Birreria all'aperto brothel: Bordello bureau_de_change: Cambia valute bus_station: Stazione degli autobus @@ -475,6 +503,7 @@ it: car_sharing: Car Sharing car_wash: Autolavaggio casino: Casinò + charging_station: Stazione di ricarica cinema: Cinema clinic: Clinica club: Club @@ -493,6 +522,7 @@ it: ferry_terminal: Terminal traghetti fire_hydrant: Pompa antincendio fire_station: Vigili del fuoco + food_court: Food Court fountain: Fontana fuel: Stazione di rifornimento grave_yard: Cimitero @@ -533,9 +563,12 @@ it: shelter: Pensilina/ricovero shop: Negozio shopping: Acquisti + shower: Doccia + social_centre: Centro sociale social_club: Centro Sociale studio: Studio supermarket: Supermercato + swimming_pool: Piscina taxi: Taxi telephone: Telefono pubblico theatre: Teatro @@ -550,37 +583,17 @@ it: youth_centre: Centro Giovanile boundary: administrative: Confine amministrativo + census: Limite di censimento + national_park: Parco nazionale + protected_area: Area protetta + bridge: + aqueduct: Acquedotto + suspension: Ponte sospeso + swing: Ponte girevole + viaduct: Viadotto + "yes": Ponte building: - apartments: Edificio residenziale - block: Complesso di edifici - bunker: Bunker - chapel: Cappella - church: Chiesa - city_hall: Municipio - commercial: Uffici - dormitory: Dormitorio - entrance: Entrata dell'edificio - faculty: Palazzo della Facoltà - farm: Edificio rurale - flats: Appartamenti - garage: Autorimessa - hall: Sala - hospital: Ospedale - hotel: Albergo - house: Casa - industrial: Edificio industriale - office: Uffici - public: Edificio pubblico - residential: Edificio residenziale - retail: Edificio commerciale - school: Edificio scolastico - shop: Negozio - stadium: Stadio - store: Negozio - terrace: Terrazza - tower: Torre - train_station: Stazione ferroviaria - university: Sede universitaria + "yes": Edificio highway: bridleway: Percorso per equitazione bus_guideway: Autobus guidato @@ -588,12 +601,11 @@ it: byway: Byway (UK) construction: Strada in costruzione cycleway: Percorso ciclabile - distance_marker: Distanziometro emergency_access_point: Colonnina SOS footway: Percorso pedonale ford: Guado - gate: Cancello living_street: Strada pedonale + milestone: Pietra miliare minor: Strada secondaria motorway: Autostrada/tangenziale motorway_junction: Svincolo @@ -605,14 +617,17 @@ it: primary_link: Strada principale raceway: Pista residential: Strada residenziale + rest_area: Area di Sosta road: Strada generica secondary: Strada di importanza regionale secondary_link: Strada secondaria service: Strada di servizio services: Stazione di servizio + speed_camera: Autovelox fissi steps: Scala stile: Scaletta tertiary: Strada di importanza locale + tertiary_link: Strada di importanza locale track: Strada forestale o agricola trail: Percorso escursionistico trunk: Superstrada @@ -626,6 +641,7 @@ it: building: Edificio castle: Castello church: Chiesa + fort: Forte house: Casa storica icon: Icona manor: Maniero @@ -650,6 +666,7 @@ it: farmland: Terreno agricolo farmyard: Aia forest: Foresta + garages: Garage grass: Prato greenfield: Area da adibire a costruzioni industrial: Zona Industriale @@ -657,25 +674,28 @@ it: meadow: Prato military: Zona militare mine: Miniera - mountain: Montagna nature_reserve: Riserva naturale + orchard: Frutteto park: Parco piste: Piste - plaza: Piazza quarry: Cava railway: Ferrovia recreation_ground: Area di svago reservoir: Riserva idrica + reservoir_watershed: Serbatoio spartiacque residential: Area Residenziale retail: Negozi + road: Area della sede stradale village_green: Parco urbano vineyard: Vigneto wetland: Zona umida wood: Bosco leisure: beach_resort: Stabilimento balneare + bird_hide: Osservatorio Camuffato common: Area comune (UK) fishing: Riserva di pesca + fitness_station: Centro fitness garden: Giardino golf_course: Campo da golf ice_rink: Pista di ghiaccio @@ -686,12 +706,17 @@ it: pitch: Campo sportivo playground: Parco giochi recreation_ground: Area di svago + sauna: Sauna slipway: Rampa per la messa in acqua di imbarcazioni sports_centre: Centro sportivo stadium: Stadio swimming_pool: Piscina track: Pista da corsa water_park: Parco acquatico + military: + airfield: Aeroporto militare + barracks: Caserma + bunker: Bunker natural: bay: Baia beach: Spiaggia @@ -699,11 +724,12 @@ it: cave_entrance: Entrata di grotta/caverna channel: Canale cliff: Rupe - coastline: Linea di costa crater: Cratere + dune: Duna feature: Caratteristica fell: Prato alpino fjord: Fiordo + forest: Foresta geyser: Geyser glacier: Ghiacciaio heath: Brughiera @@ -723,6 +749,7 @@ it: scrub: Boscaglia shoal: Secca spring: Sorgente + stone: Pietra strait: Stretto tree: Albero valley: Valle @@ -731,6 +758,19 @@ it: wetland: Zona umida wetlands: Zona umida wood: Bosco + office: + accountant: Ragioniere + architect: Architetto + company: Azienda + employment_agency: Agenzia di lavoro + estate_agent: Agente immobiliare + government: Ufficio governativo + insurance: Agenzia di assicurazione + lawyer: Avvocato + ngo: Ufficio di una ONG (Organizzazione Non Governativa) + telecommunication: Ufficio di telecomunicazioni + travel_agent: Agenzia di viaggi + "yes": Ufficio place: airport: Aeroporto city: Città @@ -742,6 +782,7 @@ it: houses: Gruppo di case island: Isola islet: Isoletta + isolated_dwelling: Case sparse locality: Località (luogo con nome, non popolato) moor: Molo municipality: Comune @@ -765,6 +806,7 @@ it: junction: Collegamento ferroviario level_crossing: Passaggio a livello light_rail: Ferrovia leggera + miniature: Ferrovia in miniatura monorail: Monorotaia narrow_gauge: Ferrovia a scartamento ridotto platform: Banchina ferroviaria @@ -779,7 +821,7 @@ it: yard: Zona di manovra ferroviaria shop: alcohol: Alcolici - apparel: Negozio di abbigliamento + antiques: Antiquario art: Negozio d'arte bakery: Panetteria beauty: Prodotti cosmetici @@ -788,7 +830,6 @@ it: books: Libreria butcher: Macellaio car: Concessionaria - car_dealer: Concessionaria auto car_parts: Autoricambi car_repair: Autofficina carpet: Tappeti @@ -803,7 +844,6 @@ it: department_store: Grande magazzino discount: Discount doityourself: Fai da-te - drugstore: Emporio dry_cleaning: Lavasecco electronics: Elettronica estate_agent: Agenzia immobiliare @@ -869,7 +909,10 @@ it: valley: Valle viewpoint: Punto panoramico zoo: Zoo + tunnel: + "yes": Galleria waterway: + artificial: Corso d'acqua artificiale boatyard: Cantiere nautico canal: Canale connector: Canale connettore @@ -895,6 +938,7 @@ it: base: cycle_map: Open Cycle Map mapquest: MapQuest Open + standard: Predefinito transport_map: Mappa dei trasporti site: edit_disabled_tooltip: Zooma per modificare la mappa @@ -904,9 +948,10 @@ it: history_tooltip: Visualizza le modifiche per quest'area history_zoom_alert: Devi ingrandire per vedere la cronologia delle modifiche layouts: + community: Comunità community_blogs: Blog della comunità community_blogs_title: Blog dei membri della comunità OpenStreetMap - copyright: Copyright e Licenza + copyright: Copyright e licenza documentation: Documentazione documentation_title: Documentazione sul progetto donate: Supporta OpenStreetMap %{link} al fondo destinato all'aggiornamento dell'hardware. @@ -925,16 +970,17 @@ it: history: Storico home: posizione iniziale home_tooltip: Vai alla posizione iniziale - inbox: in arrivo (%{count}) + inbox_html: in arrivo %{count} inbox_tooltip: one: La tua posta in arrivo contiene 1 messaggio non letto other: La tua posta in arrivo contiene %{count} messaggi non letti - zero: La tua posta in arrivo non contiene alcun messaggio non letto + zero: La tua posta in arrivo contiene solo messaggi già letti intro_1: OpenStreetMap è una mappa liberamente modificabile dell'intero pianeta. E' fatta da persone come te. - intro_2: OpenStreetMap permette a chiunque sulla Terra di visualizzare, modificare ed utilizzare dati geografici con un approccio collaborativo. - intro_3: L'hosting di OpenStreetMap è gentilmente fornito da %{ucl}, %{ic} e %{bytemark}. Altri sostenitori del progetto sono elencati fra i %{partners}. - intro_3_ic: Imperial College di Londra - intro_3_partners: Wiki + intro_2_create_account: Crea un account utente + intro_2_download: scaricati + intro_2_html: I dati possono essere %{download} liberamente e %{use} in accordo alla %{license}. %{create_account} per aiutare a migliorare la mappa. + intro_2_license: licenza libera + intro_2_use: utilizzati license: title: I dati di OpenStreetMap sono distribuiti secondo la licenza Creative Commons Attribution-Share Alike 2.0 Generic log_in: entra @@ -948,9 +994,14 @@ it: title: Aiuta OpenStreetMap con una donazione in denaro osm_offline: Il database di OpenStreetMap è al momento non in linea per pemettere lo svolgimento di alcuni lavori essenziali su di esso. osm_read_only: Il database di OpenStreetMap è al momento in modalità sola-lettura per pemettere lo svolgimento di alcuni lavori essenziali su di esso. + partners_bytemark: Bytemark Hosting + partners_html: L'hosting è supportato da %{ucl}, %{ic}, %{bytemark} e da altri %{partners}. + partners_ic: Imperial College (Londra) + partners_partners: partner + partners_ucl: UCL VR Centre sign_up: iscriviti sign_up_tooltip: Crea un profilo utente per apportare modifiche - sotm2011: Vieni alla conferenza di OpenStreetMap 2011, The State of the Map, il 9-11 Settembre a Denver! + sotm2012: Vieni alla conferenza di OpenStreetMap 2012, The State of the Map, il 6-8 settembre a Tokyo! tag_line: La wiki-mappa Libera del Mondo user_diaries: Diari degli utenti user_diaries_tooltip: Visualizza diari utente @@ -965,7 +1016,30 @@ it: english_link: l'originale in inglese text: In caso di incoerenza fra questa pagina di traduzione e %{english_original_link}, fa fede la pagina in inglese title: A proposito di questa traduzione - legal_babble: "<h2>Copyright e licenza</h2>\n<p>\n OpenStreetMap è un <i>database aperto</i>, sotto la licenza <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n Creative Commons Attribuzione-Condividi allo stesso modo 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Sei libero di copiare, distribuire, trasmettere e adattare le nostre mappe\n e dati, finchè lo attribuisci a OpenStreetMap e i suoi\n contributori. Se tu alteri o ti basi sulle nostre mappe o dati,\n è possibile distribuire il risultato solo sotto la stessa licenza. Il \n codice legale completo <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legale\n illustra i tuoi diritti e le tue responsabilità.\n<p>\n\n<h3>Come si attribuisce a OpenStreetMap</h3>\n<p>\n Se utilizzi le immagini della mappa di OpenStreetMap, si richiede che\n l'attribuzione abbia almeno scritto “© OpenStreetMap\n contributors, CC-BY-SA”. Se utilizzi solo i dati della mappa\n si richiede “Map data © OpenStreetMap contributors,\n CC-BY-SA”.\n</p>\n<p>\n Ove possibile, OpenStreetMap dovrebbe essere un collegamento ipertestuale a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n e CC-BY-SA a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Se\n utilizzi un mezzo dove il link non sono possibili (per esempio un\n opera stampata), suggeriamo di indirizzare i lettori a\n www.OpenStreetMap.org (forse scrivendo\n ‘OpenStreetMap’ a questo indirizzo completo) e a\n www.creativecommons.org.\n<p>\n\n<h3>Per saperne di più</h3>\n<p>\n Approfonisci su come utilizzare i nostri dati presso le <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Domande\n legali frequenti</a>.\n<p>\n<p>\n Ai contributori OSM si ricorda di non aggiungere dati da qualsiasi\n fonte protetta da copyright (ad esempio Google Maps o mappe stampate) senza\n esplicita autorizzazione dei titolare del copyright.\n</p>\n<p>\n Anche se i dati OpenStreetMap sono aperti, non possiamo fornire una\n mappa API esente dalle tasse per gli sviluppatori di terze parti.\n\n Vedi la nostra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Politica di utilizzo API</a>, la\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politica di utilizzo dei riquadri mappa</a>\n e la <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Politica di utilizzo Nominatim</a>.\n</p>\n\n<h3>Nostri collaboratori</h3>\n<p>\n La nostra licenza CC-BY-SA richiede di “dare la ragionevole\n attribuzione dell'autore originale al mezzo o ai mezzi che stai\n utilizzando\"”. I mappatori individuali OSM non richiedono\n un'attribuzione al di là che per i “contributori\n OpenStreetMap”, ma, dove i dati forniti da un' agenzia cartografica\n nazionale o altra fonte importante sono stati inclusi in OpenStreetMap,\n può essere congrua l'attribuzione a loro, riproducendo direttamente\n la loro attribuzione o l'indirizzamento a questa pagina.\n</p>\n\n<!--\nInformazioni per gli editor della pagina\n\nDi seguito sono elencate solo le organizzazioni che necessitano di attribuzione\ncome condizione che i loro dati vengano utilizzati in OpenStreetMap. Non è un\ncatalogo generale delle importazioni, e non devono essere utilizzati, tranne quando\nl'attribuzione è tenuto a rispettare la licenza di importazione\ndei dati.\n\nEventuali aggiunte qui devono essere prima discusse con gli amministratori di sistema OSM .\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Contiene i dati della periferia basati\n sui dati dell'Australian Bureau of Statistics.</li>\n <li><strong>Austria</strong>: Contiene i dati della\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> sotto\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Canada</strong>: Contiene i dati della\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), e della StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Francia</strong>: Contiene dati provenienti dalla\n Direction Générale des Impôts.</li>\n <li><strong>Nuova Zelanda</strong>: Contiene i dati provenienti dalla\n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Polonia</strong>: Contiene i dati dalle <a\n href=\"http://ump.waw.pl/\">mappe UMP-pcPL</a>. Copyright dei\n contributori di UMP-pcPL.</li>\n <li><strong>Regno Unito</strong>: Contiene i dati della\n Ordnance Survey © Crown copyright and database right\n 2010.</li>\n</ul>\n\n<p>\n L'inserimento dei dati in OpenStreetMap non implica che l'originale\n provider di dati appoggi OpenStreetMap, fornisca alcuna garanzia o\n accetti qualsiasi responsabilità.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: contiene i dati della\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (sotto\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> e\nLand Tirol (sotto <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT con emendamenti</a>)." + contributors_au_html: "<strong>Australia</strong>: contiene i dati della periferia basati\nsui dati dell'Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canada</strong>: contiene i dati della\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), e della StatCan (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: "Per ulteriori dettagli di queste e altre fonti che sono state utilizzate\nper aiutare a migliorare OpenStreetMap, consulta la <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">pagina dei\ncollaboratori</a> sul wiki di OpenStreetMap." + contributors_footer_2_html: "L'inserimento dei dati in OpenStreetMap non implica che il fornitore\noriginale dei dati appoggi OpenStreetMap, fornisca alcuna garanzia o\naccetti qualsiasi responsabilità." + contributors_fr_html: "<strong>Francia</strong>: contiene dati provenienti dalla\nDirection Générale des Impôts." + contributors_gb_html: "<strong>Regno Unito</strong>: contiene i dati della\nOrdnance Survey © Crown copyright and database right\n2010." + contributors_intro_html: "La nostra licenza CC BY-SA richiede di “dare l'attribuzione\nall'autore originale ragionevolmente al mezzo o ai mezzi che stai\nutilizzando”. I mappatori individuali OSM non richiedono\nun'attribuzione al di là che per i “contributori\nOpenStreetMap”, ma dove i dati forniti da un'agenzia cartografica\nnazionale o altra fonte importante sono stati inclusi in OpenStreetMap,\npuò essere congrua l'attribuzione a loro, riproducendo direttamente\nla loro attribuzione o l'indirizzamento a questa pagina." + contributors_nl_html: "strong>Olanda</strong>: contiene dati © AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nuova Zelanda</strong>: contiene i dati provenienti dalla\nLand Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polonia</strong>: contiene i dati dalle <a\nhref=\"http://ump.waw.pl/\">mappe UMP-pcPL</a>. Copyright dei\ncontributori di UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nAltre informazioni sull'uso dei dati di UMP da parte di OSM</a>" + contributors_title_html: Nostri collaboratori + contributors_za_html: "<strong>Sud Africa</strong>: contiene i dati provenienti dalla\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: "Se utilizzi le immagini delle mappe di OpenStreetMap, si richiede che\nl'attribuzione abbia almeno scritto “© OpenStreetMap\ncontributors, CC BY-SA”. Se utilizzi solo i dati delle mappe\nsi richiede “Map data © OpenStreetMap contributors,\nCC BY-SA”." + credit_2_html: "Ove possibile, dovrebbe essere un collegamento ipertestuale verso OpenStreetMap\ntramite <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\ne CC BY-SA tramite <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Se\nutilizzi un mezzo dove i link non sono possibili (per esempio un\nopera stampata), suggeriamo di indirizzare i lettori a\nwww.OpenStreetMap.org (forse scrivendo\n‘OpenStreetMap’ a questo indirizzo completo) e a\nwww.creativecommons.org." + credit_title_html: Come si attribuisce a OpenStreetMap + intro_1_html: "OpenStreetMap è un <i>database aperto</i>, rilasciato in base alla licenza <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.it\">\nCreative Commons Attribuzione-Condividi allo stesso modo 2.0</a> (CC BY-SA)." + intro_2_html: "Sei libero di copiare, distribuire, trasmettere e adattare le nostre mappe\ne dati, finché lo attribuisci a OpenStreetMap e i suoi\ncontributori. Se tu alteri o ti basi sulle nostre mappe o dati,\nè possibile distribuire il risultato solo sotto la stessa licenza. Il \n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">codice\nlegale completo</a> illustra i tuoi diritti e le tue responsabilità." + more_1_html: "Per saperne di più su come utilizzare i nostri dati consulta\nle <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Domande\nlegali frequenti</a>." + more_2_html: "Ai contributori OSM si ricorda di non aggiungere dati da qualsiasi\nfonte protetta da copyright (ad esempio Google Maps o mappe stampate) senza\nesplicita autorizzazione dei titolare del copyright." + more_3_html: "Anche se i dati OpenStreetMap sono aperti, non possiamo fornire una\nmappa API esente dalle tasse per gli sviluppatori di terze parti.\nVedi la nostra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Politica di utilizzo API</a>, la\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politica di utilizzo dei riquadri mappa</a>\ne la <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Politica di utilizzo Nominatim</a>." + more_title_html: Per saperne di più + title_html: Copyright e licenza native: mapping_link: inizia a mappare native_link: versione in italiano @@ -991,11 +1065,11 @@ it: subject: Oggetto title: In arrivo mark: - as_read: Messaggio marcato come letto + as_read: Messaggio marcato come già letto as_unread: Messaggio marcato come non letto message_summary: delete_button: Elimina - read_button: Marca come letto + read_button: Marca come già letto reply_button: Rispondi unread_button: Marca come non letto new: @@ -1011,10 +1085,6 @@ it: body: Siamo spiacenti, non ci sono messaggi con l'id indicato. heading: Nessun messaggio del genere title: Nessun messaggio del genere - no_such_user: - body: Siamo spiacenti, non ci sono utenti con questo nome. - heading: Utente inesistente - title: Nessun utente del genere outbox: date: Data inbox: in arrivo @@ -1056,11 +1126,11 @@ it: email_confirm_html: click_the_link: Se sei tu, per favore clicca il link sotto per confermare le variazioni. greeting: Ciao, - hopefully_you: Qualcuno (si spera proprio tu) vuole modificare il suo indirizzo di posta elettronica su %{server_url} con il nuovo indirizzo %{new_address}. + hopefully_you: Qualcuno (si spera proprio tu) vuole modificare il tuo indirizzo di posta elettronica su %{server_url} con il nuovo indirizzo %{new_address}. email_confirm_plain: click_the_link: Se questo sei proprio tu, per favore clicca sul collegamento sottostante per confermare il cambiamento. greeting: Ciao, - hopefully_you_1: Qualcuno (si spera proprio tu) vuole modificare il proprio indirizzo di posta elettronica su + hopefully_you_1: Qualcuno (si spera proprio tu) vuole modificare il tuo indirizzo di posta elettronica su hopefully_you_2: "%{server_url} con il nuovo indirizzo %{new_address}." friend_notification: befriend_them: Puoi anche aggiungerli come amici in %{befriendurl}. @@ -1086,7 +1156,7 @@ it: lost_password_html: click_the_link: Se sei proprio tu, per favore clicca sul collegamento sottostante per impostare nuovamente la tua password. greeting: Ciao, - hopefully_you: Qualcuno (probabilmente tu stesso) ha richiesto che la sua password sia impostata nuovamente su questo indirizzo di posta elettronica associato al profilo utente di openstreetmap.org. + hopefully_you: Qualcuno (probabilmente tu stesso) ha richiesto che la tua password sia impostata nuovamente su questo indirizzo di posta elettronica associato al profilo utente di openstreetmap.org. lost_password_plain: click_the_link: Se sei tu, per favore clicca sul link sotto per resettare la password greeting: Ciao, @@ -1109,7 +1179,7 @@ it: introductory_video: Puoi guardare un %{introductory_video_link}. more_videos: Ci sono %{more_videos_link}. more_videos_here: ulteriori video qui - user_wiki_page: E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria che si riferiscano al luogo in si opera, come ad esempio <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>. + user_wiki_page: E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria che si riferiscano al luogo in cui si opera, come ad esempio <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>. video_to_openstreetmap: video introduttivo su OpenStreetMap wiki_signup: Ci si può anche <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">iscrivere al wiki di OpenStreetMap</a>. signup_confirm_plain: @@ -1186,6 +1256,8 @@ it: allow_write_gpx: carica tracciati GPS. allow_write_prefs: modifica le sue preferenze utente. authorize_url: "Autorizza URL:" + confirm: Sei sicuro? + delete: Eliminare Client edit: Modifica dettagli key: "Chiave del consumatore:" requests: "Richieste le seguenti autorizzazioni da parte dell'utente:" @@ -1195,6 +1267,37 @@ it: url: "URL del token di richiesta:" update: flash: Aggiornate con successo le informazioni sul client + redaction: + create: + flash: La revisone è stata creata. + destroy: + error: Si è verificato un errore durante l'eliminazione. + flash: Revisione eliminata. + not_empty: La revisione non è vuota. Si prega di non-redigere tutte le versioni appartenenti a questa revisione prima di eliminarla. + edit: + description: Descrizione + heading: Modifica Redazione + submit: Salvare la revisione + title: Modifica revisione + index: + empty: Nessuna revisione disponibile. + heading: Lista Revisioni + title: Lista Revisioni + new: + description: Descrizione + heading: Inserire informazioni per una nuova revisione + submit: Crea revisione + title: Crea nuova revisione + show: + confirm: Sei sicuro? + description: "Descrizione:" + destroy: Rimuovere questa revisione + edit: Modifica questa revisione + heading: Mostra revisione "%{title}" + title: Mostra revisione + user: "Autore:" + update: + flash: Modifiche salvate. site: edit: anon_edits_link_text: Leggi il perché. @@ -1209,12 +1312,11 @@ it: index: js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato disabilitato JavaScript. js_2: OpenStreetMap utilizza JavaScript per le sua mappa. - js_3: Se non si riesce ad abilitare JavaScript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>. license: license_name: Creative Commons Attribuzione-Condividi allo stesso modo 2.0 notice: Rilasciato sotto la licenza %{license_name} dal %{project_name} ed i suoi contributori. project_name: progetto OpenStreetMap - permalink: Permalink + permalink: Link permanente remote_failed: Modifica non riuscita - assicurarsi che JOSM o Merkaartor sia avviato e che l'opzione di controllo remoto sia abilitata shortlink: Collegamento breve key: @@ -1286,12 +1388,29 @@ it: unclassified: Strada minore unsurfaced: Strada non pavimentata wood: Bosco + markdown_help: + alt: Testo alternativo + first: Prima voce + heading: Intestazione + headings: Intestazioni + image: Immagine + link: Collegamento + ordered: Elenco ordinato + second: Seconda voce + subheading: Sottotitolo + text: Testo + title_html: Analizzato con <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Elenco non ordinato + url: URL + richtext_area: + edit: Modifica + preview: Anteprima search: search: Cerca search_help: "esempi: 'Trieste', 'Via Dante Alighieri, Trieste', 'CB2 5AQ', oppure 'post offices near Trieste' <a href='http://wiki.openstreetmap.org/wiki/Search'>altri esempi...</a>" submit_text: Vai where_am_i: Dove sono? - where_am_i_title: Descrivi la posizione corrente utilizzando il motore di ricerca + where_am_i_title: Descrivi la posizione attuale usando il motore di ricerca sidebar: close: Chiudi search_results: Risultati della ricerca @@ -1306,7 +1425,7 @@ it: scheduled_for_deletion: Tracciato in attesa di essere eliminato edit: description: "Descrizione:" - download: scarica + download: scaricati edit: modifica filename: "Nome file:" heading: Modifica al tracciato %{name} @@ -1322,16 +1441,13 @@ it: visibility: "Visibilità:" visibility_help: che cosa significa questo? list: + empty_html: Ancora niente qui. <a href='%{upload_link}'>Carica una nuova traccia</a> o leggi ulteriori informazioni sul tracciamento GPS nella <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina wiki</a>. public_traces: Tracciati GPS pubblici public_traces_from: Tracciati GPS pubblici di %{user} tagged_with: " etichettati con %{tags}" your_traces: Tracciati GPS personali make_public: made_public: Tracciato reso pubblico - no_such_user: - body: Spiacenti, non c'è alcun utente con il nome %{user}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato. - heading: L'utente %{user} non esiste - title: Nessun utente offline: heading: Archiviazione GPX non in linea message: L'archiviazione dei file GPX ed il sistema di upload al momento non sono disponibili. @@ -1370,8 +1486,8 @@ it: trace_optionals: tags: Etichette trace_paging_nav: - next: Successivo » - previous: « Precedente + newer: Tracce più recenti + older: Tracce più vecchie showing_page: Visualizzata la pagina %{page} view: delete_track: Elimina questo tracciato @@ -1487,6 +1603,7 @@ it: login_button: Entra lost password link: Persa la password? new to osm: Sei nuovo su OpenStreetMap? + no account: Non hai un account? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Leggi i dettagli sull'imminente cambio di licenza di OpenStreetMap</a> ( <a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traduzioni</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussione</a> ) notice_terms: OpenStreetMap si sta muovendo per avere una nuova licenza per il 1° aprile 2012. È ''open'' come quella attuale, ma le restrizioni legali sono molto più indicate per il nostro database cartografico. Ci piacerebbe mantenere i vostri contributi in OpenStreetMap, ma possiamo farlo solo se accosentite a farceli redistribuire sotto una nuova licenza. In caso contrario, purtroppo, dovremo rimuoverli dal database.<br/><br/>Per favore accedi, poi prenditi pochi secondi per leggere e ad accettare i nuovi termini. Grazie! openid: "%{logo} OpenID:" @@ -1514,7 +1631,7 @@ it: title: Accedi con Yahoo password: "Password:" register now: Registrati ora - remember: "Ricordati di me:" + remember: Ricordati di me title: Entra to make changes: Per apportare modifiche ai dati di OpenStreetMap, è necessario disporre di un account. with openid: "In alternativa utilizza il tuo OpenID per entrare:" @@ -1558,7 +1675,7 @@ it: title: Crea profilo use openid: In alternativa utilizza %{logo} OpenID per accedere no_such_user: - body: Spiacenti, non c'è alcun utente con il nome %{user}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato. + body: Spiacenti, non c'è alcun utente con il nome %{user}. Controllare la digitazione, o che il collegamento sul quale hai cliccato non sia errato. heading: L'utente %{user} non esiste title: Nessun utente popup: @@ -1602,9 +1719,10 @@ it: activate_user: attiva questo utente add as friend: aggiungi come amico ago: (%{time_in_words_ago} fa) - block_history: visualizza i blocchi ricevuti + block_history: vedi i blocchi ricevuti blocks by me: blocchi applicati da me blocks on me: blocchi su di me + comments: commenti confirm: Conferma confirm_user: conferma questo utente create_block: blocca questo utente @@ -1627,7 +1745,8 @@ it: latest edit: "Ultima modifica %{ago}:" m away: "%{count}m di distanza" mapper since: "Mappatore dal:" - moderator_history: visualizza i blocchi applicati + moderator_history: vedi i blocchi applicati + my comments: miei commenti my diary: diario personale my edits: modifiche personali my settings: impostazioni personali @@ -1675,14 +1794,13 @@ it: heading: Modifica del blocco su %{name} needs_view: L'utente ha bisogno di collegarsi prima che questo blocco sia cancellato? period: Quanto a lungo, a partire da adesso, l'accesso alle API sarà bloccato per l'utente. - reason: La motivazione per cui %{name} è stato bloccato. Per favore sii sufficientemente paziente e ragionevole e fornisci il maggior numero di dettagli possibili sulla situazione. Tieni a mente che non tutti gli utenti comprendono il gergo della comunità e quindi utilizza dei termini comprensibili a tutti. + reason: La motivazione per cui %{name} è stato bloccato. Per favore sii paziente e ragionevole quanto più possibile e fornisci tutti i dettagli sulla situazione. Tieni a mente che non tutti gli utenti comprendono il gergo della comunità e quindi cerca di utilizzare dei termini che siano comprensibili a tutti. show: Visualizza questo blocco submit: Aggiorna blocco title: Modifica del blocco su %{name} filter: block_expired: Il blocco è già scaduto e non può essere modificato. block_period: Il periodo di blocco deve essere uno dei valori selezionabili nella lista a tendina. - not_a_moderator: Devi essere un moderatore per compiere questa azione. helper: time_future: Termina fra %{time}. time_past: Terminato %{time} fa. @@ -1712,11 +1830,14 @@ it: creator_name: Autore display_name: Utente bloccato edit: Modifica + next: Successivo » not_revoked: (non revocato) + previous: « Precedente reason: Motivo del blocco revoke: Revoca! revoker_name: Revocato da show: Mostra + showing_page: Visualizzata la pagina %{page} status: Stato period: one: 1 ora diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 88f5e9b4c..4173f8a4c 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1,15 +1,19 @@ # Messages for Japanese (日本語) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Atysn # Author: Fryed-peach # Author: Higa4 # Author: Hosiryuhosi # Author: Iwai.masaharu # Author: Mage Whopper +# Author: Mfuji # Author: Miya # Author: Nabetaro # Author: Nazotoko # Author: Schu +# Author: Shirayuki +# Author: Tombi-aburage # Author: Wrightbus # Author: 青子守歌 ja: @@ -22,10 +26,10 @@ ja: latitude: 緯度 longitude: 経度 title: タイトル - user: ユーザ + user: ユーザー friend: friend: 友達 - user: ユーザ + user: ユーザー message: body: 本文 recipient: 受信者 @@ -38,27 +42,27 @@ ja: name: 名前 public: 公開 size: サイズ - user: ユーザ + user: ユーザー visible: 表示 user: active: アクティブ description: 説明 display_name: 表示名 - email: 電子メール + email: メール languages: 言語 pass_crypt: パスワード models: acl: 通行制限リスト changeset: 変更セット - changeset_tag: 変更セットタグ + changeset_tag: 変更セット タグ country: 国 diary_comment: 日記コメント - diary_entry: 日記エントリー + diary_entry: 日記エントリ friend: 友達 language: 言語 message: メッセージ node: ノード - node_tag: ノードタグ + node_tag: ノードのタグ notifier: 通知 old_node: 古いノード old_node_tag: 古いノードのタグ @@ -73,35 +77,37 @@ ja: relation_tag: リレーションのタグ session: セッション trace: トレース - tracepoint: トレースポイント - tracetag: トレースタグ - user: ユーザ - user_preference: ユーザ設定 - user_token: ユーザトークン + tracepoint: トレース ポイント + tracetag: トレース タグ + user: ユーザー + user_preference: ユーザー設定 + user_token: ユーザ トークン way: ウェイ way_node: ウェイのノード way_tag: ウェイのタグ application: require_cookies: cookies_needed: ブラウザのクッキーが無効になっているようです。続行する前にブラウザのクッキーをonにしてください。 + require_moderator: + not_a_moderator: その動作にはモデレータ権限が必要です。 setup_user_auth: - blocked: APIへのアクセスがブロックされました。Web インターフェースからログインし直して詳細を確認してください。 + blocked: APIへのアクセスがブロックされました。Web インターフェイスからログインし直して詳細を確認してください。 + need_to_see_terms: あなたは一時的にAPIの利用を保留されています。ウェブインターフェイスにログインして投稿規約（Contributor Terms）をご覧ください。同意しなくてもかまいませんが、必ずご覧ください。 browse: changeset: - changeset: "変更セット: %{id}" + changeset: 変更セット：%{id} changesetxml: 変更セットXML - download: ダウンロード%{changeset_xml_link} or %{osmchange_xml_link} feed: title: 変更セット %{id} title_comment: 変更セット %{id} - %{comment} osmchangexml: osm変更XML title: 変更セット changeset_details: - belongs_to: "ユーザ:" - bounding_box: "境界囲み:" + belongs_to: ユーザ： + bounding_box: 境界囲み： box: ボックス - closed_at: "完了日時:" - created_at: "作成日時:" + closed_at: 完了日時： + created_at: 作成日時： has_nodes: "以下の %{count} ノードで構成されています:" has_relations: "次の%{count} 個のリレーションを持ちます:" has_ways: "次の %{count} ウェイを持ちます:" @@ -126,27 +132,26 @@ ja: relation: リレーションを編集 way: ウェイを編集 larger: - area: この範囲を大きい地図で見る - node: このノードを大きいマップで見る + area: 範囲を大きい地図で表示 + node: ノードを大きい地図で表示 relation: このリレーションを大きい地図で見る - way: このウェイを大きい地図で見る - loading: 読み込み中… + way: ウェイを大きい地図で表示 + loading: 読み込み中... navigation: all: next_changeset_tooltip: 次の変更セット next_node_tooltip: 次のノード next_relation_tooltip: 次のリレーション next_way_tooltip: 次のウェイ - prev_changeset_tooltip: 一つ前の変更セット + prev_changeset_tooltip: 前の変更セット prev_node_tooltip: 前のノード prev_relation_tooltip: 前のリレーション prev_way_tooltip: 前のウェイ user: name_changeset_tooltip: "%{user}による編集を表示" - next_changeset_tooltip: 次の編集（%{user}による） - prev_changeset_tooltip: 前の編集（%{user}による） + next_changeset_tooltip: 次の編集 (%{user} による) + prev_changeset_tooltip: 前の編集 (%{user} による) node: - download: "%{download_xml_link}、%{view_history_link}、または、%{edit_link}" download_xml: XMLをダウンロード edit: 編集 node: ノード @@ -156,11 +161,10 @@ ja: coordinates: "座標:" part_of: "次の一部:" node_history: - download: "%{download_xml_link}、または、%{view_details_link}" download_xml: XMLダウンロード node_history: ノードの履歴 - node_history_title: "ノード履歴: %{node_name}" - view_details: 詳細表示 + node_history_title: "ノードの履歴: %{node_name}" + view_details: 詳細を表示 not_found: sorry: ID %{id} の %{type} は見つかりません。 type: @@ -171,9 +175,15 @@ ja: paging_nav: of: 中 showing_page: ページ表示 + redacted: + message_html: この %{type} の %{version} 版は、改訂されたため表示できません。詳細は %{redaction_link} をご覧ください。 + redaction: 改訂 %{id} + type: + node: ノード + relation: リレーション + way: ウェイ relation: - download: "%{download_xml_link} または %{view_history_link}" - download_xml: XMLのダウンロード + download_xml: XML をダウンロード relation: リレーション relation_title: "関連: %{relation_name}" view_history: 履歴表示 @@ -181,7 +191,6 @@ ja: members: "メンバー:" part_of: "次の一部:" relation_history: - download: "%{download_xml_link}、または、%{view_details_link}" download_xml: XML をダウンロード relation_history: 関連の履歴 relation_history_title: "リレーションの履歴: %{relation_name}" @@ -197,7 +206,7 @@ ja: view_data: 現在のマップのデータを表示 start_rjs: data_frame_title: データ - data_layer_name: データ + data_layer_name: 地図データを参照 details: 詳細 drag_a_box: ボックスをマップにドラッグして領域を選択 edited_by_user_at_timestamp: "[[user]]による[[timestamp]]時点の編集" @@ -205,11 +214,11 @@ ja: history_for_feature: "[[feature]]の履歴" load_data: データの読み込み loaded_an_area_with_num_features: "[[num_features]]個の地物を含む領域を読み込みました。一般に、一部のブラウザーでは、この量のデータ表示をうまく処理できないことがあるようです。通常、ブラウザは一度に100未満の地物を表示させるとよいようです: 何かすると、ブラウザが遅くなったり、反応しなくなったりします。それでも、このデータを表示したいならば、以下のボタンをクリックしてください。" - loading: 読み込み中… + loading: 読み込み中... manually_select: 別の領域を手動で選択 object_list: - api: APIからこの領域を取り込み - back: オブジェクト一覧表示 + api: API でこの領域を取得 + back: オブジェクト一覧を表示 details: 詳細 heading: オブジェクト一覧 history: @@ -223,7 +232,7 @@ ja: type: node: ノード way: ウェイ - private_user: プライベートユーザ + private_user: 非公開ユーザ show_areas: 領域を表示 show_history: 履歴表示 unable_to_load_size: "読み込みできません: 境界囲みのサイズ [[bbox_size]]が大きすぎます。(%{max_bbox_size}より小さい必要があります)" @@ -232,33 +241,31 @@ ja: tag_details: tags: "タグ:" wiki_link: - key: Wikiの %{key} tagについての説明ページ - tag: Wikiの %{key}=%{value} についての解説ページ + key: "%{key} タグの wiki での説明ページ" + tag: "%{key}=%{value} タグの wiki での説明ページ" wikipedia_link: ウィキペディアの %{page} 記事 timeout: - sorry: 申し訳ありません。id %{id} のデータは %{type} は大きすぎて取得できません。 + sorry: すみません、ID %{id} の %{type} のデータは大きすぎるため取得できません。 type: changeset: 変更セット node: ノード relation: リレーション way: ウェイ way: - download: "%{download_xml_link}、%{view_history_link}、または、%{edit_link}" - download_xml: XMLダウンロード + download_xml: XML をダウンロード edit: 編集 view_history: 履歴表示 way: ウェイ way_title: "ウェイ: %{way_name}" way_details: also_part_of: - one: ウェイ「%{related_ways}」の一部でもあります} - other: ウェイ「%{related_ways}」の一部でもあります} + one: ウェイ「%{related_ways}」の一部でもあります + other: ウェイ「%{related_ways}」の一部でもあります nodes: "ノード:" part_of: "変更セット:" way_history: - download: "%{download_xml_link}、または、%{view_details_link}" download_xml: XMLダウンロード - view_details: 詳細表示 + view_details: 詳細を表示 way_history: ウェイの履歴 way_history_title: "ウェイの履歴: %{way_name}" changeset: @@ -271,8 +278,8 @@ ja: still_editing: （まだ編集中です） view_changeset_details: 変更セットの詳細表示 changeset_paging_nav: - next: 旧 » - previous: « 新 + next: 次へ » + previous: « 前へ showing_page: ページ %{page} 表示中 changesets: area: 領域 @@ -281,24 +288,35 @@ ja: saved_at: 保存日時 user: ユーザ list: - description: 最新の変更 + description: 最近の変更 description_bbox: "%{bbox} 内の変更セット" description_friend: 友達による変更セット + description_nearby: 周辺のユーザによる変更セット description_user: "%{user} による変更セット" description_user_bbox: "%{bbox} 範囲内の %{user} の変更セット" heading: 変更セット heading_bbox: 変更セット heading_friend: 変更セット + heading_nearby: 変更セット heading_user: 変更セット heading_user_bbox: 変更セット title: 変更セット title_bbox: "%{bbox} 範囲内の変更セット" title_friend: 友達による変更セット + title_nearby: 周辺のユーザによる変更セット title_user: "%{user} の変更セット" - title_user_bbox: "%{bbox}内の%{user}による変更セット" + title_user_bbox: "%{bbox} 内の %{user} による変更セット" timeout: - sorry: 申し訳ありません。あなたが要求した変更セットのリストは大きすぎて取得に失敗しました。 + sorry: すみません、あなたが要求した変更セットの一覧は大きすぎて取得に失敗しました。 diary_entry: + comments: + ago: "%{ago}前" + comment: コメント + has_commented_on: "%{display_name} が以下の日記エントリにコメントしました" + newer_comments: 新しいコメント + older_comments: 古いコメント + post: 投稿 + when: 日時 diary_comment: comment_from: "%{comment_created_at} %{link_user} からのコメント" confirm: 確認 @@ -310,12 +328,12 @@ ja: comment_link: このエントリへのコメント confirm: 確認 edit_link: この記事の編集 - hide_link: このエントリーを隠す + hide_link: このエントリを隠す posted_by: "%{link_user} による %{created}（%{language_link}）の投稿。" - reply_link: このエントリーに返信する + reply_link: このエントリに返信 edit: body: "本文:" - language: "言語:" + language: 言語： latitude: "緯度:" location: "地域:" longitude: "経度:" @@ -323,26 +341,28 @@ ja: save_button: 保存 subject: "タイトル:" title: 日記の編集 - use_map_link: 地図で指定する + use_map_link: 地図を使用 feed: all: - description: OpenStreetMap ユーザーの最近の日記エントリー - title: OpenStreetMap 日記エントリー + description: OpenStreetMap ユーザの最近の日記エントリ + title: OpenStreetMap 日記エントリ language: - description: "%{language_name} のOpenStreetMap ユーザーの最近の日記エントリー" - title: "%{language_name}のOpenStreetMap 日記エントリー" + description: "%{language_name} の OpenStreetMap ユーザの最近の日記エントリ" + title: "%{language_name} の OpenStreetMap 日記エントリ" user: - description: "%{user} さんの最近のOpenStreetMap 日記のエントリー" - title: "%{user} さんの最近のOpenStreetMap 日記のエントリー" + description: "%{user} さんの最近の OpenStreetMap 日記エントリ" + title: "%{user} さんの最近のOpenStreetMap 日記エントリ" list: - in_language_title: "%{language} の日記項目" + in_language_title: "%{language} の日記エントリ" new: 新規日記入力 - new_title: あなたの日記に新規項目を作成 - newer_entries: 新しい項目 + new_title: あなたの日記に新規エントリを作成 + newer_entries: 新しいエントリ no_entries: 日記の項目がありません - older_entries: 古い項目 - recent_entries: "最新の日記項目:" + older_entries: 古いエントリ + recent_entries: "最近の日記エントリ:" title: ユーザの日記 + title_friends: 友達の日記 + title_nearby: 周辺のユーザの日記 user_title: "%{user} の日記" location: edit: 編集 @@ -353,48 +373,45 @@ ja: no_such_entry: body: ID が %{id} のコメントや日記は存在しません。URLにスペルミスが無いか確認をしてください。もしくはリンク元が間違ってます。 heading: ID %{id} にコメントはまだありません。 - title: そのような日記エントリーはありません。 - no_such_user: - body: "%{user} という名前のユーザは存在しません。スペルを確認してください。もしくはリンク元が間違っています。" - heading: "%{user} というユーザは存在しません。" - title: ユーザが存在しません。 + title: そのような日記エントリはありません view: leave_a_comment: コメントを書いてください login: ログイン - login_to_leave_a_comment: コメントを書くには%{login_link}してください。 + login_to_leave_a_comment: コメントを書くには%{login_link}してください save_button: 保存 title: "%{user}の日記 | %{title}" user_title: "%{user} の日記" editor: default: 規定値 (現在は %{name}) potlatch: - description: Potlatch 1 ( ブラウザ内エディタ ) + description: Potlatch 1 (ブラウザ内エディタ) name: Potlatch 1 potlatch2: - description: Potlatch 2 ( ブラウザ内エディタ ) + description: Potlatch 2 (ブラウザ内エディタ) name: Potlatch 2 remote: - description: リモート制御 ( JOSM または Merkaartor ) - name: リモート制御 + description: 遠隔制御 (JOSM または Merkaartor) + name: 遠隔制御 export: start: add_marker: 地図にマーカーを追加する area_to_export: エクスポートする範囲 embeddable_html: 埋め込みHTML - export_button: 出力 + export_button: エクスポート export_details: OpenStreetMap のデータは <a href="http://creativecommons.org/licenses/by-sa/2.0/">クリエイティブコモンズ 表示-継承 2.0 (Creative Commons Attribution-ShareAlike 2.0)</a>.によって提供されています。 format: "ファイル形式:" format_to_export: エクスポートするファイル形式 - image_size: "画像サイズ:" - latitude: "緯度:" + image_size: 画像サイズ： + latitude: 緯度： licence: ライセンス - longitude: "経度:" + longitude: 経度： manually_select: 別の領域を指定する + map_image: 地図画像 (標準レイヤを表示) max: 最大 options: オプション osm_xml_data: OSM XMLデータ output: 出力 - paste_html: 以下の HTML をあなたのサイトに埋め込んでください + paste_html: 以下の HTML をあなたのサイトに貼り付けてください scale: 縮尺 too_large: body: このエリアは OpenStreetMap XML データとしてエクスポートするには大きすぎます。拡大するか、もっと小さなエリアを選択してください。 @@ -403,10 +420,10 @@ ja: start_rjs: add_marker: マーカーを地図に追加する change_marker: マーカーの位置を変更する - click_add_marker: マーカーを追加する位置をクリックしてください。 - drag_a_box: 指定したい範囲でマウスをドラッグしてください。 - export: 出力 - manually_select: 別の範囲を指定する + click_add_marker: マーカーを追加する位置をクリック + drag_a_box: 地図の選択したい範囲をマウスをドラッグしてください + export: エクスポート + manually_select: 別の範囲を手動選択 view_larger_map: 大きな地図を表示... geocoder: description: @@ -432,7 +449,7 @@ ja: other: 約%{count}キロメートル zero: 1キロメートル以下 results: - more_results: さらに検索... + more_results: その他の結果 no_results: 見つかりませんでした。 search: title: @@ -443,18 +460,33 @@ ja: osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> からの結果 uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>からの結果 us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>からの結果 + search_osm_namefinder: + suffix_parent: "%{suffix}（%{parentname} から%{parentdirection}に %{parentdistance}）" + suffix_place: "%{placename} から%{direction}に %{distance}" search_osm_nominatim: prefix: + aeroway: + aerodrome: 飛行場 + apron: エプロン（空港ランプ） + gate: 門 + helipad: ヘリポート + runway: 滑走路 + taxiway: 空港誘導路 + terminal: ターミナル amenity: + WLAN: WiFiアクセスポイント airport: 空港 arts_centre: アートセンター + artwork: 芸術作品 atm: ATM auditorium: 講堂 bank: 銀行 bar: バー (立ち飲み屋) + bbq: バーベキュー bench: ベンチ bicycle_parking: 駐輪場 bicycle_rental: レンタサイクル + biergarten: ビアガーデン brothel: 売春宿 bureau_de_change: 両替 bus_station: バス停 @@ -463,11 +495,12 @@ ja: car_sharing: カーシェアリング car_wash: 洗車 casino: è³­å ´ + charging_station: 充電ステーション cinema: 映画館 clinic: 診療所 club: クラブ college: 大学 - community_centre: コミュニティセンター + community_centre: コミュニティ センター courthouse: 裁判所 crematorium: 火葬場 dentist: 歯科医 @@ -481,22 +514,23 @@ ja: ferry_terminal: フェリー乗り場 fire_hydrant: 消火栓 fire_station: 消防署 + food_court: フードコート fountain: 噴水 fuel: 燃料 grave_yard: 墓地 - gym: フィットネスセンター + gym: フィットネス センター/ジム hall: ホール health_centre: 保健所 hospital: 病院 hotel: ホテル - hunting_stand: ハンティングスタンド + hunting_stand: ハンティング スタンド ice_cream: アイスクリーム販売店 kindergarten: 幼稚園 library: 図書館 market: 市場 marketplace: 市場 mountain_rescue: 山岳救助 - nightclub: ナイトクラブ + nightclub: ナイト クラブ nursery: 保育所 nursing_home: 特別養護老人ホーム office: オフィス @@ -504,16 +538,16 @@ ja: parking: 駐車場 pharmacy: 薬局 place_of_worship: 神社仏閣 - police: 警察所 + police: 警察署 post_box: 郵便ポスト post_office: 郵便局 preschool: 幼稚園 prison: 刑務所 - pub: パブ（立ち吞み屋） + pub: パブ public_building: 公共建築物 public_market: 公設市場 - reception_area: レセプションエリア - recycling: リサイクル場所 + reception_area: レセプション エリア + recycling: リサイクル場 restaurant: レストラン retirement_home: 老人ホーム sauna: サウナ @@ -521,9 +555,12 @@ ja: shelter: 避難所 shop: 店舗 shopping: ショッピング + shower: シャワー + social_centre: 社会センター social_club: 社交クラブ studio: スタジオ supermarket: スーパーマーケット + swimming_pool: 水泳用プール taxi: タクシー乗り場 telephone: 公衆電話 theatre: 劇場 @@ -538,70 +575,57 @@ ja: youth_centre: 青少年センター boundary: administrative: 行政境界 + census: 国勢調査の境界 + national_park: 国立公園 + bridge: + aqueduct: 水道橋 + suspension: 吊り橋 + swing: 旋回橋 + viaduct: 高架橋 + "yes": 橋 building: - apartments: 団地 - block: 構築物 - bunker: 貯蔵庫 - chapel: 礼拝堂 - church: 教会 - city_hall: 市役所 - commercial: 商業ビル - dormitory: 寮 - entrance: ビル入口 - faculty: 学部棟 - farm: 農舎 - flats: アパート - garage: 車庫 - hall: ホール - hospital: 病院 - hotel: ホテル - house: 住宅 - industrial: 工業ビル - office: オフィスビル - public: 公共建築物 - residential: 住宅 - retail: 店舗ビル - school: 校舎 - shop: 店舗 - stadium: 球技場 - store: 店舗 - terrace: テラス - tower: 塔 - train_station: 鉄道駅 - university: 大学の建物 + "yes": 建造物 highway: bridleway: 乗馬道 + bus_guideway: 路面バス専用車線 bus_stop: バス停 byway: 路地 construction: 建設中の高速道路 cycleway: 自転車道 footway: 歩道 ford: ç ¦ - gate: 門 living_street: 住宅街 + milestone: マイルス トーン minor: 補助道路 motorway: 高速道路 motorway_junction: 高速道路ジャンクション path: パス + pedestrian: 歩行者用通路 platform: プラットフォーム primary: 幹線道路 primary_link: 幹線道路 + rest_area: 休憩所 road: 道路 secondary: 一般道路 secondary_link: 一般道路 service: 取付道路 + speed_camera: 高速度カメラ steps: 階段 tertiary: 周辺道路 + tertiary_link: 周辺道路 + track: Track (農道・林道) trunk: 国道 trunk_link: 幹線道路 unclassified: 未分類の道路 unsurfaced: 未舗装道路 historic: + archaeological_site: 考古学サイト battlefield: 戦場 boundary_stone: 境界石 building: ビル castle: 城 church: 教会 + fort: ç ¦ house: 住宅 icon: アイコン manor: 荘園 @@ -616,19 +640,20 @@ ja: allotments: 家庭菜園 cemetery: 墓地 commercial: 商業地域 + conservation: 保全 construction: 工事中 farm: 農場 farmland: 農地 forest: 森林 + garages: ガレージ grass: 草地 industrial: 工業地帯 landfill: 埋め立て地 meadow: 牧草地 military: 軍用地域 mine: 鉱山 - mountain: å±± + orchard: 果樹園 park: 公園 - plaza: 広場 quarry: 採石場 railway: 鉄道 reservoir: 貯水池 @@ -641,9 +666,10 @@ ja: beach_resort: ビーチリゾート common: 共有地 fishing: 釣り場 + fitness_station: フィットネス ステーション garden: 庭園 golf_course: ゴルフ場 - ice_rink: スケート場 + ice_rink: アイススケート場 marina: マリーナ miniature_golf: ミニチュアゴルフ nature_reserve: 自然保護区 @@ -651,12 +677,17 @@ ja: pitch: 運動場 playground: 遊び場 recreation_ground: 遊園地 + sauna: サウナ slipway: 造船台 - sports_centre: スポーツセンター + sports_centre: スポーツ センター stadium: スタジアム swimming_pool: 水泳用プール track: 陸上競技用トラック water_park: 親水公園 + military: + airfield: 軍用飛行場 + barracks: バラック + bunker: 貯蔵庫 natural: bay: 入り江 beach: 砂浜 @@ -664,11 +695,12 @@ ja: cave_entrance: 洞窟入口 channel: æ°´è·¯ cliff: 崖 - coastline: 海岸線 crater: クレーター + dune: 砂丘 feature: 地物 fell: 荒野 fjord: フィヨルド + forest: 森林 geyser: 間欠泉 glacier: æ°·æ²³ heath: 荒れ地 @@ -688,6 +720,7 @@ ja: scrub: 低木林 shoal: 浅瀬 spring: 泉 + stone: 岩石 strait: 海峡 tree: 木 valley: è°· @@ -696,17 +729,31 @@ ja: wetland: 湿地帯 wetlands: 湿原 wood: 森林 + office: + accountant: 会計 + architect: 建築士 + company: 会社 + employment_agency: 職業紹介 + estate_agent: 不動産代理店 + government: 官公庁 + insurance: 保険事務所 + lawyer: 弁護士 + ngo: NGO オフィス + telecommunication: 通信 + travel_agent: 旅行代理店 + "yes": オフィス place: airport: 空港 city: 市 country: 国 - county: 郡 + county: 国 farm: 牧場 hamlet: 村 house: 住宅 houses: 住宅地 island: 島 islet: 小島 + isolated_dwelling: 免震住宅 locality: 地域 moor: 沼地 municipality: 市町村 @@ -719,6 +766,7 @@ ja: town: 町 village: 村 railway: + abandoned: 廃止鉄道 construction: 建設中の鉄道 disused: 廃線跡 funicular: ケーブル鉄道 @@ -734,9 +782,10 @@ ja: subway_entrance: 地下鉄駅入口 tram: 路面軌道 tram_stop: トラム停留所 + yard: 車両基地 shop: - apparel: 服屋 - art: アートショップ + antiques: 骨董品 + art: アート ショップ bakery: パン屋 beauty: 美容室 beverages: 飲料ショップ @@ -744,28 +793,33 @@ ja: books: 書店 butcher: 肉屋 car: 自動車販売店 - car_dealer: カーディーラー car_parts: 自動車部品販売店 - carpet: カーペットショップ + car_repair: 自動車修理 + carpet: カーペット店 + charity: チャリティ ショップ + chemist: 化学者 clothes: 洋服店 computer: コンピューターショップ + convenience: コンビニエンス ストア cosmetics: 化粧品販売店 department_store: デパート discount: 安売り店 doityourself: 日曜大工 - drugstore: ドラッグストア dry_cleaning: クリーニング electronics: 電気製品販売店 + estate_agent: 不動産代理店 + fashion: ファッション ショップ fish: 鮮魚販売店 florist: 花屋 food: 食品販売店 furniture: 家具店 gallery: ギャラリー general: 雑貨屋 - gift: ギフトショップ + gift: ギフト ショップ greengrocer: 八百屋 grocery: 食料品店 hairdresser: 美容室 + hifi: 高級オーディオ insurance: 保険 jewelry: 宝石店 kiosk: キオスク @@ -774,21 +828,22 @@ ja: market: 市場 mobile_phone: 携帯電話販売店 motorcycle: バイクショップ - music: ミュージックショップ + music: 音楽ショップ newsagent: 新聞販売店 optician: メガネ店 organic: 有機食材店 - outdoor: アウトドアショップ - pet: ペットショップ + outdoor: アウトドア ショップ + pet: ペット ショップ + photo: 写真屋 salon: サロン shoes: 靴屋 - shopping_centre: ショッピングセンター + shopping_centre: ショッピング センター sports: スポーツ用品専門店 stationery: 文房具店 supermarket: スーパーマーケット toys: 玩具店 travel_agency: 旅行代理店 - video: ビデオショップ + video: ビデオ ショップ tourism: artwork: 芸術作品 attraction: アトラクション @@ -803,9 +858,12 @@ ja: information: 案内所 motel: モーテル museum: 博物館 + picnic_site: ピクニック サイト theme_park: テーマパーク valley: è°· zoo: 動物園 + tunnel: + "yes": トンネル waterway: boatyard: ボートヤード canal: 運河 @@ -827,46 +885,51 @@ ja: waterfall: 滝 weir: ダム javascripts: + map: + base: + cycle_map: 自転車地図 + standard: 標準 + transport_map: 輸送地図 site: - edit_disabled_tooltip: 編集のために地図を拡大する + edit_disabled_tooltip: 地図を編集するには拡大してください edit_tooltip: 地図を編集 - edit_zoom_alert: 編集するにはもっと拡大してください - history_disabled_tooltip: 編集履歴を参照するにはもっと拡大してください - history_tooltip: この範囲の編集履歴を見る - history_zoom_alert: 編集履歴を参照するにはもっと拡大してください + edit_zoom_alert: 地図を編集するには拡大してください + history_disabled_tooltip: 編集履歴を表示するには拡大してください + history_tooltip: この範囲の編集履歴を表示 + history_zoom_alert: 編集履歴を表示するには拡大してください layouts: + community: コミュニティ community_blogs: コミュニティ ブログ community_blogs_title: OpenStreetMap コミュニティのメンバーからのブログ copyright: 著作権とライセンス documentation: ドキュメント documentation_title: プロジェクトのドキュメント - donate: ハードウェアーアップグレード基金への%{link} で、OpenStreetMap を支援する。 + donate: ハードウェア アップグレード基金への%{link}で、OpenStreetMap を支援します。 donate_link_text: 寄付 edit: 編集 edit_with: "%{editor} で編集" export: エクスポート export_tooltip: 地図データのエクスポート - foundation: 財団法人 - foundation_title: OpenStreetMap 財団法人 + foundation: 財団 + foundation_title: OpenStreetMap 財団 gps_traces: GPSトレース gps_traces_tooltip: トレースの管理 help: ヘルプ - help_centre: ヘルプセンター + help_centre: ヘルプ センター help_title: プロジェクトのヘルプサイト history: 履歴 home: ホーム - home_tooltip: ホームへ戻る - inbox: 受信箱 (%{count}) + home_tooltip: ホームに戻る inbox_tooltip: one: 受信箱には１通の未読メッセージがあります other: 受信箱には %{count} 通の未読メッセージがあります zero: 受信箱に未読メッセージはありません intro_1: OpenStreetMap は自由に編集できる世界地図です。あなたのような人々が作りました。 - intro_2: OpenStreetMap は地球上の誰でも、どこからでもこの共同作業の結果である地図データを編集、閲覧することを可能にしています。 - intro_3: OpenStreetMap は %{ucl} 、%{ic} 、%{bytemark} によってホスティングされています。%{partners} には協賛組織の一覧があります。 - intro_3_ic: インペリアル・カレッジ・ロンドン - intro_3_partners: ウィキ - intro_3_ucl: ユニヴァーシティ・カレッジ・ロンドン (UCL) VR センター + intro_2_create_account: ユーザ アカウントを作成 + intro_2_download: ダウンロード + intro_2_html: データはその%{license}のもとで自由に%{download}および%{use}できます。地図を改良するには%{create_account}してください。 + intro_2_license: オープン ライセンス + intro_2_use: 使用 license: title: OpenStreetMapのデータは、クリエイティブコモンズ表示 - 継承2.0一般 でライセンスされています log_in: ログイン @@ -877,12 +940,16 @@ ja: logout_tooltip: ログアウト make_a_donation: text: 寄付 - title: 金銭の寄贈でOpenStreetMapを支援する + title: 金銭を寄贈して OpenStreetMap を支援 osm_offline: OpenStreetMap のデータベースはメンテナンスのため一時的に停止しています。 osm_read_only: OpenStreetMap のデータベースはメンテナンスのため一時的に読み込み専用モードになっています。 + partners_bytemark: バイトマーク ホスティング + partners_html: ホスティング支援：%{ucl}、%{ic}、%{bytemark}、その他の%{partners} + partners_ic: インペリアル カレッジ ロンドン + partners_partners: パートナー + partners_ucl: UCL VR センター sign_up: 登録 sign_up_tooltip: 編集のためのアカウントを作成 - sotm2011: 2011å¹´ OpenStreetMap カンファレンス State of the Map は 9月9日-11日 デンバーで開かれます。おいでください! tag_line: 自由なウィキ世界地図 user_diaries: 日記 user_diaries_tooltip: ユーザの日記を見る @@ -898,29 +965,37 @@ ja: text: 翻訳したページと、%{english_original_link} の間で競合が発生しました。英語版の内容が優先されるでしょう。 title: この翻訳について native: - mapping_link: マッピングを始める + mapping_link: マッピングを開始 native_link: THIS_LANGUAGE_NAME_HERE バージョン text: あなたは英語版の著作権情報のページを閲覧しています。%{native_link} から戻る事ができます。または %{mapping_link} からマッピングに戻れます。 title: このページについて message: delete: - deleted: メッセージは削除されました + deleted: メッセージを削除しました inbox: date: 日付 from: 差出人 + messages: "%{new_messages}、%{old_messages}があります" my_inbox: 自分の受信箱 + new_messages: + one: "%{count} 件の新着メッセージ" + other: "%{count} 件の新着メッセージ" + no_messages_yet: まだメッセージがありません。%{people_mapping_nearby_link}とお近づきになってはいかがですか? + old_messages: + one: "%{count} 件の古いメッセージ" + other: "%{count} 件の古いメッセージ" outbox: 送信箱 people_mapping_nearby: 近所でマッピングしている人々 - subject: タイトル + subject: 件名 title: 受信箱 mark: as_read: 既読メッセージ as_unread: 未読メッセージ message_summary: delete_button: 削除 - read_button: 既読に設定 + read_button: 既読にする reply_button: 返信 - unread_button: 未読に設定 + unread_button: 未読にする new: back_to_inbox: 受信箱に戻る body: 本文 @@ -931,17 +1006,16 @@ ja: subject: タイトル title: メッセージの送信 no_such_message: - body: 申し訳ありません。そのIDのメッセージは存在しないようです。 + body: すみません、その ID のメッセージはありません。 heading: そのようなメッセージはありません title: そのようなメッセージはありません - no_such_user: - body: そのような名前のユーザーは存在しません - heading: そのようなユーザーは存在しません - title: そのようなユーザは存在しません outbox: date: 日付 inbox: 受信箱 - my_inbox: わたしの %{inbox_link} + messages: + one: "%{count} 件の送信済みメッセージがあります" + other: "%{count} 件の送信済みメッセージがあります" + my_inbox: 私の%{inbox_link} no_sent_messages: 送信したメッセージはまだありません。%{people_mapping_nearby_link}とお近づきになってはいかがですか? outbox: 送信箱 people_mapping_nearby: 近所でマッピングしている人々 @@ -956,25 +1030,31 @@ ja: reading_your_messages: メッセージを読む reading_your_sent_messages: 送信したメッセージを読む reply_button: 返信 - subject: タイトル + subject: 件名 title: メッセージを読む to: 宛先 - unread_button: 未読に設定 + unread_button: 未読にする + wrong_user: あなたは「%{user}」としてログインしていますが、あなたが読もうとしたメッセージは、そのユーザーが送信したものでも、そのユーザー宛てのものでもありません。メッセージを読むには、正しいユーザでログインしてください。 + reply: + wrong_user: あなたは「%{user}」としてログインしていますが、あなたが返信しようとしたメッセージは、そのユーザー宛てのものではありません。返信するには、正しいユーザでログインしてください。 sent_message_summary: delete_button: 削除 notifier: diary_comment_notification: footer: "%{readurl}でコメントを読むことができ、%{commenturl} でコメントするか、%{replyurl} で返信できます。" + header: あなたが最近入力した OpenStreetMap 日記エントリ（タイトル：%{subject}）に対して、%{from_user} がコメントしました。 hi: やあ、%{to_user} さん - subject: "[OpenStreetMap] %{user} さんが、あなたの日記エントリーにコメントしてくれました" + subject: "[OpenStreetMap] %{user} さんがあなたの日記エントリにコメントしました" email_confirm: - subject: "[OpenStreetMap] あなたのメールアドレスを確認しました。" + subject: "[OpenStreetMap] あなたのメール アドレスの確認" email_confirm_html: + click_the_link: これがあなたであれば、以下のリンクをクリックして変更を確認してください。 greeting: こんにちは、 + hopefully_you: 誰か（おそらくあなた）が %{server_url} で、メールアドレスを %{new_address} に変更しようとしています。 email_confirm_plain: click_the_link: この要求を出したのがあなたなら、下のリンクをクリックして、変更の認証をしてください。 greeting: こんにちは。 - hopefully_you_1: "(あなただとは思いますが、)誰かが彼らのEメールアドレスを変更したいようです。変更先:" + hopefully_you_1: "誰か(おそらくあなた)が彼らのメール アドレスを変更しようとしています。変更先:" hopefully_you_2: "%{server_url}から%{new_address}へ。" friend_notification: had_added_you: "%{user} さんが、あなたを OpenStreetMapの友達に登録しました。" @@ -993,46 +1073,56 @@ ja: loaded_successfully: 得られた%{possible_points} 点のうち、%{trace_points}点がロードに成功しました。 subject: "[OpenStreetMap] GPX のインポートが成功" with_description: 説明付き - your_gpx_file: これはあなたのGPX ファイルのようです。 + your_gpx_file: これはあなたの GPX ファイルのようです lost_password: subject: "[OpenStreetMap] パスワードリセットの要求" lost_password_html: + click_the_link: これがあなたであれば、以下のリンクをクリックしてパスワードをリセットしてください。 greeting: こんにちは、 - hopefully_you: 誰か(たぶんあなた)が、このEメールアドレスの openstreetmap.org アカウントに対して、パスワードをリセットするように依頼しました。 + hopefully_you: 誰か(おそらくあなた)が、このメール アドレスの openstreetmap.org アカウントに対して、パスワードをリセットするように依頼しました。 lost_password_plain: + click_the_link: これがあなたであれば、以下のリンクをクリックしてパスワードをリセットしてください。 greeting: こんにちは、 - hopefully_you_1: 誰か(たぶんあなた)が、この openstreetmap.org アカウントのEメールアドレスに対する + hopefully_you_1: 誰か(おそらくあなた)がこの openstreetmap.org アカウントのメール アドレスに対する hopefully_you_2: パスワードをリセットするように依頼しました。 message_notification: footer1: "%{readurl} でメッセージを読むこともできます。" footer2: また、%{replyurl} で返信することができます。 - hi: やあ %{to_user}、 + header: "%{from_user} さんが OpenStreetMap であなたに、件名 %{subject} でメッセージを送信しました：" + hi: やあ %{to_user} さん、 signup_confirm: - subject: "[OpenStreetMap] あなたのEメールアドレスの確認" + subject: "[OpenStreetMap] あなたのメール アドレスの確認" signup_confirm_html: + ask_questions: <a href="http://help.openstreetmap.org/">質疑用サイト</a>では、OpenStreetMap について何でもご質問いただけます ： get_reading: まずは、OpenStreetMap について知るために、<a href="http://wiki.openstreetmap.org/wiki/Ja:Beginners%27_Guide">ウィキを読みましょう</a>。そして、最新ニュースを<a href="http://blog.openstreetmap.org/">OpenStreetMap ブログ</a>か<a href="http://twitter.com/openstreetmap">Twitter</a>で追いかけましょう。また、OpenStreetMap 創設者 Steve Coast の<a href="http://www.opengeodata.org/">OpenGeoData ブログ</a>を見て、このプロジェクトの歴史を味わってみましょう。これは、<a href="http://www.opengeodata.org/?cat=13">podcasts</a>で聞くこともできます。(英語です) greeting: やあ、皆さん! - hopefully_you: "誰か(多分あなた)がここでアカウントを作りたいようです:" - introductory_video: ビデオは、%{introductory_video_link} で見ることができます。 + hopefully_you: "誰か(おそらくあなた)がここでアカウントを作りたいようです:" + introductory_video: "%{introductory_video_link} で動画をご覧いただけます。" more_videos: ビデオがあります。%{more_videos_link}. - more_videos_here: ビデオはここです - user_wiki_page: ユーザーwiki ページを作ることをお勧めします。その中にあなたがどこにいるかを知らせるCategory タグを入れるといいです。例えば、<a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Japan">[[Category:Users_in_Japan]]</a>とかです。 - video_to_openstreetmap: OpenStreetMap の紹介ビデオ + more_videos_here: その他の動画はこちら + user_wiki_page: ユーザ wiki ページを作成して、あなたがどこにいるかを示すカテゴリ タグを入れることをお勧めします。例えば、<a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Tokyo">[[Category:Users_in_Tokyo]]</a>などです。 + video_to_openstreetmap: OpenStreetMap の紹介動画 wiki_signup: また、<a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page&uselang=ja">OpenStreetMap wikのサインアップ</a>もしておくとよいでしょう。 signup_confirm_plain: - introductory_video: OpenStreetMap の紹介ビデオをこちらで見ることができます： - more_videos: こちらにもっとビデオがあります： + ask_questions: "質疑用サイトでは、OpenStreetMap について何でもご質問いただけます:" + blog_and_twitter: "OpenStreetMap ブログや Twitter では最新のニュースをご覧いただけます:" + greeting: やあ、皆さん! + introductory_video: "OpenStreetMap の紹介動画をこちらでご覧いただけます:" + more_videos: "その他の動画がこちらにあります:" + opengeodata: OpenGeoData.org は OpenStreetMap の創設者 Steve Coast さんのブログであり、ポッドキャストもされています： the_wiki_url: http://wiki.openstreetmap.org/wiki/Ja:Beginners%27_Guide + wiki_signup: OpenStreetMap wiki にサインアップしたい場合は： wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page&uselang=ja oauth: oauthorize: allow_read_gpx: あなたの非公開GPSトレースを読み込む。 - allow_read_prefs: あなたの利用者設定を読み込む。 + allow_read_prefs: あなたのユーザ設定を読み込みます。 allow_to: "クライアントアプリケーションに以下の操作を許可する:" - allow_write_api: 地図を修正する。 + allow_write_api: 地図を修正します。 + allow_write_diary: 日記エントリを作成したり、コメントしたり、友達を作ったりします。 allow_write_gpx: GPSトレースをアップロードする。 - allow_write_prefs: あなたの利用者設定を変更する。 - request_access: アプリケーション %{app_name} があなたのアカウント、%{user} への接続許可を求めています。そのアプリケーションに許可してもよいかどうかを確認してください。複数のアプリケーションに許可を与える事もできます。 + allow_write_prefs: あなたのユーザ設定を変更します。 + request_access: アプリケーション %{app_name} があなたのアカウント、%{user} への接続許可を求めています。そのアプリケーションに許可してもよいかどうかを確認してください。複数のアプリケーションに許可を与えることもできます。 revoke: flash: "%{application} へのトークンを失効しました。" oauth_clients: @@ -1042,24 +1132,25 @@ ja: flash: 破棄されたクライアントアプリケーションの登録 edit: submit: 編集 - title: アプリケーションの編集 + title: アプリケーションを編集 form: - allow_read_gpx: 非公開GPSトレースを読み込む。 - allow_read_prefs: 利用者設定を読み込む。 - allow_write_api: 地図を修正する。 - allow_write_gpx: GPSトレースをアップロードする。 - allow_write_prefs: ユーザー設定を変更する。 + allow_read_gpx: 非公開 GPS トレースを読み込みます。 + allow_read_prefs: ユーザ設定を読み込みます。 + allow_write_api: 地図を修正します。 + allow_write_diary: 日記エントリやコメントを作成し、友達を作ります。 + allow_write_gpx: GPS トレースをアップロードします。 + allow_write_prefs: ユーザ設定を変更します。 callback_url: コールバックURL name: 名前 - requests: "ユーザからのアクセス許可要求:" + requests: "ユーザから以下の許可をリクエスト:" required: 必須 support_url: サポートURL url: メインアプリケーションのURL index: application: アプリケーション名 issued_at: 発行 - list_tokens: 以下のアプリケーションに対してあなたのユーザー名でトークンが許可されています。 - my_apps: クライアントアプリケーション + list_tokens: "アプリケーションに対してあなたの名前で以下のトークンが許可されています:" + my_apps: クライアント アプリケーション my_tokens: 認証を許可したアプリケーション no_apps: OSMのサイトで使用するアプリケーションを新しく %{oauth} で登録するにはOAuthリクエストの前にあらかじめwebから登録しておく必要があります。 register_new: アプリケーションの登録 @@ -1069,36 +1160,56 @@ ja: new: submit: 登録 title: 新しいアプリケーションを登録 + not_found: + sorry: すみません、その %{type} は見つかりませんでした。 show: - access_url: "アクセストークンURL:" - allow_read_gpx: 非公開GPSトレースを読み込む。 - allow_read_prefs: 利用者設定を読み込む。 - allow_write_api: 地図を修正する。 - allow_write_gpx: GPS トレースをアップロードする。 - allow_write_prefs: 利用者設定を変更する。 - authorize_url: "承認URL:" - edit: 詳細の編集 - key: "コンシューマーキー:" - secret: "コンシューマーシークレット:" + access_url: "アクセス トークン URL:" + allow_read_gpx: 非公開 GPS トレースを読み込みます。 + allow_read_prefs: ユーザ設定を読み込む。 + allow_write_api: 地図を修正します。 + allow_write_diary: 日記エントリやコメントを作成し、友達を作ります。 + allow_write_gpx: GPS トレースをアップロードします。 + allow_write_prefs: ユーザ設定を変更します。 + authorize_url: "承認 URL:" + confirm: よろしいですか? + edit: 詳細を編集 + key: "コンシューマ キー:" + requests: "ユーザが以下の許可をリクエストしています:" + secret: "コンシューマ シークレット:" + support_notice: SSLモードでの平文方式だけでなく、HMAC-SHA1方式（推奨）にも対応しています。 title: "%{app_name} の OAuth 詳細" - url: "リクエストトークンURL:" + url: "リクエスト トークン URL:" update: flash: クライアント情報の更新が正常に終了しました + redaction: + edit: + description: 説明 + new: + description: 説明 + show: + confirm: よろしいですか? + description: 説明： + user: "作成者:" + update: + flash: 変更を保存しました。 site: edit: flash_player_required: OpenStreetMap エディタの Potlatch を使うには、Flash Player が必要です。Flash Player は<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Adobe.com</a>からダウンロードできます。OpenStreetMapを編集する<a href="http://wiki.openstreetmap.org/wiki/Ja:Editing">他の方法</a>もあります。 + no_iframe_support: あなたのブラウザーは、この機能に必須の HTML iframe に未対応です。 not_public: あなたの編集結果を公開できません。 + potlatch2_not_configured: Potlatch 2 が設定されていません - 詳細情報はこちらをご覧ください：http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_unsaved_changes: 保存していない変更があります。（Potlatch 2 で保存するには、保存をクリックする必要があります。） potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.) user_page_link: ユーザページ index: js_1: JavaScriptをサポートしていないブラウザを使用しているか、JavaScriptを使用不可に設定しています。 js_2: OpenStreetMapは、地図表示にJavaScriptを使用しています。 - js_3: JavaScriptを使えない場合は静的な<a href="http://tah.openstreetmap.org/Browse/">Tiles@Homeの地図ブラウザ</a>を試してみてはいかがでしょうか。 license: license_name: クリエイティブコモンズ 表示-継承 2.0 notice: " %{project_name}とその貢献者により、%{license_name} ライセンスの元提供されています。" project_name: OpenStreetMapプロジェクト permalink: パーマリンク + remote_failed: 編集に失敗しました - JOSM または Merkaartor がロードされており、リモート制御オプションが有効になっていることを確認してください。 shortlink: ショートリンク key: map_key: 凡例 @@ -1112,10 +1223,11 @@ ja: - 空港ターミナル bridge: 黒枠 = 橋梁 bridleway: 馬道 + brownfield: Brownfield サイト（廃工場地域） building: 重要建造物 byway: 路地 cable: - - ケーブル・カー + - ケーブルカー - リフト cemetery: 墓地 centre: スポーツセンター @@ -1168,12 +1280,28 @@ ja: unclassified: 未分類の道路 unsurfaced: 未舗装道路 wood: 森林 + markdown_help: + alt: 代替テキスト + first: 最初の項目 + heading: 見出し + headings: 見出し + image: 画像 + link: リンク + ordered: 順序付きリスト + second: 2 番目の項目 + subheading: 小見出し + text: テキスト + unordered: 順序なしリスト + url: URL + richtext_area: + edit: 編集 + preview: プレビュー search: search: 検索 - search_help: "例: '名古屋城'、'名寄市'、'New York'、'皇居' など <a href='http://wiki.openstreetmap.org/wiki/Search'>他の例…</a>" + search_help: "例: '名古屋城'、'名寄市'、'New York'、'皇居' など <a href='http://wiki.openstreetmap.org/wiki/Search'>その他の例...</a>" submit_text: 行く where_am_i: いまどこ? - where_am_i_title: サーチエンジンを使って現在の場所を記述する + where_am_i_title: 検索エンジンを使用して現在の場所を記述 sidebar: close: 閉じる search_results: 検索結果 @@ -1195,10 +1323,10 @@ ja: map: 地図 owner: "アップロードしたユーザ:" points: "ポイント数:" - save_button: 変更を保存する + save_button: 変更を保存 start_coord: "開始座標:" tags: "タグ:" - tags_help: コンマ区切り + tags_help: カンマ区切り title: トレース %{name} を編集 uploaded_at: "アップロード日時:" visibility: "可視性:" @@ -1211,10 +1339,6 @@ ja: your_traces: あなたのGPSトレース make_public: made_public: トラックを公開しました - no_such_user: - body: "%{user} という名前のユーザは存在しません。スペルをチェックしてください。もしくはリンク元が誤っています。" - heading: "%{user} というユーザは存在しません。" - title: そのようなユーザは存在しません offline: heading: GPXのストレージが利用できません message: GPXファイルのストレージとアップロードシステムは現在使用できません。 @@ -1239,33 +1363,31 @@ ja: help: ヘルプ help_url: http://wiki.openstreetmap.org/wiki/Ja:Upload tags: タグ： - tags_help: コンマ区切り + tags_help: カンマ区切り upload_button: アップロード upload_gpx: GPXファイルのアップロード： visibility: 可視性： visibility_help: これはどういう意味？ visibility_help_url: http://wiki.openstreetmap.org/wiki/Ja:Visibility_of_GPS_traces trace_header: - see_all_traces: 全てのトレースを見る + see_all_traces: すべてのトレースを見る see_your_traces: あなたのトレースを全て見る - traces_waiting: あなたは %{count} のトレースがアップロード待ちになっています。それらのアップロードが終了するまでお待ちください。他のユーザーのアップロードが制限されてしまいます。 + traces_waiting: あなたの %{count} 件のトレースがアップロード待ち中です。これらのアップロードの完了までお待ちください。他のユーザのアップロードが制限されてしまいます。 upload_trace: トレースをアップロード trace_optionals: tags: タグ（複数可） trace_paging_nav: - next: 次へ » - previous: « 前へ showing_page: " %{page} ページ" view: - delete_track: このトラックの削除 + delete_track: このトラックを削除 description: "詳細:" download: ダウンロード edit: 編集 - edit_track: このトラックの編集 + edit_track: このトラックを編集 filename: "ファイル名:" heading: トレース%{name}の表示 map: 地図 - none: 無し + none: なし owner: "アップロードしたユーザ:" pending: アップロード中 points: "ポイント数:" @@ -1289,82 +1411,92 @@ ja: link text: これは何ですか？ not yet agreed: あなたはまだ新しい投稿規約を承諾していません。 review link text: ご都合の良い時にこのリンクをクリックして新しい投稿規約をレビューの上、同意してください。 - current email address: 現在の電子メールアドレス： + current email address: "現在のメール アドレス:" delete image: 現在の画像を削除 - email never displayed publicly: （公開しません） - flash update success: ユーザ情報の更新に成功しました。 - flash update success confirm needed: ユーザ情報の更新に成功しました。登録したメールアドレスのメールを受信して、メールアドレスの確認を行ってください。 + email never displayed publicly: (非公開) + flash update success: ユーザ情報を更新しました。 + flash update success confirm needed: ユーザ情報を更新しました。新しいメール アドレスを確認するためにメールを確認してください。 home location: "活動地域:" image: "画像:" - keep image: 現在のイメージを保持 + image size hint: (100x100 以下の正方形の画像が最適) + keep image: 現在の画像を保持 latitude: "緯度:" longitude: "経度:" make edits public button: 私の編集を全て公開する my settings: 私の設定 - new email address: 新しい電子メールアドレス + new email address: "新しいメール アドレス:" new image: 画像を追加 no home location: あなたはまだ活動地域を登録していません。 openid: - link text: これは何ですか？ + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: これは何ですか? openid: OpenID： preferred editor: 優先エディタ： - preferred languages: "言語設定:" + preferred languages: "言語:" profile description: "ユーザ情報の詳細:" public editing: - disabled: Disabled 編集できません。これまでの編集は全て匿名の物として扱われます。 - disabled link text: なぜ編集できないのですか？ - enabled: 有効。 匿名編集ではなく、ふつうに編集できます。 + disabled: 無効。データを編集できず、これまでの編集はすべて匿名です。 + disabled link text: なぜ編集できないのですか? + enabled: 有効。匿名ではなく、データを編集できます。 enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits - enabled link text: これは何ですか？ + enabled link text: これは何ですか? heading: "公開編集:" public editing note: heading: 公開編集 - replace image: 現在の画像と置換 + text: 現在、あなたの編集作業は匿名扱いであるため、他の人々があなたにメッセージを送信したり、あなたの場所を見たりすることはできません。あなたの編集結果を表示できるようにして、他の人々がウェブサイト経由であなたに連絡できるようにするためには、下のボタンをクリックしてください。<b>API 0.6版以降では、地図データを編集できるのは公開ユーザーのみです。</b>（<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">その理由</a>）<ul><li>公開扱いに変更しても、あなたのメールアドレスが暴露されることはありません。</li><li>この変更は取り消せません。なお新しいユーザーは、既定で公開扱いとなります。</li></ul> + replace image: 現在の画像を置換 return to profile: プロフィールに戻る save changes button: 変更を保存 title: アカウントを編集 - update home location on click: クリックした地点をあなたの活動地域として登録を更新しますか？ + update home location on click: 地図上のクリックした地点をあなたの活動地域として更新しますか? confirm: - already active: このアカウントはすでに確認されています。 + already active: このアカウントは確認済みです。 + before you start: マッピングを開始するのをお急ぎだと思いますが、以下のフォームであなたの情報をいくつか記入してください。 button: 確認 - heading: ユーザアカウントの確認 + heading: ユーザ アカウントを確認 press confirm button: アカウントを有効にして良ければ、以下の確認ボタンを押してください。 - success: あなたのアカウントを確認しました。登録ありがとうございます！ - unknown token: このトークンは存在していないようです。 + success: アカウントを確認しました。登録ありがとうございます! + unknown token: このトークンは存在しないようです。 confirm_email: button: 確認 failure: このメールアドレス確認トークンは既に確認が済んでいます。 - heading: 電子メールアドレス変更の確認 - press confirm button: 新しいメールアドレスを確認するために確認ボタンを押して下さい。 - success: あなたのメールアドレスが確認できました。登録ありがとうございます。 + heading: メール アドレスの変更を確認 + press confirm button: 新しいメール アドレスを確認するために確認ボタンを押してください。 + success: メール アドレスを確認しました。登録ありがとうございます! confirm_resend: failure: "%{name}というアカウントは登録されていません。" - success: " %{email}に確認メッセージを再送信しました。電子メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。" + success: " %{email}に確認メッセージを再送信しました。メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っている場合は webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。" filter: not_an_administrator: この作業を行うには、管理者になる必要があります。 go_public: flash success: あなたの全ての編集は公開されます。今から編集できます。 list: confirm: 選択したユーザを確認 - empty: 条件に一致するユーザーが見つかりません - heading: 利用者 - hide: 選択したユーザーを隠す + empty: 条件に一致するユーザがいません + heading: ユーザ + hide: 選択したユーザを隠す + showing: + one: ページ %{page} (%{items} 件中 %{first_item} 件目) を表示中 + other: ページ %{page} (%{items} 件中 %{first_item}-%{last_item} 件目を表示中) summary: "%{name} は %{ip_address}から%{date}に作成されました。" summary_no_ip: "%{name} は%{date}に作成されました。" - title: ユーザー + title: ユーザ login: - account not active: 申し訳ありません。あなたのアカウントはまだ有効ではありません。<br />アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックするか、<a href="%{reconfirm}">新しいアカウント確認メールの要求</a>をしてください。 - auth failure: 申し訳ありません、以下の理由によりログインできません。 + account is suspended: 申し訳ありませんが、不審な活動のため、あなたのアカウントは一時停止されております。<br />本件についてご相談がある場合は <a href="%{webmaster}">ウェブマスター</a>にご連絡ください。 + account not active: すみません、あなたのアカウントはまだ有効ではありません。<br />アカウント確認メール内のリンクをクリックするか、<a href="%{reconfirm}">新しい確認メールを要求</a>をしてください。 + auth failure: すみません、以下の理由によりログインできませんでした。 create account minute: アカウントを作成します。1分でできます。 - email or username: "Eメールアドレスかユーザ名:" + email or username: "メール アドレスまたはユーザ名:" heading: ログイン login_button: ログイン lost password link: パスワードを忘れましたか? - new to osm: OpenStreetMapは初めてですか？ + new to osm: OpenStreetMapは初めてですか? + no account: アカウントを持っていませんか? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">今後行う OpenStreetMap のライセンス変更についてお読みください</a> (<a href="http://wiki.openstreetmap.org/wiki/JA:ODbL/We_Are_Changing_The_License">翻訳</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">議論</a>) + notice_terms: OpenStreetMap は2012å¹´4月1日に新しいライセンスに移行しました。オープンさは現在のものとほぼ同等ですが、はるかに地図データベースに適した法的条件になっています。 あなたの貢献をOpenStreetMap に残しておくためには、新しいライセンス条件で配布することに同意いただく必要があります。 同意いただけない場合には、あなたの貢献をデータベースから除去するほかなくなります。<br /><br />ログインして、新しい条件を軽く確認し、承認願います。よろしくお願いします。 openid: "%{logo} OpenID：" - openid invalid: 申し訳ありません、OpenID は不正な形式と思われます。 - openid missing provider: 申し訳ありません、OpenID プロバイダに接続できませんでした。 + openid invalid: すみません、あなたの OpenID は正しくないようです + openid missing provider: すみません、OpenID プロバイダに接続できませんでした openid_logo_alt: OpenID でログイン openid_providers: aol: @@ -1377,57 +1509,61 @@ ja: alt: myOpenID の OpenID でログイン title: myOpenID でログイン openid: - alt: OpenID の URLを入力してログイン + alt: OpenID の URL でログイン title: OpenID でログイン wordpress: alt: Wordpress の OpenID でログイン title: WordPress でログイン yahoo: - alt: Yahoo OpenID でログイン + alt: Yahoo の OpenID でログイン title: Yahoo ID でログ​​イン password: "パスワード:" register now: 今すぐ登録 - remember: パスワードを記憶する。 + remember: パスワードを記憶 title: ログイン to make changes: OpenStreetMap データを変更するには、アカウントが必要です。 - with username: 既に OpenStreetMap のアカウントをお持ちですか？ ユーザー名とパスワードを入力してログインしてください： + with openid: "代わりに OpenID を使用してログインしてください:" + with username: "OpenStreetMap アカウントを既にお持ちですか? ユーザ名とパスワードでログインしてください:" logout: - heading: OpenStreetMapからログアウトする + heading: OpenStreetMap からログアウト logout_button: ログアウト title: ログアウト lost_password: - email address: "電子メールアドレス:" + email address: "メール アドレス:" heading: パスワードを忘れましたか? - help_text: あなたがサインアップしたときのEメールアドレスを入力してください。そのアドレス宛にあなたのパスワードをリセットすることができるリンクを送ります。 + help_text: サインアップに使用したメール アドレスを入力してください。そのアドレス宛にあなたのパスワードをリセットするためのリンクを送信します。 new password button: 新しいメールを送ってください - notice email cannot find: 残念ながら電子メールアドレスは見つかりません。 - notice email on way: 残念ながらパスワードをすでに消しました (-.-);; しかし、リセット用の電子メールを送っていますので、すぐに回復できるでしょう。 + notice email cannot find: すみません、そのメール アドレスは見つかりません。 + notice email on way: すみません、なくしてしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。 title: パスワードを忘れた make_friend: already_a_friend: あなたは %{name} と既に友達です。 failed: "%{name} を友達と登録できませんでした。" success: "%{name} はあなたの友達になりました。" new: - confirm email address: "メールアドレスの確認:" - confirm password: "パスワードの再入力:" + confirm email address: "メール アドレスの確認:" + confirm password: "パスワードの確認:" contact_webmaster: アカウントを作成できるよう、<a href="mailto:webmaster@openstreetmap.org">webmaster</a>に連絡してください。 できるだけ早期に、あなたの希望に対応するように努めます。 continue: 続行 display name: "表示名:" - display name description: あなたのユーザー名は投稿者として公開されます。これは設定から変更できます。 - email address: "Eメールアドレス:" + display name description: あなたの公開ユーザ名です。これはあとで設定で変更できます。 + email address: "メール アドレス:" fill_form: 以下のフォームを埋めてください。登録すると、あなたのアカウントを有効化するためにあなたにメールをお送りします。 - flash create success message: "%{email}に確認メッセージを送信しました。電子メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。" - heading: ユーザアカウントの作成 - license_agreement: アカウントを確認するときには <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a> に同意する必要があります。。 - no_auto_account_create: 残念ながら、自動的にアカウントを作ることが出来ません。 - not displayed publicly: 公開されません。（詳細は <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">プライバシーポリシー</a>を御覧下さい） + flash create success message: "%{email} に確認メッセージを送信しました。メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。" + heading: ユーザ アカウントを作成 + license_agreement: アカウントを確認するときには <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a> に同意する必要があります。 + no_auto_account_create: 残念ながら、現在、自動ではアカウントを作成できません。 + not displayed publicly: 非公開です。（詳細は <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">プライバシー ポリシー</a>を御覧下さい） openid: "%{logo} OpenID：" + openid association: "<p>あなたの OpenID は、まだ OpenStreetMap のどのアカウントとも関連付けられていません。</p>\n<ul>\n <li>OpenStreetMap が初めての場合は、下のフォームで新規アカウントを作成してください。</li>\n <li>\n 既にアカウントを持っている場合は、あなたのユーザー名とパスワードでログインしてください。\n ログイン後、ユーザ設定であなたの OpenID と関連付けることができます。\n </li>\n</ul>" + openid no password: OpenID ではパスワードは不要ですが、特殊なツール/サーバーでは必要な場合があります。 password: "パスワード:" - terms accepted: 新しい投稿規約を承諾して頂き、ありがとうございます。 - terms declined: 新しい投稿規約を承諾して頂けず残念です。詳しい情報は、<a href="%{url}">このウィキページ</a>をごらんください。 + terms accepted: 新しい投稿規約に同意いただき、ありがとうございます! + terms declined: 新しい投稿規約に同意いただけず残念です。詳しい情報は、<a href="%{url}">このウィキページ</a>をご覧ください。 title: アカウント作成 + use openid: 代わりに、%{logo} OpenID を使用してログイン no_such_user: - body: "%{user}. という名前のユーザは存在しません。スペルミスが無いかチェックしてください。もしくはリンク元が間違っています。" + body: すみません、%{user} という名前のユーザは存在しません。スペルミスをチェックしてください。もしくはクリックしたリンクが間違っています。 heading: "%{user} というユーザは存在しません。" title: ユーザが存在しません popup: @@ -1438,111 +1574,128 @@ ja: not_a_friend: "%{name} はあなたの友達ではありません。" success: "%{name} はあなたの友達から外しました。" reset_password: - confirm password: 確認用パスワード： + confirm password: "パスワードの確認:" flash changed: あなたのパスワードは変更されました。 - flash token bad: キーワードを見つけられません。URLをチェックしてはいかがですか？ + flash token bad: キーワードが見つかりません。URL を確認してください。 heading: "%{user}のパスワードを初期化" password: "パスワード:" reset: パスワードを初期化 - title: パスワードのリセット + title: パスワードをリセット set_home: flash success: 活動地域を保存しました。 suspended: - heading: アカウント保留 - title: アカウント保留 + body: "<p>\n 申し訳ありませんが、不審な活動のため、あなたのアカウントは自動的に一時停止されております。\n</p>\n<p>\n この処置については近々管理者が確認をいたしますが、ご相談がある場合は%{webmaster} にご連絡いただいてもかまいません。\n</p>" + heading: アカウント停止 + title: アカウント停止 + webmaster: ウェブマスター terms: - agree: 同意する + agree: 同意 consider_pd: 私の投稿をパブリックドメインとします（著作権、著作隣接権を放棄し、著作人格権の行使を行いません） - consider_pd_why: これは何ですか？ + consider_pd_why: これは何ですか? decline: 拒否 guidance: この規約を理解するための情報として、<a href="%{summary}">要約(英語)</a> や <a href="%{translations}">非公式の翻訳</a> をごらんください。 - heading: 投稿規約(Contributor terms) + heading: 投稿規約 legale_names: france: フランス italy: イタリア rest_of_world: それ以外の国 legale_select: "お住まいの国もしくは地域を選択してください:" read and accept: 下記の同意書を読み、あなたの既存および将来の投稿のために本同意書の条項を承諾することを確認するために同意ボタンを押してください。 - title: 投稿規約(Contributor terms) + title: 投稿規約 + you need to accept or decline: 続行するには新しい投稿規約を読んで同意または拒否してください。 view: - activate_user: このユーザーを有効にする + activate_user: このユーザを有効にする add as friend: 友達に追加 - ago: （%{time_in_words_ago} 前） - confirm: 確認する - confirm_user: このユーザーを確認する - create_block: このユーザーをブロック + ago: （%{time_in_words_ago}前） + block_history: 受信したブロックを表示 + blocks by me: 私によるブロック + blocks on me: 私へのブロック + comments: コメント + confirm: 確認 + confirm_user: このユーザを確認 + create_block: このユーザをブロック created from: "作成日:" ct accepted: "%{ago}前に承認" ct declined: 拒否 ct status: "投稿規約:" ct undecided: 未決定 - deactivate_user: このユーザーを無効にする - delete_user: このユーザーを消す - description: 詳細 + deactivate_user: このユーザを無効にする + delete_user: このユーザを削除 + description: 説明 diary: 日記 edits: 編集 - email address: 電子メールアドレス： + email address: "メール アドレス:" friends_changesets: 友達によるすべての変更セットを参照 - hide_user: このユーザーを隠す + friends_diaries: 友達の日記エントリをすべて参照 + hide_user: このユーザを隠す if set location: 活動地域を指定すると、この下に周辺の地図と、近くで活動するマッパーが表示されます。%{settings_link} から設定をしてください。 km away: 距離 %{count}km latest edit: "最終編集 %{ago}:" m away: 距離 %{count}m mapper since: "マッパー歴:" + moderator_history: 与えられたブロックを表示 + my comments: 私のコメント my diary: 私の日記 my edits: 私の編集 - my settings: ユーザ情報の設定 + my settings: 設定 my traces: 私のトレース - nearby users: その他の近くのユーザ + nearby users: 周辺のその他のユーザ + nearby_changesets: ユーザーの周辺のすべての変更セットを参照 + nearby_diaries: ユーザの周辺のすべての日記エントリを参照 new diary entry: 新しい日記エントリ no friends: あなたは誰も友達として登録されていません。 no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。 oauth settings: OAuth設定 remove as friend: 友達から削除 role: - administrator: このユーザーは管理者です。 + administrator: このユーザは管理者です grant: - administrator: 管理者権限を与える - moderator: モデレータアクセスを許可 - moderator: このユーザーはモデレータです + administrator: 管理者アクセスを許可 + moderator: モデレータ権限を許可 + moderator: このユーザはモデレータです revoke: - administrator: 管理者権限を剥奪する - moderator: モデレート権限を剥奪する + administrator: 管理者権限を剥奪 + moderator: モデレータ権限を剥奪 send message: メッセージ送信 settings_link_text: 設定 spam score: スパム評価： - status: "ステータス:" + status: "状態:" traces: トレース - unhide_user: このユーザー再表示 + unhide_user: このユーザを再表示 user location: ユーザの位置 your friends: あなたの友達 user_block: blocks_by: empty: "%{name} は一度もブロックしていません。" - heading: "%{name} によるブロックのリスト" + heading: "%{name} によるブロックの一覧" title: "%{name} が行ったブロック" blocks_on: empty: "%{name} は一度もブロックされていません。" heading: "%{name} のブロックのリスト" title: "%{name} がされたブロック" create: - flash: ユーザー %{name} をブロックしました。 + flash: ユーザ %{name} をブロックしました。 + try_contacting: ブロックする前にユーザーにご連絡し、ユーザーが対処するための十分な時間を確保するようにしてください。 + try_waiting: ブロックする前に、ユーザーが対処するための十分な時間を確保するようにしてください。 edit: back: すべてのブロックを表示 heading: "%{name} のブロックを編集" + period: ユーザーが今からどれくらいの間、APIからブロックされるか。 + reason: "%{name} さんがブロックされている理由です。メッセージは多くの人の目にふれることになりますから、できるだけ冷静かつ合理的になり、できるだけ丁寧に状況を説明するようにしてください。すべてのユーザーがコミュニティ内での隠語を理解しているわけではありませんので、分かりやすい用語を使うように努めてください。" show: このブロックを閲覧 submit: ブロックを更新 title: "%{name} のブロックを編集" filter: block_expired: このブロック期間は既に終了しており、変更できません。 block_period: ブロック期間はドロップダウンリストから一つ選択してください。 - not_a_moderator: その動作にはモデレータ権限が必要です。 helper: - time_past: "%{time} 前に終了しました。" + time_future: "%{time} に終了します。" + time_past: "%{time}前に終了しました。" + until_login: ユーザがログインするまでアクティブです。 index: empty: ブロックはまだ行われていません。 - heading: ユーザーブロックのリスト - title: ユーザーブロック + heading: ユーザ ブロックの一覧 + title: ユーザ ブロック model: non_moderator_revoke: ブロックを解除するにはモデレータ権限が必要です。 non_moderator_update: ブロックを編集するにはモデレータ権限が必要です。 @@ -1550,49 +1703,66 @@ ja: back: 全てのブロックを表示 heading: "%{name} をブロック" needs_view: ブロックを解除するにはログインし直す必要があります。 - submit: ブロックする + period: ユーザーが今からどれくらいの間、APIからブロックされるか。 + reason: "%{name} さんがブロックされている理由です。メッセージは多くの人の目にふれることになりますから、できるだけ冷静かつ合理的になり、できるだけ丁寧に状況を説明するようにしてください。すべてのユーザーがコミュニティ内での隠語を理解しているわけではありませんので、分かりやすい用語を使うように努めてください。" + submit: ブロックを作成 title: "%{name} をブロック" - tried_contacting: ユーザーにそれをやめるよう尋ねました。 + tried_contacting: ユーザに連絡し、それらをやめるよう依頼しました。 not_found: back: 索引に戻る - sorry: 申し訳ありません。ユーザーID%{id} のブロックは見つかりませんでした。 + sorry: すみません、ID %{id} のユーザ ブロックはありませんでした。 partial: confirm: 確かですか? creator_name: 製作者 - display_name: ブロックされたユーザー + display_name: ブロックされたユーザ edit: 編集 + not_revoked: (取り消されていません) reason: ブロックされた理由 - revoke: 取消し - show: 見せる + revoke: 取り消す! + revoker_name: "取り消し者:" + show: 表示する status: 状態 period: "%{count} 時間" revoke: - confirm: このブロックを取り消してよろしいですか？ + confirm: このブロックを取り消してよろしいですか? flash: このブロックは取り消されました。 heading: ブロックは %{block_on} に %{block_by} によって取り消されました。 - past: このブロックは %{time} 前に終了しました。今取り消す事はできません。 + past: このブロックは%{time}前に終了しました。もう取り消すことはできません。 revoke: 取消し time_future: このブロックは %{time} に終了します。 title: "%{block_on} のブロックを取消し" show: back: すべてのブロックを表示 - confirm: 本当によろしいですか？ + confirm: 本当によろしいですか? edit: 編集 - heading: "%{block_on} %{block_by} によってブロックされました" + heading: "%{block_on} %{block_by} がブロックしました" needs_view: ブロックを解除する前に、ログインし直す必要があります。 reason: "ブロックの理由:" - revoke: 取消し + revoke: 取り消す! revoker: "取消:" show: 表示 - status: ステータス - time_future: "%{time} に満了" - time_past: "%{time} 前に終了しました" - title: "%{block_on} %{block_by} によってブロックされました" + status: 状態 + time_future: "%{time} に終了" + time_past: "%{time}前に終了しました" + title: "%{block_on} %{block_by} がブロックしました" update: only_creator_can_edit: このブロックを編集するにはモデレータ権限が必要です。 success: ブロックを更新しました。 user_role: + filter: + already_has_role: ユーザーはすでに %{role} 権限を付与されています。 + doesnt_have_role: ユーザーに %{role} 権限が付与されていません。 + not_a_role: 文字列「%{role}」は、有効な権限ではありません。 + not_an_administrator: ユーザー権限の管理を行えるのは管理者だけですが、あなたは管理者ではありません。 grant: + are_you_sure: あなたはユーザー「%{name}」に「%{role}」権限を与えようとしています。よろしいですか？ confirm: 確認 + fail: ユーザー「%{name}」に「%{role}」権限を付与できませんでした。ユーザーおよび権限が両方とも正しいか確認してください。 + heading: 権限付与を確定 + title: 権限付与を確定 revoke: + are_you_sure: あなたはユーザー「%{name}の「%{role}」権限を取り消そうとしています。よろしいですか？ confirm: 確認 + fail: ユーザー「%{name}」の「%{role}」権限を取り消せませんでした。ユーザーおよび権限が両方とも正しいか確認してください。 + heading: 権限取り消しを確定 + title: 権限取り消しを確定 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 50b809803..90ddd07a5 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -51,7 +51,10 @@ ka: old_node: ძველი კვანძი old_way: ძველი გზა old_way_node: ძველი გზის კვანძი + relation: ურთიერთობა session: სესია + trace: ბილიკი + tracepoint: ბილიკის წერტილი user: მომხმარებელი user_preference: მომხმარებლის კონფიგურაცია way: გზა @@ -60,7 +63,6 @@ ka: changeset: changeset: "ცვლილებების პაკეტი: %{id}" changesetxml: ცვლილებების პაკეტის XML - download: გადმოწერა %{changeset_xml_link}, ან %{osmchange_xml_link} feed: title: ცვლილებების პაკეტი %{id} title_comment: ცვლილებების პაკეტი %{id} - %{comment} @@ -71,6 +73,12 @@ ka: box: საზღვარი closed_at: "დაკეტილია:" created_at: "შექმნილია:" + has_nodes: + one: "შეიცავს %{count} წერტილს:" + other: "შეიცავს %{count} წერტილს:" + has_ways: + one: "შეიცავს %{count} ხაზს:" + other: "შეიცავს %{count} ხაზს:" show_area_box: მონიშნული რეგიონის ჩვენება common_details: changeset_comment: "კომენტარი:" @@ -86,6 +94,8 @@ ka: deleted: წაშლილია edit: area: ტერიტორიის რედაქტირება + node: წერტილის რედაქტირება + relation: ურთიერთობის რედაქტირება way: გზის რედაქტირება larger: area: რეგიონის ნახვა დიდი ზომის რუკაზე @@ -108,7 +118,6 @@ ka: next_changeset_tooltip: შემდეგი შესწორება %{user} prev_changeset_tooltip: წინა შესწორება %{user} node: - download: "%{download_xml_link}, %{view_history_link} ან %{edit_link}" download_xml: გადმოწერა XML edit: რედაქტირება node: კვანძი @@ -117,7 +126,6 @@ ka: node_details: coordinates: "კოორდინატები:" node_history: - download: "%{download_xml_link} ან %{view_details_link}" download_xml: გადმოწერა XML node_history: კვანძის ისტორია node_history_title: "კვანძის ისტორია: %{node_name}" @@ -132,14 +140,17 @@ ka: paging_nav: of: დან showing_page: გვერდის ჩვენება + redacted: + type: + way: გზა relation: download_xml: გადმოწერა XML relation: ურთიერთობა + relation_title: "ურთიერთობა: %{relation_name}" view_history: ისტორიის ნახვა relation_details: members: "წევრები:" relation_history: - download: "%{download_xml_link} ან %{view_details_link}" download_xml: გადმოწერა XML relation_history: ურთიერთობის ისტორია relation_history_title: "ურთიერთობის ისტორია: %{relation_name}" @@ -150,9 +161,11 @@ ka: node: კვანძი relation: ურთიერთობა way: გზა + start: + manually_select: სხვა ტერიტორიის გამოყოფა ხელით start_rjs: data_frame_title: მონაცემები - data_layer_name: მონაცემები + data_layer_name: რუკის მონაცემების ნახვა details: დეტალები drag_a_box: რეგიონის ასარჩევად რუკაზე გაწელეთ ჩარჩო edited_by_user_at_timestamp: შეცვალა [[user]] [[timestamp]]-ში @@ -191,7 +204,6 @@ ka: relation: ურთიერთობა way: გზა way: - download: "%{download_xml_link}, %{view_history_link} ან %{edit_link}" download_xml: გადმოწერა XML edit: რედაქტირება view_history: ისტორიის ნახვა @@ -203,7 +215,6 @@ ka: other: აგრეთვე გზების ნაწილი %{related_ways} nodes: "კვანძები:" way_history: - download: "%{download_xml_link} ან %{view_details_link}" download_xml: გადმოწერა XML view_details: ვრცლად way_history: გზის ისტორია @@ -223,19 +234,33 @@ ka: area: ტერიტორია comment: კომენტარი id: ID + saved_at: შენახულია როგორც user: მომხმარებელი list: description: ბოლო ცვლილებები + description_user: მომხმარებელ %{user} ცვლილებათა პაკეტები heading: ცვლილებების პაკეტი heading_bbox: ცვლილებების პაკეტი + heading_friend: ცვლილებების პაკეტები + heading_nearby: ცვლილებების პაკეტები heading_user: ცვლილებების პაკეტი heading_user_bbox: ცვლილებების პაკეტი title: ცვლილებების პაკეტი diary_entry: + comments: + ago: "%{ago} წინ" + comment: კომენტარი + newer_comments: ახალი კომენტარები + older_comments: ძველი კომენტარები + post: პოსტი + when: როდის diary_comment: confirm: დადასტურება hide_link: ამ კომენტარის დამალვა diary_entry: + comment_count: + one: 1 კომენტარი + other: "%{count} კომენტარი" comment_link: კომენტარი confirm: დადასტურება edit_link: ჩანაწერის რედაქტირება @@ -257,6 +282,8 @@ ka: no_entries: დღიურში არ არის ჩანაწერები older_entries: ძველი ჩანაწერები title: მომხმარებლების დღიურები + title_friends: მეგობრების დღიურები + title_nearby: მეზობელი მომხმარებლების დღიურები user_title: "%{user}-ის დღიური" location: edit: რედაქტირება @@ -267,9 +294,6 @@ ka: no_such_entry: heading: "id: %{id}-დან ჩანაწერი არ არის" title: დღიურში ასეთი ჩანაწერი არ არის - no_such_user: - heading: მომხმარებელი %{user} არ არსებობს - title: ასეთი მომხმარებელი არ არსებობს view: leave_a_comment: დატოვეთ კომენტარი login: შესვლა @@ -279,6 +303,12 @@ ka: user_title: "%{user}-ის დღიური" editor: default: უპირობოდ (ამჟამად %{name}) + potlatch: + description: Potlatch 1 (ბრაუზერის რედაქტორი) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (ბრაუზერის რედაქტორი) + name: Potlatch 2 remote: description: დისტანციური მათვა (JOSM, ან Merkaartor) name: დისტანციური მართვა @@ -294,6 +324,7 @@ ka: licence: ლიცენზია longitude: "გრძედი:" manually_select: სხვა რეგიონის გამოყოფა ხელით + map_image: რუკის სურათი (სტანდარტული ფენის ჩვენება) max: მაქს. options: პარამეტრები osm_xml_data: OpenStreetMap XML–ის მონაცემები @@ -311,10 +342,15 @@ ka: view_larger_map: გადიდებული რუკის ხილვა geocoder: description: + title: + geonames: მდებარეობა <a href="http://www.geonames.org/">GeoNames</a>-დან + osm_nominatim: მდებარეობა <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>-დან types: cities: ქალაქები places: ადგილები towns: დაბები + description_osm_namefinder: + prefix: "%{distance} %{direction} %{type}" direction: east: აღმოსავლეთი north: ჩრდილოეთი @@ -324,6 +360,10 @@ ka: south_east: სამხრეთ-აღმოსავლეთი south_west: სამხრეთ-დასავლეთი west: დასავლეთი + distance: + one: დაახლოებით 1 კმ + other: დაახლოებით %{count} კმ + zero: 1 კმ-ზე ნაკლები results: more_results: მეტი შედეგი no_results: შედეგი ვერ მოიძებნა @@ -340,16 +380,24 @@ ka: suffix_place: ", %{distance} %{direction} %{placename}–დან" search_osm_nominatim: prefix: + aeroway: + aerodrome: აეროდრომი + gate: გასასვლელი + runway: ასაფრენ-დასაფრენი ბილიკი + terminal: ტერმინალი amenity: + WLAN: WiFi წერტილი airport: აეროპორტი arts_centre: ხელოვნების ცენტრი atm: ბანკომატი auditorium: აუდიტორია bank: ბანკი bar: ბარი + bbq: ბარბექიუ bench: დასაჯდომი bicycle_parking: ველოსიპედების სადგომი bicycle_rental: ველოსიპედების გაქირავება + biergarten: ლუდის ბაღი brothel: საროსკიპო bureau_de_change: ვალუტის გადაცვლა bus_station: ავტობუსის გაჩერება @@ -415,9 +463,11 @@ ka: shelter: თავშესაფარი shop: მაღაზია shopping: სავაჭრო ცენტრი + shower: შხაპი social_club: საზოგადოებრივი თავშეყრის ადგილი studio: სტუდია supermarket: სუპერმარკეტი + swimming_pool: საცურაო აუზი taxi: ტაქსი telephone: საზოგადოებრივი ტელეფონი theatre: თეატრი @@ -431,35 +481,15 @@ ka: youth_centre: ახალგაზრდული ცენტრი boundary: administrative: ადმინისტრაციული საზღვარი + national_park: ეროვნული პარკი + protected_area: დაცული ტერიტორია + bridge: + aqueduct: აკვედუკი + suspension: დაკიდებული ხიდი + swing: რეგულირებადი ხიდი + "yes": ხიდი building: - apartments: მრავალბინიანი კორპუსი - bunker: ბუნკერი - chapel: სამლოცველო - church: ეკლესია - city_hall: ქალაქის მერია - commercial: კომერციული შენობა - dormitory: საერთო საცხოვრებელი - entrance: შენობის შესასვლელი - farm: ფერმა - flats: ბინები - garage: ავტოფარეხი - hall: დარბაზი - hospital: საავადმყოფოს შენობა - hotel: სასტუმრო - house: სახლი - industrial: სამრეწველო ნაგებობა - office: საოფისე ნაგებობა - public: საზოგადოებრივი შენობა - residential: საცხოვრებელი სახლი - retail: გასაყიდი ნაგებობა - school: სკოლა - shop: მაღაზია - stadium: სტადიონი - store: მაღაზია - terrace: ტერასა - tower: კოშკი - train_station: რკინიგზის სადგური - university: უნივერსიტეტი + "yes": შენობა highway: bridleway: საცხენოსნო გზა bus_stop: ავტობუსის გაჩერება @@ -467,7 +497,6 @@ ka: cycleway: ველოსიპედის გზა emergency_access_point: სასწრაფო დახმარების პუნქტი footway: ტროტუარი - gate: გასასვლელი living_street: საცხოვრებელი ქუჩა minor: მეორადი გზა motorway: ავტომაგისტრალი @@ -477,9 +506,12 @@ ka: platform: ბაქანი primary: მთავარი გზა primary_link: მთავარი გზა + residential: საცხოვრებელი + rest_area: მოსასვენებელი ტერიტორია road: გზა secondary: მეორადი გზა secondary_link: მეორადი გზა + speed_camera: სიჩქარის მაკონტროლებელი კამერა steps: საფეხურები tertiary: მესამე კლასის გზა track: ბილიკი @@ -493,6 +525,7 @@ ka: building: შენობა castle: ციხე-სიმაგრე church: ეკლესია + fort: ფორტი house: სახლი icon: ხატულა manor: მამული @@ -511,6 +544,7 @@ ka: farm: ფერმა farmland: სავარგული forest: ტყე + garages: ავტოფარეხები grass: ბალახი greenfield: ახლადათვისებული ადგილი industrial: სამრეწველო ზონა @@ -518,8 +552,8 @@ ka: meadow: მინდორი military: სამხედრო ტერიტორია mine: მაღარო - mountain: მთა nature_reserve: ნაკრძალი + orchard: ხილის ბაღი park: პარკი quarry: კარიერი railway: რკინიგზა @@ -542,11 +576,16 @@ ka: pitch: სპორტული გაზონი playground: სათამაშო მოედანი recreation_ground: რეკრეაციული ზონა + sauna: საუნა sports_centre: სპორტული ცენტრი stadium: სტადიონი swimming_pool: საცურაო აუზი track: სარბენი ბილიკი water_park: აკვაპარკი + military: + airfield: სამხედრო აეროდრომი + barracks: ყაზარმები + bunker: ბუნკერი natural: bay: ყურე beach: პლაჟი @@ -554,10 +593,11 @@ ka: cave_entrance: გამოქვაბულში შესასვლელი channel: არხი cliff: ხრამი - coastline: სანაპირო ზოლი crater: კრატერი + dune: დიუნა fell: ბორცვი fjord: ფიორდი + forest: ტყე geyser: გეიზერი glacier: მყინვარი hill: ბორცვი @@ -576,6 +616,7 @@ ka: scrub: ბუჩქნარი shoal: თავთხელი spring: წყარო + stone: ქვა strait: სრუტე tree: ხე valley: ველი @@ -584,10 +625,20 @@ ka: wetland: ჭარბტენიანი ტერიტორია wetlands: ჭარბტენიანი ტერიტორიები wood: ტყე + office: + architect: არქიტექტორი + company: კომპანია + estate_agent: უძრავი ქონების აგენტი + government: სამთავრობო ოფისი + ngo: არასამთავრობო ორგანიზაციის ოფისი + telecommunication: სატელეკომუნიკაციო ოფისი + travel_agent: ტურისტული სააგენტო + "yes": ოფისი place: airport: აეროპორტი city: ქალაქი country: ქვეყანა + county: ოლქი farm: ფერმა hamlet: დასახლება house: სახლი @@ -623,6 +674,8 @@ ka: tram_stop: ტრამვაის გაჩერება yard: რკინიგზის დეპო shop: + antiques: ანტიკვარიატი + art: სამხატვრო სალონი bakery: საცხობი beauty: სილამაზის სალონი beverages: სასმელების მაღაზია @@ -630,7 +683,6 @@ ka: books: წიგნის მაღაზია butcher: საყასბო car: ავტოსალონი - car_dealer: ავტომაღაზია car_parts: ავტონაწილები car_repair: ავტოსახელოსნო carpet: ხალიჩების მაღაზია @@ -640,6 +692,9 @@ ka: confectionery: საკონდიტრო cosmetics: კოსმეტიკის მაღაზია electronics: ელექტროტექნიკის მაღაზია + estate_agent: უძრავი ქონების აგენტი + fish: თევზების მაღაზია + florist: ყვავილების მაღაზია furniture: ავეჯი gallery: გალერეა gift: საჩუქრების მაღაზია @@ -652,6 +707,11 @@ ka: optician: ოპტიკა pet: ზოომაღაზია photo: ფოტომაღაზია + salon: სალონი + shoes: ფეხსაცმლის მაღაზია + shopping_centre: სავაჭრო ცენტრი + sports: სპორტული მაღაზია + stationery: საკანცელარიო მაღაზია supermarket: სუპერმარკეტი toys: სათამაშოების მაღაზია travel_agency: ტურისტული სააგენტო @@ -669,16 +729,23 @@ ka: theme_park: თემატური პარკი valley: ველი zoo: ზოოპარკი + tunnel: + "yes": გვირაბი waterway: canal: არხი dam: კაშხალი + dock: ნავსადგური + mineral_spring: მინერალური წყარო river: მდინარე + riverbank: მდინარის ნაპირი stream: ნაკადული waterfall: ჩანჩქერი javascripts: map: base: cycle_map: ველოსიპედისტების რუკა + standard: სტანდარტული + transport_map: ტრანსპორტის რუკა site: edit_disabled_tooltip: რედაქტირებისათვის გაზარდეთ რუკის მასშტაბი edit_tooltip: რუკის რედაქტირება @@ -687,18 +754,28 @@ ka: history_tooltip: ამ ტერიტორიის რედაქტირებების ხილვა history_zoom_alert: რედაქტირებების ისტორიის სანახავად საჭიროა რუკის მასშტაბის გაზრდა layouts: + community: თანასაზოგადოება + community_blogs: თანასაზოგადოების ბლოგები + copyright: საავტორო უფლები და ლიცენზია documentation: დოკუმენტაცია edit: რედაქტირება + edit_with: რედაქტირება %{editor} export: ექსპორტი export_tooltip: რუკის მონაცემების ექსპორტირება foundation: ფონდი + foundation_title: ფონდი OpenStreetMap + gps_traces: GPS გზები help: დახმარება help_centre: დახმარების ცენტრი history: ისტორია home: სახლი home_tooltip: საწყის მდებარეობაზე დაბრუნება - inbox: შემომავალი (%{count}) - intro_3_partners: ვიკი + intro_1: OpenStreetMap არის მსოფლიოს თავისუფალი რუკა, შექმნილი თქვენნაირი ადამიანების მიერ. + intro_2_create_account: მომხმარებლის ანგარიშის შექმნა + intro_2_download: გადმოწერა + intro_2_license: თავისუფალი ლიცენზია + intro_2_use: გამოყენება + intro_2_use_url: http://wiki.openstreetmap.org/wiki/KA:Using_OpenStreetMap log_in: შესვლა logo: alt_text: OpenStreetMap-ის ლოგო @@ -706,7 +783,12 @@ ka: logout_tooltip: გასვლა make_a_donation: text: პროექტის დახმარება + partners_partners: პარტნიორები + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: რეგისტრაცია + tag_line: თავისუფალი ვიკი-რუკა + user_diaries: მომხმარებლების დღიურები + user_diaries_tooltip: მომხმარებლების დღიურების ნახვა view: იხილეთ view_tooltip: რუკის ხილვა welcome_user: კეთილი იყოს თქვენი მობრძანება, %{user_link} @@ -717,44 +799,90 @@ ka: english_link: ინგლისური ორიგინალი native: mapping_link: კარტოგრაფირების დაწყება + native_link: ქართული ვერსია title: ამ გვერდის შესახებ message: + delete: + deleted: შეტყობინება წაშლილია inbox: date: თარიღი + from: გამომგზავნი + messages: თქვენ გაქვთ %{new_messages} და %{old_messages} my_inbox: ჩემი მიღებული + new_messages: + one: "%{count} ახალი შეტყობინება" + other: "%{count} ახალი შეტყობინება" + no_messages_yet: თქვენ ჯერ არ გაქვთ შეტყობინებები. რატომ არ უნდა გავესაუბრო ვინმეს %{people_mapping_nearby_link}? + old_messages: + one: "%{count} ძველი შეტყობინება" + other: "%{count} ძველი შეტყობინება" outbox: გაგზავნილი + people_mapping_nearby: ახლოს მყოფი ხალხი subject: თემა title: მიღებული + mark: + as_read: შეტყობინება მონიშნულია როგორც წაკითხული + as_unread: შეტყობინება მონიშნულია როგორც წაუკითხავი message_summary: delete_button: წაშლა + read_button: მონიშნეთ როგორც წაკითხული reply_button: პასუხი + unread_button: მონიშნეთ როგორც წაუკითხავი new: back_to_inbox: მიღებულებში დაბრუნება body: ტექსტი + limit_exceeded: თქვენ ცოტა ხნის წინ გაგზავნეთ ბევრი შეტყობინება. სანამ კიდევ გაგზავნიდეთ, მოიცადეთ ცოტა ხანი. message_sent: შეტყობინება გაიგზავნა send_button: გაგზავნა + send_message_to: გაუგზავნეთ ახალი შეტყობინება %{name} subject: თემა title: შეტყობინების გაგზავნა + no_such_message: + body: ბოდიშით, მაგრამ შეტყობინება ამ ID-ით არ არსებობს. + heading: ასეთი შეტყობინება არ არსებობს + title: ასეთი შეტყობინება არ არსებობს outbox: date: თარიღი inbox: მიღებული + messages: + one: თქვენ გაქვთ %{count} გაგზავნილი შეტყობინება + other: თქვენ გაქვთ %{count} გაგზავნილი შეტყობინება + my_inbox: ჩემი %{inbox_link} + no_sent_messages: თქვენ ჯერ არ გაქვთ გაგზავნილი შეტყობინებები. რატომ არ უნდა გავესაუბრო ვინმეს %{people_mapping_nearby_link}? outbox: გაგზავნილი + people_mapping_nearby: ახლოს მყოფი ხალხი subject: თემა title: გაგზავნილი + to: ვის read: + back_to_inbox: მიღებულებში დაბრუნება + back_to_outbox: გაგზავნილებში დაბრუნება date: თარიღი + from: გამომგზავნი + reading_your_messages: შეტყობინებების წაკითხვა + reading_your_sent_messages: გაგზავნილი შეტყობინებების წაკითხვა reply_button: პასუხი subject: თემა title: შეტყობინების წაკითხვა + to: ვის + unread_button: მონიშნეთ როგორც წაუკითხავი + wrong_user: თქვენ შეხვედით როგორც `%{user}' მაგრამ შეტყობინება რომლის წაკითხვაც გსურთ, არ არის გაგზავნილი ამ მომხმარებელთან, ან მის მიერ. გთხოვთ, შეხვიდეთ, როგორც შესაბამისი მომხმარებელი, რათა წაიკითხოთ ის. + reply: + wrong_user: თქვენ შეხვედით როგორც `%{user}' მაგრამ პასუხი თქვენ კითხვაზე არ გაიგზავნა ამ მომხმარებელთან. გთხოვთ, შეხვიდეთ, როგორც შესაბამისი მოთხოვნის გამკეთებელი მომხმარებელი, რათა იხილოთ პასუხი. sent_message_summary: delete_button: წაშლა notifier: diary_comment_notification: hi: გამარჯობა %{to_user}, + subject: "[OpenStreetMap]-ის მომხმარებელმა %{user} თქვენს დღიურში დატოვა კომენტარი" + email_confirm: + subject: "[OpenStreetMap] დაადასტურეთ თქვენი ელ.ფოსტის მისამართი" email_confirm_html: greeting: გამარჯობა, email_confirm_plain: greeting: გამარჯობა, + friend_notification: + subject: "[OpenStreetMap]-ის მომხმარებელმა %{user} დაგამატათ მეგობრებში" gpx_notification: greeting: გამარჯობა, lost_password_html: @@ -767,19 +895,46 @@ ka: subject: "[OpenStreetMap] დაადასტურეთ ელ.ფოსტის მისამართი" signup_confirm_html: greeting: გამარჯობა! + more_videos: აქ არის %{more_videos_link}. + more_videos_here: მეტი ვიდეო აქ signup_confirm_plain: greeting: გამარჯობა! + oauth: + oauthorize: + allow_write_api: რუკის შეცვლა. oauth_clients: edit: submit: რედაქტირება form: + allow_write_api: რუკის რედაქტირება. name: სახელი + required: სავალდებულოა + index: + revoke: განბლოკვა! new: submit: რეგისტრაცია + show: + allow_write_api: რუკის შეცვლა. + confirm: დარწმუნებული ხართ? + edit: დეტალების რედაქტირება + redaction: + edit: + description: აღწერა + show: + description: "აღწერა:" + user: "შემქმნელი:" site: edit: user_page_link: მომხმარებლის გვერდი + index: + license: + license_name: Creative Commons Attribution-Share Alike 2.0 + project_name: პროექტი OpenStreetMap + permalink: მუდმივი ბმული + shortlink: მოკლე ბმული key: + map_key: პირობითი აღნიშვნები + map_key_tooltip: რუკის ლეგენდა table: entry: admin: ადმინისტრაციული საზღვარი @@ -787,6 +942,8 @@ ka: 1: ტერმინალი bridleway: საცხენოსნო გზა byway: ბილიკი + cable: + - საბაგირო გზა cemetery: სასაფლაო centre: სპორტული ცენტრი commercial: კომერციული ტერიტორია @@ -794,31 +951,52 @@ ka: farm: ფერმა footway: საფეხმავლო გზა forest: ტყე + golf: გოლფის მოედანი lake: - ტბა - წყალსაცავი military: სამხედრო ტერიტორია + motorway: ავტომაგისტრალი park: პარკი pitch: სპორტული მოედანი + primary: მაგისტრალური საერთაშორისო მნიშვნელობის გზა + rail: რკინიგზა reserve: ნაკრძალი resident: საცხოვრებელი ტერიტორია + runway: + - აეროპორტის ასაფრენ-დასაფრენი ბილიკი school: - სკოლა - უნივერსიტეტი + secondary: სახელმწიფო მნიშვნელობის გზა station: რკინიგზის სადგური subway: მეტრო summit: - მწვერვალი - პიკი + tourist: ღირსშესანიშნაობა + track: სოფლის გზა tram: 1: ტრამვაი + unclassified: ადგილობრივი მნიშვნელობის გზა + unsurfaced: ყამირი გზა wood: ტყე + markdown_help: + alt: ალტერნატიული ტექსტი + first: პირველი ელემენტი + image: სურათი + link: ბმული + second: მეორე ელემენტი + text: ტექსტი + url: URL search: search: ძიება - submit_text: მიდი + search_help: "მაგალითები: 'ახმეტა', 'რუსთაველის გამზირი, თბილისი', 'გორის ჰოსპიტალი', ან 'მანავის ციხე' <a href='http://wiki.openstreetmap.org/wiki/Search'>მეტი მაგალითი...</a>" + submit_text: Ok where_am_i: სად ვარ მე? sidebar: close: დახურვა + search_results: ძიების შედეგები time: formats: friendly: "%დ %თ %წ at %ს:%წ" @@ -830,9 +1008,13 @@ ka: filename: "ფაილის სახელი:" map: რუკა owner: "მფლობელი:" + points: "წერტილი:" save_button: ცვლილებების შენახვა start_coord: "საწყისი კოორდინატი:" tags_help: მძიმის შემდეგ + uploaded_at: "ატვირთულია:" + visibility: "ხილვადობა:" + visibility_help: ეს რას ნიშნავს? trace: ago: "%{time_in_words_ago} წინ" by: "ავტორი:" @@ -848,45 +1030,89 @@ ka: trackable: კონტროლირებადი view_map: რუკის ნახვა trace_form: - description: აღწერილობა + description: "აღწერა:" help: დახმარება + tags_help: მძიმის შემდეგ upload_button: ატვირთვა + visibility: "ხილვადობა:" + visibility_help: ეს რას ნიშნავს? + trace_paging_nav: + showing_page: ნაჩვენებია გვერდი %{page} view: + description: "აღწერა:" download: გადმოწერა edit: რედაქტირება filename: "ფაილის სახელი:" map: რუკა none: არა owner: "მფლობელი:" + pending: დამუშავება + points: "წერტილი:" start_coordinates: "საწყისი კოორდინატი:" + uploaded: "ატვირთულია:" + visibility: "ხილვადობა:" user: account: contributor terms: link text: რა არის ეს? + current email address: "ელ-ფოსტის ამჟამინდელი მისამართი:" + home location: "ჩემი ადგილსამყოფელი:" image: "სურათი:" latitude: "განედი:" longitude: "გრძედი:" + my settings: ჩემი პარამეტრები new email address: "ახალი ელ. ფოსტის მისამართი:" new image: სურათის დამატება openid: + link: http://wiki.openstreetmap.org/wiki/KA:OpenID link text: რა არის ეს? + openid: "OpenID:" public editing: disabled link text: რატომ არ შემიძლია რედაქტირება? enabled link text: რა არის ეს? + return to profile: პროფილში დაბრუნება save changes button: ცვლილებების შენახვა + title: ანგარიშის რედაქტირება confirm: button: დადასტურება + heading: მომხმარებლის ანგარიშის დადასტურება confirm_email: button: დადასტურება heading: ელ. ფოსტის მისამართის ცვლილების დადასტურება + confirm_resend: + failure: მომხმარებელი %{name} ვერ მოიძებნა. list: heading: მომხმარებლები title: მომხმარებლები login: + create account minute: შექმნეით ანგარიში. ამისათვის მხოლოდ ერთი წუთია საჭირო. email or username: "ელ. ფოსტის მისამართი, ან მომხმარებლის სახელი:" heading: შესვლა login_button: შესვლა lost password link: დაგავიწყდათ პაროლი? + new to osm: ახალი ხართ OpenStreetMap-ზე? + no account: არ გაქვთ ანგარიში? + openid: "%{logo} OpenID:" + openid_logo_alt: შესვლა OpenID-ის საშუალებით + openid_providers: + aol: + alt: შესვლა AOL OpenID-ის საშუალებით + title: შესვლა AOL-ის საშუალებით + google: + alt: შესვლა Google OpenID-ის საშუალებით + title: შესვლა Google-ის საშუალებით + myopenid: + alt: შესვლა myOpenID OpenID-ის საშუალებით + title: შესვლა myOpenID-ის საშუალებით + openid: + alt: შესვლა OpenID URL-ის საშუალებით + title: შესვლა OpenID-ის საშუალებით + wordpress: + alt: შესვლა Wordpress OpenID-ის საშუალებით + title: შესვლა Wordpress-ის საშუალებით + yahoo: + alt: შესვლა Yahoo OpenID-ის საშუალებით + title: შესვლა Yahoo-ს საშუალებით password: "პაროლი:" register now: დარეგისტრირდით ახლავე remember: "დამიმახსოვრე:" @@ -896,26 +1122,33 @@ ka: logout_button: გასვლა title: გასვლა lost_password: + email address: "ელ. ფოსტის მისამართი:" heading: დაგავიწყდათ პაროლი? title: პაროლის აღდგენა new: confirm email address: "ელ. ფოსტის მისამართის დადასტურება:" + confirm password: "პაროლის დადასტურება:" continue: გაგრძელება display name: "სახელი ეკრანზე:" email address: "ელ. ფოსტის მისამართი:" heading: მომხმარებლის ანგარიშის შექმნა + openid: "%{logo} OpenID:" password: "პაროლი:" title: ანგარიშის შექმნა + no_such_user: + heading: მომხმარებელი %{user} არ არსებობს popup: friend: მეგობარი your location: თქვენი ადგილმდებარეობა reset_password: confirm password: "პაროლის დადასტურება:" + flash changed: თქვენი პაროლი შეიცვალა. password: "პაროლი:" suspended: webmaster: ვებ-მასტერი terms: agree: მიღება + consider_pd_why: რა არის ეს? decline: უარყოფა legale_names: france: საფრანგეთი @@ -923,49 +1156,100 @@ ka: rest_of_world: დანარჩენი მსოფლიო legale_select: "გთხოვთ, აირჩიეთ თქვენი ქვეყანა:" view: + activate_user: ამ მომხმარებლის აქტივაცია + add as friend: დაამატე მეგობარი + comments: კომენტარები confirm: დადასტურება + confirm_user: ამ მომხმარებლის დადასტურება + create_block: ამ მომხმარებლის დაბლოკვა + created from: "შექმნილია:" + ct accepted: მიღებულია %{ago} წინ + deactivate_user: ამ მომხმარებლის დეაქტივაცია + delete_user: ამ მომხმარებლის წაშლა + description: აღწერა + diary: დღიური edits: რედაქტირებები + email address: "ელ. ფოსტის მისამართი:" + hide_user: ამ მომხმარებლის დამალვა km away: "%{count}კმ თქვენგან" + latest edit: "ბოლო რედაქტირება %{ago}:" m away: "%{count}მ თქვენგან" + my comments: ჩემი კომენტარები + my diary: ჩემი დღიური my edits: ჩემი რედაქტირებები my settings: ჩემი პარამეტრები + new diary entry: დღიურში ახალი ჩანაწერის გაკეთება + remove as friend: მეგობრებიდან წაშლა + role: + administrator: ეს მომხმარებელი ადმინისტრატორია + send message: შეტყობინების გაგზავნა settings_link_text: პარამეტრები + spam score: "სპამის შეფასება:" status: "სტატუსი:" + unhide_user: ამ მომხმარებლის გამოჩენა user location: მომხმარებლის ადგილმდებარეობა your friends: თქვენი მეგობრები user_block: + blocks_by: + empty: "%{name} ჯერ არანაირი ბლოკირება არ გაუკეთებია." + heading: "%{name}-ის მიერ გაკეთებული ბლოკირებების სია" + title: "%{name}-ის მიერ გაკეთებული ბლოკირებები" + blocks_on: + empty: "%{name} ჯერ არასდროს არ ყოფილა დაბლოკილი." + heading: "%{name}-ის მიერ გაკეთებული ბლოკირებების სია" + title: "%{name}-ის მიერ გაკეთებული ბლოკირებები" edit: back: ყველა ბლოკირების ჩვენება + heading: მომხმარებელ %{name} ბლოკირების რედაქტირება show: ამ ბლოკირების ჩვენება submit: განაახლეთ ბლოკირება + title: მომხმარებელ %{name} ბლოკირების რედაქტირება helper: time_future: მთავრდება %{time}–ში. + time_past: დასრულდა %{time} წინ. + until_login: აქტიურია მანამდე, სანამ მომხმარებელი არ შევა სისტემაში. index: heading: მომხმარებლის ბლოკირებების სია title: მომხმარებლის ბლოკირებები new: back: ყველა ბლოკირების ჩვენება + heading: მომხმარებელ %{name} ბლოკირების შექმნა submit: ბლოკირების შექმნა + title: მომხმარებელ %{name} ბლოკირების შექმნა partial: confirm: დარწმუნებული ხართ? creator_name: შემქმნელი display_name: დაბლოკილი მომხმარებელი edit: რედაქტირება + not_revoked: (არ არის განბლოკილი) + reason: დაბლოკვის მიზეზი + revoke: განბლოკვა! + revoker_name: განბლოკილია show: ჩვენება status: სტატუსი + period: + one: 1 საათი + other: "%{count} საათი" revoke: confirm: დარწმუნებული ხართ, რომ ამ ბლოკირების მოხსნა გსურთ? + flash: ეს ბლოკირება მოიხსნა. + past: ეს ბლოკირება დასრულდა %{time} წინ და მისი გაუქმება უკვე შეუძლებელია. + revoke: განბლოკვა! + time_future: ეს ბლოკირება დასრულდა %{time}. show: back: ყველა ბლოკირების ჩვენება confirm: დარწმუნებული ხართ? edit: რედაქტირება + heading: "%{block_on}, დაადო ბლოკი: %{block_by}" needs_view: სანამ მოხდება ბლოკის მოხსნა, მანამდე საჭიროა მომხმარებლის დარეგისტრირება reason: "დაბლოკვის მიზეზი:" revoke: განბლოკვა! + revoker: "განმბლოკველი:" show: ჩვენება status: სტატუსი time_future: მთავრდება %{time}–ში time_past: დასრულდა %{time} წინ + title: "%{block_on}, დაადო ბლოკი: %{block_by}" update: success: ბლოკირების განახლება user_role: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 150439511..23fc58369 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1,8 +1,11 @@ # Messages for Korean (한국어) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: B891202 # Author: Freebiekr +# Author: Kwj2772 # Author: Wrightbus +# Author: 아라 ko: activerecord: attributes: @@ -37,13 +40,13 @@ ko: display_name: 표시 이름 email: 전자 우편 languages: 언어 - pass_crypt: 암호 + pass_crypt: 비밀번호 models: acl: 접근 조절 목록 - changeset: 변경세트 - changeset_tag: 변경세트 태그 + changeset: 바뀜집합 + changeset_tag: 바뀜집합 태그 country: 국가 - diary_comment: 일지 댓글 + diary_comment: 일지 덧글 diary_entry: 일지 항목 friend: 친구 language: 언어 @@ -51,11 +54,14 @@ ko: node: 노드 node_tag: 노드 태그 notifier: 알림자 - old_node: 옛 노드 - old_node_tag: 옛 노드 태그 - old_relation: 옛 관계 - old_relation_member: 옛 관계 멤버 - old_relation_tag: 옛 관계 태그 + old_node: 이전 노드 + old_node_tag: 이전 노드 태그 + old_relation: 이전 관계 + old_relation_member: 이전 관계 멤버 + old_relation_tag: 이전 관계 태그 + old_way: 이전 길 + old_way_node: 이전 길 노드 + old_way_tag: 이전 길 태그 relation: 관계 relation_member: 관계 멤버 relation_tag: 관계 태그 @@ -64,79 +70,137 @@ ko: tracepoint: 발자취 지점 tracetag: 발자취 태그 user: 사용자 - user_preference: 사용자 환경 + user_preference: 사용자 환경 설정 user_token: 사용자 토큰 way: 길 way_node: 길노드 way_tag: 길태그 browse: changeset: - changeset: "변경셋: %{id}" - changesetxml: 변경셋 XML - download: 내려받기 %{changeset_xml_link} 혹은 %{osmchange_xml_link} - title: 변경셋 + changeset: "바뀜집합: %{id}" + changesetxml: 바뀜집합 XML + feed: + title: 바뀜집합 %{id} + title_comment: 바뀜집합 %{id} - %{comment} + osmchangexml: osm바뀜 XML + title: 바뀜집합 changeset_details: - belongs_to: "소속:" - bounding_box: "경계:" - closed_at: "종료일:" - created_at: "생성일:" - has_nodes: "는(은) 다음 %{count} 개의 노드를 가지고 있습니다:" - has_relations: "는(은) 다음 %{count} 개의 관계를 가지고 있습니다:" - has_ways: "는(은) 다음 %{count} 개의 길을 가지고 있습니다:" - no_bounding_box: 이 변경셋을 위해 저장된 경계가 없습니다. - show_area_box: 영역 표시 + belongs_to: "소유자:" + bounding_box: "테두리 지정 사각형:" + box: 사각형 + closed_at: "종료된 때:" + created_at: "생성된 때:" + has_nodes: "는(은) 다음 노드 %{count}개를 가지고 있습니다:" + has_relations: "는(은) 다음 관계 %{count}개를 가지고 있습니다:" + has_ways: "는(은) 다음 길 %{count}개를 가지고 있습니다:" + no_bounding_box: 이 바뀜집합에서 어떤 테두리 지정 사각형도 저장되지 않았습니다. + show_area_box: 구역 사각형 표시 common_details: + changeset_comment: "덧글:" + deleted_at: "삭제된 때:" + deleted_by: "삭제한 사람:" edited_at: "편집일:" edited_by: "편집자:" - version: "버젼:" + in_changeset: "바뀜집합:" + version: "판:" containing_relation: entry: 관계 %{relation_name} - entry_role: 관계 %{relation_name} (as %{relation_role}) + entry_role: (%{relation_role}로서) 관계 %{relation_name} map: deleted: 삭제됨 + edit: + area: 지역 편집 + node: 노드 편집 + relation: 관계 편집 + way: 길 편집 + larger: + area: 큰 지도에서 지역 보기 + node: 큰 지도에서 노드 보기 + relation: 큰 지도에서 관계 보기 + way: 큰 지도에서 길 보기 loading: 불러 오는 중... + navigation: + all: + next_changeset_tooltip: 다음 바뀜집합 + next_node_tooltip: 다음 노드 + next_relation_tooltip: 다음 관계 + next_way_tooltip: 다음 길 + prev_changeset_tooltip: 이전 바뀜집합 + prev_node_tooltip: 이전 노드 + prev_relation_tooltip: 이전 관계 + prev_way_tooltip: 이전 길 + user: + name_changeset_tooltip: "%{user}의 편집 보기" + next_changeset_tooltip: "%{user}의 다음 편집" + prev_changeset_tooltip: "%{user}의 이전 편집" node: - download: "%{download_xml_link} or %{view_history_link}" - download_xml: XML 내려받기 + download_xml: XML 다운로드 + edit: 노드 편집 node: 노드 node_title: "노드: %{node_name}" - view_history: 이력 보기 + view_history: 역사 보기 node_details: coordinates: "좌표:" + part_of: "포함되는 노드:" node_history: - download_xml: XML 내려받기 - node_history: 노드 이력 - view_details: 세부 사항 표시 + download_xml: XML 다운로드 + node_history: 노드 역사 + node_history_title: "노드 역사: %{node_name}" + view_details: 자세한 내용 보기 not_found: - sorry: 죄송합니다. %{id}인 %{type}를 발견하지 못 했습니다. + sorry: 죄송합니다. %{id}인 %{type}를 발견하지 못했습니다. + type: + changeset: 바뀜집합 + node: 노드 + relation: 관계 + way: 길 + paging_nav: + of: 중 + showing_page: 페이지 보기 + redacted: + redaction: 개정 %{id} type: node: 노드 relation: 관계 way: 길 relation: - download_xml: XML 내려받기 + download_xml: XML 다운로드 relation: 관계 relation_title: "관계: %{relation_name}" - view_history: 이력 보기 + view_history: 역사 보기 + relation_details: + members: "멤버:" + part_of: "포함되는 관계:" relation_history: - relation_history: 관계 이력 - relation_history_title: "관계 이력: %{relation_name}" + download_xml: XML 다운로드 + relation_history: 관계 역사 + relation_history_title: "관계 역사: %{relation_name}" + view_details: 자세한 내용 보기 + relation_member: + entry_role: "%{type}에서 %{role}의 %{name}" + type: + node: 노드 + relation: 관계 + way: 길 start: manually_select: 다른 지역 수동 선택 view_data: 현재 지도 표기로 정보 보기 start_rjs: - details: 세부 사항 - drag_a_box: 지역을 보기 위해 지도로 끌어 놓으세요. + data_frame_title: 데이터 + data_layer_name: 지도 데이터 찾아보기 + details: 자세한 사항 + drag_a_box: 지역을 보기 위해 지도로 끌어 놓으세요 edited_by_user_at_timestamp: "[[timestamp]]에 [[user]]가 수정" - history_for_feature: "[[feature]]의 이력" - load_data: 정보 불러 오기 - loaded_an_area_with_num_features: 당신은 [[num_features]] 개의 특성을 가진 지역을 로드하였습니다. 경우에 따라, 어떤 브라우저에서는 이 데이터를 모두 처리하지 못 할 수도 있습니다. 일반적으로, 브라우저들은 대게 100개 이하의 특성을 처리하여 보여줄 수 있습니다. 그렇지 않은 경우, 브라우저의 속도가 저하되거나 브라우저의 반응이 느려질 수 있습니다. 여전히 이 데이터를 표시하려면, 아래의 버튼을 클릭하여 주십시오. - loading: 불러 오는 중... + hide_areas: 지역 숨기기 + history_for_feature: "[[feature]]의 역사" + load_data: 데이터 불러오기 + loaded_an_area_with_num_features: 당신은 특성을 가진 지역 [[num_features]]개를 불러왔습니다. 일반적으로, 일부 브라우저에서는 이 데이터 개수를 모두 처리하지 못할 수도 있습니다. 일반적으로, 브라우저들은 대개 특성 [[max_features]]개 이하를 처리하여 보여줄 수 있습니다. 그렇지 않은 경우, 브라우저의 속도가 저하되거나 브라우저의 반응이 느려질 수 있습니다. 여전히 이 데이터를 표시하려면, 아래의 버튼을 클릭하세요. + loading: 불러오는 중... manually_select: 다른 지역 선택 object_list: api: API로부터 이 지역 회수 back: 개체 목록 표시 - details: 세부 사항 + details: 자세한 사항 heading: 개체 목록 history: type: @@ -150,18 +214,30 @@ ko: node: 노드 way: 길 private_user: 개인 유저 - show_history: 이력 보기 - unable_to_load_size: "불러 오기 실패: 표시하려는 지역([[bbox_size]])의 설정 박스가 너무 큽니다. %{max_bbox_size}까지 표시할 수 있습니다." + show_areas: 지역 보이기 + show_history: 역사 보기 + unable_to_load_size: "불러오기 실패: 표시하려는 지역([[bbox_size]])의 설정 박스가 너무 큽니다. %{max_bbox_size}까지 표시할 수 있습니다." wait: 잠시만 기다려 주세요... zoom_or_select: 확대 또는 ë³´ê³  싶은 지도의 지역을 선택하세요 tag_details: - tags: "태그들:" + tags: "태그:" + wiki_link: + key: "%{key} 태그에 대한 위키 설명 문서" + tag: "%{key}=%{value} 태그에 대한 위키 설명 문서" + wikipedia_link: 위키백과에 %{page} 문서 있음 + timeout: + sorry: 죄송합니다, %{id} id와 %{type}에 대한 데이터는 너무 오래 검색하려 했습니다. + type: + changeset: 바뀜집합 + node: 노드 + relation: 관계 + way: 길 way: - download: "%{download_xml_link} or %{view_history_link}" - download_xml: XML 내려받기 - view_history: 이력 보기 + download_xml: XML 다운로드 + edit: 길 편집 + view_history: 역사 보기 way: 길 - way_title: "길이력: %{way_name}" + way_title: "길: %{way_name}" way_details: also_part_of: one: "%{related_ways}의 일부" @@ -169,10 +245,10 @@ ko: nodes: "노드:" part_of: "포함되는 길:" way_history: - download_xml: XML 내려받기 - view_details: 세부 사항 표시 - way_history: 길 이력 - way_history_title: "길 이력: %{way_name}" + download_xml: XML 다운로드 + view_details: 자세한 내용 보기 + way_history: 길 역사 + way_history_title: "길 역사: %{way_name}" changeset: changeset: anonymous: 익명 @@ -181,21 +257,60 @@ ko: no_edits: (수정 없음) show_area_box: 지역 박스 보기 still_editing: (현재 수정 중) - view_changeset_details: 변경셋 세부 사항 보기 + view_changeset_details: 바뀜집합 자세한 사항 보기 + changeset_paging_nav: + next: 다음 » + previous: « 이전 + showing_page: 페이지 %{page}개 보임 changesets: area: 지역 comment: 설명 + id: ID saved_at: 저장 시간 user: 사용자 + list: + description: 최근 바뀜 + description_bbox: "%{bbox} 안에서 바뀜집합" + description_friend: 내 친구의 바뀜집합 + description_nearby: 근처 사용자의 바뀜집합 + description_user: "%{user} 사용자의 바뀜집합" + description_user_bbox: "%{bbox} 안에서 %{user} 사용자의 바뀜집합" + empty_anon_html: 아직 수정한 사항이 없습니다 + heading: 바뀜집합 + heading_bbox: 바뀜집합 + heading_friend: 바뀜집합 + heading_nearby: 바뀜집합 + heading_user: 바뀜집합 + heading_user_bbox: 바뀜집합 + title: 바뀜집합 + title_bbox: "%{bbox} 안에서 바뀜집합" + title_friend: 내 친구의 바뀜집합 + title_nearby: 근처 사용자의 바뀜집합 + title_user: "%{user} 사용자의 바뀜집합" + title_user_bbox: "%{bbox} 안에서 %{user} 사용자의 바뀜집합" + timeout: + sorry: 죄송합니다, 요청하는 바뀜집합 목록을 찾는데 너무 오래 걸립니다. diary_entry: + comments: + ago: "%{ago} 전" + comment: 덧글 + has_commented_on: "%{display_name} 사용자가 다음 일지 항목에 덧글을 남겼습니다" + newer_comments: 새 덧글 + older_comments: 이전 덧글 + post: 게시물 + when: 날짜 diary_comment: - hide_link: 이 댓글 숨기기 + comment_from: "%{comment_created_at}에 %{link_user}에서 덧글" + confirm: 확인 + hide_link: 이 덧글 숨기기 diary_entry: comment_count: - one: 댓글 한 개 - other: 댓글 %{count} 개 - comment_link: 이 항목에 댓글 남기기 + one: 덧글 한 개 + other: 덧글 %{count}개 + comment_link: 이 항목에 덧글 남기기 + confirm: 확인 edit_link: 이 항목 수정 + hide_link: 이 항목 숨기기 reply_link: 이 항목에 답변하기 edit: body: "내용:" @@ -208,153 +323,880 @@ ko: subject: "제목:" title: 일지 항목 수정 use_map_link: 지도 사용 + feed: + all: + description: OpenStreetMap의 사용자에서 최근 일지 항목 + title: OpenStreetMap 일지 항목 + language: + description: "%{language_name}로 된 OpenStreetMap 최근 일지 항목" + title: "%{language_name}로 된 OpenStreetMap 일지 항목" + user: + description: "%{user} 사용자에서 최근 OpenStreetMap 일지 항목" + title: "%{user} 사용자에 대한 OpenStreetMap 일지 항목" list: in_language_title: "%{language} 일지 항목" new: 새 일지 항목 - newer_entries: 다음 항목들 - older_entries: 이전 항목들 + new_title: 사용자 일지에 새 항목 작성 + newer_entries: 다음 항목 + no_entries: 일지 항목이 없습니다 + older_entries: 이전 항목 + recent_entries: "최근 일지 항목:" title: 사용자 일지 + title_friends: 친구의 일지 + title_nearby: 근처 사용자의 일지 user_title: "%{user} 일지" + location: + edit: 편집 + location: "위치:" + view: 보기 new: title: 새 일지 항목 + no_such_entry: + heading: "id에 항목 없음: %{id}" + title: 일지 항목이 없음 view: - leave_a_comment: 댓들 남기기 + leave_a_comment: 덧글 남기기 login: 로그인 - login_to_leave_a_comment: 댓글을 남기려면 로그인해야 합니다. %{login_link} + login_to_leave_a_comment: 덧글을 남기려면 로그인해야 합니다. %{login_link} save_button: 저장 title: 사용자 일지 | %{user} user_title: "%{user} 일지" + editor: + default: 기본값(현재 %{name}) + potlatch: + description: Potlatch 1(브라우저 편집기) + name: Potlatch 1 + potlatch2: + description: Potlatch 2(브라우저 편집기) + name: Potlatch 2 + remote: + description: 원격 제어(JOSM 또는 Merkaartor) + name: 원격 제어 export: start: - area_to_export: 지역 추출 - export_button: 추출 - export_details: OpenStreetMap의 정보는 <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license 에 의거합니다.</a>. - format: 포맷 - format_to_export: 추출 포맷 + add_marker: 지도에 표시 추가 + area_to_export: 지역 내보내기 + embeddable_html: 내장된 HTML + export_button: 내보내기 + export_details: OpenStreetMap 데이터는 <a href="http://creativecommons.org/licenses/by-sa/2.0/">크리에이티브 커먼즈 저작자표시-동일조건변경허락 2.0 라이선스</a>에 따릅니다. + format: 형식 + format_to_export: 내보내기 형식 image_size: 이미지 크기 latitude: "위도:" - licence: 라이센스 + licence: 라이선스 longitude: "경도:" manually_select: 다른 지역 선택 + map_image: 지도 그림 (표준 레이어 보이기) max: 최대 options: 선택사항 + osm_xml_data: OpenStreetMap XML 데이터 output: 출력 + paste_html: HTML을 붙여 넣어 웹사이트에 포함시키기 scale: 축척 - zoom: 줌 + too_large: + body: 이 지역은 OpenStreetMap XML 데이터로 내보내는 데 너무 넓습니다. 확대하거나 작은 지역을 선택하세요. + heading: 너무 넓은 지역 + zoom: 확대 start_rjs: - export: 추출 + add_marker: 지도에 표시 추가 + change_marker: 표시 위치 바꾸기 + click_add_marker: 표시를 추가하려면 지도에 클릭하세요 + drag_a_box: 지역을 보기 위해 지도로 끌어 놓으세요 + export: 내보내기 manually_select: 다른 지역 선택 view_larger_map: 큰 지도 보기 geocoder: + description: + types: + cities: 도시 + places: 장소 + towns: 마을 + direction: + east: 동 + north: 북 + north_east: 북동 + north_west: 북서 + south: 남 + south_east: 남동 + south_west: 남서 + west: 서 + distance: + one: 다음 1km + other: 다음 %{count}km + zero: 1km보다 가까움 + results: + more_results: 더 많은 ê²°ê³¼ + no_results: 결과가 없습니다 + search: + title: + ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> ê²°ê³¼ + geonames: <a href="http://www.geonames.org/">GeoNames</a> ê²°ê³¼ + latlon: <a href="http://openstreetmap.org/">내부</a> ê²°ê³¼ + osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap 이름 찾기</a> ê²°ê³¼ + osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> ê²°ê³¼ + uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> ê²°ê³¼ + us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> ê²°ê³¼ + search_osm_namefinder: + suffix_parent: "%{suffix} (%{parentname}의 %{parentdirection}에 %{parentdistance})" + suffix_place: ", %{placename}의 %{direction}에 %{distance}" search_osm_nominatim: prefix: + aeroway: + terminal: 터미널 amenity: + WLAN: 와이파이 ì¡´ + airport: 공항 + arts_centre: 문예회관 + atm: ATM + bank: 은행 + bar: 주점 + bbq: BBQ + bench: 벤치 + bicycle_parking: 자전거 주차 + bicycle_rental: 자전거 대여 + bus_station: 버스 정류장 + cafe: 카페 + car_wash: 세차장 + casino: 카지노 + cinema: 영화관 + club: 클럽 + college: 대학 + courthouse: 법원 + crematorium: 화장장 + dentist: 치과 + doctors: 의원 + dormitory: 기숙사 + drinking_water: 식수대 + driving_school: 운전학원 + embassy: 대사관 + emergency_phone: 긴급전화 + fast_food: 패스트푸드점 + ferry_terminal: 부두 fire_hydrant: 소화전 + fire_station: 소방서 + food_court: 푸드 코트 + fountain: 분수대 + fuel: 주유소 + grave_yard: 묘지 + gym: 체육관 + hall: 홀 + health_centre: 보건소 + hospital: 병원 + hotel: 호텔 + ice_cream: 아이스크림 + kindergarten: 유치원 + library: 도서관 + market: 시장 + marketplace: 시장 + mountain_rescue: 산악구조대 + nightclub: 나이트클럽 + nursery: 보육원 + nursing_home: 복지관 + office: 사무실 + park: 공원 + parking: 주차장 + pharmacy: 약국 + place_of_worship: 예배당 + police: 경찰 + post_box: 우체통 + post_office: 우체국 + preschool: 유치원 + prison: 교도소 + pub: 술집 + public_building: 공공 건물 + public_market: 공동 시장 + recycling: 재활용 장소 + restaurant: 식당 + retirement_home: 노인정 + sauna: 사우나 + school: 학교 + shelter: 쉼터 + shop: 상점 + shower: 샤워 + social_club: 사교 클럽 + studio: 스튜디오 + supermarket: 슈퍼마켓 + swimming_pool: 수영장 + taxi: 택시 정류장 + telephone: 공중전화 + theatre: 극장 + toilets: 화장실 + townhall: 마을 회관 + university: 종합대학 + vending_machine: 자동판매기 + veterinary: 동물병원 + village_hall: 주민센터 + waste_basket: 쓰레기통 + wifi: 와이파이 ì¡´ + youth_centre: 청소년 센터 + boundary: + administrative: 행정 구역 경계 + national_park: 국립 공원 + protected_area: 보호 구역 + bridge: + "yes": 다리 + building: + "yes": 건물 + highway: + bus_stop: 버스 정류장 + historic: + building: 건물 + church: 교회 + memorial: 기념관 + monument: 기념물 + museum: 박물관 + tower: 타워 + landuse: + farm: 농장 + farmland: 농지 + farmyard: 농지 + forest: 숲 + railway: 철도 + wood: 산림 + leisure: + fishing: 낚시터 + garden: 정원 + golf_course: 골프 코스 + ice_rink: 아이스링크 + park: 공원 + playground: 운동장 + sauna: 사우나 + sports_centre: 스포츠 센터 + stadium: 경기장 + swimming_pool: 수영장 + water_park: 워터파크 + military: + airfield: 군용 비행장 + bunker: 벙커 + natural: + bay: 만 + beach: 해변 + cape: 곶 + cave_entrance: 동굴 입구 + channel: 수로 + cliff: 절벽 + crater: 크레이터 + dune: 모래 언덕 + fjord: 피요르드 + forest: 숲 + geyser: 건헐천 + glacier: 빙하 + hill: 언덕 + island: 섬 + river: 강 + spring: 온천 + strait: 해협 + tree: 나무 + volcano: 화산 + water: 물 + wetland: 습지 + wood: 산림 + office: + accountant: 회계사 사무실 + company: 회사 + insurance: 보험 사무실 + lawyer: 변호사 사무실 + ngo: NGO 사무실 + "yes": 사무실 place: airport: 공항 + city: 시 + country: 국가 + county: êµ° + farm: 농장 + house: 주택 + island: 섬 + postcode: 우편 번호 + sea: 바다 + state: 주 + suburb: 교외 + town: 탑 + village: 마을 + railway: + light_rail: 경전철 + monorail: 모노레일 + narrow_gauge: 협궤 철도 + station: 철도역 + subway: 지하철역 + subway_entrance: 지하철 입구 shop: + antiques: 골동품 상점 + bakery: 제과점 + bicycle: 자전거 상점 + books: 서점 + butcher: 정육점 + car_parts: 자동차 부품 상점 + car_repair: 자동차 정비소 + clothes: 의류 상점 + computer: 컴퓨터 가게 + convenience: 편의점 + copyshop: 복사점 + cosmetics: 화장품 상점 + department_store: 백화점 + dry_cleaning: 드라이 클리닝 + furniture: 가구 + gallery: 갤러리 + general: 일반 상점 + gift: 선물 상점 + grocery: 식료품 상점 insurance: 보험 + jewelry: 보석 가게 + laundry: 세탁소 + market: 시장 + mobile_phone: 휴대 전화 상점 + music: 음악 상점 + optician: 안경점 + organic: 유기농 식품 상점 + shoes: 신발 가게 + sports: 스포츠 상점 + supermarket: 수퍼마켓 + toys: 장난감 가게 + tourism: + guest_house: 게스트 하우스 + hostel: 호스텔 + hotel: 호텔 + information: 안내소 + motel: 모텔 + museum: 박물관 + zoo: 동물원 + tunnel: + "yes": 터널 + waterway: + dam: 댐 + river: 강 + waterfall: 폭포 + javascripts: + map: + base: + cycle_map: 사이클 지도 + standard: 표준 + transport_map: 교통 지도 + site: + edit_tooltip: 지도 편집 + history_tooltip: 이 지역에 대한 편집 보기 layouts: + community: 커뮤니티 + community_blogs: 커뮤니티 블로그 + community_blogs_title: OpenStreetMap 커뮤니티 회원 블로그 + copyright: 저작권 및 라이선스 + documentation: 설명서 + documentation_title: 이 프로젝트에 대한 설명서 + donate: 하드웨어 업데이트 기금에서 %{link}에 의해 OpenStreet를 지원합니다. donate_link_text: 기부 edit: 편집 - export: 추출 - export_tooltip: 맵 정보 추출 + edit_with: "%{editor}(으)로 편집" + export: 내보내기 + export_tooltip: 지도 데이터 내보내기 + foundation: 재단 + foundation_title: OpenStreetMap 재단 gps_traces: GPS 추적 - gps_traces_tooltip: 추적 설정 - history: 이력 - inbox: 받은 쪽지함 (%{count}) + gps_traces_tooltip: GPS 추적 설정 + help: 도움말 + help_centre: 도움말 센터 + help_title: 프로젝트에 대한 도움말 사이트 + history: 역사 + home: 집 + home_tooltip: 집 위치로 가기 inbox_tooltip: - one: 한 개의 읽지 않은 쪽지가 있습니다. - other: "%{count} 개의 읽지 않은 쪽지가 있습니다." + one: 읽지 않은 쪽지 한 개가 있습니다. + other: 읽지 않은 쪽지 %{count}개가 있습니다. zero: 읽지 않은 쪽지가 없습니다 + intro_1: OpenStreetMap은 여러분같은 사람에 의해 만들어진 우리 모두의 전세계 지도입니다. + intro_2_create_account: 계정을 만들 수 있습니다 + intro_2_download: 다운로드 + intro_2_html: 데이터는 %{license} 하에 무료로 %{download}와 %{use}합니다. 지도를 개선하려면 %{create_account}. + intro_2_license: 오픈 라이선스 + intro_2_use: 이용 + license: + alt: CC BY-SA 2.0 log_in: 로그인 log_in_tooltip: 기존 계정으로 로그인 - logout: 로그 아웃 - logout_tooltip: 로그 아웃 + logo: + alt_text: OpenStreetMap 로고 + logout: 로그아웃 + logout_tooltip: 로그아웃 make_a_donation: text: 기부하기 - osm_offline: 데이터베이스 점검을 위해 OpenStreetMap 의 데이터가 현재 오프라인입니다. - osm_read_only: 데이터베이스 점검을 위해 OpenStreetMap 의 데이터가 현재 읽기 전용입니다. + title: 금전적인 기부와 OpenStreetMap 지원 + osm_offline: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 오프라인입니다. + osm_read_only: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 읽기 전용입니다. + partners_bytemark: 바이트마크 호스팅 + partners_html: 호스팅은 %{ucl}, %{ic}와 %{bytemark}, 그리고 다른 %{partners}에 의해 지원합니다. + partners_ic: 임페리얼 칼리지 런던 대학 + partners_partners: 파트너 + partners_ucl: UCL VR 센터 sign_up: 가입하기 - sign_up_tooltip: 수정가능한 계좌 신규 등록 + sign_up_tooltip: 편집을 위한 계정 만들기 + tag_line: 우리 모두의 위키 세계 지도 user_diaries: 사용자 일지 user_diaries_tooltip: 사용자 일지 보기 view: 보기 view_tooltip: 지도 보기 welcome_user: "%{user_link}님 환영합니다." + welcome_user_link_tooltip: 내 사용자 문서 + wiki: 위키 + wiki_title: 프로젝트에 대한 위키 사이트 + wiki_url: http://wiki.openstreetmap.org/ + license_page: + foreign: + english_link: 영어 원본 + title: 이 번역에 대한 정보 + native: + mapping_link: 매핑 시작 + native_link: THIS_LANGUAGE_NAME_HERE 버전 + title: 이 문서에 대한 정보 message: + delete: + deleted: 메시지가 삭제됨 inbox: date: 날짜 + from: 보낸 사람 + messages: "%{new_messages}와 %{old_messages}가 있습니다" my_inbox: 내 쪽지함 + new_messages: + one: 새 메시지 %{count}개 + other: 새 메시지 %{count}개 no_messages_yet: 받은 쪽지가 없습니다. %{people_mapping_nearby_link}에서 친구를 찾아보세요. + old_messages: + one: 오래된 메시지 %{count}개 + other: 오래된 메시지 %{count}개 outbox: 보낸 쪽지함 people_mapping_nearby: 근처를 지도 입력한 사람들 subject: 제목 title: 받은 쪽지함 - you_have: "%{new_count} 개의 새 쪽지와 %{old_count} 개의 읽은 쪽지가 있습니다." + mark: + as_read: 메시지를 읽은 것으로 표시 + as_unread: 메시지를 읽지 않은 것으로 표시 message_summary: + delete_button: 삭제 read_button: 읽음으로 표시 reply_button: 답장 unread_button: 읽지 않음으로 표시 new: - back_to_inbox: 쪽지함으로 돌아가기 + back_to_inbox: 받은 쪽지함으로 돌아가기 body: 내용 message_sent: 쪽지가 전송되었습니다. send_button: 보내기 send_message_to: "%{name}에게 새 쪽지 보내기" subject: 제목 title: 새 쪽지 - no_such_user: - body: 죄송합니다. 그런 아이디 또는 이름의 사용자가 쪽지를 찾을 수 없습니다. - heading: 사용자 또는 쪽지를 찾을 수 없습니다 - title: 사용자 또는 쪽지를 찾을 수 없습니다 + no_such_message: + heading: 메시지가 없습니다. + title: 메시지가 없습니다. outbox: date: 날짜 inbox: 받은 편지함 + messages: + one: 메시지 %{count}개를 보냈습니다 + other: 메시지 %{count}개를 보냈습니다 + my_inbox: 내 %{inbox_link} no_sent_messages: 받은 쪽지가 없습니다. %{people_mapping_nearby_link}에서 친구를 찾아보세요. outbox: 보낸 편지함 people_mapping_nearby: 근처를 지도 입력한 사람들 subject: 제목 title: 보낸 쪽지함 - you_have_sent_messages: "%{count} 개의 쪽지를 보냈습니다." + to: 받는 사람 + read: + back_to_inbox: 받은 쪽지함으로 돌아가기 + back_to_outbox: 보낸 쪽지함으로 돌아가기 + date: 날짜 + from: 보낸 사람 + reading_your_messages: 메시지 읽기 + reading_your_sent_messages: 보낸 메시지 읽기 + reply_button: 답글 + subject: 제목 + title: 메시지 읽기 + to: 받는 사람 + unread_button: 읽지 않음으로 표시 + sent_message_summary: + delete_button: 삭제 notifier: diary_comment_notification: footer: "%{readurl}에서도 댓글을 확인할 수 있습니다. %{commenturl}에서 댓글을 남기거나 %{replyurl}에서 답글을 남길 수 있습니다." - header: "%{from_user} 님이 %{subject} 제목의 OpenStreetMap 일지 항목에 댓글을 남겼습니다.:" + header: "%{from_user} 님이 %{subject} 제목의 OpenStreetMap 일지 항목에 댓글을 남겼습니다:" hi: "%{to_user}님 안녕하세요." subject: "[OpenStreetMap] %{user} 님이 당신의 일지 항목에 댓글을 남겼습니다." + email_confirm: + subject: "[OpenStreetMap] 이메일 주소 확인" + email_confirm_html: + greeting: 안녕하세요, + email_confirm_plain: + greeting: 안녕하세요, friend_notification: had_added_you: "%{user} 님이 당신을 OpenStreetMap 친구로 추가하였습니다." see_their_profile: "%{userurl} 에서 프로필을 확인하고 원하면 친구로 등록할 수 있습니다." subject: "[OpenStreetMap] %{user} 님이 당신을 친구로 추가하였습니다." gpx_notification: + and_no_tags: 태그가 없습니다. + and_the_tags: "다음 태그가 있습니다:" + failure: + subject: "[OpenStreetMap] GPX 가져오기 실패" + greeting: 안녕하세요, success: - loaded_successfully: "loaded successfully with %{trace_points} out of a possible\n%{possible_points} points." + loaded_successfully: 가능한 %{possible_points} 포인트 중 %{trace_points} 포인트를 성공적으로 불러왔습니다. + subject: "[OpenStreetMap] GPX 가져오기 성공" + with_description: 설명과 함께 + your_gpx_file: GPX 파일 같아 보이고 + lost_password: + subject: "[OpenStreetMap] 비밀번호 초기화 요청" + lost_password_html: + greeting: 안녕하세요, + lost_password_plain: + greeting: 안녕하세요, message_notification: footer1: "%{readurl} 에서도 쪽지를 확인할 수 있습니다." footer2: "%{replyurl} 에서 답장하실 수 있습니다." header: "%{from_user} 님이 OpenStreetMap을 통해 %{subject} 쪽지를 보냈습니다." hi: "%{to_user}님 안녕하세요." + signup_confirm: + subject: "[OpenStreetMap] 이메일 주소 확인" + signup_confirm_html: + greeting: 안녕하세요! + more_videos: "%{more_videos_link}이 있습니다." + more_videos_here: 여기에 더 많은 동영상 + video_to_openstreetmap: OpenStreetMap 소개 동영상 + signup_confirm_plain: + blog_and_twitter: "OpenStreetMap 블로그 또는 트위터를 통해 최신 뉴스 보기:" + greeting: 안녕하세요! + the_wiki: "위키에서 OpenStreetMap에 대하여 읽기:" + oauth: + oauthorize: + allow_write_gpx: 사용자가 GPS 추적을 올립니다. + oauth_clients: + edit: + submit: 편집 + form: + allow_write_api: 사용자가 지도를 수정합니다. + allow_write_gpx: 사용자가 GPS 추적을 올립니다. + callback_url: 연락 URL + name: 이름 + required: 필수 + support_url: 지원 URL + url: 주요 어플리케이션 URL + index: + application: 어플리케이션 이름 + register_new: 어플리케이션 등록 + show: + allow_write_api: 사용자가 지도를 수정합니다. + allow_write_gpx: 사용자가 GPS 추적을 올립니다. + confirm: 확실합니까? + redaction: + show: + confirm: 확실합니까? site: edit: - potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.) + potlatch_unsaved_changes: 바뀜 사항을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우, 현재의 방식이나 포인트를 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.) + user_page_link: 사용자 문서 index: js_1: 자바스크립트를 지원하지 않는 브라우저이거나, 자바스크립트가 활성화 되어 있지 않습니다. + license: + license_name: 크리에이티브 커먼즈 저작자표시-동일조건변경허락 2.0 + notice: "%{project_name}와 기여자에 의해 %{license_name} 라이선스하에 라이선스합니다." + project_name: OpenStreetMap 프로젝트 + permalink: 고유링크 + shortlink: 짧은링크 + key: + map_key: 지도 키 + map_key_tooltip: 지도에 대한 키 + table: + entry: + allotments: 산 + apron: + 1: 터미널 + cable: + - 케이블 ì¹´ + cemetery: 묘지 + centre: 스포츠 센터 + farm: 농장 + forest: 숲 + golf: 골프장 + lake: + - 호수 + military: 군사 지역 + park: 공원 + rail: 철도 + school: + - 학교 + - 대학교 + subway: 지하철 + summit: + - 제출 + wood: 산림 + markdown_help: + url: URL + richtext_area: + edit: 편집 + preview: 미리 보기 search: - search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lì²´nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>" + search: 찾기 + search_help: "예제: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 또는 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>더 많은 예제...</a>" + submit_text: 가기 + where_am_i: 내가 어디있나요? + where_am_i_title: 검색 엔진을 사용하여 현재 위치를 설명 + sidebar: + close: 닫기 + search_results: 찾기 ê²°ê³¼ + time: + formats: + friendly: "%Y년 %B %e일 %H:%M" trace: + create: + upload_trace: GPS 추적 올리기 + edit: + description: "설명:" + download: 다운로드 + edit: 편집 + filename: "파일 이름:" + heading: 경로 편집 %{name} + map: 지도 + owner: "소유자:" + save_button: 바뀐 사항 저장 + tags: "태그:" + title: 경로 편집 %{name} + uploaded_at: "올려짐:" + visibility_help: 이게 무슨 의미입니까? + list: + public_traces: 공개 GPS 추적 + public_traces_from: "%{user} 사용자의 공중 GPS 추적" + your_traces: 내 GPS 추적 + make_public: + made_public: 추적이 공개적으로 만들어짐 + offline: + heading: GPX 저장소 오프라인 + trace: + ago: "% {time_in_words_ago} 전" + by: 사용자 + count_points: "% {count} 포인트" + edit: 편집 + edit_map: 지도 편집 + in: 위치 + map: 지도 + more: 더 보기 + trace_details: 추적 자세한 정보 보기 + view_map: 지도 보기 + trace_form: + description: "설명:" + help: 도움말 + tags: "태그:" + upload_button: 올리기 + upload_gpx: "GPX 파일 업로드:" + trace_header: + see_all_traces: 모든 추적 보기 + see_your_traces: 내 추적 보기 + upload_trace: 추적 올리기 + trace_optionals: + tags: 태그 view: - tags: Tags + delete_track: 이 추적 삭제 + description: "설명:" + download: 다운로드 + edit: 편집 + edit_track: 이 추적 편집 + filename: "파일 이름:" + map: 지도 + none: 없음 + owner: "소유자:" + pending: 보류 중 + points: "포인트:" + tags: "태그:" + trace_not_found: 추적을 찾을 수 없습니다! + uploaded: "올려짐:" user: account: + contributor terms: + link text: 이게 뭐죠? + current email address: "현재 이메일 주소:" + delete image: 현재 이미지 제거 + image: "그림:" + keep image: 현재 이미지를 유지 + latitude: "위도:" + longitude: "경도:" + my settings: 내 설정 + new email address: "새 이메일 주소:" + new image: 그림 추가 + openid: + link text: 이게 뭐죠? + openid: "OpenID:" + preferred editor: "주로 사용하는 편집기:" + preferred languages: 주로 사용하는 언어 + profile description: "프로필 설명:" public editing: + disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명으로 됩니다. + disabled link text: 왜 편집할 수 없나요? enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link text: 이게 뭐죠? + heading: "공개 편집:" + public editing note: + heading: 공개 편집 + replace image: 현재 이미지 대체 + return to profile: 프로필로 돌아가기 + save changes button: 바뀐 사항 저장 + title: 계정 편집 + confirm: + button: 확인 + heading: 사용자 계정 확인 + confirm_email: + button: 확인 + heading: 이메일 주소 변경 확인 + confirm_resend: + failure: "%{name} 사용자를 찾을 수 없습니다." + list: + heading: 사용자 + showing: + one: 페이지 %{page}개 보임 (%{items} 중 %{first_item}) + other: 페이지 %{page}개 보임 (%{items} 중 %{first_item}-%{last_item}) + summary: "%{name}(이)가 %{date}에 %{ip_address}에서 만들어짐" + summary_no_ip: "%{name}(이)가 %{date}에 만들어짐" + title: 사용자 + login: + create account minute: 계정을 만듭니다. 1분도 걸리지 않습니다. + email or username: "이메일 주소 또는 사용자 이름:" + heading: 로그인 + login_button: 로그인 + lost password link: 비밀번호를 잊으셨나요? + new to osm: OpenStreetMap이 처음이세요? + no account: 계정이 없나요? + openid: "%{logo} OpenID:" + openid invalid: 죄송합니다, OpenID가 잘못된 것 같습니다 + openid missing provider: 죄송합니다, OpenID 제공자에 문의할 수 없습니다 + openid_logo_alt: OpenID로 로그인 + openid_providers: + aol: + alt: AOL OpenID로 로그인 + title: AOL로 로그인 + google: + alt: 구글 OpenID로 로그인 + title: 구글로 로그인 + myopenid: + alt: myOpenID OpenID로 로그인 + title: myOpenID로 로그인 + openid: + alt: OpenID URL로 로그인 + title: OpenID로 로그인 + wordpress: + alt: 워드프레스 OpenID로 로그인 + title: 워드프레스로 로그인 + yahoo: + alt: 야후 OpenID로 로그인 + title: 야후로 로그인 + password: "비밀번호:" + register now: 지금 등록할 수 있습니다 + remember: 로그인 상태를 기억하기 + title: 로그인 + to make changes: OpenStreetMap 데이터를 바꾸려면 계정이 있어야 합니다. + with openid: "또는 OpenID로 로그인하세요:" + with username: "이미 OpenStreetMap 계정을 가지고 있나요? 계정 이름과 비밀번호로 로그인하세요:" + logout: + heading: OpenStreetMap에서 로그아웃 + logout_button: 로그아웃 + title: 로그아웃 lost_password: - new password button: Send me a new password - title: lost password + email address: "이메일 주소:" + heading: 비밀번호를 잊으셨나요? + new password button: 비밀번호 초기화 + notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다. + title: 잊어버진 비밀번호 + make_friend: + success: "%{name} 사용자는 친구입니다." + new: + confirm email address: "이메일 주소 확인:" + confirm password: "비밀번호 확인:" + continue: 계속 + display name: "보여줄 이름:" + display name description: 공개적으로 보여질 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다. + email address: "이메일 주소:" + fill_form: 양식을 채우고 우리에게 계정을 활성화하기 위해 신속하게 이메일을 보내드립니다. + heading: 사용자 계정 만들기 + license_agreement: 계정을 확인하면 당신은 <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">기여자 약관</a>에 동의해야합니다. + not displayed publicly: 공개적으로 보여지지 않습니다 (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">개인정보 정책</a>을 참고하세요) + openid: "%{logo} OpenID:" + openid no password: OpenID로 비밀번호가 필요하지 않지만 몇 추가 도구나 서버는 여전히 비밀번호가 필요할 수 있습니다. + password: "비밀번호:" + title: 계정 만들기 + use openid: 또는 ${logo} OpenID를 사용하여 로그인하세요 + popup: + friend: 친구 + nearby mapper: 인근 매퍼 + your location: 내 위치 reset_password: - title: reset password + confirm password: 비밀번호 확인 + flash changed: 비밀번호가 바뀌었습니다. + flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까? + heading: "%{user} 사용자 비밀번호 초기화" + password: "비밀번호:" + reset: 비밀번호 초기화 + title: 비밀번호 초기화 terms: + agree: 동의 + consider_pd_why: 이게 뭐죠? legale_names: france: 프랑스 italy: 이탈리아 + view: + add as friend: 친구 추가 + blocks by me: 나에 의한 차단 + blocks on me: 나를 차단 + comments: 의견 + confirm: 확인 + create_block: 이 사용자를 차단 + created from: "만든 날:" + delete_user: 이 사용자를 삭제 + description: 설명 + diary: 일지 + edits: 편집 + email address: "이메일 주소:" + friends_changesets: 친구의 모든 바뀜집합 찾아보기 + friends_diaries: 친구의 모든 일지 항목 찾아보기 + hide_user: 이 사용자를 숨기기 + latest edit: "최근 편집 %{ago}:" + my comments: 내 덧글 + my diary: 내 일지 + my edits: 내 편집 + my settings: 내 설정 + my traces: 내 발자취 + nearby_changesets: 인근 사용자의 모든 바뀜집합 찾아보기 + nearby_diaries: 인근 사용자의 모든 일지 항목 찾아보기 + new diary entry: 새 일지 항목 + remove as friend: 친구 제거 + send message: 메시지 보내기 + settings_link_text: 설정 + spam score: "스팸 점수:" + status: "상태:" + traces: 발자취 + your friends: 내 친구 + user_block: + blocks_by: + heading: "%{name} 사용자에 의해 차단한 목록" + title: "%{name} 사용자에 의해 차단" + blocks_on: + title: "%{name} 사용자에 대해 차단" + edit: + back: 모든 차단 보기 + show: 이 차단 보기 + submit: 차단 업데이트 + index: + heading: 사용자 차단 목록 + title: 사용자 차단 + new: + submit: 차단 만들기 + partial: + confirm: 확실합니까? + display_name: 차단된 사용자 + edit: 편집 + next: 다음 » + previous: « 이전 + show: 보기 + showing_page: 페이지 %{page}개 보임 + period: + one: 1시간 + other: "%{count}시간" + show: + confirm: 확실합니까? + edit: 편집 + update: + success: 차단이 업데이트되었습니다. + user_role: + grant: + confirm: 확인 + revoke: + confirm: 확인 diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 5d5b0ba1e..eb1840235 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -44,7 +44,6 @@ lb: way: Wee browse: changeset: - download: Als %{changeset_xml_link} oder %{osmchange_xml_link} eroflueden. osmchangexml: osmChange XML changeset_details: belongs_to: "Gehéiert dem:" @@ -80,9 +79,8 @@ lb: next_changeset_tooltip: Nächst Ännerung vum %{user} prev_changeset_tooltip: Vireg Ännerung vum %{user} node: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" download_xml: XML eroflueden - edit: änneren + edit: Knuet änneren node: Knuet node_title: "Knuet: %{node_name}" view_history: Versioune weisen @@ -90,7 +88,6 @@ lb: coordinates: "Koordinaten:" part_of: "Deel vu(n):" node_history: - download: "%{download_xml_link} oder %{view_details_link}" download_xml: XML eroflueden view_details: Detailer weisen not_found: @@ -102,8 +99,11 @@ lb: paging_nav: of: vu(n) showing_page: Säit gëtt gewisen + redacted: + type: + relation: Relatioun + way: Wee relation: - download: "%{download_xml_link} oder %{view_history_link}" download_xml: XML eroflueden relation: Relatioun relation_title: "Relatioun: %{relation_name}" @@ -112,7 +112,6 @@ lb: members: "Memberen:" part_of: "Deel vu(n):" relation_history: - download: "%{download_xml_link} oder %{view_details_link}" download_xml: XML eroflueden view_details: Detailer weisen relation_member: @@ -125,7 +124,7 @@ lb: manually_select: En anere Beräich manuell eraussichen start_rjs: data_frame_title: Donnéeën - data_layer_name: Donnéeën + data_layer_name: Donnéeë vun de Kaarten duerchkucken details: Detailer edited_by_user_at_timestamp: Vum [[user]] de(n) [[timestamp]] geännert load_data: Donnéeë lueden @@ -158,9 +157,8 @@ lb: relation: Relatioun way: Wee way: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" download_xml: XML eroflueden - edit: änneren + edit: Wee änneren view_history: Versioune weisen way: Wee way_title: "Wee: %{way_name}" @@ -168,7 +166,6 @@ lb: nodes: "Kniet:" part_of: "Deel vu(n):" way_history: - download: "%{download_xml_link} oder %{view_details_link}" download_xml: XML eroflueden view_details: Detailer weisen changeset: @@ -189,6 +186,11 @@ lb: list: description: Rezent Ännerungen diary_entry: + comments: + comment: Bemierkung + newer_comments: Méi nei Bemierkungen + older_comments: Méi al Bemierkungen + when: Wéini diary_comment: confirm: Confirméieren hide_link: Dës Bemierkung verstoppen @@ -203,9 +205,6 @@ lb: location: edit: Änneren view: Weisen - no_such_user: - heading: De Benotzer %{user} gëtt et net - title: Esou e Benotzer gëtt et net view: leave_a_comment: Eng Bemierkung maachen save_button: Späicheren @@ -301,24 +300,13 @@ lb: university: Universitéit vending_machine: Verkaafsautomat veterinary: Déiereklinik + bridge: + viaduct: Viadukt + "yes": Bréck building: - bunker: Bunker - chapel: Kapell - church: Kierch - city_hall: Stadhaus - flats: Appartementer - hotel: Hotel - house: Haus - office: Bürosgebai - school: Schoulgebai - stadium: Stadion - store: Geschäft - terrace: Terrasse - tower: Tuerm - train_station: Gare (Eisebunn) + "yes": Gebai highway: footway: Fousswee - gate: Paard motorway: Autobunn path: Pad pedestrian: Fousswee @@ -344,7 +332,6 @@ lb: farm: Bauerenhaff forest: Bësch military: Militairegebitt - mountain: Bierg park: Park railway: Eisebunn vineyard: Wéngert @@ -355,6 +342,7 @@ lb: marina: Yachthafen miniature_golf: Minigolf nature_reserve: Naturschutzgebitt + park: Park playground: Spillplaz stadium: Stadion swimming_pool: Schwëmm @@ -363,6 +351,7 @@ lb: channel: Kanal crater: Krater fjord: Fjord + forest: Bësch geyser: Geysir glacier: Gletscher hill: Hiwwel @@ -373,6 +362,7 @@ lb: river: Floss rock: Steng spring: Quell + stone: Steen tree: Bam valley: Dall volcano: Vulkan @@ -393,13 +383,13 @@ lb: railway: abandoned: Fréier Eisebunn disused: Fréier Eisebunn + miniature: Miniatur-Eisebunn station: Gare (Eisebunn) subway: Metro-Statioun tram: Tram shop: bakery: Bäckerei books: Bichergeschäft - car_dealer: Autoshändler car_repair: Garage chemist: Apdikt clothes: Kleedergeschäft @@ -449,14 +439,16 @@ lb: foundation: Fondatioun help: Hëllef home: Doheem - intro_3_partners: Wiki logo: alt_text: OpenStreetMap Logo + logout: ausloggen logout_tooltip: Ausloggen make_a_donation: text: En Don maachen title: Ënnerstëtzt OpenStreetMap mat engem Don + partners_partners: Partner user_diaries: Benotzer Bloggen + view: Weisen view_tooltip: Kaart weisen welcome_user: Wëllkomm, %{user_link} welcome_user_link_tooltip: Är Benotzersäit @@ -465,6 +457,8 @@ lb: foreign: english_link: den engleschen Original title: Iwwer dës Iwwersetzung + legal_babble: + more_title_html: Fir méi ze wëssen native: native_link: lëtzebuergesch Versioun title: Iwwer dës Säit @@ -488,15 +482,12 @@ lb: no_such_message: heading: Keen esou ee Message title: Keen esou ee Message - no_such_user: - body: Pardon, et gëtt kee Benotzer mat deem Numm. - heading: Esou e Benotzer gëtt et net - title: Esou e Benotzer gëtt et net outbox: date: Datum subject: Sujet read: date: Datum + from: Vum reply_button: Äntwerten subject: Sujet title: Message liesen @@ -537,7 +528,18 @@ lb: submit: Registréieren show: allow_write_api: Kaart änneren + confirm: Sidd Dir sécher? edit: Detailer änneren + redaction: + edit: + description: Beschreiwung + new: + description: Beschreiwung + show: + confirm: Sidd Dir sécher? + description: "Beschreiwung:" + update: + flash: Ännerunge gespäichert. site: edit: user_page_link: Benotzersäit @@ -567,6 +569,10 @@ lb: tram: 1: Tram wood: Bësch + markdown_help: + image: Bild + link: Link + text: Text search: search: Sichen submit_text: Lass @@ -592,9 +598,6 @@ lb: uploaded_at: "Eropgelueden:" visibility: "Visibilitéit:" visibility_help: wat heescht dat? - no_such_user: - heading: De Benotzer %{user} gëtt et net - title: Esou e Benotzer gëtt et net trace: ago: viru(n) %{time_in_words_ago} by: vum @@ -616,8 +619,6 @@ lb: visibility: "Visibilitéit:" visibility_help: wat heescht dat? trace_paging_nav: - next: Nächst » - previous: « Vireg showing_page: D'Säit %{page} gëtt gewisen view: description: "Beschreiwung:" diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 6b317d807..f9594fb97 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1,7 +1,8 @@ -# Messages for Lithuanian (Lietuvių) +# Messages for Lithuanian (lietuvių) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Cyklopas +# Author: Eitvys200 # Author: Garas # Author: Matasg # Author: Pauliuz @@ -54,10 +55,12 @@ lt: message: Žinutė node: TaÅ¡kas node_tag: TaÅ¡ko žyma + notifier: PraneÅ¡ti old_node: Ankstesnis taÅ¡kas old_node_tag: Ankstesnio taÅ¡ko žyma old_relation: Ankstesnis ryÅ¡ys old_relation_member: Ankstesnio ryÅ¡io narys + old_relation_tag: Seno ryÅ¡io žyma old_way: Ankstesnis kelias old_way_node: Ankstesnio kelio taÅ¡kas old_way_tag: Ankstesnio kelio žyma @@ -70,6 +73,7 @@ lt: tracetag: Pėdsako žyma user: Naudotojas user_preference: Naudotojo nustatymai + user_token: Vartotojo ženklas way: Kelias way_node: Kelio mazgas way_tag: Kelio žyma @@ -83,7 +87,6 @@ lt: changeset: changeset: "Pakeitimas: %{id}" changesetxml: Pakeitimo XML - download: Parsisiųsti %{changeset_xml_link} arba %{osmchange_xml_link} feed: title: Pakeitimas %{id} title_comment: Pakeitimas %{id} - %{comment} @@ -145,7 +148,6 @@ lt: next_changeset_tooltip: Kitas naudotojo %{user} pakeitimas prev_changeset_tooltip: Anksčiau redagavo %{user} node: - download: "%{download_xml_link}, %{view_history_link} arba %{edit_link}" download_xml: Atsisiųsti XML edit: redaguoti node: TaÅ¡kas @@ -155,7 +157,6 @@ lt: coordinates: "Koordinatės:" part_of: "Dalis:" node_history: - download: "%{download_xml_link} arba %{view_details_link}" download_xml: Atsisiųsti XML node_history: TaÅ¡ko istorija node_history_title: "TaÅ¡ko istorija: %{node_name}" @@ -170,8 +171,14 @@ lt: paging_nav: of: iÅ¡ showing_page: Rodomas puslapis + redacted: + message_html: Versijos "%{version}" tipas %{type} negali bÅ«ti rodomas, kai jis buvo redaguotas. ŽiÅ«rėkite %{redaction_link} dėl iÅ¡samesnės informacijos. + redaction: Redakcija % {id} + type: + node: taÅ¡kas + relation: ryÅ¡ys + way: kelias relation: - download: "%{download_xml_link} arba %{view_history_link}" download_xml: Atsisiųsti XML relation: RyÅ¡ys relation_title: "RyÅ¡ys: %{relation_name}" @@ -180,7 +187,6 @@ lt: members: "Nariai:" part_of: "Dalis:" relation_history: - download: "%{download_xml_link} arba %{view_details_link}" download_xml: Atsisiųsti XML relation_history: RyÅ¡io istorija relation_history_title: "RyÅ¡io istorija: %{relation_name}" @@ -242,7 +248,6 @@ lt: relation: ryÅ¡ys way: kelias way: - download: "%{download_xml_link}, %{view_history_link} arba %{edit_link}" download_xml: Atsisiųsti XML edit: redaguoti view_history: rodyti istoriją @@ -255,7 +260,6 @@ lt: nodes: "TaÅ¡kai:" part_of: "Dalis:" way_history: - download: "%{download_xml_link} arba %{view_details_link}" download_xml: Atsisiųsti XML view_details: iÅ¡samiau way_history: Kelio istorija @@ -282,19 +286,33 @@ lt: list: description: Paskutiniai pakeitimai description_bbox: Pakeitimai daryti plote %{bbox} + description_friend: JÅ«sų draugų pakeitimai + description_nearby: Netoliese esančių naudotojų pakeitimai description_user: Naudotojo %{user} pakeitimai description_user_bbox: Naudotojo %{user} pakeitimai srityje %{bbox} heading: Pakeitimai heading_bbox: Pakeitimai + heading_friend: Pakeitimai + heading_nearby: Pakeitimai heading_user: Pakeitimai heading_user_bbox: Pakeitimai title: Pakeitimai title_bbox: Pakeitimai daryti plote %{bbox} + title_friend: JÅ«sų draugų pakeitimai + title_nearby: Netoliese esančių naudotojų pakeitimai title_user: Naudotojo %{user} pakeitimai title_user_bbox: Naudotojo %{user} pakeitimai daryti plote %{bbox} timeout: sorry: AtsipraÅ¡ome, bet jÅ«sų praÅ¡ytų pakeitimų iÅ¡traukimas užtruko per ilgai. diary_entry: + comments: + ago: prieÅ¡ %{ago} + comment: Komentuoti + has_commented_on: "%{display_name} pakomentavo vieno iÅ¡ jÅ«sų dienoraščio įrašų." + newer_comments: Naujesni komentarai + older_comments: Senesni komentarai + post: RaÅ¡yti + when: Kada diary_comment: comment_from: Naudotojo %{link_user} komentaras, paraÅ¡ytas %{comment_created_at} confirm: Patvirtinti @@ -339,6 +357,8 @@ lt: older_entries: Senesni įraÅ¡ai recent_entries: "Paskutiniai dienoraščio įraÅ¡ai:" title: Naudotojo dienoraščiai + title_friends: Draugų dienoraščiai + title_nearby: Netoliese esančių naudotojų dienoraščiai user_title: "%{user} dienoraÅ¡tis" location: edit: Taisyti @@ -350,10 +370,6 @@ lt: body: AtsipraÅ¡ome, čia nėra jokio dienoraščio įraÅ¡o ar komentaro su Å¡iuo id %{id}. Pasitikrinkite raÅ¡ybą, arba nuoroda kurią jÅ«s pasirinkite yra klaidinga. heading: "Nėra įraÅ¡o su id: %{id}" title: Nėra tokio dienoraščio įraÅ¡o - no_such_user: - body: AtsipraÅ¡ome, čia nėra jokio naudotojo vardu „%{user}“. Pasitikrinkite raÅ¡ybą, arba nuoroda kurią jÅ«s pasirinkite yra klaidinga. - heading: Naudotojas %{user} neegzistuoja - title: Nėra tokio naudotojo view: leave_a_comment: Palikti komentarą login: Prisijungti @@ -443,16 +459,28 @@ lt: suffix_place: ", %{distance}, į %{direction}, %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodromas + apron: Oro uosto aikÅ¡telė + gate: Vartai + helipad: Sraigtasparnių aikÅ¡telė + runway: Pakilimo takas + taxiway: Riedėjimo takas + terminal: Terminalas amenity: + WLAN: WiFi prieiga airport: Oro uostas arts_centre: Menų centras + artwork: Meno dirbiniai atm: Bankomatas auditorium: Auditorija bank: Bankas bar: Baras + bbq: BBQ bench: Suoliukas bicycle_parking: Dviračių stovėjimo aikÅ¡telė bicycle_rental: Dviračių nuoma + biergarten: Alaus sodas brothel: VieÅ¡ieji namai bureau_de_change: Valiutos keitimo punktas bus_station: Autobusų stotis @@ -461,6 +489,7 @@ lt: car_sharing: Dalinimosi automobiliu paslauga car_wash: Automobilių plovykla casino: Kazino + charging_station: Ä®krovimo stotis cinema: Kino teatras clinic: Klinika club: Klubas @@ -479,6 +508,7 @@ lt: ferry_terminal: Keltų terminalas fire_hydrant: Hidrantas fire_station: Gaisrinė + food_court: Savitarnos kavinė fountain: Fontanas fuel: Degalinė grave_yard: Kapinės @@ -495,6 +525,7 @@ lt: marketplace: Turgavietė mountain_rescue: Pagalba kalnuose nightclub: Naktinis klubas + nursery: Seselės kabinetas nursing_home: Slaugos namai office: Biuras park: Parkas @@ -518,9 +549,12 @@ lt: shelter: Pastogė shop: Parduotuvė shopping: Apsipirkimo vieta + shower: DuÅ¡as + social_centre: Socialinių reikalų centras social_club: Socialinių reikalų klubas studio: Studija supermarket: Prekybos centras + swimming_pool: Plaukiojimo baseinas taxi: Taksi telephone: VieÅ¡as telefonas theatre: Teatras @@ -535,36 +569,17 @@ lt: youth_centre: Jaunimo centras boundary: administrative: Administracinė riba + census: Gyventojų suraÅ¡ymo teritorijos riba + national_park: Nacionalinis parkas + protected_area: Saugoma teritorija + bridge: + aqueduct: Akvedukas + suspension: Kabantis tiltas + swing: SiÅ«buojantis tiltas + viaduct: Viadukas + "yes": Tiltas building: - apartments: Gyvenamasis kvartalas - block: Pastatų blokas - bunker: Bunkeris - chapel: Koplyčia - church: Bažnyčia - city_hall: Rotušė - commercial: Komercinės paskirties pastatas - dormitory: Bendrabutis - entrance: Įėjimas į pastatą - farm: Ūkio pastatas - flats: Butai - garage: Garažas - hall: Salė - hospital: Ligoninės pastatas - hotel: VieÅ¡butis - house: Namas - industrial: Pramoninis pastatas - office: Biurų pastatas - public: Visuomeninis pastatas - residential: Gyvenamasis pastatas - retail: Mažmeninės prekybos pastatas - school: Mokyklos pastatas - shop: Parduotuvė - stadium: Stadionas - store: Parduotuvė - terrace: Terasa - tower: BokÅ¡tas - train_station: Geležinkelio stotis - university: Universiteto pastatas + "yes": Pastatas highway: bridleway: Žirgų kelias bus_guideway: Bėginio autobuso linija @@ -572,12 +587,11 @@ lt: byway: Keliukas construction: Statomas greitkelis cycleway: Dviračių takas - distance_marker: Nuotolio žymeklis emergency_access_point: Skubios prieigos punktas footway: Pėsčiųjų takelis ford: Brasta - gate: Vartai living_street: Gyvenamoji gatvė + milestone: Etapinis ženklas minor: Å alutinis kelias motorway: Automagistralė motorway_junction: Automagistralės rampa @@ -589,14 +603,17 @@ lt: primary_link: Pirmosios reikÅ¡mės kelias raceway: Lenktynių trasa residential: Gyvenamasis (-oji) + rest_area: Poilsio vieta road: Kelias secondary: Antros reikÅ¡mės kelias secondary_link: Antros reikÅ¡mės kelias service: Privažiuojamasis kelias services: Automagistralės paslaugos + speed_camera: Greičio kamera steps: Laiptai stile: Kopynė tertiary: Trečios reikÅ¡mės kelias + tertiary_link: Trečios reikÅ¡mės kelias track: Vėžės trail: Takas trunk: Magistralinis kelias @@ -610,6 +627,7 @@ lt: building: Pastatas castle: Pilis church: Bažnyčia + fort: Fortas house: Namas icon: Ikona manor: Dvaras @@ -625,36 +643,45 @@ lt: landuse: allotments: Sodai basin: Baseinas + brownfield: „Rudasis laukas“ cemetery: Kapinės commercial: Komercinis plotas conservation: Apsaugos zona construction: Statyba farm: Ūkis + farmland: Fermos žemės farmyard: Ferma forest: MiÅ¡kas + garages: Garažai grass: Žolė + greenfield: „Žaliasis laukas“ industrial: Pramoninė zona landfill: Sąvartynas meadow: Pieva military: Karinė zona mine: Kasykla - mountain: Kalnas nature_reserve: Gamtos draustinis + orchard: Sodai park: Parkas piste: Slidinėjimo trasa quarry: Karjeras railway: Geležinkelis recreation_ground: Rekreacinė zona reservoir: Rezervuaras + reservoir_watershed: Vandens rezervuaras residential: Gyvenamasis rajonas retail: Mažmeninė prekyba + road: Kelio zona + village_green: Gyvenvietės žalioji zona vineyard: Vynuogynas wetland: Pelkė wood: Medžiai leisure: beach_resort: PajÅ«rio kurortas + bird_hide: paukščių stebėjimo vieta common: Bendra žemė fishing: Žvejybos zona + fitness_station: Fitneso vieta garden: Sodas golf_course: Golfo laukas ice_rink: Slidinėjimo vieta (paklojant užšąlantį vandenį) @@ -665,24 +692,33 @@ lt: pitch: Sporto aikÅ¡tė playground: Žaidimų aikÅ¡telė recreation_ground: Rekreacinis plotas + sauna: Sauna slipway: Slipas sports_centre: Sporto centras stadium: Stadionas swimming_pool: Plaukiojimo baseinas track: Bėgimo takelis water_park: Vandens parkas + military: + airfield: Karinis aerodromas + barracks: Kareivinės + bunker: Bunkeris natural: bay: Ä®lanka beach: PaplÅ«dimys + cape: KyÅ¡ulys cave_entrance: Įėjimas į urvą channel: Kanalas cliff: Uola - coastline: Pakrantė crater: Krateris + dune: Kopa feature: Ypatybė + fell: Kalnuota vieta fjord: Fiordas + forest: MiÅ¡kas geyser: Geizeris glacier: Ledynas + heath: Dykynė hill: Kalva island: Sala land: Žemė @@ -699,6 +735,7 @@ lt: scrub: KrÅ«mai shoal: Rėva spring: Å altinis + stone: Akmuo strait: Sąsiauris tree: Medis valley: Slėnis @@ -707,6 +744,19 @@ lt: wetland: Pelkė wetlands: Pelkės wood: Medžiai + office: + accountant: Buhalteris + architect: Architektas + company: Bendrovė + employment_agency: Ä®darbinimo agentÅ«ra + estate_agent: Nekilnojamojo turto agentas + government: Vyriausybinė tarnyba + insurance: Draudimo įstaiga + lawyer: Advokatas + ngo: NGO įstaiga + telecommunication: Telekomunikacijų tarnyba + travel_agent: Kelionių agentÅ«ra + "yes": Biuras place: airport: Oro uostas city: Miestas @@ -718,6 +768,7 @@ lt: houses: Namai island: Sala islet: Salelė + isolated_dwelling: Izoliuota gyvenamoji zona locality: Vietovė moor: Dažnai užliejama vieta municipality: Savivaldybė @@ -741,17 +792,22 @@ lt: junction: Geležinkelio mazgas level_crossing: Pervaža light_rail: Lengvasis geležinkelis + miniature: MiniatiÅ«rinis geležinkelis monorail: Vienbėgis narrow_gauge: Siaurukas platform: Geležinkelio platforma preserved: Paveldo geležinkelis + spur: Geležinkelio atsiÅ¡akojimas station: Geležinkelio stotis subway: Metro stotis subway_entrance: Įėjimas į metro + switch: Geležinkelio punktai tram: Tramvajus tram_stop: Tramvajaus stotelė + yard: Geležinkelio kiemas shop: - apparel: Drabužių parduotuvė + alcohol: Licencijuotos parduotuvės + antiques: Antikvariniai daiktai art: Meno parduotuvė bakery: Kepykla beauty: Grožio salonas @@ -760,7 +816,6 @@ lt: books: Knygynas butcher: Mėsininkas car: Automobilių parduotuvė - car_dealer: Prekiautojas automobiliais car_parts: Automobilių dalys car_repair: Automobilių remontas carpet: Kilimų parduotuvė @@ -770,11 +825,11 @@ lt: computer: Kompiuterių parduotuvė confectionery: Konditerijos parduotuvė convenience: Parduotuvė + copyshop: Kanceliarinių prekių parduotuvė cosmetics: Kosmetikos parduotuvė department_store: Universalinė parduotuvė discount: Nukainotų prekių parduotuvė doityourself: Pasidaryk pats - drugstore: Vaistinė dry_cleaning: Sausasis valymas electronics: Elektronikos parduotuvė estate_agent: Nekilnojamojo turto agentas @@ -783,9 +838,11 @@ lt: fish: Žuvies parduotuvė florist: Gėlininkas food: Maisto parduotuvė + funeral_directors: Laidotuvių direktoriai furniture: Baldai gallery: Galerija garden_centre: Sodo prekės + general: Bendroji parduotuvė gift: Dovanų parduotuvė greengrocer: Daržovių ir vaisių pardavėjas grocery: Gastronomas @@ -801,20 +858,28 @@ lt: mobile_phone: Mobiliųjų telefonų parduotuvė motorcycle: Motociklų parduotuvė music: Muzikos prekių parduotuvė + newsagent: Spaudos pardavėjas optician: Optikas organic: EkologiÅ¡kų maisto produktų parduotuvė + outdoor: Lauko parduotuvė pet: Naminių gyvÅ«nėlių parduotuvė photo: Foto prekių parduotuvė salon: Salonas shoes: Batų parduotuvė shopping_centre: Prekybos centras sports: Sporto prekių parduotuvė + stationery: RaÅ¡tinės reikmenys supermarket: Prekybos centras toys: Žaislų parduotuvė travel_agency: Kelionių agentÅ«ra video: Video parduotuvė + wine: Licencijuota parduotuvė tourism: + alpine_hut: Kalnų trobelė + artwork: Meno dirbiniai attraction: Lankytina vieta + bed_and_breakfast: Nakvynės namai (vieÅ¡butis) + cabin: Kabina camp_site: Stovyklavietė caravan_site: Kemperių aikÅ¡telė chalet: Trobelė @@ -825,9 +890,12 @@ lt: motel: Motelis museum: Muziejus picnic_site: Poilsiavietė + theme_park: Nuotykių parkas valley: Slėnis viewpoint: Apžvalgos aikÅ¡telė zoo: Zoologijos sodas + tunnel: + "yes": Tunelis waterway: canal: Kanalas dam: Užtvanka @@ -843,6 +911,8 @@ lt: map: base: cycle_map: Dviračių žemėlapis + standard: Standartinis + transport_map: Transporto žemėlapis site: edit_disabled_tooltip: Norėdami redaguoti, priartinkite edit_tooltip: Redaguoti žemėlapį @@ -851,6 +921,7 @@ lt: history_tooltip: PeržiÅ«rėti pakeitimus Å¡ioje srityje history_zoom_alert: Turite priartinti vaizdą, kad galėtumėte peržiÅ«rėti srities pakeitimus layouts: + community: Bendruomenė community_blogs: Dienoraščiai community_blogs_title: OpenStreetMap bendruomenės blogai copyright: Teisės ir licencija @@ -872,15 +943,14 @@ lt: history: Istorija home: namo home_tooltip: Eiti į namų vietą - inbox: gauti (%{count}) inbox_tooltip: one: JÅ«sų dėžutėje yra viena neperskaityta žinutė other: JÅ«sų dėžutėje yra %{count} neperskaitytos žinutės zero: JÅ«sų dėžutėje nėra neperskaitytų žinučių intro_1: OpenStreetMap yra laisvai prieinamas ir keičiamas pasaulio žemėlapis. Jį kuria žmonės, tokie kaip jÅ«s. - intro_2: Su OpenStreetMap galite žiÅ«rėti, keisti ir naudoti geografinius duomenis bendradarbiavimo bÅ«du bet kur žemėje. - intro_3: OpenStreetMap hostingą remia %{ucl}, %{ic} ir %{bytemark}. Kiti projekto rėmėjai iÅ¡vardinti %{partners}. - intro_3_partners: wiki + intro_2_create_account: Sukurti naudotojo paskyrą + intro_2_download: atsisiųsti + intro_2_use: naudoti license: title: OpenStreetMap duomenys yra licencijuoti pagal Creative Commons Attribution-Share Alike 2.0 Generic licenciją log_in: prisijungti @@ -894,9 +964,9 @@ lt: title: Paremkite OpenStreetMap finansiÅ¡kai osm_offline: Å iuo metu OpenStreetMap duomenų bazė iÅ¡jungta, nes vykdomi svarbÅ«s priežiÅ«ros darbai. osm_read_only: OpenStreetMap duomenų bazė Å¡iuo metu dirba tik skaitymo režimu, nes vykdomi esminiai priežiÅ«ros darbai. + partners_partners: partneriai sign_up: užsiregistruoti sign_up_tooltip: Sukurkite paskyrą redagavimui - sotm2011: Atvykite į 2011 metų OpenStreetMap konferenciją „Žemėlapio bÅ«sena“, kuri vyks rugsėjo 9-11 dienomis Denveryje! tag_line: Atviras wiki žemėlapis user_diaries: Dienoraščiai user_diaries_tooltip: PeržiÅ«rėti naudotojų dienoraščius @@ -920,6 +990,7 @@ lt: inbox: date: Data from: Nuo + messages: JÅ«s turite %{new_messages} ir %{old_messages} my_inbox: Mano gauti no_messages_yet: JÅ«s dar negavote nei vienos žinutės. Kodėl gi nesusisiekus su %{people_mapping_nearby_link}? outbox: iÅ¡siųstieji @@ -947,10 +1018,6 @@ lt: body: Gaila, bet žinutės su tokiu id nėra. heading: Nėra tokio praneÅ¡imo title: Nėra tokio praneÅ¡imo - no_such_user: - body: Gaila, bet nėra naudotojo su tokiu vardu. - heading: Nėra tokio naudotojo - title: Nėra tokio naudotojo outbox: date: Data inbox: gautieji @@ -1113,6 +1180,37 @@ lt: title: OAuth informacija programai %{app_name} update: flash: Kliento informacija sėkmingai atnaujinta + redaction: + create: + flash: Redakcija sukurta. + destroy: + error: Ä®vyko klaida, naikinant redakciją. + flash: Redakcija sunaikinta. + not_empty: Redakcija nėra tuščia. PraÅ¡ome atÅ¡aukti visas versijas, galiojančias Å¡iai redakcijai, prieÅ¡ ją sunaikinant. + edit: + description: ApraÅ¡ymas + heading: Keisti redakciją + submit: IÅ¡saugoti redakciją + title: Keisti redakciją + index: + empty: Nėra jokių redakcijų + heading: Redakcijų sąraÅ¡as + title: Redakcijų sąraÅ¡as + new: + description: ApraÅ¡ymas + heading: Ä®raÅ¡ykite naujos redakcijos informaciją + submit: Kurti redakciją + title: Sukurti naują redakciją + show: + confirm: Ar esate tikra(s)? + description: "ApraÅ¡ymas:" + destroy: PaÅ¡alinti Å¡ią redakciją + edit: Redaguoti Å¡ią redakciją + heading: Rodoma redakcija "%{title}" + title: Redakcijos rodymas + user: "KÅ«rėjas:" + update: + flash: Pakeitimai iÅ¡saugoti. site: edit: anon_edits_link_text: Sužinokite, kodėl taip yra. @@ -1188,6 +1286,13 @@ lt: unclassified: Neklasifikuotas kelias unsurfaced: Kelias be dangos wood: MiÅ¡kas + markdown_help: + image: Paveikslėlis + link: Nuoroda + text: Tekstas + url: URL + richtext_area: + edit: Redaguoti search: search: "PaieÅ¡ka:" search_help: "pavyzdžiai: S.Dariaus ir S.Girėno stadionas, Gedimino pr., Ukmergė, \"Gardino g. 5\" arba \"paÅ¡to Å¡alia Lünen\" <a href='http://wiki.openstreetmap.org/wiki/Search'>ir daugiau pavyzdžių ...</a>" @@ -1197,6 +1302,9 @@ lt: sidebar: close: Uždaryti search_results: PaieÅ¡kos rezultatai + time: + formats: + friendly: "%Y m. %B %e d., %H:%M" trace: create: trace_uploaded: JÅ«sų GPX pėdsakas įkrautas ir laukia įterpimo į duomenų bazę. Paprastai tai įvyks pusvalandžio bėgyje, o tada jums bus iÅ¡siųstas patvirtinimo laiÅ¡kas. @@ -1227,10 +1335,6 @@ lt: your_traces: JÅ«sų GPS pėdsakai make_public: made_public: Pėdsakas nuo dabar bus vieÅ¡as - no_such_user: - body: AtsipraÅ¡ome, čia nėra jokio naudotojo vardu „%{user}“. Pasitikrinkite raÅ¡ybą, arba nuoroda kurią jÅ«s pasirinkite yra klaidinga. - heading: Naudotojas „%{user}“ neegzistuoja - title: Nėra tokio naudotojo offline: message: GPX pėdsakų saugojimo ir įkėlimo sistema Å¡iuo metu neveikia. offline_warning: @@ -1267,8 +1371,6 @@ lt: trace_optionals: tags: Žymos trace_paging_nav: - next: Kitas » - previous: « Ankstesnis showing_page: Rodomas puslapis %{page} view: delete_track: Naikinti šį pėdsaką @@ -1317,6 +1419,8 @@ lt: new email address: "Naujas e-paÅ¡to adresas:" new image: Pridėti nuotrauką no home location: JÅ«s neįvedėte savo namų pozicijos + openid: + link text: kas tai? preferred editor: "Pageidautinas redaktorius:" preferred languages: "Pageidautinos kalbos:" profile description: "Profilio apraÅ¡ymas:" @@ -1368,15 +1472,25 @@ lt: login_button: Prisijungti lost password link: PamirÅ¡ote slaptažodį? new to osm: Nesusipažinę su OpenStreetMap? + no account: Neturite savo paskyros? openid: "%{logo} OpenID:" openid_logo_alt: Prisijunkite su OpenID openid_providers: + aol: + alt: Prisijungti su Yahoo OpenID + title: Prisijungti su AOL google: alt: Prisijungti su Google OpenID title: Prisijungti su Google + myopenid: + alt: Prisijungti su myOpenID OpenID + title: Prisijungti su OpenID openid: alt: Prisijungti su savo OpenID URL title: Prisijungti su OpenID + wordpress: + alt: Prisijungti su Wordpress OpenID + title: Prisijungti su Wordpress yahoo: alt: Prisijungti su Yahoo OpenID title: Prisijungti su Yahoo @@ -1473,6 +1587,7 @@ lt: latest edit: "Paskutinis pakeitimas %{ago}:" m away: nutolęs %{count}m mapper since: "Žymi nuo:" + my comments: mano komentarai my diary: mano dienoraÅ¡tis my edits: mano keitimai my settings: mano nustatymai @@ -1523,7 +1638,6 @@ lt: filter: block_expired: Blokavimo laikas jau baigėsi, todėl negali bÅ«ti keičiamas. block_period: Blokavimo periodo reikÅ¡mė turi bÅ«ti pasirinkta iÅ¡ iÅ¡krentančio sąraÅ¡o. - not_a_moderator: Norėdami atlikti šį veiksmą turite bÅ«ti moderatoriumi. helper: time_future: Baigiasi po %{time}. time_past: Pasibaigė prieÅ¡ %{time} diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 661b2d29b..c9abc2fdb 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1,12 +1,14 @@ -# Messages for Latvian (LatvieÅ¡u) +# Messages for Latvian (latvieÅ¡u) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Cuu508 # Author: GreenZeb # Author: Karlis # Author: Lafriks +# Author: Nemo bis # Author: Papuass # Author: Raitisx +# Author: Ttdnet lv: activerecord: attributes: @@ -54,6 +56,7 @@ lv: message: Ziņojums node: Punkts node_tag: Punkta apzÄ«mējums + notifier: Paziņotājs old_node: Vecais punkts old_node_tag: Vecā punkta birka old_relation: Vecā relācija @@ -71,12 +74,18 @@ lv: tracetag: Trases birka user: Lietotājs user_preference: Lietāja iestatÄ«jums + user_token: Lietotāja tiesÄ«bas way: LÄ«nija way_node: LÄ«nijas punkts way_tag: LÄ«nijas apzÄ«mējums application: require_cookies: cookies_needed: Izskatā, ka jums cookies ir atslēgti, pirms turpināt, lÅ«dzu, ieslēdziet tos savā pārlÅ«kprogrammā. + require_moderator: + not_a_moderator: Tev nepiecieÅ¡ams bÅ«t moderatoram, lai izpildÄ«tu Å¡o darbÄ«bu. + setup_user_auth: + blocked: Tev ir liegta piekļuve API. LÅ«dzu autorizējies mājaslapas interfeisā, lai uzzinātu vairāk. + need_to_see_terms: Tava piekļuve API un laiku pārtraukta. LÅ«dzu autorizējies mājaslapas interfeisā, lai apskatÄ«tu Veidotāju Noteikumus. Tev nevajag piekrist, bet tev tie ir jāapskata. browse: changeset: changeset: "Izmaiņu kopa: %{id}" @@ -84,6 +93,7 @@ lv: feed: title: Izmaiņu kopa %{id} title_comment: Izmaiņu kopa %{id} - %{comment} + osmchangexml: osmChange XML title: Izmaiņu kopa changeset_details: belongs_to: "Pieder:" @@ -91,6 +101,17 @@ lv: box: kaste closed_at: "Slēgts:" created_at: "Izveidots:" + has_nodes: + one: "Ir sekojoÅ¡ais %{count} punkts:" + other: "Ir sekojoÅ¡ie %{count} punkti:" + has_relations: + one: "Ir sekjošā %{count} relācija:" + other: "Ir sekojošās %{count} relācijas:" + has_ways: + one: "Ir sekojoÅ¡ais %{count} ceļš:" + other: "Ir sekojoÅ¡ie %{count} ceļi:" + no_bounding_box: Nav saglabāta rāmja priekÅ¡ Å¡Ä«s izmaiņu kopas + show_area_box: RādÄ«t Apgabala Rāmi common_details: changeset_comment: "Komentārs:" deleted_at: "Izdzēsts:" @@ -104,6 +125,11 @@ lv: entry_role: Relācija %{relation_name} (kā %{relation_role}) map: deleted: Dzēsts + edit: + area: Rediģētu apgabalu + node: Rediģēt punktu + relation: Rediģēt relāciju + way: Rediģēt ceļu larger: area: SkatÄ«t apgabalu lielākā kartē node: SkatÄ«t punktu lielākā kartē @@ -131,15 +157,15 @@ lv: node_title: "Punkts: %{node_name}" view_history: skatÄ«t vēsturi node_details: - coordinates: "Koordinātes:" + coordinates: "Koordinātas:" part_of: "Daļa no:" node_history: - download: "%{download_xml_link} vai %{view_details_link}" download_xml: Lejupielādēt XML node_history: Punkta vēsture node_history_title: "Punkta vēsture: %{node_name}" view_details: skatÄ«t sÄ«kāku informāciju not_found: + sorry: Atvainojiet, %{type} ar id %{id} nevarēja atrast. type: changeset: izmaiņu kopa node: punkts @@ -148,8 +174,14 @@ lv: paging_nav: of: 'no' showing_page: Rāda lapu + redacted: + message_html: Versija %{version} no Å¡Ä« %{type} nevar tikt parādÄ«ta, jo tika rediģēta. LÅ«dzu apskati %{redaction_link} priekÅ¡ papildus informācijas. + redaction: Redakcijas %{id} + type: + node: punkts + relation: relācija + way: ceļš relation: - download: "%{download_xml_link} vai %{view_history_link}" download_xml: Lejupielādēt XML relation: Relācija relation_title: "Relācija: %{relation_name}" @@ -173,14 +205,18 @@ lv: view_data: SkatÄ«t datus paÅ¡reizējā kartes skatā start_rjs: data_frame_title: Dati - data_layer_name: Dati + data_layer_name: PārlÅ«kot kartes datus details: SÄ«kāka informācija + drag_a_box: Uzvelciet rāmi uz kartes, lai izvēlētos apgabalu edited_by_user_at_timestamp: Rediģēja [[user]] [[timestamp]] hide_areas: Paslēpt zonas history_for_feature: Vēsture [[feature]] load_data: Ielādēt datus + loaded_an_area_with_num_features: "JÅ«s esat ielādējis apgabalu, kurÅ¡ satur [[num_features]] iezÄ«mes. Pamatā, daži pārlÅ«ki var pārāk labi netikt galā ar šādu lielu datu kvantuma parādÄ«Å¡anu. Parasti, pārlÅ«ki tiek galā vislabāk rādot mazāk nekā 100 iezÄ«mes vienlaikus: jebkā cita darÄ«Å¡ana tos bremzē. Ja JÅ«s esat droÅ¡s, ka vēlaties attēlot Å¡os datus, JÅ«s tā varat izdarÄ«t spiežot pogu zemāk." loading: Ielādē… + manually_select: Manuāli izvēlēties citu apgabalu object_list: + api: IzgÅ«t Å¡o apgabalu no API back: ParādÄ«t objektu sarakstu details: SÄ«kāka informācija heading: Objektu saraksts @@ -198,7 +234,9 @@ lv: private_user: privāts lietotājs show_areas: RādÄ«t apgabalus show_history: RādÄ«t vēsturi + unable_to_load_size: "Nevar ielādēt: Apgabala rāmis [[bbox_size]], ir pārāk liels (jābÅ«t mazākam nekā %{max_bbox_size})" wait: Uzgaidiet ... + zoom_or_select: Tuvini vai atlasi kartes apgabalu, lai skatÄ«tu tag_details: tags: "Birkas:" wiki_link: @@ -206,25 +244,29 @@ lv: tag: Birkas %{key}=%{value} viki lapa wikipedia_link: "%{page} Å¡Ä·irklis Vikipēdijā" timeout: + sorry: Diemžēl dati %{type} ar id %{id}, prasÄ«ja pārāk daudz laika, lai ielādētu. type: changeset: izmaiņu kopa node: punkts relation: relācija way: lÄ«nija way: - download: "%{download_xml_link}, %{view_history_link} vai %{edit_link}" download_xml: Lejupielādēt XML - edit: rediģēt + edit: Labot ceļu view_history: skatÄ«t vēsturi way: LÄ«nija way_title: "LÄ«nija: %{way_name}" way_details: + also_part_of: + one: arÄ« daļa no ceļa %{related_ways} + other: arÄ« daļa no ceļiem %{related_ways} nodes: "Punkti:" part_of: "Daļā no:" way_history: download_xml: Lejupielādēt XML view_details: skatÄ«t sÄ«kāku informāciju way_history: LÄ«nijas vēsture + way_history_title: "Ceļa Vēsture: %{way_name}" changeset: changeset: anonymous: AnonÄ«ms @@ -247,20 +289,35 @@ lv: list: description: Pēdējās izmaiņas description_bbox: Izmaiņu kopas iekÅ¡ %{bbox} + description_friend: Tavu draugu izmaiņu kopas + description_nearby: Tuvējo lietotāju izmaiņu kopas description_user: Lietotāja %{user} izmaiņu kopas description_user_bbox: Lietotāja %{user} izmaiņu kopas iekÅ¡ %{bbox} heading: Izmaiņu kopas heading_bbox: Izmaiņu kopas + heading_friend: Izmaiņu kopas + heading_nearby: Izmaiņu kopas heading_user: Izmaiņu kopas heading_user_bbox: Izmaiņu kopas title: Izmaiņu kopas title_bbox: Izmaiņu kopas iekÅ¡ %{bbox} + title_friend: Tavu draugu izmaiņu kopas + title_nearby: Tuvējo lietotāju izmaiņu kopas title_user: Lietotāja %{user} izmaiņu kopas title_user_bbox: Lietotāja %{user} izmaiņu kopas iekÅ¡ %{bbox} timeout: sorry: Atvainojiet, jÅ«su pieprasÄ«to izmaiņu kopu ielāde prasÄ«ja pārāk daudz laika. diary_entry: + comments: + ago: "%{ago} atpakaļ" + comment: Komentārs + has_commented_on: "%{display_name} komentēja sekojoÅ¡os dienasgrāmatas ierakstus" + newer_comments: Jaunākie komentāri + older_comments: Vecāki komentāri + post: Publicēt + when: Kad diary_comment: + comment_from: Komentārs no %{link_user} @ %{comment_created_at} confirm: Apstiprināt hide_link: Paslēpt Å¡o komentāru diary_entry: @@ -271,6 +328,7 @@ lv: confirm: Apstiprināt edit_link: Rediģēt Å¡o ierakstu hide_link: Slēpt Å¡o ierakstu + posted_by: Ievietoja %{link_user} @ %{created} iekÅ¡ %{language_link} reply_link: Atbildēt uz Å¡o ierakstu edit: body: "Teksts:" @@ -285,8 +343,10 @@ lv: use_map_link: izmantot karti feed: all: + description: Pēdējie dienasgrāmatu ieraksti no OpenStreetMap lietotājiem title: OpenStreetMap dienasgrāmatu ieraksti language: + description: Neseno dienasgrāmatu ieraksti no OpenStreetMap lietotājiem iekÅ¡ %{language_name} title: OpenStreetMap dienasgrāmatas ieraksti valodā %{language_name} user: description: Neseni %{user} OpenStreetMap dienasgrāmatas ieraksti @@ -310,14 +370,12 @@ lv: new: title: Jauns dienasgrāmatas ieraksts no_such_entry: + body: Atvaino, Å¡eit nav dienasgrāmatas vai komentāra ar Å¡o id %{id}. LÅ«dzu, pārbaudiet pareizrakstÄ«bu vai varbÅ«t esat noklikÅ¡Ä·inājis uz saites, kura ir nepareiza. heading: "Nav ieraksta ar identifikatoru: %{id}" title: Dienasgrāmatas ieraksts nav atrasts - no_such_user: - heading: Lietotājs %{user} neeksistē - title: NeesoÅ¡s lietotājs view: leave_a_comment: IerakstÄ«t komentāru - login: Ieiet + login: Pieslēgties login_to_leave_a_comment: "%{login_link} lai komentētu" save_button: Saglabāt title: "%{user} dienasgrāmata | %{title}" @@ -339,6 +397,7 @@ lv: area_to_export: Kvadrants, kuru eksportēt embeddable_html: Ievietojams HTML kods export_button: Eksportēt + export_details: OpenStreetMap dati ir licencēta saskaņā ar <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 licenci</a>. format: Formāts format_to_export: Eksportēšanas formāts image_size: Attēla izmērs @@ -346,11 +405,15 @@ lv: licence: Licence longitude: "Garums:" manually_select: Manuāli izvēlēties citu teritoriju + map_image: Kartes attēls (parāda standarta slāni) max: lÄ«dz + options: Iespējas osm_xml_data: OpenStreetMap XML dati output: Izvade + paste_html: IelÄ«mēt HTML mājas lapā scale: Mērogs too_large: + body: Å is apgabals ir pārāk liels, lai to eksportētu kā OpenStreetMap XML datus. LÅ«dzu tuvini vai izvēlies mazāku apgabalu. heading: Apgabals pārāk liels zoom: Palielināt start_rjs: @@ -365,11 +428,14 @@ lv: description: title: geonames: AtraÅ¡anās vieta no <a href="http://www.geonames.org/">GeoNames</a> + osm_namefinder: "%{types} no <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>" osm_nominatim: AtraÅ¡anās vieta no <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> types: cities: Pilsētas places: Vietas towns: Pilsētas + description_osm_namefinder: + prefix: "%{distance} %{direction} no %{type}" direction: east: austrumi north: ziemeļi @@ -379,6 +445,10 @@ lv: south_east: dienvidaustrumi south_west: dienvidrietumi west: rietumi + distance: + one: apmēram 1km + other: apmēram %{count}km + zero: mazāk nekā 1km results: more_results: Vairāk rezultātu no_results: Nav atrasts neviens rezultāts @@ -391,18 +461,33 @@ lv: osm_nominatim: Rezultāti no <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> uk_postcode: Rezultāti no <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> us_postcode: Rezultāti no <a href="http://geocoder.us/">Geocoder.us</a> + search_osm_namefinder: + suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} no %{parentname})" + suffix_place: ", %{distance} %{direction} no %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Lidlauks + apron: Perons + gate: Vārti + helipad: Helikopteru nolaiÅ¡anās laukums + runway: Skrejceļš + taxiway: Manevrēšanas ceļš + terminal: Terminālis amenity: + WLAN: WiFi piekļuves punkts airport: Lidosta arts_centre: Mākslas centrs + artwork: Mākslas darbs atm: Bankomāts auditorium: Auditorija bank: Banka bar: Bārs + bbq: BBQ bench: Soliņš bicycle_parking: Velosipēdu novietne bicycle_rental: Velosipēdu noma + biergarten: Alus dārzs brothel: Bordelis bureau_de_change: ValÅ«tas maiņas punkts bus_station: Autoosta @@ -411,6 +496,7 @@ lv: car_sharing: Auto koplietoÅ¡ana car_wash: Automazgātava casino: Kazino + charging_station: Uzlādēšanas stacija cinema: Kino clinic: KlÄ«nika club: Klubs @@ -429,6 +515,7 @@ lv: ferry_terminal: Prāmju termināls fire_hydrant: Hidrants fire_station: Ugunsdzēsēju depo + food_court: Ēstuves fountain: StrÅ«klaka fuel: Degviela grave_yard: Kapsēta @@ -469,9 +556,12 @@ lv: shelter: Pajumte shop: Veikals shopping: IepirkÅ¡anās + shower: DuÅ¡as + social_centre: Sociālais centrs social_club: Sociālais klubs studio: Studija supermarket: Lielveikals + swimming_pool: Peldbaseins taxi: Taksometrs telephone: Publisks telefons theatre: Teātris @@ -486,46 +576,30 @@ lv: youth_centre: JaunieÅ¡u centrs boundary: administrative: AdministratÄ«vā robeža + census: SkaitÄ«Å¡anas robeža + national_park: Nacionālais parks + protected_area: Aizsargājamās teritorijas + bridge: + aqueduct: Akvedukts + suspension: Piekartitls + swing: Grozāmais Tilts + viaduct: Viadukts + "yes": Tilts building: - bunker: Bunkurs - chapel: Kapela - church: BaznÄ«ca - city_hall: Rātsnams - commercial: TirdzniecÄ«bas ēka - dormitory: KopmÄ«tnes - entrance: Ēkas ieeja - faculty: Fakultātes ēka - farm: SaimniecÄ«bas ēka - flats: DzÄ«vokļi - garage: Garāža - hall: Zāle - hospital: SlimnÄ«cas ēka - hotel: ViesnÄ«ca - house: Māja - industrial: RažoÅ¡anas ēka - office: Biroju ēka - public: Sabiedriskā ēka - residential: DzÄ«vojamā ēka - retail: MazumtirdzniecÄ«bas ēka - school: Skolas ēka - shop: Veikals - stadium: Stadions - store: Veikals - terrace: Terase - tower: Tornis - train_station: Dzelzceļa stacija - university: Universitātes ēka + "yes": Ēka highway: bridleway: Izjādes taka + bus_guideway: Vadāmais Autobuss bus_stop: Autobusa pietura byway: Blakusceļš construction: AutomaÄ£istrāle bÅ«vniecÄ«bas stadijā cycleway: Veloceliņš - distance_marker: Attāluma stabiņš emergency_access_point: Ārkārtas piekļuves punkts footway: Taka - gate: Vārti + ford: Fjords living_street: DzÄ«vojamā zona + milestone: Ceļa stabs + minor: OtrÅ¡Ä·irÄ«gs ceļš motorway: AutomaÄ£istrāle motorway_junction: AutomaÄ£istrāles krustojums motorway_link: AutomaÄ£istrāles pievedceļš @@ -536,11 +610,17 @@ lv: primary_link: Galvenais valsts ceļš raceway: SacensÄ«bu trase residential: DzÄ«vojamā + rest_area: AtpÅ«tas zona road: Ceļš secondary: Sekundāras nozÄ«mes ceļš secondary_link: Sekundāras nozÄ«mes ceļš + service: Servisa Ceļš + services: Ceļa AtpÅ«tas Vieta + speed_camera: Ātruma kamera steps: Pakāpieni + stile: Pakāpiens tertiary: PaÅ¡valdÄ«bu autoceļi + tertiary_link: PaÅ¡valdÄ«bu autoceļš track: Zemesceļš trail: Taka trunk: MaÄ£istrālais ceļš @@ -554,6 +634,7 @@ lv: building: Ēka castle: Pils church: BaznÄ«ca + fort: Forts house: Māja icon: Ikona manor: Muiža @@ -568,14 +649,17 @@ lv: wreck: Vraks landuse: allotments: Mazdārziņi + basin: Rezervuārs brownfield: AttÄ«rÄ«ts bÅ«vlaukums cemetery: Kapsēta commercial: TirdzniecÄ«bas zona + conservation: Saglabāšanas zona construction: BÅ«vlaukums farm: SaimniecÄ«ba farmland: SaimniecÄ«bas zeme farmyard: SaimniecÄ«bas pagalms forest: Mežs + garages: Garāžas grass: Zāle greenfield: Zaļā zona industrial: RÅ«pniecÄ«bas zona @@ -583,23 +667,28 @@ lv: meadow: Pļava military: Militārā zona mine: Raktuves - mountain: Kalns nature_reserve: Dabas rezervāts + orchard: Dārza zona park: Parks piste: SlēpoÅ¡anas trase - plaza: Tirgus laukums quarry: Karjers railway: Dzelzceļš + recreation_ground: AtpÅ«tas Zona reservoir: Ūdenskrātuve + reservoir_watershed: Rezervuāru Å«densÅ¡Ä·irtne residential: DzÄ«vojamā zona retail: MazumtirdzniecÄ«ba + road: Ceļa Apgabals + village_green: Ciema Centrālais Parks vineyard: VÄ«na dārzs wetland: Mitrājs wood: Mežs leisure: beach_resort: Pludmales kÅ«rorts + bird_hide: Putnu Slēptuve common: KoplietoÅ¡anas zeme fishing: Zvejas apgabals + fitness_station: Fitnesa Stacija garden: Dārzs golf_course: Golfa laukums ice_rink: Ledus halle @@ -610,11 +699,17 @@ lv: pitch: Sporta laukums playground: Spēļu laukums recreation_ground: AtpÅ«tas Zona + sauna: Pirts + slipway: Stāpelis sports_centre: Sporta centrs stadium: Stadions swimming_pool: Peldbaseins track: Skrejceļš water_park: Ūdens atrakciju parks + military: + airfield: Militārais lidlauks + barracks: Barakas + bunker: Bunkurs natural: bay: LÄ«cis beach: Pludmale @@ -622,9 +717,12 @@ lv: cave_entrance: Ieeja alā channel: Kanāls cliff: Klints - coastline: Piekrastes lÄ«nija crater: Krāteris + dune: Kāpa + feature: IezÄ«me + fell: Skandināvisks Kalns fjord: Fjords + forest: Mežs geyser: Geizers glacier: Ledājs heath: TÄ«relis @@ -644,6 +742,7 @@ lv: scrub: KrÅ«mājs shoal: Sēklis spring: Avots + stone: Akmens strait: JÅ«ras Å¡aurums tree: Koks valley: Ieleja @@ -652,6 +751,19 @@ lv: wetland: Mitrājs wetlands: Mitrājs wood: Mežs + office: + accountant: Grāmatvedis + architect: Arhitekts + company: Uzņēmums + employment_agency: NodarbinātÄ«bas aÄ£entÅ«ra + estate_agent: Nekustamā Ä«paÅ¡uma aÄ£ents + government: Valsts birojs + insurance: ApdroÅ¡ināšanas birojs + lawyer: Jurists + ngo: NGO Ofiss + telecommunication: Telekomunikāciju Ofiss + travel_agent: TÅ«risma aÄ£entÅ«ra + "yes": Birojs place: airport: Lidosta city: Pilsēta @@ -663,6 +775,7 @@ lv: houses: Mājas island: Sala islet: Saliņa + isolated_dwelling: Izolēta Mājvieta locality: Vieta moor: TÄ«relis municipality: PaÅ¡valdÄ«ba @@ -670,8 +783,10 @@ lv: region: ReÄ£ions sea: JÅ«ra state: Å tats + subdivision: SubdivÄ«zija suburb: Piepilsēta town: Pilsēta + unincorporated_area: Neiekļauts apgabals village: Ciems railway: abandoned: Pamests dzelzceļš @@ -682,18 +797,24 @@ lv: halt: Vilciena pietura historic_station: Vēsturiska dzelzceļa stacija junction: Dzelzceļa mezgls + level_crossing: VienlÄ«meņa kurstojums light_rail: Tramvaja sliedes + miniature: MiniatÅ«rais dzelzceļš monorail: Monosliede narrow_gauge: Å aursliežu dzelzceļš platform: Dzelzceļa perons preserved: Iekonservēts Dzelzceļš + spur: Dzelzceļa Atradze station: Dzelzceļa stacija subway: Metro stacija subway_entrance: Metro ieeja + switch: Dzelzceļa punkti tram: Tramvajs tram_stop: Tramvaja pietura + yard: Dzelzceļa Pagalms shop: - apparel: Apģērbu veikals + alcohol: Alkohola Veikals + antiques: Senlietas art: Mākslas salons bakery: MaiznÄ«ca beauty: Kosmētiskais salons @@ -702,21 +823,24 @@ lv: books: Grāmatu veikals butcher: Miesnieks car: Auto veikals - car_dealer: Auto tirgotājs car_parts: AutomaÅ¡Ä«nu rezerves daļas car_repair: Auto remonts carpet: Paklāju veikals charity: LabdarÄ«bas veikals + chemist: ĶīmiÄ·is clothes: Apģērbu veikals computer: Datorveikals confectionery: Konditorejas veikals + convenience: StÅ«ra Veikals copyshop: Kopētava cosmetics: Kosmētikas veikals department_store: Universālveikals - drugstore: Aptieka + discount: Atlaižu Veikals + doityourself: Dari-pats dry_cleaning: Ķīmiskā tÄ«rÄ«Å¡ana electronics: Elektronikas veikals estate_agent: Nekustamā Ä«paÅ¡uma aÄ£ents + farm: SaimniecÄ«bas Veikals fashion: Modes veikals fish: Zivju veikals florist: Florists @@ -724,10 +848,13 @@ lv: funeral_directors: ApbedÄ«Å¡anas birojs furniture: Mēbeles gallery: Galerija + garden_centre: Dārza centrs + general: Veikals gift: Dāvanu veikals greengrocer: Dārzeņu tirgotājs grocery: Pārtikas preču veikals hairdresser: Frizētava + hardware: SaimniecÄ«bas veikals hifi: Hi-Fi insurance: ApdroÅ¡ināšana jewelry: Juvelierizstrādājumu veikals @@ -738,8 +865,10 @@ lv: mobile_phone: Mobilo telefonu veikals motorcycle: Motociklu veikals music: MÅ«zikas veikals + newsagent: Laikrakstu Pārdevējs optician: Optikas veikals organic: BioloÄ£iskās pārtikas veikals + outdoor: Ārtelpu Veikals pet: Zooveikals photo: Fotoveikals salon: Salons @@ -750,17 +879,22 @@ lv: supermarket: Lielveikals toys: Rotaļlietu veikals travel_agency: TÅ«risma aÄ£entÅ«ra + video: Video veikals + wine: Alkohola Veikals tourism: alpine_hut: Kalnu bÅ«da artwork: Mākslas darbs attraction: Atrakcija bed_and_breakfast: Guļamvieta un brokastis + cabin: KabÄ«ne camp_site: Nometnes vieta caravan_site: Kempings + chalet: Kotedža guest_house: Viesu nams hostel: Hostelis hotel: ViesnÄ«ca information: Informācija + lean_to: Liekties uz motel: Motelis museum: Muzejs picnic_site: Piknika vieta @@ -768,10 +902,15 @@ lv: valley: Ieleja viewpoint: Skatu punkts zoo: ZooloÄ£iskais dārzs + tunnel: + "yes": Tunelis waterway: + artificial: MākslÄ«gais Å«densceļš boatyard: Jahtu piestātne canal: Kanāls + connector: Ūdensceļu savienotājs dam: Aizsprosts + derelict_canal: Pamests Kanāls ditch: Grāvis dock: Doks drain: Grāvis @@ -783,16 +922,25 @@ lv: river: Upe riverbank: Upes krasts stream: Strauts + wadi: Izkaltusi upes gultne + water_point: Ūdens punkts waterfall: Ūdenskritums weir: Dambis javascripts: map: base: cycle_map: Velokarte + standard: Standarta transport_map: Transporta karte site: + edit_disabled_tooltip: Pietuvini, lai rediģētu karti edit_tooltip: Rediģēt karti + edit_zoom_alert: Tev ir jāpietuvina, lai rediģētu karti + history_disabled_tooltip: Pietuvini, lai redzētu labojumus Å¡im apgabalam + history_tooltip: SkatÄ«t labojumus Å¡im apgabalam + history_zoom_alert: Tev ir jāpietuvina, lai redzētu labojumus Å¡im apgabalam layouts: + community: Kopiena community_blogs: Kopienas emuāri community_blogs_title: OpenStreetMap kopienas locekļu emuāri copyright: AutortiesÄ«bas un licence @@ -814,12 +962,17 @@ lv: history: Vēsture home: sākums home_tooltip: Doties uz sākumu - inbox: iesÅ«tne (%{count}) + inbox_tooltip: + one: Tavā iesÅ«tnē ir 1 nelasÄ«ts ziņojums + other: Tavā iesÅ«tnē ir %{count} nelasÄ«ti ziņojumi + zero: Tavā iesÅ«tnē nav nelasÄ«tu ziņojumu intro_1: OpenStreetMap ir atvērta, rediģējama visas pasaules karte. To veido tādi paÅ¡i cilvēki kā jÅ«s. - intro_2: OpenStreetMap ļauj skatÄ«t, rediģēt un lietot Ä£eogrāfiskus datus sadarbÄ«bā ar citiem lietotājiem, no jebkuras vietas pasaulē. - intro_3: OpenStreetMap serveru pakalpojumus laipni nodroÅ¡ina %{ucl} , %{ic} un %{bytemark}. Citi projekta atbalstÄ«tāji atrodami lapā %{partners}. - intro_3_ic: Londonas Impērijas koledža - intro_3_partners: viki + intro_2_create_account: Izveidot lietotāja kontu + intro_2_download: lejupielādēt + intro_2_html: Dati ir brÄ«vi %{download} un %{use} zem %{license}. %{create_account}, lai uzlabotu karti. + intro_2_license: Atvērtā licence + intro_2_use: izmanto + intro_2_use_url: http://wiki.openstreetmap.org/wiki/LV:tagging_guidelines license: title: OpenStreetMap dati ir licencēti ar Creative Commons Attribution-Share Alike 2.0 Generic licenci log_in: ieiet @@ -833,9 +986,14 @@ lv: title: Atbalstiet OpenStreetMap ar naudas ziedojumu osm_offline: OpenStreetMap datubāze Å¡obrÄ«d nav pieejama, tiek veikti svarÄ«gi datubāzes apkalpoÅ¡anas darbi. osm_read_only: OpenStreetMap datubāze Å¡obrÄ«d ir pieejama tikai-lasāmā režīmā, jo tiek veikti svarÄ«gi datubāzes apkalpes darbi. + partners_bytemark: Bytemark Hosting + partners_html: Servera vietu atblasta %{ucl}, %{ic} un %{bytemark}, un citi %{partners}. + partners_ic: Londonas Imperiālā Koledža + partners_partners: partneri + partners_ucl: UCL VR centrs + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: piereÄ£istrēties sign_up_tooltip: Izveidot kontu rediģēšanai - sotm2011: Nāciet uz 2011. gada OpenStreetMap konferenci "The State of the Map" 9. - 11. septembrÄ« Denverā! tag_line: Atvērtā Wiki pasaules karte user_diaries: Lietotāju dienasgrāmatas user_diaries_tooltip: SkatÄ«t lietotāju dienasgrāmatas @@ -850,9 +1008,33 @@ lv: english_link: angliskais oriÄ£ināls text: GadÄ«jumā, ja Å¡Ä« tulkotā lapa ir nesaskaņā ar %{english_original_link}, vērā jāņem un jāvadās no angliskās lapas title: Par Å¡o tulkojumu + legal_babble: + contributors_at_html: "<strong>Austrija</strong>: Ietver datus no\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (zem\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>)." + contributors_au_html: "<strong>Austrālija</strong>: Ietver pilsētu datus no\n Australian Bureau of Statistics data." + contributors_ca_html: "<strong>Kanāda</strong>: Ietver datus no\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), un StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_2_html: " Datu ievietoÅ¡ana OpenStreetMap nenozÄ«mē ka oriÄ£inālais\n datu avots sniedz atbalstu OpenStreetMap, dod garantiju, vai\n pieņem jebkādu atbildÄ«bu." + contributors_fr_html: "<strong>Francija</strong>: Ietver datus no\n Direction Générale des Impôts." + contributors_gb_html: "<strong>Apvienotā Karaliste</strong>: Satur Ordnance\n Survey datus © Crown copyright and database right\n 2010." + contributors_intro_html: "MÅ«su CC BY-SA licence pieprasa tev “dot OriÄ£inālajam\n Autoram atsauci saprātÄ«gu lÄ«dz vidēju vai veidu, ka Tu lieto\n ”. Individuāli OSM kartētāji nepieprasa\n atsauci pāri “OpenStreetMap\n veidotāji”, bet, kur dati no nacionālas kartēšanas aÄ£entÅ«ras\n vai cita nopietna avota ir iekļauti iekÅ¡\n OpenStreetMap, varētu bÅ«t saprātÄ«gi uz viņiem atsaukties tieÅ¡i\n reproducējot viņu atsauci vai iesaitējot uz Å¡o lapu." + contributors_nl_html: "<strong>NÄ«derlande</strong>: Satur © AND data, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Jaunzēlande</strong>: Ietver datus no\n Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polija</strong>: Ietver datus no <a\n href=\"http://ump.waw.pl/\">UMP-pcPL kartes</a>. AutortiesÄ«bas\n UMP-pcPL veidotāji.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Vairāk par OSM' UMP datu lietojumu</a>" + contributors_title_html: MÅ«su veidotāji + contributors_za_html: "<strong>Dienvidāfrika</strong>: Ietver datus no\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: "Ja Tu lieto OpenStreetMap kartes bildes, mēs pieprasām ka\n tava atsaucē ir vismaz “© OpenStreetMap\n veidotāji, CC BY-SA”. Ja tu izmanto tikai kartes datus,\n mēs pieprasām “Kartes dati © OpenStreetMap veidotāji,\n CC BY-SA”." + credit_2_html: "Kur iespējams, OpenStreetMap vajadzētu bÅ«t iesaitētam uz <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n un CC BY-SA uz <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Ja\n tu lieto mediju, kur saites nav iespējamas (piem. \n printēts darbs), mēs iesakām pārsÅ«tÄ«t savus lasÄ«tājus uz\n www.openstreetmap.org (piemēram paplaÅ¡inot\n ‘OpenStreetMap’ uz pilno adresi) un uz\n www.creativecommons.org." + credit_title_html: Kā atsaukties uz OpenStreetMap + intro_1_html: " OpenStreetMap ir <i>atvērti dati</i>, licencēti zem <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> licences (CC BY-SA)." + intro_2_html: " Tu vari kopēt, izplatÄ«t, nosÅ«tÄ«t un adaptēt mÅ«su kartes\n un datus, kamēr tu atsaucies uz OpenStreetMap un tās\n veidotājiem. Ja tu maini vai veido uz mÅ«su kartēm, tu\n vari izplatÄ«t rezultātu tikai zem tās paÅ¡as licences. Pilns\n <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiskais kods</a> izskaidro tavas tiesÄ«bas un pienākumus." + more_1_html: " Lasi vairāk par mÅ«su datu izmantoÅ¡anu <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Juridiskajā\n FAQ</a>." + more_2_html: "OSM veidotājiem tiek atgādināts nievietot datus no\n ar autortiesÄ«bām aizsargātām vietām (piem. Google Maps vai drukātas kartes) bez\n skaidri izteiktas atļaujas no autortiesÄ«bu turētājiem." + more_3_html: "Lai arÄ« OpenStreetMap ir atvērti dati, mēs nevaram piedāvāt\n bezmaksas karÅ¡u API treÅ¡o puÅ¡u izstrādātājiem.\n\n SkatÄ«t mÅ«su <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API LietoÅ¡anas Politiku</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Flīžu LietoÅ¡anas Politiku</a>\n and <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim L:ietoÅ¡anas Politiku</a>." + more_title_html: Uzzināt vairāk + title_html: AutortiesÄ«bas un Licence native: mapping_link: sākt kartēt native_link: latviskā versija + text: Tu skaties anglisko versiju autortiesÄ«bām. Tu vari doties atpakaļ uz %{native_link} Å¡ai lapai vai Tu vari beigt lasÄ«t par autortiesÄ«bām un %{mapping_link}. title: Par Å¡o lapu message: delete: @@ -860,8 +1042,15 @@ lv: inbox: date: Datums from: 'No' + messages: Jums ir %{new_messages} un %{old_messages} my_inbox: Mana iesÅ«tne + new_messages: + one: "%{count} jauna ziņa" + other: "%{count} jaunas ziņas" no_messages_yet: Jums vēl nav ziņojumu. Kāpēc gan nesazināties ar kādu no %{people_mapping_nearby_link}? + old_messages: + one: "%{count} veca ziņa" + other: "%{count} vecas ziņas" outbox: izsÅ«tne people_mapping_nearby: cilvēkiem, kuri zÄ«mē karti tavā apkaimē subject: Temats @@ -887,14 +1076,14 @@ lv: body: Atvainojiet, ziņa ar norādÄ«to identifikatoru nav atrodama. heading: NeesoÅ¡a ziņa title: NeesoÅ¡a ziņa - no_such_user: - body: Atvainojiet, lietotājs ar norādÄ«to vārdu nav atrodams. - heading: NeesoÅ¡s lietotājs - title: NeesoÅ¡s lietotājs outbox: date: Datums inbox: iesÅ«tne + messages: + one: Tev ir %{count} nosÅ«tÄ«ta ziņa + other: Tev ir %{count} nosÅ«tÄ«tas ziņas my_inbox: Mana %{inbox_link} + no_sent_messages: Tev paÅ¡laik nav ziņojumu. Kāpēc nesazināties ar kādu no %{people_mapping_nearby_link}? outbox: izsÅ«tne people_mapping_nearby: cilvēki kartē tuvā apkārtnē subject: Temats @@ -912,6 +1101,9 @@ lv: title: LasÄ«t ziņu to: Kam unread_button: AtzÄ«mēt kā nelasÄ«tu + wrong_user: JÅ«s esat autorizējies kā `%{user}', bet ziņojums, kuru vēlaties izlasÄ«t, nav sÅ«tÄ«ts Å¡im lietotājam. LÅ«dzu autorizējaties kā pareizais lietotājs, lai izlasÄ«tu to. + reply: + wrong_user: Tu esi autorizējies kā `%{user}', bet ziņojums, kuram tu vēlies atbildēt, nav sÅ«tÄ«ts Å¡im lietotājam. LÅ«dzu autorizējies, kā pareizais lietotājs, lai atbildētu. sent_message_summary: delete_button: Dzēst notifier: @@ -932,6 +1124,9 @@ lv: hopefully_you_1: Kāds (cerams, jÅ«s) vēlas nomainÄ«t savu e-pasta adresi hopefully_you_2: "%{server_url} uz %{new_address}." friend_notification: + befriend_them: JÅ«s variet viņus arÄ« pievienot par draugiem %{befriendurl}. + had_added_you: "%{user} pievienoja jÅ«s kā draugu OpenStreetMap." + see_their_profile: JÅ«s variet redzēt viņu profilu %{userurl}. subject: "[OpenStreetMap] %{user} pievienoja JÅ«s kā draugu" gpx_notification: and_no_tags: bez birkām. @@ -959,19 +1154,27 @@ lv: hopefully_you_1: Kāds (iespējams, jÅ«s) ir vēlējies atiestatÄ«t paroli Å¡Ä«s hopefully_you_2: e-pasta adreses openstreetmap.org kontam. message_notification: + footer1: JÅ«s varat izlasÄ«t ziņojumu arÄ« %{readurl} + footer2: un jÅ«s variet atbildēt %{replyurl} header: "OpenStreetMap lietotājs %{from_user} ir jums nosÅ«tÄ«jis ziņu ar tematu %{subject}:" hi: Sveiks %{to_user}, signup_confirm: subject: "[OpenStreetMap] Apstipriniet savu e-pasta adresi" signup_confirm_html: + ask_questions: Tu vari jautāt jebkurus jautājumus par OpenStreetMap mÅ«su <a href="http://help.openstreetmap.org/">jautājumu un atbilžu lapā</a>. click_the_link: Ja tas esat jÅ«s, laipni aicināti! LÅ«dzu klikÅ¡Ä·iniet uz zemāk esošās saites lai apstiprinātu lietotāja kontu un uzzinātu vairāk par OpenStreetMap + current_user: Saraksts ar paÅ¡reizējiem lietotājiem kategorijās, pamatojoties uz to, kur tie atrodas pasaulē, ir pieejams no <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>. + get_reading: Izlasi par OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">iekÅ¡ wiki</a>, panāc ar jaunākajām ziņām, izmantojot <a href="http://blog.openstreetmap.org/">OpenStreetMap blogu</a> vai <a href="http://twitter.com/openstreetmap">Twitter</a>, vai pārlÅ«ko caur OpenStreetMap dibinātāja Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blogu</a> priekÅ¡ projekta vēstures, kuram ir <a href="http://www.opengeodata.org/?cat=13">podcasti, kurus klausÄ«ties</a>! greeting: Sveicināti! hopefully_you: Kāds (cerams, jÅ«s) vēlas izveidot lietotāja kontu introductory_video: Iespējams noskatÄ«ties %{introductory_video_link}. more_videos: Ir vēl citi %{more_videos_link}. more_videos_here: video Å¡eit + user_wiki_page: Ir ieteicams izveidot lietotāja wiki lapu, kas satur kategoriju birkas, norādot, kur tu esi, piemēram <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>. video_to_openstreetmap: video, kas iepazÄ«stina ar OpenStreetMap + wiki_signup: Tu varētu arÄ« vēlēties <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">piereÄ£istrēties OpenStreetMap wiki</a>. signup_confirm_plain: + ask_questions: "Tu vari jautāt jebkurus jautājumus par OpenStreetMap mÅ«su jautājumu un atbilžu lapā:" blog_and_twitter: "Sekojiet jaunumiem OpenStreetMap emuārā un Twitter:" click_the_link_1: Ja tas esat jÅ«s, laipni aicināti! LÅ«dzu sekojiet saitei zemāk lai apstiprinātu savu click_the_link_2: lietotāja kontu un uzzinātu vairāk par OpenStreetMap. @@ -983,6 +1186,9 @@ lv: more_videos: "Å eit ir vēl citi video:" opengeodata: "OpenGeoData.org ir OpenStreetMap dibinātāja StÄ«va Kousta emuārs, tajā ir arÄ« podraides:" the_wiki: "Lasiet par OpenStreetMap mÅ«su viki:" + user_wiki_1: Tas ir ieteicams, ka tu izveido sava lietotāja wiki lapu, kura satur + user_wiki_2: kategoriju tagus, norādot, kas tu esi, kā piemēram [[Category:Users_in_London]]. + wiki_signup: Tu arÄ« varētu vēlēties piereÄ£istrēties mÅ«su OpenStreetMap wiki, Å¡eit oauth: oauthorize: allow_read_gpx: lasÄ«t jÅ«su privātās GPS trases. @@ -992,22 +1198,39 @@ lv: allow_write_diary: izveidot dienasgrāmatas ierakstus, komentārus un norādÄ«t draugus. allow_write_gpx: augÅ¡upielādēt GPS trases. allow_write_prefs: mainÄ«t jÅ«su lietotāja iestatÄ«jumus. + request_access: Aplikācija %{app_name} pieprasa pieeju tavas lietotājam, %{user}. LÅ«dzu pārbaudi, vai tu vēlies, lai aplikācijai bÅ«tu sekojošās iespējas. Tu vari izvēlēties cik daudz vai maz tu vēlies. + revoke: + flash: Tu esi atsaucis pilnvaru priekÅ¡ %{application} oauth_clients: + create: + flash: VeiksmÄ«gi reÄ£istrēja informāciju + destroy: + flash: IznÄ«cināja klienta aplikācijas reÄ£istrāciju edit: submit: Rediģēt + title: Rediģē savu pieteikumu form: allow_read_gpx: lasÄ«t savas privātās GPS trases. + allow_read_prefs: lasÄ«t viņa lietotāja uzstāījumus. allow_write_api: labot karti. + allow_write_diary: veidot dienasgrāmatas ierakstus, komentārus un veidot draugus. allow_write_gpx: augÅ¡upielādēt GPS trases. + allow_write_prefs: mainÄ«t viņa lietotāja uzstādÄ«jumus. + callback_url: AtzvanÄ«Å¡anas URL name: Nosaukums + requests: "Pieprasa sekojošās atļaujas no lietotāja:" required: Obligāts support_url: Atbalsta URL + url: Galvenais Aplikācijas URL index: application: Programmas nosaukums issued_at: Izdots + list_tokens: "Sekojošās pilnvaras ir izsniegtas aplikācijām uz JÅ«su vārda:" my_apps: Manas klienta programmas my_tokens: Manas autorizētās aplikācijas + no_apps: Vai tev ir aplikācija, kuru tu vēlētos reÄ£istrēt lietoÅ¡anai ar mums lietojot %{oauth} standartu? Tev nepiecieÅ¡ams reÄ£istrēt savu aplikāciju pirms tā var veikt OAuth pieprasÄ«jumus Å¡im servisam. register_new: ReÄ£istrēt savu aplikāciju + registered_apps: "Tev ir reÄ£istrētas sekojošās klientu aplikācijas:" revoke: Atsaukt! title: Manas OAuth detaļas new: @@ -1016,23 +1239,76 @@ lv: not_found: sorry: Atvainojiet, Å¡is %{type} nav atrasts. show: + access_url: "Piekļuves pilnvaras URL:" + allow_read_gpx: lasÄ«t viņu privātās GPS trases. + allow_read_prefs: lasÄ«t lietotāja uzstādÄ«jumus. allow_write_api: labot karti. + allow_write_diary: veidot dienasgrāmatas ierakstus, komentārus un veidot draugus. allow_write_gpx: augÅ¡upielādēt GPS ceļus. + allow_write_prefs: mainÄ«t lietotāja uzstādÄ«jumus. + authorize_url: "Autorizēšanas URL:" + confirm: Vai esat pārliecināts? + delete: Dzēst klientu + edit: Labot detaļas key: "Patērētāja atslēga:" + requests: "PieprasÄ«t sekojošās atļaujas no lietotāja:" secret: "Patērētāja noslēpums:" + support_notice: Mēs atbalstām HMAC-SHA1 (ieteicams) kā arÄ« vienkārÅ¡u tekstu iekÅ¡ SSL režīma. title: OAuth detaļas %{app_name} + url: "PieprasÄ«juma pilnvaru URL:" update: flash: Klienta informācija atjaunināta veiksmÄ«gi + redaction: + create: + flash: Redakcija izveidota. + destroy: + error: IznÄ«cinot Å¡o redakciju, radās kļūda. + flash: Redakcija iznÄ«cināta. + not_empty: Redakcija nav tukÅ¡a. LÅ«dzu at-rediģē visas versijas, kuras pieder Å¡ai redakcijai, pirms tu viņu iznÄ«cini. + edit: + description: Apraksts + heading: Labot redakciju + submit: Saglabāt redakciju + title: Labot redakciju + index: + empty: Nav redakciju, ko parādÄ«t. + heading: Redakciju saraksts + title: Redakciju saraksts + new: + description: Apraksts + heading: Ievadi informāciju jaunajai redakcijai + submit: Izveidot redakciju + title: Jaunas redakcijas veidoÅ¡ana + show: + confirm: Vai esat pārliecināts? + description: "Apraksts:" + destroy: 'Noņemt Å¡o redakciju' + edit: Labot Å¡o redakciju + heading: Rāda redakciju "%{title}" + title: Rāda redakciju + user: "Veidotājs:" + update: + flash: Izmaiņas ir saglabātas. site: edit: + anon_edits_link_text: Uzzini, kāpēc tā notiek. flash_player_required: Jums nepiecieÅ¡ams Flash playeris lai izmantotu Potlatch - OpenStreetMap Flash redaktoru. JÅ«s varat <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Lejupielādēt Flash Player no Adobe.com</a>. OpenStreetMap rediģēšanai ir pieejamas arÄ«<a href="http://wiki.openstreetmap.org/wiki/Editing">vairākas citas iespējas</a> . + no_iframe_support: Tavs pārlÅ«ks neatbalsta HTML rāmjus, kas ir nepiecieÅ¡ami Å¡ai iezÄ«mei. + not_public: Tu neesi iestādÄ«jis, lai tavi labojumi bÅ«tu publiski. + not_public_description: Tu vairs nevari rediģēt karti, ja vien tā neizdari. Tu vari uzstādÄ«t savus labojumus kā publiskus no savas %{user_page}s. + potlatch2_not_configured: Potlatch 2 nav konfigurēts - lÅ«dzu apskati http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 lai iegÅ«tu vairāk informācijas + potlatch2_unsaved_changes: Tev ir nesaglabātas izmaiņas. (Lai saglabātu iekÅ¡ Potlach 2, tev ir jāspiež saglabāt.) + potlatch_unsaved_changes: Tev ir nesaglabātas izmaiņas. (Lai saglabātu iekÅ¡ Potlatch, tev ir jānoņem atlase no esošā ceļa vai punkta, ja labojiet tieÅ¡raides režīmā, vai spiediet saglabāt, ja Jums ir Saglabāt poga.) user_page_link: lietotāja lapa index: js_1: Vai nu jÅ«s lietojat pārlÅ«kprogrammu, kas neatbalsta JavaScript, vai arÄ« jÅ«su pārlÅ«kprogrammā JavaScript ir atslēgts. js_2: OpenStreetMap kartes rādÄ«Å¡anai lieto JavaScript. license: + license_name: Creative Commons Attribution-Share Alike 2.0 + notice: Licencēts zem %{license_name} licences, pēc %{project_name} un tā atbalstÄ«tājiem. project_name: OpenStreetMap projekts permalink: PastāvÄ«gā saite + remote_failed: Rediģēšana neizdevās - pārbaudi, ka JOSM vai Merkaartor ir ielādēts un attālinātās vadÄ«bas iespēja ir aktivizēta shortlink: Īsā saite key: map_key: ApzÄ«mējumi @@ -1083,6 +1359,7 @@ lv: retail: MazumtirdzniecÄ«bas zona runway: - Lidostas skrejceļš + - manevrēšanas ceļš school: - Skola - universitāte @@ -1102,6 +1379,23 @@ lv: unclassified: Neklasificēts ceļš unsurfaced: Ceļš bez seguma wood: Pirmatnējs mežs + markdown_help: + alt: Alt teksts + first: Pirmais vienums + heading: Virsraksts + headings: Virsraksti + image: Attēls + link: Saite + ordered: Sakārtots saraksts + second: Otrais vienums + subheading: ApakÅ¡virsraksts + text: Teksts + title_html: Parsēts ar <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Nesakārtots saraksts + url: URL + richtext_area: + edit: Labot + preview: PriekÅ¡skatÄ«jums search: search: Meklēt search_help: "piemēri: 'Valmiera', 'Mazā kalna iela, RÄ«ga', 'LV-1010' vai 'post offices near Liepāja' <a href='http://wiki.openstreetmap.org/wiki/Search'>vairāk piemēru...</a>" @@ -1111,6 +1405,9 @@ lv: sidebar: close: Aizvērt search_results: Meklēšanas rezultāti + time: + formats: + friendly: "%e %B %Y @ %H:%M" trace: create: trace_uploaded: JÅ«su GPX fails ir augÅ¡upielādēts un gaida iekļauÅ¡anu datubāzē. Tas parasti notiek apmēram pusstundas laikā. Jums tiks nosÅ«tÄ«ts e-pasts, kad Å¡is uzdevums bÅ«s pabeigts. @@ -1120,7 +1417,7 @@ lv: edit: description: "Apraksts:" download: lejupielādēt - edit: rediģēt + edit: labot filename: "Faila nosaukums:" heading: Rediģē trasi %{name} map: karte @@ -1141,19 +1438,19 @@ lv: your_traces: JÅ«su GPS trases make_public: made_public: Trase padarÄ«ta publiska - no_such_user: - body: Atvaino, nav tāda lietotāja %{user}. LÅ«dzu, pārbaudi pareizrakstÄ«bu. Iespējams saite uz kuru noklikÅ¡Ä·ināji ir nepareiza. - heading: Lietotājs %{user} neeksistē - title: NeesoÅ¡s lietotājs + offline: + heading: GPX bezsaistes glabātuve + message: GPX datņu glabātuve un augÅ¡upielādes sistēma paÅ¡laik nav pieejama. offline_warning: message: GPX failu augÅ¡upielādes sistēma paÅ¡laik nav pieejama trace: ago: pirms %{time_in_words_ago} by: 'no' count_points: "%{count} punkti" - edit: rediģēt + edit: labot edit_map: Rediģēt karti identifiable: IDENTIFICĒJAMS + in: iekÅ¡ map: karte more: vairāk pending: RINDĀ @@ -1174,18 +1471,17 @@ lv: trace_header: see_all_traces: SkatÄ«t visas trases see_your_traces: SkatÄ«t tikai jÅ«su trases + traces_waiting: Tev ir %{count} trases, kuras gaida augÅ¡upielādi. LÅ«dzu apsver uzgaidÄ«Å¡anu pirms augÅ¡upielādē vēl, lai nenobloķētu rindu citiem lietotājiem. upload_trace: AugÅ¡upielādēt trasi trace_optionals: tags: Birkas trace_paging_nav: - next: Nākamā » - previous: « Iepriekšējā showing_page: Rāda lapu %{page} view: delete_track: Dzēst Å¡o trasi description: "Apraksts:" download: lejupielādēt - edit: rediģēt + edit: labot edit_track: Rediģēt Å¡o trasi filename: "Faila nosaukums:" heading: Trase %{name} @@ -1200,14 +1496,25 @@ lv: trace_not_found: Trase nav atrasta! uploaded: "AugÅ¡upielādēts:" visibility: "RedzamÄ«ba:" + visibility: + identifiable: Identificējams (rādÄ«ts traÅ¡u sarakstā un identificējams, sakārtoti punkti ar laika nospiedumiem) + private: Privāts (kopÄ«gots kā anonÄ«ms, nesakārtoti punkti) + public: Publisks (rādÄ«t traÅ¡u sarakstā un kā anonÄ«ms, nesakārtoti punkti) + trackable: Izsekojams (kopÄ«gots kā anonÄ«ms, nesakārtoti punkti ar laika nospiedumiem) user: account: contributor terms: + agreed: Tu esi pieņēmis jaunos Veidotāju Noteikumus. + agreed_with_pd: Tu arÄ« esi paziņojis, ka tavi labojumi var bÅ«t Publiskajā Domēnā. + heading: "Devuma Noteikumi:" link text: kas tas ir? + not yet agreed: Tu vēl neesi piekritis jaunajiem Veidotāju Noteikumiem + review link text: LÅ«dzu sekojiet Å¡ai saitei un izskatiet un pieņemiet jaunos Veidotāju Noteikumus. current email address: "PaÅ¡reizējā e-pasta adrese:" delete image: Novākt paÅ¡reizējo attēlu email never displayed publicly: (nekad netiek rādÄ«ta publiski) flash update success: Lietotāja informācija veiksmÄ«gi atjaunināta. + flash update success confirm needed: Lietotāja informācija veiksmÄ«gi atjaunota. Pārbaudi e-pastu, lai apstiprinātu savu jauno e-pasta adresi. home location: "Māju atraÅ¡anās vieta:" image: "Attēls:" image size hint: (vislabāk der kvadrātveida attēli vismaz 100x100 izmērā) @@ -1219,10 +1526,15 @@ lv: new email address: "Jauna e-pasta adrese:" new image: Pievienot attēlu no home location: JÅ«s neesat norādÄ«jis mājas atraÅ¡anās vietu. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: Kas tas ir? + openid: "OpenID:" preferred editor: "Vēlamais redaktors:" preferred languages: "Vēlamās valodas:" profile description: "Profila apraksts:" public editing: + disabled: Atspējots un nevar labot datus, visi iepriekšējie labojumi ir anonÄ«mi. disabled link text: Kāpēc nevar rediģēt? enabled: Ieslēgts. Nav anonÄ«ms, un var rediģēt datus. enabled link: http://wiki.OpenStreetMap.org/wiki/Anonymous_edits @@ -1230,41 +1542,88 @@ lv: heading: "Publiska rediģēšana:" public editing note: heading: Publiska rediģēšana + text: PaÅ¡laik tavi labojumi ir anonÄ«mi un cilvēki nevar nosÅ«tÄ«t tev ziņojumus vai redzēt tavu atraÅ¡anās vietu. Lai parādÄ«tu, ko tu esi labojis un ļautu cilvēkiem sazināties ar tevi caur mājaslapu, spied uz pogu zemāk. <b>KopÅ¡ 0.6 API nomaiņas, tikai publiski lietotāji var labot karti</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">uzzini kāpēc</a>). <ul><li>Tava e-pasta adrese netiks atklāta, ja kļūsi publisks.</li><li>Å o darbÄ«bu nevar atgriezt un visi jaunie lietotāji ir publiski pēc noklusējuma. replace image: Aizstāt paÅ¡reizējo attēlu return to profile: Atgriezties pie profila save changes button: Saglabāt izmaiņas title: Rediģēt kontu update home location on click: Atjaunināt māju atraÅ¡anās vietu, noklikÅ¡Ä·inot uz kartes? confirm: + already active: Å is lietotājs jau ir apstiprināts. + before you start: Mēs zinām, ka jÅ«s esat steigā, lai sāktu kartēt, bet pirms tam, Tu varētu vēlēties aizpildÄ«t nedaudz informācijas par sevi formā zemāk. button: Apstiprināt heading: Apstipriniet lietotāja kontu + press confirm button: Spied pieņemÅ¡anas pogu zemāk, lai aktivizētu savu lietotāju. + reconfirm: Ja ir pagājis jau kāds laiciņš pirms tu reÄ£istrējies, tev varētu bÅ«t nepiecieÅ¡ams <a href="%{reconfirm}">atsÅ«tÄ«t jaunu pārbaudes e-pastu</a>. success: JÅ«su e-pasta adrese ir apstiprināta, paldies par reÄ£istrēšanos! + unknown token: Å Ä« pilnvara nepastāv. confirm_email: button: Apstiprināt + failure: E-pasta adrese jau ir apstiprināta ar Å¡o pilnvaru. heading: Apstiprināt e-pasta adreses maiņu + press confirm button: Spied uz apstiprināšanas pogu zemāk, lai apstiprinātu savu jauno e-pasta adresi. success: JÅ«su e-pasta adrese ir apstiprināta, paldies par reÄ£istrēšanos! confirm_resend: failure: Lietotājs %{name} nav atrasts. + success: Mēs nosÅ«tÄ«jām jaunu pārbaudes e-pastu uz %{email} un tiklÄ«dz tu apstiprināsi savu lietotāju, tu varēti kartēt.<br /><br />Ja tu lieto pretmēstuļu sistēmu, kura nosÅ«ta pārbaudes pieprasÄ«jumus, tad pārliecinies, ka esi ielicis webmaster@openstreetmap.org baltajā sarakstā, jo mēs nevaram atbildēt uz pārbaudes pieprasÄ«jumiem. filter: not_an_administrator: Jums jābÅ«t administratoram, lai veiktu Å¡o darbÄ«bu. + go_public: + flash success: Visi tavi labojumi tagad ir publiski, un tu drÄ«ksti labot. list: + confirm: Apstiprināt atlasÄ«tos lietotājus empty: Nav atrasti atbilstoÅ¡i lietotāji heading: Lietotāji hide: Paslēpt atlasÄ«tos lietotājus + showing: + one: Rāda lapu %{page} (%{first_item} no %{items}) + other: Rāda lapu %{page} (%{first_item}-%{last_item} no %{items}) + summary: "%{name} izveidoja no %{ip_address} @ %{date}" + summary_no_ip: "%{name} izveidoja @ %{date}" title: Lietotāji login: + account is suspended: Atvainojiet, tavs lietotājs ir bloķētā stāvoklÄ« apÅ¡aubāmas aktivitātes dēļ.<br />LÅ«dzu kontaktējies ar <a href="%{webmaster}">tÄ«mekļa pārzini</a>, ja tu vēlies Å¡o diskutēt. + account not active: Atvainojiet, tavs lietotājs vēl nav aktÄ«vs.<br />LÅ«dzu izmanto saiti lietotāja pārbaudes e-pastā, lai aktivizētu savu lietotāju, vai <a href="%{reconfirm}">pieprasi jaunu pārbaudes e-pastu</a>. auth failure: Diemžēl nevarēja ieiet ar Å¡iem datiem create account minute: Izveidojiet kontu. Tas aizņem mazāk par minÅ«ti. email or username: "E-pasta adrese vai lietotājvārds:" - heading: Ieiet - login_button: Ieiet + heading: Pieslēgties + login_button: Pieslēgties lost password link: Aizmirsi paroli? + new to osm: Jauns iekÅ¡ OpenStreetMap? + no account: Nav lietotāja? + notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Uzzini vairāk par OpenStreetMap tuvojoÅ¡os licences maiņu</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">tulkojumi</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskusija</a>) + notice_terms: OpenStreetMap pārceļas uz jaunu licenci 1. aprÄ«lÄ« 2012. gadā. Tā ir tikpat atvērta kā esošā, bet juridiskās detaļas ir labāk saderÄ«gas ar mÅ«su karÅ¡u datubāzi. Mēs vēlētos tavu devumu OpenStreetMap paturēt, bet mēs to varam izdarÄ«t tikai tad, ja Tu ļauj mums tos izplatÄ«t zem jaunās licences. Citādāk, mums nāksies tos noņemt no datubāzes.<br /><br />LÅ«dzu autorizējies, tad atvēli dažas sekundes, lai pārskatÄ«tu un pieņemtu jaunos nosacÄ«jumus. Paldies! openid: "%{logo} OpenID:" + openid invalid: Atvaino, Å¡Ä·iet, ka tavs OpenID ir izkropļots + openid missing provider: Atvaino, nevar sazināties ar tavu OpenID sniedzēju + openid_logo_alt: Pieteikties ar OpenID + openid_providers: + aol: + alt: Pieteikties ar AOL OpenID + title: Pieteikties ar AOL + google: + alt: Pieteikties ar Google OpenID + title: Pieteikties ar Google + myopenid: + alt: Pieteikties ar myOpenID OpenID + title: Pieteikties ar myOpenID + openid: + alt: Pieteikties ar OpenID URL + title: PieteikÅ¡anās, izmantojot OpenID + wordpress: + alt: Pieteikties ar Wordpress OpenID + title: Pieteikties ar Wordpress + yahoo: + alt: Pieteikties ar Yahoo OpenID + title: Pieteikties ar Yahoo password: "Parole:" register now: ReÄ£istrēties remember: "Atcerēties mani:" - title: Ieiet + title: Pieslēgties to make changes: Lai veiktu izmaiņas OpenStreetMap datos, jums jābÅ«t savam kontam. + with openid: "AlternatÄ«vi, lÅ«dzu lieto savu OpenID, lai autorizētos:" + with username: "Jau ir OpenStreetMap lietotājs? LÅ«dzu autorizējies ar savu lietotājvārdu un paroli:" logout: heading: Iziet no OpenStreetMap logout_button: Iziet @@ -1272,8 +1631,10 @@ lv: lost_password: email address: "E-pasta adrese:" heading: Aizmirsi paroli? + help_text: Ievadiet e-pasta adresi, kuru izmantojāt, lai reÄ£istrētos, mēs Jums nosÅ«tÄ«sim saiti uz to, lai JÅ«s varētu atjaunot savu paroli. new password button: AtiestatÄ«t paroli notice email cannot find: Atvaino, nevaru atrast Å¡o epasta adresi. + notice email on way: Atvaino, tu to pazaudēji :-( , bet e-pasts jau ir ceļā, lai tu viņu drÄ«z varētu atjaunot. title: Aizmirsāt paroli make_friend: already_a_friend: JÅ«s jau esat draugos ar %{name}. @@ -1282,16 +1643,27 @@ lv: new: confirm email address: "Apstipriniet e-pasta adresi:" confirm password: "Parole (pārbaudei):" + contact_webmaster: LÅ«dzu kontaktējies ar <a href="mailto:webmaster@openstreetmap.org">tÄ«mekļa pārzini</a>, lai organizētu lietotāja izveidi - mēs centÄ«simies un tiksim galā ar tavu pieprasÄ«jumu, cik ātri vien iespējams. continue: Turpināt display name: "Rādāmais vārds:" display name description: Vārds, kas tiks rādÄ«ts publiski. JÅ«s to vēlāk varēsiet izmainÄ«t iestatÄ«jumos. email address: "E-pasta adrese:" + fill_form: Aizpildi Å¡o formu un mēs tev nosÅ«tÄ«sim ātru e-pastu, lai aktivizētu tavu lietotāju. + flash create success message: Paldies, ka reÄ£istrējies. Mēs tev nosÅ«tÄ«jām pārbaudes e-pastu uz %{email} un tiklÄ«dz tu apstiprināsi savu lietotāju, tu varēsi sākt kartēt.<br /><br />Ja tu lieto pretmēstuļu sistēmu, kura nosÅ«ta pārbaudes pieprasÄ«jumus, tad pārliecinies, ka esi ielicis webmaster@openstreetmap.org baltajā sarakstā, jo mēs nevaram atbildēt uz pārbaudes pieprasÄ«jumiem. heading: Izveidot lietotāja kontu + license_agreement: Kad tu apstiprini savu lietotāju, tev bÅ«s nepiecieÅ¡ams pieņemt <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">veidotāju noteikumus</a>. no_auto_account_create: Diemžēl mēs Å¡obrÄ«d nevaram izveidot kontu automātiski. + not displayed publicly: Netiek rādÄ«ts publiski (skati <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privātuma politika, iekļaujot nodaļu par e-pasta adresēm">Privātuma politika</a>) openid: "%{logo} OpenID:" + openid association: "<p>Tavs OpenID vēl nav savienots ar OpenStreetMap lietotāju.</p>\n<ul>\n <li>Ja tu esi jauns OpenStreetMap, lÅ«dzu izveido jaunu lietotāju, izmantojot formu zemāk.</li>\n <li>\n Ja tev jau ir lietotājs, tu vari autorizēties savā lietotājā\n ar savu lietotāju un paroli un tad savienot lietotāju\n ar savu OpenID savos lietotāja uzstādÄ«jumos.\n </li>\n</ul>" + openid no password: Ar OpenID parole nav nepiecieÅ¡ama, bet daži papildus rÄ«ki vai serveris, joprojām to var pieprasÄ«t. password: "Parole:" + terms accepted: Paldies, ka pieņēmāt jaunos devuma noteikumus! + terms declined: Mums žēl, ka tu izvēlējies nepieņemt jaunos Veidotāju Noteikumus. PriekÅ¡ vairāk informācijas, apskati <a href="%{url}">Å¡o wiki lapu</a>. title: Izveidot kontu + use openid: AlternatÄ«vi, lieto %{logo} OpenID, lai autorizētos no_such_user: + body: Atvaino, nav lietotāja ar lietotājvārdu %{user}. LÅ«dzu pārbaudi pareizrakstÄ«bu, vai varbÅ«t saite, uz kuras Tu uzspiedi, ir nepareiza. heading: Lietotājs %{user} neeksistē title: NeesoÅ¡s lietotājs popup: @@ -1304,31 +1676,41 @@ lv: reset_password: confirm password: "Atkārtot paroli:" flash changed: JÅ«su parole ir nomainÄ«ta. + flash token bad: Neatradu to pilnvaru, varbÅ«t pārbaudi URL? heading: Atcelt %{user} paroli password: "Parole:" reset: Atcelt paroli title: AtiestatÄ«t paroli + set_home: + flash success: Mājas atraÅ¡anās vieta veiksmÄ«gi saglabāta suspended: + body: "<p>\n Atvaino, tav lietotājs ir automātiski bloķēts saistÄ«bā ar\n aizdomÄ«gām darbÄ«bām.\n</p>\n<p>\n Å o lēmumu drÄ«z pārskatÄ«s administrators, vai\n tu vari sazināties ar %{webmaster}, ja tu vēlies apspriesties par Å¡o.\n</p>" heading: Konta darbÄ«ba apturēta title: Konta darbÄ«ba apturēta webmaster: webmaster terms: agree: PiekrÄ«tu + consider_pd: Papildinājumā augstākminētajai vienoÅ¡anai, Es pieņemu mana devuma bÅ«Å¡anu Publiskajā Domēnā consider_pd_why: kas tas ir? decline: NepiekrÄ«tu + guidance: "Informācija, lai labāk saprastu Å¡os noteikumus: <a href=\"%{summary}\">cilvēkam lasām apkopojums</a> un daži <a href=\"%{translations}\">neformāli tulkojumi</a>" heading: DalÄ«bnieka noteikumi legale_names: france: Francija italy: Itālija rest_of_world: Pārējā pasaule + legale_select: "LÅ«dzu, atlasiet savu dzÄ«vesvietas valsti:" read and accept: LÅ«dzu, izlasiet tālāk esoÅ¡o lÄ«gumu, un nospiediet 'Agree' pogu, lai apstiprinātu, ka jÅ«s piekrÄ«tat noteikumiem Å¡em nosacÄ«jumiem par jÅ«su esoÅ¡ajiem un nākotnā radÄ«tajiem datiem. title: DalÄ«bnieka noteikumi + you need to accept or decline: LÅ«dzu izlasi un vai nu pieņem vai noraidi jaunos Veidotāju Noteikumus, lai turpinātu. view: activate_user: aktivizēt Å¡o lietotāju add as friend: pievienot kā draugu + ago: (pirms %{time_in_words_ago}) block_history: skatÄ«t saņemtos bloķējumus blocks by me: mani pieÅ¡Ä·irtie bloki blocks on me: bloki par mani + comments: komentāri confirm: Apstiprināt confirm_user: apstiprināt Å¡o lietotāju create_block: bloķēt Å¡o lietotāju @@ -1343,18 +1725,25 @@ lv: diary: dienasgrāmata edits: labojumi email address: "E-pasta adrese:" + friends_changesets: SkatÄ«t visas draugu izmaiņu kopas + friends_diaries: SkatÄ«t visus draugu dienasgrāmatu ierakstus hide_user: slēpt Å¡o lietotāju + if set location: Ja Tu uzstādi savu atraÅ¡anās vietu, skaista karte un sÄ«kumi parādÄ«sies Å¡eit. Tu vari uzstādÄ«t savu mājvietu savā %{settings_link} lapā. km away: "%{count} km attālumā" latest edit: "Pēdējais labojums %{ago}:" m away: "%{count} m attālumā" mapper since: "Kartētājs kopÅ¡:" moderator_history: skatÄ«t dotos bloķējumus + my comments: mani komentāri my diary: mana dienasgrāmata my edits: mani labojumi my settings: mani iestatÄ«jumi my traces: manas trases nearby users: Citi tuvumā esoÅ¡i lietotāji + nearby_changesets: SkatÄ«t visas tuvējo lietotāju izmaiņu kopas + nearby_diaries: SkatÄ«t visus tuvējo lietotāju dienasgrāmatu ierakstus new diary entry: jauns dienasgrāmatas ieraksts + no friends: Tu vēl neesi pievienojis draugus. no nearby users: Nav citu lietotāju kas tuvumā kartētu. oauth settings: OAuth uzstādÄ«jumi remove as friend: 'noņemt kā draugu' @@ -1371,46 +1760,116 @@ lv: settings_link_text: uzstādÄ«jumi spam score: "Surogātpasta rādÄ«tājs:" status: "Statuss:" + traces: trases unhide_user: parādÄ«t Å¡o lietotāju user location: Lietotāja atraÅ¡anās vieta your friends: JÅ«su draugi user_block: + blocks_by: + empty: "%{name} vēl nav izveidojis nevienu liegumu." + heading: Liegumu saraksts no %{name} + title: Liegumi no %{name} + blocks_on: + empty: "%{name} vēl nav ticis bloķēts." + heading: Liegumu saraksts uz %{name} + title: Liegumi uz %{name} + create: + flash: Izveidot liegumu uz lietotāju %{name}. + try_contacting: LÅ«dzu centies kontaktēties ar lietotāju pirms liegum uzlikÅ¡anas un dodot viņiem atbilstoÅ¡u daudzumu laika, lai atbildētu. + try_waiting: LÅ«dzu dod lietotājam gana daudz laika, lai viņš atbildētu, pirms uzliekat liegumu. edit: back: SkatÄ«t visus blokus + heading: Rediģē liegumu uz %{name} needs_view: Vai lietotājam ir nepiecieÅ¡ams ieiet pirms Å¡is bloks tiks noņemts? + period: Cik ilgi, no Å¡Ä« brīža, lietotājam bÅ«s liegta pieeja pie API. + reason: Iemesls, kāpēc %{name} ir bloķēts. LÅ«dzu esi mierÄ«gs un saprotoÅ¡s, dod detalizētu izskaidrojumu par situāciju. Atceries, ka ne visi lietotāji saprot kopienas žargonus, tāpēc centies izmantot nespeciālistu terminus. show: ApskatÄ«t Å¡o bloku submit: Atjaunot bloku + title: Rediģē liegumu uz %{name} filter: - not_a_moderator: Jums jābÅ«t administratoram, lai veiktu Å¡o darbÄ«bu. + block_expired: Å is liegums jau ir beidzies un nevar tikt labots. + block_period: Lieguma periodam jābÅ«t vienam no izvēlamām iespējām krÄ«toÅ¡ajā sarakstā. helper: time_future: Beidzas %{time}. + time_past: Pabeigts %{time} atpakaļ. + until_login: AktÄ«vs lÄ«dz lietotājs autorizēsies. + index: + empty: PaÅ¡laik nav izveidotu liegumu. + heading: Lietotāja liegumu saraksts + title: Lietotāja liegumi + model: + non_moderator_revoke: JābÅ«t moderatoram, lai atsauktu liegumu. + non_moderator_update: JābÅ«t moderatoram, lai veidotu vai atjaunotu liegumu. new: + back: SkatÄ«t visus liegumus heading: Veidoju bloku uz %{name} + needs_view: Lietotājam ir jāautorizējas, pirms liegums tiks noņemts + period: Cik ilgi, no Å¡Ä« brīža, lietotājam bÅ«s liegta pieeja pie API. + reason: Iemesls kāpēc %{name} tika bloķēts. LÅ«dzu esi tik mierÄ«gs un saprotoÅ¡s, cik vien ir iespējams, dodot pēc iespējas detalizētāku izskaidrojumu par situāciju, atceroties, ka ziņojums bÅ«s publiski redzams. Atceries, ka ne visi lietotāji izprot kopienas žargonus, tāpēc centies izmantot nespeciālistu terminus. + submit: Veidot liegumu title: Veidoju bloku uz %{name} + tried_contacting: Es sazinājos ar lietotāju un lÅ«dzu tam pārtraukt. + tried_waiting: Esmu devis lietotājam atbilstoÅ¡u laika daudzumu, lai atbildētu uz paziņojumiem. not_found: back: Atpakaļ uz saturu + sorry: Atvaino, lietotāja lieguma ar ID %{id} netika atrasts. partial: confirm: Vai esat pārliecināts? creator_name: Autors display_name: Bloķēts lietotājs - edit: Rediģēt + edit: Labot + next: Nākamais » not_revoked: (nav atsaukts) + previous: « Iepriekšējais + reason: Iemesls liegumam + revoke: Atsaukt! revoker_name: Atsaucis show: RādÄ«t + showing_page: Rāda lapu %{page} status: Statuss + period: + one: 1 stunda + other: "%{count} stundas" revoke: confirm: Vai jÅ«s tiešām vēlaties atcelt Å¡o bloku? flash: Å is bloks ir atsaukts. + heading: Atceļ liegumu uz %{block_on} pēc %{block_by} + past: Å is liegums beidzās %{time} atpakaļ un nevar tikt atsaukts. revoke: Atsaukt! + time_future: Å is liegums beigsies %{time}. + title: Atcelt liegumu uz %{block_on} show: back: SkatÄ«t visus bloķējumus confirm: Vai esat pārliecināts? edit: Rediģēt + heading: "%{block_on} bloķēts pēc %{block_by}" + needs_view: Lietotājam ir jāautorizējas, pirms liegums tiks notÄ«rÄ«ts. reason: "Bloķēšanas iemesls:" + revoke: Atsaukt! + revoker: "Atsaucējs:" show: RādÄ«t status: Statuss + time_future: Beidzas %{time} + time_past: Beidzās %{time} atpakaļ. + title: "%{block_on} bloķēts pēc %{block_by}" + update: + only_creator_can_edit: Tikai moderators, kurÅ¡ izveidoja Å¡o liegumu, var to labot. + success: Liegums atjaunots. user_role: + filter: + already_has_role: Lietotājam jau ir loma %{role}. + doesnt_have_role: Lietotājam nav loma %{role}. + not_a_role: Virkne `%{role}' nav derÄ«ga kā loma. + not_an_administrator: Tikai administratori var veikt lietotāju lomu pārvaldi, un tu neesi administrators. grant: + are_you_sure: Vai tu esi pārliecināts, ka vēlies pieÅ¡Ä·irt lomu `%{role}' lietotājam `%{name}'? confirm: Apstiprināt + fail: Nevarēja pieÅ¡Ä·irt lomu `%{role}' lietotājam `%{name}'. LÅ«dzu pārbaudi, ka lietotājs un loma ir pareizi. + heading: Apstiprināt lomu pieÅ¡Ä·irÅ¡anu + title: Apstiprināt lomu pieÅ¡Ä·irÅ¡anu revoke: + are_you_sure: Vai tu esi droÅ¡s, ka vēlies atsaukt lomu `%{role}' no lietotāja `%{name}'? confirm: Apstiprināt + fail: Neizdevās atsaukt lomu `%{role}' no lietotāja `%{name}'. LÅ«dzu pārbaudi, ka tas lietotājs un loma ir derÄ«gi. + heading: Apstiprināt lomu atcelÅ¡anu + title: Apstiprināt lomu atcelÅ¡anu diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 2177edd50..14b08dedf 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1,7 +1,8 @@ -# Messages for Macedonian (Македонски) +# Messages for Macedonian (македонски) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Bjankuloski06 +# Author: Nemo bis mk: activerecord: attributes: @@ -52,15 +53,15 @@ mk: notifier: Известувач old_node: Стар јазол old_node_tag: Стара ознака за јазол - old_relation: Стара релација - old_relation_member: Стар член во релација - old_relation_tag: Стара ознака на релација + old_relation: Стар однос + old_relation_member: Стар член на однос + old_relation_tag: Стара ознака на однос old_way: Стар пат old_way_node: Стар јазол на пат old_way_tag: Стара ознака за пат - relation: Релација - relation_member: Член на релација - relation_tag: Ознака за релација + relation: Однос + relation_member: Член на однос + relation_tag: Ознака за однос session: Сесија trace: Трага tracepoint: Точка на трага @@ -74,6 +75,8 @@ mk: application: require_cookies: cookies_needed: Изгледа сте оневозможиле колачиња - дозволете колачиња во прелистувачот за да можете да продолжите, + require_moderator: + not_a_moderator: За да го изведете тоа, треба да сте модератор. setup_user_auth: blocked: Пристапот кон API ви е блокиран. Најавете се на посредникот за да дознаете повеќе. need_to_see_terms: Вашиот пристап до приложниот програм (API) е привремено запрен. Најавете се на мрежниот посредник за да ги погледате Условите за учесниците. Нема потреба да се согласувате со услоците, но мора да ги прочитате. @@ -81,7 +84,6 @@ mk: changeset: changeset: "Измени: %{id}" changesetxml: XML за измените - download: Преземи %{changeset_xml_link} или %{osmchange_xml_link} feed: title: Измени %{id} title_comment: Измени %{id} - %{comment} @@ -97,8 +99,8 @@ mk: one: "Го има следниов %{count} јазол:" other: "Ги има следниве %{count} јазли:" has_relations: - one: "Ја има следнава %{count} релација:" - other: "Ги има следниве %{count} релации:" + one: "Го има следниов %{count} однос:" + other: "Ги има следниве %{count} односи:" has_ways: one: "Го има следниов %{count} пат:" other: "Ги има следниве %{count} патишта:" @@ -113,95 +115,98 @@ mk: in_changeset: "Во измените:" version: "Верзија:" containing_relation: - entry: Релација %{relation_name} - entry_role: Релација %{relation_name} (како %{relation_role}) + entry: Однос %{relation_name} + entry_role: Однос %{relation_name} (како %{relation_role}) map: deleted: Избришано edit: area: Уреди подрачје node: Уреди јазол - relation: Уреди релација + relation: Уреди однос way: Уреди пат larger: area: Погледај го просторот на поголема карта node: Погледај го јазолот на поголема карта - relation: Погледај ја релацијата на поголема карта + relation: Вид. односот на поголема карта way: Погледај го патот на поголема карта loading: Вчитувам... navigation: all: next_changeset_tooltip: "Следни измени:" next_node_tooltip: Следен јазол - next_relation_tooltip: Следна релација + next_relation_tooltip: Следен однос next_way_tooltip: Следен пат prev_changeset_tooltip: "Претходни измени:" prev_node_tooltip: Претходен јазол - prev_relation_tooltip: Претходна релација + prev_relation_tooltip: Претходен однос prev_way_tooltip: Претходен пат user: name_changeset_tooltip: Погледај уредувања на %{user} next_changeset_tooltip: Следно уредување на %{user} prev_changeset_tooltip: Претходно уредување на %{user} node: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" download_xml: Преземи XML - edit: уреди + edit: Уреди јазол node: Јазол node_title: "Јазол: %{node_name}" - view_history: погледај ја историјата + view_history: Погл. историја node_details: coordinates: "Координати:" part_of: "Дел од:" node_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Преземи XML node_history: Историја на јазолот node_history_title: "Историја на јазолот: %{node_name}" - view_details: погледај детали + view_details: Погл. подробности not_found: sorry: Жалиам, но не најдов %{type} со назнака %{id}. type: changeset: измени node: јазол - relation: релација + relation: однос way: пат paging_nav: of: од showing_page: Приказ на страница + redacted: + message_html: Верзијата %{version} на оваа %{type} не може да се прикаже бидејќи е редактирана. Повеќе на %{redaction_link}. + redaction: Редакција %{id} + type: + node: јазол + relation: однос + way: пат relation: - download: "%{download_xml_link} или %{view_history_link}" download_xml: Преземи XML - relation: Релација - relation_title: "Релација: %{relation_name}" - view_history: погледај ја историјата + relation: Однос + relation_title: "Однос: %{relation_name}" + view_history: Погл. историја relation_details: members: "Членови:" part_of: "Дел од:" relation_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Преземи XML - relation_history: Историја на релацијата - relation_history_title: "Историја на релацијата: %{relation_name}" - view_details: погледај детали + relation_history: Историја на односот + relation_history_title: "Историја на односот: %{relation_name}" + view_details: Погл. подробности relation_member: entry_role: "%{type} %{name} како %{role}" type: node: Јазол - relation: Релација + relation: Однос way: Пат start: manually_select: Рачно избери друга површина view_data: Погледајте податоци за тековниот поглед на картата start_rjs: data_frame_title: Податоци - data_layer_name: Податоци + data_layer_name: Прелист. податоци за картата details: Подробно drag_a_box: Повлечете рамка на картата за да одберете простор edited_by_user_at_timestamp: Уредено од [[user]] во [[timestamp]] hide_areas: Скриј подрачја history_for_feature: Историја за [[feature]] load_data: Вчитај ги податоците - loaded_an_area_with_num_features: "Вчитавте простор кој содржи [[num_features]] елементи. Некои прелистувачи не можат добро да прикажат со волку податоци. Начелно, прелистувачите работат најдобро при помалку од 100 елементи наеднаш: ако правите нешто друго прелистувачот ќе ви биде бавен/пасивен. Ако и покрај тоа сакате да се прикажат овие податоци, кликнете подолу." + loaded_an_area_with_num_features: "Вчитавте простор што содржи [[num_features]] елементи. Некои прелистувачи не можат да се справат со толку податоци. Начелно, прелистувачите работат најдобро при помалку од [[max_features]] елементи наеднаш: ако правите нешто друго прелистувачот ќе ви биде бавен/пасивен. Ако и покрај тоа сакате да се прикажат овие податоци, тогаш стиснете на копчето подолу." loading: Вчитувам... manually_select: Рачно изберете друга површина object_list: @@ -237,13 +242,12 @@ mk: type: changeset: менувач node: јазол - relation: релација + relation: однос way: пат way: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" download_xml: Преземи XML - edit: уреди - view_history: погледај историја + edit: Уреди пат + view_history: Погл. историја way: Пат way_title: "Пат: %{way_name}" way_details: @@ -253,9 +257,8 @@ mk: nodes: Јазли part_of: "Дел од:" way_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Преземи XML - view_details: погледај детали + view_details: Погл. подробности way_history: Историја на патот way_history_title: "Историја на патот: %{way_name}" changeset: @@ -267,11 +270,11 @@ mk: no_edits: (нема уредувања) show_area_box: прикажи рамка на површина still_editing: (сè уште уредува) - view_changeset_details: Преглед на детали од измените + view_changeset_details: Преглед на подробности од измените changeset_paging_nav: next: Следно » previous: « Претходно - showing_page: Прикажана е страница %{page} + showing_page: Прикажана е страницата %{page} changesets: area: Површина comment: Коментар @@ -285,6 +288,8 @@ mk: description_nearby: Измени од соседни корисници description_user: Измени на %{user} description_user_bbox: Измени на %{user} во рамките на %{bbox} + empty_anon_html: Сè уште нема уредувања + empty_user_html: Сè уште немате направено ниедно уредување. За да почнете, прво погледајте ги <a href='http://wiki.openstreetmap.org/wiki/Mk:Beginners_Guide_1.3'>напатствијата за почетници</a>. heading: Измени heading_bbox: Измени heading_friend: Измени @@ -365,10 +370,6 @@ mk: body: Жалиме, но нема дневничка ставка или коментар со назнака %{id}. Проверете дали сте напишале правилно, или да не сте стиснале на погрешна врска. heading: "Нема ставка со назнака: %{id}" title: Нема таква дневничка ставка - no_such_user: - body: Жалиме, но нема корисник по име %{user}. Проверете дали сте напишале правилно, или да не сте стиснале на погрешна врска. - heading: Корисникот %{user} не постои - title: Нема таков корисник view: leave_a_comment: Пиши коментар login: Најава @@ -447,7 +448,7 @@ mk: zero: помалку од 1 км results: more_results: Повеќе резултати - no_results: Нема пронајдено резултати + no_results: Не пронајдов ништо search: title: ca_postcode: Резултати од <a href="http://geocoder.ca/">Geocoder.CA</a> @@ -462,16 +463,28 @@ mk: suffix_place: ", %{distance} %{direction} од %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Аеродром + apron: Рампа + gate: Порта + helipad: Хелиодром + runway: Писта + taxiway: Рулажна патека + terminal: Терминал amenity: + WLAN: Безжичен интернет airport: Аеродром arts_centre: Дом на уметности + artwork: Уметничко дело atm: Банкомат auditorium: Аудиториум bank: Банка bar: Бар + bbq: Скара bench: Клупа bicycle_parking: Велосипедско паркирање bicycle_rental: Изнајмување велосипеди + biergarten: Пивска градина brothel: Бордел bureau_de_change: Менувачница bus_station: Автобуска станица @@ -480,6 +493,7 @@ mk: car_sharing: Изнајмување автомобил car_wash: Автоперална casino: Казино + charging_station: Напојна станица cinema: Кино clinic: Клиника club: Клуб @@ -498,6 +512,7 @@ mk: ferry_terminal: Ферибот-терминал fire_hydrant: Противпожарен хидрант fire_station: Пожарна + food_court: Штандови за брза храна fountain: Фонтана fuel: Гориво grave_yard: Гробишта @@ -538,9 +553,12 @@ mk: shelter: Засолниште shop: Дуќан shopping: Дуќани + shower: Туш + social_centre: Социјален центар social_club: Друштвен клуб studio: Студио supermarket: Супермаркет + swimming_pool: Базен taxi: Такси telephone: Телефонска говорница theatre: Театар @@ -555,37 +573,17 @@ mk: youth_centre: Младински центар boundary: administrative: Административна граница + census: Пописна граница + national_park: Национален парк + protected_area: Заштитено подрачје + bridge: + aqueduct: Аквадукт + suspension: Висечки мост + swing: Вртечки мост + viaduct: Вијадукт + "yes": Мост building: - apartments: Станбен блок - block: Блок згради - bunker: Бункер - chapel: Капела - church: Црква - city_hall: Градски дом - commercial: Комерцијална зграда - dormitory: Студентски дом - entrance: Влез во зграда - faculty: Факултетски објект - farm: Земјоделски објект - flats: Станови - garage: Гаража - hall: Сала - hospital: Болничка зграда - hotel: Хотел - house: Куќа - industrial: Индустриски објект - office: Деловна зграда - public: Јавен објект - residential: Станбена зграда - retail: Продажен објект - school: Школско здание - shop: Дуќан - stadium: Стадион - store: Продавница - terrace: Тераса - tower: Кула - train_station: Железничка станица - university: Универзитетска зграда + "yes": Градба highway: bridleway: Коњски пат bus_guideway: Автобуски шини @@ -593,12 +591,11 @@ mk: byway: Спореден пат construction: Автопат во изградба cycleway: Велосипедска патека - distance_marker: Бележник на растојание emergency_access_point: Прва помош footway: Тротоар ford: Брод - gate: Порта living_street: Маалска улица + milestone: Милјоказ minor: Помал спореден пат motorway: Автопат motorway_junction: Клучка @@ -610,14 +607,17 @@ mk: primary_link: Главен пат raceway: Тркачка патека residential: Станбен + rest_area: Одмориште road: Пат secondary: Спореден пат secondary_link: Спореден пат service: Помошен пат services: Крајпатен сервис + speed_camera: Брзиноловец steps: Скалила stile: Тарабен премин tertiary: Третостепен пат + tertiary_link: Третостепен пат track: Полски пат trail: Патека trunk: Магистрала @@ -631,6 +631,7 @@ mk: building: Градба castle: Замок church: Црква + fort: Утврдување house: Куќа icon: Икона manor: Велепоседнички дом @@ -645,7 +646,7 @@ mk: wreck: Бродолом landuse: allotments: Парцели - basin: Басен + basin: Котлина brownfield: Угар cemetery: Гробишта commercial: Комерцијално подрачје @@ -655,6 +656,7 @@ mk: farmland: Обработливо земјиште farmyard: Земјоделски двор forest: Шума + garages: Гаража grass: Трева greenfield: Неискористено земјиште industrial: Индустриско подрачје @@ -662,25 +664,28 @@ mk: meadow: Ливада military: Воено подрачје mine: Рудник - mountain: Планина nature_reserve: Природен резерват + orchard: Овоштарник park: Парк piste: Писта - plaza: Плоштадче quarry: Каменолом railway: Железница recreation_ground: Рекреативен терен reservoir: Резервоар + reservoir_watershed: Акумулациска вододелница residential: Станбено подрачје retail: Дуќани + road: Патно подрачје village_green: Селско зеленило vineyard: Лозници wetland: Мочуриште wood: Шума leisure: beach_resort: Крајбрежно одморалиште + bird_hide: Набљудувалиште за птици common: Општествена земја fishing: Рибарење + fitness_station: Технички преглед garden: Градина golf_course: Голф-терен ice_rink: Лизгалиште @@ -691,12 +696,17 @@ mk: pitch: Спортски терен playground: Детско игралиште recreation_ground: Разонодно место + sauna: Сауна slipway: Испуст sports_centre: Спортски центар stadium: Стадион swimming_pool: Базен track: Спортска патека water_park: Аквапарк + military: + airfield: Воено слетувалиште + barracks: Касарна + bunker: Бункер natural: bay: Залив beach: Плажа @@ -704,11 +714,12 @@ mk: cave_entrance: Влез во пештера channel: Канал cliff: Гребен - coastline: Крајбрежје crater: Кратер + dune: Дина feature: Елемент fell: Фел fjord: Фјорд + forest: Шума geyser: Гејзер glacier: Глечер heath: Голет @@ -728,6 +739,7 @@ mk: scrub: Честак shoal: Плитко место spring: Извор + stone: Камен strait: Проток tree: Дрво valley: Долина @@ -736,6 +748,19 @@ mk: wetland: Мочуриште wetlands: Мочуриште wood: Шума + office: + accountant: Сметководител + architect: Архитект + company: Фирма + employment_agency: Агенција за вработување + estate_agent: Агенција за недвижности + government: Владина служба + insurance: Служба за осигурување + lawyer: Адвокат + ngo: НВО-канцеларија + telecommunication: Телекомуникациска служба + travel_agent: Туристичка агенција + "yes": Канцеларија place: airport: Аеродром city: Град @@ -747,6 +772,7 @@ mk: houses: Куќи island: Остров islet: Островче + isolated_dwelling: Зафрлено живееалиште locality: Месност moor: Пустара municipality: Општина @@ -770,6 +796,7 @@ mk: junction: Железнички јазол level_crossing: Надвозник light_rail: Лека железница + miniature: Минијатурна железница monorail: Едношинска линија narrow_gauge: Теснолинејка platform: Железнички перон @@ -784,7 +811,7 @@ mk: yard: Железничко депо shop: alcohol: Алкохол на црно - apparel: Облека + antiques: Старинарница art: Уметнички дуќан bakery: Пекара beauty: Козметика @@ -793,7 +820,6 @@ mk: books: Книжарница butcher: Месарница car: Автосалон - car_dealer: Автосалон car_parts: Автоделови car_repair: Автосервис carpet: Дуќан за теписи @@ -808,7 +834,6 @@ mk: department_store: Стоковна куќа discount: Распродажен дуќан doityourself: Направи-сам - drugstore: Аптека dry_cleaning: Хемиско чистење electronics: Електронска опрема estate_agent: Недвижности @@ -874,7 +899,10 @@ mk: valley: Долина viewpoint: Видиковец zoo: Зоолошка + tunnel: + "yes": Тунел waterway: + artificial: Вештачки воден пат boatyard: Чамцоградилиште canal: Канал connector: Слив @@ -912,6 +940,7 @@ mk: history_tooltip: Преглед на уредувањата во ова подрачје history_zoom_alert: Морате да приближите за да можете да ја видите историјата на уредувања layouts: + community: Заедница community_blogs: Блогови на заедницата community_blogs_title: Блогови од членови на заедницата на OpenStreetMap copyright: Авторски права и лиценца @@ -933,19 +962,18 @@ mk: history: Историја home: дома home_tooltip: Оди на матичната местоположба - inbox: пораки (%{count}) + inbox_html: пораки (%{count}) inbox_tooltip: one: Имате 1 непрочитана порака во сандачето other: Имате %{count} непрочитани пораки во сандачето zero: Немате непрочитани пораки во сандачето intro_1: OpenStreetMap е слободна уредлива карта на целиот свет. Ја прават луѓе како вас. - intro_2: OpenStreetMap ви овозможува да разгледувате, уредувате и користите гоеографски податоци на колаборативен начин од било кое место на Земјината топка. - intro_3: Вдомувањето на OpenStreetMap го овозможија %{ucl}, %{ic} и %{bytemark}. Другите поддржувачи на проектот се наведени на %{partners}. - intro_3_bytemark: Вдомување Bytemark - intro_3_ic: Империјалниот колеџ - Лондон - intro_3_partners: викито - intro_3_partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=mk - intro_3_ucl: UCL VR Centre + intro_2_create_account: Создајте корисничка сметка + intro_2_download: преземање + intro_2_html: Податоците се слободни за %{download} и %{use} под нивната лиценца %{license}. %{create_account} за да ја подобрите картата. + intro_2_license: отворена лиценца + intro_2_use: употреба + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap?uselang=mk license: title: Податоците на OpenStreetMap се под Creative Commons Наведи извор-Сподели под исти услови 2.0 Нелокализирана лиценца log_in: најави ме @@ -959,9 +987,15 @@ mk: title: Поддржете ја OpenStreetMap со паричен прилог osm_offline: Базата на податоци на OpenStreetMap моментално е исклучена додека работиме на неопходни одржувања. osm_read_only: Базата на податоци на OpenStreetMap моментално може само да се чита, додека ги извршиме неопходните одржувања. + partners_bytemark: вдомителот „Bytemark“ + partners_html: Вдомувањето е поддржано од %{ucl}, %{ic} и %{bytemark}, како и други %{partners}. + partners_ic: Империјалниот колеџ - Лондон + partners_partners: партнери + partners_ucl: VR-центарот на UCL + partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=mk sign_up: регистрација sign_up_tooltip: Создај сметка за уредување - sotm2011: Дојдете на Конференцијата на OpenStreetMap 2011 што се одржува од 9 до 11 септември во Денвер! + sotm2012: Дојдете на конференцијата на OpenStreetMap за 2012 „The State of the Map“ што ќе се одржи од 6 до 8 септември во Токио! tag_line: Слободна вики-карта на светот user_diaries: Кориснички дневници user_diaries_tooltip: Види кориснички дневници @@ -975,9 +1009,32 @@ mk: license_page: foreign: english_link: англискиот оригинал - text: Во случај на конфликт помеѓу оваа преведена страница и %{english_original_link}, предност има англиската страница + text: Во случај на спротиставеност помеѓу оваа преведена страница и %{english_original_link}, предност има англиската страница title: За овој превод - legal_babble: "<h2>Авторски права и лиценца</h2>\n<p>\n OpenStreetMap има <i>отворени податоци</i>, и е лиценциран со <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив\n комонс НаведиИзвор-СподелиПодИстиУслови 2.0</a> (CC BY-SA).\n</p>\n<p>\n Слободно можете да ги копирате, распространувате, јавно прикажувате и адаптирате нашите карти\n и податоци, под услов да го наведете OpenStreetMap и неговите\n учесници. Ако ги менувате или темелите дела врз нашите карти и податоци\n резултатите можете да ги распространувате само под истата лиценца.\n Во полниот <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">законски\n правилник</a> се објаснети вашите права и должности.\n</p>\n\n<h3>Како да го наведувате OpenStreetMap</h3>\n<p>\n Доколку користите слики од карти на OpenStreetMap, бараме\n наводот да содржи барем “© Учесници на\n OpenStreetMap, CC BY-SA”. Ако користите само податоци од картите,\n бараме наводот да гласи “Картографски податоци © Учесници на OpenStreetMap,\n CC BY-SA”.\n</p>\n<p>\n Кадешто е можно, OpenStreetMap треба да има хиперврска <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n и CC BY-SA до <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">http://creativecommons.org/licenses/by-sa/2.0/deed.mk</a>. Доколку\n користите медиум кадешто не може да се ставаат врски (како на пр.\n печатено издание), ви препорачуваме да ги наведете корисниците на\n www.openstreetmap.org (на пр. со проширување на\n ‘OpenStreetMap’ со полнава адреса) и до\n www.creativecommons.org.\n</p>\n\n<h3>Како да дознаете повеќе</h3>\n<p>\n Прочитајте повеќе за користењето на нашите податоци на <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Правните\n ЧПП</a>.\n</p>\n<p>\n Учесниците во OSM се потсетуваат никогаш да не ставаат податоци од\n извори заштитени со авторски права (на пр. Google Карти или печатени карти) без\n јасна дозвола од имателите на авторските права.\n</p>\n<p>\n Иако OpenStreetMap има отворени податоци, ние сепак не можеме бесплатно да \n го нудиме картографскиот програм на развивачи кои се трети лица.\n\n Погледајте ги нашите <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Правила на користење на програмот</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Правила на користење на полињата</a>\n и <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Правила на користење на Nominatim</a>.\n</p>\n\n<h3>Нашите учесници</h3>\n<p>\n Нашата лиценца CC BY-SA бара да “го наведете изворниот\n автор разумно за медиумот или средството што го\n користите”. Поединечните картографи на OSM не бараат да\n бидат наведувани посебно, туку само како “Учесници на\n OpenStreetMap”, но онаму кадешто OpenStreetMap содржи податоци\n од некоја државна картографска установа или друг важен извор,\n веројатно би било разумно да ги наведете нив директно,\n наведувајќи ги како што тие обично се наведуваат, или ставајќи врска до нивната страница.\n</p>\n\n<!--\nИнформации за уредниците на страници\n\nТука се наведени само оние организации кои бараат да бидат наведени\nкако предуслов за користење на нивните податоци на OpenStreetMap. Ова не е\nопшт каталог на увезени податоци, и не смее да се користи, освен кога\nсе бара навод за да се задоволат условите на лиценцата на увезените\nподатоци.\n\nСите дополнувања мора најпрвин да се продискутираат со систем-администраторите на OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Австралија</strong>: Содржи податоци за населби засновани на\n податоци на Австралиската служба за статистика.</li>\n<li><strong>Австрија</strong>: Содржи податоци од\n <a href=\"http://data.wien.gv.at/\">Град Виена</a> под лиценцата\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.mk\">CC BY</a>.</li>\n <li><strong>Канада</strong>: Содржи податоци од\n GeoBase®, GeoGratis (© Министерство за природни ресурси\n Канада), CanVec (© Министерство за природни ресурси\n Канада) и StatCan (Географско одделение,\n Статистика Канада).</li>\n <li><strong>Франција</strong>: Содржи податоци преземени од\n Главната даночна управа.</li>\n <li><strong>Нов Зеланд</strong>: Содржи податоци преземени од\n Land Information New Zealand. Крунски авторски права задржани.</li>\n <li><strong>Полска</strong>: Содржи податоци од <a\n href=\"http://ump.waw.pl/\">UMP-pcPL карти</a>. Авторски права на\n учесниците на UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Повеќе за употребата на податоци од UMP во OSM</a></li>\n <li><strong>ЈАР</strong>: Содржи податоци преземени од\n <a href=\"http://www.ngi.gov.za/\">Главниот директорат:\n Национални геопросторни информации</a>, Државни права задржани.</li>\n <li><strong>Обединето Кралство</strong>: Податоци од Ordnance Survey \n © Крунски авторски права и права врз базата на податоци\n 2010.</li>\n</ul>\n\n<p>\n Поставањето на податоци во OpenStreetMap не подразбира дека изворниот \n добавувач на податоци го поддржува и застапува OpenStreetMap, дека дава било каква гаранција, или пак\n дека прифаќа било каква одговорност.\n</p>" + legal_babble: + contributors_at_html: "<strong>Австрија</strong>: Содржи податоци од\n<a href=\"http://data.wien.gv.at/\">Град Виена</a> (под\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.mk\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Покраина Предарлска</a> и\nПокраина Тирол (под <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT со исправки</a>)." + contributors_au_html: "<strong>Австралија</strong>: Содржи податоци за населби од\nАвстралиското биро за статистика." + contributors_ca_html: "<strong>Canada</strong>: Содржи податоци од\nGeoBase®, GeoGratis (© Министерство за природни ресурси на Канада), CanVec (© Министерство за природни ресурси на Канада), and StatCan (Географско одделение,\nСтатистичка служба на Канада)." + contributors_footer_1_html: "Повеќе информации за овие и други извори искористени\nза подобрување на OpenStreetMap ќе најдете на страницата <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Учесници</a> на викито на OpenStreetMap." + contributors_footer_2_html: "Употребата на податоците на OpenStreetMap не подразбира дека добавувачот\nна изворните податоци го застапува или рекламира OpenStreetMap, дава било каква гаранција, или\nдека прифаќа било каква одговорност." + contributors_fr_html: "<strong>Франција</strong>: Содржи податоци од\nГенералната даночна управа." + contributors_gb_html: "<strong>Велика Британија</strong>: Содржи податоци\nод Картографскиот завод на Обединетото Кралство© Крунски авторски права и\nправа на базата 2010." + contributors_intro_html: " Нашата лиценца CC BY-SA бара да “го наведете изворниот\n автор разумно за медиумот или средството што го\n користите”. Поединечните картографи на OSM не бараат да\n бидат наведувани посебно, туку само како “Учесници на\n OpenStreetMap”, но онаму кадешто OpenStreetMap содржи податоци\n од некоја државна картографска установа или друг важен извор,\n веројатно би било разумно да ги наведете нив директно,\n наведувајќи ги како што тие обично се наведуваат, или ставајќи врска до нивната страница." + contributors_nl_html: "<strong>Холандија</strong>: Содржи © податоци од AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Нов Зеланд</strong>: Содржи податоци од\nКатастарската служба на Нов Зеланд. Крунски авторски права." + contributors_pl_html: "<strong>Полска</strong>: Содржи податоци од <a\nhref=\"http://ump.waw.pl/\">UMP-pcPL</a>. Авторски права\nучесници на UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nПовеќе за употребата на овие податоци на OSM</a>" + contributors_title_html: Нашите учесници + contributors_za_html: "<strong>ЈАР</strong>: Содржи податоци од\n<a href=\"http://www.ngi.gov.za/\">Главната управа:\nНационална катастарска служба</a>, државни авторски права задржани." + credit_1_html: " Доколку користите слики од карти на OpenStreetMap, бараме\n наводот да содржи барем “© Учесници на\n OpenStreetMap, CC BY-SA”. Ако користите само податоци од картите,\n бараме наводот да гласи “Картографски податоци © Учесници на OpenStreetMap,\n CC BY-SA”." + credit_2_html: " Кадешто е можно, OpenStreetMap треба да има хиперврска <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n и CC BY-SA до <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">http://creativecommons.org/licenses/by-sa/2.0/deed.mk</a>. Доколку\n користите медиум кадешто не може да се ставаат врски (како на пр.\n печатено издание), ви препорачуваме да ги наведете корисниците на\n www.openstreetmap.org (на пр. со проширување на\n ‘OpenStreetMap’ со полнава адреса) и до\n www.creativecommons.org." + credit_title_html: Како да ја наведете OpenStreetMap + intro_1_html: "OpenStreetMap содржи <i>отворени податоци</i>, лиценцирани со <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив комонс НаведиИзвор-СподелиПодИстиУслови 2.0</a> (CC BY-SA)." + intro_2_html: "Нашите карти и податоци слободно можете да ги умножувате, распространувате, предавате и менувате, \nдоколку ја наведете OpenStreetMap и нејзините\nучесници. Доколку ги измените или дополните картите или податоците,\nдобиеното можете да го распространувате само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">правен текст</a>." + more_1_html: "Повеќе за употребата на податоци ќе најдете на <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Правни ЧПП</a>." + more_2_html: "Би сакале да ги потсетиме учесниците на OSM дека никогаш не смеат да ставаат\nподатоци од извори заштитени со авторски права (на пр. Google Карти или печатени карти) без\nизрична дозвола од имателите на тие права." + more_3_html: "Иако OpenStreetMap содржи отворени податоци, сепак не можеме да понудиме\nбезплатни API-прилози за карти на трети лица и разработувачи.\nПогл. <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Правила за користење на API</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Правила за користење на полињата</a>\nи <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Правила за користење на Nominatim</a>." + more_title_html: Повеќе информации + title_html: Авторски права и лиценца native: mapping_link: почнете со изработка на карти native_link: македонската верзија @@ -1023,10 +1080,6 @@ mk: body: Нажалост нема порака со тој id. heading: Нема таква порака title: Нема таква порака - no_such_user: - body: Нажалост нема корисник со тоа име. - heading: Нема таков корисник - title: Нема таков корисник outbox: date: Датум inbox: примени пораки @@ -1202,17 +1255,50 @@ mk: allow_write_gpx: подига GPS-траги. allow_write_prefs: им ги менува корисничките прилагодувања. authorize_url: "Дозволи URL адреса:" - edit: Детали од уредувањето + confirm: Дали сте сигурни? + delete: Избриши клиент + edit: Измени подробности key: "Потрошувачки клуч:" requests: Ги барам следните дозволи од корисникот secret: "Потрошувачка тајна:" support_notice: Поддржуваме hmac-sha1 (препорачано) како и ssl режим со прост текст. - title: OAuth детали за %{app_name} + title: OAuth податоци за %{app_name} url: "Побарај URL адреса на жетонот:" update: flash: Клиентските информации се успешно подновени printable_name: with_version: "%{id}, вер. %{version}" + redaction: + create: + flash: Редакцијата е создадена. + destroy: + error: Се појави грешна при поништувањето на редакцијата. + flash: Редакцијата е поништена. + not_empty: Редакцијата не е празна. Одредактирајте ги сите верзии што ѝ принадлежат на оваа редакција пред да ја поништите. + edit: + description: Опис + heading: Уреди редакција + submit: Зачувај редакција + title: Уреди редакција + index: + empty: Нема редакции. + heading: Список на редакции + title: Список на редакции + new: + description: Опис + heading: Внесете информации за новата редакција + submit: Создај редакција + title: Создавање на нова редакција + show: + confirm: Дали сте сигурни? + description: "Опис:" + destroy: Отстрани ја редакцијава + edit: Уреди ја редакцијава + heading: Прикажана е редакцијата „%{title}“ + title: Приказ на редакција + user: "Создавач:" + update: + flash: Промените се зачувани. site: edit: anon_edits_link_text: Дознајте зошто ова е така. @@ -1227,7 +1313,6 @@ mk: index: js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го оневозможиле тој програм. js_2: OpenStreetMap користи JavaScript за нејзината лизгава карта. - js_3: Препорачуваме да ја пробате <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home статичната карта</a> ако не можете да овозможите JavaScript. license: license_name: Creative Commons Наведи извор-Сподели под исти услови 2.0 notice: Под лиценцата %{license_name} од %{project_name} и неговите учесници. @@ -1304,6 +1389,23 @@ mk: unclassified: Некласификуван пат unsurfaced: Неасфалтиран пат wood: Шумичка + markdown_help: + alt: Алетрн. текст + first: Прва ставка + heading: Наслов + headings: Наслови + image: Слика + link: Врска + ordered: Подреден список + second: Втора ставка + subheading: Поднаслов + text: Текст + title_html: Парсирано со <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Неподреден список + url: URL + richtext_area: + edit: Уреди + preview: Преглед search: search: Пребарај search_help: "примери: 'Струмица', 'Илинденска', 'Regent Street, Cambridge', 'CB2 5AQ' или 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search?uselang=mk'>повеќе примери...</a>" @@ -1341,16 +1443,13 @@ mk: visibility_help: што значи ова? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk list: + empty_html: Тука сè уште нема ништо. <a href='%{upload_link}'>Подигнете нова трага</a> или дознајте повеќе за GPS-трагите на <a href='http://wiki.openstreetmap.org/wiki/Mk:Beginners_Guide_1.2'>нивната викстраница</a>. public_traces: Јавни GPS-траги public_traces_from: Јавни GPS-траги од %{user} tagged_with: " означено со %{tags}" your_traces: Ваши GPS-траги make_public: made_public: Трагата е објавена - no_such_user: - body: Жалиме, но нема корисник по име %{user}. Видете дали сте згрешиле при пишувањето, или пак сте кликнале на погрешна врска. - heading: Корисникот %{user} не постои. - title: Нема таков корисник offline: heading: GPX-складиште вон интернет message: Системот за складирање и подигање на GPX-податотеки моментално е недостапен. @@ -1391,9 +1490,9 @@ mk: trace_optionals: tags: Ознаки trace_paging_nav: - next: Следна » - previous: « Претходна - showing_page: Прикажувам страница %{page} + newer: Понови траги + older: Постари траги + showing_page: Прикажана е страницата %{page} view: delete_track: Избриши ја трагава description: "Опис:" @@ -1422,7 +1521,7 @@ mk: account: contributor terms: agreed: Се согласивте на новите Услови за учество. - agreed_with_pd: Исто така изјавивте дека вашите уредувања ги сметате за јавнодоменски. + agreed_with_pd: Исто така изјавивте дека вашите уредувања ги сметате за јавна сопственост. heading: "Услови за учество:" link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk link text: што е ова? @@ -1485,7 +1584,7 @@ mk: failure: Корисникот %{name} не е пронајден. success: Испративме поврдна порака на %{email}, и штом ќе ја потврдите сметката, ќе можете да почнете со картографска работа.<br /><br />Ако користите систем против спам кој испраќа барања за потврда, тогаш ќе морате да ја дозволите адресата webmaster@openstreetmap.org бидејќи ние немаме начин да одговараме на такви потврди. filter: - not_an_administrator: За да го изведете тоа, треба да се администратор. + not_an_administrator: За да го изведете тоа, треба да сте администратор. go_public: flash success: Сега сите уредувања ви се јавни, и ви е дозволено да уредувате. list: @@ -1609,7 +1708,7 @@ mk: webmaster: мреж. управник terms: agree: Се согласувам - consider_pd: Покрај горенаведената согласност, сметам дека мојот придонес е јавнодоменски + consider_pd: Покрај горенаведената согласност, сметам дека мојот придонес е во јавна сопственост consider_pd_why: Што е ова? consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain?uselang=mk decline: Одбиј @@ -1708,9 +1807,8 @@ mk: submit: Поднови го блокот title: Уредување на блок за %{name} filter: - block_expired: Блокот е веќе истечен и не може да се ажурира. + block_expired: Блокот е веќе истечен и затоа не може да се менува. block_period: Периодот на блокада мора да биде со рок избран од паѓачкиот список. - not_a_moderator: Треба да бидете модератор за да го направите тоа. helper: time_future: Истекува за %{time}. time_past: Истечено пред %{time}. @@ -1740,11 +1838,14 @@ mk: creator_name: Создавач display_name: Блокиран корисник edit: Уреди + next: Следна » not_revoked: (не се поништува) + previous: « Претходна reason: Причина за блокирање revoke: Поништи! revoker_name: "Поништил:" show: Прикажи + showing_page: Прикажана е страницата %{page} status: Статус period: one: 1 час @@ -1772,8 +1873,8 @@ mk: time_past: Истечено пред %{time} title: "%{block_on} блокиран од %{block_by}" update: - only_creator_can_edit: Само модераторот кој го направил блоков може да го ажурира. - success: Блокот е ажуриран. + only_creator_can_edit: Само модераторот кој го направил блоков може да го менува. + success: Блокот е изменет. user_role: filter: already_has_role: Корисникот веќе ја има улогата %{role}. diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 78a9ef41c..523f92843 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Anakmalaysia +# Author: Nemo bis ms: activerecord: attributes: @@ -74,6 +75,8 @@ ms: application: require_cookies: cookies_needed: Nampaknya cookies anda belum dihidupkan - sila hidupkan cookies dalam pelayar anda, kemudian sambung. + require_moderator: + not_a_moderator: Anda perlu menjadi penyelia untuk melakukan tindakan itu. setup_user_auth: blocked: Akses anda kepada API telah disekat. Sila log masuk ke dalam antaramuka web untuk mengetahui lebih lanjut. need_to_see_terms: Akses anda kepada API digantung buat sementara waktu. Sila log masuk ke dalam antaramuka web untuk melihat Terma-Terma Penyumbang. Anda tidak semestinya harus bersetuju, tetapi mesti membacanya. @@ -81,7 +84,6 @@ ms: changeset: changeset: "Set Ubah: %{id}" changesetxml: XML Set Ubah - download: Muat turun %{changeset_xml_link} atau %{osmchange_xml_link} feed: title: Set Ubah %{id} title_comment: Set Ubah %{id} - %{comment} @@ -137,21 +139,19 @@ ms: next_changeset_tooltip: Suntingan berikutnya oleh %{user} prev_changeset_tooltip: Suntingan sebelumnya oleh %{user} node: - download: "%{download_xml_link}, %{view_history_link} atau %{edit_link}" download_xml: Muat Turun XML - edit: sunting + edit: Sunting nod node: Nod node_title: "Nod: %{node_name}" - view_history: lihat sejarah + view_history: Lihat sejarah node_details: coordinates: "Koordinat:" part_of: "Sebahagian:" node_history: - download: "%{download_xml_link} atau %{view_details_link}" download_xml: Muat Turun XML node_history: Sejarah Nod node_history_title: "Sejarah Nod: %{node_name}" - view_details: lihat butiran + view_details: Lihat butiran not_found: sorry: Maaf, %{type} dengan id %{id} tidak dapat dijumpai. type: @@ -162,21 +162,26 @@ ms: paging_nav: of: daripada showing_page: Memaparkan laman + redacted: + message_html: Versi %{version} %{type} ini tidak boleh ditunjukkan kerana ia telah diredaksi. Sila lihat %{redaction_link} untuk perincian. + redaction: Redaksi %{id} + type: + node: nod + relation: hubungan + way: jalan relation: - download: "%{download_xml_link} atau %{view_history_link}" download_xml: Muat Turun XML relation: Hubungan relation_title: "Hubungan: %{relation_name}" - view_history: lihat sejarah + view_history: Lihat sejarah relation_details: members: "Anggota:" part_of: "Sebahagian:" relation_history: - download: "%{download_xml_link} atau %{view_details_link}" download_xml: Muat Turun XML relation_history: Sejarah Hubungan relation_history_title: "Sejarah Hubungan: %{relation_name}" - view_details: lihat butiran + view_details: Lihat butiran relation_member: entry_role: "%{type} %{name} sebagai %{role}" type: @@ -188,14 +193,14 @@ ms: view_data: Lihat data untuk paparan peta semasa start_rjs: data_frame_title: Data - data_layer_name: Data + data_layer_name: Telusuri Data Peta details: Butiran drag_a_box: Seretkan petak di atas peta untuk memilih kawasan edited_by_user_at_timestamp: Disunting oleh [[user]] pada [[timestamp]] hide_areas: Sorokkan kawasan history_for_feature: Sejarah [[feature]] load_data: Muatkan Data - loaded_an_area_with_num_features: Anda telah memilih satu kawasan yang mengandungi [[num_features]] ciri. Pada umumnya, sesetengah pelayar web tidak mungkin mampu memaparkan sebegini banyak data dengan betul. Lazimnya, pelayar paling berkemampuan apabila memaparkan kurang daripada 100 ciri sekaligus; lebih daripada itu mungkin akan melambatkan pelayar anda atau membuatnya tidak responsif. Jika anda betul-betul ingin memaparkan data ini, anda boleh berbuat demikian dengan mengklik butang di bawah. + loaded_an_area_with_num_features: Anda telah memilih satu kawasan yang mengandungi [[num_features]] ciri. Pada umumnya, sesetengah pelayar web tidak mungkin mampu memaparkan sebegini banyak data dengan betul. Lazimnya, pelayar paling berkemampuan apabila memaparkan kurang daripada [[max_features]] ciri sekaligus; lebih daripada itu mungkin akan melambatkan pelayar anda atau membuatnya tidak responsif. Jika anda betul-betul ingin memaparkan data ini, anda boleh berbuat demikian dengan mengklik butang di bawah. loading: Memuatkan... manually_select: Pilih kawasan yang lain secara insani object_list: @@ -234,10 +239,9 @@ ms: relation: hubungan way: jalan way: - download: "%{download_xml_link}, %{view_history_link} atau %{edit_link}" download_xml: Muat Turun XML - edit: sunting - view_history: lihat sejarah + edit: Sunting jalan + view_history: Lihat sejarah way: Jalan way_title: "Jalan: %{way_name}" way_details: @@ -247,9 +251,8 @@ ms: nodes: "Nod:" part_of: "Sebahagian:" way_history: - download: "%{download_xml_link} atau %{view_details_link}" download_xml: Muat Turun XML - view_details: lihat butiran + view_details: Lihat butiran way_history: Sejarah Jalan way_history_title: "Sejarah Jalan: %{way_name}" changeset: @@ -278,6 +281,8 @@ ms: description_nearby: Set ubah pengguna berdekatan description_user: Set Ubah oleh %{user} description_user_bbox: Set Ubah oleh %{user} di dalam %{bbox} + empty_anon_html: Suntingan belum dibuat + empty_user_html: Nampaknya anda belum membuat suntingan. Untuk bermula, sila baca <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Panduan Permulaan</a>. heading: Set Ubah heading_bbox: Set Ubah heading_friend: Set Ubah @@ -356,10 +361,6 @@ ms: body: Maaf, tiada catatan atau komen diari dengan id %{id}. Sila semak ejaan anda, atau mungkin pautan yang anda klik itu tidak betul. heading: "Tiada catatan dengan id: %{id}" title: Catatan diari ini tidak wujud - no_such_user: - body: Maaf, tiada pengguna dengan nama %{user}. Sila semak ejaan anda, atau mungkin pautan yang anda klik itu tidak betul. - heading: Pengguna %{user} tidak wujud - title: Pengguna ini tidak wujud view: leave_a_comment: Tinggalkan komen login: Log masuk @@ -453,16 +454,28 @@ ms: suffix_place: ", %{distance} ke %{direction} dari %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Padang Terbang + apron: Apron + gate: Pintu + helipad: Helipad + runway: Landasan Kapal Terbang + taxiway: Jalan Rayap + terminal: Terminal amenity: + WLAN: Capaian WiFi airport: Lapangan Terbang arts_centre: Pusat Seni + artwork: Karya Seni atm: ATM auditorium: Auditorium bank: Bank bar: Kedai Arak + bbq: BBQ bench: Bangku bicycle_parking: Letak Basikal bicycle_rental: Sewa Basikal + biergarten: Taman Bir brothel: Rumah Pelacuran bureau_de_change: Pengurup Wang bus_station: Stesen Bas @@ -471,6 +484,7 @@ ms: car_sharing: Kongsi Kereta car_wash: Cuci Kereta casino: Kasino + charging_station: Stesen Cas cinema: Pawagam clinic: Klinik club: Kelab @@ -489,6 +503,7 @@ ms: ferry_terminal: Terminal Feri fire_hydrant: Pili Bomba fire_station: Balai Bomba + food_court: Medan Selera fountain: Air Pancutan fuel: Minyak grave_yard: Perkuburan @@ -529,9 +544,12 @@ ms: shelter: Perteduhan shop: Kedai shopping: Beli-Belah + shower: Pancuran + social_centre: Pusat Sosial social_club: Kelab Sosial studio: Studio supermarket: Pasar Raya + swimming_pool: Kolam Renang taxi: Teksi telephone: Telefon Awam theatre: Teater @@ -546,37 +564,17 @@ ms: youth_centre: Pusat Belia boundary: administrative: Sempadan Pentadbiran + census: Sempadan Banci + national_park: Taman Negara + protected_area: Kawasan Terlindung + bridge: + aqueduct: Akueduk + suspension: Jambatan Gantung + swing: Jambatan Ayun + viaduct: Jejambat + "yes": Jambatan building: - apartments: Blok Rumah Pangsa - block: Blok Bangunan - bunker: Bunker - chapel: Gereja Kecil - church: Gereja - city_hall: Dewan Bandaraya - commercial: Bangunan Perdagangan - dormitory: Asrama - entrance: Pintu Masuk Bangunan - faculty: Bangunan Fakulti - farm: Bangunan Ladang - flats: Rumah Pangsa - garage: Garaj - hall: Dewan - hospital: Bangunan Hospital - hotel: Hotel - house: Rumah - industrial: Bangunan Industri - office: Bangunan Pejabat - public: Bangunan Awam - residential: Bangunan Perumahan - retail: Bangunan Peruncitan - school: Bangunan Sekolah - shop: Kedai - stadium: Stadium - store: Gedung - terrace: Teres - tower: Menara - train_station: Stesen Keretapi - university: Bangunan Universiti + "yes": Bangunan highway: bridleway: Lorong Kuda bus_guideway: Lorong Bas Berpandu @@ -584,12 +582,11 @@ ms: byway: Jalan Kecil construction: Lebuhraya dalam Pembinaan cycleway: Lorong Basikal - distance_marker: Penanda Jarak emergency_access_point: Titik Capaian Kecemasan footway: Lorong Pejalan Kaki ford: Harungan - gate: Pintu Besar living_street: Jalan Masyarakat + milestone: Batu Tanda Jalan minor: Jalan Sampingan motorway: Lebuhraya motorway_junction: Simpang Lebuhraya @@ -601,14 +598,17 @@ ms: primary_link: Jalan Utama raceway: Jalan Lumba residential: Perumahan + rest_area: Kawasan Rehat road: Jalan Raya secondary: Jalan Sekunder secondary_link: Jalan Sekunder service: Jalan Perkhidmatan services: Perkhidmatan Lebuhraya + speed_camera: Kamera Kelajuan steps: Tangga stile: Tangga Pagar tertiary: Jalan Tertier + tertiary_link: Jalan Tertier track: Laluan trail: Denai trunk: Jalan Utama @@ -622,6 +622,7 @@ ms: building: Bangunan castle: Istana church: Gereja + fort: Kubu house: Rumah icon: Patung manor: Manor @@ -646,6 +647,7 @@ ms: farmland: Tanah Ladang farmyard: Laman Ladang forest: Hutan + garages: Garaj grass: Rumput greenfield: Tanah Tak Terbangun industrial: Kawasan Perindustrian @@ -653,25 +655,28 @@ ms: meadow: Padang Rumput military: Kawasan Tentera mine: Lombong - mountain: Gunung nature_reserve: Cagar Alam + orchard: Dusun park: Taman piste: Padang Luncur Ais - plaza: Plaza quarry: Kuari railway: Landasan Keretapi recreation_ground: Tempat Berekreasi reservoir: Takungan + reservoir_watershed: Kawasan Tadahan Air Takungan residential: Kawasan Perumahan retail: Peruncitan + road: Kawasan Jalan Raya village_green: Padang Kampung vineyard: Ladang Anggur wetland: Tanah Lembap wood: Hutan Kecil leisure: beach_resort: Peranginan Pantai + bird_hide: Kurungan Burung common: Tanah Awam fishing: Tempat Memancing + fitness_station: Pusat Kesihatan garden: Kebun golf_course: Padang Golf ice_rink: Gelanggang Ais @@ -682,12 +687,17 @@ ms: pitch: Padang Sukan playground: Taman Permainan recreation_ground: Tempat Berekreasi + sauna: Sauna slipway: Landasan Kapal sports_centre: Pusat Sukan stadium: Stadium swimming_pool: Kolam Renang track: Balapan Lumba Lari water_park: Taman Air + military: + airfield: Lapangan Terbang Tentera + barracks: Tangsi + bunker: Bunker natural: bay: Teluk beach: Pantai @@ -695,11 +705,12 @@ ms: cave_entrance: Liang Gua channel: Alur cliff: Cenuram - coastline: Garis Pinggir Laut crater: Kawah + dune: Gumuk feature: Rupa Muka fell: Fell fjord: Fjord + forest: Hutan geyser: Geiser glacier: Glasier heath: Kerangas @@ -719,6 +730,7 @@ ms: scrub: Belukar shoal: Beting spring: Mata Air + stone: Batu strait: Selat tree: Pokok valley: Lembah @@ -727,6 +739,19 @@ ms: wetland: Tanah Lembap wetlands: Tanah Lembap wood: Hutan Kecil + office: + accountant: Juruakaun + architect: Jurubina + company: Syarikat + employment_agency: Agensi Pekerjaan + estate_agent: Ejen Hartanah + government: Pejabat Kerajaan + insurance: Pejabat Insurans + lawyer: Peguam + ngo: Pejabat Badan Bukan Kerajaan + telecommunication: Pejabat Telekomunikasi + travel_agent: Agensi Pelancongan + "yes": Pejabat place: airport: Lapangan Terbang city: Bandar @@ -738,6 +763,7 @@ ms: houses: Rumah-Rumah island: Pulau islet: Anak Pulau + isolated_dwelling: Kediaman Terpencil locality: Lokaliti moor: Mur municipality: Perbandaran @@ -761,6 +787,7 @@ ms: junction: Simpang Landasan Keretapi level_crossing: Lintasan Keretapi Rata light_rail: Rel Ringan + miniature: Landasan Mini monorail: Monorel narrow_gauge: Landasan Keretapi Sempit platform: Platform Keretapi @@ -775,7 +802,7 @@ ms: yard: Laman Keretapi shop: alcohol: Kedai Arak Tanpa Lesen - apparel: Kedai Busana + antiques: Kedai Antik art: Kedai Seni bakery: Kedai Roti beauty: Kedai Kecantikan @@ -784,7 +811,6 @@ ms: books: Kedai Buku butcher: Kedai Daging car: Kedai Kereta - car_dealer: Peniaga Kereta car_parts: Alat Ganti Kereta car_repair: Baiki Kereta carpet: Kedai Permaidani @@ -799,7 +825,6 @@ ms: department_store: Gedung Serbaneka discount: Kedai Diskaun doityourself: DIY - drugstore: Kedai Ubat dry_cleaning: Kedai Cuci Kering electronics: Kedai Elektronik estate_agent: Ejen Hartanah @@ -865,7 +890,10 @@ ms: valley: Lembah viewpoint: Sudut Pandangan zoo: Taman Haiwan + tunnel: + "yes": Terowong waterway: + artificial: Jalan Air Buatan boatyard: Limbungan Bot canal: Terusan connector: Penyambung Jalan Air @@ -901,6 +929,7 @@ ms: history_tooltip: Lihat suntingan bagi kawasan ini history_zoom_alert: Anda mesti mengezum dekat untuk melihat suntingan bagi kawasan ini layouts: + community: Komuniti community_blogs: Blog Komuniti community_blogs_title: Blog-blog ahli komuniti OpenStreetMap copyright: Hak Cipta & Lesen @@ -922,17 +951,17 @@ ms: history: Sejarah home: laman utama home_tooltip: Pergi ke lokasi rumah - inbox: peti masuk (%{count}) + inbox_html: peti masuk %{count} inbox_tooltip: one: Peti masuk anda mengandungi sepucuk pesanan yang belum dibaca other: Peti masuk anda mengandungi %{count} pesanan yang belum dibaca zero: Peti masuk anda tidak mengandungi sebarang pesanan yang belum dibaca intro_1: OpenStreetMap ialah peta seluruh dunia yang boleh disunting. Ia dihasilkan oleh insan-insan seperti anda. - intro_2: OpenStreetMap membolehkan anda untuk melihat, menyunting dan menggunakan data geografi secara kolaborasi dari mana-mana di atas muka Bumi. - intro_3: Pengehosan OpenStreetMap disokong dengan sepenuh hati oleh %{ucl}, %{ic} dan %{bytemark}. Penyokong-penyokong projek yang lain tersenarai dalam %{partners}. - intro_3_ic: Imperial College London - intro_3_partners: wiki - intro_3_ucl: Pusat VR UCL + intro_2_create_account: Buka akaun pengguna + intro_2_download: dimuat turun + intro_2_html: Data ini boleh %{download} dan %{use} dengan percuma di bawah %{license}nya. %{create_account} untuk memperbaiki peta ini. + intro_2_license: lesen terbuka + intro_2_use: digunakan license: title: Data OpenStreetMap dilesenkan di bawah lesen Creative Commons Pengiktirafan-PerkongsianSerupa 2.0 Umum log_in: log masuk @@ -946,9 +975,14 @@ ms: title: Sokonglah OpenStreetMap dengan dermaan dalam bentuk wang osm_offline: Pangkalan data OpenStreetMap kini diputuskan sambungannya sementara kerja penyelenggaran mustahak dilangsungkan. osm_read_only: Pangkalan data OpenStreetMap sekarang ditetapkan pada mod baca sahaja sementara kerja penyelenggaran mustahak dilangsungkan. + partners_bytemark: Bytemark Hosting + partners_html: Pengehosan disokong oleh %{ucl}, %{ic} dan %{bytemark}, serta %{partners} yang lain. + partners_ic: Imperial College London + partners_partners: rakan-rakan kongsi + partners_ucl: Pusat VR UCL sign_up: daftar diri sign_up_tooltip: Buka akaun untuk menyunting - sotm2011: "-" + sotm2012: Datanglah ke Persidangan OpenStreetMap 2012 di Tokyo pada 6-8hb September! tag_line: Peta Dunia Wiki Bebas user_diaries: Diari Pengguna user_diaries_tooltip: Lihat diari pengguna @@ -963,7 +997,30 @@ ms: english_link: teks asal bahasa Inggeris text: Sekiranya terdapat percanggahan antara halaman yang diterjemah ini dengan %{english_original_link}, maka versi bahasa Inggeris itu akan diberi keutamaan title: Perihal terjemahan ini - legal_babble: "<h2>Hak Cipta dan Lesen</h2>\n<p>\n OpenStreetMap merupakan <i>data terbuka</i> yang dilesenkan di bawah lesen <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Pengiktirafan-PerkongsianSerupa 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Anda diberi kebebasan untuk menyalin, mengedarkan, memancarkan dan mengubah suai peta-peta dan data kami asalkan anda memberikan penghargaan kepada OpenStreetMap dan para penyumbangnya. Sekiranya anda mengubah atau menokok tambah peta-peta atau data kami, anda boleh mengedarkan hasilnya di bawah lesen yang sama sahaja. <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Hukum undang-undang</a> yang penuh ini menjelaskan hak-hak dan tanggungjawab anda.\n</p>\n\n<h3>Cara memberikan penghargaan kepada OpenStreetMap</h3>\n<p>\n Sekiranya anda menggunakan imej-imej peta OpenStreetMap map images, kami memohon supaya penghargaan anda menyatakan sekurang-kurangnya yang berikut: “© para penyumbang OpenStreetMap, CC-BY-SA”. Jika anda menggunakan data peta sahaja, kami memohon “Data peta © penyumbang OpenStreetMap, CC-BY-SA”.\n</p>\n<p>\n Di mana mungkin, OpenStreetMap sewajarnya dihiperpautkan dengan <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> dan CC-BY-SA dengan <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Jika anda menggunakan bahantara yang tidak membolehkan pautan (cth. hasil cetakan), kami mencadangkan agar anda melencongkan para pembaca anda kepada www.openstreetmap.org (mungkin dengan mengembangkan ‘OpenStreetMap’ kepada alamat penuh ini) dan juga www.creativecommons.org.\n</p>\n\n<h3>Mengetahui lebih lanjut</h3>\n<p>\n Baca lebih lanjut tentang penggunaan data kami di <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Soalan Lazim Undang-Undang</a>.\n</p>\n<p>\n Para penyumbang OSM diingatkan supaya tidak sesekali menambahkan data dari mana-mana sumber yang berhak cipta (cth. Google Maps atau peta cetakan) tanpa kebenaran yang tersurat daripada pemegang hak cipta.\n</p>\n<p>\n Sungguhpun OpenStreetMap merupakan data terbuka, namun kami tidak boleh menyediakan API peta yang percuma untuk pemaju pihak ketiga.\n\n Bacalah <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Dasar Penggunaan API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Dasar Penggunaan Jubin</a> dan <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Dasar Penggunaan Nominatim</a> kami.\n</p>\n\n<h3>Penyumbang kami</h3>\n<p>\n Lesen CC-BY-SA kami mengehendaki anda untuk “memberikan penghargaan Pengarang Asal yang berpatutan dengan bahantara atau kaedah yang Anda sedang gunakan”. Setiap seorang pemeta OSM tidak memohon penghargaan yang melebihi penghargaan kepada “para penyumbang OpenStreetMap”, tetapi seandainya data daripada agensi pemetaan kebangsaan atau sebarang sumber utama yang lain telah disertakan dalam OpenStreetMap, maka adalah wajar untuk memberikan penghargaan kepadanya dengan terus mengeluarkan semula penghargaannya atau membubuh pautan kepadanya dalam laman ini.\n</p>\n\n<!--\nMakluman untuk penyunting halaman\n\nSenarai berikut hanya menyertakan pihak-pihak yang memerlukan atribusi sebagai syarat penggunaan data di OpenStreetMap. Ia bukan katalog import am dan tidak boleh digunakan melainkan apabila atribusi diperlukan untuk mematuhi lesen data yang diimport itu.\n\nSebarang tambahan di sini mesti dibincangkan dengan penyelia sistem OSM terlebih dahulu.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Mengandungi data subbandar berasaskan data Australian Bureau of Statistics.</li>\n <li><strong>Austria</strong>: Mengandungi data daripada <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> di bawah <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Kanada</strong>: Mengandungi data daripada GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada).</li>\n <li><strong>New Zealand</strong>: Mengandungi data yang disumberkan daripada Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Perancis</strong>: Mengandungi data yang disumberkan daripada Direction Générale des Impôts.</li>\n <li><strong>Poland</strong>: Mengandungi data daripada <a href=\"http://ump.waw.pl/\">peta-peta UMP-pcPL</a>. Hak cipta penyumbang UMP-pcPL.</li>\n <li><strong>United Kingdom</strong>: Mengandungi data Ordnance Survey data © Crown copyright and database right 2010.</li>\n</ul>\n\n<p>\n Penyertaan data dalam OpenStreetMap tidak bermaksud bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang waranti, atau menerima sebarang tanggungan.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: Mengandungi data daripada <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (di bawah <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>) dan <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a>, dan Land Tirol (under <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT dengan pindaan</a>)." + contributors_au_html: "<strong>Australia</strong>: Mengandungi data subbandar berasaskan data Australian Bureau of Statistics." + contributors_ca_html: "<strong>Kanada</strong>: Mengandungi data daripada GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: " Untuk keterangan lanjut tentang semua ini, serta sumber-sumber lain yang telah digunakan untuk membantu menambah baik OpenStreetMap, sila rujuk <a href=\"http://wiki.openstreetmap.org/wiki/Contributors\">Halaman penyumbang</a> di Wiki OpenStreetMap." + contributors_footer_2_html: " Penyertaan data dalam OpenStreetMap tidak bermaksud bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang waranti, atau menerima sebarang tanggungan." + contributors_fr_html: "<strong>Perancis</strong>: Mengandungi data yang disumberkan daripada Direction Générale des Impôts." + contributors_gb_html: "<strong>United Kingdom</strong>: Mengandungi data Ordnance Survey data © Crown copyright and database right 2010." + contributors_intro_html: " Lesen CC BY-SA kami mengehendaki anda untuk “memberikan penghargaan Pengarang Asal yang berpatutan dengan bahantara atau kaedah yang Anda sedang gunakan”. Setiap seorang pemeta OSM tidak memohon penghargaan yang melebihi penghargaan kepada “para penyumbang OpenStreetMap”, tetapi seandainya data daripada agensi pemetaan kebangsaan atau sebarang sumber utama yang lain telah disertakan dalam OpenStreetMap, maka adalah wajar untuk memberikan penghargaan kepadanya dengan terus mengeluarkan semula penghargaannya atau membubuh pautan kepadanya dalam laman ini." + contributors_nl_html: "<strong>Belanda</strong>: Mendandungi data © AND, 2007\n (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>New Zealand</strong>: Mengandungi data yang disumberkan daripada Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Poland</strong>: Mengandungi data daripada <a href=\"http://ump.waw.pl/\">peta-peta UMP-pcPL</a>. Hak cipta penyumbang UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Maklumat lanjut mengenai penggunaan data UMP oleh OSM&</a>" + contributors_title_html: Penyumbang kami + contributors_za_html: "<strong>Afrika Selatan</strong>: Mengandungi data yang disumberkan daripada\n <a href=\"http://www.ngi.gov.za/\">Pejabat Ketua Pengarah:\n National Geo-Spatial Information</a>, Hak cipta kerajaan dipelihara." + credit_1_html: " Sekiranya anda menggunakan imej-imej peta OpenStreetMap map images, kami memohon supaya penghargaan anda menyatakan sekurang-kurangnya yang berikut: “© para penyumbang OpenStreetMap, CC BY-SA”. Jika anda menggunakan data peta sahaja, kami memohon “Data peta © penyumbang OpenStreetMap, CC BY-SA”." + credit_2_html: " Di mana mungkin, OpenStreetMap sewajarnya dihiperpautkan dengan <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> dan CC BY-SA dengan <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Jika anda menggunakan bahantara yang tidak membolehkan pautan (cth. hasil cetakan), kami mencadangkan agar anda melencongkan para pembaca anda kepada www.openstreetmap.org (mungkin dengan mengembangkan ‘OpenStreetMap’ kepada alamat penuh ini) dan juga www.creativecommons.org." + credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap + intro_1_html: OpenStreetMap merupakan <i>data terbuka</i> yang dilesenkan di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Pengiktirafan-PerkongsianSerupa 2.0</a> (CC BY-SA). + intro_2_html: " Anda diberi kebebasan untuk menyalin, mengedarkan, memancarkan dan mengubah suai peta-peta dan data kami asalkan anda memberikan penghargaan kepada OpenStreetMap dan para penyumbangnya. Sekiranya anda mengubah atau menokok tambah peta-peta atau data kami, anda boleh mengedarkan hasilnya di bawah lesen yang sama sahaja. <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Hukum undang-undang</a> yang penuh ini menjelaskan hak-hak dan tanggungjawab anda." + more_1_html: " Baca lebih lanjut tentang penggunaan data kami di <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Soalan Lazim Undang-Undang</a>." + more_2_html: " Para penyumbang OSM diingatkan supaya tidak sesekali menambahkan data dari mana-mana sumber yang berhak cipta (cth. Google Maps atau peta cetakan) tanpa kebenaran yang tersurat daripada pemegang hak cipta." + more_3_html: " Sungguhpun OpenStreetMap merupakan data terbuka, namun kami tidak boleh menyediakan API peta yang percuma untuk pemaju pihak ketiga.\n\n Bacalah <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Dasar Penggunaan API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Dasar Penggunaan Jubin</a> dan <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Dasar Penggunaan Nominatim</a> kami." + more_title_html: Mengetahui lebih lanjut + title_html: Hak Cipta dan Lesen native: mapping_link: mula membuat peta native_link: versi Bahasa Melayu @@ -1005,10 +1062,6 @@ ms: body: Maaf, tiada pesanan dengan ID ini. heading: Pesanan ini tidak wujud title: Pesanan ini tidak wujud - no_such_user: - body: Maaf, tiada pengguna yang bernama sedemikian. - heading: Pengguna ini tidak wujud - title: Pengguna ini tidak wujud outbox: date: Tarikh inbox: Peti masuk @@ -1178,6 +1231,8 @@ ms: allow_write_gpx: memuat naik jejak GPS. allow_write_prefs: mengubah suai keutamaan penggunanya. authorize_url: "URL Kebenaran:" + confirm: Adakah anda pasti? + delete: Hapuskan Klien edit: Sunting Butiran key: "Kunci Pengguna:" requests: "Kebenaran-kebenaran berikut dipohon daripada pengguna tersebut:" @@ -1187,6 +1242,37 @@ ms: url: "URL Token Permohonan:" update: flash: Maklumat klien berjaya dikemaskinikan + redaction: + create: + flash: Redaksi dicipta. + destroy: + error: Ralat terjadi ketika menghapuskan redaksi ini. + flash: Redaksi dihapuskan. + not_empty: Redaksi tidak kosong. Sila nyahredaksi semua versi yang tergolong dalam redaksi ini sebelum memusnahkannya. + edit: + description: Keterangan + heading: Sunting redaksi + submit: Simpan redaksi + title: Sunting redaksi + index: + empty: Tiada redaksi. + heading: Senarai redaksi + title: Senarai redaksi + new: + description: Keterangan + heading: Isikan maklumat untuk redaksi baru + submit: Cipta redaksi + title: Mencipta redaksi baru + show: + confirm: Adakah anda pasti? + description: "Keterangan:" + destroy: Buang redaksi ini + edit: Sunting redaksi ini + heading: Memaparkan redaksi "%{title}" + title: Memaparkan redaksi + user: "Pencipta:" + update: + flash: Perubahan disimpan. site: edit: anon_edits_link_text: Ketahuilah sebab jadinya begini. @@ -1201,7 +1287,6 @@ ms: index: js_1: Anda sedang menggunakan pelayar web yang tidak menyokong JavaScript, ataupun anda tidak menghidupkan JavaScript. js_2: OpenStreetMap menggunakan JavaScript untuk peta licinnya. - js_3: Apa kata anda cuba <a href="http://tah.openstreetmap.org/Browse/">pelayar jubin statik Tiles@Home</a> seandainya anda tidak dapat menghidupkan JavaScript. license: license_name: Pengiktirafan-PerkongsianSerupa 2.0 notice: Dilesenkan di bawah lesen %{license_name} oleh %{project_name} dan para penyumbangnya. @@ -1278,6 +1363,23 @@ ms: unclassified: Jalan tidak terkelas unsurfaced: Jalan tanpa turapan wood: Hutan kecil + markdown_help: + alt: Teks alt + first: Perkara pertama + heading: Judul + headings: Judul + image: Gambar + link: Pautan + ordered: Senarai tertib + second: Perkara kedua + subheading: Judul kecil + text: Teks + title_html: Dihuraikan dengan <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Senarai tak tertib + url: URL + richtext_area: + edit: Sunting + preview: Pralihat search: search: Cari search_help: "cth: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', atau 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>banyak lagi contoh...</a>" @@ -1314,16 +1416,13 @@ ms: visibility: "Keterlihatan:" visibility_help: apakah maksud ini? list: + empty_html: Belum ada apa-apa lagi di sini. <a href='%{upload_link}'>Muat naik jejak baru</a> atau ketahui lebih lanjut tentang penjejakan GPS di <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>halaman wiki</a> ini. public_traces: Jejak GPS umum public_traces_from: Jejak GPS umum oleh %{user} tagged_with: " ditagkan dengan %{tags}" your_traces: Jejak GPS anda make_public: made_public: Jejak diumumkan - no_such_user: - body: Maaf, tiada pengguna dengan nama %{user}. Sila semak ejaan anda, atau mungkin pautan yang anda klik itu tidak betul. - heading: Pengguna %{user} tidak wujud - title: Pengguna ini tidak wujud offline: heading: Storan GPX di Luar Talian message: Sistem storan dan muat naik fail GPX kini tidak boleh digunakan. @@ -1362,8 +1461,8 @@ ms: trace_optionals: tags: Tag trace_paging_nav: - next: Berikutnya » - previous: "« Sebelumnya" + newer: Jejak Baru + older: Jejak Lama showing_page: Memaparkan halaman %{page} view: delete_track: Hapuskan jejak ini @@ -1595,7 +1694,7 @@ ms: activate_user: aktifkan pengguna ini add as friend: jadikan kawan ago: (%{time_in_words_ago} lalu) - block_history: lihat sekatan yang diterima + block_history: sekatan yang diterima blocks by me: sekatan oleh saya blocks on me: sekatan ke atas saya comments: komen @@ -1621,7 +1720,7 @@ ms: latest edit: "Suntingan terkini %{ago}:" m away: "%{count}m jauhnya" mapper since: "Pemeta sejak:" - moderator_history: lihat sekatan yang dikenakan + moderator_history: sekatan yang dikenakan my comments: komen saya my diary: diari saya my edits: suntingan saya @@ -1677,7 +1776,6 @@ ms: filter: block_expired: Sekatan ini sudah luput dan tidak boleh disunting. block_period: Tempoh sekatan mestilah salah satu nilai yang boleh dipilih dalam senarai juntai bawah ini. - not_a_moderator: Anda perlu menjadi penyelia untuk melakukan tindakan itu. helper: time_future: Berakhir dalam masa %{time}. time_past: Berakhir %{time} lalu. @@ -1707,11 +1805,14 @@ ms: creator_name: Pembuat display_name: Pengguna yang Disekat edit: Sunting + next: Berikutnya » not_revoked: (tidak ditarik balik) + previous: « Sebelumnya reason: Sebab sekatan revoke: Tarik Balik! revoker_name: Ditarik balik oleh show: Tunjukkan + showing_page: Memaparkan halaman %{page} status: Status period: one: 1 jam diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 36dd505a4..1779c88a1 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -1,10 +1,13 @@ -# Messages for Norwegian BokmÃ¥l (‪Norsk (bokmÃ¥l)‬) +# Messages for Norwegian BokmÃ¥l (‪norsk (bokmÃ¥l)‬) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Dittaeva # Author: Event # Author: Gustavf +# Author: Haakon K # Author: Hansfn # Author: Laaknor +# Author: Nemo bis # Author: Nghtwlkr # Author: Oyvind # Author: The real emj @@ -87,7 +90,6 @@ nb: changeset: changeset: "Endringssett: %{id}" changesetxml: XML for endringssett - download: Last ned %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Endringssett %{id} title_comment: "Endringssett: %{id} - %{comment}" @@ -149,7 +151,6 @@ nb: next_changeset_tooltip: Neste redigering av %{user} prev_changeset_tooltip: Forrige redigering av %{user} node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Last ned XML edit: rediger node: Node @@ -159,7 +160,6 @@ nb: coordinates: "Koordinater:" part_of: "Del av:" node_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Last ned XML node_history: Nodehistorik node_history_title: "Nodehistorikk: %{node_name}" @@ -175,7 +175,6 @@ nb: of: av showing_page: Viser side relation: - download: "%{download_xml_link} eller %{view_history_link}" download_xml: Last ned XML relation: Relasjon relation_title: "Relasjon: %{relation_name}" @@ -184,7 +183,6 @@ nb: members: "Medlemmer:" part_of: "Del av:" relation_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Last ned XML relation_history: Relasjonshistorikk relation_history_title: "Relasjonshistorikk: %{relation_name}" @@ -246,7 +244,6 @@ nb: relation: relasjon way: vei way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Last ned XML edit: rediger view_history: vis historikk @@ -259,7 +256,6 @@ nb: nodes: "Noder:" part_of: "Del av:" way_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Last ned XML view_details: vis detaljer way_history: Veihistorikk @@ -357,10 +353,6 @@ nb: body: Det er ingen dagbokinnlegg eller kommentar med ID %{id}. Sjekk om du har skrevet feil eller om lenka du klikket er feil. heading: Ingen oppføring med %{id} title: Ingen slik dagbokoppføring - no_such_user: - body: Beklager, det finnes ingen bruker med navnet %{user}. Vennligst sjekk at du har stavet riktig, eller kanskje lenken du fulgte er feil. - heading: Brukeren %{user} finnes ikke - title: Ingen bruker funnet view: leave_a_comment: Legg igjen en kommentar login: Logg inn @@ -455,12 +447,15 @@ nb: search_osm_nominatim: prefix: amenity: + WLAN: TrÃ¥dløs internettilgang airport: Flyplass arts_centre: Kunstsenter + artwork: Kunstverk atm: Minibank auditorium: Auditorium bank: Bank bar: Bar + bbq: Grill bench: Benk bicycle_parking: Sykkelparkering bicycle_rental: Sykkelutleie @@ -490,6 +485,7 @@ nb: ferry_terminal: Ferjeterminal fire_hydrant: Brannhydrant fire_station: Brannstasjon + food_court: Serveringssteder fountain: Fontene fuel: Drivstoff grave_yard: Gravlund @@ -530,6 +526,7 @@ nb: shelter: Tilfluktsrom shop: Butikk shopping: Handel + shower: Dusj social_club: Sosial klubb studio: Studio supermarket: Supermarked @@ -547,37 +544,14 @@ nb: youth_centre: Ungdomssenter boundary: administrative: Administrativ grense + national_park: Nasjonalpark + protected_area: Verna omrÃ¥de + bridge: + suspension: Hengebru + swing: Svingbru + "yes": Bru building: - apartments: Leilighetsblokk - block: Bygningsblokk - bunker: Bunker - chapel: Kapell - church: Kirke - city_hall: RÃ¥dhus - commercial: Kommersiell bygning - dormitory: Sovesal - entrance: Bygningsinngang - faculty: Fakultetsbygning - farm: GÃ¥rdsbygg - flats: Leiligheter - garage: Garasje - hall: Spisesal - hospital: Sykehusbygg - hotel: Hotell - house: Hus - industrial: Industribygg - office: Kontorbygg - public: Offentlig bygg - residential: Boligbygg - retail: Detaljsalgbygg - school: Skolebygg - shop: Butikk - stadium: Stadion - store: Butikk - terrace: Terrasse - tower: TÃ¥rn - train_station: Jernbanestasjon - university: Universitetsbygg + "yes": Bygning highway: bridleway: Ridevei bus_guideway: Ledet bussfelt @@ -585,11 +559,9 @@ nb: byway: Stikkvei construction: Motorvei under konstruksjon cycleway: Sykkelsti - distance_marker: Avstandsmarkør emergency_access_point: Nødtilgangspunkt footway: Gangsti ford: Vadested - gate: Bom living_street: Gatetun minor: Mindre vei motorway: Motorvei @@ -602,6 +574,7 @@ nb: primary_link: Primær vei raceway: Racerbane residential: Bolig + rest_area: Rasteplass road: Vei secondary: Sekundær vei secondary_link: Sekundær vei @@ -654,11 +627,9 @@ nb: meadow: Eng military: Militært omrÃ¥de mine: Gruve - mountain: Fjell nature_reserve: Naturreservat park: Park piste: Løype - plaza: Torg quarry: Steinbrudd railway: Jernbane recreation_ground: Idrettsplass @@ -696,7 +667,6 @@ nb: cave_entrance: Huleinngang channel: Kanal cliff: Klippe - coastline: Kystlinje crater: Krater feature: Egenskap fell: Fjellskrent @@ -720,6 +690,7 @@ nb: scrub: Kratt shoal: Grunning spring: Kilde + stone: Stein strait: Stred tree: Tre valley: Dal @@ -776,7 +747,6 @@ nb: yard: Skiftetomt shop: alcohol: Utenfor lisens - apparel: Klesbutikk art: Kunstbutikk bakery: Bakeri beauty: Skjønnhetssalong @@ -785,7 +755,6 @@ nb: books: Bokhandel butcher: Slakter car: Bilbutikk - car_dealer: Bilforhandler car_parts: Bildeler car_repair: Bilverksted carpet: Teppebutikk @@ -800,7 +769,6 @@ nb: department_store: Varehus discount: Tilbudsbutikk doityourself: Gjør-det-selv - drugstore: Apotek dry_cleaning: Renseri electronics: Elektronikkforretning estate_agent: Eiendomsmegler @@ -904,6 +872,7 @@ nb: history_tooltip: Vis redigeringer for dette omrÃ¥det history_zoom_alert: Du mÃ¥ zoome inn for Ã¥ vise redigeringer i dette omrÃ¥det layouts: + community: Samfunnet community_blogs: Fellesskapsblogger community_blogs_title: Blogger fra medlemmene i OpenStreetMap-felleskapet copyright: Opphavsrett & lisens @@ -916,7 +885,7 @@ nb: export: Eksporter export_tooltip: Eksporter kartdata foundation: Stiftelse - foundation_title: OpenStreetMap stiftelsen + foundation_title: OpenStreetMap-stiftelsen gps_traces: GPS-spor gps_traces_tooltip: Behandle GPS-spor help: Hjelp @@ -925,16 +894,11 @@ nb: history: Historikk home: hjem home_tooltip: GÃ¥ til hjemmeposisjon - inbox: innboks (%{count}) inbox_tooltip: one: Din innboks inneholder 1 ulest melding other: Din innboks inneholder %{count} uleste meldinger zero: Din innboks inneholder ingen uleste meldinger intro_1: OpenStreetMap er et fritt redigerbart kart over hele jorda. Det er lagd av folk som deg. - intro_2: OpenStreetMap gjør det mulig Ã¥ vise, redigere og bruke geografiske data pÃ¥ en samarbeidende mÃ¥te fra hvor som helst pÃ¥ jorda. - intro_3: OpenStreetMaps sponses av %{ucl}, %{ic} og %{bytemark}. Andre sponsorer av prosjektet er oppført i %{partners}. - intro_3_ic: Imperial College London - intro_3_partners: wiki license: title: Data fra OpenStreetMap er lisensiert under lisensen Creative Commons Navngivelse-Del pÃ¥ like vilkÃ¥r 2.0 Generisk log_in: logg inn @@ -947,13 +911,13 @@ nb: text: Doner title: Støtt OpenStreetMap med en donasjon osm_offline: OpenStreetMap databasen er for øyeblikket utilgjengelig mens essensielt vedlikeholdsarbeid utføres. - osm_read_only: OpenStreetMap databasen er for øyeblikket i kun-lese-modus mens essensielt vedlikeholdsarbeid utføres. + osm_read_only: OpenStreetMap kan ikke redigeres akkurat nÃ¥, pÃ¥ grunn av nødvendig vedlikeholdsarbeid. + partners_partners: partnere project_name: h1: OpenStreetMap title: OpenStreetMap sign_up: registrer sign_up_tooltip: Opprett en konto for redigering - sotm2011: Kom til 2011 OpenStreetMap-konferansen, «Kartets tilstand», 11.-9. september i Denver! tag_line: Fritt Wiki-verdenskart user_diaries: Brukerdagbok user_diaries_tooltip: Vis brukerens dagbok @@ -968,7 +932,27 @@ nb: english_link: den engelske originalen text: I tilfellet av en konflikt mellom denne oversatte siden og %{english_original_link} har den engelske presedens title: Om denne oversettelsen - legal_babble: "<h2>Opphavsrett og lisenser</h2>\n<p>\n OpenStreetMap er <i>Ã¥pne data</i>, lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Navngivelse-DelPÃ¥SammeVilkÃ¥r 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Du er fri til Ã¥ kopiere, distribuere, overføre og tilpasse vÃ¥re kart og data, sÃ¥ lenge du krediterer OpenStreetMap og dens\n bidragsytere. Hvis du endrer eller bygger pÃ¥ vÃ¥re kart eller data, kan du bare distribuere resultatet under samme lisens. \n Den fulle <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiske\n koden</a> forklarer rettighetene og ansvaret.\n</p>\n\n<h3>Hvordan kreditere OpenStreetMap</h3>\n<p>\n Hvis du bruker OpenStreetMap kartbilder, ber vi om at din kreditering minst inneholder \n «© OpenStreetMap-bidragsytere, CC-BY-SA». Hvis du bare bruker kartdata, ber vi om \n «Kartdata © OpenStreetMap-bidragsytere, CC-BY-SA».\n</p>\n<p>\n Der det er mulig, bør OpenStreetMap bli lenket til <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n og CC-BY-SA til <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Hvis\n du bruker et medium der lenker ikke er mulig (f.eks. i utskrevne arbeid), foreslÃ¥r vi at du henviser leserne til\n www.openstreetmap.org (kanskje ved Ã¥ utvide 'OpenStreetMap' til denne fullstendige adressen) og til\n www.creativecommons.org.\n</p>\n\n<h3>Finn ut mer</h3>\n<p>\n Les mer om hvordan du bruker vÃ¥re data i den <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiske\n FAQ-en</a>.\n</p>\n<p>\n OSM-bidragsytere blir pÃ¥minnet Ã¥ aldri legge til data fra opphavsrettsbeskyttede kilder (f.eks. Google Maps eller utskrevne kart) uten\n uttrykkelig tillatelse fra rettighetshavere.\n</p>\n<p>\n Selv om OpenStreetMap er Ã¥pne data kan vi ikke gi et\n gratis kart-API til tredjepartsutviklere.\n\n Se vÃ¥re retningslinjer for bruken av <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-et</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">kartbilder (Tiles)</a>\n og <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim</a>.\n</p>\n\n<h3>VÃ¥re bidragsytere</h3>\n<p>\n VÃ¥r CC-BY-SA-lisens krever at du «gir den opprinnelige forfatteren rimelig kreditt til mediet eller mÃ¥ten du\n benytter». Individuelle OSM-kartleggere krever ikke en kreditering utover «OpenStreetMap bidragsytere»,\n men der data fra et nasjonal kartleggingsbyrÃ¥ eller fra en annen stor kilde er blitt inkludert inne i\n OpenStreetMap, kan det være fornuftig Ã¥ kreditere dem ved direkte\n reprodusering av deres kreditt eller ved Ã¥ linke til det pÃ¥ denne siden.\n</p>\n\n<!--\nInformasjon til sideredaktører\n\nDen følgende listen lister kun opp de organisasjonene som krever kreditering\nsom et vilkÃ¥r for at deres data brukes i OpenStreetMap. Det er ikke en\ngenerell importeringskatalog og mÃ¥ ikke brukes unntatt nÃ¥r kreditering\nkreves for Ã¥ oppfylle lisensvilkÃ¥rene til de importerte dataene.\n\nAlle tillegg her mÃ¥ diskuteres med en OSM-sysadmin først.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Inneholder forstaddata basert\n pÃ¥ Australian Bureau of Statistics data.</li>\n <li><strong>Canada</strong>: Inneholder data fra\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Frankrike</strong>: Inneholder data hentet fra\n Direction Générale des Impôts.</li>\n <li><strong>New Zealand</strong>: Inneholder data hentet fra\n Land Information New Zealand. Crown Copyright reservert.</li>\n <li><strong>Polen</strong>: Inneholder data fra <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL bidragsytere.</li>\n <li><strong>Storbritannia</strong>: Inneholder Ordnance\n Survey data © Crown copyright og database-rettigheter\n 2010.</li>\n <li><strong>Østerrike</strong>: Inneholder data hentet fra\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> under\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n</ul>\n\n<p>\n Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige\n dataleverandøren støtter OpenStreetMap, gir noen garanti eller\n godtar noe erstatningsansvar.\n</p>" + legal_babble: + contributors_at_html: "<strong>Østerrike</strong>: Inneholder data hentet fra\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> under\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>." + contributors_au_html: "<strong>Australia</strong>: Inneholder forstaddata basert\n pÃ¥ Australian Bureau of Statistics data." + contributors_ca_html: "<strong>Canada</strong>: Inneholder data fra\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_2_html: " Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige\n dataleverandøren støtter OpenStreetMap, gir noen garanti eller\n godtar noe erstatningsansvar." + contributors_fr_html: "<strong>Frankrike</strong>: Inneholder data hentet fra\n Direction Générale des Impôts." + contributors_gb_html: "<strong>Storbritannia</strong>: Inneholder Ordnance\n Survey data © Crown copyright og database-rettigheter\n 2010." + contributors_intro_html: " VÃ¥r CC BY-SA-lisens krever at du «gir den opprinnelige forfatteren rimelig kreditt til mediet eller mÃ¥ten du\n benytter». Individuelle OSM-kartleggere krever ikke en kreditering utover «OpenStreetMap bidragsytere»,\n men der data fra et nasjonal kartleggingsbyrÃ¥ eller fra en annen stor kilde er blitt inkludert inne i\n OpenStreetMap, kan det være fornuftig Ã¥ kreditere dem ved direkte\n reprodusering av deres kreditt eller ved Ã¥ linke til det pÃ¥ denne siden." + contributors_nz_html: "<strong>New Zealand</strong>: Inneholder data hentet fra\n Land Information New Zealand. Crown Copyright reservert." + contributors_pl_html: "<strong>Polen</strong>: Inneholder data fra <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL bidragsytere." + contributors_title_html: VÃ¥re bidragsytere + credit_1_html: " Hvis du bruker OpenStreetMap kartbilder, ber vi om at din kreditering minst inneholder \n «© OpenStreetMap-bidragsytere, CC BY-SA». Hvis du bare bruker kartdata, ber vi om \n «Kartdata © OpenStreetMap-bidragsytere, CC BY-SA»." + credit_2_html: " Der det er mulig, bør OpenStreetMap bli lenket til <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n og CC BY-SA til <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Hvis\n du bruker et medium der lenker ikke er mulig (f.eks. i utskrevne arbeid), foreslÃ¥r vi at du henviser leserne til\n www.openstreetmap.org (kanskje ved Ã¥ utvide 'OpenStreetMap' til denne fullstendige adressen) og til\n www.creativecommons.org." + credit_title_html: Hvordan kreditere OpenStreetMap + intro_1_html: " OpenStreetMap er <i>Ã¥pne data</i>, lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Navngivelse-DelPÃ¥SammeVilkÃ¥r 2.0</a> (CC BY-SA)." + intro_2_html: " Du er fri til Ã¥ kopiere, distribuere, overføre og tilpasse vÃ¥re kart og data, sÃ¥ lenge du krediterer OpenStreetMap og dens\n bidragsytere. Hvis du endrer eller bygger pÃ¥ vÃ¥re kart eller data, kan du bare distribuere resultatet under samme lisens. \n Den fulle <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiske\n koden</a> forklarer rettighetene og ansvaret." + more_1_html: " Les mer om hvordan du bruker vÃ¥re data i den <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiske\n FAQ-en" + more_2_html: " OSM-bidragsytere blir pÃ¥minnet Ã¥ aldri legge til data fra opphavsrettsbeskyttede kilder (f.eks. Google Maps eller utskrevne kart) uten\n uttrykkelig tillatelse fra rettighetshavere." + more_3_html: " Selv om OpenStreetMap er Ã¥pne data kan vi ikke gi et\n gratis kart-API til tredjepartsutviklere.\n\n Se vÃ¥re retningslinjer for bruken av <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-et</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">kartbilder (Tiles)</a>\n og <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim</a>." + more_title_html: Finn ut mer + title_html: Opphavsrett og lisenser native: mapping_link: start kartlegging native_link: Norsk versjon @@ -1007,10 +991,6 @@ nb: body: Det er ingen melding med den ID-en. heading: Ingen melding funnet title: Ingen melding funnet - no_such_user: - body: Det er ingen bruker med det navnet. - heading: Ingen bruker funnet - title: Ingen bruker funnet outbox: date: Dato inbox: innboks @@ -1026,7 +1006,7 @@ nb: back_to_outbox: Tilbake til utboks date: Dato from: Fra - reading_your_messages: Leser dine meldinger + reading_your_messages: Leser meldingene dine reading_your_sent_messages: Les dine sendte meldinger reply_button: Svar subject: Emne @@ -1124,13 +1104,13 @@ nb: wiki_signup: "Du vil kanskje ogsÃ¥ melde deg inn i OpenStreetMap-wikien pÃ¥:" oauth: oauthorize: - allow_read_gpx: les dine private GPS-spor. - allow_read_prefs: les brukerinnstillingene dine. - allow_to: "Tillat klientprogrammet Ã¥ gjøre:" + allow_read_gpx: lese dine private GPS-spor. + allow_read_prefs: lese brukerinnstillingene dine. + allow_to: "Gi programmet lov til Ã¥:" allow_write_api: endre kartet. - allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner. - allow_write_gpx: last opp GPS-spor. - allow_write_prefs: Innstillingene ble lagret. + allow_write_diary: opprette dagbokoppføringer, kommentarer og finne venner. + allow_write_gpx: laste opp GPS-spor. + allow_write_prefs: endre innstillingene dine. request_access: Applikasjonen %{app_name} ber om tilgang til din konto, %{user}. Sjekk om du vil at applikasjonen skal ha følgende muligheter. Du kan velge sÃ¥ mange eller fÃ¥ du vil. revoke: flash: Du slettet nøkkelen for %{application} @@ -1203,7 +1183,6 @@ nb: index: js_1: Du har en nettleser som ikke støtter JavaScript eller sÃ¥ har du slÃ¥tt av JavaScript. js_2: OpenStreetMap bruker JavaScript pÃ¥ kartsidene. - js_3: Hvis du ikke kan slÃ¥ pÃ¥ JavaScript, sÃ¥ kan du prøve de <a href="http://tah.openstreetmap.org/Browse/">de statiske Tiles@Home-kartsidene</a>. license: license_name: Creative Commons Navngivelse-Del pÃ¥ like vilkÃ¥r 2.0 notice: Lisensiert under lisensen %{license_name} av %{project_name} og dets bidragsytere. @@ -1322,10 +1301,6 @@ nb: your_traces: Dine GPS-spor make_public: made_public: Spor gjort offentlig - no_such_user: - body: Beklager, det finnes ingen bruker med navnet %{user}. Vennligst sjekk at du har stavet riktig, eller kanskje lenken du fulgte er feil. - heading: Brukeren %{user} finnes ikke - title: Ingen bruker funnet offline: heading: GPX-lagring er utilgjengelig message: Systemet for opplasting og lagring av GPX-filer er ikke tilgjengelig for øyeblikket. @@ -1364,8 +1339,6 @@ nb: trace_optionals: tags: Merkelapper trace_paging_nav: - next: Neste » - previous: « Forrige showing_page: Viser side %{page} view: delete_track: Slett dette sporet @@ -1383,7 +1356,7 @@ nb: start_coordinates: "Startkoordinat:" tags: "Markelapper:" title: Viser spor %{name} - trace_not_found: Spor ikke funnet! + trace_not_found: Sporet ble ikke funnet! uploaded: "Lastet opp:" visibility: "Synlighet:" visibility: @@ -1672,7 +1645,6 @@ nb: filter: block_expired: Blokkeringen har allerede utløpt og kan ikke endres. block_period: Blokkeringsperioden mÃ¥ være en av verdiene som kan velges fra rullegardinen. - not_a_moderator: Du mÃ¥ være en moderator for Ã¥ utføre den handlingen. helper: time_future: Slutter om %{time}. time_past: Sluttet %{time} siden. diff --git a/config/locales/nds.yml b/config/locales/nds.yml index 52ccde65c..c4c890deb 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -124,7 +124,6 @@ nds: type: way: Weg way: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" download_xml: XML dalladen edit: ännern view_history: Geschicht wiesen @@ -184,8 +183,6 @@ nds: title: Ne’en Dagbook-Indrag no_such_entry: heading: Keen Indrag mit de Nummer %{id} - no_such_user: - title: Bruker nich funnen view: leave_a_comment: Kommentar schrieven login: Anmellen @@ -316,29 +313,6 @@ nds: village_hall: Gemeendehuus wifi: Wifi-Togang youth_centre: Jöögdcenter - building: - apartments: Wahnblock - bunker: Bunker - chapel: Kapell - church: Kark - city_hall: Raadhuus - dormitory: Studentenhuus - farm: Buuree-Bowark - flats: Wahnungen - garage: Garaasch - hall: Hall - hospital: Krankenhuus - hotel: Hotel - house: Huus - industrial: Industriebowark - public: Apenboor Bowark - residential: Wahnhuus - school: School-Bowark - shop: Laden - stadium: Stadion - store: Laden - terrace: Terrass - tower: Toorn highway: bridleway: Riedpadd bus_stop: Busstopp @@ -346,7 +320,6 @@ nds: cycleway: Radweg footway: Footpadd ford: Foord - gate: Heck living_street: Wahnstraat minor: Blangenstraat motorway: Autobahn @@ -387,10 +360,8 @@ nds: meadow: Wisch military: Militärrebeed mine: Mien - mountain: Barg park: Park piste: Piste - plaza: Platz quarry: Steenkuhl reservoir: Reservoir residential: Wahnrebeed @@ -415,7 +386,6 @@ nds: cape: Kap cave_entrance: Höhleningang channel: Kanaal - coastline: Küstenlien crater: Krater fell: Fjell fjord: Fjord @@ -473,12 +443,10 @@ nds: books: Bookladen butcher: Slachter car: Autohuus - car_dealer: Autoverköper car_repair: Autowarksteed chemist: Avtheek computer: Computerladen cosmetics: Kosmetikladen - drugstore: Drogeree fish: Fischhöker florist: Blomenladen furniture: Möbelladen @@ -542,9 +510,6 @@ nds: help_centre: Hülpcenter history: Geschicht intro_1: OpenStreetMap is en fre’e, ännerbore Koort von hele Welt, de von Minschen jüst as du tohoopstellt warrt. - intro_2: Mit OpenStreetMap kannst du geograafsche Daten op de ganze Welt ankieken, gemeensaam ännern un bruken. - intro_3: Dat Hosting von de OpenStreetMap-Servers warrt ünnerstütt von %{ucl}, %{ic} un %{bytemark}. Annere Partners staht op de Sied %{partners}. - intro_3_partners: Wiki log_in: anmellen log_in_tooltip: Mit dien Brukerkonto anmellen logo: @@ -726,8 +691,6 @@ nds: uploaded_at: "Hoochladen an’n:" visibility: "Sichtborkeit:" visibility_help: wat bedüüdt dat? - no_such_user: - title: gifft den Bruker nich trace: by: von edit: ännern diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9254be29e..91fa03f31 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -81,6 +81,8 @@ nl: application: require_cookies: cookies_needed: U hebt cookies waarschijnlijk uitgeschakeld in uw browser. Schakel cookies in voordat u verder gaat. + require_moderator: + not_a_moderator: U moet moderator zijn om die handeling uit te kunnen voeren. setup_user_auth: blocked: Uw toegang tot de API is geblokkeerd. Meld u opnieuw aan in de webinterface om meer te weten te komen. need_to_see_terms: Uw toegang tot de API is tijdelijk opgeschort. Meld u aan in de webinterface om de Voorwaarden voor Bijdragen te bekijken. U hoeft ze niet te onderschijven, maar moet ze wel gezien hebben. @@ -88,7 +90,6 @@ nl: changeset: changeset: "Set wijzigingen: %{id}" changesetxml: Changeset-XML - download: "%{changeset_xml_link} of %{osmchange_xml_link} downloaden" feed: title: Set wijzigingen %{id} title_comment: Set wijzigingen %{id} - %{comment} @@ -150,21 +151,19 @@ nl: next_changeset_tooltip: Volgende beweking door %{user} prev_changeset_tooltip: Vorige bewerking door %{user} node: - download: "%{download_xml_link} of %{view_history_link}" download_xml: XML downloaden - edit: bewerken + edit: Bewerken node: Node node_title: "Node: %{node_name}" - view_history: geschiedenis bekijken + view_history: Geschiedenis weergeven node_details: coordinates: "Coördinaten:" part_of: "Onderdeel van:" node_history: - download: "%{download_xml_link} of %{view_details_link}" download_xml: XML downloaden node_history: Nodegeschiedenis node_history_title: "Nodegeschiedenis: %{node_name}" - view_details: details weergeven + view_details: Gegevens bekijken not_found: sorry: De %{type} met id %{id} kan niet worden gevonden. type: @@ -175,21 +174,26 @@ nl: paging_nav: of: van showing_page: Bezig met weergeven van pagina + redacted: + message_html: Versie %{version} van dit element van het type %{type} kan niet weergegeven worden omdat deze na redigering geblokkeerd is. Zie %{redaction_link} voor details. + redaction: Redigering %{id} + type: + node: node + relation: relatie + way: weg relation: - download: "%{download_xml_link} of %{view_history_link}" download_xml: XML downloaden relation: Relatie relation_title: "Relatie: %{relation_name}" - view_history: geschiedenis weergeven + view_history: Geschiedenis weergeven relation_details: members: "Leden:" part_of: "Onderdeel van:" relation_history: - download: "%{download_xml_link} of %{view_details_link}" download_xml: XML downloaden relation_history: Relatiegeschiedenis relation_history_title: "Relatiegeschiedenis: %{relation_name}" - view_details: details bekijken + view_details: Gegevens bekijken relation_member: entry_role: "%{type} %{name} als %{role}" type: @@ -201,14 +205,14 @@ nl: view_data: Gegevens voor de huidige kaartweergave weergeven start_rjs: data_frame_title: Gegevens - data_layer_name: Gegevens - details: Gegevens + data_layer_name: Kaartgegevens verkennen + details: Details drag_a_box: Teken een rechthoek op de kaart om een gebied te selecteren edited_by_user_at_timestamp: Bewerkt door [[user]] op [[timestamp]] hide_areas: Gebieden verbergen history_for_feature: Geschiedenis voor [[feature]] load_data: Gegevens laden - loaded_an_area_with_num_features: U hebt een gebied geladen dat [[num_features]] objecten bevat. Sommige browsers kunnen niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan honderd objecten. Als u er meer weergeeft kan de browser traag worden of niet meer reageren. Als u zeker weet dat u de gegevens wilt weergeven, klik dan op de knop hieronder. + loaded_an_area_with_num_features: U hebt een gebied geladen dat [[num_features]] objecten bevat. Sommige browsers kunnen niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan [[max_features]] objecten. Als u er meer weergeeft kan de browser traag worden of niet meer reageren. Als u zeker weet dat u de gegevens wilt weergeven, klik dan op de knop hieronder. loading: Bezig met laden… manually_select: Handmatig een ander gebied selecteren object_list: @@ -247,10 +251,9 @@ nl: relation: relatie way: weg way: - download: "%{download_xml_link} of %{view_history_link}" download_xml: XML downloaden - edit: bewerken - view_history: geschiedenis weergeven + edit: Weg bewerken + view_history: Geschiedenis weergeven way: Weg way_title: "Weg: %{way_name}" way_details: @@ -260,9 +263,8 @@ nl: nodes: "Nodes:" part_of: "Onderdeel van:" way_history: - download: "%{download_xml_link} of %{view_details_link}" download_xml: XML downloaden - view_details: details weergeven + view_details: Gegevens weergeven way_history: Weggeschiedenis way_history_title: "Weggeschiedenis: %{way_name}" changeset: @@ -291,6 +293,8 @@ nl: description_nearby: Wijzigingensets door nabijgelegen gebruikers description_user: Wijzigingensets door %{user} description_user_bbox: Wijzigingensets door %{user} binnen %{bbox} + empty_anon_html: Nog geen bewerkingen gemaakt + empty_user_html: U hebt nog geen bewerkingen gemaakt. Kijk eens naar de <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginnersgids</a>. heading: Wijzigingensets heading_bbox: Wijzigingensets heading_friend: Wijzigingensets @@ -371,10 +375,6 @@ nl: body: Er is geen dagboekbericht of opmerking met het id %{id}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist. heading: Een bericht met id %{id} bestaat niet title: Het opgevraagde dagboekbericht bestaat niet - no_such_user: - body: Er is geen gebruiker met de naam %{user}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist. - heading: De gebruiker %{user} bestaat niet - title: Deze gebruiker bestaat niet view: leave_a_comment: Opmerking achterlaten login: aanmelden @@ -468,16 +468,28 @@ nl: suffix_place: ", %{distance} %{direction} van %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Luchtvaartterrein + apron: Platform + gate: Gate + helipad: Helikopterplatform + runway: Start-en landingsbaan + taxiway: Taxibaan + terminal: Terminal amenity: + WLAN: Wifi-toegang airport: Luchthaven arts_centre: Kunstcollectief + artwork: Kunst atm: Geldautomaat auditorium: Auditorium bank: Bank bar: Bar + bbq: BBQ bench: Bankje bicycle_parking: Fietsenstalling bicycle_rental: Fietsverhuur + biergarten: Biertuin brothel: Bordeel bureau_de_change: Wisselkantoor bus_station: Busstation @@ -486,6 +498,7 @@ nl: car_sharing: Autodelen car_wash: Autowasstraat casino: Casino + charging_station: Laadstation cinema: Bioscoop clinic: Kliniek club: Club @@ -504,6 +517,7 @@ nl: ferry_terminal: Veerterminal fire_hydrant: Brandkraan fire_station: Brandweer + food_court: Foodcourt fountain: Fontein fuel: Brandstof grave_yard: Begraafplaats @@ -544,9 +558,12 @@ nl: shelter: Beschutting shop: Winkel shopping: Winkelen + shower: Douche + social_centre: Sociaal centrum social_club: Sociale club studio: Eenkamerappartement supermarket: Supermarkt + swimming_pool: Zwembad taxi: Taxi telephone: Openbare telefoon theatre: Theater @@ -561,37 +578,17 @@ nl: youth_centre: Jeugdcentrum boundary: administrative: Administratieve grens + census: Volkstellingsgrens + national_park: Nationaal park + protected_area: Beschermd gebied + bridge: + aqueduct: Aquaduct + suspension: Hangbrug + swing: Draaibrug + viaduct: Viaduct + "yes": Brug building: - apartments: Appartementen - block: Bouwblok - bunker: Bunker - chapel: Kapel - church: Kerk - city_hall: Gemeentehuis - commercial: Commercieel gebouw - dormitory: Studentenhuis - entrance: Ingang - faculty: Faculteitsgebouw - farm: Agrarisch gebouw - flats: Flats - garage: Garage - hall: Hal - hospital: Ziekenhuis - hotel: Hotel - house: Huis - industrial: Industrieel gebouw - office: Kantoorgebouw - public: Openbaar gebouw - residential: Woningen - retail: Winkelpand - school: Schoolgebouw - shop: Winkel - stadium: Stadion - store: Winkel - terrace: Terras - tower: Toren - train_station: Spoorwegstation - university: Universiteitsgebouw + "yes": Gebouw highway: bridleway: Ruiterpad bus_guideway: Vrijliggende busbaan @@ -599,12 +596,11 @@ nl: byway: Onverharde weg construction: Snelweg in aanbouw cycleway: Fietspad - distance_marker: Afstandsmarkering emergency_access_point: Noodafslag footway: Voetpad ford: Voorde - gate: Slagboom living_street: Woonerf + milestone: Mijlpaal minor: Lokale weg motorway: Autosnelweg motorway_junction: Autosnelwegknooppunt @@ -616,14 +612,17 @@ nl: primary_link: Primaire weg raceway: Racecircuit residential: Woonerf + rest_area: Rustplaats road: Weg secondary: Secundaire weg secondary_link: Secundaire weg service: Parallelweg services: Autosnelwegdienstverlening + speed_camera: Snelheidscamera steps: Trap stile: Overstap tertiary: Tertiaire weg + tertiary_link: Tertiaire weg track: Pad trail: Pad trunk: Autosnelweg @@ -637,12 +636,13 @@ nl: building: Gebouw castle: Kasteel church: Kerk + fort: Fort house: Huis icon: Icoon manor: Landgoed memorial: Herdenkingsmonument mine: Mijn - monument: Monoment + monument: Monument museum: Museum ruins: Ruïne tower: Toren @@ -661,6 +661,7 @@ nl: farmland: Gecultiveerd areaal farmyard: Boerenerf forest: Bos + garages: Garages grass: Gras greenfield: Stadsgroen industrial: Industrieel gebied @@ -668,25 +669,28 @@ nl: meadow: Weide military: Miltair gebied mine: Mijn - mountain: Berg nature_reserve: Natuurreservaat + orchard: Boomgaard park: Park piste: Piste - plaza: Plein quarry: Steengroeve railway: Spoor recreation_ground: Recreatiegebied reservoir: Reservoir + reservoir_watershed: Overloopgebied residential: Woonwijk retail: Winkels + road: Weggebied village_green: Stadsgroen vineyard: Wijngaard wetland: Moeras wood: Hout leisure: beach_resort: Badplaats + bird_hide: Nestplaats common: Meent fishing: Visgrond + fitness_station: Fitnessstation garden: Tuin golf_course: Golfbaan ice_rink: IJsbaan @@ -697,12 +701,17 @@ nl: pitch: Sportveld playground: Speelplaats recreation_ground: Recreatiegebied + sauna: Sauna slipway: Trailerhelling sports_centre: Sportcentrum stadium: Stadion swimming_pool: Zwembad track: Atletiekbaan water_park: Waterspeelpark + military: + airfield: Militair vliegveld + barracks: Kazerne + bunker: Bunker natural: bay: Baai beach: Strand @@ -710,11 +719,12 @@ nl: cave_entrance: Grotingang channel: Kanaal cliff: Klif - coastline: Kustlijn crater: Krater + dune: Duin feature: Bezienswaardigheid fell: Fjell fjord: Fjord + forest: Bos geyser: Geiser glacier: Gletsjer heath: Heide @@ -734,6 +744,7 @@ nl: scrub: Struikgewas shoal: Zandbank spring: Bron + stone: Steen strait: Zeeëngte tree: Boom valley: Vallei @@ -742,9 +753,22 @@ nl: wetland: Moeras wetlands: Moeras wood: Bos + office: + accountant: Boekhouder + architect: Architect + company: Bedrijf + employment_agency: Bureau voor werkgelegenheid + estate_agent: Makelaar + government: Overheidskantoor + insurance: Verzekeringskantoor + lawyer: Advocaat + ngo: NGO-kantoor + telecommunication: Telecommunicatiekantoor + travel_agent: Reisbureau + "yes": Kantoor place: airport: Luchthaven - city: Stad + city: Plaats country: Land county: District farm: Boerderij @@ -753,6 +777,7 @@ nl: houses: Huizen island: Eiland islet: Eilandje + isolated_dwelling: Geïsoleerde woning locality: Plaats moor: Veen municipality: Gemeente @@ -776,6 +801,7 @@ nl: junction: Spoorwegkruising level_crossing: Spoorwegovergang light_rail: Lightrail + miniature: Miniatuur spoorweg monorail: Monorail narrow_gauge: Smalspoor platform: Spoorwegplatform @@ -790,7 +816,7 @@ nl: yard: Rangeerterrein shop: alcohol: Slijterij - apparel: Kledingwinkel + antiques: Antiek art: Kunstwinkel bakery: Bakkerij beauty: Schoonheidssalon @@ -799,7 +825,6 @@ nl: books: Boekenwinkel butcher: Slagerij car: Automaterialenwinkel - car_dealer: Autodealer car_parts: Autoonderdelen car_repair: Autogarage carpet: Tapijtzaak @@ -814,7 +839,6 @@ nl: department_store: Warenhuis discount: Discountwinkel doityourself: Doe-het-zelf-winkel - drugstore: Drogisterij dry_cleaning: Stomerij electronics: Elektronicawinkel estate_agent: Makelaar @@ -880,7 +904,10 @@ nl: valley: Vallei viewpoint: Bijzonder uitzicht zoo: Dierentuin + tunnel: + "yes": Tunnel waterway: + artificial: Kunstmatige waterweg boatyard: Scheepswerf canal: Kanaal connector: Waterverbinding @@ -916,6 +943,7 @@ nl: history_tooltip: Bewerkingen voor dit gebied bekijken history_zoom_alert: U moet inzoomen om de kaart te bewerkingsgeschiedenis te bekijken layouts: + community: Gemeenschap community_blogs: Gemeenschapsblogs community_blogs_title: Blogs van leden van de OpenStreetMap-gemeenschap copyright: Auteursrechten & licentie @@ -937,16 +965,18 @@ nl: history: Geschiedenis home: home home_tooltip: Naar thuislocatie gaan - inbox: Postvak IN (%{count}) + inbox_html: Postvak IN %{count} inbox_tooltip: one: Uw Postvak IN bevat één ongelezen bericht other: Uw Postvak IN bevat %{count} ongelezen berichten zero: Uw Postvak IN bevat geen nieuwe berichten intro_1: OpenStreetMap is een vrij bewerkbare kaart van de hele wereld. Hij wordt gemaakt door mensen zoals u. - intro_2: Met OpenStreetMap kunt u geografische gegevens van de hele aarde bekijken, samen bewerken en gebruiken. - intro_3: De hosting van OpenStreetMap wordt ondersteund door %{ucl}, %{ic} en %{bytemark}. Andere partners van het project zijn opgenomen in de pagina %{partners} - intro_3_ic: Imperial College London - intro_3_partners: wiki + intro_2_create_account: Maak een gebruiker aan + intro_2_download: downloaden + intro_2_html: De gegevens zijn vrij te %{download} en te %{use} onder de %{license}. %{create_account} om de kaart te verbeteren. + intro_2_license: open licentie + intro_2_use: gebruiken + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: title: Gegevens van OpenStreetMap zijn beschikbaar onder de licentie Creative Commons Naamsvermelding-Gelijk delen 2.0 Generiek log_in: aanmelden @@ -960,9 +990,14 @@ nl: title: Steun OpenStreetMap met een donatie osm_offline: De OpenStreetMap-database is op het moment niet beschikbaar wegens het uitvoeren van onderhoudswerkzaamheden. osm_read_only: De OpenStreetMap-database kan op het moment niet gewijzigd worden wegens het uitvoeren van onderhoudswerkzaamheden. + partners_bytemark: Bytemark Hosting + partners_html: De hosting wordt ondersteund door %{ucl}, %{ic} en %{bytemark}, en andere %{partners}. + partners_ic: Imperial College London + partners_partners: partners + partners_ucl: het UCL VR Centre sign_up: registreren sign_up_tooltip: Gebruiker voor bewerken aanmaken - sotm2011: Kom naar de OpenStreetMap-conferentie 2011, de staat van de kaart, 9-11 september in Denver! + sotm2012: Kom naar de OpenStreetMap-conferentie 2012, de staat van de kaart, 6-8 september in Tokyo! tag_line: De vrije wikiwereldkaart user_diaries: Gebruikersdagboeken user_diaries_tooltip: Gebruikersdagboeken bekijken @@ -977,7 +1012,30 @@ nl: english_link: Engelstalige origineel text: In het geval deze taalversie en het %{english_original_link} elkaar tegenspreken, hebben de bepalingen op de Engelstalige pagina voorrang. title: Over deze vertaling - legal_babble: "<h2>Auteursrechten en licentie</h2>\n<p>\n OpenStreetMap is <i>open data</i>, gelicenceerd onder de licentie <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Naamsvermelding-Gelijk delen 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Het staat u vrij onze kaarten en gegevens te kopieren, te distribueren,\n weer te geven en aan te passen, zo lang als u OpenStreetMap en haar\n auteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,\n mag u de resultaten onder dezelfde licentie distribueren. In de\n volledige <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridische\n tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.\n</p>\n\n<h3>Hoe OpenStreetMap te vermelden</h3>\n<p>\n Als u kaartmateriaal van OpenStreetMap gebruikt, vragen we u als\n naamsvermelding tenminste op te nemen “© OpenStreetMap-auteurs, CC-BY-SA”.\n Als u alleen kaartgegevens gebruikt, vragen we u te vermelden\n “Kaartgegevens © OpenStreetMap-auteurs,\n CC-BY-SA”.\n</p>\n<p>\n Waar mogelijk moet u verwijzen naar OpenStreetMap met een hyperlink naar <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n en CC-BY-SA naar <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Als\n u een medium gebruikt waarin u niet met hyperlinks kunt verwijzen (bijvoorbeeld in\n drukwerk), dan verzoeken we u uw lezers te verwijzen naar \n www.openstreetmap.org (wellicht door \n ‘OpenStreetMap’ uit te schrijven als het complete webadres) en naar\n www.creativecommons.org.\n</p>\n\n<h3>Meer informatie</h3>\n<p>\n U kunt meer lezen over onze gegevens in de <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Veel gestelde juridische\n vragen</a>.\n</p>\n<p>\n OSM-auteurs worden er continu aan herinnerd nooit gebruik te maken van enige\n auteursrechtelijk beschermde bron (zoals bijvoorbeeld Google Maps of gedrukte kaarten) zonder\n expliciete toestemming van de auteursrechthebbenden.\n</p>\n<p>\n Hoewel OpenStreetMap open data is, kunnen we niet om niet een kaart-API\n ter beschikking stellen voor ontwikkelaars van derde partijen.\n\n Zie ons <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-gebruiksbeleid</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Kaartgebruikbeleid</a>\n en <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatimgebruiksbeleid</a>.\n</p>\n\n<h3>Onze gegevensleveranciers</h3>\n<p>\n Door onze CC-BY-SA-licentie moet u “de Originele auteur\n vermelden op een redelijke wijze voor het door U gebruikte medium”.\n Individuele OSM-mappers vragen niet om meer vermelding dan\n “OpenStreetMap-auteurs”, maar daar waar gegevens van\n een nationaal kaartenbureau afkomstig zijn of van een andere belangrijke\n bron, en opgenomen in OpenStreetMap, kan het redelijk zijn om\n die bron direct te vermelden of door naar deze pagina te verwijzen.\n</p>\n\n<!--\nInformatie voor paginabewerkers\n\nIn de volgende lijst zijn alleen organisaties opgenomen die\nvermelding vereisen bij opname van hun gegevens in OpenStreetMap.\nHet is geen algeheel overzicht van geïmporteerde gegevens en mag\nniet gebruikt worden, tenzij naamsvermelding verplicht is om te\nvoldoen aan de licentie van de geïmporteerde gegevens.\n\nToevoegingen op deze plaats moeten eerst met OSM-beheerders\noverlegd worden.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australië</strong>: Bevat wijkgegevens\n gebaseerd op gegevens van het Australian Bureau of Statistics.</li>\n <li><strong>Austria</strong>: Bevat gegevens van de\n <a href=\"http://data.wien.gv.at/\">Stad Wenen</a> onder\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Canada</strong>: Bevat gegevens van\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), en StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Polen</strong>: Bevat gegevens van <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Auteursrechten\n UMP-pcPL-deelnemers.</li>\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Meer over hoe OSM UMP-gegevens gebruikt</a></li>\n <li><strong>Zuid-Afrika</strong>: Bevat gegevens afkomstig uit\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, auteursrechten voor de Staat voorbehouden.</li>\n <li><strong>Frankrijk</strong>: Bevat gegevens van\n Direction Générale des Impôts.</li>\n <li><strong>Nieuw-Zeeland</strong>: Bevat gegevens van\n Land Information New Zealand. Crown Copyright voorbehouden.</li>\n <li><strong>Verenigd Koninkrijk</strong>: Bevat gegevens van\n de Ordnance Survey © Crown Copyright en databaserechten\n 2010.</li>\n</ul>\n\n<p>\n Opname van gegevens in OpenStreetMap betekent niet dat de originele\n gegevensverstrekker OpenStreetMap ondersteunt, enige vorm van garantie geeft, of\n aansprakelijkheid aanvaardt.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: Bevat gegevens van de\n<a href=\"http://data.wien.gv.at/\">Stad Wenen</a> (onder\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> en\nLand Tirol (onder <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT met aanvullingen</a>)." + contributors_au_html: "<strong>Australië</strong>: Bevat wijkgegevens\ngebaseerd op gegevens van het Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canada</strong>: Bevat gegevens van\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), en StatCan (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: "Voor meer gegevens over deze en andere bronnen die gebruikt zijn\nvoor het verbeteren van OpenStreetMap, kunt u de <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">pagina met Bijdragers</a>\nop de OpenStreetMap Wiki raadplegen." + contributors_footer_2_html: "Opname van gegevens in OpenStreetMap betekent niet dat de originele\ngegevensverstrekker OpenStreetMap ondersteunt, enige vorm van garantie geeft, of\naansprakelijkheid aanvaardt." + contributors_fr_html: "<strong>Frankrijk</strong>: Bevat gegevens van\nDirection Générale des Impôts." + contributors_gb_html: "<strong>Verenigd Koninkrijk</strong>: Bevat gegevens van\nde Ordnance Survey © Crown Copyright en databaserechten\n2010." + contributors_intro_html: "Door onze CC BY-SA-licentie moet u “de Originele auteur\nvermelden op een redelijke wijze voor het door U gebruikte medium”.\nIndividuele OSM-mappers vragen niet om meer vermelding dan\n“OpenStreetMap-auteurs”, maar daar waar gegevens van\neen nationaal kaartenbureau afkomstig zijn of van een andere belangrijke\nbron, en opgenomen in OpenStreetMap, kan het redelijk zijn om\ndie bron direct te vermelden of door naar deze pagina te verwijzen." + contributors_nl_html: "<strong>Nederland</strong>: Bevat © Gegevens van AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nieuw-Zeeland</strong>: Bevat gegevens van\nLand Information New Zealand. Crown Copyright voorbehouden." + contributors_pl_html: "<strong>Polen</strong>: Bevat gegevens van <a\nhref=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Auteursrechten\nUMP-pcPL-deelnemers.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nMeer over hoe OSM UMP-gegevens gebruikt</a>" + contributors_title_html: Onze bijdragers + contributors_za_html: "<strong>Zuid-Afrika</strong>: Bevat gegevens afkomstig uit\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, auteursrechten voor de Staat voorbehouden." + credit_1_html: "Als u kaartmateriaal van OpenStreetMap gebruikt, vragen we u als\nnaamsvermelding tenminste op te nemen “© OpenStreetMap-auteurs, CC BY-SA”.\nAls u alleen kaartgegevens gebruikt, vragen we u te vermelden\n“Kaartgegevens © OpenStreetMap-auteurs,\nCC BY-SA”." + credit_2_html: "Waar mogelijk moet u verwijzen naar OpenStreetMap met een hyperlink naar <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nen CC BY-SA naar <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Als\nu een medium gebruikt waarin u niet met hyperlinks kunt verwijzen (bijvoorbeeld in\ndrukwerk), dan verzoeken we u uw lezers te verwijzen naar \nwww.openstreetmap.org (wellicht door \n‘OpenStreetMap’ uit te schrijven als het complete webadres) en naar\nwww.creativecommons.org." + credit_title_html: Hoe OpenStreetMap te vermelden + intro_1_html: "OpenStreetMap is <i>open data</i>, gelicenceerd onder de licentie <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Naamsvermelding-Gelijk delen 2.0</a> (CC BY-SA)." + intro_2_html: "Het staat u vrij onze kaarten en gegevens te kopieren, te distribueren,\nweer te geven en aan te passen, zo lang als u OpenStreetMap en haar\nauteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,\nmag u de resultaten onder dezelfde licentie distribueren. In de\nvolledige <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridische\ntekst</a> worden uw rechten en verantwoordelijkheden uitgelegd." + more_1_html: "U kunt meer lezen over onze gegevens in de <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Veel gestelde juridische\nvragen</a>." + more_2_html: "OSM-auteurs worden er continu aan herinnerd nooit gebruik te maken van enige\nauteursrechtelijk beschermde bron (zoals bijvoorbeeld Google Maps of gedrukte kaarten) zonder\nexpliciete toestemming van de auteursrechthebbenden." + more_3_html: "Hoewel OpenStreetMap open data is, kunnen we niet om niet een kaart-API\nter beschikking stellen voor ontwikkelaars van derde partijen.\nZie ons <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-gebruiksbeleid</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Kaartgebruikbeleid</a>\nen <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatimgebruiksbeleid</a>." + more_title_html: Meer informatie + title_html: Auteursrechten en licentie native: mapping_link: gaan mappen native_link: Nederlandstalige versie @@ -1023,10 +1081,6 @@ nl: body: Er is geen bericht met dat ID. heading: Bericht bestaat niet title: Dat bericht bestaat niet - no_such_user: - body: Er is geen gebruiker die naam. - heading: Deze gebruiker bestaat niet - title: Deze gebruiker bestaat niet outbox: date: Datum inbox: Postvak IN @@ -1198,6 +1252,8 @@ nl: allow_write_gpx: GPS-tracks uploaden allow_write_prefs: gebruikerseigenschappen wijzigen authorize_url: "URL voor autorisatie:" + confirm: Weet u het zeker? + delete: Client verwijderen edit: Details bewerken key: "Gebruikerssleutel:" requests: "Van de gebruiker worden de volgende rechten gevraagd:" @@ -1207,6 +1263,37 @@ nl: url: "URL voor tokenverzoek:" update: flash: De informatie voor de client is bijgewerkt + redaction: + create: + flash: Redigering aangemaakt. + destroy: + error: Er is een fout opgetreden tijdens het verwijderen van de redigering. + flash: De redigering is vernietigd. + not_empty: De redigering is niet leeg. Herstel alle versies die bij deze redigering betrokken zijn voordat u die vernietigt. + edit: + description: Beschrijving + heading: Redigering bewerken + submit: Redigering opslaan + title: Redigering bewerken + index: + empty: Geen weer te geven redigeringen. + heading: Lijst met redigeringen + title: Lijst met redigeringen + new: + description: Beschrijving + heading: Gegevens voor nieuwe redigering invoeren + submit: Redigering maken + title: Aanmaak van een nieuwe redigering + show: + confirm: Weet u het zeker? + description: "Beschrijving:" + destroy: Redigering verwijderen + edit: Redigering bewerken + heading: U bekijkt de redigering "%{title}" + title: U bekijkt een redigering + user: "Maker:" + update: + flash: De wijzigingen zijn opgeslagen. site: edit: anon_edits_link_text: Lees waarom dit het geval is. @@ -1221,7 +1308,6 @@ nl: index: js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript uitgeschakeld. js_2: OpenStreetMap gebruikt JavaScript voor de slippy-kaart. - js_3: Gebruik de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> als u niet de mogelijkheid hebt om JavaScript aan te zetten. license: license_name: Creative Commons Naamsvermelding-Gelijk delen 2.0 notice: Gelicenseerd onder de %{license_name} licentie door het %{project_name} en zijn bijdragers. @@ -1298,6 +1384,23 @@ nl: unclassified: Ongeclassificeerde weg unsurfaced: Onverharde weg wood: Bos + markdown_help: + alt: Alternatieve tekst + first: Eerste item + heading: Kopje + headings: Kopjes + image: Afbeelding + link: Verwijzing + ordered: Geordende lijst + second: Tweede item + subheading: Onderkop + text: Tekst + title_html: Verwerkt met <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Ongeordende lijst + url: URL + richtext_area: + edit: Bewerken + preview: Voorvertoning search: search: Zoeken search_help: "voorbeelden: 'Brugge', 'Spui, Amsterdam', '1234 AA', of 'post offices near Leuven' (<a href='http://wiki.openstreetmap.org/wiki/Search'>meer voorbeelden...</a>)." @@ -1334,16 +1437,13 @@ nl: visibility: "Zichtbaarheid:" visibility_help: wat betekent dit? list: + empty_html: Hier is nog niets te zien. <a href='%{upload_link}'>Upload een nieuwe trace</a> of kom meer te weten over GPS tracen op de <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikipagina</a>. public_traces: Openbare GPS-traces public_traces_from: Openbare GPS-traces van %{user} tagged_with: " gelabeld met %{tags}" your_traces: Uw GPS-tracks make_public: made_public: Trace openbaar gemaakt - no_such_user: - body: Sorry, er is geen gebruiker %{user}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist. - heading: De gebruiker %{user} bestaat niet - title: Deze gebruiker bestaat niet offline: heading: De opslag van GPX-bestanden is niet beschikbaar message: Het systeem voor het opslaan en uploaden van GPX-bestanden is op het moment niet beschikbaar. @@ -1383,8 +1483,8 @@ nl: trace_optionals: tags: Labels trace_paging_nav: - next: Volgende » - previous: « Vorige + newer: Nieuwere traces + older: Oudere traces showing_page: Pagina %{page} view: delete_track: Deze track verwijderen @@ -1547,7 +1647,9 @@ nl: title: Wachtwoord vergeten make_friend: already_a_friend: U bent al bevriend met %{name}. + button: Als vriend toevoegen failed: Sorry, het toevoegen van %{name} als vriend is mislukt. + heading: "%{user} als vriend toevoegen?" success: "%{name} is nu uw vriend." new: confirm email address: "E-mailadres bevestigen:" @@ -1580,6 +1682,8 @@ nl: nearby mapper: Dichtbijzijnde mapper your location: Uw locatie remove_friend: + button: Als vriend verwijderen + heading: "%{user} als vriend verwijderen?" not_a_friend: "%{name} staat niet in uw vriendelijst." success: "%{name} is verwijderd uit uw vriendenlijst." reset_password: @@ -1642,7 +1746,7 @@ nl: latest edit: "Laatste bewerking %{ago}:" m away: "%{count} m verwijderd" mapper since: "Mapper sinds:" - moderator_history: ingestelde blokkades bekijken + moderator_history: ingestelde blokkades my comments: mijn opmerkingen my diary: mijn dagboek my edits: mijn bewerkingen @@ -1698,7 +1802,6 @@ nl: filter: block_expired: De blokkade is al vervallen en kan niet bijgewerkt worden. block_period: De duur van de blokkade moet een van de waarden in het menu zijn. - not_a_moderator: U moet moderator zijn om die handeling uit te kunnen voeren. helper: time_future: Vervalt over %{time}. time_past: "%{time} geleden vervallen." @@ -1728,11 +1831,14 @@ nl: creator_name: Auteur display_name: Geblokkeerde gebruiker edit: Bewerken + next: Volgende » not_revoked: (niet ingetrokken) + previous: « Vorige reason: Reden voor blokkade revoke: Intrekken revoker_name: Ingetrokken door show: Weergeven + showing_page: Pagina %{page} status: Status period: one: 1 uur diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 0668f83f5..04bb30984 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1,10 +1,12 @@ -# Messages for Norwegian Nynorsk (‪Norsk (nynorsk)‬) +# Messages for Norwegian Nynorsk (‪norsk (nynorsk)‬) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Dittaeva # Author: Eirik # Author: Gnonthgol # Author: Gunnernett # Author: Harald Khan +# Author: Nemo bis # Author: Nghtwlkr # Author: Njardarlogar # Author: Pladask @@ -80,6 +82,8 @@ nn: application: require_cookies: cookies_needed: Du ser ut til Ã¥ ha deaktivert informasjonskapsler. Aktivar informasjonskapsler i nettleseren din før du held fram. + require_moderator: + not_a_moderator: Du mÃ¥ vere ein moderator for Ã¥ utføre den handlinga. setup_user_auth: blocked: Tilgjenget ditt til API-eit er blokkert. Logg inn pÃ¥ nettstaden for Ã¥ finne ut meir. need_to_see_terms: Tilgjenget ditt til API-eit er mellombels stoppa. Logg inn pÃ¥ nettsiden for Ã¥ lese bidragsytervilkÃ¥rene. Du treng ikkje godta vilkÃ¥ra, men du mÃ¥ lese dei. @@ -87,7 +91,6 @@ nn: changeset: changeset: "Endringssett: %{id}" changesetxml: XML for endringssett - download: Last ned %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Endringssett %{id} title_comment: "Endringssett: %{id} - %{comment}" @@ -156,21 +159,19 @@ nn: next_changeset_tooltip: Neste redigering av %{user} prev_changeset_tooltip: Forrige redigering av %{user} node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Last ned XML - edit: rediger + edit: Rediger node node: Node node_title: "Node: %{node_name}" - view_history: vis historikk + view_history: SjÃ¥ historikken node_details: coordinates: "Koordinatar:" part_of: "Del av:" node_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Last ned XML node_history: Nodehistorik node_history_title: "Nodehistorikk: %{node_name}" - view_details: vis detaljar + view_details: Vis detaljar not_found: sorry: Klarte ikkje finne %{type}-ein med ID %{id}. type: @@ -181,21 +182,26 @@ nn: paging_nav: of: av showing_page: Viser side + redacted: + message_html: Versjon %{version} av denne %{type} kan ikkje visast fordi den er blitt maskert. SjÃ¥ %{redaction_link} for detaljar. + redaction: Maskering %{id} + type: + node: noden + relation: relasjonen + way: vegen relation: - download: "%{download_xml_link} eller %{view_history_link}" download_xml: Last ned XML relation: Relasjon relation_title: "Relasjon: %{relation_name}" - view_history: vis historikk + view_history: SjÃ¥ historikken relation_details: members: "Medlemmar:" part_of: "Del av:" relation_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Last ned XML relation_history: Relasjonshistorikk relation_history_title: "Relasjonshistorikk: %{relation_name}" - view_details: vis detaljar + view_details: Vis detaljar relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} som %{role}" @@ -208,14 +214,14 @@ nn: view_data: Vis data for gjeldande kartvising start_rjs: data_frame_title: Data - data_layer_name: Data + data_layer_name: Kartdata details: Detaljar drag_a_box: Dra ein boks pÃ¥ kartet for Ã¥ velje eit omrÃ¥de edited_by_user_at_timestamp: Redigert av [[user]], [[timestamp]] hide_areas: Skjul omrÃ¥der history_for_feature: Historikk for [[feature]] load_data: Last inn data - loaded_an_area_with_num_features: Dette omrÃ¥det inneheld [[num_features]] objekt. Nokre nettlesarar kan ikkje handtere sÃ¥ mykje data. For Ã¥ ikkje risikere at nettlesaren lÃ¥sar seg bør du halde deg til under 100 objekt. Om du er sikker pÃ¥ at du vil sjÃ¥ informasjonen kan du klikke pÃ¥ knappen nedanfor. + loaded_an_area_with_num_features: Dette omrÃ¥det inneheld [[num_features]] objekt. Nokre nettlesarar kan ikkje handtere sÃ¥ mykje data. For Ã¥ ikkje risikere at nettlesaren lÃ¥sar seg bør du halde deg til under [[max_features]] objekt. Om du er sikker pÃ¥ at du vil sjÃ¥ informasjonen kan du klikke pÃ¥ knappen nedanfor. loading: Lastar... manually_select: Vel eit anna omrÃ¥de manuelt object_list: @@ -254,10 +260,9 @@ nn: relation: relasjon way: veg way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Last ned XML - edit: rediger - view_history: vis historikk + edit: Rediger veg + view_history: SjÃ¥ historikken way: Veg way_title: "Veg: %{way_name}" way_details: @@ -267,9 +272,8 @@ nn: nodes: "Nodar:" part_of: "Del av:" way_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Last ned XML - view_details: vis detaljar + view_details: Vis detaljar way_history: Veghistorikk way_history_title: "Veghistorikk: %{way_name}" changeset: @@ -299,6 +303,8 @@ nn: description_nearby: Endringssett av næliggande brukarar description_user: Endringssett av %{user} description_user_bbox: Endringssett av %{user} innan %{bbox} + empty_anon_html: Ingen endringar endÃ¥ + empty_user_html: Du har ikkje gjort nokre endringar endÃ¥. For Ã¥ starte, sjÃ¥ pÃ¥ <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Startveiledninga</a>. heading: Endringssett heading_bbox: Endringssett heading_friend: Endringssett @@ -379,10 +385,6 @@ nn: body: Det er ingen dagbokinnlegg eller kommentar med ID %{id}. Sjekk om du har skrive feil eller om lenkja er riktig. heading: Inga oppføring med %{id} title: Inga slik dagbokoppføring - no_such_user: - body: Det finst ingen brukar med namnet %{user}. Sjekk om du har skrive feil eller om lenkja er riktig. - heading: Brukaren %{user} finst ikkje - title: Ingen brukar funne view: leave_a_comment: Legg igjen ein kommentar login: Logg inn @@ -478,16 +480,28 @@ nn: suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Flyplass + apron: Flyrampe + gate: Gate + helipad: Helikopterplass + runway: Rullebane + taxiway: Taksebane + terminal: Terminal amenity: + WLAN: WiFi-tilgangspunkt airport: Flyplass arts_centre: Kunstsenter + artwork: Kunstverk atm: Minibank auditorium: Auditorium bank: Bank bar: Bar + bbq: Grill bench: Benk bicycle_parking: Sykkelparkering bicycle_rental: Sykkelutleige + biergarten: Ølhage brothel: Bordell bureau_de_change: Vekslingskontor bus_station: Busstasjon @@ -496,6 +510,7 @@ nn: car_sharing: Bildeling car_wash: Bilvask casino: Kasino + charging_station: Ladestation cinema: Kino clinic: Klinikk club: Klubb @@ -514,6 +529,7 @@ nn: ferry_terminal: Ferjeterminal fire_hydrant: Brannhydrant fire_station: Brannstasjon + food_court: Serveringsstadar fountain: Fontene fuel: Drivstoff grave_yard: Gravlund @@ -554,9 +570,12 @@ nn: shelter: Tilfluktsrom shop: Butikk shopping: Handel + shower: Dusj + social_centre: Samfunnshus social_club: Sosial klubb studio: Studio supermarket: Supermarknad + swimming_pool: Symjebaseng taxi: Drosje telephone: Offentleg telefon theatre: Teater @@ -571,37 +590,17 @@ nn: youth_centre: Ungdomssenter boundary: administrative: Administrativ grense + census: Folketeljingsgrense + national_park: Nationalpark + protected_area: Verna omrÃ¥de + bridge: + aqueduct: Akvadukt + suspension: Hengebru + swing: Svingbru + viaduct: Viadukt + "yes": Bru building: - apartments: Bustadblokk - block: Bygningsblokk - bunker: Bunker - chapel: Kapell - church: Kyrkje - city_hall: RÃ¥dhus - commercial: Kommersiell bygning - dormitory: Sovesal - entrance: Bygningsinngang - faculty: Fakultetsbygning - farm: GÃ¥rdsbygg - flats: Leilegheiter - garage: Garasje - hall: Spisesal - hospital: Sykehusbygg - hotel: Hotell - house: Hus - industrial: Industribygg - office: Kontorbygg - public: Offentleg bygg - residential: Boligbygg - retail: Detaljsalgbygg - school: Skulebygg - shop: Butikk - stadium: Stadion - store: Butikk - terrace: Terrasse - tower: TÃ¥rn - train_station: Jernbanestasjon - university: Universitetsbygg + "yes": Bygning highway: bridleway: Rideveg bus_guideway: Leidde bussfelt @@ -609,12 +608,11 @@ nn: byway: Stikkveg construction: Motorveg under konstruksjon cycleway: Sykkelsti - distance_marker: Avstandsmarkør emergency_access_point: Nødtilgangspunkt footway: Gangsti ford: Vadestad - gate: Bom living_street: Gatetun + milestone: Milestolpe minor: Mindre veg motorway: Motorveg motorway_junction: Motorvegkryss @@ -625,15 +623,18 @@ nn: primary: Primær veg primary_link: Primær veg raceway: Racerbane - residential: Bustad + residential: Bustadveg + rest_area: Rasteplass road: Veg secondary: Sekundær veg secondary_link: Sekundær veg service: Tjenesteveg services: Motorveitjenester + speed_camera: Fotoboks steps: Trapper stile: Stige tertiary: Tertiær veg + tertiary_link: Kommunal veg track: Sti trail: Sti trunk: Hovedveg @@ -647,6 +648,7 @@ nn: building: Bygning castle: Slott church: Kyrkje + fort: Fort house: Hus icon: Ikon manor: Herregard @@ -671,6 +673,7 @@ nn: farmland: Jordbruksland farmyard: Gardstun forest: Skog + garages: Garasjar grass: Gras greenfield: Ikkje-utvikla omrÃ¥de industrial: IndustriomrÃ¥de @@ -678,25 +681,28 @@ nn: meadow: Eng military: Militært omrÃ¥de mine: Gruve - mountain: Fjell nature_reserve: Naturreservat + orchard: Frukthage park: Park piste: Løype - plaza: Torg quarry: Steinbrot railway: Jernbane recreation_ground: Idrettsplass reservoir: Reservoar + reservoir_watershed: Nedbørfelt residential: BoligomrÃ¥de retail: Detaljsalg + road: VegomrÃ¥de village_green: landsbypark vineyard: VingÃ¥rd wetland: VÃ¥tmark wood: Skog leisure: beach_resort: Strandsted + bird_hide: FugletÃ¥rn common: Allmenning fishing: FiskeomrÃ¥de + fitness_station: Trenings studio garden: Hage golf_course: Golfbane ice_rink: Skøytebane @@ -707,12 +713,17 @@ nn: pitch: Sportsarena playground: Leikeplass recreation_ground: Idrettsplass + sauna: Badstu slipway: Slipp sports_centre: Sportssenter stadium: Stadion swimming_pool: Symjebaseng track: Laupebane water_park: Vannpark + military: + airfield: Militær flyplass + barracks: Kaserner + bunker: Bunker natural: bay: Bukt beach: Strand @@ -720,11 +731,12 @@ nn: cave_entrance: Holeinngang channel: Kanal cliff: Klippe - coastline: Kystlinje crater: Krater + dune: Sanddyne feature: Eigenskap fell: Fjellskrent fjord: Fjord + forest: Skog geyser: Geysir glacier: Isbre heath: Vidde @@ -744,6 +756,7 @@ nn: scrub: Kratt shoal: Grunning spring: Kjelde + stone: Stein strait: Stred tree: Tre valley: Dal @@ -752,6 +765,19 @@ nn: wetland: VÃ¥tmark wetlands: VÃ¥tland wood: Skog + office: + accountant: Revisor + architect: Arkitekt + company: Bedrift + employment_agency: Bemanningsbedrift + estate_agent: Eiendomsmeglar + government: Statlig kontor + insurance: Forsikringskontor + lawyer: Advokat + ngo: Ikkje-statlig kontor + telecommunication: Telefonkontor + travel_agent: ReisebyrÃ¥ + "yes": Kontor place: airport: Flyplass city: By @@ -763,6 +789,7 @@ nn: houses: Hus island: Øy islet: Holme + isolated_dwelling: Ensleg bostad locality: Plass moor: Myr municipality: Kommune @@ -786,6 +813,7 @@ nn: junction: Jernbanekryss level_crossing: Planovergang light_rail: Bybane + miniature: Miniatyrjernbane monorail: Enskinnebane narrow_gauge: Smalsporjernbane platform: Jernbaneperrong @@ -800,7 +828,7 @@ nn: yard: Skiftetomt shop: alcohol: Utanfor lisens - apparel: Klesbutikk + antiques: Antikviteter art: Kunstbutikk bakery: Bakeri beauty: Skjønnheitssalong @@ -809,7 +837,6 @@ nn: books: Bokhandel butcher: Slaktar car: Bilbutikk - car_dealer: Bilforhandlar car_parts: Bildeler car_repair: Bilverkstad carpet: Teppebutikk @@ -824,7 +851,6 @@ nn: department_store: Varehus discount: Tilbudsbutikk doityourself: Gjer-det-sjølv - drugstore: Apotek dry_cleaning: Renseri electronics: Elektronikkforretning estate_agent: Eiendomsmegler @@ -890,7 +916,10 @@ nn: valley: Dal viewpoint: Utsiktspunkt zoo: Dyrepark + tunnel: + "yes": Tunnel waterway: + artificial: Kunstig vassdrag boatyard: BÃ¥tverft canal: Kanal connector: Vannvegforbindelse @@ -931,7 +960,8 @@ nn: history_tooltip: Vis redigeringar for dette omrÃ¥det history_zoom_alert: Du mÃ¥ zoome inn for Ã¥ vise redigeringar i dette omrÃ¥det layouts: - community_blogs: Fellesskapsblogger + community: Samfunnet + community_blogs: Bloggar community_blogs_title: Bloggar frÃ¥ medlemmane i OpenStreetMap-felleskapet copyright: Opphavsrett & lisens documentation: Dokumentasjon @@ -942,30 +972,28 @@ nn: edit_with: Rediger med %{editor} export: Eksporter export_tooltip: Eksporter kartdata - foundation: Stiftelse - foundation_title: OpenStreetMap stiftelsen + foundation: Stifting + foundation_title: OpenStreetMap-stiftinga gps_traces: GPS-spor gps_traces_tooltip: Handsam GPS-spor help: Hjelp - help_centre: Brukerstøtte + help_centre: Brukarstøtte help_title: Hjelpenettstad for prosjektet help_url: http://help.openstreetmap.org/ history: Historikk home: heim home_tooltip: GÃ¥ til heimeposisjon - inbox: innboks (%{count}) + inbox_html: innboks %{count} inbox_tooltip: one: Din innboks inneheld 1 ulesen melding other: Din innboks inneheld %{count} ulesne meldingar zero: Din innboks inneheld ingen ulesne meldingar intro_1: OpenStreetMap er eit fritt redigerbart kart over heile jorda. Det er laga av folk som deg. - intro_2: OpenStreetMap gjer det mogleg Ã¥ vise, redigere og bruke geografiske data pÃ¥ ein samarbeidande mÃ¥te frÃ¥ kvar som helst pÃ¥ jorda. - intro_3: OpenStreetMaps vert sponsa av %{ucl}, %{ic} og %{bytemark}. Andre sponsorar av prosjektet er oppført i %{partners}. - intro_3_bytemark: Bytemark Hosting - intro_3_ic: Imperial College London - intro_3_partners: wiki - intro_3_partners_url: http://wiki.openstreetmap.org/wiki/Partners - intro_3_ucl: UCL VR Senteret + intro_2_create_account: Opprett ein brukarkonto + intro_2_download: last ned + intro_2_html: Du stÃ¥r fritt til Ã¥ %{download} informasjonen og til Ã¥ %{use} den under ein %{license}. %{create_account} for Ã¥ forbedre kartet. + intro_2_license: Ã¥pen lisens + intro_2_use: bruke license: alt: CC by-sa 2.0 title: Data frÃ¥ OpenStreetMap er lisensierte under lisensen Creative Commons Navngivelse-Del pÃ¥ like vilkÃ¥r 2.0 Generisk @@ -976,16 +1004,21 @@ nn: logout: logg ut logout_tooltip: Logg ut make_a_donation: - text: Doner - title: Støytt OpenStreetMap med ein donasjon + text: Gje pengegÃ¥ve + title: Støtt OpenStreetMap med ei pengegÃ¥ve osm_offline: OpenStreetMap databasen er for augneblunken utilgjengelig medan essensielt vedlikeholdsarbeid vert utført. - osm_read_only: OpenStreetMap databasen er for augneblunken i berre-lese-modus medan essensielt vedlikeholdsarbeid vert utført. + osm_read_only: OpenStreetMap kan ikkje redigerast akkurat no, pÃ¥ grunn av nødvendig vedlikehaldsarbeid. + partners_bytemark: Bytemark Hosting + partners_html: Drifta er støtta av %{ucl}, %{ic} og %{bytemark}, og andre %{partners}. + partners_ic: Imperial College London + partners_partners: partnarar + partners_ucl: UCL VR senteret project_name: h1: OpenStreetMap title: OpenStreetMap sign_up: registrer sign_up_tooltip: Opprett ein konto for redigering - sotm2011: Kom til 2011 OpenStreetMap-konferansen, «Tilstanden til kartet», 11.9. september i Denver! + sotm2012: Kom til 2012 OpenStreetMap-konferansen, «Tilstanden til kartet», 6.-8. september i Tokyo! tag_line: Fritt Wiki-verdenskart user_diaries: Brukardagbok user_diaries_tooltip: Vis brukaren si dagbok @@ -1001,11 +1034,34 @@ nn: english_link: den engelske originalen text: I tilfellet konflikt mellom denne omsette sida og %{english_original_link} har den engelske presedensen title: Om denne omsetjinga - legal_babble: "<h2>Opphavsrett og lisensar</h2>\n<p>\n OpenStreetMap er <i>opne data</i>, lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Navngivelse-DelPÃ¥SammeVilkÃ¥r 2.0</a> (CC BY-SA).\n</p>\n<p>\n Du er fri til Ã¥ kopiere, distribuere, overføre og tilpasse karta vÃ¥re og dataa, sÃ¥ lenge du krediterer OpenStreetMap og bidragsytarane\n deira. Dersom du endrar eller byggjer pÃ¥ karta vÃ¥re eller dataa, kan du berre distribuere resultatet under same lisens. \n Den fulle <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiske\n teksten</a> forklarer rettane og ansvaret.\n</p>\n\n<h3>Korleis kreditere OpenStreetMap</h3>\n<p>\n Dersom du brukar OpenStreetMap kartbilder, ber me om at din kreditering minst inneheld \n «© OpenStreetMap-bidragsytarar, CC BY-SA». Viss du berre brukar kartdata, ber me om \n «Kartdata © OpenStreetMap-bidragsytarar, CC BY-SA».\n</p>\n<p>\n Der det er mogleg, bør OpenStreetMap lenkjast til <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n og CC BY-SA til <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Viss\n du brukar eit medium der lenkjer ikkje er mogleg (t.d. i utskrivne arbeid), foreslÃ¥r me at du viser lesarane til\n www.openstreetmap.org (kanskje ved Ã¥ utvide 'OpenStreetMap' til denne fullstendige adressa) og til\n www.creativecommons.org.\n</p>\n\n<h3>Finn ut meir</h3>\n<p>\n Les meir om korleis du brukar dataa vÃ¥re i den <a href=\"http://wiki.openstreetmap.org/wiki/Legal_fAQ\">juridiske\n FAQ-en</a>.\n</p>\n<p>\n OSM-bidragsytarar vert minna pÃ¥ Ã¥ aldri leggje til data frÃ¥ opphavsrettsbeskytta kjelder (t.d. Google Maps eller utskrivne kart) utan\n uttrykkeleg løyve frÃ¥ rettighetshavere.\n</p>\n<p>\n Sjølv om OpenStreetMap er Ã¥pne data kan me ikkje gje eit\n gratis kart-API til tredjepartsutviklere.\n\n SjÃ¥ vÃ¥re retningslinjer for nytting av <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-et</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">kartbilder</a>\n og <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_policy\">Nominatim</a>.\n</p>\n\n<h3>Bidragsytarane vÃ¥re</h3>\n<p>\n VÃ¥r CC BY-SA-lisens krev at du «gjev den opphavlege forfattaren rimeleg kreditt til mediet eller mÃ¥ten du\n nyttar». Individuelle OSM-kartleggere krev ikkje ein kreditering utover «OpenStreetMap bidragsytarar»,\n men der data frÃ¥ eit nasjonal kartleggingsbyrÃ¥ eller frÃ¥ ein anna stor kjelde er vorten inkludert inne i\n OpenStreetMap, kan det vere fornuftig Ã¥ kreditere dei ved direkte\n reprodusering av kreditten deira eller ved Ã¥ linke til det pÃ¥ denne sida.\n</p>\n\n<!--\nInformasjon til sideredaktører\n\nDen følgjande lista listar berre opp dei organisasjonane som krev kreditering\nsom eit vilkÃ¥r for at dataa deira vert brukte i OpenStreetMap. Det er ikkje ein\ngenerell importeringskatalog og mÃ¥ ikkje brukast unntatt nÃ¥r kreditering\nvert kravt for Ã¥ oppfylle lisensvilkÃ¥rene til dei importerte dataa.\n\nAlle tillegg her mÃ¥ diskuterast med ein OSM-sysadmin først.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Inneheld forstadsdata basert\n pÃ¥ Australian Bureau of Statistics data.</li>\n <li><strong>Canada</strong>: Inneheld data frÃ¥\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>Frankrike</strong>: Inneheld data henta frÃ¥\n Direction Générale des Impôts.</li>\n <li><strong>New Zealand</strong>: Inneheld data henta frÃ¥\n Land Information New Zealand. Crown Copyright reservert.</li>\n <li><strong>Polen</strong>: Inneheld data frÃ¥ <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL bidragsytarar.</li>\n <li><strong>Storbritannia</strong>: Inneheld Ordnance\n Survey data © Crown copyright og database-rettar\n 2010.</li>\n <li><strong>Austerrike</strong>: Inneheld data henta frÃ¥\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> under\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.dei\">CC BY</a>.</li>\n</ul>\n\n<p>\n Inkludering av data i OpenStreetMap inneber ikkje at den opphavlege\n dataleverandøren støttar OpenStreetMap, gjev nokon garanti eller\n godtek noko erstatningsansvar.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austerrike</strong>: Inneheld data henta frÃ¥\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> under\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.dei\">CC BY</a>,\n <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> og\n Land Tirol (under <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT med tilleg</a>)." + contributors_au_html: "<strong>Australia</strong>: Inneheld forstadsdata basert\n pÃ¥ Australian Bureau of Statistics data." + contributors_ca_html: "<strong>Canada</strong>: Inneheld data frÃ¥\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: " For detaljar om desse og andre kjelder som har blitt brukt for Ã¥ forbetra\n OpenStreetMap, sjÃ¥ <a href=\"http://wiki.openstreetmap.org/wiki/Contributors\">Bidragsytarar\n sida</a> pÃ¥ OpenStreetMap Wikien." + contributors_footer_2_html: " Inkludering av data i OpenStreetMap inneber ikkje at den opphavlege\n dataleverandøren støttar OpenStreetMap, gjev nokon garanti eller\n godtek noko erstatningsansvar." + contributors_fr_html: "<strong>Frankrike</strong>: Inneheld data henta frÃ¥\n Direction Générale des Impôts." + contributors_gb_html: "<strong>Storbritannia</strong>: Inneheld Ordnance\n Survey data © Crown copyright og database-rettar\n 2010." + contributors_intro_html: " VÃ¥r CC BY-SA-lisens krev at du «gjev den opphavlege forfattaren rimeleg kreditt til mediet eller mÃ¥ten du\n nyttar». Individuelle OSM-kartleggere krev ikkje ein kreditering utover «OpenStreetMap bidragsytarar»,\n men der data frÃ¥ eit nasjonal kartleggingsbyrÃ¥ eller frÃ¥ ein anna stor kjelde er vorten inkludert inne i\n OpenStreetMap, kan det vere fornuftig Ã¥ kreditere dei ved direkte\n reprodusering av kreditten deira eller ved Ã¥ linke til det pÃ¥ denne sida." + contributors_nl_html: "<strong>Nederland</strong>: Inneheld © AND-data, 2007\n (<a href=\"http://www.and.com\">www.and.com</a>)</li>\n <li><strong>New Zealand</strong>: Inneheld data henta frÃ¥\n Land Information New Zealand. Crown Copyright reservert." + contributors_nz_html: "<strong>New Zealand</strong>: Inneheld data henta frÃ¥\n Land Information New Zealand. Crown Copyright reservert." + contributors_pl_html: "<strong>Polen</strong>: Inneheld data frÃ¥ <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL bidragsytarar." + contributors_title_html: Bidragsytarane vÃ¥re + contributors_za_html: "<strong>Sør-Afrika</strong>: Inneheld data frÃ¥ <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: " Dersom du brukar OpenStreetMap kartbilder, ber me om at di godskriving iallfall inneheld \n «© OpenStreetMap-bidragsytarar, CC BY-SA». Viss du berre brukar kartdata, ber me om \n «Kartdata © OpenStreetMap-bidragsytarar, CC BY-SA»." + credit_2_html: " Der det er mogleg, bør OpenStreetMap lenkjast til <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n og CC BY-SA til <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Viss\n du brukar eit medium der lenkjer ikkje er mogleg (t.d. i utskrivne arbeid), foreslÃ¥r me at du viser lesarane til\n www.openstreetmap.org (kanskje ved Ã¥ utvide 'OpenStreetMap' til denne fullstendige adressa) og til\n www.creativecommons.org." + credit_title_html: Korleis kreditere OpenStreetMap + intro_1_html: "OpenStreetMap er <i>opne data</i>, lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Navngivelse-DelPÃ¥SammeVilkÃ¥r 2.0</a> (CC BY-SA)." + intro_2_html: " Du er fri til Ã¥ kopiere, distribuere, overføre og tilpasse karta vÃ¥re og dataa, sÃ¥ lenge du godskriv OpenStreetMap og bidragsytarane\n deira. Dersom du endrar eller byggjer pÃ¥ karta vÃ¥re eller dataa, kan du berre distribuere resultatet under same lisens. \n Den fullstendige <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiske\n teksten</a> forklarer rettane og ansvaret." + more_1_html: "Les meir om korleis du brukar dataa vÃ¥re i den <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiske\n FAQ-en</a>." + more_2_html: "OSM-bidragsytarar vert minna pÃ¥ Ã¥ aldri leggje til data frÃ¥ opphavsrettsbeskytta kjelder (t.d. Google Maps eller utskrivne kart) utan\n uttrykkeleg løyve frÃ¥ rettighetshavere." + more_3_html: "Sjølv om OpenStreetMap er Ã¥pne data kan me ikkje gje eit\n gratis kart-API til tredjepartsutviklere.\n\n SjÃ¥ vÃ¥re retningslinjer for nytting av <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-et</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">kartbilder</a>\n og <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_policy\">Nominatim</a>." + more_title_html: Finn ut meir + title_html: Opphavsrett og lisensar native: mapping_link: start kartlegging native_link: Nynorsk versjon - text: Du ser den engelske versjonen av opphavsrettssiden. Du kan gÃ¥ tilbake til den %{native_link} av denne sida, eller du kan stoppe Ã¥ lese om opphavsrett og %{mapping_link}. + text: Du ser den engelske versjonen av opphavsrettssida. Du kan gÃ¥ tilbake til den %{native_link} av denne sida, eller du kan stoppe Ã¥ lese om opphavsrett og %{mapping_link}. title: Om denne sida message: delete: @@ -1047,10 +1103,6 @@ nn: body: Det er inga melding med den ID-en. heading: Inga melding funne title: Inga melding funne - no_such_user: - body: Det er ingen brukar med det namnet. - heading: Ingen brukar funnet - title: Ingen brukar funnet outbox: date: Dato inbox: innboks @@ -1069,7 +1121,7 @@ nn: back_to_outbox: Tilbake til utboks date: Dato from: FrÃ¥ - reading_your_messages: Lesar meldingane dine + reading_your_messages: Les meldingane dine reading_your_sent_messages: Les dei sende meldingane dine reply_button: Svar subject: Emne @@ -1092,7 +1144,7 @@ nn: email_confirm_html: click_the_link: Om dette er deg, vennligst klikk pÃ¥ lenkja under for Ã¥ stadfeste endringa. greeting: Hei, - hopefully_you: Nokre (vonleg deg) ynskjer Ã¥ endre e-postadressen for %{server_url} til %{new_address}. + hopefully_you: Nokre (vonleg du) ynskjer Ã¥ endre registrert e-postadresse pÃ¥ %{server_url} til %{new_address}. email_confirm_plain: click_the_link: Viss det er deg, klikk lenkja nedanfor for Ã¥ stadfeste endringa. greeting: Hei, @@ -1147,7 +1199,7 @@ nn: introductory_video: Du kan sjÃ¥ ein %{introductory_video_link}. more_videos: Det er %{more_videos_link}. more_videos_here: fleire videoar her - user_wiki_page: Det vert rÃ¥dt til at du opprettar ein brukerside pÃ¥ wiki-en som inkluderer kategorimerker som viser der du er, f.eks <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_norway">[[Category:Users_in_norway]]</a>. + user_wiki_page: Det er tilrÃ¥dd at du opprettar ei brukarside pÃ¥ wikien som inneheld kategorimerker som viser kor du er, f.eks <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_norway">[[Category:Users_in_norway]]</a>. video_to_openstreetmap: introduksjonsvideo til OpenStreetMap wiki_signup: Du vil kanskje <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_page">melde deg inn i OpenStreetMap-wikien</a> òg. signup_confirm_plain: @@ -1164,20 +1216,20 @@ nn: opengeodata: "OpenGeoData.org er bloggen til OpenStreetMap-grunnlegg Steve Coast, og han har podcast-er òg:" the_wiki: "Les meir om OpenStreetMap pÃ¥ wikien:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide - user_wiki_1: Det vert rÃ¥dt til at du opprettar ein brukerside pÃ¥ wiki-en som inkluderer + user_wiki_1: Det er tilrÃ¥dd at du opprettar ei brukarside pÃ¥ wikien som inneheld user_wiki_2: kategorimerker som viser kor du er, f.eks [[Category:Users_in_norway]]. wiki_signup: "Du vil kanskje òg melde deg inn i OpenStreetMap-wikien pÃ¥:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_page oauth: oauthorize: - allow_read_gpx: les dine private GPS-spor. - allow_read_prefs: les brukarinnstillingane dine. - allow_to: "Tillat klientprogrammet Ã¥ gjere:" + allow_read_gpx: lese dine private GPS-spor. + allow_read_prefs: lese brukarinnstillingane dine. + allow_to: "Gje programmet lov til Ã¥:" allow_write_api: endre kartet. - allow_write_diary: opprett dagbokoppføringer, kommentarar og finn venner. - allow_write_gpx: last opp GPS-spor. - allow_write_prefs: Innstillingane vart lagra. - request_access: Applikasjonen %{app_name} ber om tilgjenge til kontoen din, %{user}. Sjekk om du vil at applikasjonen skal ha følgjande høve. Du kan velje sÃ¥ mange eller fÃ¥ du vil. + allow_write_diary: opprette dagbokoppføringar, kommentarar og finne venner. + allow_write_gpx: laste opp GPS-spor. + allow_write_prefs: endre brukarinnstillingane dine + request_access: Applikasjonen %{app_name} ber om tilgjenge til kontoen din, %{user}. Sjekk om du vil at applikasjonen skal ha følgjande løyve. Du kan velje sÃ¥ mange eller sÃ¥ fÃ¥ som du vil. revoke: flash: Du sletta nøkkelen for %{application} oauth_clients: @@ -1202,7 +1254,7 @@ nn: support_url: Støytte-URL url: URL til hovedapplikasjonen index: - application: Applikasjonsnavn + application: Programnamn issued_at: Utskrive list_tokens: "Følgjande nøklar er utskrivne til program i namnet ditt:" my_apps: Mine klientapplikasjoner @@ -1220,16 +1272,18 @@ nn: show: access_url: URL for tilgangensnøkkel allow_read_gpx: les deira private GPS-spor. - allow_read_prefs: les brukerinnstillingene deira. + allow_read_prefs: les brukarinnstillingane dine. allow_write_api: endre kartet. allow_write_diary: opprett dagbokoppføringer, kommentarar og finn venner. allow_write_gpx: last opp GPS-spor. allow_write_prefs: endre brukerinnstillingene deira. authorize_url: "Godkjenn URL:" + confirm: Er du sikker? + delete: Ta bort klient edit: Rediger detaljar - key: "Forbrukernøkkel:" + key: "Forbrukarnøkkel:" requests: "Ber om følgjande løyve frÃ¥ brukaren:" - secret: "Forbrukerhemmelighet:" + secret: "Forbrukarhemmelegheit:" support_notice: Me støttar HMAC-SHA1 (tilrÃ¥dt) sÃ¥ vel som rein tekst i ssl-modus. title: OAuth-detaljar for %{app_name} url: "URL for forespørelsnøkkel:" @@ -1239,6 +1293,37 @@ nn: with_id: "%{id}" with_name: "%{name} (%{id})" with_version: "%{id}, v%{version}" + redaction: + create: + flash: Maskering oppretta. + destroy: + error: Det var ein feil med Ã¥ ødelege denne maskeringa. + flash: Maskering ødelagd. + not_empty: Maskeringa er ikkje tom. Avmasker alle versjonar som høyrer til denne maskeringa før du ødeleger den. + edit: + description: Skildring + heading: Rediger maskering + submit: Lagre markering + title: Rediger relasjon + index: + empty: Ingen maskeringar Ã¥ vise. + heading: Liste over maskeringar + title: Liste over maskeringar + new: + description: Skildring + heading: Legg inn informasjon for ein ny maskering + submit: Lag maskering + title: Lagar ein ny maskering + show: + confirm: Er du sikker? + description: "Skildring:" + destroy: Fjern denne maskeringa + edit: Endre denne maskeringa + heading: Visar maskering "%{title}" + title: Visar maskering + user: "Oppretta av:" + update: + flash: Endringar lagra. site: edit: anon_edits: (%{link}) @@ -1255,7 +1340,6 @@ nn: index: js_1: Du har ein nettleser som ikkje støttar JavaScript eller sÃ¥ har du slÃ¥tt av JavaScript. js_2: OpenStreetMap brukar JavaScript pÃ¥ kartsidene. - js_3: Viss du ikkje kan slÃ¥ pÃ¥ JavaScript, sÃ¥ kan du prøve dei <a href="http://tah.openstreetmap.org/Browse/">statiske Tile sitt@Home-kartsidene</a>. license: license_name: Creative Commons Navngivelse-Del pÃ¥ like vilkÃ¥r 2.0 license_url: https://creativecommons.org/licenses/by-sa/2.0/deed.no @@ -1334,6 +1418,23 @@ nn: unclassified: Uklassifisert veg unsurfaced: Veg utan dekke wood: Ved + markdown_help: + alt: Alternativ tekst + first: Første punkt + heading: Overskrifter + headings: Overskrifter + image: Bilete + link: Lekje + ordered: Sortert liste + second: Andre punkt + subheading: Underoverskrifter + text: Tekst + title_html: Tolka med <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Usortert liste + url: URL + richtext_area: + edit: Endre + preview: Førehandsvising search: search: Søk search_help: "Døme: 'Lindesnes', 'Karl Johans gate', 'Sør-Trøndelag' og <a href='http://wiki.openstreetmap.org/wiki/Search'>fleire ...</a>" @@ -1356,7 +1457,7 @@ nn: description: "Skildring:" download: last ned edit: rediger - filename: "Filnavn:" + filename: "Filnamn:" heading: Redigerer spor %{name} map: kart owner: "Eigar:" @@ -1367,20 +1468,17 @@ nn: tags_help: kommaseparert title: Redigerer spor %{name} uploaded_at: "Last opp:" - visibility: "Synlighet:" + visibility: "Synlegheit:" visibility_help: kva tyder dette? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces list: + empty_html: Ingenting her endÃ¥. <a href='%{upload_link}'>Last opp eit nytt spor</a> eller lær Ã¥ lage GPS spor pÃ¥ <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki sida</a>. public_traces: Offentleg GPS-spor public_traces_from: Offentlege GPS-spor frÃ¥ %{user} tagged_with: merkte med %{tags} your_traces: Dine GPS-spor make_public: made_public: Spor gjort offentleg - no_such_user: - body: Beklagar, det finst ingen brukar med namnet %{user}. Vennligst sjekk at du har stava riktig, eller kanskje lenkja du følgde er feil. - heading: Brukaren %{user} finst ikkje - title: Ingen brukar funnet offline: heading: GPX-lagring er utilgjengelig message: Systemet for opplasting og lagring av GPX-filer er ikkje tilgjengeleg for augneblunken. @@ -1421,8 +1519,8 @@ nn: trace_optionals: tags: Merkelappar trace_paging_nav: - next: Neste » - previous: « Forrige + newer: Nyare spor + older: Eldre spor showing_page: Viser side %{page} view: delete_track: Slett dette sporet @@ -1430,7 +1528,7 @@ nn: download: last ned edit: rediger edit_track: Rediger dette sporet - filename: "Filnavn:" + filename: "Filnamn:" heading: Viser spor %{name} map: kart none: Ingen @@ -1440,7 +1538,7 @@ nn: start_coordinates: "Startkoordinat:" tags: "Markelappar:" title: Viser spor %{name} - trace_not_found: Spor ikkje funnet! + trace_not_found: Sporet vart ikkje funne! uploaded: "Lasta opp:" visibility: "Synligheit:" visibility: @@ -1534,7 +1632,7 @@ nn: account not active: Beklagar, kontoen din er ikkje aktivert enno.<br />Bruk lenkja i kontobekreftelseseposten for Ã¥ aktivare kontoen din, eller <a href="%{reconfirm}">be om ein ny bekreftelsesepost</a>. auth failure: Beklagar, kunne ikkje logge inn med den informasjonen create account minute: Opprett ein konto. Det tek berre eitt minutt. - email or username: "E-postadresse eller brukernavn:" + email or username: "E-postadresse eller brukarnamn:" heading: Logg inn login_button: Logg inn lost password link: Mista passordet ditt? @@ -1658,7 +1756,7 @@ nn: activate_user: aktiver denne brukaren add as friend: legg til som ein ven ago: (%{time_in_words_ago} sidan) - block_history: vis mottekne blokkeringar + block_history: mottekne blokkeringar blocks by me: blokkeringar utført av meg blocks on me: blokkeringane mine comments: kommentarar @@ -1668,7 +1766,7 @@ nn: created from: "Oppretta frÃ¥:" ct accepted: Akseptert %{ago} sidan ct declined: AvslÃ¥tt - ct status: "VilkÃ¥ra til bidragsytar:" + ct status: "BidragsytarvilkÃ¥r:" ct undecided: Usikker deactivate_user: deaktiver denne brukaren delete_user: slett denne brukaren @@ -1684,7 +1782,7 @@ nn: latest edit: "Siste redigering %{ago}:" m away: "%{count}m unna" mapper since: "Brukar sidan:" - moderator_history: vis tildelte blokkeringar + moderator_history: tildelte blokkeringar my comments: mine kommentarar my diary: mi dagbok my edits: redigeringane mine @@ -1732,7 +1830,7 @@ nn: back: Vis alle blokkeringar heading: Endrar blokkering av %{name} needs_view: MÃ¥ brukaren logge inn før denne blokkeringa vert fjerna? - period: Kor lengje, frÃ¥ no, brukaren vil blokkerast frÃ¥ API-et. + period: Kor lenge, frÃ¥ no av, brukaren vil blokkerast frÃ¥ API-en. reason: Årsaka til kvifor %{name} vert blokkert. Vennligst ver sÃ¥ roleg og rimeleg som mogleg og oppgje sÃ¥ mange detaljar du kan om situasjonen. Hugs at ikkje alle brukarar forstÃ¥r felleskapssjargongen sÃ¥ prøv Ã¥ bruke lekmannsuttrykk. show: Vis denne blokkeringa submit: Oppdater blokkering @@ -1740,7 +1838,6 @@ nn: filter: block_expired: Blokkeringa har allereie utløpt og kan ikkje endrast. block_period: Blokkeringsperioden mÃ¥ vere ein av verdia som kan vert frÃ¥ valde rullegardinen. - not_a_moderator: Du mÃ¥ vere ein moderator for Ã¥ utføre den handlinga. helper: time_future: Sluttar om %{time}. time_past: Slutta %{time} sidan. @@ -1756,7 +1853,7 @@ nn: back: Vis alle blokkeringar heading: Opprettar blokkering av %{name} needs_view: Brukaren mÃ¥ logge inn før denne blokkeringa vert fjerna. - period: Kor lengje, frÃ¥ no, brukaren vil blokkerast frÃ¥ API-et. + period: Kor lenge, frÃ¥ no av, brukaren vil blokkerast frÃ¥ API-en. reason: Årsaka til at %{name} vert blokkert. Vennligst ver sÃ¥ roleg og rimeleg som mogleg og gje sÃ¥ mange detaljar du kan om situasjonen, og husk pÃ¥ at meldinga vert synleg for offentligheita. Hugs pÃ¥ at ikkje alle brukarar forstÃ¥r fellesskapssjargongen sÃ¥ prøv Ã¥ bruke lekmannsuttrykk. submit: Opprett blokkering title: Opprettar blokkering av %{name} @@ -1770,11 +1867,14 @@ nn: creator_name: Oppretta av display_name: Blokkert brukar edit: Rediger + next: Neste » not_revoked: (ikkje tilbakekalt) + previous: « Forrige reason: Årsak for blokkering revoke: Tilbakekall! revoker_name: Tilbakekalt av show: Vis + showing_page: Viser side %{page} status: Status period: one: 1 time @@ -1802,7 +1902,7 @@ nn: time_past: Slutta %{time} sidan title: "%{block_on} blokkert av %{block_by}" update: - only_creator_can_edit: Bare moderatoren som oppretta denne blokkeringa kan endre han. + only_creator_can_edit: Berre moderatoren som oppretta blokkeringa kan endre henne. success: Blokkering oppdatert. user_role: filter: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index ce4dad8e5..719f9a95d 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1,10 +1,12 @@ -# Messages for Polish (Polski) +# Messages for Polish (polski) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Ajank # Author: BdgwksxD # Author: BeginaFelicysym # Author: Deejay1 +# Author: Nemo bis +# Author: Przemub # Author: RafalR # Author: Soeb # Author: Sp5uhe @@ -90,7 +92,6 @@ pl: changeset: changeset: "Zestaw zmian: %{id}" changesetxml: XML w formacie zestawu zmian - download: Ściągnij %{changeset_xml_link} lub %{osmchange_xml_link} feed: title: Zestaw zmian %{id} title_comment: Zestaw zmian %{id} – %{comment} @@ -155,7 +156,6 @@ pl: next_changeset_tooltip: Następna edycja wykonana przez użytkownika %{user} prev_changeset_tooltip: Poprzednia edycja wykonana przez użytkownika %{user} node: - download: "%{download_xml_link} lub %{view_history_link}" download_xml: Ściągnij XML edit: edytuj node: Węzeł @@ -165,7 +165,6 @@ pl: coordinates: "Współrzędne:" part_of: "Jest częścią:" node_history: - download: "%{download_xml_link} lub %{view_details_link}" download_xml: Ściągnij XML node_history: Historia zmian węzła node_history_title: "Historia punktu: %{node_name}" @@ -180,8 +179,12 @@ pl: paging_nav: of: z showing_page: Widoczna jest strona + redacted: + type: + node: węzeł + relation: relacja + way: droga relation: - download: "%{download_xml_link} lub %{view_history_link}" download_xml: Ściągnij XML relation: Relacja relation_title: "Relacja: %{relation_name}" @@ -190,7 +193,6 @@ pl: members: "Zawiera:" part_of: "Jest częścią:" relation_history: - download: "%{download_xml_link} lub %{view_details_link}" download_xml: Ściągnij XML relation_history: Historia zmian relacji relation_history_title: "Historia relacji: %{relation_name}" @@ -206,7 +208,7 @@ pl: view_data: Zobacz dane w aktualnym widoku mapy start_rjs: data_frame_title: Dane - data_layer_name: Dane + data_layer_name: Przeglądaj dane mapy details: Szczegóły drag_a_box: Zaznacz myszą prostokąt na mapie, aby wybrać obszar edited_by_user_at_timestamp: Edytowany przez [[user]] ostatni raz [[timestamp]] @@ -252,7 +254,6 @@ pl: relation: relacja way: droga way: - download: "%{download_xml_link} lub %{view_history_link}" download_xml: Ściągnij XML edit: edytuj view_history: pokaż historię @@ -265,7 +266,6 @@ pl: nodes: "Węzły:" part_of: "Jest częścią:" way_history: - download: "%{download_xml_link} lub %{view_details_link}" download_xml: Ściągnij XML view_details: zobacz szczegóły way_history: Historia zmian drogi @@ -292,20 +292,33 @@ pl: list: description: Ostatnie zmiany description_bbox: Zestawy zmian na obszarze %{bbox} + description_friend: Zestawy zmian twoich znajomych + description_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu description_user: Zestawy zmian utworzone przez użytkownika %{user} description_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox} + empty_user_html: Wydaje się że jeszcze nie edytowałeś. By zacząć, przejrzyj <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Przewodnik dla początkujących</a>. heading: Zestawy zmian heading_bbox: Zestawy zmian heading_friend: Zestawy zmian + heading_nearby: Zestawy zmian heading_user: Zestawy zmian heading_user_bbox: Zestawy zmian title: Zestawy zmian title_bbox: Zestawy zmian w %{bbox} + title_friend: Zestawy zmian twoich znajomych + title_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu title_user: Zestawy zmian utworzone przez użytkownika %{user} title_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox} timeout: sorry: Niestety, pobieranie listy zestawów zmian, którą chciałeś zobaczyć, trwało zbyt długo. diary_entry: + comments: + ago: "%{ago} temu" + comment: Komentarz + newer_comments: Nowsze komentarze + older_comments: Starsze komentarze + post: Wpis + when: Kiedy diary_comment: comment_from: Komentarz od %{link_user} z %{comment_created_at} confirm: Potwierdź @@ -350,6 +363,8 @@ pl: older_entries: Starsze wpisy recent_entries: "Ostatnie wpisy do dziennika:" title: Dzienniki użytkowników + title_friends: Dzienniki znajomych + title_nearby: Dzienniki najbliższych użytkowników user_title: Dziennik dla %{user} location: edit: Edytuj @@ -361,10 +376,6 @@ pl: body: Niestety nie znaleziono wpisu dziennika / komentarza o id %{id}, sprawdź pisownię. Byc może użyłeś(aś) linku który był niepoprawny. heading: "Brak wpisu o id: %{id}" title: Nie ma takiego wpisu - no_such_user: - body: Niestety nie znaleziono użytkownika o nazwie %{user}, sprawdź pisownię. Być może użyłeś(aś) linku który był niepoprawny. - heading: Użytkownik %{user} nie istnieje - title: Nie znaleziono użytkownika view: leave_a_comment: Zostaw komentarz login: Zaloguj się @@ -387,7 +398,7 @@ pl: start: add_marker: Dodaj pinezkę na mapie area_to_export: Obszar do eksportu - embeddable_html: HTML do wklejenia + embeddable_html: Kod HTML do osadzenia export_button: Eksportuj export_details: "Dane OpenStreetMap udostępnione są na licencji <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.pl\">Creative Commons: uznanie autorstwa, na tych samych warunkach 2.0</a>." format: Format @@ -397,6 +408,7 @@ pl: licence: Licencja longitude: "Dł:" manually_select: Ręcznie zaznacz inny obszar + map_image: Plik graficzny (standardowa warstwa) max: max options: Opcje osm_xml_data: Dane XML OpenStreetMap @@ -457,9 +469,19 @@ pl: suffix_place: ", %{distance} %{direction} względem %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Lotnisko + apron: Płyta postojowa + gate: Bramka + helipad: Helipad + runway: Pas startowy + taxiway: Droga kołowania + terminal: Terminal amenity: + WLAN: Dostęp do WiFi airport: Lonisko arts_centre: Centrum sztuki + artwork: Sztuka atm: Bankomat auditorium: Audytorium bank: Bank @@ -467,6 +489,7 @@ pl: bench: Ławka bicycle_parking: Parking rowerowy bicycle_rental: Wypożyczalnia rowerów + biergarten: Ogród piwny brothel: Dom publiczny bureau_de_change: Kantor bus_station: Stacja autobusowa @@ -475,6 +498,7 @@ pl: car_sharing: Dzielenie się samochodami car_wash: Myjnia samochodowa casino: Kasyno + charging_station: Stacja paliw cinema: Kino clinic: Przychodnia club: Klub @@ -493,6 +517,7 @@ pl: ferry_terminal: Terminal promowy fire_hydrant: Hydrant fire_station: Remiza strażacka + food_court: Targ z żywnością fountain: Fontanna fuel: Stacja benzynowa grave_yard: Mniejszy cmentarz @@ -533,9 +558,12 @@ pl: shelter: Schron shop: Sklep shopping: Zakupy + shower: Prysznic + social_centre: Centrum społeczne social_club: Klub towarzyski studio: Studio supermarket: Supermarket + swimming_pool: Basen taxi: Postój taksówek telephone: Budka telefoniczna theatre: Teatr @@ -550,37 +578,16 @@ pl: youth_centre: Centrum młodzieżowe boundary: administrative: Granica administracyjna + census: Granica spisu + national_park: Park Narodowy + protected_area: Obszar chroniony + bridge: + aqueduct: Akwedukt + suspension: Most wiszący + viaduct: Wiadukt + "yes": Most building: - apartments: Blok mieszkalny - block: Budynek bloku - bunker: Bunkier - chapel: Kaplica - church: Kościół - city_hall: Ratusz - commercial: Budynek handlowy - dormitory: Bursa - entrance: Wejście do budynku - faculty: Budynek prawny - farm: Budynek gospodarczy - flats: Mieszkania - garage: Garaż - hall: Hala - hospital: Budynek szpitala - hotel: Hotel - house: Dom - industrial: Budynek przemysłowy - office: Budynek biurowy - public: Budynek publiczny - residential: Budynek mieszkalny - retail: Budynek detaliczny - school: Budynek szkoły - shop: Sklep - stadium: Stadion - store: Składnica - terrace: Taras - tower: Wieża - train_station: Stacja kolejowa - university: Budynek uniwersytetu + "yes": Budynek highway: bridleway: Droga dla koni bus_guideway: Droga dla autobusów @@ -588,12 +595,11 @@ pl: byway: Boczna droga construction: Droga budowana cycleway: Ścieżka rowerowa - distance_marker: Znak odległości emergency_access_point: Punkt awaryjny footway: Chodnik ford: Bród - gate: Bramka living_street: Strefa zamieszkania + milestone: Punkt kontrolny minor: Drobna droga motorway: Autostrada motorway_junction: Skrzyżowanie autostrad @@ -605,14 +611,17 @@ pl: primary_link: Droga krajowa – dojazd raceway: Tor wyścigowy residential: Droga osiedlowa + rest_area: Miejsce obsługi podróżnych road: Droga secondary: Droga wojewódzka secondary_link: Droga wojewódzka – dojazd service: Droga serwisowa services: Usługi autostrady + speed_camera: Radar steps: Schody stile: Przełaz tertiary: Droga powiatowa + tertiary_link: Droga wojewódzka track: Droga gruntowa trail: Szlak trunk: Droga ekspresowa @@ -626,6 +635,7 @@ pl: building: Budynek castle: Zamek church: Kościół + fort: Fort house: Dom icon: Ikona manor: Dwór @@ -650,6 +660,7 @@ pl: farmland: Grunty rolne farmyard: Podwórze gospodarskie forest: Las + garages: Garaże grass: Trawa greenfield: Tereny niezagospodarowane industrial: Teren przemysłowy @@ -657,25 +668,27 @@ pl: meadow: Łąka military: Teren wojskowy mine: Kopalnia - mountain: Góra nature_reserve: Rezerwat przyrody + orchard: Sad park: Park piste: Trasa - plaza: Plac quarry: Kamieniołom railway: Teren kolejowy recreation_ground: Ziemia rekreacyjna reservoir: Sztuczny zbiornik wodny residential: Zabudowa mieszkaniowa retail: Handel detaliczny + road: Obszar drogowy village_green: Park miejski vineyard: Winnica wetland: Tereny podmokłe wood: Puszcza leisure: beach_resort: Strzeżona plaża + bird_hide: Ukryj ptaki common: Błonie fishing: Łowisko + fitness_station: Fitness garden: Ogród golf_course: Pole golfowe ice_rink: Lodowisko @@ -686,12 +699,17 @@ pl: pitch: Boisko sportowe playground: Plac zabaw recreation_ground: Pole rekreacyjne + sauna: Sauna slipway: Pochylnia sports_centre: Centrum sportowe stadium: Stadion swimming_pool: Basen track: Bieżnia water_park: Park wodny + military: + airfield: Lotnisko wojskowe + barracks: Koszary + bunker: Bunkier natural: bay: Zatoka beach: Plaża @@ -699,11 +717,11 @@ pl: cave_entrance: Wejście do jaskini channel: Kanał cliff: Urwisko - coastline: Linia brzegowa crater: Krater feature: Obiekt fell: Hale górskie fjord: Fiord + forest: Las geyser: Gejzer glacier: Lodowiec heath: Wrzosowisko @@ -723,6 +741,7 @@ pl: scrub: Zagajnik shoal: Mielizna spring: Źródło + stone: Kamieniołom strait: Cieśnina tree: Drzewo valley: Dolina @@ -731,6 +750,12 @@ pl: wetland: Obszar podmokły wetlands: Obszary podmokłe wood: Puszcza + office: + architect: Architekt + company: Przedsiębiorstwo + employment_agency: Urząd pracy + estate_agent: Biuro nieruchomości + government: Biura rządowe place: airport: Lotnisko city: Miasto @@ -779,7 +804,6 @@ pl: yard: Stacja postojowa, lokomotywownia shop: alcohol: Sklep monopolowy - apparel: Sklep odzieżowy art: Sklep z dziełami sztuki bakery: Piekarnia beauty: Salon kosmetyczny @@ -788,7 +812,6 @@ pl: books: Księgarnia butcher: Rzeźnik car: Sklep samochodowy - car_dealer: Salon samochodowy car_parts: Sklep z częściami samochodowymi car_repair: Naprawa samochodów carpet: Sklep z dywanami @@ -803,7 +826,6 @@ pl: department_store: Dom towarowy discount: Sklep z produktami po obniżce doityourself: Sklep budowlany - drugstore: Drogeria dry_cleaning: Pralnia chemiczna electronics: Sklep elektroniczny estate_agent: Biuro nieruchomości @@ -894,6 +916,7 @@ pl: map: base: cycle_map: Mapa Rowerowa + standard: Standard transport_map: Transport publiczny site: edit_disabled_tooltip: Powiększ, aby edytować mapę @@ -924,16 +947,11 @@ pl: history: Zmiany home: główna home_tooltip: Przejdź do strony głównej - inbox: poczta (%{count}) inbox_tooltip: one: Twoja skrzynka zawiera jedną nową wiadomość other: Twoja skrzynka zawiera %{count} nowych wiadomości zero: Brak nowych wiadomości intro_1: OpenStreetMap to mapa całego świata, którą możesz swobodnie edytować. Tworzą ją ludzie tacy jak Ty. - intro_2: OpenStreetMap pozwala Ci oglądać, wykorzystywać oraz wspólnie tworzyć dane geograficzne z dowolnego miejsca na Ziemi. - intro_3: Hosting OpenStreetMap jest świadczony przez %{ucl}, %{ic} oraz %{bytemark}. Inni wspomagający projekt wymienieni są na stronie %{partners}. - intro_3_ic: Imperial College w Londynie - intro_3_partners: wiki license: title: Dane OpenStreetMap są licencjonowane przez Creative Commons Attribution-Share Alike 2.0 Generic License log_in: zaloguj się @@ -949,7 +967,6 @@ pl: osm_read_only: Baza danych OpenStreetMap jest w trybie tylko-do-odczytu na czas ważnych zadań administracyjnych, które są w tym momencie wykonywane. sign_up: zarejestruj sign_up_tooltip: Załóż konto, aby edytować - sotm2011: Przybądź na konferencję OpenStreetMap, The State of the Map, 9-11 września w Denver! tag_line: Swobodna Wiki-Mapa Świata user_diaries: Dzienniczki user_diaries_tooltip: Przeglądaj dzienniczki użytkownika @@ -964,7 +981,28 @@ pl: english_link: oryginalna angielska wersja text: W przypadku konfliktu pomiędzy tym tłumaczeniem a %{english_original_link}, preferowana jest strona w języku angielskim. title: Informacje o tłumaczeniu - legal_babble: "<h2>Prawa autorskie i licencja</h2>\n<p>\nOpenStreetMap stanowi zbiór <i>wolnych danych</i>, udostępnianych na licencji <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).\n</p>\n<p>\nMożesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze mapy i dane, pod warunkiem podania OpenStreetMap i jego użytkowników jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze mapy lub dane, wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji. <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Pełen tekst licencji</a> dokładnie opisuje Twoje prawa i obowiązki.\n</p>\n\n<h3>Jak podać źródło</h3>\n<p>\nJeśli korzystasz z gotowej mapy OpenStreetMap, wymagane jest podanie źródła co najmniej w postaci „© użytkownicy OpenStreetMap, CC BY-SA”. Jeśli korzystasz tylko z danych geograficznych, wymagane jest podanie źródła w postaci „Dane mapy © użytkownicy OpenStreetMap, CC BY-SA”.\n</p>\n<p>\nO ile jest to możliwe, nazwa OpenStreetMap powinna być hiperłączem do <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>, zaś CC BY-SA do <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Jeśli korzystasz z nośnika, który uniemożliwia tworzenie hiperłącz (np. druk na papierze), zalecane jest kierowanie oglądających do stron internetowych www.openstreetmap.org (np. przez rozwinięcie nazwy OpenStreetMap do pełnego adresu internetowego) oraz www.creativecommons.org.\n</p>\n\n<h3>Dowiedz się więcej</h3>\n<p>\nWięcej informacji o możliwości wykorzystania danych OpenStreetMap można znaleźć w <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal FAQ</a>.\n</p>\n<p>\nUżytkownicy OpenStreetMap powinni pamiętać, aby nigdy nie dodawać danych z jakichkolwiek źródeł chronionych prawami autorskimi (jak np. Google Maps i większość map drukowanych) bez wyraźnego pozwolenia właściciela praw autorskich.\n</p>\n<p>\nPomimo że OpenStreetMap stanowi zbiór wolnych danych, nie jesteśmy w stanie udostępnić bezpłatnego interfejsu programistycznego (API) dla programistów firm trzecich.\n\nZapoznaj się z naszymi <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Zasadami korzystania z API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Zasadami korzystania z kafelków mapy</a> oraz <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Zasadami korzystania z Nominatima</a>.\n</p>\n\n<h3>Dane włączone do OpenStreetMap</h3>\n<p>\nWykorzystywana przez nas licencja CC BY-SA wymaga, aby „oznaczyć twórcę w sposób właściwy dla wykorzystywanego nośnika lub środka przekazu”. Indywidualni użytkownicy OpenStreetMap nie wymagają oznaczenia w sposób bardziej szczegółowy niż „użytkownicy OpenStreetMap”. Jednak gdy do OpenStreetMap włączane są dane z narodowych instytucji kartograficznych lub z innych znaczących źródeł, może być właściwe, by oznaczyć twórcę bezpośrednio we włączanych danych bądź dodać link do niego też na tej stronie.\n</p>\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n<ul id=\"contributors\">\n<li><strong>Australia</strong>: Zawiera dane o miejscowościach oparte na danych ''Australian Bureau of Statistics''.</li>\n<li><strong>Austria</strong>: Zawiera dane <a href=\"http://data.wien.gv.at/\">miasta Wiednia</a> na licencji <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>.</li>\n<li><strong>Francja</strong>: Zawiera dane uzyskane z ''Direction Générale des Impôts''.</li>\n<li><strong>Kanada</strong>: Zawiera dane z GeoBase®, GeoGratis (© ''Department of Natural Resources Canada''), CanVec (© ''Department of Natural Resources Canada'') i StatCan (''Geography Division, Statistics Canada'').</li>\n<li><strong>Nowa Zelandia</strong>: Zawiera dane uzyskane z ''Land Information New Zealand''. Crown Copyright reserved.</li>\n<li><strong>Polska</strong>: Zawiera dane z <a href=\"http://www.ump.waw.pl/\">mapy UMP-pcPL</a>. Copyright współtwórców UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\"> Więcej o użyciu danych UMP przez OSM</a></li>\n<li><strong>Południowa Afryka</strong>: Zawiera dane pochodzące od <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, Państwowe prawa autorskie zastrzeżone.\n</li>\n<li><strong>Wielka Brytania</strong>: Zawiera dane ''Ordnance Survey''. © Crown copyright and database right 2010.</li>\n</ul>\n\n<p>\nWłączenie danych do OpenStreetMap nie musi oznaczać, że podmiot będący ich źródłem popiera OpenStreetMap, udziela jakiejkolwiek gwarancji lub ponosi jakąkolwiek odpowiedzialność.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: Zawiera dane <a href=\"http://data.wien.gv.at/\">miasta Wiednia</a> (na licencji <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> oraz\nLand Tyrol (na licencji <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT z późniejszymi zmianami</a>)." + contributors_au_html: "<strong>Australia</strong>: Zawiera dane o miejscowościach oparte na danych ''Australian Bureau of Statistics''." + contributors_ca_html: "<strong>Kanada</strong>: Zawiera dane z GeoBase®, GeoGratis (© ''Department of Natural Resources Canada''), CanVec (© ''Department of Natural Resources Canada'') i StatCan (''Geography Division, Statistics Canada'')." + contributors_footer_2_html: Włączenie danych do OpenStreetMap nie musi oznaczać, że podmiot będący ich źródłem popiera OpenStreetMap, udziela jakiejkolwiek gwarancji lub ponosi jakąkolwiek odpowiedzialność. + contributors_fr_html: "<strong>Francja</strong>: Zawiera dane uzyskane z ''Direction Générale des Impôts''.</li>" + contributors_gb_html: "<strong>Wielka Brytania</strong>: Zawiera dane ''Ordnance Survey''. © Crown copyright and database right 2010." + contributors_intro_html: Wykorzystywana przez nas licencja CC BY-SA wymaga, aby „oznaczyć twórcę w sposób właściwy dla wykorzystywanego nośnika lub środka przekazu”. Indywidualni użytkownicy OpenStreetMap nie wymagają oznaczenia w sposób bardziej szczegółowy niż „użytkownicy OpenStreetMap”. Jednak gdy do OpenStreetMap włączane są dane z narodowych instytucji kartograficznych lub z innych znaczących źródeł, może być właściwe, by oznaczyć twórcę bezpośrednio we włączanych danych bądź dodać link do niego też na tej stronie. + contributors_nl_html: "<strong>Holandia</strong>: Zawiera dane © AND, 2007\t\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nowa Zelandia</strong>: Zawiera dane uzyskane z ''Land Information New Zealand''. Crown Copyright reserved." + contributors_pl_html: "<strong>Polska</strong>: Zawiera dane z <a href=\"http://www.ump.waw.pl/\">mapy UMP-pcPL</a>. Copyright współtwórców UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\"> Więcej o użyciu danych UMP przez OSM</a></li>\n<li><strong>Południowa Afryka</strong>: Zawiera dane pochodzące od <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, Państwowe prawa autorskie zastrzeżone." + contributors_title_html: Dane włączone do OpenStreetMap + credit_1_html: Jeśli korzystasz z gotowej mapy OpenStreetMap, wymagane jest podanie źródła co najmniej w postaci „© użytkownicy OpenStreetMap, CC BY-SA”. Jeśli korzystasz tylko z danych geograficznych, wymagane jest podanie źródła w postaci „Dane mapy © użytkownicy OpenStreetMap, CC BY-SA”. + credit_2_html: O ile jest to możliwe, nazwa OpenStreetMap powinna być hiperłączem do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>, zaś CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. Jeśli korzystasz z nośnika, który uniemożliwia tworzenie hiperłącz (np. druk na papierze), zalecane jest kierowanie oglądających do stron internetowych www.openstreetmap.org (np. przez rozwinięcie nazwy OpenStreetMap do pełnego adresu internetowego) oraz www.creativecommons.org. + credit_title_html: Jak podać źródło + intro_1_html: OpenStreetMap stanowi zbiór <i>wolnych danych</i>, udostępnianych na licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA). + intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze mapy i dane, pod warunkiem podania OpenStreetMap i jego użytkowników jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze mapy lub dane, wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji. <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">Pełen tekst licencji</a> dokładnie opisuje Twoje prawa i obowiązki. + more_1_html: Więcej informacji o możliwości wykorzystania danych OpenStreetMap można znaleźć w <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>. + more_2_html: Użytkownicy OpenStreetMap powinni pamiętać, aby nigdy nie dodawać danych z jakichkolwiek źródeł chronionych prawami autorskimi (jak np. Google Maps i większość map drukowanych) bez wyraźnego pozwolenia właściciela praw autorskich. + more_3_html: "Pomimo że OpenStreetMap stanowi zbiór wolnych danych, nie jesteśmy w stanie udostępnić bezpłatnego interfejsu programistycznego (API) dla programistów firm trzecich.\n\nZapoznaj się z naszymi <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Zasadami korzystania z API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Zasadami korzystania z kafelków mapy</a> oraz <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Zasadami korzystania z Nominatima</a>." + more_title_html: Dowiedz się więcej + title_html: Prawa autorskie i licencja native: mapping_link: rozpocząć tworzenie mapy native_link: wersji po polsku @@ -976,8 +1014,19 @@ pl: inbox: date: Nadano from: Od + messages: Masz %{new_messages} i %{old_messages} my_inbox: Moja skrzynka odbiorcza + new_messages: + few: "%{count} nowe wiadomości" + many: "%{count} nowych wiadomości" + one: "%{count} nową wiadomość" + other: "%{count} nowych wiadomości" no_messages_yet: Nie masz jeszcze wiadomości. Może skontaktujesz się z %{people_mapping_nearby_link}? + old_messages: + few: "%{count} stare wiadomości" + many: "%{count} starych wiadomości" + one: "%{count} starą wiadomość" + other: "%{count} starych wiadomości" outbox: nadawcza people_mapping_nearby: użytkownikami z Twojej okolicy subject: Temat @@ -1003,10 +1052,6 @@ pl: body: Niestety, nie ma wiadomości o tym identyfikatorze. heading: Nie ma takiej wiadomości title: Nie ma takiej wiadomości - no_such_user: - body: Niestety nie ma użytkownika o takiej nazwie. - heading: Nie ma takiego użytkownika - title: Nie ma takiego użytkownika outbox: date: Nadano inbox: odbiorcza @@ -1153,6 +1198,35 @@ pl: key: "Klucz odbiorcy:" secret: "Sekret odbiorcy:" title: Szczegóły OAuth dla %{app_name} + redaction: + create: + flash: Utworzono poprawkę. + destroy: + flash: Poprawka usunięta. + not_empty: Poprawka jest niepusta. Należy najpierw wycofać wersje poprawki przed jej usunięciem. + edit: + description: Opis + heading: Edytuj poprawkę + submit: Zapisz poprawkę + title: Edytuj poprawkę + index: + empty: Brak poprawek do pokazania. + heading: Lista poprawek + title: Lista poprawek + new: + description: Opis + heading: Wprowadź informację dla nowej poprawki + submit: Utwórz poprawkę + title: Tworzenie nowej poprawki + show: + confirm: Na pewno? + description: "Opis:" + destroy: Usuń tą poprawkę + heading: Poprawka "%{title}" + title: Wyświetlenie poprawki + user: "Autor:" + update: + flash: Zapisano zmiany. site: edit: anon_edits_link_text: Tu dowiesz się dlaczego. @@ -1167,7 +1241,6 @@ pl: index: js_1: Twoja przeglądarka internetowa nie obsługuje JavaScriptu, bądź też masz wyłączoną jego obsługę. js_2: OpenStreetMap używa JavaScriptu do wyświetlania tej mapy. - js_3: Możesz użyć <a href="http://tah.openstreetmap.org/Browse/">statycznej mapy Tiles@Home</a>, jeśli nie możesz włączyć obsługi JavaScriptu. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Dostęp na zasadach licencji %{license_name}, prawa autorskie %{project_name} i jego uczestników. @@ -1244,6 +1317,9 @@ pl: unclassified: Drogi niesklasyfikowane unsurfaced: Droga nieutwardzona wood: Puszcza + markdown_help: + heading: Nagłówek + headings: Nagłówki search: search: Szukaj search_help: "przykłady: 'Wąchock', 'Franciszkańska, Poznań', 'CB2 5AQ', lub 'post offices near Mokotów' <a href='http://wiki.openstreetmap.org/wiki/Search'>więcej przykładów...</a>" @@ -1286,10 +1362,6 @@ pl: your_traces: Twoje ślady GPS make_public: made_public: Ślad stał się publicznie dostępny - no_such_user: - body: Niestety nie znaleziono użytkownika o nazwie %{user}, sprawdź pisownię. Być może użyłeś(aś) linku który był niepoprawny. - heading: Użytkownik %{user} nie istnieje - title: Nie ma takiego użytkownika offline: heading: Przechowywanie danych GPX jest wyłączone message: System przechowywania i przesyłania plików GPX jest w tej chwili niedostępny @@ -1328,8 +1400,6 @@ pl: trace_optionals: tags: Znaczniki trace_paging_nav: - next: Następny » - previous: « Poprzedni showing_page: Wyświetlanie strony %{page} view: delete_track: Wykasuj ten ślad @@ -1359,6 +1429,7 @@ pl: account: contributor terms: agreed: Zgodziłeś się na nowe warunki uczestnictwa. + agreed_with_pd: Zadeklarowałeś, że twoje edycje publikujesz w domenie publicznej. heading: "Warunki uczestnictwa:" link text: co to jest? not yet agreed: Nie zgodziłeś się na nowe warunki uczestnictwa. @@ -1429,6 +1500,7 @@ pl: summary_no_ip: "%{name} utworzony %{date}" title: Użytkownicy login: + account is suspended: Twoje konto zostało zawieszone ze względu na podejrzaną aktywność.<br />Skontaktuj się z <a href="%{webmaster}">webmasterem</a>, jeśli chcesz przedyskutować blokadę. account not active: Niestety Twoje konto nie jest jeszcze aktywne.<br />Otwórz link zawarty w mailu potwierdzenia założenia konta, aby je aktywować lub <a href="%{reconfirm}">poproś o ponowne przesłanie maila</a>. auth failure: Niestety podane dane nie pozwoliły na zalogowanie Cię. create account minute: Utwórz konto. To zajmuje tylko minutę. @@ -1437,6 +1509,7 @@ pl: login_button: Zaloguj się lost password link: Zapomniałeś hasła? new to osm: Nowy na OpenStreetMap? + no account: Nie masz konta? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Dowiedz się więcej o nadchodzącej zmianie licencji OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">tłumaczenia</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">dyskusja</a>) openid: "%{logo} OpenID:" openid invalid: Niestety Twój OpenID wydaje się być nieprawidłowy @@ -1495,7 +1568,7 @@ pl: fill_form: Po wypełnieniu formularza otrzymasz e-mail z instrukcjami dotyczącymi aktywacji konta. flash create success message: Rejestracja udana. Sprawdź czy na adres %{email} przyszedł mail potwierdzający, a już za moment będziesz edytować mapę.<br /><br />Jeśli korzystasz z rozwiązania antyspamowego, które prosi nowych nadawców o potwierdzenie, będziesz musiał dodać adres webmaster@openstreetmap.org do znanych adresów, bo nie jesteśmy w stanie odpowiadać na zapytania takich systemów. heading: Zakładanie konta - license_agreement: Zakładając konto użytkownika wyrażasz zgodę na <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">warunki użytkowania dla edytujących</a>. + license_agreement: Zakładając konto użytkownika wyrażasz zgodę na <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">warunki współtworzenia</a>. no_auto_account_create: Niestety nie możemy aktualnie stworzyć Ci konta automatycznie. not displayed publicly: Informacje nie wyświetlane publicznie (zobacz <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="zasady prywatnością łącznie z sekcją o adresach e-mail na wiki">polityka prywatności</a>) openid: "%{logo} OpenID:" @@ -1543,6 +1616,7 @@ pl: legale_select: "Proszę wybrać kraj zamieszkania:" read and accept: Prosimy przeczytać umowę zamieszczoną poniżej i nacisnąć "Akceptuję". Klikając ten przycisk akceptujesz warunki umowy. title: Warunki współtworzenia + you need to accept or decline: Prosimy przeczytać i następnie zaakceptować lub odrzucić nowe warunki współtworzenia, aby kontynuować. view: activate_user: aktywuj tego użytkownika add as friend: dodaj do znajomych @@ -1550,6 +1624,7 @@ pl: block_history: otrzymane blokady blocks by me: nałożone blokady blocks on me: otrzymane blokady + comments: komentarze confirm: Potwierdź confirm_user: zatwierdź tego użytkownika create_block: zablokuj tego użytkownika @@ -1564,6 +1639,7 @@ pl: diary: dziennik edits: edycje email address: Adres e‐mail + friends_changesets: Przegląd wszystkich grup zmian wykonanych przez przyjaciół friends_diaries: Przeglądaj wszystkie wpisy dziennika wykonane przez przyjaciół hide_user: ukryj tego użytkownika if set location: Jeśli ustawisz swoją lokalizację, pojawi się na tej stronie kolorowa mapka i w ogóle. Lokalizację możesz podać na Twojej %{settings_link}. @@ -1572,11 +1648,13 @@ pl: m away: "%{count}m stąd" mapper since: "Mapuje od:" moderator_history: nałożone blokady + my comments: moje komentarze my diary: mój dziennik my edits: moje zmiany my settings: moje ustawienia my traces: moje ślady nearby users: Najbliżsi użytkownicy + nearby_changesets: Przegląd wszystkich grup zmian wykonanych przez pobliskich użytkowników nearby_diaries: Przeglądaj wszystkie wpisy dziennika użytkowników znajdujących się w pobliżu new diary entry: nowy wpis w dzienniku no friends: Nie dodałeś/aś jeszcze żadnych znajomych. @@ -1625,7 +1703,6 @@ pl: filter: block_expired: Blokada zakończyła się i nie można jej edytować. block_period: Długość blokady należy wybrać z listy rozwijanej. - not_a_moderator: Musisz być moderatorem, by wykonać to działanie. helper: time_future: Blokada wygasa %{time}. time_past: Zakończono %{time} temu. @@ -1639,9 +1716,11 @@ pl: non_moderator_update: Musisz być moderatorem, żeby ustalać i edytować blokady. new: back: Zobacz wszystkie blokady + heading: Tworzenie blokady użytkownika %{name} needs_view: Użytkownik musi się zalogować, zanim blokada zostanie wyczyszczona period: Na jak długo od tego momentu użytkownik ma być zablokowany przed dostępem do API. submit: Utwórz blokadę + title: Tworzenie blokady użytkownika %{name} tried_contacting: Skontaktowałem się z użytkownikami i poprosiłem ich o zaprzestanie. tried_waiting: Dałem(-am) użytkownikowi rozsądny czas, aby odpowiedzieć na te komunikaty. not_found: @@ -1652,7 +1731,9 @@ pl: creator_name: Twórca display_name: Zablokowany użytkownik edit: Edytuj + next: Następna » not_revoked: (nie odwołana) + previous: « Poprzednia reason: Powód blokady revoke: Odwołaj revoker_name: Odwołana przez diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index f8e820f25..79e002889 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1,12 +1,16 @@ -# Messages for Brazilian Portuguese (Português do Brasil) +# Messages for Brazilian Portuguese (português do Brasil) # Exported from translatewiki.net # Export driver: syck-pecl # Author: BraulioBezerra # Author: Diego Queiroz +# Author: Fmca # Author: Giro720 +# Author: Gmare # Author: Luckas Blade +# Author: Nemo bis # Author: Nighto # Author: Rodrigo Avila +# Author: 555 pt-BR: activerecord: attributes: @@ -79,6 +83,8 @@ pt-BR: application: require_cookies: cookies_needed: Parece que você está com os <i>cookies</i> não habilitados - por favor habilite os <i>cookies</i> no seu browser antes de continuar. + require_moderator: + not_a_moderator: Você precisa ser um moderador para realizar essa ação. setup_user_auth: blocked: Seu acesso à API foi bloqueado. Por favor, acesse a interface web para saber de mais detalhes. need_to_see_terms: O seu acesso à API está temporariamente suspenso. Por favor, faça o login na interface web para ler os Termos do Colaborador. Você não precisa concordar, mas você deve vê-los. @@ -86,7 +92,6 @@ pt-BR: changeset: changeset: "Alterações: %{id}" changesetxml: XML do conjunto de alterações - download: Baixar %{changeset_xml_link} ou %{osmchange_xml_link} feed: title: Conjunto de mudanças %{id} title_comment: Conjunto de mudanças %{id} - %{comment} @@ -155,7 +160,6 @@ pt-BR: next_changeset_tooltip: Editado posteriormente por %{user} prev_changeset_tooltip: Editado anteriormente por %{user} node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" download_xml: Baixar XML edit: editar node: Ponto @@ -165,7 +169,6 @@ pt-BR: coordinates: "Coordenadas:" part_of: "Parte de:" node_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Baixar XML node_history: Histórico do ponto node_history_title: "Histórico do ponto: %{node_name}" @@ -180,8 +183,12 @@ pt-BR: paging_nav: of: de showing_page: Exibindo página + redacted: + type: + node: nó + relation: relação + way: caminho relation: - download: "%{download_xml_link} ou %{view_history_link}" download_xml: Baixar XML relation: Relação relation_title: "Relação: %{relation_name}" @@ -190,7 +197,6 @@ pt-BR: members: "Membros:" part_of: "Parte de:" relation_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Baixar XML relation_history: Histórico de Relação relation_history_title: "Histórico da Relação: %{relation_name}" @@ -203,11 +209,11 @@ pt-BR: relation: Relação way: Caminho start: - manually_select: Selecione uma área diferente manualmente + manually_select: Selecionar manualmente uma área diferente view_data: Ver dados para do mapa em visualização atual start_rjs: data_frame_title: Dados - data_layer_name: Dados + data_layer_name: Navegar nos Dados do Mapa details: Detalhes drag_a_box: Clique e arraste para selecionar uma área no mapa edited_by_user_at_timestamp: Editado por [[user]] at [[timestamp]] @@ -216,7 +222,7 @@ pt-BR: load_data: Carregar dados loaded_an_area_with_num_features: Você carregou uma área que contém [[num_features]] pontos com características. Alguns navegadores podem não conseguir exibir todos estes dados. Geralmente, navegadores trabalham melhor exibindo um conjunto de menos de 100 características por vez, ultrapassar isso pode deixá-lo lento ou travá-lo. Se você tem certeza que deseja exibir estes dados, clique no botão abaixo. loading: Carregando... - manually_select: Selecione uma área diferente manualmente + manually_select: Selecionar manualmente uma área diferente object_list: api: Obter esta área através da API back: Exibir lista de objetos @@ -253,7 +259,6 @@ pt-BR: relation: relação way: caminho way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" download_xml: Baixar XML edit: editar view_history: ver histórico @@ -266,7 +271,6 @@ pt-BR: nodes: "Pontos:" part_of: "Parte de:" way_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Baixar XML view_details: ver detalhes way_history: Histórico de caminho @@ -306,13 +310,21 @@ pt-BR: heading_user_bbox: Conjuntos de alterações title: Conjuntos de alterações title_bbox: Conjuntos de alterações em %{bbox} - title_friend: Conjunto de alterações dos seus amigos - title_nearby: Conjunto de alterações de usuários próximos + title_friend: Conjuntos de alterações dos seus amigos + title_nearby: Conjuntos de alterações de usuários próximos title_user: Conjuntos de alterações de %{user} title_user_bbox: Conjuntos de alterações de %{user} em %{bbox} timeout: sorry: Desculpe. A lista de conjuntos de alterações que você solicitou está demorando muito tempo para ser recuperada. diary_entry: + comments: + ago: "%{ago} atrás" + comment: Comentário + has_commented_on: "%{display_name} comentou nestas entradas de diário" + newer_comments: Comentários Recentes + older_comments: Comentários Antigos + post: Postar + when: Quando diary_comment: comment_from: Comentário de %{link_user} em %{comment_created_at} confirm: Confirmar @@ -370,10 +382,6 @@ pt-BR: body: Desculpe, não há entrada no diário ou comentário com o id %{id}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado. heading: "Não há entrada no diário com o id: %{id}" title: Entrada de diário inexistente - no_such_user: - body: Desculpe, não há usuário com o nome %{user}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado. - heading: O usuário %{user} não existe - title: Usuário inexistente view: leave_a_comment: Deixe um comentário login: Entrar @@ -398,14 +406,15 @@ pt-BR: area_to_export: Área a exportar embeddable_html: HTML para embutir export_button: Exportar - export_details: Os dados do OpenStreetMap estão licenciados sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative Commons Atribuição - Compartilhamento pela mesma Licença 2.0 Genérica (CC-BYSA-2.0)</a>. + export_details: Os dados do OpenStreetMap estão licenciados sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative Commons Atribuição - Compartilhamento pela mesma Licença 2.0 Genérica (CC BY-SA 2.0)</a>. format: Formato format_to_export: Formato a Exportar image_size: Tamanho da Imagem latitude: "Lat:" licence: Licença longitude: "Lon:" - manually_select: Selecior área diferente manualmente + manually_select: Selecionar manualmente uma área diferente + map_image: Imagem do Mapa (mostra a camada padrão) max: max options: Opções osm_xml_data: Dados XML OpenStreetMap @@ -468,16 +477,28 @@ pt-BR: suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aeródromo + apron: Aeroportuário + gate: Portão + helipad: Heliponto + runway: Pista + taxiway: Pista de manobras + terminal: Terminal amenity: + WLAN: Acesso WiFi airport: Aeroporto arts_centre: Centro de Arte + artwork: Obra de Arte atm: Caixa automático auditorium: Auditório bank: Banco bar: Bar + bbq: Churrascaria bench: Banco (de praça) bicycle_parking: Estacionamento de bicicletas bicycle_rental: Aluguel de bicicletas + biergarten: Beer Garden brothel: Bordel bureau_de_change: Casa de câmbio bus_station: Estação de Ônibus/Rodoviária @@ -486,6 +507,7 @@ pt-BR: car_sharing: Aluguel de Carro car_wash: Lava-Carros casino: Cassino + charging_station: Estação de carga cinema: Cinema clinic: Clínica club: Clube @@ -504,6 +526,7 @@ pt-BR: ferry_terminal: Terminal de barca fire_hydrant: Hidrante fire_station: Corpo de bombeiros + food_court: Praça de Alimentação fountain: Fonte fuel: Combustível grave_yard: Cemitério @@ -544,9 +567,12 @@ pt-BR: shelter: Refúgio shop: Loja shopping: Shopping + shower: Chuveiro + social_centre: Centro social social_club: Clube social studio: Estúdio supermarket: Supermercado + swimming_pool: Piscina taxi: Táxi telephone: Telefone público theatre: Teatro @@ -557,41 +583,21 @@ pt-BR: veterinary: Clínica veterinária village_hall: Salão de vila waste_basket: Lata de lixo - wifi: Ponto de Acesso WiFi + wifi: Acesso Wi-Fi youth_centre: Centro juvenil boundary: administrative: Limite Administrativo + census: Limite de censo + national_park: Parque Nacional + protected_area: Área protegida + bridge: + aqueduct: Aqueduto + suspension: Ponte pênsil + swing: Ponte giratória + viaduct: Viaduto + "yes": Ponte building: - apartments: Bloco de apartamentos - block: Bloco de Prédios - bunker: Bunker - chapel: Capela - church: Igreja - city_hall: Prefeitura - commercial: Edifício comercial - dormitory: Dormitório - entrance: Entrada de edifício - faculty: Prédio de Faculdade - farm: Paiol - flats: Apartamentos - garage: Garagem - hall: Salão - hospital: Hospital - hotel: Hotel - house: Casa - industrial: Edifício industrial - office: Edifício de escritórios - public: Edifício público - residential: Edifício residencial - retail: Prédio de Varejo - school: Edifício escolar - shop: Loja - stadium: Estádio - store: Loja - terrace: Terraço - tower: Torre - train_station: Estação de Trem - university: Edifício Universitário + "yes": Edifício highway: bridleway: Pista para cavalos bus_guideway: Corredor de ônibus @@ -599,12 +605,11 @@ pt-BR: byway: Trilha larga construction: Estrada em construção cycleway: Ciclovia - distance_marker: Marcador de quilometragem emergency_access_point: Acesso de emergência footway: Caminho ford: Travessia de rio - gate: Portão living_street: Rua residencial + milestone: Marco minor: Estrada Secundária motorway: Rodovia expressa motorway_junction: Trevo de Acesso @@ -616,14 +621,17 @@ pt-BR: primary_link: Via Primária raceway: Pista de corrida residential: Residencial + rest_area: Área de descanso road: Estrada secondary: Via Secundária secondary_link: Via Secundária service: Rua de serviço services: Serviços de autoestrada + speed_camera: Radar steps: Degraus stile: Escada de cerca tertiary: Via terciária + tertiary_link: Via terciária track: Trilha trail: Trilha trunk: Via de entroncamento @@ -637,6 +645,7 @@ pt-BR: building: Edifício castle: Castelo church: Igreja + fort: Forte house: Casa histórica icon: Ícone manor: Terra arrendada @@ -661,6 +670,7 @@ pt-BR: farmland: Área cultivada farmyard: Curral forest: Floresta + garages: Garagens grass: Gramado greenfield: Espaço Verde industrial: Área industrial @@ -668,25 +678,28 @@ pt-BR: meadow: Gramado military: Área militar mine: Mina - mountain: Montanha nature_reserve: Reserva Natural + orchard: Pomar park: Parque piste: Pista de ski - plaza: Praça quarry: Pedreira railway: Terreno de ferrovia recreation_ground: Área recreacional reservoir: Represa ou Reservatório de Água + reservoir_watershed: Barragem residential: Área residencial retail: Varejo + road: Área de estrada village_green: Parque municipal vineyard: Vinhedo wetland: Pântano / Mangue wood: Madeira leisure: beach_resort: Balneário + bird_hide: Observatório de pássaros common: Terreno comum fishing: Área de pesca + fitness_station: Academia de ginástica garden: Jardim golf_course: Campo de Golf ice_rink: Rinque de patinação no gelo @@ -697,12 +710,17 @@ pt-BR: pitch: Campo esportivo playground: Playground recreation_ground: Área recreativa + sauna: Sauna slipway: Rampa de barco sports_centre: Centro Esportivo stadium: Estádio swimming_pool: Piscina track: Pista de corrida water_park: Parque aquático + military: + airfield: Aeródromo militar + barracks: Quartel + bunker: Bunker natural: bay: Baía beach: Praia @@ -710,11 +728,12 @@ pt-BR: cave_entrance: Entrada de Gruta channel: Canal cliff: Penhasco - coastline: Litoral crater: Cratera + dune: Duna feature: Recurso natural fell: Colina fjord: Fiorde + forest: Floresta geyser: Gêiser glacier: Geleira heath: Charneca @@ -734,6 +753,7 @@ pt-BR: scrub: Arbusto shoal: Barra spring: Nascente + stone: Pedra strait: Estreito tree: Árvore valley: Vale @@ -742,6 +762,19 @@ pt-BR: wetland: Pântano / Mangue wetlands: Pântano wood: Madeira + office: + accountant: Contabilista + architect: Arquiteto + company: Empresa + employment_agency: Agência de emprego + estate_agent: Agente imobiliário + government: Escritório governamental + insurance: Seguradora + lawyer: Advogado + ngo: ONG (Escritório) + telecommunication: Escritório de telecomunicações + travel_agent: Agência de viagens + "yes": Escritório place: airport: Aeroporto city: Cidade @@ -753,6 +786,7 @@ pt-BR: houses: Casas island: Ilha islet: Ilhota + isolated_dwelling: Moradia isolada locality: Localidade moor: Pântano municipality: Municipalidade @@ -776,6 +810,7 @@ pt-BR: junction: Cruzamento de ferrovia level_crossing: Passagem em nível light_rail: Trem metropolitano + miniature: Linhas ferroviárias para miniaturas monorail: Monotrilho narrow_gauge: Ferrovia estreita platform: Plataforma de trem @@ -790,7 +825,7 @@ pt-BR: yard: Estação de classificação shop: alcohol: Loja de bebidas alcoolicas - apparel: Loja de roupa + antiques: Antiguidades art: Loja de artigos de arte bakery: Padaria beauty: Salão de Beleza @@ -799,7 +834,6 @@ pt-BR: books: Livraria butcher: Açougue car: Loja de carros - car_dealer: Concessionária de automóveis car_parts: Autopeças car_repair: Oficina mecânica carpet: Loja de tapetes @@ -814,7 +848,6 @@ pt-BR: department_store: Loja de departamentos discount: Loja de descontos doityourself: Faça você mesmo - drugstore: Drogaria dry_cleaning: Lavagem a seco electronics: Loja de Eletrônicos estate_agent: Imobiliária @@ -861,7 +894,7 @@ pt-BR: wine: Loja de vinhos tourism: alpine_hut: Cabana alpina - artwork: Ilustração + artwork: Obra de Arte attraction: Atração bed_and_breakfast: Cama e café da manhã cabin: Cabana @@ -872,7 +905,7 @@ pt-BR: hostel: Abrigo hotel: Hotel information: Informações - lean_to: Inclinado Para + lean_to: Abrigo motel: Motel museum: Museu picnic_site: Área de Piquenique @@ -880,7 +913,10 @@ pt-BR: valley: Vale viewpoint: Mirador zoo: Zoológico + tunnel: + "yes": Túnel waterway: + artificial: Via fluvial artificial boatyard: Estaleiro canal: Canal connector: Eclusa @@ -909,6 +945,7 @@ pt-BR: base: cycle_map: Cycle Map mapquest: MapQuest Open + standard: Padrão transport_map: Mapa de transporte público overlays: maplint: Maplint @@ -920,6 +957,7 @@ pt-BR: history_tooltip: Veja as edições desta área history_zoom_alert: Você deve aumentar o zoom para ver o histórico de edição layouts: + community: Comunidade community_blogs: Blogs da Comunidade community_blogs_title: Blogs de membros da comunidade OpenStreetMap copyright: Direitos Autorais & Licença @@ -942,26 +980,23 @@ pt-BR: history: Histórico home: início home_tooltip: Ir para a sua localização - inbox: caixa de entrada (%{count}) inbox_tooltip: one: 1 Nova mensagem na sua caixa de entrada other: Sua caixa de entrada tem %{count} mensagens não lidas zero: Sem novas mensagens na sua caixa de entrada intro_1: O OpenStreetMap é um mapa livre e editável do mundo todo. Ele é feito por pessoas como você. - intro_2: O OpenStreetMap permite visualizar, editar e usar dados geográficos de maneira colaborativa de qualquer lugar do mundo. - intro_3: A hospedagem do OpenStreetMap é cedida gentilmente por %{ucl}, %{ic} e %{bytemark}. Outros apoiadores do projeto estão listados no %{partners}. - intro_3_bytemark: bytemark - intro_3_ic: Imperial College de Londres - intro_3_partners: wiki - intro_3_partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=pt-br - intro_3_ucl: UCL VR Centre + intro_2_create_account: Criar uma conta de usuário + intro_2_download: baixar + intro_2_html: Os dados são livres para %{download} e %{use} sob sua %{license}. %{create_account} para melhorar o mapa. + intro_2_license: licença aberta + intro_2_use: usar license: alt: CC by-sa 2.0 title: Os dados do OpenStreetMaps estão licenciados na Licença Creative Commons Atribuição-Compartilhamento pela Mesma Licença 2.0 Genérica log_in: entrar log_in_tooltip: Entrar com uma conta existente logo: - alt_text: OpenStreetMap logo + alt_text: Logotipo do OpenStreetMap logout: sair logout_tooltip: Sair make_a_donation: @@ -969,12 +1004,16 @@ pt-BR: title: Ajude o OpenStreetMap com uma doação monetária osm_offline: A base de dados do OpenStreetMap está off-line devido a operações de manutenção. osm_read_only: A base de dados do OpenStreetMap está em modo somente leitura devido a operações de manutenção. + partners_bytemark: Alojamento Bytemark + partners_html: Hospedagem é suportada por %{ucl}, %{ic}, %{bytemark}, e outros %{partners}. + partners_ic: Imperial College de Londres + partners_partners: parceiros + partners_ucl: UCL VR Centre project_name: h1: OpenStreetMap title: OpenStreetMap sign_up: registrar sign_up_tooltip: Criar uma conta para editar - sotm2011: Venha para a Conferência OpenStreetMap 2011, The State of the Map, de 9 a 11 de setembro em Denver! tag_line: O Wiki de Mapas Livres user_diaries: Diários de Usuário user_diaries_tooltip: Ver os diários dos usuários @@ -982,7 +1021,7 @@ pt-BR: view_tooltip: Veja o mapa welcome_user: Bem vindo, %{user_link} welcome_user_link_tooltip: Sua Página de usuário - wiki: Wikia + wiki: Wiki wiki_title: Site wiki para o projeto wiki_url: http://wiki.openstreetmap.org/wiki/Pt-br:Main_Page license_page: @@ -990,7 +1029,27 @@ pt-BR: english_link: o original em Inglês text: Caso haja um conflito entre esta tradução e %{english_original_link}, a página em Inglês terá precedência title: Sobre esta tradução - legal_babble: "<h2>Direitos Autorais e Licença</h2>\n<p>\n O OpenStreetMap possui <i>dados abertos</i>, licenciados sob a licença <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Atribuição-Compartilhamento pela mesma Licença 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Você está livre para copiar, distribuir, transmitir e adaptar nossos mapas\n e dados, desde que você dê crédito ao OpenStreetMap e seus\n colaboradores. Se você alterar ou criar sobre nossos mapas ou dados, você\n deve distribuir os resultados apenas sobre a mesma licença. A\n <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">licença\n jurídica</a> explica seus direitos e responsabilidades.\n</p>\n\n<h3>Como dar crédito ao OpenStreetMap</h3>\n<p>\n Se você usar as imagens dos mapas do OpenStreetMap, nós pedimos que\n os créditos apareçam como “© OpenStreetMap\n contributors, CC-BY-SA”. Se você estiver usando apenas os dados dos mapas,\n nós pedimos que os créditos apareçam como “Map data © OpenStreetMap contributors,\n CC-BY-SA”.\n</p>\n<p>\n Onde for possível, um link para o OpenStreetMap deve direcionar para <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n e a licença CC-BY-SA para <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Se\n você estiver usando uma mídia que não pode conter links (ex.: um\n trabalho impresso), sugerimos que você direcione seus leitores para \n www.openstreetmap.org (talvez por expandir\n ‘OpenStreetMap’ para este endereço completo) e para \n www.creativecommons.org.\n</p>\n\n<h3>Descobrir mais</h3>\n<p>\n Leia mais sobre o uso de nossos dados no <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>.\n</p>\n<p>\n Os colaboradores do OSM são lembrados de nunca adicionar dados de quaisquer\n fontes sob copyright (ex.: Google Maps ou mapas impressos) sem\n permissão explícita dos detentores dos direitos atorais.\n</p>\n<p>\n Embora o OpenStreetMap tenha dados abertos, nós não podemos prover uma\n API de mapas livre de encargos para desenvolvedores de terceiros.\n\n Veja nossa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso da API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de Uso de Imagens</a>\n e <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Política de Uso do Nominatim</a>.\n</p>\n\n<h3>Nossos colaboradores</h3>\n<p>\n A nossa licença CC-BY-SA requer que você “dê crédito ao \n Autor Original de forma equivalente à mídia ou meios que Você\n está utilizando”. Mapeadores individuais do OSM não solicitam \n crédito além do “OpenStreetMap\n contributors”, mas quando os dados vem de uma agência \n nacional de mapeamento, ou de outra fonte superior, a ser incluída\n no OpenStreetMap, é razoável creditá-la por reproduzir diretamente \n os seus créditos ou por fazer links para eles nesta página.\n</p>\n\n<!--\nInformações para editores desta página\n\nA lista a seguir mostra apenas as organizações que solicitaram atribuição\ncomo condição para terem seus dados usados no OpenStreetMap. Este não é um \ncatálogo geral de importações, e não deve ser usado como tal, exceto quando a \natribuição é solicitada para obedecer à licença dos dados importados.\n\nQuaisquer adições devem primeiro ser discutidas pelos administradores do OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Austrália</strong>: Contém dados do subúrbio baseado\n nos dados do Australian Bureau of Statistics.</li>\n <li><strong>Áustria</strong>: Contém dados do \n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> sob licença\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.pt_BR\">CC-BY</a>.</li>\n <li><strong>Canadá</strong>: Contém dados do\n GeoBase®, GeoGratis (© Departamento de Recursos\n Naturais do Canadá), CanVec (© Departamento de Recursos\n Naturais do Canadá), and StatCan (Divisão de Geografia e \n Estatística do Canada).</li>\n <li><strong>França</strong>: Contém dados da\n Direction Générale des Impôts.</li>\n <li><strong>Nova Zelândia</strong>: Contém dados do \n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Polônia</strong>: Contém dados do <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright Colaboradores do\n UMP-pcPL.</li>\n <li><strong>Reino Unido</strong>: Contém Ordnance\n Survey data © Crown copyright and database right\n 2010.</li>\n</ul>\n\n<p>\n A inclusão de dados no OpenStreetMap não implica em endosso do provedor dos dados \n ao OpenStreetMap, nem em qualquer garantia, ou\n aceitação de qualquer responsabilidade.\n</p>" + legal_babble: + contributors_at_html: "<strong>Áustria</strong>: Contém dados do \n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (sob licença\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.pt_BR\">CC BY</a>) e <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg.</a>." + contributors_au_html: "<strong>Austrália</strong>: Contém dados do subúrbio baseado\n nos dados do Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canadá</strong>: Contém dados do\n GeoBase®, GeoGratis (© Departamento de Recursos\n Naturais do Canadá), CanVec (© Departamento de Recursos\n Naturais do Canadá), and StatCan (Divisão de Geografia e \n Estatística do Canada)." + contributors_footer_1_html: " A inclusão de dados no OpenStreetMap não implica em endosso do provedor dos dados \n ao OpenStreetMap, nem em qualquer garantia, ou\n aceitação de qualquer responsabilidade." + contributors_fr_html: "<strong>França</strong>: Contém dados da\n Direction Générale des Impôts." + contributors_gb_html: "<strong>Reino Unido</strong>: Contém Ordnance\n Survey data © Crown copyright and database right\n 2010." + contributors_intro_html: " A nossa licença CC BY-SA requer que você “dê crédito ao \n Autor Original de forma equivalente à mídia ou meios que Você\n está utilizando”. Mapeadores individuais do OSM não solicitam \n crédito além do “OpenStreetMap\n contributors”, mas quando os dados vem de uma agência \n nacional de mapeamento, ou de outra fonte superior, a ser incluída\n no OpenStreetMap, é razoável creditá-la por reproduzir diretamente \n os seus créditos ou por fazer links para eles nesta página." + contributors_nz_html: "<strong>Nova Zelândia</strong>: Contém dados do \n Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polônia</strong>: Contém dados do <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright Colaboradores do\n UMP-pcPL." + contributors_title_html: Nossos colaboradores + credit_1_html: " Se você usar as imagens dos mapas do OpenStreetMap, nós pedimos que\n os créditos apareçam como “© OpenStreetMap\n contributors, CC BY-SA”. Se você estiver usando apenas os dados dos mapas,\n nós pedimos que os créditos apareçam como “Map data © OpenStreetMap contributors,\n CC BY-SA”." + credit_2_html: " Onde for possível, um link para o OpenStreetMap deve direcionar para <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n e a licença CC BY-SA para <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Se\n você estiver usando uma mídia que não pode conter links (ex.: um\n trabalho impresso), sugerimos que você direcione seus leitores para \n www.openstreetmap.org (talvez por expandir\n ‘OpenStreetMap’ para este endereço completo) e para \n www.creativecommons.org." + credit_title_html: Como dar crédito ao OpenStreetMap + intro_1_html: " O OpenStreetMap possui <i>dados abertos</i>, licenciados sob a licença <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Atribuição-Compartilhamento pela mesma Licença 2.0</a> (CC BY-SA)." + intro_2_html: " Você está livre para copiar, distribuir, transmitir e adaptar nossos mapas\n e dados, desde que você dê crédito ao OpenStreetMap e seus\n colaboradores. Se você alterar ou criar sobre nossos mapas ou dados, você\n deve distribuir os resultados apenas sobre a mesma licença. A\n <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">licença\n jurídica</a> explica seus direitos e responsabilidades." + more_1_html: " Leia mais sobre o uso de nossos dados no <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>." + more_2_html: " Os colaboradores do OSM são lembrados de nunca adicionar dados de quaisquer\n fontes sob copyright (ex.: Google Maps ou mapas impressos) sem\n permissão explícita dos detentores dos direitos atorais." + more_3_html: " Embora o OpenStreetMap tenha dados abertos, nós não podemos prover uma\n API de mapas livre de encargos para desenvolvedores de terceiros.\n\n Veja nossa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso da API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de Uso de Imagens</a>\n e <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Política de Uso do Nominatim</a>." + more_title_html: Descobrir mais + title_html: Direitos Autorais e Licença native: mapping_link: começar a mapear native_link: Versão em Português do Brasil @@ -1005,10 +1064,12 @@ pt-BR: messages: Você tem %{new_messages} e %{old_messages} my_inbox: Minha caixa de entrada new_messages: - other: uma=%{count} nova mensagem + one: "%{count} nova mensagem" + other: "%{count} novas mensagens" no_messages_yet: Você ainda não tem mensagens. Por que não entrar em contato com %{people_mapping_nearby_link}? old_messages: - other: uma=%{count} mensagem antiga + one: "%{count} mensagem antiga" + other: "%{count} mensagens antigas" outbox: caixa de saída people_mapping_nearby: alguém mapeando por perto subject: Assunto @@ -1025,7 +1086,7 @@ pt-BR: back_to_inbox: Voltar para a caixa de entrada body: Mensagem limit_exceeded: Você enviou muitas mensagens recentemente. Por favor espere um momento antes de tentar enviar mais. - message_sent: Mensage enviada + message_sent: Mensagem enviada send_button: Enviar send_message_to: Enviar uma nova mensagem para %{name} subject: Assunto @@ -1034,15 +1095,12 @@ pt-BR: body: Desculpe, mas não existe uma mensagem com este id. heading: Esta mensagem não existe title: Esta mensagem não existe - no_such_user: - body: Desculpe, mas não existe usuário com este nome. - heading: Este usuário não existe - title: Este usuário não existe outbox: date: Data inbox: caixa de entrada messages: - other: uma=Você tem %{count} mensagem enviada + one: Você tem %{count} mensagem enviada + other: Você tem %{count} mensagens enviadas my_inbox: Minha %{inbox_link} no_sent_messages: Você ainda não enviou nenhuma mensagem. Porque não entrar em contato com %{people_mapping_nearby_link}? outbox: caixa de saída @@ -1116,7 +1174,7 @@ pt-BR: hopefully_you_1: Alguém (possivelmente você) pediu uma nova senha hopefully_you_2: para a conta no openstreetmap.org ligada a este e-mail. message_notification: - footer1: Você pode ser a mensagem em %{readurl} + footer1: Você pode ler a mensagem em %{readurl} footer2: e pode respondê-la em %{replyurl} header: "%{from_user} enviou uma mensagem pelo OpenStreetMap para você com o assunto %{subject}:" hi: Olá %{to_user}, @@ -1212,6 +1270,8 @@ pt-BR: allow_write_gpx: enviar trilhas de GPS. allow_write_prefs: modificar suas preferências de usuário. authorize_url: "URL de autorização:" + confirm: Você tem certeza? + delete: Excluir Cliente edit: Editar detalhes key: Chave de Consumidor requests: "Pedindo as seguintes permissões ao usuário:" @@ -1225,6 +1285,23 @@ pt-BR: with_id: "%{id}" with_name: "%{name} (%{id})" with_version: "%{id}, v%{version}" + redaction: + edit: + description: Descrição + heading: Editar redação + submit: Salvar redação + title: Editar redação + index: + empty: Nenhuma redação para mostrar. + heading: Lista de redações + title: Lista de redações + new: + description: Descrição + heading: Digite informações para a nova redação + submit: Criar redação + title: Criando uma nova redação + show: + description: "Descrição:" site: edit: anon_edits: (%{link}) @@ -1241,7 +1318,6 @@ pt-BR: index: js_1: Você está usando um navegador sem suporte a JavaScript, ou está com o JavaScript desativado. js_2: O OpenStreetMap usa JavaScript para a navegação dos mapas. - js_3: Você pode tentar o <a href="http://tah.openstreetmap.org/Browse/">navegador estático Tiles@Home</a> se não for possível ativar o JavaScript. license: license_name: Creative Commons de Atribuição-Compartilhamento pela Mesma Licença 2.0 license_url: http://creativecommons.org/licenses/by-sa/2.0/ @@ -1271,7 +1347,7 @@ pt-BR: - Elevador de Cadeiras cemetery: Cemitério centre: Centro de Esportes/Ginásio - commercial: Área Commercial (Escritórios) + commercial: Área Comercial (Escritórios) common: - Área pública - Vegetação rasteira @@ -1320,6 +1396,23 @@ pt-BR: unclassified: Via Sem Classificação Administrativa unsurfaced: Via Não Pavimentada wood: Reserva Florestal + markdown_help: + alt: Texto alternativo + first: Primeiro item + heading: Título de seção + headings: Títulos de seções + image: Imagem + link: Link + ordered: Lista ordenada + second: Segundo item + subheading: Subtítulo + text: Texto + title_html: Analisado com <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Lista não ordenada + url: URL + richtext_area: + edit: Editar + preview: Pré-visualizar search: search: Buscar search_help: "exemplos: 'Brasília', 'Av. Paulista, São Paulo', ou 'hospitals near Belo Horizonte'. <a href='http://wiki.openstreetmap.org/wiki/Pt-br:Search'>mais exemplos...</a>" @@ -1363,10 +1456,6 @@ pt-BR: your_traces: Suas Trilhas de GPS make_public: made_public: Trilha publicada - no_such_user: - body: Perdão, não há usuário com o nome %{user}. Por favor, cheque sua ortografia, ou talvez o link que você clicou está errado. - heading: O usuário %{user} não existe - title: Usuário não encontrado offline: heading: O armazenamento de GPX está offline message: O sistema de armazenamento e envio de arquivos GPX está atualmente indisponível. @@ -1384,7 +1473,7 @@ pt-BR: more: mais pending: PENDENTE private: PRIVADO - public: PUBLICO + public: PÚBLICO trace_details: Ver detalhes da trilha trackable: RASTREÁVEL view_map: Ver Mapa @@ -1407,8 +1496,6 @@ pt-BR: trace_optionals: tags: Etiquetas trace_paging_nav: - next: Seguinte » - previous: « Anterior showing_page: Mostrando página %{page} view: delete_track: Apague esta trilha @@ -1428,11 +1515,11 @@ pt-BR: title: Visualizando trilha %{name} trace_not_found: Trilha não encontrada! uploaded: "Enviado em:" - visibility: "Vsibilidade:" + visibility: "Visibilidade:" visibility: identifiable: Identificável (mostrado na lista como pontos identificáveis, ordenados e com informação de tempo) private: Privado (compartilhado apenas como pontos anônimos e não ordenados) - public: Pública (apresentado na lista como pontos anônimos e desordenados) + public: Pública (apresentado na lista como pontos anônimos e não ordenados) trackable: Acompanhável (compartilhada anonimamente como pontos ordenados com informação de tempo) user: account: @@ -1525,6 +1612,7 @@ pt-BR: login_button: Entrar lost password link: Esqueceu sua senha? new to osm: Primeira vez no OpenStreetMap? + no account: Não possui uma conta? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Saiba mais sobre a mudança na licença do OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traduções</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussão</a>) notice_terms: O OpenStreetMap irá trocar sua licença em 1 de Abril de 2012. É tão aberta quanto a atual, mas as informações legais se encaixam melhor em nossa base de dados de mapas. Nós ficaríamos felizes de manter suas contribuições no OpenStreetMap, mas nós apenas poderemos fazer isso se você permitir distribui-la sob a nova licença. Do contrário, teremos que remover suas contribuições da base de dados<br /><br />Por favor faça o login, e tome alguns segundos para revisar e aceitar os novos termos. Muito obrigado! openid: "%{logo} OpenID:" @@ -1582,7 +1670,7 @@ pt-BR: display name description: Seu nome de usuário disponível publicamente. Você pode mudá-lo posteriormente nas preferências. email address: "Endereço de Email:" fill_form: Preencha o formulário e lhe enviaremos um email rapidamente para ativar sua conta. - flash create success message: Obrigado por se cadastrar. Nós mandamos uma confirmação para %{email} e assim que você confirmar sua conta você poderá começar a mapear.<br /><br />Se você usa um sistema antispam que envia pedido de confirmação assegure-se que você adicionou o endereço webmaster@openstreetmap.org à sua Lista Branca, já que nós não conseguimos responder a nenhum pedido de confirmação. + flash create success message: Obrigado por se cadastrar. Nós mandamos uma confirmação para %{email} e assim que você confirmar sua conta você poderá começar a mapear.<br /><br />Se você usa um sistema antispam que envia pedido de confirmação assegure-se que você adicionou o endereço webmaster@openstreetmap.org à sua lista de e-mails confiáveis, já que nós não conseguimos responder a nenhum pedido de confirmação. heading: Criar uma nova conta de usuário license_agreement: Quando você confirmar sua conta, você precisará concordar com os <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Termos de Colaborador</a>. no_auto_account_create: Infelizmente não foi possível criar uma conta para você automaticamente. @@ -1640,11 +1728,12 @@ pt-BR: you need to accept or decline: Por favor leia e, em seguida, aceite ou recuse os novos Termos do Colaborador para continuar. view: activate_user: ativar este usuário - add as friend: adicionar como amigos + add as friend: adicionar como amigo ago: (%{time_in_words_ago} atrás) block_history: ver bloqueios recebidos - blocks by me: bloqueios em mim + blocks by me: bloqueios por mim blocks on me: bloqueios sobre mim + comments: comentários confirm: Confirmar confirm_user: confirmar este usuário create_block: bloquear este usuário @@ -1668,6 +1757,7 @@ pt-BR: m away: "%{count}m de distância" mapper since: "Mapeador desde:" moderator_history: ver bloqueios aplicados + my comments: meus comentários my diary: meu diário my edits: minhas edições my settings: minhas configurações @@ -1722,7 +1812,6 @@ pt-BR: filter: block_expired: O bloqueio já expirou e não pode mais ser editado. block_period: O período de bloqueio deve ser um dos valores selecionáveis na lista. - not_a_moderator: Você precisa ser um moderador para tomar essa ação. helper: time_future: Termina em %{time}. time_past: Terminou há %{time} @@ -1756,7 +1845,7 @@ pt-BR: reason: Razão para o bloqueio revoke: Cancelar! revoker_name: Retirado por - show: Mostrar + show: Exibir status: Status period: one: uma hora @@ -1778,7 +1867,7 @@ pt-BR: reason: "Razão do bloqueio:" revoke: Cancelar! revoker: "Quem retirou:" - show: Mostrar + show: Exibir status: Status time_future: Termina em %{time} time_past: Terminou há %{time} diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 8909f00cb..9626e043f 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1,14 +1,19 @@ -# Messages for Portuguese (Português) +# Messages for Portuguese (português) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Crazymadlover # Author: Giro720 +# Author: Gmare # Author: Hamilton Abreu # Author: Indech +# Author: JasonZe # Author: Luckas Blade # Author: Malafaya # Author: McDutchie +# Author: Nemo bis +# Author: Rsbarbosa # Author: SandroHc +# Author: Waldir pt: activerecord: attributes: @@ -40,190 +45,282 @@ pt: user: active: Activo description: Descrição - display_name: Nome de Exibição + display_name: Nome visualizado email: E-mail languages: Idiomas - pass_crypt: Palavra-chave + pass_crypt: Palavra-passe models: + acl: Lista de Controlo do Acesso + changeset: Conjunto de alterações + changeset_tag: Etiqueta do conjunto de alterações country: País + diary_comment: Comentário no Diário + diary_entry: Entrada de diário friend: Amigo language: Idioma message: Mensagem + node: Nó + node_tag: Etiqueta do Nó notifier: Notificador + old_node: Nó antigo + old_node_tag: Etiqueta do Nó antigo + old_relation: Relação Antiga + old_relation_member: Membro da Relação Antiga + old_relation_tag: Etiqueta da Relação Antiga + old_way: Linha antiga + old_way_node: Nó de linha antiga + old_way_tag: Etiqueta da linha antiga + relation: Relação + relation_member: Membros da relação + relation_tag: Etiqueta da relação session: Sessão + trace: Trilho + tracepoint: Ponto do Trilho + tracetag: Etiqueta do Trilho user: Utilizador + user_preference: Preferências do utilizador + user_token: Token do Utilizador + way: Linha + way_node: Nó da linha + way_tag: Etiqueta da Linha + application: + require_cookies: + cookies_needed: Parece que tem os "cookies" desativados - por favor ative-os no seu navegador de Internet antes de continuar. + require_moderator: + not_a_moderator: Tem de ser um moderador para poder fazer essa ação. + setup_user_auth: + blocked: O seu acesso à API foi bloqueado. Por favor aceda à página web do OpenStreetMap e entre na sua conta para saber mais. + need_to_see_terms: O seu acesso à API está temporariamente suspenso. Por favor aceda à página web do OpenStreetMap e entre na sua conta para ver os Termos de Contribuição. Não precisa de aceitar os termos mas tem de os ver. browse: changeset: - changeset: "Conjunto de mudanças: %{id}" - changesetxml: Conjunto de mudanças XML - download: Download de %{changeset_xml_link} ou %{osmchange_xml_link} + changeset: "Conjunto de alterações: %{id}" + changesetxml: Conjunto de alterações XML feed: - title: Conjunto de mudanças %{id} - title_comment: Conjunto de mudanças %{id} - %{comment} - title: Conjunto de mudanças + title: Conjunto de alterações %{id} + title_comment: Conjunto de alterações %{id} - %{comment} + osmchangexml: XML no formato osmChange + title: Conjunto de alterações changeset_details: - belongs_to: "Pertence a:" + belongs_to: "Feito por:" + bounding_box: "Área delimitadora:" box: caixa closed_at: "Fechado em:" created_at: "Criado em:" + has_nodes: + one: "Tem %{count} nó:" + other: "Tem %{count} nós:" has_relations: - one: "Tem a seguinte %{count} relação:" - other: "Tem as seguintes %{count} relações:" + one: "Tem %{count} relação:" + other: "Tem %{count} relações:" has_ways: - one: "tem o seguinte %{count} trajecto:" - other: "Tem os seguintes %{count} trajectos:" + one: "Tem %{count} linha:" + other: "Tem %{count} linhas:" + no_bounding_box: Não foi guardada uma área delimitadora deste conjunto de alterações. show_area_box: Mostrar Caixa de Área common_details: changeset_comment: "Comentário:" + deleted_at: "Eliminado em:" + deleted_by: "Eliminado por:" edited_at: "Editado em:" edited_by: "Editado por:" - in_changeset: "No conjunto de mudanças:" - version: Versão + in_changeset: "No conjunto de alterações:" + version: "Versão:" containing_relation: entry: Relação %{relation_name} entry_role: Relação %{relation_name} (como %{relation_role}) map: - deleted: Apagado + deleted: Eliminado + edit: + area: Editar área + node: Editar nó + relation: Editar relação + way: Editar linha larger: area: Ver área num mapa maior - node: Ver trajecto num mapa maior + node: Ver nó num mapa maior relation: Ver relação num mapa maior - way: Ver trajeto num mapa maior + way: Ver linha num mapa maior loading: A carregar… navigation: all: - next_changeset_tooltip: Seguinte conjunto de mudanças + next_changeset_tooltip: Conjunto de alterações seguinte next_node_tooltip: Nó seguinte next_relation_tooltip: Relação seguinte - next_way_tooltip: Próximo caminho - prev_changeset_tooltip: Anterior conjunto de mudanças + next_way_tooltip: Linha seguinte + prev_changeset_tooltip: Conjunto de alterações anterior prev_node_tooltip: Nó anterior - prev_way_tooltip: Trajecto anterior + prev_relation_tooltip: Relação anterior + prev_way_tooltip: Linha anterior user: name_changeset_tooltip: Ver edições de %{user} next_changeset_tooltip: Próxima edição por %{user} prev_changeset_tooltip: Edição anterior por %{user} node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Baixar XML + download_xml: Descarregar XML edit: editar node: Nó node_title: "Nó: %{node_name}" view_history: ver histórico node_details: coordinates: "Coordenadas:" - part_of: "Parte de:" + part_of: "Faz parte de:" node_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Baixar XML - node_history: Nenhum Histórico + download_xml: Descarregar XML + node_history: Histórico do nó + node_history_title: "Histórico do nó: %{node_name}" view_details: ver detalhes not_found: sorry: Lamentamos, não foi possível encontrar o %{type} com o id %{id}. type: - changeset: alterações - node: nenhum + changeset: conjunto de alterações + node: nó relation: relação - way: trajeto + way: linha paging_nav: of: de showing_page: Mostrando página + redacted: + message_html: A versão %{version} do elemento %{type} não pode ser mostrado porque foi redigido. Por favor consulte %{redaction_link} mais obter mais informações.. + redaction: Redação % {id} + type: + node: nó + relation: relação + way: linha relation: - download: "%{download_xml_link} ou %{view_history_link}" - download_xml: Download XML + download_xml: Descarregar XML relation: Relação relation_title: "Relação: %{relation_name}" view_history: ver histórico relation_details: members: "Membros:" - part_of: "Parte de:" + part_of: "Faz parte de:" relation_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Download XML - relation_history: Histórico de Relação - relation_history_title: "Historial da Relação: %{relation_name}" + download_xml: Descarregar XML + relation_history: Histórico da Relação + relation_history_title: "Histórico da Relação: %{relation_name}" view_details: ver detalhes relation_member: entry_role: "%{type} %{name} como %{role}" type: node: Nó relation: Relação - way: Trajeto + way: Linha + start: + manually_select: Selecionar manualmente uma área diferente + view_data: Ver dados para a vista atual do mapa start_rjs: data_frame_title: Dados - data_layer_name: Dados + data_layer_name: Inspecionar dados técnicos do mapa details: Detalhes drag_a_box: Arraste uma seleção no mapa para escolher uma área - edited_by_user_at_timestamp: Editado pelo [[user]] em [[timestamp]] + edited_by_user_at_timestamp: Editado por [[user]] em [[timestamp]] + hide_areas: Ocultar áreas history_for_feature: Histórico de [[feature]] load_data: Carregar Dados + loaded_an_area_with_num_features: Carregou uma área com [[num_features]] elementos. Alguns navegadores de Internet podem ter problemas em mostrar esta quantidade de dados. Geralmente os navegadores funcionam melhor a mostrar até [[max_features]] elementos de cada vez. Mais do que isso o navegador poderá ficar muito lento ou até bloquear. Se tem a certeza que quer mostrar esta quantidade de elementos clique no botão seguinte. loading: A carregar... manually_select: Selecionar manualmente uma área diferente object_list: + api: Descarregar esta área no formato XML OSM através da API back: Mostrar lista de objetos details: Detalhes heading: Lista de objetos history: type: - node: Nenhum [[id]] - way: Trajeto [[id]] + node: Nó [[id]] + way: Linha [[id]] selected: type: - node: Nenhum [[id]] - way: Trajeto [[id]] + node: Nó [[id]] + way: Linha [[id]] type: - node: Nenhum - way: Trajeto - private_user: usuário privativo + node: Nó + way: Linha + private_user: utilizador privado + show_areas: Mostrar áreas show_history: Mostrar Histórico unable_to_load_size: "Não foi possível carregar: O tamanho da caixa de [[bbox_size]] é muito grande (deve ser menor que %{max_bbox_size})" wait: Espere... zoom_or_select: Aproximar ou seleccionar uma área do mapa para visionamento tag_details: - tags: "Marcações:" + tags: "Etiquetas:" wiki_link: - key: A página de descrição da wiki para a etiqueta %{key} - tag: A página de descrição da wiki para a etiqueta %{key}=%{value} - wikipedia_link: O(A) %{page} na Wikipedia + key: A página wiki com a descrição da etiqueta %{key} + tag: A página wiki com a descrição da etiqueta %{key}=%{value} + wikipedia_link: A página %{page} na Wikipédia timeout: sorry: Lamentamos, demorou demasiado tempo a obter os dados para o %{type} com o id %{id}. type: changeset: alterações - node: nenhum + node: nó relation: relação - way: trajecto + way: linha way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Baixar XML + download_xml: Descarregar XML edit: editar view_history: ver histórico - way: Trajeto - way_title: "Trajeto: %{way_name}" + way: Linha + way_title: "Linha: %{way_name}" way_details: also_part_of: - one: também faz parte do trajecto %{related_ways} - other: também faz parte dos trajectos %{related_ways} + one: também faz parte da linha %{related_ways} + other: também faz parte das linhas %{related_ways} nodes: "Nós:" - part_of: "Parte de:" + part_of: "Faz parte de:" way_history: - download: "%{download_xml_link} ou %{view_details_link}" download_xml: Descarregar XML view_details: ver detalhes - way_history: Histórico do Trajeto - way_history_title: "Histórico do Trajeto: %{way_name}" + way_history: Histórico da Linha + way_history_title: "Histórico da Linha: %{way_name}" changeset: + changeset: + anonymous: Anónimo + big_area: (grande) + no_comment: (sem comentário) + no_edits: (nenhuma edição) + show_area_box: Mostrar Caixa de Área + still_editing: (ainda a editar) + view_changeset_details: Ver detalhes do conjunto de alterações changeset_paging_nav: next: Seguinte » previous: « Anterior + showing_page: Mostrando página %{page} changesets: area: Área comment: Comentário id: ID - saved_at: Salvo em + saved_at: Gravado em user: Utilizador list: description: Mudanças recentes + description_bbox: Conjunto de alterações em %{bbox} + description_friend: Alterações feitas pelos seus amigos + description_nearby: Alterações feitas por utilizadores das redondezas + description_user: Conjunto de alterações feitas por %{user} + description_user_bbox: Conjunto de alterações feitas por %{user} na área %{bbox} + heading: Conjunto de alterações + heading_bbox: Conjunto de alterações + heading_friend: Conjunto de alterações + heading_nearby: Conjunto de alterações + heading_user: Conjunto de alterações + heading_user_bbox: Conjunto de alterações + title: Conjuntos de alterações + title_bbox: Conjuntos de alterações dentro de %{bbox} + title_friend: Conjuntos de alterações feitos pelos seus amigos + title_nearby: Conjuntos de alterações feitos por utilizadores das redondezas + title_user: Conjuntos de alterações de %{user} + title_user_bbox: Conjuntos de alterações de %{user} dentro de %{bbox} + timeout: + sorry: Pedimos desculpa, mas a lista de conjuntos de alterações que pediu excedeu o tempo limite de resposta. diary_entry: + comments: + ago: "%{ago} atrás" + comment: Comentário + has_commented_on: "%{display_name} comentou nas seguintes entradas de diários" + newer_comments: Comentários mais recentes + older_comments: Comentários mais antigos + post: Entrada + when: Quando diary_comment: comment_from: Comentário de %{link_user} em %{comment_created_at} confirm: Confirmar @@ -232,54 +329,112 @@ pt: comment_count: one: 1 comentário other: "%{count} comentários" + comment_link: Comentar esta entrada confirm: Confirmar + edit_link: Editar esta entrada hide_link: Ocultar esta entrada + posted_by: Colocado por %{link_user} a %{created} em %{language_link} + reply_link: Responder a esta entrada edit: body: "Mensagem:" language: "Idioma:" latitude: "Latitude:" location: "Localização:" longitude: "Longitude:" - save_button: Salvar + marker_text: Localização da entrada do diário + save_button: Gravar subject: "Assunto:" + title: Editar entrada do diário use_map_link: usar mapa + feed: + all: + description: Entradas recentes no diário de editores do OpenStreetMap + title: Entradas no diário de editores do OpenStreetMap + language: + description: Entradas recentes no diário de editores OpenStreetMap em %{language_name} + title: Entradas no diário de editores OpenStreetMap em %{language_name} + user: + description: Entradas recentes no diário de editores OpenStreetMap de %{user} + title: Entradas no diário de editores OpenStreetMap de %{user} + list: + in_language_title: Entradas no Diário em %{language} + new: Nova Entrada no Diário + new_title: Adicionar entrada ao diário + newer_entries: Entradas Recentes + no_entries: Diário sem entradas + older_entries: Entradas Mais Antigas + recent_entries: "Entradas recentes no diário:" + title: Diário dos editores + title_friends: Diários dos amigos + title_nearby: Diários dos Editores das redondezas + user_title: Diário de %{user} location: edit: Editar location: "Localização:" view: Ver + new: + title: Nova entrada no diário + no_such_entry: + body: Desculpe, não há nenhuma entrada de diário ou comentário com o identificador (ID) % {id}. Por favor, verifique a ortografia, caso contrário a ligação está errada ou deixou de existir. + heading: Não existe a entrada com o identificador (ID) %{id} + title: Esta entrada de diário não existe view: + leave_a_comment: Deixar um comentário login: Entrar - save_button: Salvar + login_to_leave_a_comment: "%{login_link} para deixar um comentário" + save_button: Gravar + title: Diário de %{user} | %{title} + user_title: Diário de %{user} editor: default: Padrão (actualmente %{name}) potlatch: - description: Potlatch 1 (editor do navegador) + description: Potlatch 1 name: Potlatch 1 potlatch2: - description: Potlatch 2 (editor do navegador) + description: Potlatch 2 name: Potlatch 2 remote: - description: Controlo Remoto (JOSM or Merkaartor) - name: Controlo Remoto + description: programa externo (JOSM ou Merkaartor) + name: programa externo export: start: + add_marker: Adicionar um ponto de interesse no mapa + area_to_export: Área a exportar + embeddable_html: HTML (mostra mapa interativo noutros sites) todos os mapas export_button: Exportar + export_details: Os dados do OpenStreetMap encontram-se sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pt">licença Creative Commons Atribuição - CompartilhaIgual 2.0 (CC BY-SA 2.0)</a>. format: Formato + format_to_export: Formato da exportação image_size: Tamanho da Imagem latitude: "Lat:" licence: Licença longitude: "Lon:" + manually_select: Selecionar manualmente uma área diferente + map_image: Imagem (.jpg .pdf .svg .png .ps) apenas mapa padrão + max: máx options: Opções - osm_xml_data: OpenStreetMap XML Data - output: Saída + osm_xml_data: XML OpenStreetMap (.osm) apenas mapa padrão + output: Código HTML + paste_html: Copie e cole o código num site para mostrar o mapa interativo nesse site scale: Escala too_large: + body: Esta área é demasiado grande para exportar em XML do OpenStreetMap. Por favor aproxime a vista ou selecione uma área mais pequena. heading: Área Muito Grande zoom: Zoom start_rjs: + add_marker: Adicionar um ponto de interesse no mapa + change_marker: Alterar posição do ponto de interesse + click_add_marker: Clique no mapa para adicionar um ponto de interesse + drag_a_box: Clique e arraste no mapa para escolher uma área export: Exportar + manually_select: Escolher manualmente uma área diferente + view_larger_map: Ver num mapa maior geocoder: description: + title: + geonames: Resultado de <a href="http://www.geonames.org/">GeoNames</a> + osm_namefinder: "%{types} de <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>" + osm_nominatim: Resultado de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> types: cities: Cidades places: Lugares @@ -311,115 +466,298 @@ pt: osm_nominatim: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> uk_postcode: Resultados de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> us_postcode: Resultados de <a href="http://geocoder.us/">Geocoder.us</a> + search_osm_namefinder: + suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" + suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aeródromo + apron: Plataforma de estacionamento + gate: Porta + helipad: Heliponto + runway: Pista de Aterragem e Descolagem + taxiway: Via de circulação + terminal: Terminal amenity: + WLAN: Acesso WiFi airport: Aeroporto + arts_centre: Centro Artístico + artwork: Obra de Arte + atm: Multibanco + auditorium: Auditório bank: Banco bar: Bar + bbq: Churrasqueira + bench: Banco + bicycle_parking: Estacionamento de bicicletas + bicycle_rental: Aluguer de bicicletas + biergarten: Biergarten (jardim da cerveja) + brothel: Bordel + bureau_de_change: Casa de câmbio + bus_station: Estação de autocarros cafe: Café + car_rental: Aluguer de automóveis + car_sharing: Partilha de Veículos + car_wash: Lavagem de carro casino: Casino + charging_station: Estação de carregamento + cinema: Cinema + clinic: Clínica + club: Clube college: Colégio + community_centre: Centro comunitário + courthouse: Tribunal + crematorium: Crematório dentist: Dentista doctors: Médicos + dormitory: Dormitório + drinking_water: Água potável + driving_school: Escola de Condução + embassy: Embaixada emergency_phone: Telefone de Emergência fast_food: Fast Food + ferry_terminal: Terminal de ferry + fire_hydrant: Boca de incêndio + fire_station: Quartel dos Bombeiros + food_court: Praça de alimentação fountain: Fonte fuel: Combustível grave_yard: Cemitério + gym: Centro de Fitness / Ginásio + health_centre: Centro de saúde hospital: Hospital hotel: Hotel + hunting_stand: Cabana de caça + ice_cream: Geladaria + kindergarten: Jardim de infância library: Biblioteca market: Mercado + marketplace: Mercado + mountain_rescue: Resgate em Montanha + nightclub: Clube Nocturno + nursery: Infantário / Jardim Infantil + nursing_home: Lar de Idosos office: Escritório + park: Parque + parking: Estacionamento pharmacy: Farmácia + place_of_worship: Lugar de Oração police: Polícia + post_box: Marco de Correio + post_office: Correios + preschool: Pré-escola prison: Prisão + pub: Pub + public_building: Edifício público + public_market: Mercado público + reception_area: Área de recepção + recycling: Ponto de reciclagem restaurant: Restaurante + retirement_home: Lar de 3ª idade sauna: Sauna school: Escola + shelter: Abrigo shop: Loja + shower: Chuveiro + social_centre: Centro social + social_club: Clube Social studio: Estúdio supermarket: Supermercado + swimming_pool: Piscina taxi: Táxi telephone: Telefone público theatre: Teatro + toilets: Casas de Banho + townhall: Câmara Municipal university: Universidade + vending_machine: Máquina de venda automática + veterinary: Clínica veterinária + waste_basket: Caixote do Lixo wifi: Acesso WiFi + boundary: + administrative: Fronteira Administrativa + census: Fronteira de Censos + national_park: Parque Nacional + protected_area: Área protegida + bridge: + aqueduct: Aqueduto + suspension: Ponte pênsil + swing: Ponte giratória + viaduct: Viaduto + "yes": Ponte building: - apartments: Bloco de apartamentos - chapel: Capela - church: Igreja - city_hall: Câmara Municipal - garage: Garagem - hotel: Hotel - house: Casa - shop: Loja - stadium: Estádio - store: Loja - terrace: Terraço - tower: Torre + "yes": Edifício highway: - gate: Porta + bridleway: Pista de cavalos + bus_guideway: Faixa de Autocarros de Guia + bus_stop: Paragem de Autocarro + byway: Byway (atalho proibido a veículos motorizados) + construction: Auto-Estrada em Construção + cycleway: Ciclovia + emergency_access_point: Ponto de acesso de emergência + footway: Caminho pedestre + ford: Vau + milestone: Marco quilométrico + motorway: Auto-Estrada + motorway_junction: Saída de Auto-Estrada + motorway_link: Ligação a Auto-Estrada + path: Caminho + pedestrian: Via pedonal + platform: Plataforma de embarque + primary: Estrada Nacional (Primária) + primary_link: Ligação a Estrada Nacional (Primária) + raceway: Autódromo + residential: Rua residencial + rest_area: Área de descanso road: Estrada - secondary_link: Estrada Secundária - steps: Passos - stile: Escada - trail: Trilha + secondary: Estrada Regional (Secundária) + secondary_link: Ligação a Estrada Regional (Secundária) + service: Estrada de serviço + services: Área de Serviço de Auto-Estrada + speed_camera: Radar + steps: Escadas + stile: Escada de vedação + tertiary: Estrada Municipal (Terciária) + tertiary_link: Ligação a Estrada Municipal (Terciária) + track: Carreiro florestal ou agrícola + trail: Trilho + trunk: Via Rápida / IP / IC + trunk_link: Via Rápida / IP / IC + unclassified: Estrada sem classificação oficial + unsurfaced: Estrada não pavimentada historic: + archaeological_site: Sítio arqueológico + battlefield: Campo de batalha + boundary_stone: Marco de Fronteira + building: Edifício castle: Castelo church: Igreja + fort: Forte house: Casa + manor: Solar / Casa senhorial memorial: Memorial mine: Mina monument: Monumento museum: Museu ruins: Ruínas tower: Torre + wayside_cross: Cruzeiro + wayside_shrine: Alminhas + wreck: Destroços landuse: - allotments: Lotes + allotments: Hortas urbanas + basin: Bacia + brownfield: Edifícios industriais em ruínas e contaminados cemetery: Cemitério commercial: Área comercial conservation: Conservação + construction: Construção + farm: Quinta + farmland: Terreno agrícola + farmyard: Quinta forest: Floresta + garages: Garagens grass: Erva + greenfield: Terreno urbanizável + industrial: Área industrial + landfill: Aterro sanitário meadow: Pradaria military: Área militar mine: Mina - mountain: Montanha + nature_reserve: Reserva Natural + orchard: Pomar park: Parque + piste: Pista de esqui + quarry: Pedreira + railway: Ferrovia + recreation_ground: Área recreativa + reservoir: Reservatório + reservoir_watershed: Bacia hidrográfica do reservatório + residential: Área residencial + retail: Zona comercial + road: Área de Rodovia + village_green: Espaço Verde Urbano + vineyard: Vinha + wetland: Pântano + wood: Madeira leisure: + beach_resort: Resort + bird_hide: Observatório de aves + common: Baldio fishing: Área de Pesca + fitness_station: Ginásio garden: Jardim golf_course: Campo de golf + ice_rink: Pista de gelo marina: Marina miniature_golf: Mini-Golf nature_reserve: Reserva Natural park: Parque + pitch: Campo desportivo playground: Parque + recreation_ground: Área recreativa + sauna: Sauna + slipway: Rampa para barcos sports_centre: Centro Desportivo stadium: Estádio swimming_pool: Piscina + track: Pista de corrida water_park: Parque aquático + military: + airfield: Aeródromo militar + barracks: Quartel + bunker: Bunker natural: bay: Baía beach: Praia cape: Cabo cave_entrance: Entrada de gruta channel: Canal - coastline: Litoral + cliff: Precipício + crater: Cratera + dune: Duna + fjord: Fiorde + forest: Floresta geyser: Geiser + glacier: Glaciar + heath: Charneca + hill: Colinas island: Ilha land: Terra marsh: Pântano + moor: Ancoradouro + mud: Lama peak: Pico point: Ponto reef: Recife + ridge: Cordilheira river: Rio + rock: Rocha + scree: Escarpa de Roxas Soltas + scrub: Matagal + spring: Nascente + stone: Pedra tree: Árvore valley: Vale volcano: Vulcão water: Água + wetland: Zona húmida + wetlands: Zonas húmidas + wood: Bosque + office: + accountant: Contabilista + architect: Arquiteto + company: Empresa + employment_agency: Agência de Emprego + estate_agent: Imobiliária + government: Edifício Governamental + insurance: Agência de Seguros + lawyer: Advogado + ngo: Escritório de ONG + telecommunication: Escritório de empresa de Telecomunicações + travel_agent: Agência de Viagens + "yes": Escritório place: airport: Aeroporto city: Cidade @@ -431,168 +769,666 @@ pt: houses: Casas island: Ilha islet: Ilhota + isolated_dwelling: Moradia isolada locality: Localidade + moor: Ancoradouro + municipality: Município + postcode: Código postal region: Região sea: Mar state: Estado subdivision: Subdivisão suburb: Subúrbio town: Cidade + unincorporated_area: Área não incorporada village: Vila railway: + abandoned: Ferrovia Abandonada (carris removidos) + construction: Ferrovia em construção + disused: Ferrovia Não Utilizada + disused_station: Estação Ferroviária Não Utilizada funicular: Funicular + halt: Apeadeiro + historic_station: Estação Ferroviária Histórica + level_crossing: Passagem de Nível + light_rail: Metropolitano de Superfície + miniature: Ferrovia em Miniatura + monorail: Monocarril + narrow_gauge: Ferrovia de Bitola Estreita + platform: Plataforma ferroviária + preserved: Ferrovia Preservada + spur: Pequeno Ramal Ferroviário + station: Estação Ferroviária + subway: Estação de Metropolitano + subway_entrance: Entrada para Estação de Metropolitano + switch: Agulha de ferrovia + tram: Linha de elétrico + tram_stop: Paragem de Elétrico + yard: Pátio de Manobras Ferroviário shop: + alcohol: Venda de Bebidas (Off License) + antiques: Antiguidades + art: Loja de Arte bakery: Padaria + beauty: Loja de Produtos de Beleza + beverages: Loja de Bebidas + bicycle: Loja de Bicicletas books: Livraria + butcher: Talho car: Oficina + car_parts: Loja de Peças para Automóvel car_repair: Oficina + carpet: Loja de Tapetes e Alcatifas + charity: Loja de caridade + chemist: Drogaria + clothes: Loja de Roupas computer: Loja de informática + confectionery: Confeitaria + convenience: Loja de Conveniência + copyshop: Centro de Cópias cosmetics: Loja de cosméticos + department_store: Loja de Departamento / Grande Armazém + discount: Loja de Descontos + doityourself: Bricolage + dry_cleaning: Limpeza a Seco electronics: Loja de electrónica + estate_agent: Imobiliária + farm: Loja de quinta + fashion: Loja de Moda + fish: Peixaria florist: Florista + food: Loja de alimentos + funeral_directors: Funerária + furniture: Mobiliário + gallery: Galeria + garden_centre: Loja de Jardinagem + gift: Loja de Lembranças + greengrocer: Loja de Frutas e Verduras + grocery: Mercearia + hairdresser: Cabeleireiro(a) + hardware: Loja de Ferragens hifi: Hi-Fi + insurance: Seguros jewelry: Joalharia + kiosk: Quiosque laundry: Lavandaria + mall: Centro Comercial + market: Mercado + mobile_phone: Loja de Telemóveis + motorcycle: Loja de Motas music: Loja de música + newsagent: Loja de Jornais + optician: Oftalmologista + organic: Loja de alimentos orgânicos + outdoor: Loja de artigos para atividades ao ar livre pet: Loja de animais + photo: Loja de Fotografia + salon: Salão de beleza + shoes: Sapataria shopping_centre: Centro Comercial + sports: Loja de Artigos Desportivos + stationery: Papelaria supermarket: Supermercado + toys: Loja de Brinquedos + travel_agency: Agência de Viagens + video: Videoclube + wine: Venda de Bebidas (Off License) tourism: + alpine_hut: Albergue de Montanha + artwork: Obra de arte attraction: Atracção + bed_and_breakfast: Pensão com pequeno-almoço incluído cabin: Cabana + camp_site: Parque de campismo + caravan_site: Parque de caravanas chalet: Chalé + guest_house: Casa de Hóspedes + hostel: Pousada / Hostel hotel: Hotel information: Informação + lean_to: Abrigo motel: Motel museum: Museu + picnic_site: Parque de merendas / piqueniques theme_park: Parque temático valley: Vale + viewpoint: Miradouro zoo: Jardim zoológico + tunnel: + "yes": Túnel waterway: + artificial: Curso de água artificial + boatyard: Estaleiro Naval canal: Canal + dam: Barragem + derelict_canal: Canal abandonado + ditch: Vala dock: Doca + drain: Vala de drenagem + lock: Eclusa + lock_gate: Comporta de Eclusa + mineral_spring: Fonte de água mineral + mooring: Ancoragem + rapids: Rápidos river: Rio + riverbank: Margem de rio + stream: Ribeiro + wadi: Uádi + waterfall: Queda de água + weir: Represa javascripts: + map: + base: + cycle_map: Mapa de Ciclismo + standard: Mapa Padrão + transport_map: Transportes Públicos site: + edit_disabled_tooltip: Área demasiado grande. Amplie para poder editar edit_tooltip: Editar o mapa + edit_zoom_alert: A área do mapa é demasiado grande. Amplie para poder editar o mapa. + history_disabled_tooltip: Amplie para poder ver o histórico de edições nesta área + history_tooltip: Ver histórico de edições nesta área do mapa + history_zoom_alert: Área demasiado grande. Amplie para poder ver o histórico de edições nesta área do mapa. layouts: + community: Comunidade + community_blogs: Blogues da Comunidade + community_blogs_title: Blogues de membros da comunidade OpenStreetMap + copyright: Licença e Direitos de Autor documentation: Documentação + documentation_title: Documentação do projeto + donate: Apoie o OpenStreetMap %{link} para o Fundo de Atualização do Hardware. donate_link_text: doação edit: Editar + edit_with: Editar com %{editor} export: Exportar + export_tooltip: "Exporta o mapa em vários formatos: imagem, XML ou HTML" + foundation: Fundação + foundation_title: A Fundação OpenStreetMap + gps_traces: Trilhos GPS + gps_traces_tooltip: Gerir os trilhos GPS + help: Ajuda + help_centre: Fórum de Ajuda + help_title: Fórum onde pode colocar dúvidas sobre o projeto history: Histórico - intro_3_partners: wiki + home: Início + home_tooltip: Ir para a posição inicial + inbox_tooltip: + one: A sua caixa de entrada contém 1 mensagem por ler + other: A sua caixa de entrada contém %{count} mensagens por ler + zero: A sua caixa de entrada não contém mensagens por ler + intro_1: O OpenStreetMap é um mapa mundial livre, feito por pessoas de todo o mundo. + intro_2_create_account: Crie uma conta de utilizador + intro_2_download: descarregar + intro_2_html: Os dados do mapa são livres para %{download} e %{use} sob uma %{license}. %{create_account} para tornar o mapa mais completo e atualizado. + intro_2_license: licença aberta + intro_2_use: usar + license: + title: Os dados do OpenStreetMap encontram-se sob a licença Creative Commons - Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA) log_in: entrar + log_in_tooltip: Entrar com uma conta existente + logo: + alt_text: Logotipo do OpenStreetMap logout: sair logout_tooltip: Sair - sign_up: registar-se + make_a_donation: + text: Fazer um Donativo + title: Suporte o OpenStreetMap com um donativo monetário + osm_offline: A base de dados do OpenStreetMap não está disponível neste momento enquanto decorrerem trabalhos de manutenção. + osm_read_only: A base de dados do OpenStreetMap encontra-se neste momento no modo de leitura, enquanto decorrerem trabalhos de manutenção. + partners_bytemark: Bytemark Hosting + partners_html: O alojamento é suportado por %{ucl}, %{ic}, %{bytemark} e outros %{partners}. + partners_ic: Imperial College London + partners_partners: parceiros + partners_ucl: UCL VR Centre + sign_up: criar conta + sign_up_tooltip: Criar uma conta para poder editar o mapa + tag_line: O Mapa Mundial Livre e Editável + user_diaries: Diários de Editores + user_diaries_tooltip: Ver diários dos editores + view: Ver + view_tooltip: Ver o mapa + welcome_user: Bem vindo, %{user_link} + welcome_user_link_tooltip: A sua página de utilizador wiki: Wiki + wiki_title: Sitio wiki do projeto license_page: foreign: english_link: o original em inglês + text: Caso haja um conflito entre esta página traduzida e a %{english_original_link}, a página em inglês tem prevalência title: Sobre esta tradução + legal_babble: + contributors_at_html: "<strong>Áustria</strong>: Contém dados de <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (sob a licença <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> e Land Tirol (sob a licença <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT com emendas</a>)." + contributors_au_html: "<strong>Austrália</strong>: Contém dados de periferias provenientes de dados do Australian Bureau of Statistics." + contributors_ca_html: "<strong>Canadá</strong>: Contém dados de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), e StatCan (Geography Division, Statistics Canada)." + contributors_footer_2_html: " A inclusão de dados no OpenStreetMap não implica que o fornecedor de dados originais apoie o OpenStreetMap, forneça qualquer garantia, ou aceite algum tipo de responsabilidade." + contributors_fr_html: "<strong>França</strong>: Contém dados provenientes da Direction Générale des Impôts." + contributors_gb_html: "<strong>Reino Unido</strong>: Contém dados do Ordnance Survey © Crown copyright and database right 2010." + contributors_intro_html: " A nossa licença CC BY-SA requer que “reconheça o Autor Original de forma razoável ao meio ou forma que estiver a utilizar”. Os contribuidores individuais não requerem que os credite para além de “Colaboradores de OpenStreetMap”, mas nos locais onde se adicionaram dados de agências cartográficas nacionais ou outras fontes relevantes, pode ser razoável reconhecer a autoria destas reproduzindo a referência a estas ou incluindo um hiperligação a apontar para esta página." + contributors_nl_html: "<strong>Países Baixos</strong>: Contém dados © AND, 2007 (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nova Zelândia</strong>: Contém dados provenientes de Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Polónia</strong>: Contém dados de <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright UMP-pcPL contributors. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">Mais informações sobre a utilização de dados de UMP no OpenStreetMap</a>" + contributors_title_html: os nossos contribuidores + contributors_za_html: "<strong>África do Sul</strong>: Contém dados provenientes de <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: " Se estiver a utilizar imagens de mapas do OpenStreetMap, pedimos que credite pelo menos com “© contribuidores do OpenStreetMap, CC BY-SA”. Se estiver a usar apenas dados do mapa (cartográficos), pedimos que credite pelo menos com “Dados cartográficos © contribuidores do OpenStreetMap, CC BY-SA”." + credit_2_html: " Quando possível, a referência ao OpenStreetMap deve ter uma hiperligação a apontar para <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> e a referência a CC BY-SA a apontar para <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.pt\">http://creativecommons.org/licenses/by-sa/2.0/deed.pt</a> Se estiver a utilizar um meio onde não é possível utilizar hiperligações (por ex. livro impresso) sugerimos-lhe que dirija os seus leitores para www.openstreetmap.org (talvez substituindo ‘OpenStreetMap’ por este endereço web) e para www.creativecommons.org" + credit_title_html: Como creditar o OpenStreetMap + intro_1_html: " O OpenStreetMap é constituído por <i>dados abertos</i>, disponibilizados sob a licença <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.pt\">Creative Commons - Atribuição - CompartilhaIgual 2.0 Genérica</a> (CC BY-SA 2.0)." + intro_2_html: " Tem o direito de copiar, distribuir, transmitir e adaptar os nossos mapas e dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores. Se alterar ou adicionar conteúdo dos nossos mapas ou dados, pode distribuir o resultado apenas com a mesma licença. O <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">texto legal completo</a> explica os seus direitos e responsabilidades." + more_1_html: " Leia mais informações sobre a utilização dos nossos dados em <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Perguntas frequentes - Legais</a>." + more_2_html: " Os contribuidores do OpenStreetMap são informados para nunca adicionarem dados de nenhuma fonte protegida por direitos de autor (por e. Google Maps ou mapas impressos) sem a permissão explícita dos detentores de direitos de autor." + more_3_html: " Apesar do OpenStreetMap ser constituído por dados abertos, não podemos fornecer uma API gratuitamente a programadores terceiros.\n\n Consulte a nossa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de Utilização da API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de Utilização de Telas (Tiles)</a> e a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Política de Utilização do Nominatim</a>." + more_title_html: Saber mais + title_html: Licença e Direitos de autor native: mapping_link: começar a mapear native_link: Versão em português + text: Está a ver a versão em Inglês da página de copyright. Pode voltar à %{native_link} desta página ou, se preferir, %{mapping_link}. title: Sobre esta página message: delete: - deleted: Mensagem apagada + deleted: Mensagem eliminada inbox: date: Data from: De - my_inbox: Minha caixa de entrada - no_messages_yet: Ainda não tens mensagens. Por que não entrar em contacto com alguns da %{people_mapping_nearby_link}? + messages: Tem %{new_messages} e %{old_messages} + my_inbox: A minha caixa de entrada + new_messages: + one: "%{count} mensagem nova" + other: "%{count} mensagens novas" + no_messages_yet: Ainda não tem mensagens. Por que não entrar em contacto com algumas %{people_mapping_nearby_link}? + old_messages: + one: "%{count} mensagem antiga" + other: "%{count} mensagens antigas" outbox: caixa de saída + people_mapping_nearby: pessoas a mapear nas redondezas subject: Assunto title: Caixa de Entrada + mark: + as_read: Mensagem marcada como lida + as_unread: Mensagem marcada como não lida message_summary: - delete_button: Apagar + delete_button: Eliminar read_button: Marcar como lido reply_button: Responder unread_button: Marcar como não lida new: + back_to_inbox: Voltar à caixa de entrada + body: Mensagem + limit_exceeded: Enviou muitas mensagens recentemente. Por favor aguarde e envie mais tarde. + message_sent: Mensagem enviada send_button: Enviar + send_message_to: Enviar uma nova mensagem para %{name} + subject: Assunto title: Enviar mensagem + no_such_message: + body: Desculpe, não existe nenhuma mensagem com esse identificador (ID). + heading: Esta mensagem não existe. + title: Esta mensagem não existe + outbox: + date: Data + inbox: caixa de entrada + messages: + one: Tem %{count} mensagem enviada + other: Tem %{count} mensagens enviadas + my_inbox: A minha %{inbox_link} + no_sent_messages: Ainda não tem mensagens enviadas. Por que não entrar em contacto com algumas %{people_mapping_nearby_link}? + outbox: caixa de saída + people_mapping_nearby: pessoas a mapear nas redondezas + subject: Assunto + title: Caixa de saída + to: Para read: back_to_inbox: Voltar para a caixa de entrada back_to_outbox: Voltar para a caixa de saída date: Data from: De - reading_your_messages: Lendo mensagem + reading_your_messages: A ler a mensagem reading_your_sent_messages: Lendo as mensagens enviadas + reply_button: Responder subject: Assunto title: Ler mensagem to: Para unread_button: Marcar como não lida - wrong_user: Estás logado como `%{user}', mas a mensagem que pediste para ler não foi enviada por ou para o utilizador. Por favor, entra com o usuário correto para a ler. + wrong_user: Está autenticado com a conta `%{user}', mas a mensagem que pediu para ler não foi enviada por, ou para, essa conta de utilizador. Por favor, entre na conta de utilizador correta para ler a mensagem. + reply: + wrong_user: Está autenticado como o utilizador `%{user}' mas a mensagem que pediu para responder não foi enviada para esse utilizador. Por favor entre na conta de utilizador correta para responder. sent_message_summary: - delete_button: Apagar + delete_button: Eliminar notifier: + diary_comment_notification: + footer: Também pode ver o comentário em % {readurl} e comentar em % {commenturl} ou responder em % {replyurl} + header: "%{from_user} comentou na sua entrada recente do diário no OpenStreetMap com o assunto %{subject}:" + hi: Olá %{to_user}, + subject: "[OpenStreetMap] % {usuário} comentou numa entrada do seu diário" + email_confirm: + subject: "[OpenStreetMap] Confirme o seu endereço de e-mail" + email_confirm_html: + click_the_link: Se foi você que fez o pedido, clique na ligação seguinte para confirmar a alteração. + greeting: Olá, + hopefully_you: Foi feito um pedido no site do OpenStreetMap para alterar o endereço de e-mail da sua conta de %{server_url} para %{new_address}. email_confirm_plain: + click_the_link: Se foi você que fez o pedido, clique na ligação seguinte para confirmar o pedido. greeting: Olá, + hopefully_you_1: Foi feito um pedido no site do OpenStreetMap para alterar o endereço de e-mail da sua conta de + hopefully_you_2: "%{server_url} para %{new_address}." + friend_notification: + befriend_them: Também pode adicioná-lo como amigo em % {befriendurl}. + had_added_you: "% {usuário} adicionou-o como amigo no OpenStreetMap." + see_their_profile: Pode ver o perfil do editor em % {userurl}. + subject: "[OpenStreetMap] %{user} adicionou-o como amigo" gpx_notification: + and_no_tags: e sem etiquetas. + and_the_tags: "e com as seguintes etiquetas:" + failure: + failed_to_import: "falhou na importação. Erro:" + more_info_1: Pode encontrar mais informação sobre erros em importações GPX e como evitar + more_info_2: "que ocorram novamente em:" + subject: "[OpenStreetMap] Erro de importação GPX" greeting: Olá, + success: + loaded_successfully: foi carregado com sucesso com %{trace_points} de %{possible_points} pontos possíveis. + subject: "[OpenStreetMap] Importação de GPX bem sucedida" + with_description: com a descrição + your_gpx_file: Parece que seu ficheiro GPX + lost_password: + subject: "[OpenStreetMap] Pedido de uma nova palavra-passe" + lost_password_html: + click_the_link: Se foi você que fez o pedido, clique na ligação seguinte para lhe ser enviada uma nova palavra-passe, invalidando a anterior. + greeting: Olá, + hopefully_you: Foi feito um pedido para obter uma nova palavra-passe nesta conta do openstreetmap.org associada a este e-mail. + lost_password_plain: + click_the_link: Se foi você que fez o pedido, clique na ligação seguinte para lhe ser enviada uma nova palavra-passe, invalidando a anterior. + greeting: Olá, + hopefully_you_1: Foi feito um pedido no site OpenStreetMap para obter uma nova palavra-passe nesta + hopefully_you_2: conta do openstreetmap.org associada a este e-mail. + message_notification: + footer1: Também pode ler a mensagem em % {readurl} + footer2: e pode responder em % {replyurl} + header: "% {from_user} enviou-lhe uma mensagem através do OpenStreetMap com o assunto % {objecto}:" + hi: Olá %{to_user}, + signup_confirm: + subject: "[OpenStreetMap] Confirme o seu endereço de e-mail" + signup_confirm_html: + ask_questions: Pode fazer qualquer pergunta sobre o OpenStreetMap no nosso <a href="http://help.openstreetmap.org/">fórum de ajuda</a>. + click_the_link: Se foi você que pediu, clique na ligação abaixo para confirmar a conta de utilizador e ver mais informações sobre o OpenStreetMap + current_user: Está disponível uma lista de utilizadores por categorização conforme o local onde se encontram em <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>. + get_reading: Saiba mais sobre o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">no wiki</a>, Ponha-se em dia com as últimas notícias com <a href="http://blog.openstreetmap.org/">o blogue OpenStreetMap</a> ou <a href="http://twitter.com/openstreetmap">o Twitter</a>, ou veja <a href="http://www.opengeodata.org/">o blogue OpenGeoData</a> de Steve Coast, fundador do OpenStreetMap com alguma história sobre o projeto, que também tem <a href="http://www.opengeodata.org/?cat=13">podcasts para ouvir</a>! + greeting: Olá! + hopefully_you: Foi feito um pedido para criar uma conta em + introductory_video: Pode ver um %{introductory_video_link}. + more_videos: Existem %{more_videos_link} + more_videos_here: mais vídeos aqui + user_wiki_page: É recomendável criar uma página de utilizador no wiki, o que inclui etiquetas de categorização que indiquem de onde é, como a <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Lisboa">[[Category:Users_in_Lisboa]]</a>. + video_to_openstreetmap: ví­deo de introdução sobre o OpenStreetMap. + wiki_signup: Também pode <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">criar uma conta no wiki do OpenStreetMap</a>. + signup_confirm_plain: + ask_questions: "Pode fazer qualquer pergunta que queira sobre o OpenStreetMap no nosso fórum de ajuda:" + blog_and_twitter: "Ponha-se em dia com as últimas notícias com o blogue OpenStreetMap ou o Twitter:" + click_the_link_1: Se foi você que fez o pedido, bem vindo! Por favor clique na ligação seguinte para confirmar + click_the_link_2: a conta e ver mais informação sobre o OpenStreetMap + current_user_1: Está disponível uma lista de utilizadores por categorização, + current_user_2: "conforme o local onde se encontram em:" + greeting: Olá! + hopefully_you: Foi feito um pedido para criar uma conta em + introductory_video: "Pode ver um vídeo de introdução sobre o OpenStreetMap em:" + more_videos: "Há mais vídeos em:" + opengeodata: "OpenGeoData.org é o blogue do fundador do OpenStreetMap, que também tem podcasts disponíveis:" + the_wiki: "Leia mais sobre o OpenStreetMap em:" + user_wiki_1: É recomendável criar uma página de utilizador no wiki, o que inclui + user_wiki_2: etiquetas de categorização que indiquem de onde é, como a [[Category:Users_in_Lisboa]]. + wiki_signup: "Também pode querer criar uma conta no wiki OpenStreetMap em:" + oauth: + oauthorize: + allow_read_gpx: ler os meus trilhos GPS privados. + allow_read_prefs: ler as minhas preferências de utilizador. + allow_to: "Dar permissão ao programa para:" + allow_write_api: alterar o mapa. + allow_write_diary: criar entradas no diário, comentários e adicionar amigos. + allow_write_gpx: enviar trilhos GPS. + allow_write_prefs: alterar as minhas preferências. + request_access: O programa %{app_name} está a pedir acesso à sua conta, %{user}. Por favor escolha as permissões que o programa pode ter. Pode escolher as que quiser. + revoke: + flash: Revogou o Token para %{application} oauth_clients: + create: + flash: As informações foram registadas com sucesso + destroy: + flash: O registo do programa foi eliminado edit: submit: Editar + title: Editar o programa form: + allow_read_gpx: ler os trilhos GPS privados do utilizador. + allow_read_prefs: ler as preferências do utilizador. + allow_write_api: alterar o mapa. + allow_write_diary: criar entradas no diário, comentários e adicionar amigos. + allow_write_gpx: enviar trilhos GPS. + allow_write_prefs: alterar as preferências do utilizador. + callback_url: URL de retorno name: Nome + requests: "Pedir as seguintes permissões do utilizador:" + required: obrigatório + support_url: URL de suporte + url: URL do programa principal + index: + application: Nome do Programa + issued_at: Emitido em + list_tokens: "Os seguintes tokens forem emitidos a programas em seu nome:" + my_apps: Meus programas + my_tokens: Meus programas autorizados + no_apps: Tem um programa que queira registar para ser utilizado com o OpenStreetMap utilizando o %{oauth}? Tem de registar o programa para poder fazer solicitações OAuth. + register_new: Registar um programa + registered_apps: "Tem os seguintes programas registados:" + revoke: Anular! + title: Minhas preferências do OAuth + new: + submit: Registar + title: Registar um novo programa + not_found: + sorry: Desculpe, não foi possível encontrar esse %{type}. + show: + access_url: URL do Token de Acesso + allow_read_gpx: ler os trilhos GPS privados do utilizador. + allow_read_prefs: ler as preferências do utilizador. + allow_write_api: alterar o mapa. + allow_write_diary: criar entradas no diário, comentários e adicionar amigos. + allow_write_gpx: enviar trilhos GPS. + allow_write_prefs: alterar as preferências do utilizador. + authorize_url: "URL de Autorização:" + confirm: Tem a certeza? + delete: Eliminar programa + edit: Editar Detalhes + key: "Chave de Utilizador:" + requests: "Pedir as seguintes permissões do utilizador:" + secret: "Segredo de Utilizador:" + support_notice: Suportamos HMAC-SHA1 (recomendado) assim como texto normal no modo SSL. + title: Detalhes do OAuth de %{app_name} + url: "URL do Token de Pedido:" + update: + flash: A atualização da informação do programa foi feita com sucesso + redaction: + create: + flash: A redação foi criada. + destroy: + error: Ocorreu um erro ao tentar eliminar esta redação. + flash: Redação eliminada. + not_empty: A redação não está vazia. Por favor retire a redação de todas as versões pertencentes a esta redação antes de a eliminar + edit: + description: Descrição + heading: Editar redação + submit: Gravar redação + title: Editar redação + index: + empty: Não existem redações a mostrar. + heading: Lista de redações + title: Lista de redações + new: + description: Descrição + heading: Introduza a informação da nova redação + submit: Criar redação + title: A criar uma nova redação + show: + confirm: Tem a certeza? + description: "Descrição:" + destroy: Remover esta redação + edit: Editar esta redação + heading: A mostrar a redação "%{title}" + title: A mostrar a redação + user: "Criador:" + update: + flash: As alterações foram gravadas. site: + edit: + anon_edits_link_text: Descubra a que se deve isto. + flash_player_required: Necessita do Flash instalado e ativado para usar o Potlatch, o editor em Flash do OpenStreetMap. Pode <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">descarregar o Flash do site Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Também estão disponíveis outras opções</a> para editar o OpenStreetMap. + no_iframe_support: O seu navegador de Internet não suporta ou tem desativado as iframes HTML, que são necessárias para esta funcionalidade. + not_public: Não configurou as suas edições como públicas. + not_public_description: Não pode editar mais o mapa a não ser que torne as suas edições públicas. Pode fazer essa alteração na sua %{user_page}. + potlatch2_not_configured: O Potlatch 2 não foi configurado - por favor veja http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para mais informações + potlatch2_unsaved_changes: Tem alterações que não foram gravadas. (Para gravar no Potlatch 2, deve clicar no botão Gravar.) + potlatch_unsaved_changes: Tem alterações por gravar (Para gravar no Potlatch, deve desselecionar o ponto ou linha atual, se estiver a editar no modo direto, ou clicar no botão gravar se este estiver disponível.) + user_page_link: página de utilizador + index: + js_1: Está a usar um navegador de Internet que não suporta JavaScript ou tem o JavaScript desativado. + js_2: É necessário ter o JavaScript ativado para visualizar mapas no OpenStreetMap. + license: + license_name: Creative Commons - Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA) + notice: Sob a licença % {license_name} pelo % {project_name} e seus colaboradores. + project_name: projeto OpenStreetMap + permalink: Ligação permanente + remote_failed: Erro na edição - confirme se o JOSM ou o Merkaartor está aberto e a opção de Controlo Removo (Remote Control) está ativada + shortlink: Ligação curta key: + map_key: Legenda do Mapa + map_key_tooltip: Mostra a legenda para identificar os elementos presentes no mapa table: entry: admin: Fronteira administrativa allotments: Lotes apron: - - Estacionamento de aeroporto - - terminal + - Estacionamento de aviões + - terminal de aeroporto + bridge: Linha cheia = ponte + bridleway: Via para cavaleiros + brownfield: Edifícios industriais em ruínas e contaminados + building: Edifício significativo + byway: Byway (atalho proibido a veículos motorizados) + cable: + - Teleférico + - telecadeira cemetery: Cemitério centre: Centro desportivo - commercial: Área comercial + commercial: Área comercial (escritórios) + common: + - Baldio + - prado + construction: Estradas em construção cycleway: Ciclovia - destination: Acesso a destino + destination: Acesso a clientes / fornecedores farm: Quinta + footway: Via pedonal forest: Floresta + golf: Campo de golfe + heathland: Charneca / mato de vegetação rasteira + industrial: Área industrial lake: - Lago + - reservatório military: Área militar + motorway: Auto-Estrada park: Parque + permissive: Acesso permitido + pitch: Campo desportivo + primary: Estrada Primária (Nacional) + private: Acesso restrito (propriedade privada) + rail: Ferrovia reserve: Reserva natural + resident: Área residencial + retail: Área de retalho (lojas) + runway: + - Pista de Aeroporto + - Via de Circulação (taxiway) school: - Escola - universidade + secondary: Estrada Secundária (Regional) + station: Estação ferroviária + subway: Metropolitano + summit: + - Cume + - pico + tourist: Atração turística + track: Carreiro florestal ou agrícola + tram: + - Metropolitano de Superfície + - elétrico + trunk: Via Rápida / Itinerário Principal ou Complementar + tunnel: Linha tracejada = túnel + unclassified: Estrada sem classificação oficial + unsurfaced: Estrada não pavimentada + wood: Bosque + markdown_help: + alt: Texto alternativo + first: Primeiro item + heading: Secção + headings: Títulos de secções + image: Imagem + link: Hiperligação + ordered: Lista numerada + second: Segundo item + subheading: Sub-secção + text: Texto + title_html: Tabela de códigos. Processado com <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Lista + url: URL + richtext_area: + edit: Editar + preview: Mostrar previsão + search: + search: Pesquisar + search_help: "exemplos: 'Coimbra', 'Rua da Atalaia, Faro', 'EN329', ou 'Estação ferroviária Lisboa' <a href='http://wiki.openstreetmap.org/wiki/Pt-br:Nominatim'>mais exemplos...</a>" + submit_text: Ir + where_am_i: Onde estou? + where_am_i_title: Pesquisa a localização atual do mapa sidebar: close: Fechar + search_results: Resultados da Pesquisa time: formats: friendly: "%e %B %Y às %H:%M" trace: create: - upload_trace: Carregar um Caminho de GPS + trace_uploaded: O seu ficheiro GPX (GPS) foi enviado e está a aguardar a inclusão na base de dados. Normalmente este processo dura cerca de uma hora. Quando for incluído na base de dados será enviado um email a informá-lo. + upload_trace: Carregar um Trilho GPS + delete: + scheduled_for_deletion: Trilho programado para eliminação edit: description: "Descrição:" - download: baixar + download: descarregar edit: editar filename: "Nome do ficheiro:" - heading: A editar caminho %{name} + heading: A editar o trilho %{name} map: mapa - owner: "Proprietário:" + owner: "Autor:" points: "Pontos:" - save_button: Gravar Mudanças + save_button: Gravar Alterações start_coord: "Coordenada de início:" - tags: "Marcações:" - title: Editando caminho %{name} + tags: "Etiquetas:" + tags_help: delimitado por vírgulas + title: A editar o trilho %{name} uploaded_at: "Mandado em:" visibility: "Visibilidade:" - visibility_help: o que significa isso? + visibility_help: o que significa isto? list: - public_traces: Caminhos GPS públicos - public_traces_from: Caminhos GPS públicos do utilizador %{user} - tagged_with: " etiquetado como %{tags}" - your_traces: Os seus caminhos GPS + public_traces: Trilhos GPS públicos + public_traces_from: Trilhos GPS públicos do utilizador %{user} + tagged_with: " etiquetado com %{tags}" + your_traces: Os seus trilhos GPS make_public: - made_public: Caminho tornado público + made_public: Trilho tornado público + offline: + heading: Armazenamento de GPX indisponível + message: O sistema de envio e armazenamento GPX está neste momento indisponível. offline_warning: message: O sistema de carregamento de ficheiros GPX está actualmente indisponível trace: @@ -608,114 +1444,174 @@ pt: pending: PENDENTE private: PRIVADO public: PÚBLICO - trace_details: Ver Detalhes do Caminho + trace_details: Ver Detalhes do Trilho trackable: CONTROLÁVEL view_map: Ver Mapa trace_form: - description: Descrição + description: "Descrição:" help: Ajuda - tags: Etiquetas + tags: "Etiquetas:" + tags_help: delimitado por vírgulas upload_button: Carregar - upload_gpx: Carregar Ficheiro GPX - visibility: Visibilidade + upload_gpx: "Carregar Ficheiro GPX:" + visibility: "Visibilidade:" + visibility_help: o que significa isto? trace_header: - see_all_traces: Ver todos os caminhos - see_your_traces: Ver todos os teus caminhos - traces_waiting: Tu tens %{count} caminhos esperando pelo carregamento. Por favor, considera em esperar por esses carregamentos terminares antes de enviares mais, de modo a não bloquear a fila para outros utilizadores. - upload_trace: Carregar caminho + see_all_traces: Ver todos os trilhos + see_your_traces: Ver todos os meus trilhos + traces_waiting: Tem %{count} trilhos a serem colocados na base de dados. Por favor, antes de enviar mais trilhos aguarde um pouco para terminar a inclusão dos trilhos enviados, de modo a não bloquear a fila para outros utilizadores. + upload_trace: Carregar trilho GPS trace_optionals: tags: Etiquetas trace_paging_nav: - next: Próximo » - previous: « Anterior showing_page: Mostrando página %{page} view: - delete_track: Apagar este caminho + delete_track: Eliminar este trilho description: "Descrição:" - download: download + download: descarregar edit: editar - edit_track: Editar este caminho + edit_track: Editar este trilho filename: "Nome do ficheiro:" - heading: Vendo o caminho %{name} + heading: A ver o trilho %{name} map: mapa none: Nenhum - owner: "Proprietário:" + owner: "Autor:" pending: PENDENTE points: "Pontos:" start_coordinates: "Coordenada de início:" tags: "Etiquetas:" - title: Vendo o caminho %{name} - trace_not_found: Caminho não encontrado + title: A ver o trilho %{name} + trace_not_found: Não foi encontrado o trilho! uploaded: "Carregado:" visibility: "Visibilidade:" visibility: - identifiable: Identificável (mostrado na lista de caminhos e como identificável, pontos ordenados com data e hora) + identifiable: Identificável (mostrado na lista de trilhos GPS e identificável, pontos ordenados com data e hora) private: Privado (só partilhado como anónimo, pontos não ordenados) - public: Público (mostrado na lista de caminhos como anónimo, pontos não ordenados) + public: Público (mostrado na lista de trilhos GPS como anónimo, pontos não ordenados) trackable: Controlável (apenas compartilhada como anónimo, pontos ordenados com data e hora) user: account: contributor terms: + agreed: Você não aceitou os novos Termos de Colaboração. + agreed_with_pd: Também declarou que as suas edições são disponibilizadas em Domínio Público. heading: "Termos do Contribuidor:" - link text: o que é isso? + link text: o que é isto? + not yet agreed: Ainda não aceitou os novos Termos de Contribuição. + review link text: Por favor clique na ligação seguinte para rever e aceitar os Termos de Contribuição. current email address: "E-mail Actual:" delete image: Remover a imagem actual + email never displayed publicly: (nunca é mostrado publicamente) flash update success: As informações do utilizador foram actualizadas com sucesso. flash update success confirm needed: As informações do utilizador foram actualizadas com sucesso. Verifica o teu e-mail para confirmar o teu endereço de e-mail. - home location: Localização da Residência + home location: Localização Habitual image: "Imagem:" + image size hint: (funcionam melhor as imagens quadradas com pelo menos 100x100 pixeis) + keep image: Manter a imagem atual latitude: "Latitude:" longitude: "Longitude:" make edits public button: Tornar todas as minhas edições públicas my settings: Minhas definições new email address: "Novo E-mail:" new image: Adicionar imagem - no home location: Não inseriste a localização da tua residência. + no home location: Não inseriu a sua localização habitual. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: o que é isto? + openid: "OpenID:" preferred editor: "Editor Preferido:" preferred languages: "Línguas preferidas:" + profile description: "Descrição do perfil:" public editing: + disabled: Desativado e não pode editar. Todas as edições anteriores são anónimas. disabled link text: porque não posso editar? + enabled: Ativado. Não anónimo e pode editar. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: o que é isso? + enabled link text: o que é isto? heading: "Edição pública:" + public editing note: + heading: Edição pública + text: Neste momento as suas edições são anónimas e as outras pessoas não lhe podem enviar mensagens nem ver onde se encontra. Para mostrar as suas edições e permitir que o contactem através do OpenStreetMap, clique na ligação seguinte. <b>Desde a migração 0.6 da API, apenas utilizadores com edições públicas podem editar dados do mapa</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">mais informações</a>).<ul><li>Ao tornar as suas edições públicas o seu endereço de email não será revelado.</li><li>Esta ação não pode ser revertida e todos os novos utilizadores têm as edições disponibilizadas publicamente.</li></ul> replace image: Substituir a imagem actual + return to profile: Regressar ao perfil save changes button: Gravar Alterações title: Editar conta + update home location on click: Atualizar local onde me encontro normalmente quando clico no mapa? confirm: already active: Esta conta já foi confirmada. + before you start: Sabemos que provavelmente está com pressa começar a mapear, mas antes disso pode querer preencher mais algumas informações sobre si mesmo no formulário abaixo. button: Confirmar heading: Confirmar a conta de utilizador press confirm button: Prime o botão confirmar abaixo para activar a tua conta. + reconfirm: Já passou algum tempo desde que criou uma conta. Pode ser necessário <a href="%{reconfirm}">enviar novamente um email de confirmação para ativar a conta.</a>. success: Conta confirmada, obrigado por te registares! + unknown token: Parece que esse Token não existe. confirm_email: button: Confirmar failure: Um e-mail já foi confirmado com este código. heading: Confirmar a alteração de e-mail - press confirm button: Prime o botão confirmar abaixo para confirmar o teu e-mail. - success: O teu e-mail foi confirmado, obrigado por te inscreveres! + press confirm button: Clique no botão confirmar para confirmar o seu e-mail. + success: O seu e-mail foi confirmado, obrigado por se inscrever! confirm_resend: failure: Utilizador %{name} não foi encontrado. + success: Já enviámos um email de confirmação para %{email} e mal confirme a sua conta, poderá mapear.<br /><br />Caso utilize um sistema anti-spam que envie pedidos de confirmação, por favor coloque na lista branca de remetentes seguros o endereço webmaster@openstreetmap.org uma vez que não temos possibilidade de responder a pedidos de confirmação. filter: - not_an_administrator: Precisas de ser um administrador de para realizar esta operação. + not_an_administrator: É necessário ser administrador para realizar esta operação. go_public: - flash success: Todas as tuas edições são agora públicas, e agora estás autorizado a editar. + flash success: Todas as suas edições são agora públicas e agora poderá editar o mapa. list: confirm: Confirmar Utilizadores Seleccionados + empty: Não foi encontrado nenhum utilizador correspondente heading: Utilizadores hide: Ocultar Utilizadores Seleccionados + showing: + one: A mostrar a página %{page} (%{first_item} de %{items}) + other: A mostrar a página %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} criado com o ip %{ip_address} em %{date}" summary_no_ip: "%{name} criado na %{date}" title: Utilizadores login: + account is suspended: Pedimos desculpa, mas a sua conta foi suspensa devido a atividades suspeitas.<br />Por favor contacte o <a href="%{webmaster}">administrador do site</a> para resolver o problema. + account not active: Desculpe, a sua conta ainda não está ativa.<br />Por favor clique na ligação presente no email que lhe foi enviado para ativar a sua conta, ou<a href="%{reconfirm}">peça uma nova mensagem de email para confirmação</a>. + auth failure: Pedimos desculpa, mas não pode entrar na conta com os detalhes fornecidos. + create account minute: Crie uma conta. Leva apenas um minuto. email or username: "E-mail ou Utilizador:" heading: Iniciar sessão - login_button: Autenticar-se - lost password link: Perdeu a sua palavra-chave? - new to osm: Novo no OpenStreetMap? - password: "Palavra-chave:" - register now: Registar-se agora + login_button: Entrar + lost password link: Perdeu a sua palavra-passe? + new to osm: É a primeira vez que está no OpenStreetMap? + no account: Não possui uma conta? + notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Saiba mais sobre a alteração da licença do OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traduções</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussão</a>) + notice_terms: O OpenStreetMap iniciou o processo de alteração da licença na qual disponibiliza os dados a 1 de Abril de 2012. A nova licença é igualmente aberta, mas é mais adequada a uma base de dados geográficos como a nossa. Adoraríamos manter as suas contribuições no OpenStreetMap, mas apenas poderemos fazê-lo se concordar que o OpenStreetMap disponibilize e distribua as suas contribuições sob a nova licença. Caso contrário seremos obrigados a remover as suas contribuições da nossa base de dados.<br /><br />Por favor entre na sua conta e dedique alguns segundos para rever e aceitar os termos da nova licença. Muito obrigado! + openid: "% {logo} OpenID:" + openid invalid: Desculpe, o seu OpenID parece estar incorreto + openid missing provider: Desculpe, não foi possível contactar o seu fornecedor de OpenID + openid_logo_alt: Iniciar sessão com OpenID + openid_providers: + aol: + alt: Iniciar sessão com um OpenID do AOL + title: Iniciar sessão com AOL + google: + alt: Iniciar sessão com OpenID do Google + title: Iniciar sessão com Google + myopenid: + alt: Iniciar sessão com um OpenID do myOpendID + title: Iniciar sessão com myOpendID + openid: + alt: Iniciar sessão com um endereço URL de OpenID + title: Iniciar sessão com OpenID + wordpress: + alt: Iniciar sessão com um OpenID do Wordpress + title: Iniciar sessão com Wordpress + yahoo: + alt: Iniciar sessão com OpenID do Yahoo + title: Iniciar sessão com Yahoo + password: "Palavra-passe:" + register now: Criar conta agora remember: "Lembrar-me:" - title: Autenticar-se + title: Entrar + to make changes: Para editar no OpenStreetMap, é necessário ter uma conta. + with openid: "Como alternativa, utilize o seu OpenID para entrar na conta:" + with username: "Já tem uma conta no OpenStreetMap? Por favor introduza o nome de utilizador e a palavra-passe:" logout: heading: Sair do OpenStreetMap logout_button: Sair @@ -723,11 +1619,13 @@ pt: lost_password: email address: "E-mail:" heading: Palavra-passe esquecida? + help_text: Introduza o endereço de e-mail que utilizou para criar a conta, enviaremos uma ligação para esse e-mail para que possa pedir outra palavra-passe. new password button: Alterar Palavra-passe notice email cannot find: Não foi possível encontrar o e-mail, desculpe. + notice email on way: Já vai um e-mail a caminho para que possa utilizar outra palavra-passe. title: Palavra-passe esquecida make_friend: - already_a_friend: Já és amigo do(a) %{name}. + already_a_friend: Já é amigo de %{name}. failed: Desculpe, falha ao adicionar %{name} como um amigo. success: "%{name} agora é teu amigo." new: @@ -735,87 +1633,230 @@ pt: confirm password: "Confirmar palavra-passe:" contact_webmaster: Entre em contacto com o <a href="mailto:webmaster@openstreetmap.org">webmaster</a> para uma conta ser criada - vamos tentar lidar com o pedido o mais rapidamente possível. continue: Continuar - display name: "Mostrar Nome:" + display name: "Nome de utilizador:" + display name description: O nome de utilizador será visível publicamente. Poderá alterar o nome posteriormente nas preferências. email address: "E-mail:" + fill_form: Preencha o formulário e enviaremos de seguida um e-mail de confirmação para ativar a conta. flash create success message: Obrigado por te inscreveres. Enviamos uma nota de confirmação para o e-mail %{email} e assim que confirmares a conta, vais ser capaz de obter o mapeamento. <br /><br /> Se utilizares um sistema anti-spam que envia pedidos de confirmação, por favor, vai ver á pasta de spam. heading: Criar uma Conta de Utilizador - password: "Palavra-chave:" + license_agreement: Quando confirmar a sua conta, será necessário aceitar os <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Termos de Colaboração</a>. + no_auto_account_create: Infelizmente neste momento não poderemos criar uma conta automaticamente. + not displayed publicly: Não será visível publicamente (ver <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="política de privacidade incluindo secção sobre endereços de e-mail">política de privacidade</a>) + openid: "% {logo} OpenID:" + openid association: "<p>O seu OpenID ainda não está associado a uma conta do OpenStreetMap.</p>\n<ul>\n <li>Se ainda não tem uma conta no OpenStreetMap, por favor crie uma conta utilizando o formulário abaixo.</li>\n <li>\n Se já tem uma conta, pode entrar na conta\n usando o nome de utilizador e palavra-passe e então associar a conta\n a um OpenID nas configurações da sua conta.\n </li>\n</ul>" + openid no password: Não é necessário uma palavra-passe com o OpenID, mas algumas ferramentas adicionais ou servidores podem necessitar de uma. + password: "Palavra-passe:" terms accepted: Obrigado por aceitar os novos termos do contribuidor! + terms declined: Lamentamos não ter aceitado os novos Termos de Contribuição. Para obter mais informações consulte <a href="%{url}">esta página wiki</a>. title: Criar conta + use openid: Como alternativa, use % {logo} OpenID para entrar + no_such_user: + body: Não existe nenhum utilizador com o nome %{user}. Verifique se o endereço está correto ou talvez a hiperligação que clicou esteja errada. + heading: O utilizador % {user} não existe + title: Este utilizador não existe popup: friend: Amigo + nearby mapper: Mapeador das redondezas your location: Tua localização remove_friend: - not_a_friend: "%{name} não é teu amigo." - success: "%{name} foi removido dos teus amigos." + not_a_friend: "%{name} não está na lista de seus amigos." + success: "%{name} foi removido(a) da lista de seus amigos." reset_password: confirm password: "Confirmar Palavra-passe:" - flash changed: A sua palavra-chave foi alterada. + flash changed: A sua palavra-passe foi alterada. + flash token bad: O Token não foi encontrado. Verifique por favor o URL. heading: Repor palavra-passe para o %{user} - password: "Palavra-chave:" - reset: Repor Palavra-chave + password: "Palavra-passe:" + reset: Repor Palavra-passe title: Repor palavra-passe set_home: - flash success: Residência salva com sucesso + flash success: Localização gravada com êxito suspended: + body: "<p>\n Pedimos desculpa, mas a sua conta foi automaticamente suspensa devido\n a atividades suspeitas.\n</p>\n<p>\n Esta decisão será revista brevemente por um administrador.\n Pode contactar o %{webmaster} se desejar.\n</p>" heading: Conta Suspensa title: Conta Suspensa + webmaster: administrador do site terms: agree: Aceitar + consider_pd: para além do acordo exposto acima, considero que as minhas contribuições se encontram em Domínio Público. consider_pd_why: O que é isto? decline: Rejeitar + guidance: "Informação para ajudar a compreender os termos: um <a href=\"%{summary}\">resumo inteligível</a> e algumas <a href=\"%{translations}\">traduções informais</a>" heading: Termos do contribuidor legale_names: france: França italy: Itália rest_of_world: Resto do mundo + legale_select: "por favor selecione o seu país de residência:" + read and accept: Por favor leia o acordo seguinte e clique no botão "Aceitar" para confirmar que aceita os termos deste acordo para as suas contribuições anteriores e futuras. title: Termos dos contribuidores + you need to accept or decline: Por favor leia e depois aceite ou recuse os novos Termos de Contribuição para continuar. view: activate_user: activar este utilizador add as friend: adicionar aos amigos ago: (%{time_in_words_ago} atrás) + block_history: ver bloqueios recebidos + blocks by me: bloqueados por mim + blocks on me: bloqueios sobre mim + comments: comentários confirm: Confirmar confirm_user: confirmar esse utilizador create_block: bloquear este utilizador created from: "Criado em:" + ct accepted: Aceitou há %{ago} + ct declined: Rejeitou + ct status: "Termos do Contribuidor:" + ct undecided: Indeciso deactivate_user: desactivar este utilizador delete_user: eliminar este utilizador description: Descrição diary: diário edits: edições email address: "E-mail:" + friends_changesets: Ver todos os conjuntos de alterações dos amigos + friends_diaries: Ver todas as entradas de diários dos amigos hide_user: ocultar este utilizador + if set location: Se definir a sua localização habitual, aparecerá aqui um mapa. Pode definir a sua localização na página %{settings_link}. km away: "%{count}km de distância" latest edit: "Última edição %{ago}:" m away: "%{count}m de distância" + mapper since: "Mapeando desde:" + moderator_history: ver bloqueios feitos + my comments: meus comentários my diary: meu diário my edits: as minhas edições my settings: as minhas configurações - new diary entry: nova entrada no de diário + my traces: meus trilhos + nearby users: Outros editores nas redondezas + nearby_changesets: Ver todos os conjuntos de alterações de editores das redondezas + nearby_diaries: Ver todas as entradas em diários de editores das redondezas + new diary entry: adicionar entrada no meu diário no friends: Ainda não adicionou nenhum amigo. + no nearby users: Não existem outros editores nas redondezas que admitam que estão nas redondezas. + oauth settings: configurações do OAuth remove as friend: remover amigo role: administrator: Este utilizador é administrador + grant: + administrator: Dar acesso de administrador + moderator: Dar acesso de moderador moderator: Este utilizador é um moderador + revoke: + administrator: Retirar acesso de administrador + moderator: Retirar acesso de moderador send message: enviar mensagem settings_link_text: configurações + spam score: "Pontuação de Spam:" status: "Estado:" - traces: caminhos + traces: trilhos unhide_user: descobrir este utilizador user location: Localização do utilizador your friends: Os seus amigos user_block: + blocks_by: + empty: "% {nome} ainda não bloqueou ninguém." + heading: Lista de bloqueios feitos por %{name} + title: Bloqueios por %{name} + blocks_on: + empty: "%{name} nunca foi bloqueado(a)." + heading: Lista de bloqueios em %{name} + title: Bloqueios em %{name} + create: + flash: Bloqueou o utilizador %{name}. + try_contacting: Por favor tente contactar o utilizador antes de o bloquear e dê-lhe algum tempo para responder. + try_waiting: Por favor dê um tempo razoável para o utilizador responder antes de o bloquear. + edit: + back: Ver todos os bloqueios + heading: A editar o bloqueio em %{name} + needs_view: O utilizador necessita de entrar na conta antes do bloqueio terminar? + period: Por quanto tempo, a partir deste momento, o utilizador será bloqueado na utilização da API. + reason: O motivo porque %{name} está a ser bloqueado. Por favor escreva de forma calma e razoável, fornecendo o máximo de detalhes sobre a situação. Tenha em conta que nem todos os utilizadores entendem o jargão da comunidade, por isso escreva de forma clara e compreensível para qualquer outra pessoa leiga. + show: Ver este bloqueio + submit: Atualizar o bloqueio + title: A editar o bloqueio em %{name} + filter: + block_expired: Este bloqueio já terminou e por isso não pode ser editado. + block_period: O período de tempo do bloqueio tem de ser um dos valores da lista deslizante. + helper: + time_future: Termina em %{time}. + time_past: Terminou há %{time} atrás. + until_login: Ativo até o utilizador entrar na conta. + index: + empty: Ainda não foram feitos bloqueios. + heading: Lista de bloqueios de utilizadores + title: Bloqueio de utilizador + model: + non_moderator_revoke: Tem de ser um moderador para revogar um bloqueio. + non_moderator_update: Tem de ser um moderador para criar ou atualizar um bloqueio. + new: + back: Ver todos os bloqueios + heading: A criar um bloqueio em %{name} + needs_view: O utilizador necessita de autenticar-se antes deste bloqueio terminar + period: Por quanto tempo, a partir deste momento, o utilizador será bloqueado na utilização da API. + reason: O motivo porque %{name} está a ser bloqueado. Por favor escreva de forma calma e razoável, fornecendo o máximo de detalhes sobre a situação e tendo em conta que a mensagem será visível publicamente. Note que nem todos os utilizadores entendem o jargão da comunidade, por isso escreva de forma clara e compreensível para qualquer outra pessoa leiga. + submit: Criar bloqueio + title: A criar um bloqueio em %{name} + tried_contacting: Já contactei o utilizador e pedi-lhe para parar. + tried_waiting: Já dei um tempo razoável para o utilizador responder a esta comunicações + not_found: + back: Voltar ao índice + sorry: Pedimos desculpa mas não foi encontrado um utilizador com o identificador (ID) %{id}. partial: confirm: Tem a certeza? + creator_name: Criador + display_name: Utilizador Bloqueado edit: Editar + next: Seguinte » + not_revoked: (não revogado) + previous: « Anterior + reason: Motivo do bloqueio + revoke: Revogar! + revoker_name: Revogado por + show: Mostrar + status: Estado + period: + one: 1 hora + other: "%{count} horas" + revoke: + confirm: Tem a certeza que quer revocar este bloqueio? + flash: Este bloqueio foi revogado. + heading: Revocando bloqueio de %{block_on} por %{block_by} + past: Este bloqueio terminou há %{time} atrás e já não pode ser revocado. + revoke: Revogar! + time_future: Este bloqueio terminará em %{time}. + title: Revocando bloqueio de %{block_on} show: + back: Ver todos os bloqueios + confirm: Tem a certeza? edit: Editar + heading: "%{block_on} bloqueado por %{block_by}" + needs_view: O utilizador necessita de autenticar-se antes deste bloqueio terminar. + reason: "Razão do bloqueio:" + revoke: Revogar! + revoker: "Revocador:" + show: Mostrar + status: Estado + time_future: Termina em %{time} + time_past: Terminou há %{time} atrás + title: "%{block_on} bloqueado por %{block_by}" + update: + only_creator_can_edit: Apenas o moderador que criou este bloqueio pode editá-lo. + success: Bloqueio atualizado. user_role: + filter: + already_has_role: O utilizador já tem o cargo %{role}. + doesnt_have_role: O utilizador não tem o cargo %{role}. + not_a_role: A expressão `%{role}' não é um cargo válido. + not_an_administrator: Apenas os administradores podem gerir cargos, e você não é administrador. grant: - are_you_sure: Tens certeza que você desejas conceder o cargo `%{role}' ao utilizador `%{name}'? + are_you_sure: Tem a certeza que deseja conceder o cargo `%{role}' ao utilizador `%{name}'? confirm: Confirmar + fail: Não foi possível conceder o cargo `%{role}' ao utilizador `%{name}'. Por favor verifique se o utilizador e o cargo são válidos. + heading: Confirmar concessão do cargo title: Confirmar a concessão do cargo revoke: + are_you_sure: Tem a certeza que deseja retirar o cargo `%{role}' ao utilizador `%{name}'? confirm: Confirmar + fail: Não foi possível retirar o cargo `%{role}' ao utilizador `%{name}'. Por favor verifique se o utilizador e o cargo são válidos. heading: Confirmar revogação de cargo title: Confirmar revogação de cargo diff --git a/config/locales/ro.yml b/config/locales/ro.yml index a065de2a6..3f8729e69 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1,4 +1,4 @@ -# Messages for Romanian (Română) +# Messages for Romanian (română) # Exported from translatewiki.net # Export driver: syck-pecl # Author: McDutchie @@ -75,7 +75,6 @@ ro: changeset: changeset: "Set de modificări: %{id}" changesetxml: Set de modificări XML - download: Descarcă %{changeset_xml_link} sau %{osmchange_xml_link} feed: title_comment: Set de schimbări %{id} - %{comment} osmchangexml: XML osmChange @@ -125,7 +124,6 @@ ro: next_changeset_tooltip: Următoarea editare de %{user} prev_changeset_tooltip: Editarea precedentă de %{user} node: - download: "%{download_xml_link}, %{view_history_link} sau %{edit_link}" download_xml: Descărcare XML edit: editare node: Nod @@ -135,7 +133,6 @@ ro: coordinates: "Coordonate:" part_of: "Parte din:" node_history: - download: "%{download_xml_link} sau %{view_details_link}" download_xml: Descărcare XML node_history: Istoric nod node_history_title: "Istoric nod: %{node_name}" @@ -151,7 +148,6 @@ ro: of: din showing_page: Se afișează pagina relation: - download: "%{download_xml_link} sau %{view_history_link}" download_xml: Descărcare XML relation: Relație relation_title: "Relație: %{relation_name}" @@ -160,7 +156,6 @@ ro: members: "Membrii:" part_of: "Parte din:" relation_history: - download: "%{download_xml_link} sau %{view_details_link}" download_xml: Descărcare XML relation_history: Istoric relații relation_history_title: "Istoric relații: %{relation_name}" @@ -176,7 +171,7 @@ ro: view_data: Vizualizare date pentru perspectiva curentă a hărții start_rjs: data_frame_title: Date - data_layer_name: Date + data_layer_name: Navigare prin datele hărții details: Detalii drag_a_box: Trageți cu mouse-ul și creați un dreptunghi pentru a selecta zona hărții edited_by_user_at_timestamp: Editat de [[user]] la [[timestamp]] @@ -220,7 +215,6 @@ ro: relation: relație way: cale way: - download: "%{download_xml_link}, %{view_history_link} sau %{edit_link}" download_xml: Descărcare XML edit: editare view_history: vizualizare istoric @@ -233,7 +227,6 @@ ro: nodes: "Noduri:" part_of: "Parte din:" way_history: - download: "%{download_xml_link} sau %{view_details_link}" download_xml: Descărcare XML view_details: vizualizare detalii way_history: Istoric cale @@ -426,37 +419,12 @@ ro: youth_centre: Centru de tineret boundary: administrative: Graniță administrativă - building: - apartments: Bloc de apartamente - bunker: Buncăr - chapel: Capelă - church: Biserică - city_hall: Primărie - commercial: Clădire comercială - entrance: Intrare în clădire - flats: Apartamente - garage: Garaj - hospital: Clădire de spital - hotel: Hotel - house: Casă - industrial: Clădire industrială - office: Clădire de birouri - public: Clădire publică - residential: Clădire rezidențială - school: Clădire școlară - shop: Magazin - stadium: Stadion - store: Magazin - terrace: Terasă - tower: Turn - train_station: Gară highway: bus_guideway: Linie de autobuz ghidată bus_stop: Stație de autobuz emergency_access_point: Punct de acces de urgență footway: Cale pietonală ford: Vad - gate: Poartă motorway: Autostradă motorway_junction: Intersecție pe autostradă path: Potecă @@ -500,10 +468,8 @@ ro: meadow: Luncă military: Zonă militară mine: Mină - mountain: Munte nature_reserve: Rezervație naturală park: Parc - plaza: Scuar quarry: Carieră railway: Cale ferată recreation_ground: Zonă de recreere @@ -534,7 +500,6 @@ ro: cave_entrance: Intrare în peșteră channel: Canal cliff: Stâncă - coastline: Litoral crater: Crater fjord: Fiord geyser: Gheizer @@ -603,7 +568,6 @@ ro: tram_stop: Stație de tramvai yard: Depou shop: - apparel: Magazin de îmbrăcăminte art: Magazin de artă bakery: Brutărie beauty: Salon de frumusețe @@ -616,7 +580,6 @@ ro: clothes: Magazin de haine confectionery: Cofetărie cosmetics: Magazin de cosmetice - drugstore: Farmacie dry_cleaning: Curățătorie chimică electronics: Magazin de electronice estate_agent: Agent imobiliar @@ -766,8 +729,6 @@ ro: edit: visibility: "Vizibilitate:" visibility_help: ce înseamnă asta? - no_such_user: - title: Nu există acest utilizator trace_form: description: "Descriere:" tags: "Etichete:" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 6e881c0ec..3fb0ad9c5 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1,22 +1,29 @@ -# Messages for Russian (Русский) +# Messages for Russian (русский) # Exported from translatewiki.net # Export driver: syck-pecl # Author: AOleg # Author: Aleksandr Dezhin # Author: Amire80 +# Author: Andrewsh # Author: Calibrator # Author: Chilin +# Author: DCamer # Author: Dr&mx # Author: Eleferen # Author: EugeneZelenko # Author: Express2000 # Author: Ezhick # Author: G0rn +# Author: Ignatus +# Author: Kaganer # Author: Komzpa # Author: Lockal # Author: MaxSem +# Author: Mechano +# Author: Nemo bis # Author: TarzanASG # Author: Yuri Nazarov +# Author: Zverik # Author: Александр Сигачёв # Author: Сrower ru: @@ -91,6 +98,8 @@ ru: application: require_cookies: cookies_needed: Похоже, что у вас выключены куки. Пожалуйста, включите куки в вашем браузере, прежде чем продолжить. + require_moderator: + not_a_moderator: Чтобы выполнить это действие, нужно быть модератором. setup_user_auth: blocked: Ваш доступ к API заблокирован. Пожалуйста, войдите через веб-интерфейсе, чтобы узнать подробности. need_to_see_terms: Ваш доступ к API временно приостановлен. Пожалуйста войдите через веб-интерфейс для просмотра условий участия. Вам не обязательно соглашаться, но вы должны просмотреть их. @@ -98,7 +107,6 @@ ru: changeset: changeset: "Пакет правок: %{id}" changesetxml: XML пакета правок - download: Загрузить %{changeset_xml_link} или %{osmchange_xml_link} feed: title: Пакет правок %{id} title_comment: Пакет правок %{id} — %{comment} @@ -111,16 +119,17 @@ ru: closed_at: "Закрыт:" created_at: "Создан:" has_nodes: + few: "Содержит %{count} точки:" one: "Содержит %{count} точку:" - other: "Содержит точки (%{count} шт.):" + other: "Содержит %{count} точек:" has_relations: few: "Содержит следующие %{count} отношения:" one: "Содержит следующие %{count} отношение:" other: "Содержит следующие %{count} отношений:" has_ways: - few: "Содержит следующие %{count} линии:" - one: "Содержит следующую %{count} линию:" - other: "Содержит следующие %{count} линий:" + few: "Содержит %{count} линии:" + one: "Содержит %{count} линию:" + other: "Содержит %{count} линий:" no_bounding_box: Для этого пакета правок границы не установлены. show_area_box: Показать выделенную область common_details: @@ -162,7 +171,6 @@ ru: next_changeset_tooltip: Следующая правка %{user} prev_changeset_tooltip: Предыдущая правка %{user} node: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" download_xml: Скачать XML edit: править node: Точка @@ -172,7 +180,6 @@ ru: coordinates: "Координаты:" part_of: "Участвует в:" node_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Скачать XML node_history: История точки node_history_title: "История точки: %{node_name}" @@ -187,8 +194,14 @@ ru: paging_nav: of: из showing_page: Показана страница + redacted: + message_html: Версия %{version} этого %{type} не может быть показана как он отредактированнаям. Пожалуйста, смотрите %{redaction_link} для получение дополнительной информации. + redaction: Редакция %{id} + type: + node: точка + relation: отношение + way: линия relation: - download: "%{download_xml_link} или %{view_history_link}" download_xml: Скачать XML relation: Отношение relation_title: "Отношение: %{relation_name}" @@ -197,7 +210,6 @@ ru: members: "Участники:" part_of: "Участвует в:" relation_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Скачать XML relation_history: История отношения relation_history_title: "История отношения: %{relation_name}" @@ -213,14 +225,14 @@ ru: view_data: Посмотреть данные для текущего вида start_rjs: data_frame_title: Данные - data_layer_name: Данные + data_layer_name: Просмотр данных карты details: Подробности drag_a_box: Для выбора области растяните рамку по карте edited_by_user_at_timestamp: Изменил [[user]] в [[timestamp]] hide_areas: Скрыть области history_for_feature: История [[feature]] load_data: Загрузить данные - loaded_an_area_with_num_features: Вы загрузили область, которая содержит [[num_features]] объектов. Некоторые браузеры могут не справиться с отображением такого количества данных. Обычно браузеры лучше всего обрабатывают до 100 объектов одновременно. Загрузка большего числа может замедлить ваш браузер или привести к зависанию. Если вы всё равно хотите отобразить эти данные, нажмите на кнопку ниже. + loaded_an_area_with_num_features: Вы загрузили область, которая содержит [[num_features]] объектов. Некоторые браузеры могут не справиться с отображением такого количества данных. Обычно браузеры могут обрабатывать до [[max_features]] объектов. Загрузка большего числа может замедлить ваш браузер или привести к его зависанию. Если вы всё равно хотите отобразить эти данные, нажмите на кнопку ниже. loading: Загрузка... manually_select: Выделить другую область object_list: @@ -259,7 +271,6 @@ ru: relation: отношения way: линии way: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" download_xml: Скачать XML edit: править view_history: посмотреть историю @@ -272,7 +283,6 @@ ru: nodes: "Точки:" part_of: "Участвует в:" way_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Скачать XML view_details: подробнее way_history: История правок линии @@ -303,6 +313,7 @@ ru: description_nearby: Наборы правок соседних участников description_user: Пакеты правок пользователя %{user} description_user_bbox: Пакеты правок пользователя %{user} в рамке, охватывающей координаты %{bbox} + empty_anon_html: Пока правок ещё нет heading: Пакеты правок heading_bbox: Пакеты правок heading_friend: Пакеты правок @@ -384,10 +395,6 @@ ru: body: К сожалению, записи или комментария с id %{id} не найдено. Проверьте правильность написания. Возможно, ссылка, по которой вы перешли, ошибочна. heading: Нет записи с id %{id} title: Нет такой дневниковой записи - no_such_user: - body: К сожалению, пользователь с именем %{user} не найден. Пожалуйста, проверьте правильность ввода. Возможно, ссылка, по которой вы перешли, ошибочна. - heading: Пользователя %{user} не существует - title: Нет такого пользователя view: leave_a_comment: Оставить комментарий login: Представиться @@ -473,7 +480,7 @@ ru: geonames: Результаты от <a href="http://www.geonames.org/">GeoNames</a> latlon: <a href="http://openstreetmap.org/">Внутренние результаты</a> osm_namefinder: Результаты от <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a> - osm_nominatim: Результаты, полученые из <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> + osm_nominatim: Результаты, полученные из <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> uk_postcode: Результаты от <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> us_postcode: Результаты от <a href="http://geocoder.us/">Geocoder.us</a> search_osm_namefinder: @@ -481,16 +488,28 @@ ru: suffix_place: ", %{distance} %{direction} %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Аэродром + apron: Перрон + gate: Выход на посадку + helipad: Вертолётная площадка + runway: Взлётно-посадочная полоса + taxiway: Рулёжная дорожка + terminal: Терминал amenity: + WLAN: WiFi доступ airport: Аэропорт arts_centre: Дом искусств + artwork: Произведения искусства atm: Банкомат auditorium: Аудитория bank: Банк bar: Бар + bbq: Барбекю bench: Скамья bicycle_parking: Велопарковка bicycle_rental: Прокат велосипедов + biergarten: Пивная на открытом воздухе brothel: Бордель bureau_de_change: Обмен валют bus_station: Автобусная станция @@ -499,6 +518,7 @@ ru: car_sharing: Каршаринг car_wash: Автомойка casino: Казино + charging_station: Станция зарядки электромобилей cinema: Кинотеатр clinic: Поликлиника club: Клуб @@ -517,10 +537,11 @@ ru: ferry_terminal: Паромная станция fire_hydrant: Пожарный гидрант fire_station: Пожарная охрана + food_court: Фаст-фуд fountain: Фонтан fuel: Заправка grave_yard: Место захоронения - gym: Тренажёрный зал / Фитнес-центр + gym: Фитнес-центр / Тренажёрный зал hall: Холл health_centre: Оздоровительный центр hospital: Госпиталь @@ -557,9 +578,12 @@ ru: shelter: Укрытие shop: Магазин shopping: Торговый центр + shower: Душ + social_centre: Общественный центр social_club: Сообщество studio: Студия supermarket: Супермаркет + swimming_pool: Бассейн taxi: Такси telephone: Телефон theatre: Театр @@ -570,41 +594,21 @@ ru: veterinary: Ветеринарная клиника village_hall: Усадьба waste_basket: Мусорка - wifi: Wi-Fi-доступ + wifi: WiFi-доступ youth_centre: Молодёжный центр boundary: administrative: Административная граница + census: Граница переписного участка + national_park: Национальный парк + protected_area: Охраняемый район + bridge: + aqueduct: Акведук + suspension: Висячий мост + swing: Разводной мост + viaduct: Виадук + "yes": Мост building: - apartments: Многоквартирный дом - block: Ряд зданий - bunker: Бункер - chapel: Часовня - church: Церковь - city_hall: Мэрия - commercial: Офисное здание - dormitory: Общежитие - entrance: Вход в здание - faculty: Факультетское здание - farm: Ферма - flats: Квартиры - garage: Гараж - hall: Холл - hospital: Здание больницы - hotel: Гостиница - house: Дом - industrial: Промышленное здание - office: Офисное здание - public: Общественное здание - residential: Жилой дом - retail: Здание на продажу - school: Здание школы - shop: Магазин - stadium: Стадион - store: Магазин - terrace: Ряд жилых домов - tower: Башня - train_station: трамвайная остановка - university: Университет + "yes": Здание highway: bridleway: Конный путь bus_guideway: Автобусная полоса-рельс @@ -612,12 +616,11 @@ ru: byway: Закоулок construction: Ремонт дороги cycleway: Велодорожка - distance_marker: Километровый столб emergency_access_point: Пункт первой помощи footway: Тротуар ford: Брод - gate: Ворота living_street: Жилая улица + milestone: Километровый столб minor: Второстепенная дорога motorway: Автомагистраль motorway_junction: Перекрёсток @@ -629,14 +632,17 @@ ru: primary_link: Главная дорога raceway: Гоночная трасса residential: Улица обычная + rest_area: Зона отдыха road: Дорога secondary: Второстепенная дорога secondary_link: Примыкающая дорога service: Подъездная дорога services: Придорожный сервис + speed_camera: Камера по контролю скорости steps: Ступеньки stile: Турникет tertiary: Дорога третьего класса + tertiary_link: Дорога третьего класса track: Неофициальная грунтовка trail: Тропа trunk: Трасса @@ -650,6 +656,7 @@ ru: building: Здание castle: Крепость church: Церковь + fort: Форт house: Дом icon: Икона manor: Поместье @@ -674,6 +681,7 @@ ru: farmland: Сельхозугодья farmyard: Сельхоздворы forest: Дикий лес + garages: Гаражи grass: Трава greenfield: Неосвоенная территория industrial: Промзона @@ -681,25 +689,28 @@ ru: meadow: Луг military: Военная зона mine: Шахта - mountain: Гора nature_reserve: Заповедник + orchard: Фруктовый сад park: Парк piste: Лыжня - plaza: Открытая площадка quarry: Карьер railway: Железная дорога recreation_ground: Зона отдыха - reservoir: водохранилище + reservoir: Водохранилище + reservoir_watershed: Водохранилище водораздел residential: Жилой район retail: Торговая территория + road: Зона дорожной сети village_green: Зелёная деревня vineyard: Виноградник wetland: Заболоченность wood: Обслуживаемый лес leisure: beach_resort: Пляж с насаждениями + bird_hide: Засидка (пункт скрытого наблюдения за птицами) common: Альменда fishing: Рыбалка + fitness_station: Фитнес-станция garden: Сад golf_course: Поле для гольфа ice_rink: Каток @@ -710,24 +721,30 @@ ru: pitch: Спортивный газон playground: Детская игровая площадка recreation_ground: Зона отдыха + sauna: Сауна slipway: Эллинг sports_centre: Спортивный центр stadium: Стадион swimming_pool: Бассейн track: Спортивная дорожка water_park: Аквапарк + military: + airfield: Военный аэродром + barracks: Казармы + bunker: Бункер natural: bay: Залив beach: Пляж cape: Мыс cave_entrance: Вход в пещеру channel: Канал - cliff: обрыв - coastline: Береговая линия + cliff: Обрыв crater: Кратер + dune: Дюна feature: Природный объект fell: Холм fjord: Фьорд + forest: Лес geyser: Гейзер glacier: Ледник heath: Пустошь @@ -747,6 +764,7 @@ ru: scrub: Кустарник shoal: Мелководье spring: Родник + stone: Камень strait: Пролив tree: Дерево valley: Долина @@ -755,6 +773,19 @@ ru: wetland: Заболоченная территория wetlands: Заболоченные земли wood: Естественный лес + office: + accountant: Бухгалтер + architect: Архитектор + company: Компания + employment_agency: Агентство занятости + estate_agent: Агент по продаже недвижимости + government: Государственное управление + insurance: Страховое бюро + lawyer: Юрист + ngo: Офис НКО + telecommunication: Офис телекоммуникационной компании + travel_agent: Туристическое агентство + "yes": Офисы place: airport: Аэропорт city: Город @@ -766,6 +797,7 @@ ru: houses: Дома island: Остров islet: Маленький остров + isolated_dwelling: Отдельный дом-ферма locality: Заброшенная деревня, урочище, необитаемая местность moor: Торфяник municipality: Муниципалитет @@ -789,6 +821,7 @@ ru: junction: Стрелка ж/д level_crossing: Железнодорожный переезд light_rail: Легкорельсовый ж/д транспорт + miniature: Мини железная дорога (Miniature Rail) monorail: Монорельс narrow_gauge: Узкоколейка platform: Железнодорожная платформа @@ -803,7 +836,7 @@ ru: yard: Депо shop: alcohol: Винный магазин - apparel: Магазин одежды + antiques: Антиквариат art: Художественный салон bakery: Булочная beauty: Салон красоты @@ -811,13 +844,12 @@ ru: bicycle: Веломагазин books: Книжный магазин butcher: Мясная лавка - car: Автосалон - car_dealer: Автомобильный дилер - car_parts: Автозапчасти + car: Продажа и ремонт автомобилей + car_parts: Автомагазин car_repair: Автомастерская carpet: Ковры charity: Секонд-хэнд - chemist: м-н бытовой химии + chemist: Магазин бытовой химии clothes: Магазин одежды computer: Компьютерный магазин confectionery: Кондитерская @@ -826,8 +858,7 @@ ru: cosmetics: Косметика department_store: Универсам discount: Магазин распродаж - doityourself: Сделай сам - drugstore: Аптека + doityourself: Магазин типа «Сделай сам» (DIY — Do-It-Yourself) dry_cleaning: Химчистка electronics: Магазин электротоваров estate_agent: Продажа недвижимости @@ -861,7 +892,7 @@ ru: organic: Продуктовый магазин outdoor: Открытый рынок pet: Зоомагазин - photo: фотомагазин + photo: Фотомагазин salon: Салон shoes: Обувной магазин shopping_centre: Торговый центр @@ -879,7 +910,7 @@ ru: bed_and_breakfast: Полупансион cabin: Каюта camp_site: Лагерь - caravan_site: Стоянка для домиков на колёсах + caravan_site: Стоянка для домов на колёсах chalet: Шале guest_house: Домик для гостей hostel: Хостел @@ -893,7 +924,10 @@ ru: valley: Долина viewpoint: Смотровая площадка zoo: Зоопарк + tunnel: + "yes": Туннель waterway: + artificial: Искусственный водный путь boatyard: Верфь canal: Канал connector: Слияние рек @@ -931,10 +965,11 @@ ru: history_tooltip: Просмотр правок в этой области history_zoom_alert: Необходимо увеличить масштаб карты, чтобы увидеть историю правок layouts: + community: Сообщество community_blogs: Блоги сообщества community_blogs_title: Блоги членов сообщества OpenStreetMap - copyright: Авторское право и лицензия - documentation: Документация + copyright: Лицензия и авторы + documentation: О проекте documentation_title: Документация по проекту donate: Поддержите OpenStreetMap %{link} в Фонд обновления оборудования. donate_link_text: пожертвованиями @@ -942,29 +977,28 @@ ru: edit_with: Править с помощью %{editor} export: Экспорт export_tooltip: Экспортировать данные карты - foundation: Фонд + foundation: Фонд OpenStreetMap foundation_title: Фонд OpenStreetMap gps_traces: GPS-треки gps_traces_tooltip: Работать с GPS треками help: Помощь - help_centre: Справочный центр + help_centre: Центр помощи (англ.) help_title: Сайт помощи проекта history: История home: домой home_tooltip: Показать мой дом - inbox: входящие (%{count}) inbox_tooltip: few: В вашем ящике %{count} новых сообщения one: В вашем ящике %{count} новое сообщение other: В вашем ящике есть %{count} новых сообщений. zero: В вашем ящике нет непрочитанных сообщений - intro_1: OpenStreetMap — это свободная и доступная для редактирования карта всего мира. Она сделана такими же людьми, как и вы. - intro_2: OpenStreetMap позволяет вам просматривать, редактировать и в духе сотрудничества использовать географические данные о любой точке Земли. - intro_3: Услуги хостинга для OpenStreetMap любезно предоставлены %{ucl}, %{ic} и %{bytemark}. Другие сторонники проекта перечислены в %{partners}. - intro_3_ic: Имперским колледжом Лондона - intro_3_partners: вики - intro_3_partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=ru - intro_3_ucl: UCL VR Centre + intro_1: OpenStreetMap — это свободная карта всего мира, созданная такими же людьми, как и вы. + intro_2_create_account: Создайте учётную запись + intro_2_download: скачивания + intro_2_html: Все данные являются свободными для %{download}, %{use} и предоставляются по %{license}. %{create_account} для улучшения карты. + intro_2_license: свободной лицензии + intro_2_use: использования + intro_2_use_url: http://wiki.openstreetmap.org/wiki/RU:Using_OpenStreetMap license: alt: CC BY-SA 2.0 title: Данные OpenStreetMap доступны по лицензии Creative Commons Attribution-Share Alike 2.0 Generic @@ -976,19 +1010,23 @@ ru: logout_tooltip: Выйти make_a_donation: text: Поддержать проект - title: Поддержка OpenStreetMap денежно-кредитным пожертвованием + title: Поддержите OpenStreetMap денежным пожертвованием osm_offline: База данных OpenStreetMap в данный момент не доступна, так как проводится необходимое техническое обслуживание. osm_read_only: База данных OpenStreetMap в данный момент доступна только для чтения, так как проводится необходимое техническое обслуживание. + partners_bytemark: Bytemark Hosting + partners_html: Хостинг поддерживается %{ucl}, %{ic} и %{bytemark}, а также другими %{partners}. + partners_ic: Имперским колледжем Лондона + partners_partners: партнёрами + partners_ucl: UCL VR Centre sign_up: регистрация sign_up_tooltip: Создать учётную запись для редактирования - sotm2011: Приезжайте на конференцию OpenStreetMap 2011 «The State of the Map», 9-11 сентября, Денвер! tag_line: Свободная вики-карта мира - user_diaries: Дневники - user_diaries_tooltip: Посмотреть дневники + user_diaries: Дневники участников + user_diaries_tooltip: Посмотреть дневники участников view: Карта view_tooltip: Посмотреть карту welcome_user: Добро пожаловать, %{user_link} - welcome_user_link_tooltip: Ваша страница пользователя + welcome_user_link_tooltip: Ваша персональная страница wiki: Вики wiki_title: Вики-сайт проекта wiki_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D0%BB%D0%B0%D0%B2%D0%BD%D0%B0%D1%8F_%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0?uselang=ru @@ -997,7 +1035,28 @@ ru: english_link: английского оригинала text: В случае конфликта между этой переведённой страницей и %{english_original_link}, английская страница должна иметь приоритет title: Об этом переводе - legal_babble: "<h2> Авторские права и лицензирование</h2>\n<p>OpenStreetMap — это <i>открытые данные</i> доступные по лицензии <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.ru\">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA). \n</p>\n\n<p>Вы можете свободно копировать, распространять, передавать и дорабатывать наши карты и данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество. Если вы изменяете или берёте наши карты за основу, то вы должны распространять результат только по такой же лицензии. Полный <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">юридический текст лицензии</a> (<a href=\"http://ru.wikisource.org/wiki/Creative_Commons_Attribution-ShareAlike_2.0_Generic\">перевод на русский язык</a>) разъясняет ваши права и обязанности.\n</p>\n\n<h3>Как сослаться на OpenStreetMap</h3>\n<p>Если вы используете изображения карт OpenStreetMap, мы требуем, чтобы вы указывали, по крайней мере, «© Участники OpenStreetMap, CC-BY-SA». Если вы используете только картографические данные, мы требуем наличия указания «Картографические данные © Участники OpenStreetMap, CC-BY-SA». \n</p>\n<p>Где это возможно текст «OpenStreetMap» должен быть гиперссылкой на <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>, «CC-BY-SA» - на <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.ru\">http://creativecommons.org/licenses/by-sa/2.0/deed.ru</a>. Если вы используете носители, где гиперссылки невозможны (например, печатная работа), мы предлагаем вам направлять ваших читателей непосредственно к www.openstreetmap.org (возможно, расширяя «OpenStreetMap» до полного адреса) и к www.creativecommons.org. \n</p>\n\n<h3>Узнайте больше</h3>\n<p>Прочитайте больше об использовании наших данных на странице <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=ru\">ответов на юридические вопросы</a>. \n</p>\n<p>Участники сообщества OSM должны всегда помнить о том, что запрещается добавлять данные из любых защищенных авторским правом источников (например, с Google Maps или печатных карт) без явного предварительного согласия правообладателей. \n</p>\n<p>Хотя OpenStreetMap - открытые данные, мы не в состоянии предоставлять бесплатный API к нашим картам для сторонних разработчиков. См. <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Правила использования API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Правила использования частей карты</a> и <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Правила использования службы Nominatim</a> . \n</p>\n\n<h3>Кто вносит вклад в наш проект</h3>\n<p>Наша лицензия CC-BY-SA требует от вас «указывать авторство Автора Оригинала разумно в средстве или способах, которые Вы используете». Индивидуальные картографы OSM не требуют указания авторства больше, чем строчкой «участники OpenStreetMap», но в OpenStreetMap есть данные, полученные от национальных картографических агентств или других существенных источников, поэтому возможно имеет смысл указать непосредственно на них, как на источник, или добавить ссылку на эту страницу. \n</p>\n\n<!-- Информация для редактирующих страницу. Ниже перечислены только те организации, которые требуют ссылки на своё авторство в качестве условий использования их данных в OpenStreetMap. Это не общий каталог импортируемых данных, список не должен использоваться за исключением случаев, когда указание авторства требуется условиями лицензии на импортируемые данные.\n\nЛюбые дополнения должны быть в первую очередь обсуждены с системными администраторами OSM. -->\n\n<ul id=\"contributors\">\n<li><strong>Австралия.</strong> Данные пригородов от Австралийского бюро статистики. </li>\n<li><strong>Австрия.</strong> Данные <a href=\"http://data.wien.gv.at/\">города Вена</a> на условиях <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n<li><strong>Канада.</strong> Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады).</li>\n<li><strong>Франция</strong>: Данные от Главного налогового управления.</i>\n<li><strong>Новая Зеландия.</strong> Данные из сведений о земельных ресурсах Новой Зеландии. Crown Copyright reserved. </li>\n\n\n<li><strong>Польша</strong>: Данные с <a\n href=\"http://ump.waw.pl/\">карт UMP-pcPL</a>. Copyright участники UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Подробнее об использовании данных UMP проектом OSM</a></li>\n <li><strong>ЮАР</strong>: Данные из\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, State copyright reserved.</li>\n<li><strong>Великобритания.</strong> Данные Ordnance Survey © Crown copyright и права на базы данных 2010.</li>\n</ul>\n\n<p>\nВключение данных в OpenStreetMap не означает, что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap, предоставляет гарантии или принимает на себя какую-любую ответственность. \n</p>" + legal_babble: + contributors_at_html: "<strong>Австрия.</strong> Данные <a href=\"http://data.wien.gv.at/\">города Вена</a> (на условиях <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), а также земель <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Форарльберга</a> и\n Тироля (на условиях <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT с дополнениями</a>)." + contributors_au_html: <strong>Австралия.</strong> Данные пригородов от Австралийского бюро статистики. + contributors_ca_html: <strong>Канада.</strong> Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады). + contributors_footer_2_html: Включение данных в OpenStreetMap не означает, что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap, предоставляет гарантии или принимает на себя какую-любую ответственность. + contributors_fr_html: "<strong>Франция</strong>: Данные от Главного налогового управления." + contributors_gb_html: <strong>Великобритания.</strong> Данные Ordnance Survey © Crown copyright и права на базы данных 2010. + contributors_intro_html: Наша лицензия CC BY-SA требует от вас «указывать авторство Автора Оригинала разумно в средстве или способах, которые Вы используете». Индивидуальные картографы OSM не требуют указания авторства больше, чем строчкой «участники OpenStreetMap», но в OpenStreetMap есть данные, полученные от национальных картографических агентств или других существенных источников, поэтому возможно имеет смысл указать непосредственно на них, как на источник, или добавить ссылку на эту страницу. + contributors_nl_html: "<strong>Нидерланды</strong>: Contains © AND data, 2007 (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: <strong>Новая Зеландия.</strong> Данные из сведений о земельных ресурсах Новой Зеландии. Crown Copyright reserved. + contributors_pl_html: "<strong>Польша</strong>: Данные с <a\n href=\"http://ump.waw.pl/\">карт UMP-pcPL</a>. Copyright участники UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Подробнее об использовании данных UMP проектом OSM</a></li>\n <li><strong>ЮАР</strong>: Данные из\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, State copyright reserved." + contributors_title_html: Кто вносит вклад в наш проект + credit_1_html: Если вы используете изображения карт OpenStreetMap, мы требуем, чтобы вы указывали, по крайней мере, «© Участники OpenStreetMap, CC BY-SA». Если вы используете только картографические данные, мы требуем наличия указания «Картографические данные © Участники OpenStreetMap, CC BY-SA». + credit_2_html: Где это возможно, текст «OpenStreetMap» должен быть гиперссылкой на <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>, «CC BY-SA» — на <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.ru">http://creativecommons.org/licenses/by-sa/2.0/deed.ru</a>. Если вы используете носители, где гиперссылки невозможны (например, печатная работа), мы предлагаем вам направлять ваших читателей непосредственно к www.openstreetmap.org (возможно, расширяя «OpenStreetMap» до полного адреса) и к www.creativecommons.org. + credit_title_html: Как сослаться на OpenStreetMap + intro_1_html: OpenStreetMap — это <i>открытые данные</i> доступные по лицензии <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.ru">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA). + intro_2_html: Вы можете свободно копировать, распространять, передавать и дорабатывать наши карты и данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество. Если вы изменяете или берёте наши карты за основу, то вы должны распространять результат только по такой же лицензии. Полный <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">юридический текст лицензии</a> (<a href="http://ru.wikisource.org/wiki/Creative_Commons_Attribution-ShareAlike_2.0_Generic">перевод на русский язык</a>) разъясняет ваши права и обязанности. + more_1_html: Прочитайте больше об использовании наших данных на странице <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=ru">ответов на юридические вопросы</a>. + more_2_html: Участники сообщества OSM должны всегда помнить о том, что запрещается добавлять данные из любых защищенных авторским правом источников (например, с Google Maps или печатных карт) без явного предварительного согласия правообладателей. + more_3_html: Хотя OpenStreetMap — открытые данные, мы не в состоянии предоставлять бесплатный API к нашим картам для сторонних разработчиков. См. <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Правила использования API</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Правила использования частей карты</a> и <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Правила использования службы Nominatim</a> . + more_title_html: Узнайте больше + title_html: Авторские права и лицензирование native: mapping_link: начать картографирование native_link: русской версии @@ -1037,10 +1096,6 @@ ru: body: "\nИзвините, но сообщения с таким ID нет." heading: "\nНет такого сообщения" title: "\nНет такого сообщения" - no_such_user: - body: Извините, пользователя с таким именем нет. - heading: Нет такого пользователя - title: Нет такого пользователя outbox: date: Дата inbox: входящие @@ -1147,7 +1202,7 @@ ru: hopefully_you: Кто-то (надеемся, что вы) хотел создать учетную запись на introductory_video: "Вы можете посмотреть ознакомительное видео об OpenStreetMap здесь:" more_videos: "Здесь ещё больше видео:" - opengeodata: "OpenGeoData.org — это блог основателя OpenStreetMap Стива Коста (Steve Coast) и там также можно найти подкасты:" + opengeodata: "OpenGeoData.org — это блог основателя OpenStreetMap Стива Коста (Steve Coast) и там же можно найти подкасты:" the_wiki: "Почитать об OpenStreetMap в вики:" the_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Beginners%27_guide?uselang=ru user_wiki_1: Рекомендуется создать свою пользовательскую вики-страницу, включив в неё @@ -1212,6 +1267,8 @@ ru: allow_write_gpx: передавать GPS-треки на сервер. allow_write_prefs: изменять их пользовательские настройки. authorize_url: "Авторизующий URL:" + confirm: Вы уверены? + delete: Удаление клиента edit: Изменить подробности key: "Потребительский ключ:" requests: "Запрос следующих разрешений со стороны пользователя:" @@ -1221,6 +1278,37 @@ ru: url: "URL маркера запроса:" update: flash: Клиентская информация успешно обновлена + redaction: + create: + flash: Редакция создана. + destroy: + error: Произошла ошибка при уничтожении этой редакции. + flash: Редакция уничтожена. + not_empty: Редакция не пуста. Пожалуйста, откатите все версии, принадлежащие к этой редакции перед удалением. + edit: + description: Описание + heading: Редактировать исправление + submit: Сохранить исправление + title: Редактировать исправление + index: + empty: Нет исправлений для показа. + heading: Список исправлений + title: Список исправлений + new: + description: Описание + heading: Введите информацию для нового исправления + submit: Создание исправления + title: Создание нового исправления + show: + confirm: Вы уверены? + description: "Описание:" + destroy: Удалить это исправление + edit: Редактировать это исправление + heading: Отображение исправления «%{title}» + title: Отображение исправления + user: "Создано:" + update: + flash: Изменения сохранены. site: edit: anon_edits_link_text: Выяснить, в чём дело. @@ -1235,10 +1323,9 @@ ru: index: js_1: Вы используете браузер, в котором не поддерживается или отключен JavaScript. js_2: OpenStreetMap использует JavaScript для отображения карт. - js_3: Вы можете попробовать <a href="http://tah.openstreetmap.org/Browse/">статичную карту от Tiles@Home</a>, если вы не можете включить JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Лицензировано на условиях %{license_name} проектом %{project_name} и теми, кто вносил в него вклад. + notice: Лицензировано на условиях %{license_name} проектом %{project_name} и его участниками, вносившими свой вклад. project_name: OpenStreetMap permalink: Постоянная ссылка remote_failed: Редактирование не удалось. Убедитесь, что JOSM или Merkaartor загружены и включена настройка дистанционного управления @@ -1312,10 +1399,27 @@ ru: unclassified: Дорога местного значения unsurfaced: Грунтовая дорога wood: Роща + markdown_help: + alt: Альтернативный текст + first: Первый элемент + heading: Заголовок + headings: Заголовки + image: Изображение + link: Ссылка + ordered: Упорядоченный список + second: Второй элемент + subheading: Подзаголовок + text: Текст + title_html: Разобрано с помощью <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Неупорядоченный список + url: URL + richtext_area: + edit: Изменить + preview: Предпросмотр search: search: Поиск - search_help: "примеры: «Рыбинск», «Ростов-на-Дону», «1, Красная площадь, Москва», «кафе рядом с Арбат», «стоянки в Петергоф», «банкоматы около Крещатик», «Regent Street, Cambridge» или «CB2 5AQ» (<a href=http://wiki.openstreetmap.org/wiki/RU:Search?uselang=ru>больше примеров</a>.<br />Улучшенный русскоязычный поиск: <a href=http://openstreetmap.ru/#layer=S>OSM Россия</a> и <a href=http://openstreetmap.by/?lang=ru>OSM Беларусь</a>.<br />Проложить маршрут на карте: <a href=http://openstreetmap.by/?lang=ru>OSM Беларусь</a>, <a href=http://www.yournavigation.org/>YourNavigation</a>, <a href=http://maps.cloudmade.com/>CloudMade Maps</a> и <a href=http://open.mapquest.com/>MapQuest Open</a>." - submit_text: "?" + search_help: "Примеры: «Рыбинск», «Ростов-на-Дону», «1, Красная площадь, Москва», «кафе рядом с Арбат», «стоянки Петергоф», «банкоматы Крещатик», «Regent Street, Cambridge» или «CB2 5AQ» (<a href=http://wiki.openstreetmap.org/wiki/RU:Search?uselang=ru>больше примеров</a>)." + submit_text: Перейти where_am_i: Где я? where_am_i_title: Опишите ваше местоположение, воспользовавшись инструментом поиска sidebar: @@ -1355,10 +1459,6 @@ ru: your_traces: Ваши GPS-треки make_public: made_public: Трек сделан общедоступным - no_such_user: - body: Извините, пользователя с именем %{user} не существует. Пожалуйста, проверьте правильность написания. Возможно ссылка, по которой вы пришли, неверна. - heading: Пользователя %{user} не существует - title: Нет такого пользователя offline: heading: GPX хранилище отключено message: Хранилище GPX файлов и система их загрузки в настоящий момент недоступна. @@ -1399,8 +1499,6 @@ ru: trace_optionals: tags: "Теги:" trace_paging_nav: - next: Следующая → - previous: ← Предыдущая showing_page: Показывается страница %{page} view: delete_track: Удалить этот трек @@ -1577,7 +1675,7 @@ ru: fill_form: Заполните форму, и мы вышлем вам на электронную почту письмо с инструкцией по активации. flash create success message: Спасибо за регистрацию. Мы выслали письмо с подтверждением на адрес %{email} и как только вы подтвердите вашу учётную запись, вы можете начать работать с картами.<br /><br />Если вы используете антиспам, посылающий запросы на подтверждение, внесите адрес webmaster@openstreetmap.org в ваш белый список, так как мы не можем отвечать на такие запросы. heading: Создание учётной записи - license_agreement: Когда вы подтверждаете вашу учётную запись, вам необходимо согласиться с <a href="http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru">условиями сотрудничества</a>. + license_agreement: Для подтверждения своей учётной записи вам необходимо согласиться с <a href="http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru">условиями сотрудничества</a>. no_auto_account_create: К сожалению, сейчас мы не можем автоматически создать для вас учётную запись. not displayed publicly: Не отображается публично (см. <a href="http://wiki.openstreetmap.org/index.php?title=Privacy_Policy&uselang=ru" title="вики политика конфиденциальности включая часть про адрес эл. почты">политику конфиденциальности</a>) openid: "%{logo} OpenID:" @@ -1715,7 +1813,6 @@ ru: filter: block_expired: Блокирование уже закончилось и не может быть отредактировано. block_period: Время блокирования должно быть выбрано из значений, рвзворачивающегося списка. - not_a_moderator: Вам нужно быть модератором, чтобы выполнить это действие. helper: time_future: Заканчивается в %{time}. time_past: Закончилось %{time} назад. @@ -1745,7 +1842,9 @@ ru: creator_name: Автор display_name: Заблокированный пользователь edit: Править + next: Следующая → not_revoked: (не разблокирован) + previous: ← Предыдущая reason: Причина блокирования revoke: Разблокировать! revoker_name: Разблокировал diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 91448ef69..1cf6cabc9 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1,28 +1,33 @@ -# Messages for Slovak (Slovenčina) +# Messages for Slovak (slovenčina) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Helix84 # Author: Jose1711 +# Author: Kusavica # Author: Lesny skriatok +# Author: Nemo bis # Author: Rudko +# Author: Teslaton # Author: Vladolc sk: activerecord: attributes: diary_comment: - body: Telo + body: Text diary_entry: language: Jazyk latitude: Zem. šírka longitude: Zem. dĺžka title: Nadpis - user: Užívateľ + user: Používateľ friend: friend: Priateľ - user: Užívateľ + user: Používateľ message: - body: Telo + body: Text recipient: Príjemca sender: Odosielateľ + title: Predmet trace: description: Popis latitude: Zem. šírka @@ -30,7 +35,7 @@ sk: name: Meno public: Verejné size: VeľkosÅ¥ - user: Užívateľ + user: Používateľ visible: Viditeľný user: active: Aktívny @@ -40,15 +45,18 @@ sk: languages: Jazyky pass_crypt: Heslo models: - changeset: Súbor zmien + acl: Zoznam prístupových práv + changeset: Sada zmien + changeset_tag: Značka sady zmien country: Krajina - diary_comment: Poznámka v denníku + diary_comment: Komentár k denníku diary_entry: Položka denníka friend: Priateľ language: Jazyk message: Správa node: Bod - node_tag: Tag bodu + node_tag: Značka bodu + notifier: Oznamovateľ old_node: Starý bod old_node_tag: Stará značka bodu old_relation: Stará relácia @@ -64,85 +72,99 @@ sk: trace: Stopa tracepoint: Bod stopy tracetag: Značka stopy - user: Užívateľ + user: Používateľ user_preference: Osobné nastavenia + user_token: Používateľský token way: Cesta way_node: Bod cesty + way_tag: Značka cesty application: require_cookies: - cookies_needed: Vyzerá to tak, že máte zakázané cookies – prosím povoľte cookies vo vaÅ¡om prehliadači a až potom pokračujte. + cookies_needed: Zdá sa, že máte zakázané cookies – povoľte prosím cookies vo vaÅ¡om prehliadači a následne pokračujte. + require_moderator: + not_a_moderator: Pre vykonanie tejto akcie musíte byÅ¥ moderátor. setup_user_auth: blocked: Váš prístup do API bol zablokovaný. Prosím prihláste sa na webové rozhranie pre zistenie viac informácií. + need_to_see_terms: Váš prístup k API je dočasne pozastavený. Prosím prihláste do webového rozhrania a prečítajte si Podmienky prispievania. Nie je nutné ich odsúhlasiÅ¥, musíte si ich ale zobraziÅ¥. browse: changeset: - changeset: "Súbor zmien: %{id}" - changesetxml: Súbor zmien XML - download: StiahnuÅ¥ %{changeset_xml_link} alebo %{osmchange_xml_link} + changeset: "Sada zmien: %{id}" + changesetxml: XML sady zmien feed: - title: Súbor zmien %{id} - title_comment: Súbor zmien %{id} - %{comment} - osmchangexml: osmZmena XML - title: Súbor zmien + title: Sada zmien %{id} + title_comment: Sada zmien %{id} - %{comment} + osmchangexml: osmChange XML + title: Sada zmien changeset_details: - belongs_to: "Patrí k:" + belongs_to: "Používateľ:" bounding_box: "Rozsah:" box: rám - closed_at: "Zatvorené o:" + closed_at: "Uzavreté o:" created_at: "Vytvorené o:" - has_nodes: - one: "Obsahuje nasledujúci %{count} body:" - other: "Obsahuje nasledujúce %{count} body:" has_relations: + few: "Obsahuje nasledujúce %{count} relácie:" one: "Obsahuje nasledujúcu %{count} reláciu:" - other: "Obsahuje nasledujúce %{count} relácie:" + other: "Obsahuje nasledujúcich %{count} relácií:" has_ways: + few: "Obsahuje nasledujúce %{count} cesty:" one: "Obsahuje nasledujúcu %{count} cestu:" - other: "Obsahuje nasledujúce %{count} cesty:" + other: "Obsahuje nasledujúcich %{count} ciest:" no_bounding_box: Pre tento počet zmien nie je uložený žiadny rozsah. - show_area_box: ZobraziÅ¥ Rám Oblasti + show_area_box: ZobraziÅ¥ rám oblasti common_details: changeset_comment: "Komentár:" + deleted_at: "Odstránené:" + deleted_by: "Odstránil:" edited_at: "Upravené o:" - edited_by: "Upravené od:" - in_changeset: "V súbore zmien:" + edited_by: "Upravil:" + in_changeset: "V sade zmien:" version: "Verzia:" containing_relation: entry: Relácia %{relation_name} entry_role: Relácia %{relation_name} (ako %{relation_role}) map: deleted: Zmazané + edit: + area: UpraviÅ¥ oblasÅ¥ + node: UpraviÅ¥ bod + relation: UpraviÅ¥ reláciu + way: UpraviÅ¥ cestu larger: area: ZobraziÅ¥ oblasÅ¥ na väčšej mape - node: ZobraziÅ¥ uzol na väčšej mape + node: ZobraziÅ¥ bod na väčšej mape relation: ZobraziÅ¥ reláciu na väčšej mape way: ZobraziÅ¥ cestu na väčšej mape loading: Nahrávanie... navigation: all: - next_changeset_tooltip: Nasledujúci súbor zmien - prev_changeset_tooltip: Predchádzajúci súbor zmien + next_changeset_tooltip: Nasledujúca sada zmien + next_node_tooltip: Nasledujúci bod + next_relation_tooltip: Následujúca relácia + next_way_tooltip: Nasledujúca cesta + prev_changeset_tooltip: Predchádzajúca sada zmien + prev_node_tooltip: Predchádzajúci bod + prev_relation_tooltip: Predchádzajúca relácia + prev_way_tooltip: Predchádzajúca cesta user: - name_changeset_tooltip: ZobraziÅ¥ úpravy od %{user} - next_changeset_tooltip: ĎalÅ¡ia úprava od %{user} - prev_changeset_tooltip: PredoÅ¡lá úprava od %{user} + name_changeset_tooltip: ZobraziÅ¥ úpravy používateľa %{user} + next_changeset_tooltip: ĎalÅ¡ia úprava používateľa %{user} + prev_changeset_tooltip: PredoÅ¡lá úprava používateľa %{user} node: - download: "%{download_xml_link}, %{view_history_link} alebo %{edit_link}" download_xml: StiahnuÅ¥ XML - edit: upraviÅ¥ + edit: UpraviÅ¥ bod node: Bod node_title: "Bod: %{node_name}" - view_history: zobraziÅ¥ históriu + view_history: ZobraziÅ¥ históriu node_details: coordinates: "Súradnice:" part_of: "ČasÅ¥ z:" node_history: - download: "%{download_xml_link} alebo %{view_details_link}" download_xml: StiahnuÅ¥ XML node_history: História bodu node_history_title: "História bodu: %{node_name}" - view_details: zobraziÅ¥ detaily + view_details: ZobraziÅ¥ detaily not_found: - sorry: Prepáčte, %{type} s id %{id} nebolo možné nájsÅ¥. + sorry: Ľutujeme, %{type} s id %{id} nebolo možné nájsÅ¥. type: changeset: počet zmien node: bod @@ -151,21 +173,24 @@ sk: paging_nav: of: z showing_page: Strana + redacted: + type: + node: bod + relation: vzÅ¥ah + way: cesta relation: - download: "%{download_xml_link} alebo %{view_history_link}" download_xml: StiahnuÅ¥ XML relation: Relácia relation_title: "Relácia: %{relation_name}" - view_history: zobraziÅ¥ históriu + view_history: ZobraziÅ¥ históriu relation_details: members: "Členovia:" part_of: "ČasÅ¥ z:" relation_history: - download: "%{download_xml_link} alebo %{view_details_link}" download_xml: StiahnuÅ¥ XML - relation_history: História Relácie - relation_history_title: "História Relácií: %{relation_name}" - view_details: zobraziÅ¥ detaily + relation_history: História relácie + relation_history_title: "História relácie: %{relation_name}" + view_details: ZobraziÅ¥ detaily relation_member: entry_role: "%{type} %{name} ako %{role}" type: @@ -173,21 +198,22 @@ sk: relation: Relácia way: Cesta start: - manually_select: Ručne vybraÅ¥ rôznu oblasÅ¥ + manually_select: Manuálne vybraÅ¥ inú oblasÅ¥ view_data: ZobraziÅ¥ údaje v aktuálnom zobrazení mapy start_rjs: data_frame_title: Dáta - data_layer_name: Dáta + data_layer_name: PrehľadávaÅ¥ mapové dáta details: Detaily - drag_a_box: NatiahnuÅ¥ na mape rám pre výber oblasti - edited_by_user_at_timestamp: Upravoval [[user]] o [[timestamp]] + drag_a_box: Označte myÅ¡ou na mape zvolenú oblasÅ¥ + edited_by_user_at_timestamp: Upravoval [[user]] o [[timestamp]] + hide_areas: SkryÅ¥ oblasti history_for_feature: História pre [[feature]] - load_data: NahraÅ¥ Dáta - loaded_an_area_with_num_features: "Nahrali ste oblasÅ¥, ktorá obsahuje [[num_features]] zložiek. Vo vÅ¡eobecnosti majú niektoré prehliadače problém so zobrazením takéhoto množstva dát. Prehliadače spravidla najlepÅ¡ie zobrazujú menej než 100 zložiek naraz: každý iný postup spomaluje/blokuje Váš prehliadač. Pokiaľ ste si istý, že chcete zobraziÅ¥ nasledujúce dáta, môžte tak urobiÅ¥ tým, že kliknete na tlačidlo poniže." + load_data: NačítaÅ¥ údaje + loaded_an_area_with_num_features: Máte načítanú oblasÅ¥, ktorá obsahuje [[num_features]] zložiek. Niektoré prehliadače môžu maÅ¥ problémy so zobrazením takého množstva dát, viac než približne [[max_features]] položiek ich môže spomaliÅ¥ až zablokovaÅ¥. Pokiaľ ste si istý, že chcete dáta zobraziÅ¥, kliknite na tlačítko nižšie. loading: Nahrávanie... - manually_select: ZvoliÅ¥ odliÅ¡nú oblasÅ¥ manuálne + manually_select: Manuálne vybraÅ¥ inú oblasÅ¥ object_list: - api: PriniesÅ¥ túto oblasÅ¥ z API + api: NačítaÅ¥ túto oblasÅ¥ pomocou API back: ZobraziÅ¥ zoznam objektov details: Detaily heading: Zoznam objektov @@ -203,24 +229,28 @@ sk: node: Bod way: Cesta private_user: anonymný používateľ - show_history: ZobraziÅ¥ Históriu - unable_to_load_size: "Nebolo možné nahraÅ¥: OblasÅ¥ veľkosti [[bbox_size]] je priveľká (musí byÅ¥ menÅ¡ia ako %{max_bbox_size})" + show_areas: ZobraziÅ¥ oblasti + show_history: ZobraziÅ¥ históriu + unable_to_load_size: "Nebolo možné načítaÅ¥: OblasÅ¥ veľkosti [[bbox_size]] je priveľká (maximum je %{max_bbox_size})" wait: Čakajte... - zoom_or_select: PriblížiÅ¥ alebo zvoliÅ¥ oblasÅ¥ na mape na zobrazenie + zoom_or_select: Priblížte mapu alebo zvoľte nejakú oblasÅ¥ na zobrazenie tag_details: tags: "Tagy:" + wiki_link: + key: Stránka s popisom značky %{key} na wiki + tag: Stránka s popisom značky %{key}=%{value} na wiki + wikipedia_link: Článok %{page} na Wikipédii timeout: - sorry: Prepáčte, ale načítanie dát %{type} číslo %{id} trvalo príliÅ¡ dlho + sorry: Ľutujeme, ale načítanie dát %{type} číslo %{id} trvalo príliÅ¡ dlho type: - changeset: zmenový súbor + changeset: sada zmien node: bod relation: relácia way: cesta way: - download: "%{download_xml_link}, %{view_history_link} alebo %{edit_link}" download_xml: StiahnuÅ¥ XML - edit: upraviÅ¥ - view_history: zobraziÅ¥ históriu + edit: UpraviÅ¥ cestu + view_history: ZobraziÅ¥ históriu way: Cesta way_title: "Cesta: %{way_name}" way_details: @@ -228,12 +258,11 @@ sk: one: tiež časÅ¥ou cesty %{related_ways} other: tiež časÅ¥ou ciest %{related_ways} nodes: "Body:" - part_of: "ČasÅ¥ z:" + part_of: "SúčasÅ¥:" way_history: - download: "%{download_xml_link} alebo %{view_details_link}" download_xml: StiahnuÅ¥ XML - view_details: zobraziÅ¥ detaily - way_history: História Cesty + view_details: ZobraziÅ¥ detaily + way_history: História cesty way_history_title: "História Cesty: %{way_name}" changeset: changeset: @@ -241,9 +270,9 @@ sk: big_area: (veľký) no_comment: (žiadny) no_edits: (bez úprav) - show_area_box: ZobraziÅ¥ Rám Oblasti + show_area_box: ZobraziÅ¥ rám oblasti still_editing: (stále sa upravuje) - view_changeset_details: ZobraziÅ¥ detaily zmenového súboru + view_changeset_details: ZobraziÅ¥ detaily sady zmien changeset_paging_nav: next: ĎalÅ¡ia » previous: « PredoÅ¡lá @@ -253,25 +282,43 @@ sk: comment: Komentár id: ID saved_at: Uložené - user: Užívateľ + user: Používateľ list: description: Posledné zmeny description_bbox: Zmenové súbory vo vnútri %{bbox} - description_user: Zmenové súbory užívateľa %{user} - description_user_bbox: Zmenové súbory užívateľa %{user} v %{bbox} - heading: Zmenové súbory - heading_bbox: Zmenové súbory - heading_user: Zmenové súbory - heading_user_bbox: Zmenové súbory - title: Zmenové súbory - title_bbox: Zmenové súbory vo vnútri %{bbox} - title_user: Zmenové súbory užívateľa %{user} - title_user_bbox: Zmenové súbory užívateľa %{user} v %{bbox} + description_friend: Sady zmien vaÅ¡ich priateľov + description_nearby: Sady zmien používateľov v okolí + description_user: Zmenové súbory používateľa %{user} + description_user_bbox: Zmenové súbory používateľa %{user} v %{bbox} + empty_anon_html: Zatiaľ bez úprav + empty_user_html: Zdá sa, že ste zatiaľ nevykonali žiadne úpravy. Ak chete začaÅ¥, pozrite si <a href='http://wiki.openstreetmap.org/wiki/Sk:Beginners%27_guide'>Príručku pre začiatočníkov</a>. + heading: Sady zmien + heading_bbox: Sady zmien + heading_friend: Sady zmien + heading_nearby: Sady zmien + heading_user: Sady zmien + heading_user_bbox: Sady zmien + title: Sady zmien + title_bbox: Sady zmien v rámci %{bbox} + title_friend: Sady zmien vaÅ¡ich priateľov + title_nearby: Sady zmien používateľov v okolí + title_user: Sady zmien používateľa %{user} + title_user_bbox: Sady zmien používateľa %{user} v rámci %{bbox} + timeout: + sorry: Ľutujeme, ale vami požadovaný zoznam sád zmien sa načítaval príliÅ¡ dlho. diary_entry: + comments: + ago: pred %{ago} + comment: Komentár + has_commented_on: "%{display_name} okomentoval nasledovné záznamy v denníku" + newer_comments: NovÅ¡ie komentáre + older_comments: StarÅ¡ie komentáre + post: Príspevok + when: Kedy diary_comment: - comment_from: Poznámka od %{link_user} na %{comment_created_at} + comment_from: Komentár od %{link_user} z %{comment_created_at} confirm: PotvrdiÅ¥ - hide_link: SkryÅ¥ túto poznámku + hide_link: SkryÅ¥ tento komentár diary_entry: comment_count: few: "%{count} komentáre" @@ -281,96 +328,108 @@ sk: confirm: PotvrdiÅ¥ edit_link: UpraviÅ¥ tento záznam hide_link: SkryÅ¥ tento záznam - posted_by: Odoslané od %{link_user} pre %{created} v %{language_link} + posted_by: Napísal %{link_user} %{created} v jazyku %{language_link} reply_link: OdpovedaÅ¥ na tento záznam edit: - body: "Telo:" + body: "Text:" language: "Jazyk:" latitude: "Zemepisná šírka:" location: "Poloha:" longitude: "Zemepisná dĺžka:" - marker_text: Umiestnenie položky zápisníka + marker_text: Poloha k položke denníka save_button: UložiÅ¥ subject: "Predmet:" title: UpraviÅ¥ záznam denníka use_map_link: použiÅ¥ mapu feed: all: - description: Nedávna položka zápisníka od užívateľov OpenStreetMap - title: OpenStreetMap položka zápisníka + description: Nedávne položky denníkov používateľov OpenStreetMap + title: Denníkové záznamy OpenStreetMap language: - description: Nedávna položka zápisníka od užívateľov OpenStreetMap v %{language_name} - title: OpenStreetMap položka zápisníka v %{language_name} + description: Nedávne záznamy v denníkoch používateľov OpenStreetMap v jazyku %{language_name} + title: Záznamy OpenStreetMap denníka v jazyku %{language_name} user: - description: Nedávna OpenStreetMap položka zápisníka od %{user} - title: OpenStreetMap položka zápisníka pre %{user} + description: Nedávne záznamy OpenStreetMap denníka používateľa %{user} + title: Záznamy OpenStreetMap denníka používateľa %{user} list: - in_language_title: Záznamy denníka v %{language} + in_language_title: Záznamy denníka v jazyku %{language} new: Nový záznam denníka - new_title: NapísaÅ¥ nový záznam do svojho užívateľského denníka + new_title: NapísaÅ¥ nový záznam do používateľského denníka newer_entries: NovÅ¡ie Príspevky no_entries: Žiadny záznam denníka older_entries: StarÅ¡ie záznamy recent_entries: "Nedávne záznamy denníka:" - title: Užívateľské denníky - user_title: "%{user}-ov denník" + title: Denníky používateľov + title_friends: Denníky priateľov + title_nearby: Denníky používateľov v okolí + user_title: Denník používateľa %{user} location: edit: EditovaÅ¥ location: "Poloha:" - view: Pohľad + view: ZobraziÅ¥ new: title: Nový záznam denníka no_such_entry: - body: Prepáčte, nie je tam žiadna položka denníka, alebo poznámka s id %{id}. Prosím skontrolujte váš text, alebo možno že odkaz na ktorý ste klikli je zlý. - heading: "Žiadny záznam s id: %{id}" - title: Nieto takýto záznam denníka - no_such_user: - body: Prepáčte, neexistuje užívateľ s menom %{user}. Prosím skontrolujte váš text, alebo možno že odkaz na ktorý ste klikli je zlý. - heading: Užívateľ %{user} neexistuje - title: Užívateľ neexistuje + body: Ľutujeme, položka denníka, alebo komentár s ID %{id} neexistuje. Skontrolujte preklepy, prípadne ste možno klikli na nesprávny odkaz. + heading: Záznam s ID %{id} neexistuje + title: Takýto záznam denníka neexistuje view: leave_a_comment: ZanechaÅ¥ komentár login: PrihlásiÅ¥ sa - login_to_leave_a_comment: "%{login_link} pre odchádzajúcu poznámku" + login_to_leave_a_comment: "%{login_link} pre zanechanie komentára" save_button: UložiÅ¥ - title: "%{user}-ov denník | %{title}" - user_title: "%{user} -ov denník" + title: Denník používateľa %{user} | %{title} + user_title: Denník používateľa %{user} + editor: + default: Predvolený (v súčasnosti %{name}) + potlatch: + description: Potlatch 1 (editor v prehliadači) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (editor v prehliadači) + name: Potlatch 2 + remote: + description: Diaľkové ovládanie (JOSM alebo Merkaartor) + name: Diaľkové ovládanie export: start: - add_marker: PridaÅ¥ marker na mapu + add_marker: PridaÅ¥ do mapy značku area_to_export: OblasÅ¥ pre export + embeddable_html: Vložiteľné HTML export_button: Export export_details: OpenStreetMap údaje sú licencované pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>. format: Formát format_to_export: Formát pre export - image_size: VeľkosÅ¥ Obrazu + image_size: Rozmery obrázku latitude: "Zem.šírka:" licence: Licencia - longitude: "Dĺžka:" - manually_select: Ručne vyberte rôzne oblasti + longitude: "Zem. dĺžka:" + manually_select: Manuálne vybraÅ¥ inú oblasÅ¥ + map_image: Obrázok (obsahuje Å¡tandardné vrstvy) max: max options: Možnosti - osm_xml_data: OpenStreetMap XML Dáta + osm_xml_data: OpenStreetMap XML dáta output: Výstup + paste_html: Pre vloženie do stránky použite toto HTML scale: Mierka too_large: - body: Táto oblasÅ¥ je príliÅ¡ veľká pre export OpenStreetMap dát. Prosím priblížte, alebo vyberte menÅ¡iu oblasÅ¥. + body: Táto oblasÅ¥ je príliÅ¡ veľká pre export OpenStreetMap dát. Priblížte prosím mapu, alebo vyberte menÅ¡iu oblasÅ¥. heading: PríliÅ¡ veľká oblasÅ¥ zoom: Zväčšenie start_rjs: - add_marker: PridaÅ¥ marker na mapu - change_marker: Zmena polohy markera - click_add_marker: Kliknite na mapu, pre pridanie markera + add_marker: PridaÅ¥ do mapy značku + change_marker: ZmeniÅ¥ polohu značky + click_add_marker: Kliknutím do mapy vložíte značku drag_a_box: Označte myÅ¡ou na mape zvolenú oblasÅ¥ export: Export - manually_select: Ručne vyberte rôzne oblasti + manually_select: Manuálne vybraÅ¥ inú oblasÅ¥ view_larger_map: ZobraziÅ¥ väčšiu mapu geocoder: description: title: - geonames: Umiestnenie na <a href="http://www.geonames.org/">GeoNames</a> - osm_namefinder: "%{types} z <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>" - osm_nominatim: Umiestnenie z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> + geonames: Poloha podľa <a href="http://www.geonames.org/">GeoNames</a> + osm_namefinder: "%{types} podľa <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>" + osm_nominatim: Poloha podľa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> types: cities: Veľkomestá places: Miesta @@ -397,25 +456,38 @@ sk: title: ca_postcode: Výsledky z <a href="http://geocoder.ca/">Geocoder.CA</a> geonames: Výsledky z <a href="http://www.geonames.org/">GeoNames</a> - latlon: Výsledok z <a href="http://openstreetmap.org/">Internal</a> + latlon: Výsledky z <a href="http://openstreetmap.org/">internej databázy</a> osm_namefinder: Výsledky z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a> - osm_nominatim: Výsledok z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> - uk_postcode: Výsledok z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> + osm_nominatim: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> + uk_postcode: Výsledky z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> us_postcode: Výsledky z <a href="http://geocoder.us/">Geocoder.us</a> search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} of %{parentname})" - suffix_place: ", %{distance} %{direction} of %{placename}" + suffix_parent: "%{suffix} (%{parentdistance} na %{parentdirection} od %{parentname})" + suffix_place: ", %{distance} na %{direction} od %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodróm + apron: Letisková parkovacia plocha + gate: Brána (gate) + helipad: Heliport + runway: Vzletová a pristávacia dráha + taxiway: Pojazdová dráha + terminal: Terminál amenity: + WLAN: Wi-Fi prístup airport: Letisko arts_centre: Kultúrne stredisko + artwork: Umelecké dielo atm: Bankomat + auditorium: Auditórium bank: Banka bar: Bar + bbq: Miesto na grilovanie bench: Lavička bicycle_parking: Parkovisko bicyklov bicycle_rental: Požičovňa bicyklov + biergarten: Záhradná krčma brothel: Nevestinec bureau_de_change: Zmenáreň bus_station: Autobusová stanica @@ -424,6 +496,7 @@ sk: car_sharing: Autopožičovňa car_wash: Autoumývareň casino: Kasíno + charging_station: Nabíjacia stanica cinema: Kino clinic: Poliklinika club: Klub @@ -442,10 +515,12 @@ sk: ferry_terminal: Terminál trajektu fire_hydrant: Požiarny hydrant fire_station: Požiarna stanica + food_court: Food court fountain: Fontána fuel: Benzínová pumpa grave_yard: Cintorín gym: Fitnes centrum / telocvičňa + hall: Sála health_centre: Zdravotné stredisko hospital: Nemocnica hotel: Hotel @@ -463,7 +538,7 @@ sk: park: Park parking: Parkovisko pharmacy: lekáreň - place_of_worship: Kostol + place_of_worship: Miesto pre bohoslužby police: Polícia post_box: PoÅ¡tová schránka post_office: PoÅ¡ta @@ -471,16 +546,22 @@ sk: prison: Väzenie pub: Krčma public_building: Verejná budova - recycling: Recyklačké miesto + public_market: Verejné trhovisko + reception_area: Recepcia + recycling: Recyklačné miesto restaurant: ReÅ¡taurácia retirement_home: Domov dôchodcov sauna: Sauna school: Å kola shelter: Altánok shop: Obchod + shopping: Nákupné centrum + shower: Sprchy + social_centre: Komunitné centrum social_club: Spoločenský klub studio: Ateliér supermarket: Supermarket + swimming_pool: Plaváreň, kúpalisko taxi: Taxi telephone: Verejný telefón theatre: Divadlo @@ -489,71 +570,59 @@ sk: university: Univerzita vending_machine: Predajný automat veterinary: Veterinárna ordinácia + village_hall: Spoločenská miestnosÅ¥ waste_basket: Odpadkový kôš - wifi: Prístup Wi-Fi + wifi: Wi-Fi prístup youth_centre: Mládežnícke centrum boundary: - administrative: Administratívne hranice + administrative: Administratívna hranica + census: Hranica pre potreby sčítania + national_park: Národný park + protected_area: Chránená oblasÅ¥ + bridge: + aqueduct: Akvadukt + suspension: Visutý most + swing: Otočný most + viaduct: Viadukt + "yes": Most building: - apartments: Bytový dom - bunker: Bunker - chapel: Kaplnka - church: Kostol,cirkev - city_hall: Radnica,magistrát - commercial: Komerčné budovy - dormitory: Å tudentský domov - faculty: Budovy fakulty - farm: Hospodárska budova - flats: Byty - garage: Garáž - hall: Sála - hospital: Nemocničné budovy - hotel: Hotel - house: Dom - industrial: Priemyselné budovy - office: Administratívna budova - public: Verejná budova - residential: Obytné budovy - retail: Maloobchodné budovy - school: Å kola - shop: Obchod - stadium: Å tadión - store: Obchod - terrace: Radová zástavba - tower: Veža - train_station: Železničná stanica - university: Univerzitné budovy + "yes": Budova highway: bridleway: Cesta pre kone bus_guideway: Bus so sprievodcom bus_stop: Zastávka autobusu - byway: Byway (súkromná cesta) + byway: Účelová komunikácia construction: Cesta vo výstavbe cycleway: Cyklistický chodník - distance_marker: Distance Marker (kilometrovník) emergency_access_point: Stanica prvej pomoci footway: Chodník ford: Brod - gate: Brána living_street: Obytná zóna + milestone: Kilometrovník minor: VedľajÅ¡ia cesta motorway: Diaľnica - motorway_junction: Motorway Junction (Diaľničná križovatka) + motorway_junction: Diaľničná križovatka motorway_link: Diaľnica path: Cesta pedestrian: Chodník pre chodcov platform: NástupiÅ¡te primary: Cesta I. triedy primary_link: Cesta I. triedy - residential: Residential(Obytný) + raceway: Pretekárska dráha + residential: Ulica + rest_area: Odpočívadlo road: Cesta secondary: Cesta II. triedy secondary_link: Cesta II. triedy - service: Service Road (prístupová komunikácia) + service: Prístupová komunikácia + services: Diaľničné odpočívadlo + speed_camera: Radar steps: Schody stile: Schodíky cez ohradu tertiary: Cesta III. triedy - track: Nespevnené cesty + tertiary_link: Cesta III. triedy + track: Nespevnená cesta + trail: Chodník trunk: Cesta pre motorové vozidlá trunk_link: Cesta pre motorové vozidlá unclassified: Neklasifikovaná cesta @@ -565,6 +634,7 @@ sk: building: Budova castle: Hrad church: Kostol + fort: PevnosÅ¥ house: Dom icon: Ikona manor: Šľachtické sídlo @@ -579,35 +649,46 @@ sk: wreck: Zrúcanina landuse: allotments: Záhradkárske osady - basin: Basin (Vodná nádrž) + basin: Vodná nádrž + brownfield: Opustená priemyselná oblasÅ¥ (brownfield) cemetery: Cintorín commercial: Obchodná Å¡tvrÅ¥ + conservation: Chránené územie construction: Stavba farm: Farma + farmland: Poľnohospodárska pôda farmyard: Dvor - forest: Les + forest: Les (udržiavaný) + garages: Garáže grass: Tráva + greenfield: Zelená plocha pre výstavbu industrial: Priemyslová oblasÅ¥ landfill: Skládka odpadu meadow: Lúka military: Vojenský priestor mine: Baňa - mountain: Hora nature_reserve: Prírodná rezervácia + orchard: Sad park: Park piste: Zjazdovka - plaza: Námestie quarry: Lom railway: Železnica + recreation_ground: Rekreačná oblasÅ¥ + reservoir: Zásobník na vodu + reservoir_watershed: Povodie nádrže residential: Residential Area (Obytná oblasÅ¥) retail: Retail (Obchodná zóna) + road: Cesty village_green: Verejná zeleň vineyard: Vinica wetland: Mokrina - wood: Drevo + wood: Les (neudržiavaný) leisure: + beach_resort: Plážové letovisko + bird_hide: Vtáčia pozorovateľňa common: Verejné priestranstvo fishing: Rybolov (Å¡portový) + fitness_station: Fitnes zastávka garden: Záhrada golf_course: Golfové ihrisko ice_rink: Umelé klzisko @@ -618,12 +699,17 @@ sk: pitch: Å portové ihrisko playground: Detské ihrisko recreation_ground: Rekreačná oblasÅ¥ + sauna: Sauna slipway: Lodný sklz sports_centre: Å portové stredisko stadium: Å tadión swimming_pool: Plaváreň track: Bežecká dráha water_park: Aquapark + military: + airfield: Vojenské letisko + barracks: Kasárne + bunker: Bunker natural: bay: Zátoka, záliv beach: Pláž @@ -631,16 +717,18 @@ sk: cave_entrance: Vstup do jaskyne channel: Kanál cliff: Útes, kamenná stena - coastline: Pobrežie crater: Kráter + dune: Duna feature: VlastnosÅ¥ fell: Horská pastvina fjord: Fjord + forest: Les (udržiavaný) geyser: Gejzír glacier: Ľadovec heath: Vresovisko hill: Kopec island: Ostrov + land: Pevnina marsh: Bažina moor: Močiar mud: Bahno @@ -654,6 +742,7 @@ sk: scrub: Rúbanisko shoal: Plytčina spring: Prameň + stone: Balvan strait: Úžina tree: Strom valley: Dolina @@ -661,7 +750,20 @@ sk: water: Voda wetland: Mokrina wetlands: Mokrina - wood: Les + wood: Les (neudržiavaný) + office: + accountant: Účtovník + architect: Architektonický ateliér + company: Súkromná firma + employment_agency: Sprostredkovanie práce + estate_agent: Realitná kancelária + government: Vládny úrad + insurance: PoisÅ¥ovňa + lawyer: Právnická kancelária + ngo: Mimovládna organizácia + telecommunication: Telekomunikácie + travel_agent: Cestovná kancelária + "yes": Úrad place: airport: Letisko city: Mesto nad 100 tis. @@ -673,6 +775,7 @@ sk: houses: Budovy island: Ostrov islet: Ostrovček + isolated_dwelling: Samota locality: OblasÅ¥ moor: Močiar municipality: Obecný úrad @@ -686,7 +789,7 @@ sk: unincorporated_area: Nezaradená oblasÅ¥ village: Obec 200-10 tis. railway: - abandoned: Opustená železnica + abandoned: ZruÅ¡ená železničná traÅ¥ construction: Železnica vo výstavbe disused: Nepoužívaná železnica disused_station: Nepoužívaná železničná stanica @@ -696,6 +799,7 @@ sk: junction: Železničný uzol level_crossing: Železničný prejazd light_rail: Ľahká železnica + miniature: Záhradná železnica monorail: Jednokoľajka narrow_gauge: Úzkokoľajná železnica platform: Železničné nástupiÅ¡te @@ -710,7 +814,7 @@ sk: yard: Železničné depo shop: alcohol: Mimo povolenia - apparel: Odevy + antiques: Starožitnosti art: Obchod s umením bakery: Pekáreň beauty: Salón krásy @@ -718,7 +822,7 @@ sk: bicycle: Obchod s bicylkami books: Kníhkupectvo butcher: Mäsiarstvo - car_dealer: Obchod s autami + car: Predajňa automobilov car_parts: Mototechna car_repair: Autoservis carpet: Obchod s kobercami @@ -727,13 +831,17 @@ sk: clothes: Obchod s konfekciou computer: Obchod s počítačmi confectionery: Cukráreň + convenience: Rozličný tovar + copyshop: Copy centrum + cosmetics: Parfuméria department_store: Obchodný dom + discount: Diskontná predajňa doityourself: Urob si sám - drugstore: Lekáreň dry_cleaning: Chemická čistiareň electronics: Elektro estate_agent: Realitná kancelária farm: Poľnonákup + fashion: Módny salón fish: Obchod s rybami florist: Kvetinárstvo food: Obchod s potravinami @@ -753,9 +861,11 @@ sk: kiosk: Novinový stánok laundry: Práčovňa mall: PeÅ¡ia zóna + market: Obchod mobile_phone: Obchod s mobilnými telefónmi motorcycle: Motocyklový obchod music: Hudobniny + newsagent: Novinový stánok optician: Očná optika organic: Obchod so zdravou výživou outdoor: Turistický obchod @@ -769,6 +879,7 @@ sk: supermarket: Supermarket toys: Hračkárstvo travel_agency: Cestovná kancelária + video: Videopožičovňa, predaj DVD wine: Mimo povolenia tourism: alpine_hut: Vysokohorská chata @@ -791,9 +902,13 @@ sk: valley: Údolie viewpoint: Rozhľadňa, výhliadka zoo: Zoo + tunnel: + "yes": Tunel waterway: + artificial: Vodný kanál, prieplav boatyard: Lodenica canal: Kanál + connector: Prepojenie vodných ciest dam: Priehrada,hrádza derelict_canal: Opustený kanál ditch: Priekopa @@ -803,6 +918,7 @@ sk: lock_gate: Brána plavebnej komory mineral_spring: Minerálny prameň mooring: Kotvisko + rapids: Pereje river: Rieka riverbank: Breh rieky stream: Potok @@ -814,60 +930,114 @@ sk: map: base: cycle_map: Cyklomapa + standard: Å tandardná + transport_map: Dopravná mapa site: - edit_disabled_tooltip: PriblížiÅ¥ na editovateľnú mapu + edit_disabled_tooltip: Pre editáciu priblížte mapu edit_tooltip: UpraviÅ¥ mapu - edit_zoom_alert: Musíte sa priblížiÅ¥ na úpravu mapy - history_disabled_tooltip: PriblížiÅ¥ na zobrazenie úprav pre túto oblasÅ¥ - history_tooltip: ZobraziÅ¥ úpravy pre túto oblasÅ¥ - history_zoom_alert: Musíte priblížiÅ¥ na zobrazenie úprav pre túto oblasÅ¥ + edit_zoom_alert: UpravovaÅ¥ mapu môžete len pri väčšom priblížení + history_disabled_tooltip: Pre zobrazenie úprav tejto oblasti priblížte mapu + history_tooltip: ZobraziÅ¥ úpravy tejto oblasti + history_zoom_alert: ZobraziÅ¥ editácie môžete len pri väčšom priblížení layouts: + community: Komunita community_blogs: Komunitné blogy + community_blogs_title: Blogy členov komunity OpenStreetMap copyright: Autorské práva a licencia documentation: Dokumentácia - donate_link_text: darovanie + documentation_title: Dokumentácia k projektu + donate: Podporte OpenStreetMap %{link} Fondu na obnovu hardwaru + donate_link_text: príspevkom edit: UpraviÅ¥ + edit_with: UpraviÅ¥ pomocou %{editor} export: Export export_tooltip: Export mapových dát foundation: Nadácia + foundation_title: Nadácia OpenStreetMap Foundation gps_traces: GPS Stopy - gps_traces_tooltip: Správa GPS stopy + gps_traces_tooltip: Správa GPS stôp + help: Pomoc help_centre: Centrum pomoci + help_title: Stránky s nápovedou k tomuto projektu history: História home: domov - home_tooltip: Choďte na domácu polohu - inbox: správy (%{count}) + home_tooltip: PrejsÅ¥ na domovské miesto inbox_tooltip: few: V schránke máte %{count} neprečítané správy one: V schránke máte 1 neprečítanú správu other: V schránke máte %{count} neprečítaných správ zero: Nemáte žiadne neprečítané správy - intro_1: OpenStreetMap je volne editovateľná mapa celého sveta. Tvoria ju ľudia ako vy. - intro_2: OpenStreetMap vám dovolí prezeraÅ¥, upravovaÅ¥ a používaÅ¥ zemepisné dáta vďaka spolupráci kdekoľvek na Zemi. - intro_3: Hosting OpenStreetMap láskavo poskytujú %{ucl} a %{bytemark}. Ďalší partneri projektu sú uvedení na %{partners}. - intro_3_partners: wiki + intro_1: OpenStreetMap je slobodná editovateľná mapa celého sveta. Tvoria ju ľudia ako vy. + intro_2_create_account: Založte si konto + intro_2_download: stiahnutie + intro_2_html: Dáta sú k dispozícii na %{download} a %{use} pod %{license}. %{create_account} a pomôžte mapu zdokonaliÅ¥. + intro_2_license: slobodnou licenciou + intro_2_use: použitie + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: title: OpenStreetMap dáta sú licencované pod the Creative Commons Attribution-Share Alike 2.0 Generic License log_in: prihlásiÅ¥ sa - log_in_tooltip: Prihlásenie s existujúcim účtom + log_in_tooltip: PrihlásiÅ¥ sa k existujúcemu kontu logo: alt_text: Logo OpenStreetMap logout: odhlásiÅ¥ logout_tooltip: OdhlásiÅ¥ make_a_donation: text: Darovanie - title: Podpora OpenStreetMap s finančnou podporou + title: Podporte OpenStreetMap finančným príspevkom osm_offline: OpenStreetMap databáza je teraz offline, zatiaľ čo potrebná údržba databázy naďalej prebieha. osm_read_only: OpenStreetMap databáza je teraz len v móde čítania (bez možnosti zapisovania), zatiaľ čo potrebná údržba databázy naďalej prebieha. + partners_bytemark: Bytemark Hosting + partners_html: Prevádzku podporujú %{ucl}, %{ic}, %{bytemark} a iní %{partners}. + partners_ic: Imperial College v Londýne + partners_partners: partneri + partners_ucl: VR centrum UCL + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: zaregistrovaÅ¥ sa - sign_up_tooltip: Vytvorte si účet pre úpravy - tag_line: Voľná Wiki Mapa sveta - user_diaries: Denník užívateľa - user_diaries_tooltip: ZobraziÅ¥ denníky užívateľa + sign_up_tooltip: VytvoriÅ¥ si používateľské konto pre úpravy + sotm2012: Príďte na konferenciu 2012 OpenStreetMap Conference, The State of the Map, 6.-8. septembra do Tokia + tag_line: Slobodná wiki-mapa sveta + user_diaries: Denníky používateľov + user_diaries_tooltip: ZobraziÅ¥ denníky používateľov view: ZobraziÅ¥ view_tooltip: ZobraziÅ¥ mapu welcome_user: Vitajte, %{user_link} - welcome_user_link_tooltip: VaÅ¡a užívateľská stránka + welcome_user_link_tooltip: VaÅ¡a používateľská stránka + wiki: wiki + wiki_title: Wiki k projektu + license_page: + foreign: + english_link: anglickým originálom + text: V prípade rozporu mezi touto preloženou verziou a %{english_original_link} má anglická stránka prednosÅ¥ + title: O tomto preklade + legal_babble: + contributors_at_html: "<strong>Rakúsko</strong>: Obsahuje dáta od\n<a href=\"http://data.wien.gv.at/\">mesta Viedeň</a> (pod licenciou\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">krajiny Vorarlberg</a> a\nkrajiny Tirol (pod licenciou <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT s úpravami</a>)." + contributors_au_html: "<strong>Austrália</strong>: Obsahuje dáta predmestí založené na dátach Austrálskeho Å¡tatistického úradu." + contributors_ca_html: "<strong>Kanada</strong>: Obsahuje dáta z GeoBase ®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: "Podrobnosti o týchto a ďalších zdrojoch, ktoré boli použité pre vylepÅ¡enie OpenStreetMap, nájdete na <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">stránke Contributors</a> na OpenStreetMap wiki." + contributors_footer_2_html: " Zahrnutie dát do OpenStreetMap neznamená, že pôvodný poskytovateľ dát podporuje OpenStreetMap, ponúka akúkoľvek záruku, alebo prijíma akúkoľvek zodpovednosÅ¥." + contributors_fr_html: "<strong>Francúzsko</strong>: Obsahuje dáta pochádzajúce z Direction Générale des impôts." + contributors_gb_html: "<strong>Spojené kráľovstvo</strong>: Obsahuje dáta Ordnance Survey © Crown copyright a právo k databáze 2010." + contributors_intro_html: " NaÅ¡a CC BY-SA licencia vyžaduje, aby ste „spôsobom zodpovedajúcim danému nosiču a v primeranej forme uvádzali autora“. Jednotliví prispievatelia nevyžadujú uvádzanie svojho autorstva nad rámec onoho „Prispievatelia OpenStreetMap“, ale tam, kde boli do OpenStreetMap zahrnuté dáta národných geografických inÅ¡titúcií či iných veľkých zdrojov, môže byÅ¥ primerané uznaÅ¥ ich autorstvo uvedením ich názvu alebo hypertextovým odkazom na túto stránku." + contributors_nz_html: "<strong>Nový Zéland</strong>: Obsahuje dáta pochádzajúce z Land Information New Zealand. Crown Copyright reserved." + contributors_pl_html: "<strong>Poľsko</strong>: Obsahuje dáta z <a href=\"http://ump.waw.pl/\">máp UMP-pcPL</a>. Copyright prispievatelia UMP-pcPL. <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">Viac o využití dát UMP na OSM</a>." + contributors_title_html: NaÅ¡i prispievatelia + contributors_za_html: "<strong>Juhoafrická republika</strong>: Obsahuje dáta pochádzajúce z <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: " Ak používate obrázky z mapy OpenStreetMap, žiadame, aby ste uvádzali aspoň „<em>© Prispievatelia OpenStreetMap, CC BY-SA</em>“. Ak používate iba mapové dáta, požadujeme „<em>Mapové dáta © Prispievatelia OpenStreetMap, CC BY-SA</em>“." + credit_2_html: " Ak je to možné, mal byÅ¥ text <em>OpenStreetMap</em> uvedený ako hypertextový odkaz na <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> a <em>CC BY-SA</em> na <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Ak používate médium, ktoré odkazy neumožňuje (napr. v tlačenom diele), navrhujeme, aby ste svojho čitateľa nasmerovali na www.openstreetmap.org (zrejme doplnením <em>OpenStreetMap</em> o túto internetovú adresu) a analogicky <em>CC BY-SA</em> na www.creativecommons.org." + credit_title_html: Ako uvádzaÅ¥ OpenStreetMap + intro_1_html: " OpenStreetMap sú <em>slobodné dáta</em>, ponúkaná za podmienok licencie <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.cs\">Creative Commons Uveďte autora – Zachovajte licenciu 2.0</a> (CC BY-SA)." + intro_2_html: " Môžete kopírovaÅ¥, distribuovaÅ¥, oznamovaÅ¥ verejnosti a upravovaÅ¥ naÅ¡e mapy aj dáta, pokiaľ ako zdroj uvediete „<em>OpenStreetMap a jeho prispievatelia</em>“. Ak naÅ¡e mapy alebo dáta budete upravovaÅ¥ alebo ich použijete vo svojom diele, musíte výsledné dielo šíriÅ¥ pod rovnakou licenciou. VaÅ¡e práva a povinnosti sú vysvetlené v <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">plnom znení licenčnej zmluvy</a>." + more_1_html: " O používaní naÅ¡ich dát sa môžete dočítaÅ¥ viac v naÅ¡ich <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Často kladených právnych otázkach</a>." + more_2_html: " Prispievateľom OSM pripomíname, že by nikdy nemali pridávaÅ¥ dáta zo zdrojov chránených autorským právom (napr. Google Maps či tlačené mapy) bez výslovného súhlasu držiteľov práv." + more_3_html: " Hoci OpenStreetMap tvorí slobodné dáta, nemôžeme zadarmo poskytovaÅ¥ tretím stranám mapové API.\n\n Pozrite naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Pravidlá použitia API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Pravidlá použitia mapových dlaždíc</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Pravidlá použitia nástroja Nominatim</a>." + more_title_html: ĎalÅ¡ie informácie + title_html: Autorské práva a licencie + native: + mapping_link: začaÅ¥ mapovaÅ¥ + native_link: slovenskú verziu + text: Pozeráte si anglickú verziu stránky o autorských právach. Môžete sa vrátiÅ¥ na %{native_link} stránky alebo si prestaÅ¥ čítaÅ¥ o copyrightoch a %{mapping_link}. + title: O tejto stránke message: delete: deleted: Správa vymazaná @@ -875,12 +1045,20 @@ sk: date: Dátum from: Od messages: Máte %{new_messages} a %{old_messages} - my_inbox: Moja schránka doÅ¡lej poÅ¡ty - no_messages_yet: Nemáte žiadne správy. Prečo ste sa nespojili s niekým z %{people_mapping_nearby_link}? + my_inbox: Moja doručená poÅ¡ta + new_messages: + few: "%{count} nové správy" + one: "%{count} novú správu" + other: "%{count} nových správ" + no_messages_yet: Zatiaľ nemáte žiadne správy. Čo napr. kontaktovaÅ¥ %{people_mapping_nearby_link}? + old_messages: + few: "%{count} staré správy" + one: "%{count} starú správu" + other: "%{count} starých správ" outbox: odoslaná poÅ¡ta - people_mapping_nearby: blízko mapujúci ľudia + people_mapping_nearby: používateľov v okolí subject: Predmet - title: Prichádzajúca poÅ¡ta + title: Doručená poÅ¡ta mark: as_read: Správa označená ako prečítaná as_unread: Správa označená ako neprečítaná @@ -891,23 +1069,24 @@ sk: unread_button: OznačiÅ¥ ako neprečítané new: back_to_inbox: Späť do prijatých správ - body: Telo + body: Text + limit_exceeded: V poslednej dobe ste poslali veľa správ. Pred rozosielaním ďalších prosím chvíľu počkajte. message_sent: Správa odoslaná send_button: OdoslaÅ¥ - send_message_to: PoslaÅ¥ novú správu užívateľovi %{name} + send_message_to: PoslaÅ¥ novú správu používateľovi %{name} subject: Predmet title: OdoslaÅ¥ správu no_such_message: - body: Prepáčte, neexistuje správa s takým id. + body: Ľutujeme, neexistuje správa s takým ID. heading: Zadaná správa neexistuje title: Zadaná správa neexistuje - no_such_user: - body: Prepáčte, neexistuje žiaden užívateľ s týmto menom. - heading: Taký užívateľ nie je - title: Taký užívateľ nie je outbox: date: Dátum inbox: prichádzajúca poÅ¡ta + messages: + few: Máte %{count} odeslané správy + one: Máte %{count} odoslanú správu + other: Máte %{count} odoslaných správ my_inbox: Moja %{inbox_link} no_sent_messages: Nemáte odoslané správy. Prečo ste sa nespojili s niekým z %{people_mapping_nearby_link}? outbox: odoslaná poÅ¡ta @@ -927,14 +1106,17 @@ sk: title: ČítaÅ¥ správu to: Komu unread_button: OznačiÅ¥ ako neprečítané + wrong_user: Ste prihlásený ako „%{user}“, ale správa, ktorú si chcete prečítaÅ¥, nie je ani od, ani pre tohoto používateľa. Ak si ju chcete prečítaÅ¥, prihláste sa pod prísluÅ¡ným kontom. + reply: + wrong_user: Ste prihlásený ako „%{user}“, ale správa, na ktorú chcete odpovedaÅ¥, nebola odoslaná tomuto používateľovi. Ak na ňu chcete odpovedaÅ¥, prihláste sa pod správnym kontom. sent_message_summary: delete_button: ZmazaÅ¥ notifier: diary_comment_notification: - footer: Môžete si tiež prečítaÅ¥ komentár na %{readurl} a môžete komentovaÅ¥ na %{commenturl}, alebo odpoveď na %{replyurl} - header: "%{from_user} má poznámku na váš nedávny OpenStreetMap záznam v denníku s predmetom %{subject}:" + footer: Môžete si tiež prečítaÅ¥ komentár na %{readurl}, komentovaÅ¥ na %{commenturl}, alebo odpovedaÅ¥ na %{replyurl} + header: "%{from_user} okomentoval váš nedávny záznam v OpenStreetMap denníku s predmetom %{subject}:" hi: Ahoj %{to_user}, - subject: "[OpenStreetMap] %{user} komentovaj vo vaÅ¡ej položke denníka" + subject: "[OpenStreetMap] %{user} okomentoval záznam vo vaÅ¡om denníku" email_confirm: subject: "[OpenStreetMap] Potvrďte svoju e-mailovú adresu" email_confirm_html: @@ -942,28 +1124,29 @@ sk: greeting: Ahoj, hopefully_you: Niekto (dúfajme, že vy) chcel zmeniÅ¥ e-mailovú adresu na %{server_url} do %{new_address}. email_confirm_plain: - click_the_link: Ak je toto vaÅ¡e, kliknite prosím na nižšie uvedený odkaz pre potvrdenie zmeny. + click_the_link: Ak ste to boli vy, potvrďte prosím zmenu kliknutím na nasledovný odkaz. greeting: Ahoj, hopefully_you_1: Niekto (dúfajme, že vy) chce zmeniÅ¥ svoju e-mailovú adresu, na viac ako - hopefully_you_2: "%{server_url} do %{new_address}." + hopefully_you_2: "%{server_url} na %{new_address}." friend_notification: befriend_them: Môžete ich tiež pridaÅ¥ ako priateľov na %{befriendurl}. had_added_you: "%{user} vás pridal ako priateľa na OpenStreetMap." - see_their_profile: Môžete vidieÅ¥ svoj profil na %{userurl}. + see_their_profile: Jeho/jej profil si môžete pozrieÅ¥ na %{userurl}. subject: "[OpenStreetMap] %{user} vás pridal ako priateľa" gpx_notification: and_no_tags: a žiadne značky. and_the_tags: "a nasledujúce značky:" failure: - failed_to_import: "neúspeÅ¡ný import. Tu je chyba:" - more_info_1: Viac informácií o neúspeÅ¡ných importoch GPX a ako sa im vyhnúť + failed_to_import: "sa nepodarilo naimportovaÅ¥. Chybové hlásenie:" + more_info_1: Viac informácií o neúspeÅ¡ných importoch GPX a ako sa im vyhnúť more_info_2: "nemožno nájsÅ¥ na adrese:" - subject: "[OpenStreetMap] GPX Import neúspeÅ¡ný" + subject: "[OpenStreetMap] NeúspeÅ¡ný import GPX" greeting: Ahoj, success: - subject: "[OpenStreetMap] GPX Import uspeÅ¡ný" + loaded_successfully: sa úspeÅ¡ne načítal s %{trace_points} z možných %{possible_points} bodov. + subject: "[OpenStreetMap] GPX import úspeÅ¡ný" with_description: s popisom - your_gpx_file: Vyzerá to ako váš GPX súbor + your_gpx_file: Zdá sa, že váš GPX súbor lost_password: subject: "[OpenStreetMap] ŽiadosÅ¥ o reset hesla" lost_password_html: @@ -971,7 +1154,7 @@ sk: greeting: Ahoj, hopefully_you: Niekto (možno vy) požiadal, o reset hesla na tejto emailovej adrese openstreetmap.org účtu. lost_password_plain: - click_the_link: Ak ste to vy, prosím kliknite na odkaz nižšie pre obnovenie svojho hesla. + click_the_link: Ak ste to vy, kliknite prosím na odkaz nižšie pre obnovenie svojho hesla. greeting: Ahoj, hopefully_you_1: Niekto (dúfajme že vy) požiadal o obnovu hesla hopefully_you_2: e-mailové adresy openstreetmap.org účtu. @@ -983,108 +1166,143 @@ sk: signup_confirm: subject: "[OpenStreetMap] Potvrďte svoju e-mailovú adresu" signup_confirm_html: - click_the_link: Ak je to vám, vitajte! Prosím kliknite na odkaz nižšie pre potvrdenie vášho účtu a prečítajte si viac informácií o OpenStreetMap - current_user: Zoznam aktuálnych užívateľov v kategóriách, založený na tom, kde sa nachádzate, je dostupný na <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>. - get_reading: Poďte čítaÅ¥ o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">na wiki</a>, dostanete posledné správy cez <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> alebo <a href="http://twitter.com/openstreetmap">Twitter</a>, alebo prehliadaÅ¥ cez OpenStreetMap zakladateľa Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blog</a> pre stručnú históriu projektu, ktorý má <a href="http://www.opengeodata.org/?cat=13">podcasts na počúvanie</a> tiež! - greeting: Ahoj tam! + ask_questions: Prípadné otázky k OpenStreetMap môžete položiÅ¥ na naÅ¡om <a href="http://help.openstreetmap.org/">webe otázok a odpovedí</a>. + click_the_link: Ak ste to vy, vitajte! Kliknutím na nasledovný odkaz potvrdíte svoje konto, nižšie sa dozviete ďalÅ¡ie informácie o OpenStreetMap + current_user: Zoznam existujúcich používateľov v kategóriách podľa miesta bydliska je dostupný v <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">kategórii Users by geographical region</a>. + get_reading: Prečítajte si niečo o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Sk:Beginners%27_guide">na wiki</a>, sledujte aktuálne dianie na naÅ¡om <a href="http://blog.openstreetmap.org/">blogu</a> alebo <a href="http://twitter.com/openstreetmap">Twitteri</a>, alebo si prebehnite blog zakladateľa OpenStreetMap Steva Coasta <a href="http://www.opengeodata.org/">OpenGeoData</a> so stručnou históriou projektu aj vo forme <a href="http://www.opengeodata.org/?cat=13">podcastov</a>! + greeting: Ahoj! hopefully_you: Niekto (dúfame že vy) chcel vytvoriÅ¥ účet po dobu introductory_video: Môžete sledovaÅ¥ %{introductory_video_link}. more_videos: Je tam %{more_videos_link}. more_videos_here: viac videí tu - user_wiki_page: Toto je doporučenie ak vytvárate užívateľskú stránku na wiki, ktorá obsahuje kategórie podľa toho kde sa nachádzate, také ako <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>. - video_to_openstreetmap: úvodné video do OpenStreetMap - wiki_signup: Môžete tiež potrebovaÅ¥ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">prihlásiÅ¥ sa do OpenStreetMap wiki</a>. + user_wiki_page: Odporúčame, aby ste si na wiki založili používateľskú stránku, na ktorej kategóriami označíte odkiaľ pochádzate, napr. <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Bratislava">[[Category:Users in Bratislava]]</a>. + video_to_openstreetmap: úvodné inÅ¡truktážne video k OpenStreetMap + wiki_signup: Môžete sa tiež <a href="http://wiki.openstreetmap.org/w/index.php?title=Special:UserLogin&type=signup&returnto=Sk%3AMain_Page&uselang=sk">zaregistrovaÅ¥ na OpenStreetMap wiki</a>. signup_confirm_plain: - blog_and_twitter: "Dosiahnite na posledné novinky cez OpenStreetMap blog alebo Twitter:" + ask_questions: "Prípadné otázky k OpenStreetMap môžete položiÅ¥ na naÅ¡om webe otázok a odpovedí:" + blog_and_twitter: "Sledujte aktuálne dianie na naÅ¡om blogu alebo Twitteri:" click_the_link_1: Ak je to vám, vitajte! Prosím kliknite na odkaz nižšie pre potvrdenie vášho - current_user_1: Zoznam aktuálnych užívateľov v kategóriách, založené na tom, kde sa vo svete nachádzajú + click_the_link_2: svoje konto, nižšie sa dozviete ďalÅ¡ie informácie o OpenStreetMap. + current_user_1: Zoznam aktuálnych používateľov v kategóriách podľa miesta, kde sa vo svete nachádzajú current_user_2: "sú k dispozícii na:" greeting: Ahoj! - hopefully_you: Niekto (dúfame že vy) chce vytvoriÅ¥ účet po dobu + hopefully_you: Niekto (dúfame že vy) si chce založiÅ¥ konto na introductory_video: "Môžete sledovaÅ¥ úvodné video k OpenStreetMap tu:" more_videos: "Existujú ďalÅ¡ie videá tu:" - the_wiki: "Poďte čítaÅ¥ o OpenStreetMap na wiki:" - user_wiki_1: Odporúča sa, aby ste vytvorili užívateľskú wiki stránku, ktorá obsahuje - user_wiki_2: obsahuje kategórie podľa toho kde sa nachádzate, také ako [[Category:Users_in_London]]. + opengeodata: "OpenGeoData.org je blog zakladateľa OpenStreetMap Steva Coasta, ponúka aj podcasty:" + the_wiki: "Prečítajte si niečo o OpenStreetMap na wiki:" + user_wiki_1: Odporúčame, aby ste si na wiki vytvorili používateľskú stránku, ktorá obsahuje + user_wiki_2: kategóriami označíte, odkiaľ pochádzate, napríklad [[Category:Users in Bratislava]]. wiki_signup: "Môžete tiež prihlásiÅ¥ do wiki OpenStreetMap na adrese:" oauth: oauthorize: allow_read_gpx: čítaÅ¥ vaÅ¡e súkromné GPS stopy. allow_read_prefs: čítaÅ¥ vaÅ¡e osobné nastavenia. - allow_to: "Klientskej aplikácie umožnia, aby:" + allow_to: "Klientskej aplikácii umožniÅ¥:" allow_write_api: upravovaÅ¥ mapu. allow_write_diary: vytvoriÅ¥ položky denníka, poznámok a priateľov. allow_write_gpx: nahraÅ¥ GPS stopy. allow_write_prefs: upraviÅ¥ vaÅ¡e osobné nastavenia. - request_access: Aplikácia %{app_name} požaduje prístup na váš účet. Prosím skontrolujte či aplikácia má nasledujúcu schopnosÅ¥. Môžete si vybraÅ¥ veľa alebo málo, ako sa vám páči. + request_access: Aplikácia %{app_name} požaduje prístup k vášmu kontu (%{user}). Vyberte si, či si želáte, aby mala aplikácia nasledujúce oprávnenie. Môžete zvoliÅ¥ ľubovoľný počet oprávnení. + revoke: + flash: Prístup pre aplikáciu %{application} bol odvolaný. oauth_clients: create: flash: UspeÅ¡ne registrované informácie + destroy: + flash: Registrácia klientskej aplikácie bola zruÅ¡ená edit: submit: UpraviÅ¥ - title: Upravte vaÅ¡u žiadosÅ¥ + title: UpraviÅ¥ aplikáciu form: allow_read_gpx: čítaÅ¥ svoje súkromné GPS stopy. - allow_read_prefs: čítaÅ¥ svoje užívateľské nastavenia. + allow_read_prefs: čítaÅ¥ ich používateľské nastavenia. allow_write_api: zmeniÅ¥ mapu. allow_write_diary: vytvoriÅ¥ položky denníka, poznámky a vytvoriÅ¥ priateľov. allow_write_gpx: nahraÅ¥ GPS stopy. - allow_write_prefs: upraviÅ¥ svoje užívateľské nastavenia. - callback_url: Spätná URL - name: Meno - requests: "ŽiadosÅ¥ o nasledujúce povolenia od užívateľa:" - required: Požadované - support_url: Podpora URL - url: URL Hlavnej aplikácie + allow_write_prefs: upraviÅ¥ ich používateľské nastavenia. + callback_url: URL pre spätné volanie (callback) + name: Názov + requests: "ŽiadaÅ¥ používateľov o nasledujúce oprávnenia:" + required: Povinné + support_url: URL s podporou + url: Hlavné URL aplikácie index: - application: Meno žiadosti - issued_at: Vydané v - my_tokens: Moje povolené požiadavky - register_new: Zaregistrujte svoju požiadavku + application: Názov aplikácie + issued_at: Vydané + list_tokens: "Nasledovné tokeny boli vo vaÅ¡om mene vydané aplikáciám:" + my_apps: Moje klientské aplikácie + my_tokens: Moje autorizované aplikácie + no_apps: Máte nejakú aplikáciu, využívajúcu Å¡tandard %{oauth}, ktorá by s nami mala spolupracovaÅ¥? Aplikáciu je potrebné najprv zaregistrovaÅ¥, až potom sem bude môcÅ¥ posielaÅ¥ OAuth požiadavky. + register_new: ZaregistrovaÅ¥ aplikáciu + registered_apps: "Máte zaregistrované nasledujúce klientské aplikácie:" revoke: ZruÅ¡iÅ¥! + title: Moje OAuth nastavenia new: submit: RegistrovaÅ¥ - title: ZaregistrovaÅ¥ novú žiadosÅ¥ + title: Registrácia novej aplikácie not_found: sorry: Je nám ľúto, že %{type} nemožno nájsÅ¥. show: + access_url: "Access Token URL:" allow_read_gpx: čítaÅ¥ svoje súkromné GPS stopy. allow_read_prefs: čítaÅ¥ svoje užívateľské nastavenia. allow_write_api: zmeniÅ¥ mapu. allow_write_diary: vytvoriÅ¥ položky denníka, poznámky a vytvoriÅ¥ priateľov. allow_write_gpx: nahraÅ¥ GPS stopy. allow_write_prefs: upraviÅ¥ svoje užívateľské nastavenia. + authorize_url: "Authorise URL:" + confirm: Ste si istý? + delete: OdstrániÅ¥ klienta edit: UpraviÅ¥ detaily - requests: "Žiadam nasledujúce povolenia od užívateľa:" + key: "Consumer Key:" + requests: "Žiadam nasledujúce oprávnenia od používateľa:" + secret: "Consumer Secret:" support_notice: Podporujeme HMAC-SHA1 (odporúča sa) rovnako ako obyčajný text v ssl móde. + title: Podrobnosti OAuth pre %{app_name} + url: "Request Token URL:" update: flash: ÚspeÅ¡ne aktualizované informácie o klientovi + redaction: + show: + confirm: Ste si istý? + user: "Autor:" + update: + flash: Zmeny boli uložené. site: edit: - anon_edits_link_text: Zistite, prečo tomu tak je. - flash_player_required: Potrebujete Flash player pre Potlatch, the OpenStreetMap Flash editor. Môžete <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">stiahnuÅ¥ Flash Player z Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Niekoľko iných možností</a> sú tiež dostupné pre úpravu OpenStreetMap. + anon_edits_link_text: Prečo to tak je? + flash_player_required: Ak chcete používaÅ¥ Potlatch, flashový editor OpenStreetMap, potrebujete Flash prehrávač. Môžete si <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">stiahnuÅ¥ Flash Player z Adobe.com</a>. Pre editáciu OpenStreetMap existuje <a href="http://wiki.openstreetmap.org/wiki/Editing">viacero ďalších možností</a>. + no_iframe_support: Váš prehliadač nepodporuje vložené HTML rámy (iframes), ktoré sú pre túto funkciu nevyhnutné. not_public: Nemáte nastavené úpravy na verejné. - not_public_description: Nemôžete naďalej upravovaÅ¥ mapy, iba ak urobíte takto. Môžete si nastaviÅ¥ vaÅ¡e úpravy, ako verejné z vaÅ¡ej %{user_page}. - potlatch_unsaved_changes: Nemáte uložené zmeny. (Pre uloženie v Potlatchu, mali by ste odznačiÅ¥ aktuálnu cestu, alebo bod, ak upravujete v režime naživo, alebo kliknite uložiÅ¥ ak máte tlačidlo uložiÅ¥.) - user_page_link: stránka užívateľa + not_public_description: Kým tak neurobíte, nemôžete ďalej editovaÅ¥ mapu. Svoje úpravy môžete nastaviÅ¥ ako verejné na vaÅ¡ej %{user_page}. + potlatch2_not_configured: Potlatch 2 nie je nakonfigurovaný – podrobnejÅ¡ie informácie nájdete na http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_unsaved_changes: Nemáte uložené zmeny. (V Potlatch 2 sa zmeny ukladajú kliknutím na tlačítko Save/UložiÅ¥ vľavo hore.) + potlatch_unsaved_changes: Nemáte uložené zmeny. (V Potlatchu odznačte aktuálnu cestu alebo bod ak editujete v živom režime, alebo kliknite na tlačítko UložiÅ¥ (Save) vľavo hore, ak sa tam zobrazuje.) + user_page_link: stránke používateľa index: js_1: Používate prehliadač, ktorý nepodporuje JavaScript, alebo máte vypnutý JavaScript. js_2: OpenStreetMap využíva JavaScript pre slippy map. - js_3: Môžete skúsiÅ¥ <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> ak sa vám nedarí povoliÅ¥ JavaScript. license: license_name: Creative Commons Attribution Share-Alike 2,0 notice: Licencovaný pod %{license_name} s %{project_name} a jej prispievatelia. project_name: OpenStreetMap projekt permalink: Trvalý odkaz + remote_failed: Editácia sa nepodarila – skontrolujte, či je JOSM alebo Merkaartor spustený a je v ňom povolená funkcia Diaľkové ovládanie (Remote control) shortlink: Krátky odkaz key: map_key: Legenda + map_key_tooltip: Legenda k mape table: entry: admin: Administratívne hranice + allotments: Záhradkárska kolónia apron: - 1: terminál + - Letisková odbavovacia plocha + - terminál + bridge: Čireny obrys = most bridleway: Chodník pre kone + brownfield: Zborenisko building: Významná budova byway: Súkromná cesta cable: @@ -1094,13 +1312,14 @@ sk: centre: Å portové centrum commercial: Komerčná oblasÅ¥ common: - - Obecný + - Pastvina - lúka construction: Cesta vo výstavbe cycleway: Cyklotrasa + destination: Prejazd zakázaný farm: Farma footway: Chodník pre peších - forest: Les + forest: Les (udržiavaný) golf: Golfové ihrisko heathland: Vresovisko industrial: Priemyselná oblasÅ¥ @@ -1119,7 +1338,8 @@ sk: resident: Obytná oblasÅ¥ retail: Nákupná oblasÅ¥ runway: - 1: pojazdové dráhy + - Letisková dráha + - pojazdová dráha school: - Å kola - univerzita @@ -1135,13 +1355,31 @@ sk: - Rýchloelektrička - električka trunk: Cesta pre motorové vozidlá - tunnel: Únikový kryt = tunel + tunnel: Čiarkovaný obrys = tunel unclassified: Neklasifikovaná cesta unsurfaced: Nespevnená cesta + wood: Les (neudržiavaný) + markdown_help: + alt: Alternatívny text + first: Prvá položka + heading: Nadpis + headings: Nadpisy + image: Obrázok + link: Odkaz + ordered: Číslovaný zoznam + second: Druhá položka + subheading: Podnadpis + text: Text + title_html: Používa sa syntax <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Neusporiadaný zoznam + url: URL + richtext_area: + edit: UpraviÅ¥ + preview: Náhľad search: - search: VyhľadaÅ¥ - search_help: "príklady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', alebo 'poÅ¡ta blízko Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more príklady...</a>" - submit_text: VykonaÅ¥ + search: HľadaÅ¥ + search_help: "príklady: 'Žilina', 'Veľká Okružná, Žilina', '83103', alebo 'post offices near Žilina' <a href='http://wiki.openstreetmap.org/wiki/Search'>ďalÅ¡ie príklady…</a>" + submit_text: hľ. where_am_i: Kde som? where_am_i_title: Opis aktuálnej polohy pomocou vyhľadávača sidebar: @@ -1149,10 +1387,10 @@ sk: search_results: Výsledky vyhľadávania time: formats: - friendly: "%e %B %Y at %H:%M" + friendly: "%e. %B %Y o %H:%M" trace: create: - trace_uploaded: Váš GPX súbor bol nahratý a je očakávané vloženie do databázy. To bude spravidla trvaÅ¥ polhodinu až hodinu, a budete vyrozumený mailom po uskutočnení. + trace_uploaded: Váš GPX súbor bol uložený a čaká na zaradenie do databázy. Obvykle to netrvá viac než polhodinu. Po jeho zaradení dostanete potvrdzujúci e-mail. upload_trace: NahraÅ¥ GPS stopu delete: scheduled_for_deletion: Stopa plánovaná na vymazanie @@ -1171,47 +1409,45 @@ sk: tags_help: oddelené čiarkou title: Úprava stopy %{name} uploaded_at: "NahraÅ¥ na:" - visibility: "VidieľnosÅ¥:" + visibility: "ViditeľnosÅ¥:" visibility_help: čo má toto znamenaÅ¥? list: + empty_html: Nič tu zatiaľ nie je. <a href='%{upload_link}'>Nahrajte novú stopu</a>, alebo si niečo o GPS stopách prečítajte na <a href='http://wiki.openstreetmap.org/wiki/Sk:Beginners_Guide_1.2'>wiki</a>. public_traces: Verejné GPS stopy public_traces_from: Verejné GPS stopy od %{user} tagged_with: označený s %{tags} your_traces: VaÅ¡e GPS stopy make_public: made_public: Zverejnená stopa - no_such_user: - body: Prepáčte, nie je tu užívateľ s menom %{user}. Prosím skontrolujte váš text, alebo možno odkaz na ktorý ste klikli je chybný. - heading: Užívateľ %{user} neexistuje - title: Nie je taký užívateľ offline: - heading: GPX úschovňa je Offline - message: Ukladací priestor GPX súborov a nahrávací systém je teraz neprístupný. + heading: GPX úložisko je offline + message: GPX úložisko a nahrávanie GPX súborov je momentálne nedostupné. offline_warning: - message: Systém nahrávania GPX súborov je teraz neprístupný + message: Nahrávanie GPX súborov je momentálne nedostupné trace: ago: pred %{time_in_words_ago} by: od - count_points: "%{count} body" + count_points: "%{count} bodov" edit: upraviÅ¥ - edit_map: UpraviÅ¥ Mapu - identifiable: IDENTIFIKOVATEĽNÝ + edit_map: UpraviÅ¥ mapu + identifiable: IDENTIFIKOVATEĽNÁ in: v map: mapa more: viac pending: NEVYRIEÅ ENÉ - private: SÚKROMNÉ - public: VEREJNÝ - trace_details: ZobraziÅ¥ Detaily Stopy - view_map: ZobraziÅ¥ Mapu + private: SÚKROMNÁ + public: VEREJNÁ + trace_details: ZobraziÅ¥ detaily stopy + trackable: STOPOVATEĽNÁ + view_map: ZobraziÅ¥ mapu trace_form: - description: Popis + description: "Popis:" help: Pomoc - tags: Tagy + tags: "Značky:" tags_help: oddelené čiarkou upload_button: NahraÅ¥ - upload_gpx: NahraÅ¥ GPX Súbor - visibility: ViditeľnosÅ¥ + upload_gpx: "NahraÅ¥ GPX súbor:" + visibility: "ViditeľnosÅ¥:" visibility_help: čo toto znamená? trace_header: see_all_traces: ZobraziÅ¥ vÅ¡etky stopy @@ -1221,8 +1457,8 @@ sk: trace_optionals: tags: Tagy trace_paging_nav: - next: Dopredu » - previous: « Naspäť + newer: NovÅ¡ie stopy + older: StarÅ¡ie stopy showing_page: Strana %{page} view: delete_track: VymazaÅ¥ túto stopu @@ -1235,126 +1471,187 @@ sk: map: mapa none: Žiadne owner: "Vlastník:" - pending: NEVYRIEÅ ENÉ - points: "Body:" + pending: NEVYRIEÅ ENÁ + points: "Bodov:" start_coordinates: "Začiatočná súradnica:" tags: "Tagy:" title: Sledovanie stopy %{name} trace_not_found: Stopa nenájdená! - uploaded: "Nahraté na:" + uploaded: "Nahraté o:" visibility: "ViditeľnosÅ¥:" visibility: - identifiable: Identifikovateľné (zobrazené v obsahu stôp a ako identifikovateľné, usporiadané body s časovou značkou) + identifiable: Identifikovateľné (zobrazené v zozname stôp, aj ako identifikovateľné, usporiadané body s časovou značkou) private: Súkromné (iba zdieľané ako anonymné, neusporiadané body) - public: Verejné (zobraziÅ¥ v prehľade stopy a ako anonymné, neusporiadané body) + public: Verejné (zobrazené v prehľade stopy, aj ako anonymné, neusporiadané body) trackable: Zaznamenávané stopy (zdieľané iba ako anonymné, usporiadané body s časovými značkami) user: account: contributor terms: agreed: Súhlasili ste s novými Podmienkami prispievania. - current email address: "Aktuálna E-mailová Adresa:" + agreed_with_pd: Deklarovali ste tiež, že svoje úpravy považujete za slobodné dielo. + heading: "Podmienky prispievania:" + link text: čo je toto? + not yet agreed: Zatiaľ ste neodsúhlasili nové Podmienky prispievania. + review link text: Keď budete maÅ¥ čas, pomocou tohoto odkazu si prosím prečítajte a odsúhlaste nové Podmienky prispievania. + current email address: "Aktuálna e-mailová adresa:" delete image: OdstrániÅ¥ aktuálny obrázok - email never displayed publicly: (nezobrazovaný verejne) - flash update success: Informácie používateľa boli obnovené. - flash update success confirm needed: Užívateľské informácie boli úspeÅ¡ne aktualizované. Skontrolujte vaÅ¡u emailovú adresu pre správu na potvrdenie vaÅ¡ej novej emailovej adresy. + email never displayed publicly: (nikde se verejne nezobrazuje) + flash update success: Používateľské údaje boli úspeÅ¡ne aktualizované. + flash update success confirm needed: Používateľské údaje boli úspeÅ¡ne aktualizované. Skontrolujte si e-mail, mala by Vám prísÅ¥ výzva na potvrdenie novej e-mailovej adresy. home location: "Domovské miesto:" image: "Obrázok:" - image size hint: (veľkosÅ¥ obrázkov aspoň 100x100 je najlepÅ¡ia) + image size hint: (najvhodnejÅ¡ie sú Å¡tvorcové obrázky s veľkosÅ¥ou najmenej 100×100) keep image: PonechaÅ¥ aktuálny obrázok latitude: "Zem. šírka:" longitude: "Zem. dĺžka:" make edits public button: ZverejniÅ¥ vÅ¡etky moje úpravy my settings: Moje nastavenia - new email address: "Nová E-mailová Adresa:" + new email address: "Nová e-mailová adresa:" new image: "PridaÅ¥ obrázok:" no home location: Nezadali ste svoje domovské miesto. openid: + link: http://wiki.openstreetmap.org/wiki/CS:OpenID link text: čo je toto? + openid: "OpenID:" preferred editor: "Preferovaný editor:" - preferred languages: "Uprednostňované jazyky:" + preferred languages: "Preferované jazyky:" profile description: "Popis profilu:" public editing: disabled: Vypnutý a nemôže upravovaÅ¥ údaje, vÅ¡etky predchádzajúce úpravy sú anonymné. disabled link text: prečo nemôžem upravovaÅ¥? enabled: Zapnutý. Nie je anonym a môže upravovaÅ¥ dáta. + enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: čo je toto? - heading: "Verejná úprava:" + heading: "Verejné úpravy:" public editing note: heading: Úprava pre verejnosÅ¥ - text: Teraz upravujete ako anonymný a iný vám nemôžu poslaÅ¥ správy, alebo vidieÅ¥ vaÅ¡e miesto. Ukážte čo upravujete a dovoľte iným kontaktovaÅ¥ vás cez webovú stránku, kliknite na tlačítko dolu. <b>Od zmeny verzie 0.6 API, iba užívateľ, ktorý povolil svoje úpravy verejnosti, môže upravovaÅ¥ mapové údaje</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">zistiÅ¥ prečo</a>).<ul><li>VaÅ¡a emailová adresa nebude odhalená pre patričnú verejnosÅ¥.</li><li>Tento dej sa nedá vrátiÅ¥ späť a vÅ¡etci nový užívatelia sú nastavený Å¡tandardne ako verejný.</li></ul> + text: Teraz upravujete ako anonym a ostatní Vám nemôžu poslaÅ¥ správy, alebo vidieÅ¥ vaÅ¡e domovské miesto. Ukážte čo upravujete a dovoľte ostatným kontaktovaÅ¥ Vás cez webovú stránku, kliknite na tlačítko dolu. <b>Od API verzie 0.6, iba používateľ, ktorý povolil svoje úpravy verejnosti, môže upravovaÅ¥ mapové údaje</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">zistiÅ¥ prečo</a>).<ul><li>VaÅ¡a emailová adresa nebude odhalená pre verejnosÅ¥.</li><li>Táto akcia sa nedá vrátiÅ¥ späť a vÅ¡etci noví používatelia sú už implicitne verejní.</li></ul> replace image: NahradiÅ¥ aktuálny obrázok return to profile: Návrat do profilu - save changes button: UložiÅ¥ Zmeny + save changes button: UložiÅ¥ zmeny title: UpraviÅ¥ účet - update home location on click: UpraviÅ¥ polohu domova, kliknutím na mapu? + update home location on click: AktualizovaÅ¥ domovské miesto kliknutím na mapu? confirm: + already active: Toto používateľské konto už bolo potvrdené. + before you start: Pravdepodobne sa už nemôžete dočkaÅ¥, kedy začnete vytváraÅ¥ mapy, predtým by ste ale mohli chcieÅ¥ v nasledovnom formulári vyplniÅ¥ niekoľko informácií o svojej osobe. button: PotvrdiÅ¥ - heading: PotvrdiÅ¥ užívateľský účet + heading: PotvrdiÅ¥ používateľské konto press confirm button: Stlačte tlačítko na potvrdenie dole, pre aktiváciu vášho účtu. + reconfirm: Ak už od vaÅ¡ej registrácie uplynul dlhší čas, budete si možno musieÅ¥ <a href="%{reconfirm}">nechaÅ¥ poslaÅ¥ nový potvrdzovací e-mail</a>. success: Váš účet je založený, ďakujeme, že ste sa zapísali! + unknown token: Zadaný potvrdzovací kód neexistuje. confirm_email: button: PotvrdiÅ¥ failure: E-mailová adresa bola už potvrdená s týmto znakom. heading: PotvrdiÅ¥ zmenu e-mailovej adresy press confirm button: Stlačte potvrdzovacie tlačidlo nižšie a potvrďte svoju novú e-mailovú adresu. success: Potvrdená vaÅ¡a e-mailová adresa, ďakujeme za registráciu! + confirm_resend: + failure: Používateľ %{name} neexistuje. + success: Na adresu %{email} sme Vám poslali potvrdzovací e-mail. Akonáhle svoje konto potvrdíte, budete môcÅ¥ začaÅ¥ tvoriÅ¥ mapy.<br /><br />Ak náhodou používate systém pre ochranu proti nevyžiadanej poÅ¡te (anti-spam), ktorý vyžaduje potvrdenia, nezabudnite definovaÅ¥ výnimku pre odosielateľa webmaster@openstreetmap.org, nakoľko na žiadosti o potvrdenie nie sme schopní reagovaÅ¥. filter: not_an_administrator: Potrebujete byÅ¥ administrátor na vykonanie tejto akcie. go_public: flash success: VÅ¡etky vaÅ¡e úpravy sú teraz verejné, a teraz máte povolenie na úpravu. list: - heading: Užívatelia - hide: SkryÅ¥ vybraných užívateľov - title: Užívatelia + confirm: PotvrdiÅ¥ zvolených používateľov + empty: Žiadni používatelia vyhovujúci podmienkam neboli nájdení + heading: Používatelia + hide: SkryÅ¥ vybraných používateľov + showing: + one: Zobrazuje sa stránka %{page} (%{first_item} z %{items}) + other: Zobrazuje sa stránka %{page} (%{first_item}–%{last_item} z %{items}) + summary: "%{name} založené %{date} z %{ip_address}" + summary_no_ip: "%{name} založený %{date}" + title: Používatelia login: - account not active: Prepáčte, vaÅ¡ účet nie je eÅ¡te aktívne.<br /> Prosím kliknite na odkaz v maile potvrdzujúcom účet na aktivovanie vášho účtu. - auth failure: Prepáčte, nemohol som vás prihlásiÅ¥ s týmito údajmi. - email or username: "E-mailová adresa alebo Meno užívateľa:" + account is suspended: Ľutujeme, ale vaÅ¡e konto bolo pozastavené vzhľadom na podozrivú aktivitu.<br>Ak to chcete rieÅ¡iÅ¥, môžete kontaktovaÅ¥ <a href="%{webmaster}">webmastera</a>. + account not active: Ľutujeme, vaÅ¡e konto eÅ¡te nie je aktívne.<br />Môžete si ho aktivovaÅ¥ kliknutím na odkaz v potvrdzovacom e-maile, prípadne si <a href="%{reconfirm}">nechajte poslaÅ¥ nový potvrdzovací e-mail</a>. + auth failure: Ľutujeme, s uvedenými údajmi sa nie je možné prihlásiÅ¥. + create account minute: Založte si konto. Zaberie to len chvíľku. + email or username: "E-mailová adresa alebo prihlasovacie meno:" heading: Prihlásenie login_button: PrihlásiÅ¥ lost password link: Stratili ste heslo? + new to osm: Ste na OpenStreetMap nový? + no account: Nemáte konto? + notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Zistite viac o chystanej zmene licencie OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/CS:ODbL/We_Are_Changing_The_License">preklady</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskusia</a>) + notice_terms: OpenStreetMap prechádza 1. apríla 2012 na novú licenciu. Je rovnako otvorená ako tá súčasná, ale právne oÅ¡etrenie je pre naÅ¡u mapovú databázu podstatne vhodnejÅ¡ie. Veľmi radi by sme v OpenStreetMap zachovali vaÅ¡e príspevky, to ale budeme môcÅ¥ len v prípade, že dáte súhlas k ich šíreniu pod novou licenciou. V opačnom prípade ich budeme musieÅ¥ z databázy vyradiÅ¥.<br /><br />Prosíme, prihláste sa a venujte chvíľku na prečítanie a odsúhlasenie nových podmienok. Ďakujeme! + openid: "%{logo} OpenID:" + openid invalid: Ľutujeme, ale vaÅ¡e OpenID sa zdá byÅ¥ nesprávne + openid missing provider: Ľutujeme, nepodarilo se spojiÅ¥ s vaším OpenID poskytovateľom + openid_logo_alt: Prihlásenie pomocou OpenID + openid_providers: + aol: + alt: Prihlásenie pomocou AOL OpenID + title: Prihlásenie pomocou AOL + google: + alt: Prihlásenie pomocou Google OpenID + title: Prihlásenie pomocou Google + myopenid: + alt: Prihlásenie pomocou myOpenID OpenID + title: Prihlásenie pomocou myOpenID + openid: + alt: Prihlásenie pomocou OpenID URL + title: Prihlásenie pomocou OpenID + wordpress: + alt: Prihlásenie pomocou Wordpress OpenID + title: Prihlásenie pomocou Wordpress + yahoo: + alt: Prihlásenie pomocou Yahoo OpenID + title: Prihlásenie pomocou Yahoo password: "Heslo:" - remember: "ZapamätaÅ¥:" + register now: Zaregistrujte se + remember: ZapamätaÅ¥ title: PrihlásiÅ¥ sa + to make changes: Ak chcete upravovaÅ¥ OpenStreetMap, musíte maÅ¥ používateľské konto. + with openid: "Alternatívne sa môžete prihlásiÅ¥ svojím OpenID:" + with username: "Už máte na OpenStreetMap konto? Prihláste sa svojim menom a heslom:" logout: heading: Odhlásenie z OpenStreetMap logout_button: Odhlásenie title: Odhlásenie lost_password: - email address: "E-mailová Adresa:" - heading: Zabudli Ste Heslo? - help_text: Vložte emailovú adresu, ktorú ste použili pri prihlásení, poÅ¡leme vám odkaz na to aby ste mohli resetovaÅ¥ vaÅ¡e heslo. - new password button: ResetovaÅ¥ heslo - notice email cannot find: Nemôžem nájsÅ¥ emailovú adresu, prepáčte. - notice email on way: Prepáčte stratili ste to :-( ale na ceste je mail, tak to čoskoro budete môcÅ¥ resetovaÅ¥. + email address: "E-mailová adresa:" + heading: Zabudli ste heslo? + help_text: Vložte emailovú adresu, ktorú ste uviedli pri registrácii, poÅ¡leme vám odkaz, pomocou ktorého si budete môcÅ¥ nastaviÅ¥ nové heslo. + new password button: Resetnúť heslo + notice email cannot find: Ľutujeme, túto e-mailovú adresu nie je možné nájsÅ¥. + notice email on way: Å koda zabudnutého hesla :-( ale e-mail je už na ceste, takže si čoskoro budete môcÅ¥ zvoliÅ¥ nové. title: Stratené heslo make_friend: already_a_friend: Ste už priatelia s %{name}. - failed: Prepáčte, neúspeÅ¡né pridanie %{name} ako priateľa. + failed: Ľutujeme, nepodarilo sa pridaÅ¥ %{name} ako priateľa. success: "%{name} je teraz váš priateľ." new: confirm email address: "PotvrdiÅ¥ emailovú adresu:" confirm password: "PotvrdiÅ¥ Heslo:" - contact_webmaster: Prosím kontaktovaÅ¥ <a href="mailto:webmaster@openstreetmap.org">webmaster</a> kvôli žiadosti pre vytvorenie účtu – budeme sa snažiÅ¥ vaÅ¡u požiadavku vybaviÅ¥ tak rýchlo, ako je len možné. + contact_webmaster: Kontaktujte prosím <a href="mailto:webmaster@openstreetmap.org">webmastera</a> so žiadosÅ¥ou o založenie konta – budeme sa snažiÅ¥ vaÅ¡u požiadavku vybaviÅ¥ čo najrýchlejÅ¡ie. continue: PokračovaÅ¥ display name: "Zobrazované meno:" display name description: VaÅ¡e verejne zobrazené meno užívateľa. Môžete ho potom zmeniÅ¥ v nastaveniach. email address: "Emailová adresa:" fill_form: Vyplňte formulár a my vám rýchlo poÅ¡leme email na aktiváciu vášho účtu. - flash create success message: Užívateľ bol úspeÅ¡ne vytvorený. Skontrolujte váš email, kvôli potvrdzujúcej správe, a budete môcÅ¥ mapovaÅ¥ ihneď :-)<br /><br />Prosím vÅ¡imnite si, že nie ste schopný prihlásiÅ¥ sa až do prijatia a potvrdenie vaÅ¡ej emailovej adresy.<br /><br /> Ak používate antispamový systém, ktorý posiela žiadosÅ¥ o potvrdenie, potom sa uistite prosím či je emailová adresa webmaster@openstreetmap.org na whiteliste, inak nie sme schopný odpovedaÅ¥ na potvrdenie požiadavky. - heading: VytvoriÅ¥ užívateľský účet - license_agreement: Vytvorením účtu súhlasíte, že vÅ¡etky údaje vami doplnené do Openstreetmap projektu budú (bez výhrady) licencované pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">touto Creative Commons license (by-sa)</a>. + flash create success message: Používateľ bol úspeÅ¡ne vytvorený. Skontrolujte váš email, kvôli potvrdzujúcej správe, a budete môcÅ¥ mapovaÅ¥ ihneď :-)<br /><br />Majte prosím na pamäti, že nebudete schopný prihlásiÅ¥ sa až do prijatia a potvrdenie vaÅ¡ej emailovej adresy.<br /><br /> Ak používate antispamový systém, ktorý posiela žiadosÅ¥ o potvrdenie, potom sa uistite či je emailová adresa webmaster@openstreetmap.org na whiteliste, inak nie sme schopný odpovedaÅ¥ na potvrdenie požiadavky. + heading: VytvoriÅ¥ používateľský účet + license_agreement: Pri potvrdení konta budete musieÅ¥ vyjadriÅ¥ súhlas s <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Podmienkami prispievania</a>. no_auto_account_create: Bohužiaľ teraz nie sme schopný vytvoriÅ¥ pre vás účet automaticky. - not displayed publicly: NezobrazovaÅ¥ verejne (pozrite <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)k + not displayed publicly: Nezobrazuje sa nikde verejne (pozrite <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Pravidlá ochrany osobných údajov na wiki, vrátane časti o e-mailových adresách">pravidlá ochrany osobných údajov</a>) + openid: "%{logo} OpenID:" + openid association: "<p>VaÅ¡e OpenID zatiaľ nebolo prepojené s kontom na OpenStreetMap.</p>\n<ul>\n <li>Ak ste na OpenStreetMap nový, vytvorte si konto pomocou formulára nižšie.</li>\n <li>\n Ak už konto máte, môžete sa prihlásiÅ¥\n pomocou používateľského mena a hesla a následne ho\n v používateľskom nastavení prepojiÅ¥ s OpenID.\n </li>\n</ul>" + openid no password: S OpenID nie je heslo potrebné. Niektoré ďalÅ¡ie nástroje alebo servery ho vÅ¡ak vyžadovaÅ¥ môžu. password: "Heslo:" + terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania! + terms declined: Je nám ľúto, že ste sa rozhodli neprijaÅ¥ nové Podmienky prispievania. Bližšie informácie nájdete na<a href="%{url}">tejto wiki-stránke</a>. title: VytvoriÅ¥ účet + use openid: Prípadne sa môžete prihlásiÅ¥ pomocou %{logo} OpenID no_such_user: - body: Prepáčte, užívateľ s týmto menom sa tu nenachádza %{user}. Prosím skontrolujte váš text, alebo možno ste klikli na nesprávny odkaz. - heading: Užívateľ %{user} neexistuje - title: Taký užívateľ nie je + body: Ľutujeme, používateľ %{user} neexistuje. Prosím skontrolujte váš text, alebo ste možno klikli na nesprávny odkaz. + heading: Používateľ %{user} neexistuje + title: Taký používateľ neexistuje popup: friend: Priateľ - nearby mapper: Blízky mapovač + nearby mapper: Používateľ v okolí your location: VaÅ¡a poloha remove_friend: not_a_friend: "%{name} nie je nikto z vaÅ¡ich priateľov." @@ -1362,167 +1659,200 @@ sk: reset_password: confirm password: "PotvrdiÅ¥ Heslo:" flash changed: VaÅ¡e heslo bolo zmenené. - flash token bad: Nemôžem nájsÅ¥ také symboly, možno skontrolujte URL? + flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL. heading: Resetnúť heslo pre %{user} password: "Heslo:" reset: ZmazaÅ¥ Heslo title: Resetnúť heslo set_home: flash success: Domáca poloha úspeÅ¡ne uložená + suspended: + body: "<p>\n Ľutujeme, ale vaÅ¡e konto bolo pozastavené kvôli podozrivej aktivite.\n</p>\n<p>\n Toto rozhodnutie onedlho posúdi niektorý správca, prípadne\n môžete skúsiÅ¥ kontaktovaÅ¥ %{webmaster}.\n</p>" + heading: Konto bolo pozastavené + title: Konto bolo pozastavené + webmaster: webmastera terms: + agree: Súhlasím + consider_pd: NavyÅ¡e k uvedenej dohode vyhlasujem, že považujem svoje príspevky za slobodné dielo (Public Domain). + consider_pd_why: čo je toto? + decline: Nesúhlasím + guidance: "Informácie, ktoré Vám môžu pomôcÅ¥ porozumieÅ¥ týmto podmienkam: <a href=\"%{summary}\">zhrnutie</a> a nejaké <a href=\"%{translations}\">neoficiálne preklady</a>" heading: Podmienky prispievania + legale_names: + france: Francúzsko + italy: Taliansko + rest_of_world: ZvyÅ¡ok sveta + legale_select: "Zvoľte prosím svoju domovskú krajinu:" + read and accept: Prečítajte si prosím nižšie uvedenú dohodu a kliknite na tlačítko súhlasu, čím potvrdíte, že prijímate podmienky tejto dohody pre existujúce aj budúce príspevky. title: Podmienky prispievania + you need to accept or decline: Pre pokračovanie si prosím prečítajte a príjmite, alebo odmietnite nové Podmienky prispievania. view: - activate_user: aktivovaÅ¥ tohto užívateľa + activate_user: aktivovaÅ¥ tohoto používateľa add as friend: pridaÅ¥ ako priateľa - ago: (%{time_in_words_ago}) - block_history: zobraziÅ¥ prijaté položky + ago: (pred %{time_in_words_ago}) + block_history: prijaté bloky blocks by me: blokovaÅ¥ pre mňa blocks on me: moje zablokovania + comments: komentáre confirm: PotvrdiÅ¥ - create_block: blokovaÅ¥ tohto užívateľa + confirm_user: potvrdiÅ¥ tohoto používateľa + create_block: blokovaÅ¥ tohoto používateľa created from: "Vytvorené od:" ct accepted: Prijaté pred %{ago} - deactivate_user: deaktivovaÅ¥ tohto užívateľa - delete_user: vymazaÅ¥ tohto užívateľa + ct declined: Odmietnuté + ct status: "Podmienky prispievania:" + ct undecided: Nerozhodnuté + deactivate_user: deaktivovaÅ¥ tohoto používateľa + delete_user: vymazaÅ¥ tohoto používateľa description: Popis diary: denník edits: úpravy email address: "Emailová adresa:" - hide_user: skryÅ¥ tohto užívateľa - if set location: Ak nastavíte vaÅ¡u polohu, a pretty map and stuff sa objavý dole. Môžete nastaviÅ¥ vaÅ¡u domovskú polohu na vaÅ¡ej %{settings_link} stránke. - km away: Vzdialený %{count}km - latest edit: "Posledné úpravy %{ago}:" - m away: Vzdialený %{count}m + friends_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien priateľov + friends_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy priateľov + hide_user: skryÅ¥ tohto používateľa + if set location: Ak si na stránke %{settings_link} zvolíte domovské miesto, zobrazí sa tu mapka vášho okolia. + km away: vzdialený %{count}km + latest edit: "Posledné úpravy pred %{ago}:" + m away: vzdialený %{count}m mapper since: "Mapuje od:" - moderator_history: zobraziÅ¥ zadaný blok - my diary: môj diár + moderator_history: odovzdané bloky + my comments: moje komentáre + my diary: môj denník my edits: moje úpravy my settings: moje nastavenia my traces: moje stopy - nearby users: Ďalší užívatelia v okolí - new diary entry: nový údaj denníka + nearby users: Ďalší používatelia v okolí + nearby_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien používateľov v okolí + nearby_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy používateľov v okolí + new diary entry: nový záznam denníka no friends: EÅ¡te nemáte pridaných žiadnych priateľov. - no nearby users: Nie je tu iný užívateľ, ktorý priznáva mapovanie v okolí. - oauth settings: Oauth nastavenia + no nearby users: Nie je tu iný používateľ, ktorý priznáva mapovanie v okolí. + oauth settings: oauth nastavenia remove as friend: odstrániÅ¥ ako priateľa role: - administrator: Tento užívateľ je administrátor + administrator: Tento používateľ je administrátor grant: administrator: PovoliÅ¥ prístup administrátora moderator: PovoliÅ¥ prístup moderátora - moderator: Tento užívateľ je moderátor + moderator: Tento používateľ je moderátor revoke: administrator: ZruÅ¡iÅ¥ prístup administrátora moderator: ZruÅ¡iÅ¥ prístup moderátora send message: poslaÅ¥ správu settings_link_text: nastavenia + spam score: "Spam skóre:" status: "Stav:" traces: stopy - unhide_user: odkryÅ¥ tohto užívateľa - user location: Poloha užívateľa + unhide_user: zobraziÅ¥ tohoto používateľa + user location: Poloha používateľa your friends: VaÅ¡i priatelia user_block: blocks_by: - empty: "%{name} nemá eÅ¡te žiadne bloky" - heading: Zoznam blokov pre %{name} - title: Bloky %{name} + empty: "%{name} eÅ¡te nikoho nezablokoval" + heading: Zoznam blokov od pre %{name} + title: Bloky od %{name} blocks_on: empty: "%{name} doteraz eÅ¡te nebol blokovaný." - heading: Zoznam blokov na %{name} - title: Bloky na %{name} + heading: Zoznam blokov používateľa %{name} + title: Bloky používateľa %{name} create: - flash: ZablokovaÅ¥ užívateľa %{name}. - try_contacting: Prosím skúste sa spojiÅ¥ s užívateľom, pred jeho zablokovaním a dajte mu primeraný čas na odpoveď. - try_waiting: Prosím skúste dávaÅ¥ užívateľovi primeraný čas na odpoveď, kým ho zablokujete. + flash: Používateľ %{name} bol zablokovaný. + try_contacting: Skúste sa prosím s používateľom pred jeho zablokovaním spojiÅ¥ a dajte mu primeraný čas na odpoveď. + try_waiting: Prosím skúste dávaÅ¥ používateľovi primeraný čas na odpoveď, kým ho zablokujete. edit: back: ZobraziÅ¥ vÅ¡etky bloky heading: Editácia bloku na %{name} - needs_view: Užívateľ sa potrebuje prihlásiÅ¥ pred tým, než blok bude vymazaný? - period: Ako dlho, teraz začínajúc, bude užívateľ zablokovaný pre API. - reason: Dôvod prečo %{name} je blokovaný. Prosím buďte kľudný a rozumný ako je možné, poskytujte mnoho detailov, koľko len môžete o situácii. Majte na pamäti, že nie vÅ¡etci užívatelia rozumejú jazyku komunity, tak prosím skúste použiÅ¥ pojmy pre laikov. + needs_view: Potrebuje sa používateľ prihlásiÅ¥ pred tým, než bude tento blok vymazaný? + period: Ako dlho (odteraz) bude používateľ zablokovaný pre používanie API. + reason: Dôvod, prečo je %{name} blokovaný. Buďte prosím vecný a popíšte čo najpodrobnejÅ¡ie situáciu. Majte na pamäti, že nie vÅ¡etci používatelia rozumejú slangu komunity, skúste preto použiÅ¥ pojmy, zrozumiteľné aj pre laikov. show: ZobraziÅ¥ tento blok submit: Aktualizácia bloku title: Editácia bloku na %{name} filter: block_expired: Blok už vyprÅ¡al a nemôže byÅ¥ upravený. block_period: Blokovacia doba musí byÅ¥ jedna z hodnôt voliteľná v roletovom menu. - not_a_moderator: Potrebujete byÅ¥ administrátor na vykonanie tejto akcie. helper: - time_future: Ukončené v %{time}. + time_future: Končí o %{time}. time_past: Ukončené pred %{time}. - until_login: Aktívny až do prihlásenia užívateľa. + until_login: Aktívny až do prihlásenia používateľa. index: empty: Žiaden blok eÅ¡te nebol vytvorený. - heading: Zoznam užívateľských blokov - title: Užívateľské bloky + heading: Zoznam blokov používateľa + title: Bloky používateľa model: non_moderator_revoke: Musíte byÅ¥ moderátorom na zruÅ¡enie bloku. non_moderator_update: Musí byÅ¥ moderátorom na vytvorenie alebo aktualizáciu bloku. new: back: ZobraziÅ¥ vÅ¡etky bloky heading: Vytvorenie bloku na %{name} - needs_view: Užívateľ musí byÅ¥ prihlásený, aby mohol vymazaÅ¥ tento blok - period: Ako dlho, teraz začínajúc, bude užívateľ blokovaný pre API. - reason: Dôvod prečo %{name} je blokovaný. Prosím buďte kľudný a rozumný ako je možné, poskytujte mnoho detailov, koľko len môžete o situácii. Majte na pamäti, že nie vÅ¡etci užívatelia rozumejú jazyku komunity, tak prosím skúste použiÅ¥ pojmy pre laikov. + needs_view: Aby sa blok zmazal, požívateľ sa musí najprv prihlásiÅ¥. + period: Ako dlho (odteraz) bude používateľ zablokovaný pre používanie API. + reason: Dôvod, prečo je %{name} blokovaný. Buďte prosím vecný a popíšte čo najpodrobnejÅ¡ie situáciu. Majte na pamäti, že nie vÅ¡etci používatelia rozumejú slangu komunity, skúste preto použiÅ¥ pojmy, zrozumiteľné aj pre laikov. Správa bude verejne viditeľná. submit: VytvoriÅ¥ blok title: Vytváram blok na %{name} - tried_contacting: Kontaktoval som užívateľa a požiadal ho, aby prestal. - tried_waiting: Prideľte primerané množstvo času pre odpoveď užívateľa na túto komunikáciu. + tried_contacting: Kontaktoval som používateľa a požiadal ho, aby prestal. + tried_waiting: Prideľte primerané množstvo času pre odpoveď používateľa na túto komunikáciu. not_found: back: Naspäť na zoznam - sorry: Prepáčte, blok užívateľa s ID %{id} nemohol byÅ¥ nájdený. + sorry: Ľutujeme, blok používateľa s ID %{id} nebol nájdený. partial: confirm: Ste si istí? creator_name: Tvorca - display_name: Blokovaný užívateľ + display_name: Blokovaný používateľ edit: UpraviÅ¥ + next: ĎalÅ¡ia stránka » not_revoked: (nezruÅ¡ený) + previous: « Predchádzajúca stránka reason: Dôvod pre blokovanie revoke: ZruÅ¡iÅ¥! revoker_name: ZruÅ¡il show: ZobraziÅ¥ status: Stav + period: + few: "%{count} hodiny" + one: 1 hodina + other: "%{count} hodín" revoke: confirm: Ste si istí, že chcete zruÅ¡iÅ¥ tento blok? flash: Tento blok bol zruÅ¡ený. - heading: ZruÅ¡ujem blok pre %{block_on} podľa %{block_by} - past: Tento blok skončil pred %{time}a teraz nemože byÅ¥ zruÅ¡ený. + heading: ZruÅ¡enie bloku pre %{block_on} od %{block_by} + past: Tento blok už skončil pred %{time} a nemože byÅ¥ zruÅ¡ený. revoke: ZruÅ¡iÅ¥! - time_future: Tento blok bol ukončený v %{time}. - title: ZruÅ¡ujem blok pre %{block_on} + time_future: Tento blok skončí v %{time}. + title: ZruÅ¡enie bloku pre %{block_on} show: back: ZobraziÅ¥ vÅ¡etky blokovania confirm: Ste si istý? edit: UpraviÅ¥ - heading: "%{block_on} blokovaný %{block_by}" - needs_view: Užívateľ sa potrebuje prihlásiÅ¥ predtým, ako bude toto blokovanie odstránené. + heading: "%{block_on} zablokovaný používateľom %{block_by}" + needs_view: Aby sa blok zmazal, požívateľ sa musí najprv prihlásiÅ¥. reason: "Dôvod blokovania:" revoke: OdvolaÅ¥! - revoker: "Odvolaním:" + revoker: "Odvolal:" show: ZobraziÅ¥ - status: Postavenie - time_future: Skončené %{time} + status: Stav + time_future: Končí o %{time} time_past: Ukončené pred %{time} - title: "%{block_on} blokovaný %{block_by}" + title: "%{block_on} zablokovaný používateľom %{block_by}" update: only_creator_can_edit: Iba moderátor, ktorý vytvoril tento blok, ho môže editovaÅ¥. success: Blok je aktualizovaný. user_role: filter: - already_has_role: Užívateľ už má úlohu %{role}. - doesnt_have_role: Užívateľ nemá úlohu %{role}. + already_has_role: Používateľ už má úlohu %{role}. + doesnt_have_role: Požívateľ nemá úlohu %{role}. not_a_role: ReÅ¥azec `%{role}' nemá platnú úlohu. - not_an_administrator: Iba administrátor môže pracovaÅ¥ so správou užívateľských funkcií, a vy nieste administrátor. + not_an_administrator: Iba administrátori môžu spravovaÅ¥ prístupové práva. Vy administrátor nie ste. grant: - are_you_sure: Naozaj chcete prideliÅ¥ úlohu `%{role}' pre užívateľa `%{name}'? + are_you_sure: Naozaj chcete prideliÅ¥ úlohu `%{role}' pre používateľa `%{name}'? confirm: PotvrdiÅ¥ - fail: Nemôžem prideliÅ¥ úlohu `%{role}' pre užívateľa `%{name}'. Prosím vybraÅ¥ aby užívateľ a úloha boli obe oprávnené. + fail: Nemôžem prideliÅ¥ úlohu `%{role}' pre používateľa `%{name}'. Prosím vybraÅ¥ aby používateľ a úloha boli obe oprávnené. heading: PotvrdiÅ¥ pridelenie funkcie title: PotvrdiÅ¥ pridelenie funkcie revoke: - are_you_sure: Určite chcete zruÅ¡iÅ¥ úlohu `%{role}' od užívateľa `%{name}'? + are_you_sure: Určite chcete zruÅ¡iÅ¥ úlohu `%{role}' používateľa `%{name}'? confirm: PotvrdiÅ¥ - fail: Nemôžem zruÅ¡iÅ¥ úlohu `%{role}' od užívateľa `%{name}'. Prosím skontrolujte aby užívateľ a úloha boli oprávnené. + fail: Nemôžem zruÅ¡iÅ¥ úlohu `%{role}' od používateľa `%{name}'. Prosím skontrolujte aby používateľ a úloha boli oprávnené. heading: PotvrdiÅ¥ zruÅ¡enie funkcie title: PotvrdiÅ¥ zruÅ¡enie funkcie diff --git a/config/locales/sl.yml b/config/locales/sl.yml index a1a09dd5a..1763313ba 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1,4 +1,4 @@ -# Messages for Slovenian (Slovenščina) +# Messages for Slovenian (slovenščina) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Dbc334 @@ -75,6 +75,8 @@ sl: application: require_cookies: cookies_needed: Izgleda imate onemogočene piÅ¡kotke - prosim omogočite jih v vaÅ¡em brskalniku preden nadaljujete. + require_moderator: + not_a_moderator: Morate biti moderator za izvedbo tega dejanja. setup_user_auth: blocked: VaÅ¡ dostop do API je bil blokiran. Prosimo, prijavite se na spletno stran, če želite izvedeti več. need_to_see_terms: VaÅ¡ dostop do API, je začasno prekinjen. Prosimo, prijavite se na spletno stran in si oglejte pogoje "Contributor Terms". Ni se vam treba strinjati, vendar si jih morate ogledati. @@ -82,7 +84,6 @@ sl: changeset: changeset: "Paket sprememb: %{id}" changesetxml: Paket sprememb XML - download: Prenesi %{changeset_xml_link} ali %{osmchange_xml_link} feed: title: Paket sprememb %{id} title_comment: Paket sprememb %{id} - %{comment} @@ -95,20 +96,22 @@ sl: closed_at: "Zaključen:" created_at: "Ustvarjen:" has_nodes: - one: "Vsebuje naslednje %{count} vozlišče:" - other: "Vsebuje naslednjih %{count} vozlišč:" + few: "Vsebuje %{count} vozlišča:" + one: "Vsebuje %{count} vozlišče:" + other: "Vsebuje %{count} vozlišč:" + two: "Vsebuje %{count} vozlišči:" has_relations: - few: "Vsebuje naslednje %{count} zveze:" - one: "Vsebuje naslednjo zvezo:" - other: "Vsebuje naslednjih %{count} zvez:" - two: "Vsebuje naslednji zvezi:" + few: "Vsebuje %{count} zveze:" + one: "Vsebuje %{count} zvezo:" + other: "Vsebuje %{count} zvez:" + two: "Vsebuje %{count} zvezi:" has_ways: - one: "Vsebuje naslednjo %{count} pot:" - other: "Vsebuje naslednjih %{count} poti:" + one: "Vsebuje %{count} pot:" + other: "Vsebuje %{count} poti:" no_bounding_box: Ta paket nima določenega pravokotnega področja. show_area_box: Prikaži pravokotno področje common_details: - changeset_comment: "Pripomba:" + changeset_comment: "Komentar:" deleted_at: "Izbrisan ob:" deleted_by: "Izbrisal:" edited_at: "Urejeno ob:" @@ -146,21 +149,19 @@ sl: next_changeset_tooltip: Naslednji prispevek uporabnika %{user} prev_changeset_tooltip: PrejÅ¡nji prispevek uporabnika %{user} node: - download: "%{download_xml_link} ali %{view_history_link}" download_xml: prenesi XML - edit: uredi + edit: Uredi vozlišče node: Vozlišče node_title: "Vozlišče: %{node_name}" - view_history: poglej zgodovino + view_history: Poglej zgodovino node_details: coordinates: "Koordinate:" part_of: "Del:" node_history: - download: "%{download_xml_link} ali %{view_details_link}" download_xml: prenesi XML node_history: Zgodovina vozlišča node_history_title: "Zgodovina vozlišča: %{node_name}" - view_details: poglej podrobnosti + view_details: Poglej podrobnosti not_found: sorry: Oprostite, %{type} z ID-jem %{id} ne obstaja v bazi. type: @@ -171,17 +172,22 @@ sl: paging_nav: of: od showing_page: Prikazana stran + redacted: + message_html: Verzija %{version} te %{type} ne more biti prikazana, ker je bila zavrnjena licenca. Glej %{redaction_link} za podrobnosti. + redaction: Redakcija %{id} + type: + node: vozlišče + relation: zveza + way: pot relation: - download: "%{download_xml_link} ali %{view_history_link}" download_xml: prenesi XML relation: Zveza relation_title: "Zveza: %{relation_name}" - view_history: poglej zgodovino + view_history: Poglej zgodovino relation_details: members: "Člani:" part_of: "Del:" relation_history: - download: "%{download_xml_link} ali %{view_details_link}" download_xml: Prenesi XML relation_history: Zgodovina zveze relation_history_title: "Zgodovina zveze: %{relation_name}" @@ -197,14 +203,14 @@ sl: view_data: Ogled podatkov trenutno prikazanega zemljevida start_rjs: data_frame_title: Podatki - data_layer_name: Podatki + data_layer_name: Prebrskaj podatke zemljevida details: Podrobnosti drag_a_box: Za izbor področja povlecite pravokotnik na zemljevidu edited_by_user_at_timestamp: Uredil [[user]] v [[timestamp]] hide_areas: Skrij področja history_for_feature: Zgodovina [[feature]] load_data: Naloži podatke - loaded_an_area_with_num_features: "Naložili ste področje, ki vsebuje [[num_features]] elementov. Nekateri spletni brskalniki ne zmorejo prikaza takÅ¡ne količine podatkov. Na sploÅ¡no brskalniki najbolje prikazujejo 100 ali manj elementov hkrati: karkoli drugega lahko upočasni vaÅ¡ brskalnik ali ga naredi neodzivnega. Če ste prepričani, da želite prikazati vse te podatke, pritisnite na spodnji gumb." + loaded_an_area_with_num_features: "Naložili ste področje, ki vsebuje [[num_features]] elementov. Nekateri spletni brskalniki ne zmorejo prikaza takÅ¡ne količine podatkov. Na sploÅ¡no brskalniki najbolje prikazujejo [[max_features]] ali manj elementov hkrati: karkoli drugega lahko upočasni vaÅ¡ brskalnik ali ga naredi neodzivnega. Če ste prepričani, da želite prikazati vse te podatke, pritisnite na spodnji gumb." loading: Nalaganje ... manually_select: Ročno izberite drugo področje object_list: @@ -243,10 +249,9 @@ sl: relation: zveza way: pot way: - download: "%{download_xml_link}, %{view_history_link} ali %{edit_link}" download_xml: prenesi XML - edit: uredi - view_history: poglej zgodovino + edit: Uredi pot + view_history: Poglej zgodovino way: Pot way_title: "Pot: %{way_name}" way_details: @@ -255,9 +260,8 @@ sl: nodes: "Vozlišča:" part_of: "Del:" way_history: - download: "%{download_xml_link} ali %{view_details_link}" download_xml: prenesi XML - view_details: poglej podrobnosti + view_details: Poglej podrobnosti way_history: Zgodovina poti way_history_title: "Zgodovina poti: %{way_name}" changeset: @@ -283,27 +287,43 @@ sl: list: description: Nedavne spremembe description_bbox: Paketi sprememb znotraj področja %{bbox} + description_friend: Paketi sprememb vaÅ¡ih prijateljev + description_nearby: Paketi sprememb bližnjih uporabnikov description_user: Paketi sprememb uporabnika %{user} description_user_bbox: Paketi sprememb uporabnika %{user} znotraj %{bbox} heading: Paketi sprememb heading_bbox: Paketi sprememb + heading_friend: Paketi sprememb + heading_nearby: Paketi sprememb heading_user: Paketi sprememb heading_user_bbox: Paketi sprememb title: Paketi sprememb title_bbox: Paketi sprememb znotraj področja %{bbox} + title_friend: Paket sprememb vaÅ¡ih prijateljev + title_nearby: Paketi sprememb bližnjih uporabnikov title_user: Paketi sprememb uporabnika %{user} title_user_bbox: Paketi sprememb uporabnika %{user} znotraj %{bbox} timeout: sorry: Žal je seznam zahtevanih sprememb predolg za prenos. diary_entry: + comments: + ago: pred %{ago} + comment: Komentar + has_commented_on: "%{display_name} je komentiral naslednje vaÅ¡e vnose v dnevnik" + newer_comments: NovejÅ¡i komentarji + older_comments: StarejÅ¡i komentarji + post: Objavi + when: Kdaj diary_comment: comment_from: Komentar uporabnika %{link_user} dne %{comment_created_at} confirm: Potrdi hide_link: Skrij ta komentar diary_entry: comment_count: + few: "%{count} komentarje" one: "%{count} komentar" other: "%{count} komentarjev" + two: "%{count} komentarja" comment_link: Komentiraj ta vnos confirm: Potrdi edit_link: Uredi ta vnos @@ -340,6 +360,8 @@ sl: older_entries: StarejÅ¡i zapisi recent_entries: "Nedavni zapisi v dnevnik:" title: Dnevniki uporabnikov + title_friends: Dnevniki vaÅ¡ih prijateljev + title_nearby: Dnevniki bližnjih uporabnikov user_title: Dnevnik uporabnika %{user} location: edit: Uredi @@ -351,10 +373,6 @@ sl: body: Oprostite, vnosa v dnevnik Å¡t. %{id} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili. heading: "Vnosa v dnevnik z id-jem: %{id} ni" title: TakÅ¡nega vnosa v dnevnik ni - no_such_user: - body: Oprostite, uporabnika z imenom %{user} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili. - heading: Uporabnik %{user} ne obstaja - title: Ni tega uporabnika view: leave_a_comment: NapiÅ¡i komentar login: Prijavite se @@ -387,6 +405,7 @@ sl: licence: Dovoljenje longitude: "Dol:" manually_select: Ročno izberite drugo področje + map_image: Slika zemljevida (prikaže standardni izris) max: največ options: Možnosti osm_xml_data: Podatki OpenStreetMap v zapisu XML @@ -427,9 +446,9 @@ sl: south_west: jugozahodno west: zahodno distance: - one: približno %{count} km + one: približno en km other: približno %{count} km - zero: manj kot 1 km + zero: manj kot en km results: more_results: Več zadetkov no_results: Ni zadetkov @@ -447,13 +466,24 @@ sl: suffix_place: ", %{distance} %{direction} od %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodrom + apron: LetaliÅ¡ka ploščad + gate: Vrata + helipad: Heliodrom + runway: Vzletna steza + taxiway: Vozna steza + terminal: Terminal amenity: + WLAN: WiFi dostop airport: Letališče arts_centre: Umetnostni center + artwork: Umetnina atm: Bankomat auditorium: Avditorij bank: Banka bar: Bar + bbq: Žar bench: Klop bicycle_parking: Parkirišče za kolesa bicycle_rental: Izposoja koles @@ -465,6 +495,7 @@ sl: car_sharing: Souporaba avtomobila car_wash: Avtopralnica casino: Kazino + charging_station: Polnilna postaja cinema: Kinematograf clinic: Klinika club: Klub @@ -523,9 +554,11 @@ sl: shelter: Zaklonišče shop: Trgovina shopping: Nakupovanje + shower: TuÅ¡ social_club: DruÅ¡tveni klub studio: Studio supermarket: Supermarket + swimming_pool: Bazen taxi: Taksi telephone: Telefonska govorilnica theatre: Gledališče @@ -540,37 +573,13 @@ sl: youth_centre: Mladinski center boundary: administrative: Upravne meje + national_park: Nacionalni Park + protected_area: Zavarovano območje + bridge: + viaduct: Viadukt + "yes": Most building: - apartments: Stanovanjski blok - block: Blok - bunker: Bunker - chapel: Kapelica - church: Cerkev - city_hall: Mestna hiÅ¡a - commercial: Poslovna zgradba - dormitory: Å tudentski dom - entrance: Vhod - faculty: Fakulteta - farm: Kmetija - flats: Stanovanja - garage: Garaža - hall: Dvorana - hospital: BolniÅ¡nica - hotel: Hotel - house: HiÅ¡a - industrial: Industrijski objekt - office: Poslovna stavba - public: Javne zgradba - residential: Stanovanjska stavba - retail: Trgovina na drobno - school: Å ola - shop: Trgovina - stadium: Stadion - store: Trgovina - terrace: Terasa - tower: Stolp - train_station: ŽelezniÅ¡ka postaja - university: Univerza + "yes": Zgradba highway: bridleway: Jahalna pot bus_guideway: Turistični avtobus @@ -578,12 +587,11 @@ sl: byway: Obvoz construction: Autocesta v izgradnji cycleway: Kolesarska steza - distance_marker: Kilometerski stebriček emergency_access_point: Dostop za interventna vozila footway: PeÅ¡pot ford: Prehod - gate: Vrata living_street: Ulica z umirjenim prometom + milestone: Kilometerski kamen minor: ManjÅ¡a cesta motorway: Avtocesta motorway_junction: Avtocestno križišče @@ -595,6 +603,7 @@ sl: primary_link: Priključek na glavno cesto raceway: Dirkališče residential: Stanovanjska + rest_area: Počivališče road: Nedoločena cesta secondary: Regionalna cesta secondary_link: Priključek na regionalno cesto @@ -640,6 +649,7 @@ sl: farmland: Kmetijsko zemljišče farmyard: Vrt forest: Gozd + garages: Garaže grass: Travnik greenfield: Pripravljeno za gradbišče industrial: Industrijska cona @@ -647,11 +657,10 @@ sl: meadow: Travnik military: VojaÅ¡ko območje mine: Minsko polje - mountain: Planina nature_reserve: Naravni rezervat + orchard: Sadovnjak park: Park piste: Proga - plaza: Trg quarry: Dnevni kop railway: Železnica recreation_ground: Rekreacijsko območje @@ -676,12 +685,17 @@ sl: pitch: Å portno igrišče playground: OtroÅ¡ko igrišče recreation_ground: Rekreacijsko območje + sauna: Savna slipway: Rampa sports_centre: Å portni center stadium: Stadion swimming_pool: Bazen track: TekaÅ¡ka proga water_park: Vodni park + military: + airfield: VojaÅ¡ko letališče + barracks: VojaÅ¡nica + bunker: Bunker natural: bay: Zaliv beach: Obala @@ -689,7 +703,6 @@ sl: cave_entrance: Vhod v jamo channel: Kanal cliff: Klif - coastline: Obala crater: Krater feature: Znamenitost fell: ViÅ¡inski travnik @@ -769,7 +782,6 @@ sl: yard: ŽelezniÅ¡ko dvorišče shop: alcohol: Trgovina alkoholnih pijač - apparel: Trgovina z oblekami art: Prodajna galerija bakery: Pekarna beauty: Salon lepote @@ -778,7 +790,6 @@ sl: books: Knjigarna butcher: Mesar car: Avtomobilski salon - car_dealer: Avto trgovec car_parts: Avtomobilski deli car_repair: Avtoservis carpet: Prodajalna preprog @@ -793,7 +804,6 @@ sl: department_store: Trgovska hiÅ¡a discount: Outlet doityourself: Orodjarna - drugstore: Lekarna dry_cleaning: Čistilnica electronics: Elektronska trgovina estate_agent: Nepremičninska agencija @@ -859,6 +869,8 @@ sl: valley: Dolina viewpoint: Razgledna točka zoo: Živalski vrt + tunnel: + "yes": Predor waterway: boatyard: Ladjedelnica canal: Prekop @@ -884,6 +896,8 @@ sl: map: base: cycle_map: Kolesarska karta + standard: Privzeta karta + transport_map: Transportna karta site: edit_disabled_tooltip: Povečajte za urejanje zemljevida edit_tooltip: Urejanje zemljevida @@ -892,6 +906,7 @@ sl: history_tooltip: Prikaži urejanja za to področje history_zoom_alert: Morate povečati karto za ogled urejanj na tem področju layouts: + community: Skupnost community_blogs: Blogi skupnosti community_blogs_title: Blogi članov skupnosti OpenStreetMap copyright: Avtorske pravice & licenca @@ -913,18 +928,18 @@ sl: history: Zgodovina home: domov home_tooltip: Prikaži domači kraj - inbox: prejeto (%{count}) inbox_tooltip: - one: Prejeli ste %{count} novo sporočilo - other: Prejeli ste %{count} novih sporočil - zero: Niste prejeli novih spročil + few: Prejeli ste %{count} nova sporočila. + one: Prejeli ste %{count} novo sporočilo. + other: Prejeli ste %{count} novih sporočil. + two: Prejeli ste %{count} novi sporočili. + zero: Niste prejeli novih spročil. intro_1: OpenStreetMap je prost zemljevid sveta, ki ga urejajo ljudje, kot ste Vi. - intro_2: OpenStreetMap vam omogoča ogled, urejanje in souporabo geografskih podatkov kjerkoli na Zemlji. - intro_3: Gostovanje OpenStreetMap prijazno podpirajo %{ucl}, %{ic} in %{bytemark}. Drugi podporniki projekta so navedeni na %{partners}. - intro_3_bytemark: bytemarku - intro_3_ic: Imperial College v Londonu - intro_3_partners: wiki - intro_3_ucl: UCL VR Centru + intro_2_create_account: Ustvarite uporabniÅ¡ki račun + intro_2_download: prenesejo + intro_2_html: Podatki se lahko brezplačno %{download} in %{use} po %{license}. %{create_account} in izboljÅ¡ajte zemljevid. + intro_2_license: odprti licenci + intro_2_use: uporabijo license: title: Podatki OpenStreetMap so licencirani v skladu z Creative Commons Attribution-Share Alike 2.0 Generic License log_in: prijava @@ -938,9 +953,13 @@ sl: title: Podprite OpenStreetMap z denarnim prispevkom osm_offline: Baza OpenStreetMap zaradi izvajanja nujnih vzdrževalnih del trenutno ni dostopna. osm_read_only: Baza OpenStreetMap je zaradi izvajanja nujnih vzdrževalnih del trenutno dostopna le za branje. + partners_bytemark: Bytemark Hosting + partners_html: Gostovanje podpira %{ucl}, %{ic} in %{bytemark}, ter ostali %{partners}. + partners_ic: Imperial College v Londonu + partners_partners: partnerji + partners_ucl: UCL VR Center sign_up: ustvari račun sign_up_tooltip: Ustvarite si nov uporabniÅ¡ki račun za urejanje - sotm2011: Pridite konferenco OpenStreetMap 2011, stanje karte, 9-11 September v Denverju! tag_line: Prost wiki zemljevid sveta user_diaries: Dnevnik user_diaries_tooltip: Pregled dnevnikov uporabnikov @@ -957,7 +976,7 @@ sl: title: O tem prevodu native: mapping_link: začnete kartirati - native_link: Slovensko verzija + native_link: Slovensko verzijo text: Berete angleÅ¡ko različico avtorskih strani. Lahko se vrnete na %{native_link} te strani, ali se lahko ustavite branje o avtorskih pravicah in %{mapping_link}. title: O tej strani message: @@ -966,8 +985,19 @@ sl: inbox: date: Datum from: Od + messages: Imate %{new_messages} in %{old_messages}. my_inbox: Moja prejeta + new_messages: + few: "%{count} nova sporočila" + one: "%{count} novo sporočilo" + other: "%{count} novih sporočil" + two: "%{count} novi sporočili" no_messages_yet: Prejeli niste Å¡e nobenih sporočil. Zakaj ne bi stopili v stik z %{people_mapping_nearby_link}? + old_messages: + few: "%{count} stara sporočila" + one: "%{count} staro sporočilo" + other: "%{count} starih sporočil" + two: "%{count} stari sporočili" outbox: poslana poÅ¡ta people_mapping_nearby: ljudmi, ki kartirajo blizu vas subject: Zadeva @@ -993,13 +1023,14 @@ sl: body: Žal ni sporočila, s tem id-jem. heading: Ni tega sporočila title: Ni tega sporočila - no_such_user: - body: Oprostite, uporabnika s tem imenom ni. - heading: Ni takega uporabnika - title: Ni takega uporabnika outbox: date: Datum inbox: prejeta + messages: + few: Imate %{count} poslana sporočila + one: Imate %{count} poslano sporočilo + other: Imate %{count} poslanih sporočil + two: Imate %{count} poslani sporočili my_inbox: Moja %{inbox_link} no_sent_messages: Poslali niste Å¡e nobenih sporočil. Zakaj ne bi stopili v stik z %{people_mapping_nearby_link}? outbox: poslana poÅ¡ta @@ -1165,6 +1196,8 @@ sl: allow_write_gpx: nalaganje sledi GPS. allow_write_prefs: spreminjanje uporabniÅ¡kih nastavitev. authorize_url: "URL za potrditev zahteve:" + confirm: Ali ste prepričani? + delete: IzbriÅ¡i odjemalca edit: Urejanje podrobnosti key: "Uporabnikov ključ:" requests: "Zahteva dovoljenja za naslednje dostope do uporabnikovih podatkov:" @@ -1176,6 +1209,37 @@ sl: flash: Informacije odjemalca uspeÅ¡no posodobljene printable_name: with_version: "%{id}, %{version}. različica" + redaction: + create: + flash: Redakcija ustvarjena. + destroy: + error: PriÅ¡lo je do napake, ob uničevanju te redakcije. + flash: Redakcija uničena. + not_empty: Redakcija ni prazna. Prosim od-revidirajte vse različice, ki pripadajo tej redakciji preden jo uničite. + edit: + description: Opis + heading: Uredi redakcijo + submit: Shrani redakcijo + title: Uredi redakcijo + index: + empty: Ni redakcije za pokazati. + heading: Seznam redakcij + title: Seznam redakcij + new: + description: Opis + heading: Vnesite informacije za novo redakcijo + submit: Ustvarite redakcijo + title: Ustvarite novo redakcijo + show: + confirm: Ali ste prepričani? + description: "Opis:" + destroy: Odstrani to redakcijo + edit: Uredi to redakcijo + heading: Prikazujem redakcijo "%{title}" + title: Prikazujem redakcijo + user: "Ustvarjalec:" + update: + flash: Spremembe shranjene. site: edit: anon_edits_link_text: Pojasnilo zakaj je temu tako. @@ -1190,7 +1254,6 @@ sl: index: js_1: Bodisi uporabljate brskalnik, ki ne podpira Javascript-a, ali pa je izvajanje Javascript-a onemogočeno. js_2: OpenStreetMap za prikaz zemljevida uporablja Javascript. - js_3: Če Javascripta ne morete omogočiti lahko poizkusite <a href="http://tah.openstreetmap.org/Browse/">statičen pregledovalnik zemljevida Tiles@Home</a>. license: license_name: Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0 notice: "%{project_name} z avtorji objavlja pod licenco %{license_name}." @@ -1267,6 +1330,23 @@ sl: unclassified: Ostale ceste izven naselij unsurfaced: Neasfaltirana cesta wood: Pragozd + markdown_help: + alt: Dodatno besedilo + first: Prvi element + heading: Poglavje + headings: Poglavja + image: Slika + link: Povezava + ordered: Urejen seznam + second: Drugi element + subheading: Podpoglavje + text: Besedilo + title_html: Obdelano z <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Neurejen seznam + url: URL + richtext_area: + edit: Uredi + preview: Predogled search: search: Iskanje search_help: "primeri: 'Bovec', 'PreÅ¡ernova, Celje', 'Živalski vrt' ali 'vzpenjača' <a href='http://wiki.openstreetmap.org/wiki/Search'>Več primerov...</a>" @@ -1309,10 +1389,6 @@ sl: your_traces: VaÅ¡e sledi GPS make_public: made_public: Sled je postala javna - no_such_user: - body: Oprostite, uporabnika z imenom %{user} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili. - heading: Uporabnik %{user} ne obstaja - title: Ni tega uporabnika offline: heading: GPX sistem trenutno ni na voljo message: Sistem za nalaganje GPX datotek in GPX sistem trenutno nista na voljo @@ -1351,8 +1427,6 @@ sl: trace_optionals: tags: Oznake trace_paging_nav: - next: Naslednja » - previous: « PrejÅ¡nja showing_page: Prikazujem stran %{page} view: delete_track: IzbriÅ¡i to sled @@ -1453,12 +1527,13 @@ sl: heading: Uporabniki hide: Skrij izbrane uporabnike showing: - one: Prikazujem stran %{page} (%{first_item} od %{items}) - other: Prikazujem stran %{page} (%{first_item}-%{last_item} od %{items}) + one: Stran %{page} (%{first_item} od %{items}) + other: Stran %{page} (%{first_item}-%{last_item} od %{items}) summary: "%{name} ustvarjen iz %{ip_address} dne %{date}" summary_no_ip: "%{name} ustvarjen dne %{date}" title: Uporabniki login: + account is suspended: Žal je bil vaÅ¡ račun ustavljen zaradi sumljive aktivnosti.<br>Prosimo, obrnite se na <a href="%{webmaster}">webmaster</a>, če želite o tem razpravljati. account not active: Oprostite, vaÅ¡ uporabniÅ¡ki račun Å¡e ni aktiven.<br />Za aktivacijo prosimo uporabite povezavo, ki ste jo prejeli v elektronskem sporočilu za potrditev uporabniÅ¡kega računa, ali <a href="%{reconfirm}">zahtevajte novo potrditveno elektronsko sporočilo</a>. auth failure: Oprostite, prijava s temi podatki ni uspela. create account minute: Naredite si račun. To vam bo vzelo le minuto. @@ -1467,7 +1542,9 @@ sl: login_button: Prijava lost password link: Ste pozabili geslo? new to osm: Ste novi na OpenStreetMap? + no account: Å e nimate uporabniÅ¡kega računa? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Preberite več o prihajajoči spremembi licence na OpenStreetMap </a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">prevodi</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">razprava</a>) + notice_terms: OpenStreetMap prehaja na novo licenciranje dne 1. April 2012. Ta licenca je enako odprta kot sedanja, a pravni del je bolj prilagojen naÅ¡i bazi. Radi bi obdržali vaÅ¡e prispevke v OpenStreetMap, vendar lahko to storimo le, če se strinjate, da jih delimo po pogojih nove licence. Sicer jih bomo morali izbrisati iz baze.<br /><br />Prosimo prijavite se in si vzamite nekaj sekund, da pregledate in sprejmete nove pogoje. Hvala! openid: "%{logo} OpenID:" openid invalid: Oprostite, vaÅ¡ OpenID ni pravilen openid missing provider: Žal se ni bilo mogoče obrniti na ponudnika OpenID @@ -1584,16 +1661,23 @@ sl: block_history: poglej prejete blokade blocks by me: moje blokade blocks on me: blokade mene + comments: komentarji confirm: Potrdi confirm_user: potrdi uporabnika create_block: blokiraj uporabnika created from: "Ustvarjen iz:" + ct accepted: "Sprejeto pred: %{ago}" + ct declined: Zavrnjeni + ct status: "Pogoji sodelovanja:" + ct undecided: Neodločen deactivate_user: dezaktiviraj uporabnika delete_user: izbriÅ¡i uporabnika description: Opis diary: dnevnik edits: prispevki email address: "E-poÅ¡tni naslov:" + friends_changesets: Brskanje po paketih sprememb vaÅ¡ih prijateljev + friends_diaries: Brskanje po dnevnikih vaÅ¡ih prijateljev hide_user: skriti tega uporabnika if set location: Če nastavite vaÅ¡o domačo lokacijo bo tu prikazan lep zemljevd in podobne dobrote. Domačo lokacijo lahko nastavite v %{settings_link}. km away: oddaljen %{count} km @@ -1601,11 +1685,14 @@ sl: m away: oddaljen %{count} m mapper since: "Kartograf od:" moderator_history: poglej dane blokade + my comments: moji komentarji my diary: moj dnevnik my edits: moji prispevki my settings: moje nastavitve my traces: moje sledi nearby users: Drugi bližnji uporabniki + nearby_changesets: Brskanje po paketih sprememb bližnjih uporabnikov + nearby_diaries: Brskanje po dnevnikih bližnjih uporabnikov new diary entry: nov vnos v dnevnik no friends: Niste Å¡e dodali nobenih prijateljev. no nearby users: Ni Å¡e drugih uporabnikov, ki bi priznali, da kartirajo v vaÅ¡i bližini. @@ -1653,7 +1740,6 @@ sl: filter: block_expired: Blokada je že potekla in je ni mogoče urejati. block_period: Čas blokade mora biti ena od izbir s spustnega seznama vrednosti. - not_a_moderator: Morate biti moderator za izvedbo tega dejanja. helper: time_future: Konča v %{time}. time_past: Je končala %{time} nazaj. @@ -1690,8 +1776,10 @@ sl: show: Prikaži status: Stanje period: + few: "%{count} ure" one: 1 ura other: "%{count} ur" + two: "%{count} uri" revoke: confirm: Ste prepričani, da želite preklicati blokado? flash: Ta blokada je bila preklicana. diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 5a2c80a0b..bfd84e0b0 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1,10 +1,11 @@ -# Messages for Albanian (Shqip) +# Messages for Albanian (shqip) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Euriditi # Author: Mdupont # Author: MicroBoy # Author: Mikullovci11 +# Author: Nemo bis # Author: Techlik # Author: Vinie007 sq: @@ -80,7 +81,6 @@ sq: changeset: changeset: "Ndryshim : %{id}" changesetxml: Ndryshim en XML - download: Shkarkone %{changeset_xml_link} ose %{osmchange_xml_link} feed: title: Ndryshim %{id} title_comment: Ndryshimi %{id} - %{comment} @@ -147,7 +147,6 @@ sq: next_changeset_tooltip: Tjetri ndryshim prej %{user} prev_changeset_tooltip: Ndryshimi i ma hershēm prej %{user} node: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" download_xml: Shkarko në XML edit: Ndrysho node: Pikë @@ -157,7 +156,6 @@ sq: coordinates: "Koordinatat:" part_of: "Pjesë e:" node_history: - download: "%{download_xml_link} ose %{view_details_link}" download_xml: Shkarkoni XML node_history: Historija e Pikes node_history_title: "Historija e Pikes: %{node_name}" @@ -173,7 +171,6 @@ sq: of: pi showing_page: Tu e kallxu faqen relation: - download: "%{download_xml_link} ose %{view_history_link}" download_xml: Shkarkoje XML relation: Lidhja relation_title: "Lidhja: %{relation_name}" @@ -182,7 +179,6 @@ sq: members: "Anëtarët:" part_of: "Pjesë e:" relation_history: - download: "%{download_xml_link} ose %{view_details_link}" download_xml: Merre me XML relation_history: Historija e Lidhjes relation_history_title: "Historija e Lidhjes: %{relation_name}" @@ -245,7 +241,6 @@ sq: relation: lidhje way: rrugë way: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" download_xml: Shkarko XML edit: ndrro view_history: shiko historin @@ -258,7 +253,6 @@ sq: nodes: "Pikat:" part_of: "Pjesë e:" way_history: - download: "%{download_xml_link} ose %{view_details_link}" download_xml: Merre me XML view_details: kqyre n'detaje way_history: Historija e Udhës @@ -345,10 +339,6 @@ sq: title: Hyrje e re në ditar no_such_entry: heading: "Nuk ka shënim me id: %{id}" - no_such_user: - body: Me na fal, po nuk ka anëtarë me emnin %{user}. Ju lutem kshyrni shkronjat, ose nashta lidhja që keni trus është gabim. - heading: Përdoruesi %{user} nuk ekziston - title: Nuk ka anëtarë të tillë view: leave_a_comment: Lene naj koment login: Kyçuni @@ -511,31 +501,9 @@ sq: youth_centre: Qendër Rinore boundary: administrative: Kufi administrativ - building: - apartments: Bllok apartamentesh - block: Kompleks me ndërtesa - bunker: Bunker - chapel: Kishë - church: Kishë - city_hall: Bashkia - commercial: Qendër tregtare - dormitory: Konvikt - entrance: Hyrje godine - faculty: Godinë fakulteti - hotel: Hotel - house: Shtëpi - public: Ndërtesë publike - shop: Dyqan - stadium: Stadium - store: Dyqan - terrace: Tarracë - tower: Kullë - train_station: Stacion hekurudhor - university: Godinë universitare highway: bridleway: Rrugë për kalërim ford: Va - gate: Portë living_street: Rrugë për këmbësorë historic: church: Kisha @@ -588,8 +556,6 @@ sq: layouts: edit: Redakto help_url: http://help.openstreetmap.org/ - intro_3_partners_url: http://wiki.openstreetmap.org/wiki/Partners - intro_3_ucl: Qendra UCL VR license: alt: CC by-sa 2.0 log_in: Kyçuni @@ -607,7 +573,25 @@ sq: english_link: orgjianl anglisht text: Në ni ngjarje të ni konflitkti me faqe e përktyme dhe %{english_original_link}, Faqja anglisht ka perparsi title: Rreth këtij përkthimi - legal_babble: "<h2>Të drejtat autoriale dhe licenca</h2>\n<p>\n OpenStreetMap është <i>me kod të hapur</i>, dhe e licencuar nën <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Ju jeni të lirë të kopjoni, shpërndani, transmetoni dhe adoptoni hartat\n dhe të dhënat tona, duke pasur parasysh citimin e OpenStreetMap dhe \n kontribuuesve të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\n mund të shpërndani rezultatet nën licencën e njëjtë. Licenca e\n e plotë <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n code</a> shpjegon të drejtat dhe përgjegjësitë tuaja.\n</p>\n\n<h3>Si të citoni OpenStreetMap</h3>\n<p>\n Nëse ju përdorni imazhe të hartave të OpenStreetMap, ne kërkojmë që \n së paku citimet tuaja të përfshijnë “© OpenStreetMap\n kontribuuesit, CC-BY-SA”. Nëse ju përdorni vetëm të dhëna të hartave\n ne kërkojmë citimin e kontribuuesve “të të dhënave të hartave © të OpenStreetMap,\n CC-BY-SA”.\n</p>\n<p>\n Ku është e mundur, OpenStreetMap duhet të hyperlinked to <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n dhe CC-BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n www.openstreetmap.org (ndoshta duke shpjeguar \n ‘OpenStreetMap’ këtë adresë të plotë) dhe tek \n www.creativecommons.org.\n</p>\n\n<h3>Të kuptoni më shumë</h3>\n<p>\n Lexoni më shumë rreth përdorimit të të dhënave <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>.\n</p>\n<p>\n OSM kontribuuesit duhet të mos përdorin asnjë të dhënë prej burimeve të çfarëdoshme\n të mbrojtura me të drejta të kopjimit (p.sh. Google Maps apo harta të printuara) pa\n leje speciale prej pronarëve të të drejtave të kopjimit.\n</p>\n<p>\n Edhe pse OpenStreetMap është me të kod të hapur, ne nuk mund të ofrojmë \n një hartë API pa pagesë për zhvillues të palëve të treta.\n\n Shikoni <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API Politika e Përdorimit</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politika e përdorimit të pllakave</a>\n dhe <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Poltika e përfitimit të Normave </a>.\n</p>\n\n<h3>Kontribuuesit tanë </h3>\n<p>\n Licenca jonë CC-BY-SA kërkon nga ju që “të vlerësoni Autorin\n Origjinal përkatës të mediumit apo masave që jeni duke i\n shfrytëzuar ”. Hartuesit individual të OSM nuk kërkojnë një\n citim mbi dhe për atë që kontribuojnë për “OpenStreetMap\n ”, por kur përfshihen në OSM, hartat nga një agjencion nacional i hartave \n apo faktor tjerë madhor burimor, është e arsyeshme të citohen drejtpërsëdrejti \n duke paraqitur emrin apo duke lidhur faqen e tyre me link.\n</p>\n\n<!--\nInformata mbi edituesit e faqeve\n\nLista e mëposhtme paraqet vetëm organizatat që kërkojnë vlerësim\nsi kusht të përdorimit të të dhënave të tyre në OpenStreetMap. Nuk është një\nkatalog i përgjithshëm i importimeve, dhe nuk duhet të përdoret kur kërkohet\nvlerësim për tu përshtatur me licencën e të dhënave të importuara.\n\nÇfarëdo shtesash këtu duhet të diskutohen së pari me administratorët e sistemit të OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australia</strong>: Përmban të dhëna periferike të bazuara në të dhënat e Zyrës Australiane të Statistikave.</li>\n <li><strong>Canada</strong>: Përmban të dhëna nga\n GeoBase®, GeoGratis (© Departamenti i Resurseve Natyrale\n në Kanada), CanVec (© Departamenti i Resurseve Natyrale\n në Kanada), and StatCan (Divizioni Gjeografik,\n Statistik në Kanada ).</li>\n <li><strong>New Zealand</strong>: Përmban të dhëna nga burimet e Informatave të tokave\n në Zelandë të re. Të drejtat e rezervuara i mbanë Crown.</li>\n <li><strong>Poland</strong>: Përmban të dhëna nga <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL contributors.</li>\n <li><strong>Britani e Madhe</strong>: Përmban të dhëna nga Ordnance\n Survey©. Crown i ka të drejtat autoriale dhe të databazës.</li>\n</ul>\n\n<p>\n Përfshirja e të dhënave në OpenStreetMap nuk thekson se të ofruesi origjinal i të \n dhënave përdor OpenStreetMap, ofron garancion, apo\n pranon çfarëdo anekse.\n</p>" + legal_babble: + contributors_au_html: "<strong>Australia</strong>: Përmban të dhëna periferike të bazuara në të dhënat e Zyrës Australiane të Statistikave." + contributors_ca_html: "<strong>Canada</strong>: Përmban të dhëna nga\n GeoBase®, GeoGratis (© Departamenti i Resurseve Natyrale\n në Kanada), CanVec (© Departamenti i Resurseve Natyrale\n në Kanada), and StatCan (Divizioni Gjeografik,\n Statistik në Kanada )." + contributors_footer_2_html: " Përfshirja e të dhënave në OpenStreetMap nuk thekson se të ofruesi origjinal i të \n dhënave përdor OpenStreetMap, ofron garancion, apo\n pranon çfarëdo anekse." + contributors_gb_html: "<strong>Britani e Madhe</strong>: Përmban të dhëna nga Ordnance\n Survey©. Crown i ka të drejtat autoriale dhe të databazës." + contributors_intro_html: " Licenca jonë CC BY-SA kërkon nga ju që “të vlerësoni Autorin\n Origjinal përkatës të mediumit apo masave që jeni duke i\n shfrytëzuar ”. Hartuesit individual të OSM nuk kërkojnë një\n citim mbi dhe për atë që kontribuojnë për “OpenStreetMap\n ”, por kur përfshihen në OSM, hartat nga një agjencion nacional i hartave \n apo faktor tjerë madhor burimor, është e arsyeshme të citohen drejtpërsëdrejti \n duke paraqitur emrin apo duke lidhur faqen e tyre me link." + contributors_nz_html: "<strong>New Zealand</strong>: Përmban të dhëna nga burimet e Informatave të tokave\n në Zelandë të re. Të drejtat e rezervuara i mbanë Crown." + contributors_pl_html: "<strong>Poland</strong>: Përmban të dhëna nga <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL contributors." + contributors_title_html: Kontribuuesit tanë + credit_1_html: " Nëse ju përdorni imazhe të hartave të OpenStreetMap, ne kërkojmë që \n së paku citimet tuaja të përfshijnë “© OpenStreetMap\n kontribuuesit, CC BY-SA”. Nëse ju përdorni vetëm të dhëna të hartave\n ne kërkojmë citimin e kontribuuesve “të të dhënave të hartave © të OpenStreetMap,\n CC BY-SA”." + credit_2_html: " Ku është e mundur, OpenStreetMap duhet të hyperlinked to <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n dhe CC BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n www.openstreetmap.org (ndoshta duke shpjeguar \n ‘OpenStreetMap’ këtë adresë të plotë) dhe tek \n www.creativecommons.org." + credit_title_html: Si të citoni OpenStreetMap + intro_1_html: " OpenStreetMap është <i>me kod të hapur</i>, dhe e licencuar nën <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC BY-SA)." + intro_2_html: " Ju jeni të lirë të kopjoni, shpërndani, transmetoni dhe adoptoni hartat\n dhe të dhënat tona, duke pasur parasysh citimin e OpenStreetMap dhe \n kontribuuesve të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\n mund të shpërndani rezultatet nën licencën e njëjtë. Licenca e\n e plotë <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n code</a> shpjegon të drejtat dhe përgjegjësitë tuaja." + more_1_html: " Lexoni më shumë rreth përdorimit të të dhënave <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>." + more_2_html: " OSM kontribuuesit duhet të mos përdorin asnjë të dhënë prej burimeve të çfarëdoshme\n të mbrojtura me të drejta të kopjimit (p.sh. Google Maps apo harta të printuara) pa\n leje speciale prej pronarëve të të drejtave të kopjimit." + more_3_html: " Edhe pse OpenStreetMap është me të kod të hapur, ne nuk mund të ofrojmë \n një hartë API pa pagesë për zhvillues të palëve të treta.\n\n Shikoni <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API Politika e Përdorimit</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politika e përdorimit të pllakave</a>\n dhe <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Poltika e përfitimit të Normave </a>." + more_title_html: Të kuptoni më shumë + title_html: Të drejtat autoriale dhe licenca native: mapping_link: Fillo hatrografimin native_link: THIS_LANGUAGE_NAME_HERE verzion @@ -620,8 +604,6 @@ sq: new: limit_exceeded: Ju keni dërguar shumë mesazhe kohët e fundit. Ju lutem prisni një kohë para se të dërgoni ndonjë tjetër. title: Qo mesazh - no_such_user: - body: Na vjen keq nuk ka asnjë përdorues me atë emër. read: reading_your_sent_messages: Tu i lexue mesazhet e dërgume sent_message_summary: @@ -714,10 +696,6 @@ sq: your_traces: Të dhanat e GPS-it make_public: made_public: Gjurma u ba publike - no_such_user: - body: Na vjen keq, por nuk ka asnjë anëtar me emrin %{user}. Ju lutem kontrolloni drejtshkrimin tuaj, ose ndoshta lidhja që keni klikuar është gabim. - heading: Anëtari %{user} nuk ekziston - title: Ska ksi shfrytezuesi offline: heading: Mbledhsi i GPX asht jasht linje message: Mbledshi i skedareve GPX dhe sistemi i ngarkimit per momentin jane jasht funksionit. @@ -758,8 +736,6 @@ sq: trace_optionals: tags: Etiketa trace_paging_nav: - next: Vazhdo » - previous: « Paraprake showing_page: Duke shfaqun faqen %{page} view: delete_track: Fshij ket gjurm @@ -991,8 +967,6 @@ sq: user location: Veni i shfyrtezuesit your friends: Miqtë e juaj user_block: - filter: - not_a_moderator: Ju duhet të jeni moderator për ta kryer atë veprim. new: reason: Arsyja pse %{name} osht blloku. Ju lutem bëhuni sa më i qet dhe arsyeshëm që osht e mundshme, tu dhon sa ma shumë detaje që muni rreth situatës, tu e mbajt në men që mesazhi munet me u pa prej publikut. Maje në men se jo krejt anëtarët e kuptojn gjuhën e komunitetit, pra ju lutem munoni me përdor terma të mirë. partial: diff --git a/config/locales/sr-EL.yml b/config/locales/sr-Latn.yml similarity index 82% rename from config/locales/sr-EL.yml rename to config/locales/sr-Latn.yml index a37e883e5..061f15fae 100644 --- a/config/locales/sr-EL.yml +++ b/config/locales/sr-Latn.yml @@ -1,8 +1,10 @@ -# Messages for Serbian (Latin script) (‪Srpski (latinica)‬) +# Messages for Serbian (Latin script) (‪srpski (latinica)‬) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: McDutchie +# Author: Nemo bis # Author: Rancher -sr-EL: +sr-Latn: activerecord: attributes: diary_comment: @@ -67,13 +69,15 @@ sr-EL: tracetag: Oznaka traga user: Korisnik user_preference: Korisničke postavke - user_token: Korisnički znak + user_token: Korisnički žeton way: Putanja way_node: Čvor putanje way_tag: Oznaka puta application: require_cookies: cookies_needed: Izgleda da ste onemogućili kolačiće. Omogućite ih pre nego Å¡to nastavite. + require_moderator: + not_a_moderator: Da biste izveli ovu radnju, treba da budete moderator. setup_user_auth: blocked: VaÅ¡ pristup API-ju je blokiran. Prijavite se da saznate viÅ¡e. need_to_see_terms: VaÅ¡ pristup API-ju je privremeno ukinut. Prijavite se da biste pogledali uslove uređivanja. Ne morate da ih prihvatite, već samo da ih vidite. @@ -81,7 +85,6 @@ sr-EL: changeset: changeset: "Skup izmena: %{id}" changesetxml: XML skup izmena - download: Preuzmi %{changeset_xml_link} ili %{osmchange_xml_link} feed: title: Skup izmena %{id} title_comment: Skup izmena %{id} – %{comment} @@ -114,7 +117,7 @@ sr-EL: edited_at: "Izmenjeno:" edited_by: "Izmenio:" in_changeset: "U skupu izmena:" - version: "Izdanje:" + version: "Verzija:" containing_relation: entry: Odnos %{relation_name} entry_role: Odnos %{relation_name} (kao %{relation_role}) @@ -141,12 +144,18 @@ sr-EL: prev_node_tooltip: Prethodni čvor prev_relation_tooltip: Prethodni odnos prev_way_tooltip: Prethodna putanja + paging: + all: + next: "%{id} »" + prev: « %{id} + user: + next: "%{id} »" + prev: « %{id} user: name_changeset_tooltip: Pogledaj izmene korisnika %{user} next_changeset_tooltip: Sledeća izmena korisnika %{user} prev_changeset_tooltip: Prethodna izmena korisnika %{user} node: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" download_xml: Preuzmi XML edit: uredi node: Čvor @@ -156,7 +165,6 @@ sr-EL: coordinates: "Koordinate:" part_of: "Deo:" node_history: - download: "%{download_xml_link} ili %{view_details_link}" download_xml: Preuzmi XML node_history: Istorija čvora node_history_title: "Istorija čvora: %{node_name}" @@ -171,8 +179,14 @@ sr-EL: paging_nav: of: od showing_page: Prikaz stranice + redacted: + message_html: Verzija %{version} ove %{type} ne može da se prikaže budući da je redigovana. ViÅ¡e na %{redaction_link}. + redaction: Redakcija %{id} + type: + node: čvor + relation: odnos + way: putanja relation: - download: "%{download_xml_link} ili %{view_history_link}" download_xml: Preuzmi XML relation: Odnos relation_title: "Odnos: %{relation_name}" @@ -181,12 +195,12 @@ sr-EL: members: "Članovi:" part_of: "Deo:" relation_history: - download: "%{download_xml_link} ili %{view_details_link}" download_xml: Preuzmi XML relation_history: Istorija odnosa relation_history_title: "Istorija odnosa: %{relation_name}" view_details: pogledaj detalje relation_member: + entry: "%{type} %{name}" entry_role: "%{type} %{name} kao %{role}" type: node: Čvor @@ -197,7 +211,7 @@ sr-EL: view_data: Pogledaj podatke trenutnog prikaza mape start_rjs: data_frame_title: Podaci - data_layer_name: Podaci + data_layer_name: Pregledaj podatke sa mape details: Detalji drag_a_box: Prevucite okvir na mapi da biste izabrali područje edited_by_user_at_timestamp: Izmenio [[user]] u [[timestamp]] @@ -243,7 +257,6 @@ sr-EL: relation: odnos way: putanja way: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" download_xml: Preuzmi XML edit: uredi view_history: pogledaj istoriju @@ -256,7 +269,6 @@ sr-EL: nodes: "Čvorovi:" part_of: "Deo:" way_history: - download: "%{download_xml_link} ili %{view_details_link}" download_xml: Preuzmi XML view_details: pogledaj detalje way_history: Istorija putanje @@ -265,19 +277,20 @@ sr-EL: changeset: anonymous: Anonimno big_area: (veliko) + id: br. %{id} no_comment: (nema komentara) no_edits: (nema izmena) show_area_box: pogledaj okvir područja still_editing: (joÅ¡ uvek uređuje) view_changeset_details: Pogledaj detalje skupa izmena changeset_paging_nav: - next: Sledeća » - previous: "« Prethodna" + next: Sledeća » + previous: « Prethodna showing_page: Prikaz stranice %{page} changesets: area: Područje comment: Komentar - id: IB + id: Naznaka saved_at: Sačuvano u user: Korisnik list: @@ -302,12 +315,21 @@ sr-EL: timeout: sorry: Žao nam je, ali spisak izmena koji ste zahtevali je predugačak. diary_entry: + comments: + ago: pre %{ago} + comment: Komentar + has_commented_on: "%{display_name} je prokomentarisao sledeće unose u dnevniku" + newer_comments: Noviji komentari + older_comments: Stariji komentari + post: Postavi + when: Kada diary_comment: comment_from: Komentar korisnika %{link_user} u %{comment_created_at} confirm: Potvrdi hide_link: Sakrij ovaj komentar diary_entry: comment_count: + few: "%{count} komentara" one: 1 komentar other: "%{count} komentara" comment_link: ProkomentariÅ¡i ovaj unos @@ -359,10 +381,6 @@ sr-EL: body: Žao nam je, ali nema unosa u dnevniku ili komentar s IB %{id}. Proverite ispravnost upisa ili veze koju ste kliknuli. heading: "Nema unosa s IB: %{id}" title: Nema takvog unosa u dnevniku - no_such_user: - body: Žao nam je, ali nema korisnika s imenom %{user}. Proverite ispravnost upisa ili veze koju ste kliknuli. - heading: Korisnik %{user} ne postoji - title: Nema takvog korisnika view: leave_a_comment: Ostavite komentar login: Prijavite se @@ -385,7 +403,7 @@ sr-EL: start: add_marker: Dodaj marker na mapu area_to_export: Područje za izvoz - embeddable_html: Ugradivi HTML kôd + embeddable_html: Ugradivi HTML kod export_button: Izvezi export_details: Podaci Openstritmapa su dostupni pod licencom <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sr">Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0</a>. format: Format @@ -395,6 +413,7 @@ sr-EL: licence: Licenca longitude: "GD:" manually_select: Ručno izaberite drugo područje + map_image: Slika mape (prikazuje standardni sloj) max: najviÅ¡e options: Mogućnosti osm_xml_data: Openstritmap XML podaci @@ -453,18 +472,31 @@ sr-EL: search_osm_namefinder: suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} od %{parentname})" suffix_place: ", %{distance} %{direction} od %{placename}" + suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodrom + apron: Rampa + gate: Kapija + helipad: Heliodrom + runway: Pista + taxiway: Rulna staza + terminal: Terminal amenity: + WLAN: Bežični internet airport: Aerodrom arts_centre: Umetnički centar + artwork: Umetničko delo atm: Bankomat auditorium: Dvorana bank: Banka bar: Bar + bbq: RoÅ¡tilj bench: Klupa bicycle_parking: Biciklistički parking bicycle_rental: Iznajmljivanje bicikla + biergarten: Pivska baÅ¡ta brothel: Javna kuća bureau_de_change: Menjačnica bus_station: Autobuska stanica @@ -473,6 +505,7 @@ sr-EL: car_sharing: Zajedničko korišćenje automobila car_wash: Auto-perionica casino: Kazino + charging_station: Napojna stanica cinema: Bioskop clinic: Klinika club: Klub @@ -491,6 +524,7 @@ sr-EL: ferry_terminal: Skela fire_hydrant: Hidrant fire_station: Vatrogasna stanica + food_court: Å tandovi za brzu hranu fountain: Fontana fuel: Benzinska pumpa grave_yard: Groblje @@ -531,9 +565,12 @@ sr-EL: shelter: SkloniÅ¡te shop: Prodavnica shopping: Trgovački centar + shower: TuÅ¡ + social_centre: Socijalni centar social_club: DruÅ¡tveni klub studio: Studio supermarket: Supermarket + swimming_pool: Bazen taxi: Taksi telephone: Telefonska govornica theatre: PozoriÅ¡te @@ -544,41 +581,21 @@ sr-EL: veterinary: Veterinarska hirurgija village_hall: Seoski dom waste_basket: Korpa za otpatke - wifi: Vi-Fi pristup + wifi: Bežični internet youth_centre: Dom omladine boundary: administrative: Administrativna granica + census: Popisna granica + national_park: Nacionalni park + protected_area: ZaÅ¡tićeno područje + bridge: + aqueduct: Akvadukt + suspension: Viseći most + swing: VrteÅ¡ki most + viaduct: Vijadukt + "yes": Most building: - apartments: Stambeni blok - block: Blok zgrada - bunker: Bunker - chapel: Kapela - church: Crkva - city_hall: Gradska skupÅ¡tina - commercial: Poslovna zgrada - dormitory: Studentski dom - entrance: Ulaz u zgradu - faculty: Zgrada fakulteta - farm: Zgrada farme - flats: Stanovi - garage: Garaža - hall: Hala - hospital: Bolnica - hotel: Hotel - house: Kuća - industrial: Industrijska zgrada - office: Poslovnica - public: Javna zgrada - residential: Stambena zgrada - retail: Maloprodajna radnja - school: Å kola - shop: Prodavnica - stadium: Stadion - store: Prodavnica - terrace: Terasa - tower: Toranj - train_station: Železnička stanica - university: Univerzitetska zgrada + "yes": Zgrada highway: bridleway: Konjička staza bus_guideway: Autobuska traka @@ -586,12 +603,11 @@ sr-EL: byway: Prečica construction: Auto-put u izgradnji cycleway: Biciklistička staza - distance_marker: Oznaka udaljenosti emergency_access_point: Izlaz za slučaj opasnosti footway: PeÅ¡ačka staza ford: Gaz - gate: Kapija living_street: Ulica smirenog prometa + milestone: Miljokaz minor: Drugorazredni put motorway: Auto-put motorway_junction: Petlja @@ -603,14 +619,17 @@ sr-EL: primary_link: Glavni put raceway: Trkačka staza residential: Ulica + rest_area: OdmaraliÅ¡te road: Put secondary: Sporedni put secondary_link: Sporedni put service: Servisni put services: Usluge na auto-putu + speed_camera: Foto-radar steps: Stepenice stile: Prelaz preko ograde tertiary: Lokalni put + tertiary_link: Lokalni put track: Makadam trail: Staza trunk: Magistralni put @@ -624,6 +643,7 @@ sr-EL: building: Zgrada castle: Dvorac church: Crkva + fort: Utvrđivanje house: Kuća icon: Ikona manor: Plemićko imanje @@ -648,6 +668,7 @@ sr-EL: farmland: Polje farmyard: Farma forest: Å uma + garages: Garaža grass: Trava greenfield: Zeleno polje industrial: Industrijsko područje @@ -655,25 +676,28 @@ sr-EL: meadow: Livada military: Vojno područje mine: Rudnik - mountain: Planina nature_reserve: Rezervat prirode + orchard: Voćnjak park: Park piste: SkijaÅ¡ka staza - plaza: Å etaliÅ¡te quarry: Kamenolom railway: Železnička pruga recreation_ground: Rekreacijsko područje reservoir: Rezervoar + reservoir_watershed: Akumulaciona vododelnica residential: Stambeno područje retail: Maloprodaja + road: Putno područje village_green: Seosko polje vineyard: Vinograd wetland: Močvara wood: Å uma leisure: beach_resort: Morsko odmaraliÅ¡te + bird_hide: SkloniÅ¡te za ptice common: OpÅ¡tinsko zemljiÅ¡te fishing: Ribolovno područje + fitness_station: Tehnički pregled garden: BaÅ¡ta golf_course: Golf teren ice_rink: KlizaliÅ¡te @@ -684,12 +708,17 @@ sr-EL: pitch: Sportsko igraliÅ¡te playground: IgraliÅ¡te recreation_ground: Rekreacijsko područje + sauna: Sauna slipway: Navoz sports_centre: Sportski centar stadium: Stadion swimming_pool: Bazen track: Staza za trčanje water_park: Vodeni park + military: + airfield: Vojni aerodrom + barracks: Kasarna + bunker: Bunker natural: bay: Zaliv beach: Plaža @@ -697,11 +726,12 @@ sr-EL: cave_entrance: Ulaz u pećinu channel: Kanal cliff: Litica - coastline: Obala crater: Krater + dune: Dina feature: Obeležje fell: Brdo fjord: Fjord + forest: Å uma geyser: Gejzir glacier: Glečer heath: Ravnica @@ -721,6 +751,7 @@ sr-EL: scrub: GuÅ¡tara shoal: Sprud spring: Izvor + stone: Kamen strait: Moreuz tree: Drvo valley: Dolina @@ -729,6 +760,19 @@ sr-EL: wetland: Močvara wetlands: Močvara wood: Å uma + office: + accountant: Računovođa + architect: Arhitekta + company: Firma + employment_agency: Agencija za zapoÅ¡ljavanje + estate_agent: Agencija za nekretnine + government: Vladina služba + insurance: Služba za osiguravanje + lawyer: Advokat + ngo: NVO kancelarija + telecommunication: Telekomunikaciona služba + travel_agent: Turistička agencija + "yes": Kancelarija place: airport: Aerodrom city: Grad @@ -740,6 +784,7 @@ sr-EL: houses: Kuće island: Ostrvo islet: Hrid + isolated_dwelling: Udaljeno prebivaliÅ¡te locality: Lokalitet moor: Močvara municipality: OpÅ¡tina @@ -763,6 +808,7 @@ sr-EL: junction: Železnički čvor level_crossing: Pružni prelaz light_rail: Laka železnica + miniature: Minijaturna železnica monorail: Jednotračna pruga narrow_gauge: Uskotračna pruga platform: Železnička platforma @@ -777,7 +823,7 @@ sr-EL: yard: Ranžirna stanica shop: alcohol: Trgovina pićem - apparel: Trgovina odećom + antiques: Antikvarnica art: Atelje bakery: Pekara beauty: Parfimerija @@ -786,7 +832,6 @@ sr-EL: books: Knjižara butcher: Mesara car: Auto-kuća - car_dealer: Auto-diler car_parts: Auto-delovi car_repair: Auto-servis carpet: Prodavnica tepiha @@ -801,7 +846,6 @@ sr-EL: department_store: Robna kuća discount: Diskont doityourself: Uradi sam - drugstore: Drogerija dry_cleaning: Hemijsko čišćenje electronics: Elektronska oprema estate_agent: Agent za nekretnine @@ -867,7 +911,10 @@ sr-EL: valley: Dolina viewpoint: Vidikovac zoo: ZooloÅ¡ki vrt + tunnel: + "yes": Tunel waterway: + artificial: VeÅ¡tački vodeni put boatyard: BrodogradiliÅ¡te canal: Kanal connector: Spoj vodnih puteva @@ -888,12 +935,18 @@ sr-EL: water_point: Tačka vodotoka waterfall: Vodopad weir: Brana + prefix_format: "%{name}" + html: + dir: ltr javascripts: map: base: cycle_map: Biciklistička mapa mapquest: Mapkvest open - transport_map: Saobraćajna karta + standard: Standardna + transport_map: Saobraćajna mapa + overlays: + maplint: Maplint site: edit_disabled_tooltip: Uvećajte prikaz da biste uredili mapu edit_tooltip: Uredite mapu @@ -902,6 +955,7 @@ sr-EL: history_tooltip: Pogledajte izmene za ovo područje history_zoom_alert: Morate uvećati prikaz da biste videli izmene za ovo područje layouts: + community: Zajednica community_blogs: Blogovi zajednice community_blogs_title: Blogovi članova zajednice copyright: Autorska prava i licenca @@ -920,20 +974,23 @@ sr-EL: help: Pomoć help_centre: Centar za pomoć help_title: Stranica pomoći za projekat + help_url: http://help.openstreetmap.org/ history: Istorija home: dom home_tooltip: Idi na lokaciju doma - inbox: primljene (%{count}) inbox_tooltip: + few: VaÅ¡e sanduče sadrži %{count} nepročitane poruke one: VaÅ¡e sanduče sadrži jednu nepročitanu poruku - other: VaÅ¡e sanduče sadrži %{count} nepročitane poruke + other: VaÅ¡e sanduče sadrži %{count} nepročitanih poruka zero: VaÅ¡e sanduče ne sadrži nepročitane poruke - intro_1: Openstritmap je slobodna karta celog sveta. Sačinjavaju je korisnici kao Å¡to ste vi. - intro_2: Openstritmap vam omogućava da pregledate, uređujete i koristite geografske podatke s bilo kog mesta na zemlji. - intro_3: Održavanje Openstritmapa podržava %{ucl}, %{ic} i %{bytemark}. Ostale pristalice projekta su na spisku %{partners}. - intro_3_ic: Londonski kraljevski koledž - intro_3_partners: viki + intro_1: Openstritmap je slobodna mapa celog sveta. Sačinjavaju je korisnici kao Å¡to ste vi. + intro_2_create_account: Otvorite nalog + intro_2_download: preuzimanje + intro_2_html: Podaci su slobodni za %{download} i %{use} pod uslovima licence %{license}. %{create_account} da poboljÅ¡ate mapu. + intro_2_license: otvorena licenca + intro_2_use: upotreba license: + alt: CC BY-SA 2.0 title: Podaci Openstritmapa su objavljeni pod licencom Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0 log_in: prijavi me log_in_tooltip: Prijavite se s postojećim nalogom @@ -946,9 +1003,16 @@ sr-EL: title: Podržite Openstritmap novčanim prilogom osm_offline: Baza podataka Openstritmapa je trenutno nedostupna dok se ne zavrÅ¡e važni radovi na održavanju. osm_read_only: Zbog radova na održavanju baze podataka Openstritmapa, istu trenutno nije moguće menjati. + partners_bytemark: Hosting „Bajtmark“ + partners_html: Hosting podržava %{ucl}, %{ic} i %{bytemark}, kao i drugi %{partners}. + partners_ic: Londonski kraljevski koledž + partners_partners: partneri + partners_ucl: VR centar UCL-a + project_name: + h1: Openstritmap + title: Openstritmap sign_up: otvori nalog sign_up_tooltip: Otvorite nalog da biste uređivali - sotm2011: Dođite na Konferenciju Openstritmapa 2011, Stanje mape, od 9. do 11. septembra u Denveru! tag_line: Slobodna viki mapa sveta user_diaries: Dnevnici user_diaries_tooltip: Pogledajte korisničke dnevnike @@ -958,12 +1022,33 @@ sr-EL: welcome_user_link_tooltip: VaÅ¡a korisnička stranica wiki: viki wiki_title: Viki stranice projekta + wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Main_Page?uselang=sr-ec license_page: foreign: english_link: engleskog originala text: U slučaju sukoba između prevedene stranice i %{english_original_link}, engleska stranica ima prednost title: O prevodu - legal_babble: "<h2>Autorska prava i licenca</h2>\n<p>\n Openstritmap čine <i>slobodni podaci</i> koji su objavljeni pod\n licencom <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Slobodni ste da umnožavate, delite, prenosite i prilagođavate\n naÅ¡e mape i podatke, sve dok imenujete Openstritmap i njene\n uređivače. Ako želite da menjate i dograđujete naÅ¡e podatke,\n možete ih deliti samo pod istom licencom.\n Ceo <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">\n tekst ugovora</a> objaÅ¡njava vam vaÅ¡a prava i odgovornosti.\n</p>\n\n<h3>Kako da imenujete Openstritmap</h3>\n<p>\n Ako koristite naÅ¡e slike mapa, tražimo da zasluge sadrže\n bar “© OpenStreetMap\n contributors, CC-BY-SA”. Ako koristite samo podatke mapa,\n navedite “Map data © OpenStreetMap contributors,\n CC-BY-SA”.\n</p>\n<p>\n Gde je moguće, Openstritmap bi trebalo da vodi ka adresi <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n i CC-BY-SA ka <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n Ako koristite medijum gde veze nije moguće postaviti\n (npr. Å¡tampani rad), predlažemo da usmerite vaÅ¡e\n čitaoce na www.openstreetmap.org (po mogućstvu\n proÅ¡iravanjem ‘OpenStreetMap’ na celu adresu)\n i na www.creativecommons.org.\n</p>\n\n<h3>Saznajte viÅ¡e</h3>\n<p>\n Pročitajte viÅ¡e o korišćenju naÅ¡ih podataka na <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">ČPP</a>.\n</p>\n<p>\n OSM uređivači se podsećaju da nikada ne dodaju podatke\n od bilo kog izvora zaÅ¡tićenog autorskim pravima (npr.\n Gugl mape ili Å¡tampane mape) bez izričite dozvole\n nosioca autorskog prava.\n</p>\n<p>\n Iako Openstritmap čine slobodni podaci, ne možemo da\n obezbedimo besplatne API-je mapa drugim programerima.\n\n Pogledajte naÅ¡u <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politiku\n o korišćenju API-ja</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politiku\n o prikazivanju mapa</a> i <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politiku\n o korišćenju Nominatima</a>.\n\n<h3>NaÅ¡i saradnici</h3>\n<p>\n NaÅ¡a licenca CC-BY-SA zahteva od vas da “morate\n navesti ime izvornog autora ili davaoca licence”.\n Pojedinačni maperi ne zahtevaju isticanje zasluga osim\n “Openstritmap saradnika”, ali kada podaci\n pripadaju nacionalnoj geografskoj agenciji ili drugom\n većem izvoru koji je uključen u Openstritmap, razumno je\n navesti izvor ili ostaviti hipervezu do izvora.\n</p>\n\n<!--\nPodaci za uređivače stranica\n\nSledeći spisak sadrži samo one organizacije koje zahtevaju pripisivanje\nkao uslov da se njihovi podaci koriste u Openstritmapu. Ovo nije celi\nkatalog „uvoza“ podataka i ne sme se koristiti osim kada se zahteva da\npripisivanje bude u skladu s licencom uvezenih podataka.\n\nDa biste bilo Å¡ta dodali ispod, prvo morate popričati s administratorima.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australija</strong>: sadrži podatke o opÅ¡tinama\n na osnovu podataka Australijskog biroa za statistiku.</li>\n<li><strong>Austrija</strong>: sadrži podatke iz\n <a href=\"http://data.wien.gv.at/\">Å tata Viena</a> pod licencom\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Kanada</strong>: sadrži podatke iz\n Beobaze®, Geogratisa (© Odeljenje za prirodne\n resurse Kanade), Kanvek (© Odeljenje za prirodne\n resurse Kanade) i Statkan (Geografski odsek,\n Zavod za statistiku Kanade).</li>\n <li><strong>Francuska</strong>: sadrži podatke koji potiču od\n Generalne direkcije za oporezivanje.</li>\n <li><strong>Novi Zeland</strong>: sadrži podatke koji potiču od\n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Poljska</strong>: sadrži podatke iz <a\n href=\"http://ump.waw.pl/\">UMP-pcPL mapa</a>. Autorska prava\n UMP-pcPL saradnici.</li>\n <li><strong>Ujedinjeno Kraljevstvo</strong>: sadrži Zvanične\n podatke geodetskog premeravanja © Autorska prava 2010.</li>\n</ul>\n\n<p>\n Uključivanje podataka u Openstritmap ne podrazumeva da izvorni\n vlasnik podataka prihvata Openstritmap, obezbeđuje bilo kakvu\n garanciju ili prihvata odgovornost.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austrija</strong>: sadrži podatke iz\n <a href=\"http://data.wien.gv.at/\">Å tata Viena</a> pod licencom\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Forarlberg</a> i\n + \nLand Tirol (pod licencom <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT sa izmenama i dopunama</a>)." + contributors_au_html: "<strong>Australija</strong>: sadrži podatke o opÅ¡tinama\n na osnovu podataka Australijskog biroa za statistiku." + contributors_ca_html: "<strong>Kanada</strong>: sadrži podatke iz\n Beobaze®, Geogratisa (© Odeljenje za prirodne\n resurse Kanade), Kanvek (© Odeljenje za prirodne\n resurse Kanade) i Statkan (Geografski odsek,\n Zavod za statistiku Kanade)." + contributors_footer_2_html: " Uključivanje podataka u Openstritmap ne podrazumeva da izvorni\n vlasnik podataka prihvata Openstritmap, obezbeđuje bilo kakvu\n garanciju ili prihvata odgovornost." + contributors_fr_html: "<strong>Francuska</strong>: sadrži podatke koji potiču od\n Generalne direkcije za oporezivanje." + contributors_intro_html: " NaÅ¡a licenca CC BY-SA zahteva od vas da “morate\n navesti ime izvornog autora ili davaoca licence”.\n Pojedinačni kartografi ne zahtevaju isticanje zasluga osim\n “Openstritmap doprinosioca”, ali kada podaci\n pripadaju nacionalnoj geografskoj agenciji ili drugom\n većem izvoru koji je uključen u Openstritmap, razumno je\n navesti izvor ili ostaviti hipervezu do njega." + contributors_nl_html: "<strong>Holandija</strong>: sadrži © i podatke, 2007\n + \n (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Novi Zeland</strong>: sadrži podatke koji potiču od\n Land Information New Zealand. Krunska autorska prava zadržana." + contributors_pl_html: "<strong>Poljska</strong>: sadrži podatke iz <a\n href=\"http://ump.waw.pl/\">UMP-pcPL mapa</a>. Autorska prava\n UMP-pcPL doprinosioca.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n ViÅ¡e o korišćenju Openstritmapovih UMP podataka</a></li>\n <li><strong>Južna Afrika</strong>: sadrži podatke koji potiču od \n <a href=\"http://www.ngi.gov.za/\">Glavnog direktorata:\n Nacionalne geoprostorne informacije</a>, državna prava zadržana.</li>\n <li><strong>Ujedinjeno Kraljevstvo</strong>: sadrži Zvanične\n podatke geodetskog premeravanja © Autorska prava 2010." + contributors_title_html: NaÅ¡i saradnici + credit_1_html: " Ako koristite naÅ¡e slike mapa, tražimo da zasluge sadrže\n bar “© Doprinosioci\n Openstritmapa, CC BY-SA”. Ako koristite samo podatke mapa,\n navedite “Kartografski podaci © Doprinosioci Openstritmapa,\n CC BY-SA”." + credit_2_html: " Gde je moguće, Openstritmap bi trebalo da vodi do adrese <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n i CC BY-SA do <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n Ako koristite medijum u kom se veze ne mogu postaviti\n (npr. Å¡tampani rad), predlažemo da usmerite vaÅ¡e\n čitaoce na www.openstreetmap.org (po mogućstvu\n proÅ¡iravanjem ‘Openstritmapa’ na celu adresu)\n i na www.creativecommons.org." + credit_title_html: Kako da imenujete Openstritmap + intro_1_html: " Openstritmap čine <i>slobodni podaci</i> koji su objavljeni pod\n licencom <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0</a> (CC BY-SA)." + intro_2_html: " Možete da umnožavate, delite, prenosite i prilagođavate\n naÅ¡e mape i podatke, sve dok imenujete Openstritmap i njene\n urednike. Ako želite da menjate i dograđujete naÅ¡e podatke,\n možete ih deliti samo pod istom licencom.\n Ceo <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">\n tekst ugovora</a> objaÅ¡njava vam vaÅ¡a prava i odgovornosti." + more_1_html: " Pročitajte viÅ¡e o korišćenju naÅ¡ih podataka na <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">ČPP</a>." + more_2_html: " Podsećamo urednike Openstritmapa da nikada ne dodaju podatke\n od bilo kog izvora zaÅ¡tićenog autorskim pravima (npr.\n Gugl mape ili Å¡tampane mape) bez izričite dozvole\n nosioca autorskog prava." + more_3_html: " Iako Openstritmap čine slobodni podaci, ne možemo da\n obezbedimo besplatne API-je mapa drugim programerima.\n\n Pogledajte naÅ¡u <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politiku\n o korišćenju API-ja</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politiku\n o prikazivanju mapa</a> i <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politiku\n o korišćenju Nominatima</a>." + more_title_html: Saznajte viÅ¡e + title_html: Autorska prava i licenca native: mapping_link: počnite s mapiranjem native_link: srpsko izdanje @@ -982,8 +1067,9 @@ sr-EL: other: "%{count} nove poruke" no_messages_yet: JoÅ¡ uvek nemate poruka. ZaÅ¡to ne biste stupili u kontakt s %{people_mapping_nearby_link}? old_messages: + few: "%{count} stare poruke" one: "%{count} stara poruka" - other: "%{count} stare poruke" + other: "%{count} starih poruka" outbox: poslate people_mapping_nearby: maperima u vaÅ¡oj okolini subject: Naslov @@ -1009,16 +1095,13 @@ sr-EL: body: Nažalost, nema poruke s tim IB. heading: Nema takve poruke title: Nema takve poruke - no_such_user: - body: Nažalost, ne postoji korisnik s tim imenom. - heading: Nema takvog korisnika - title: Nema takvog korisnika outbox: date: Datum inbox: primljene messages: + few: Imate %{count} poslate poruke one: Imate %{count} poslatu poruku - other: Imate %{count} poslate poruke + other: Imate %{count} poslatih poruka my_inbox: "%{inbox_link}" no_sent_messages: JoÅ¡ uvek nemate poslatih poruka. ZaÅ¡to ne biste stupili u kontakt s %{people_mapping_nearby_link}? outbox: poslate @@ -1062,14 +1145,15 @@ sr-EL: hopefully_you_2: "%{server_url} na %{new_address}." friend_notification: befriend_them: Možete ga/je dodati i kao prijatelja na %{befriendurl}. - had_added_you: "%{user} vas dodade kao prijatelja na Openstritmapu." + had_added_you: "%{user} vas je dodao kao prijatelja na Openstritmapu." see_their_profile: Možete videti njegov/njen profil na %{userurl}. - subject: "[OpenStreetMap] %{user} vas dodade kao prijatelja" + subject: "[Openstritmap] %{user} vas je dodao kao prijatelja" gpx_notification: and_no_tags: i bez oznaka. and_the_tags: "i sa sledećim oznakama:" failure: failed_to_import: "Uvoz nije uspeo. GreÅ¡ka:" + import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=sr-ec more_info_1: ViÅ¡e o neuspelom GPX uvozu i kako to izbeći more_info_2: "može se naći na:" subject: "[OpenStreetMap] GPX uvoz nije uspeo" @@ -1095,6 +1179,7 @@ sr-EL: footer2: i možete odgovoriti na %{replyurl} header: "%{from_user} vam posla poruku preko Openstritmapa pod naslovom %{subject}:" hi: Pozdrav, %{to_user}, + subject_header: "[Openstritmap] – %{subject}" signup_confirm: subject: "[OpenStreetMap] Potvrdite vaÅ¡u e-adresu" signup_confirm_html: @@ -1106,9 +1191,9 @@ sr-EL: hopefully_you: Neko (verovatno vi) želeo bi da otvori nalog na introductory_video: Možete pogledati %{introductory_video_link}. more_videos: Postoji %{more_videos_link}. - more_videos_here: viÅ¡e video snimaka ovde + more_videos_here: viÅ¡e video-snimaka ovde user_wiki_page: Preporučujemo vam da napravite korisničku stranicu na vikiju koja uključuje oznake kategorija koje označavaju gde se nalazite, kao na primer <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>. - video_to_openstreetmap: uvodni video snimak o Openstritmapu + video_to_openstreetmap: uvodni video-snimak za Openstritmap wiki_signup: Možete i da <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">otvorite nalog na vikiju</a>. signup_confirm_plain: ask_questions: "Možete postaviti bilo koje pitanje o Openstritmapu na naÅ¡im stranicama za pitanja i odgovore:" @@ -1119,13 +1204,15 @@ sr-EL: current_user_2: "gde žive, dostupan je na:" greeting: Pozdrav! hopefully_you: Neko (verovatno vi) želeo bi da otvori nalog na - introductory_video: "Uvodni video snimak o Openstritmapu možete pogledati ovde:" - more_videos: "Ovde se nalazi joÅ¡ viÅ¡e video snimaka:" + introductory_video: "Pogledajte uvodni video-snimak za Openstritmap ovde:" + more_videos: "ViÅ¡e video-snimaka možete naći ovde:" opengeodata: "OpenGeoData.org je blog Stiva Kosta, osnivača Openstritmapa:" the_wiki: "Pročitajte viÅ¡e o Openstritmapu na vikiju:" + the_wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Beginners'_guide?uselang=sr-ec user_wiki_1: Preporučujemo vam da napravite korisničku stranicu koja uključuje user_wiki_2: oznake kategorija koje označavaju odakle ste, kao na primer [[Category:Users_in_London]]. wiki_signup: "Možete i otvoriti nalog na naÅ¡em vikiju:" + wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=sr-ec oauth: oauthorize: allow_read_gpx: čita vaÅ¡e privatne GPS tragove. @@ -1184,6 +1271,8 @@ sr-EL: allow_write_gpx: otprema GPS tragove. allow_write_prefs: menja korisničke postavke. authorize_url: "Adresa ovlašćenja:" + confirm: Jeste li sigurni? + delete: ObriÅ¡i klijent edit: Detalji izmene key: "Ključ potroÅ¡ača:" requests: "Zahtevanje sledećih dozvola od korisnika:" @@ -1193,8 +1282,42 @@ sr-EL: url: "Adresa zahtevnog novčića:" update: flash: Podaci o klijentu su uspeÅ¡no ažurirani + printable_name: + with_version: "%{id}, ver. %{version}" + redaction: + create: + flash: Redakcija je napravljena. + destroy: + error: DoÅ¡lo je do greÅ¡ke pri uklanjanju redakcije. + flash: Redakcija je uklonjena. + not_empty: Redakcija nije prazna. PoniÅ¡tite redigovanje svih verzija koje pripadaju ovoj redakciji pre nego Å¡to je uklonite. + edit: + description: Opis + heading: Uredi redakciju + submit: Sačuvaj redakciju + title: Uređivanje redakcije + index: + empty: Nema redakcija. + heading: Spisak redakcija + title: Spisak redakcija + new: + description: Opis + heading: Unesite podatke za novu redakciju + submit: Napravi redakciju + title: Pravljenje nove redakcije + show: + confirm: Jeste li sigurni? + description: "Opis:" + destroy: Ukloni ovu redakciju + edit: Uredi ovu redakciju + heading: Prikaz redakcije „%{title}“ + title: Prikaz redakcije + user: "Tvorac:" + update: + flash: Izmene su sačuvane. site: edit: + anon_edits: (%{link}) anon_edits_link_text: Saznajte zaÅ¡to je to slučaj. flash_player_required: Potreban vam je fleÅ¡ plejer da biste koristili uređivač mapa. Preuzmite ga <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">odavde</a>. Dostupne su i <a href="http://wiki.openstreetmap.org/wiki/Editing">neke druge mogućnosti</a> za uređivanje Openstritmapa. no_iframe_support: VaÅ¡ pregledač ne podržava HTML iframes, a oni su potrebni za ovu mogućnost. @@ -1207,7 +1330,6 @@ sr-EL: index: js_1: Koristite pregledač koji ne podržava javaskript ili ste ga onemogućili. js_2: Openstritmap koristi javaskript za prikazivanje mapa. - js_3: Probajte <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home, pregledač statičnih pločica</a> ako ne možete da omogućite javaskript. license: license_name: Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0 notice: Objavljeno pod licencom %{license_name} od %{project_name} i njenih saradnika. @@ -1284,6 +1406,23 @@ sr-EL: unclassified: Nekategorisani put unsurfaced: Neasfaltirani put wood: Å uma + markdown_help: + alt: Rezervni tekst + first: Prva stavka + heading: Naslov + headings: Naslovi + image: Slika + link: Veza + ordered: Svrstan spisak + second: Druga stavka + subheading: Podnaslov + text: Tekst + title_html: Raščlanjeno sa <a href="http://daringfireball.net/projects/markdown/">markdaunom</a> + unordered: Nesvrstan spisak + url: Adresa + richtext_area: + edit: Uredi + preview: Pregled search: search: Pretraga search_help: "primeri: „Novi Sad“, „Vojvode Stepe, Beograd“ ili „železnička stanica, Niš“ <a href='http://wiki.openstreetmap.org/wiki/Search'>viÅ¡e primera…</a>" @@ -1319,6 +1458,7 @@ sr-EL: uploaded_at: "Otpremljeno:" visibility: "Vidljivost:" visibility_help: Å¡ta ovo znači? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec list: public_traces: Javni GPS tragovi public_traces_from: Javni GPS tragovi korisnika %{user} @@ -1326,10 +1466,6 @@ sr-EL: your_traces: VaÅ¡i GPS tragovi make_public: made_public: Javni trag - no_such_user: - body: Žao nam je, ali ne postoji korisnik s imenom %{user}. Proverite ispravnost upisa ili veze koju ste kliknuli. - heading: Korisnik %{user} ne postoji - title: Nema takvog korisnika offline: heading: GPX ostava je van mreže message: GPX ostava i otpremanje trenutno nisu dostupni. @@ -1345,21 +1481,23 @@ sr-EL: in: u map: mapa more: viÅ¡e - pending: NA_ČEKANJU + pending: NA_ČEKANjU private: PRIVATNI public: JAVNI - trace_details: Pogledaj detalje traga + trace_details: Pogledajte detalje o tragu trackable: MOŽE SE PRATITI - view_map: Pogledaj mapu + view_map: Pogledaj kartu trace_form: description: "Opis:" help: Pomoć + help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=sr-ec tags: "Oznake:" tags_help: razdvojeno zapetama upload_button: Otpremi upload_gpx: "Otpremi GPX datoteku:" visibility: "Vidljivost:" visibility_help: Å¡ta ovo znači? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec trace_header: see_all_traces: Pogledaj sve tragove see_your_traces: Pogledaj svoje tragove @@ -1368,8 +1506,6 @@ sr-EL: trace_optionals: tags: Oznake trace_paging_nav: - next: Sledeći » - previous: "« Prethodni" showing_page: Prikaz stranice %{page} view: delete_track: ObriÅ¡i ovaj trag @@ -1382,7 +1518,7 @@ sr-EL: map: mapa none: niÅ¡ta owner: "Vlasnik:" - pending: NA_ČEKANJU + pending: NA_ČEKANjU points: "Tačaka:" start_coordinates: "Početna koordinata:" tags: "Oznake:" @@ -1401,6 +1537,7 @@ sr-EL: agreed: Prihvatili ste nove uslove uređivanja. agreed_with_pd: Takođe se slažete da vaÅ¡e izmene budu u javnom vlasniÅ¡tvu. heading: "Uslovi uređivanja:" + link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec link text: Å¡ta je ovo? not yet agreed: Niste prihvatili nove uslove uređivanja. review link text: Pratite ovu vezu da biste pregledali i prihvatili nove uslove uređivanja. @@ -1461,7 +1598,7 @@ sr-EL: failure: Korisnik %{name} nije pronađen. success: Poslali smo novu potvrdnu poruku na %{email}. Nakon Å¡to potvrdite svoj nalog, moći ćete da počnete s mapiranjem.<br /><br />Ako koristite sistem protiv nepoželjnih poruka, dodajte webmaster@openstreetmap.org u spisak dozvoljenih adresa jer nismo u mogućnosti da odgovorimo na bilo koji zahtev za potvrdu. filter: - not_an_administrator: Morate biti administrator da biste izvrÅ¡ili ovu radnju. + not_an_administrator: Treba da budete administrator da biste izvrÅ¡ili ovu radnju. go_public: flash success: Sve vaÅ¡e izmene su sada javne. Dozvoljeno vam je uređivanje. list: @@ -1485,6 +1622,7 @@ sr-EL: login_button: Prijavi me lost password link: Zaboravili ste lozinku? new to osm: Novi ste na sajtu? + no account: Nemate nalog? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Saznajte viÅ¡e o predstojećoj izmeni licence</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">prevodi</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">razgovor</a>) notice_terms: Openstritmap dobija novu licencu 1. aprila 2012. Ova licenca je otvorena isto kao i sadaÅ¡nja, ali pravni detalji su mnogo pogodniji naÅ¡oj kartografskoj bazi. Sa zadovoljstvom bi zadržali vaÅ¡e doprinose na Openstritmapu, ali ovo je moguće samo ako prihvatite da oni budu objavljeni pod uslovima nove licence. U suprotnom, moraćemo da ih uklonimo iz baze.<br /><br />Prijavite se, pročitajte uslove i vidite da li se slažete s njima. Hvala! openid: "%{logo} OpenID:" @@ -1548,11 +1686,12 @@ sr-EL: no_auto_account_create: Nažalost, trenutno nismo u mogućnosti da otvorimo novi nalog. not displayed publicly: Ne prikazuje se javno (pogledajte <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">politiku privatnosti</a>) openid: "%{logo} OpenID:" - openid association: "<p>VaÅ¡ OpenID nije povezan s nalogom na Openstritmapu.</p>\n<ul>\n <li>Ako joÅ¡ uvek nemate nalog, otvorite ga koristeći obrazac ispod.</li>\n <li>\n Ako imate nalog, prijavite se sa svojim korisničkim imenom\n i lozinkom, pa ga onda povežite s OpenID-jem u postavkama.\n </li>\n</ul>" + openid association: "<p>VaÅ¡ OpenID nije povezan s nalogom na Openstritmapu.</p>\n<ul>\n <li>Ako joÅ¡ uvek nemate nalog, otvorite ga koristeći obrazac ispod.</li>\n <li>\n Ako imate nalog, prijavite se sa svojim korisničkim imenom\n i lozinkom, pa ga onda povežite s OpenID-jem u postavkama.\n </li>\n</ul>" openid no password: S OpenID-jem, lozinka nije potrebna, ali neke dodatne alatke ipak zahtevaju lozinku. password: "Lozinka:" terms accepted: Hvala vam Å¡to prihvatate nove uslove uređivanja. terms declined: Žao nam je Å¡to ste odlučili da ne prihvatite nove uslove uređivanja. Pogledajte <a href="%{url}">ovu stranicu</a> za viÅ¡e informacija. + terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec title: Otvaranje naloga use openid: Rezervni način je da koristite %{logo} OpenID no_such_user: @@ -1561,7 +1700,7 @@ sr-EL: title: Nema takvog korisnika popup: friend: Prijatelj - nearby mapper: Obližnji maper + nearby mapper: Obližnji kartograf your location: VaÅ¡a lokacija remove_friend: not_a_friend: "%{name} nije vaÅ¡ prijatelj." @@ -1577,7 +1716,7 @@ sr-EL: set_home: flash success: Mesto stanovanja je uspeÅ¡no sačuvano suspended: - body: "<p>\n Žao nam je, vaÅ¡ nalog je privremeno ukinut\n zbog sumnjive aktivnosti.\n</p>\n<p>\n Ovu odluku će ubrzo razmotriti administrator. Takođe,\n možete kontaktirati %{webmaster}a ako želite da se žalite.\n</p>" + body: "<p>\n Žao nam je, vaÅ¡ nalog je privremeno ukinut\n zbog sumnjive aktivnosti.\n</p>\n<p>\n Ovu odluku će ubrzo razmotriti administrator. Takođe,\n možete kontaktirati %{webmaster}a ako želite da se žalite.\n</p>" heading: Suspendovan nalog title: Suspendovan nalog webmaster: administrator @@ -1585,8 +1724,10 @@ sr-EL: agree: Prihvati consider_pd: Prema gorenavedenom ugovoru, smatram da moji doprinosi pripadaju javnom vlasniÅ¡tvu consider_pd_why: Å¡ta je ovo? + consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain?uselang=sr-ec decline: Odbaci - guidance: "Podaci koji će vam pomoći da razumete uslove: <a href=\"%{summary}\">čitljivi sažetak</a> i <a href=\"%{translations}\">neformalni prevodi</a>" + declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec + guidance: "Podaci koji će vam pomoći da razumete ove uslove: <a href=\"%{summary}\">kratak opis</a> i neki <a href=\"%{translations}\">neformalni prevodi</a>" heading: Uslovi uređivanja legale_names: france: Francuska @@ -1603,6 +1744,7 @@ sr-EL: block_history: pogledaj dobijene blokade blocks by me: moja blokiranja blocks on me: blokiranja na mene + comments: komentari confirm: Potvrdi confirm_user: potvrdi ovog korisnika create_block: blokiraj ovog korisnika @@ -1621,11 +1763,12 @@ sr-EL: friends_diaries: Pregled svih zapisa u dnevniku prijatelja hide_user: sakrij ovog korisnika if set location: Ako postavite svoju lokaciju, zgodna mapa će biti prikazana ispod. Možete je podesiti u %{settings_link}. - km away: udaljeno %{count} km + km away: udaljeno %{count} km latest edit: "Poslednja izmena pre %{ago}:" - m away: udaljeno %{count} m - mapper since: "Maper od:" + m away: udaljeno %{count} m + mapper since: "Kartograf od:" moderator_history: pogledaj date blokade + my comments: moji komentari my diary: moj dnevnik my edits: moje izmene my settings: moje postavke @@ -1653,7 +1796,7 @@ sr-EL: status: "Stanje:" traces: tragovi unhide_user: otkrij ovog korisnika - user location: Lokacija korisnika + user location: BoraviÅ¡te korisnika your friends: VaÅ¡i prijatelji user_block: blocks_by: @@ -1680,7 +1823,6 @@ sr-EL: filter: block_expired: Blokada je već istekla i ne može se uređivati. block_period: Period blokade mora biti jedna od vrednosti iz padajućeg spiska. - not_a_moderator: Morate biti urednik da biste izvrÅ¡ili ovu radnju. helper: time_future: ZavrÅ¡ava se u %{time}. time_past: ZavrÅ¡eno pre %{time}. @@ -1717,8 +1859,9 @@ sr-EL: show: Prikaži status: Stanje period: + few: "%{count} sata" one: 1 sat - other: "%{count} sata" + other: "%{count} sati" revoke: confirm: Želite li da opozovete ovu blokadu? flash: Ova blokada je opozvana. diff --git a/config/locales/sr-EC.yml b/config/locales/sr.yml similarity index 83% rename from config/locales/sr-EC.yml rename to config/locales/sr.yml index cbe262904..ce77dd074 100644 --- a/config/locales/sr-EC.yml +++ b/config/locales/sr.yml @@ -1,13 +1,14 @@ -# Messages for Serbian (Cyrillic script) (‪Српски (ћирилица)‬) +# Messages for Serbian (Cyrillic script) (‪српски (ћирилица)‬) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Nemo bis # Author: Nikola Smolenski # Author: Rancher # Author: Sawa # Author: Жељко Тодоровић # Author: Милан Јелисавчић # Author: Обрадовић Горан -sr-EC: +sr: activerecord: attributes: diary_comment: @@ -72,13 +73,15 @@ sr-EC: tracetag: Ознака трага user: Корисник user_preference: Корисничке поставке - user_token: Кориснички знак + user_token: Кориснички жетон way: Путања way_node: Чвор путање way_tag: Ознака пута application: require_cookies: cookies_needed: Изгледа да сте онемогућили колачиће. Омогућите их пре него што наставите. + require_moderator: + not_a_moderator: Да бисте извели ову радњу, треба да будете модератор. setup_user_auth: blocked: Ваш приступ АПИ-ју је блокиран. Пријавите се да сазнате више. need_to_see_terms: Ваш приступ АПИ-ју је привремено укинут. Пријавите се да бисте погледали услове уређивања. Не морате да их прихватите, већ само да их видите. @@ -86,7 +89,6 @@ sr-EC: changeset: changeset: "Скуп измена: %{id}" changesetxml: XML скуп измена - download: Преузми %{changeset_xml_link} или %{osmchange_xml_link} feed: title: Скуп измена %{id} title_comment: Скуп измена %{id} – %{comment} @@ -146,26 +148,31 @@ sr-EC: prev_node_tooltip: Претходни чвор prev_relation_tooltip: Претходни однос prev_way_tooltip: Претходна путања + paging: + all: + next: "%{id} »" + prev: « %{id} + user: + next: "%{id} »" + prev: « %{id} user: name_changeset_tooltip: Погледај измене корисника %{user} next_changeset_tooltip: Следећа измена корисника %{user} prev_changeset_tooltip: Претходна измена корисника %{user} node: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" download_xml: Преузми XML - edit: уреди + edit: Уреди чвор node: Чвор node_title: "Чвор: %{node_name}" - view_history: прикажи историју + view_history: Погледај историју node_details: coordinates: "Координате:" part_of: "Део:" node_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Преузми XML node_history: Историја чвора node_history_title: "Историја чвора: %{node_name}" - view_details: прикажи детаље + view_details: Погледај детаље not_found: sorry: Жао нам је, али %{type} с ИБ %{id} није пронађен. type: @@ -176,22 +183,28 @@ sr-EC: paging_nav: of: од showing_page: Приказ странице + redacted: + message_html: Верзија %{version} ове %{type} не може да се прикаже будући да је редигована. Више на %{redaction_link}. + redaction: Редакција %{id} + type: + node: чвор + relation: однос + way: путања relation: - download: "%{download_xml_link} или %{view_history_link}" download_xml: Преузми XML relation: Однос relation_title: "Однос: %{relation_name}" - view_history: прикажи историју + view_history: Погледај историју relation_details: members: "Чланови:" part_of: "Део:" relation_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Преузми XML relation_history: Историја односа relation_history_title: "Историја односа: %{relation_name}" - view_details: погледај детаље + view_details: Погледај детаље relation_member: + entry: "%{type} %{name}" entry_role: "%{type} %{name} као %{role}" type: node: Чвор @@ -202,14 +215,14 @@ sr-EC: view_data: Погледај податке тренутног приказа мапе start_rjs: data_frame_title: Подаци - data_layer_name: Подаци + data_layer_name: Прегледај податке са мапе details: Детаљи drag_a_box: Превуците оквир на мапи да бисте изабрали подручје edited_by_user_at_timestamp: Изменио [[user]] у [[timestamp]] hide_areas: Сакриј подручја history_for_feature: Историја за [[feature]] load_data: Учитај податке - loaded_an_area_with_num_features: "Учитали сте подручје које садржи [[num_features]] могућности. Неки прегледачи се не могу носити с толиком количином података. Они најбоље раде када приказују мање од сто могућности истовремено: ако радите још нешто, то може успорити прегледач или га закочити. Ако сте сигурни да желите да прикажете ове податке, можете то урадити кликом на дугме испод." + loaded_an_area_with_num_features: "Учитали сте подручје које садржи [[num_features]] могућности. Неки прегледачи се не могу носити с толиком количином података. Они најбоље раде када приказују мање од [[max_features]] могућности истовремено: ако радите још нешто, то може успорити прегледач или га закочити. Ако сте сигурни да желите да прикажете ове податке, можете то урадити кликом на дугме испод." loading: Учитавам… manually_select: Ручно изаберите друго подручје object_list: @@ -248,10 +261,9 @@ sr-EC: relation: однос way: путања way: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" download_xml: Преузми XML - edit: уреди - view_history: погледај историју + edit: Уреди путању + view_history: Погледај историју way: Путања way_title: "Путања: %{way_name}" way_details: @@ -261,15 +273,15 @@ sr-EC: nodes: "Чворови:" part_of: "Део:" way_history: - download: "%{download_xml_link} или %{view_details_link}" download_xml: Преузми XML - view_details: погледај детаље + view_details: Погледај детаље way_history: Историја путање way_history_title: "Историја путање: %{way_name}" changeset: changeset: anonymous: Анонимно big_area: (велико) + id: бр. %{id} no_comment: (нема коментара) no_edits: (нема измена) show_area_box: погледај оквир подручја @@ -292,6 +304,8 @@ sr-EC: description_nearby: Измене од околних корисника description_user: Скупови измена корисника %{user} description_user_bbox: Скупови измена корисника %{user} унутар %{bbox} + empty_anon_html: Још нема измена + empty_user_html: Изгледа да нисте направили ниједну измену досад. Да бисте почели, прво погледајте <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>упутство за почетнике</a>. heading: Скупови измена heading_bbox: Скупови измена heading_friend: Измене @@ -307,6 +321,14 @@ sr-EC: timeout: sorry: Жао нам је, али списак измена који сте захтевали је предугачак. diary_entry: + comments: + ago: пре %{ago} + comment: Коментар + has_commented_on: "%{display_name} је прокоментарисао следеће уносе у дневнику" + newer_comments: Новији коментари + older_comments: Старији коментари + post: Постави + when: Када diary_comment: comment_from: Коментар корисника %{link_user} у %{comment_created_at} confirm: Потврди @@ -364,10 +386,6 @@ sr-EC: body: Жао нам је, али нема уноса у дневнику или коментар с ИБ %{id}. Проверите исправност уписа или везе коју сте кликнули. heading: "Нема уноса с ИБ: %{id}" title: Нема таквог уноса у дневнику - no_such_user: - body: Жао нам је, али нема корисника с именом %{user}. Проверите исправност уписа или везе коју сте кликнули. - heading: Корисник %{user} не постоји - title: Нема таквог корисника view: leave_a_comment: Оставите коментар login: Пријавите се @@ -400,6 +418,7 @@ sr-EC: licence: Лиценца longitude: "ГД:" manually_select: Ручно изаберите друго подручје + map_image: Слика мапе (приказује стандардни слој) max: највише options: Могућности osm_xml_data: Опенстритмап XML подаци @@ -458,18 +477,31 @@ sr-EC: search_osm_namefinder: suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} од %{parentname})" suffix_place: ", %{distance} %{direction} од %{placename}" + suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Аеродром + apron: Рампа + gate: Капија + helipad: Хелиодром + runway: Писта + taxiway: Рулна стаза + terminal: Терминал amenity: + WLAN: Бежични интернет airport: Аеродром arts_centre: Уметнички центар + artwork: Уметничко дело atm: Банкомат auditorium: Дворана bank: Банка bar: Бар + bbq: Роштиљ bench: Клупа bicycle_parking: Бициклистички паркинг bicycle_rental: Изнајмљивање бицикла + biergarten: Пивска башта brothel: Јавна кућа bureau_de_change: Мењачница bus_station: Аутобуска станица @@ -478,6 +510,7 @@ sr-EC: car_sharing: Заједничко коришћење аутомобила car_wash: Ауто-перионица casino: Казино + charging_station: Напојна станица cinema: Биоскоп clinic: Клиника club: Клуб @@ -496,6 +529,7 @@ sr-EC: ferry_terminal: Скела fire_hydrant: Хидрант fire_station: Ватрогасна станица + food_court: Штандови за брзу храну fountain: Фонтана fuel: Бензинска пумпа grave_yard: Гробље @@ -536,9 +570,12 @@ sr-EC: shelter: Склониште shop: Продавница shopping: Трговачки центар + shower: Туш + social_centre: Социјални центар social_club: Друштвени клуб studio: Студио supermarket: Супермаркет + swimming_pool: Базен taxi: Такси telephone: Телефонска говорница theatre: Позориште @@ -553,37 +590,17 @@ sr-EC: youth_centre: Дом омладине boundary: administrative: Административна граница + census: Пописна граница + national_park: Национални парк + protected_area: Заштићено подручје + bridge: + aqueduct: Аквадукт + suspension: Висећи мост + swing: Вртешки мост + viaduct: Вијадукт + "yes": Мост building: - apartments: Стамбени блок - block: Блок зграда - bunker: Бункер - chapel: Капела - church: Црква - city_hall: Градска скупштина - commercial: Пословна зграда - dormitory: Студентски дом - entrance: Улаз у зграду - faculty: Зграда факултета - farm: Зграда фарме - flats: Станови - garage: Гаража - hall: Хала - hospital: Болница - hotel: Хотел - house: Кућа - industrial: Индустријска зграда - office: Пословница - public: Јавна зграда - residential: Стамбена зграда - retail: Малопродајна радња - school: Школа - shop: Продавница - stadium: Стадион - store: Продавница - terrace: Тераса - tower: Торањ - train_station: Железничка станица - university: Универзитетска зграда + "yes": Зграда highway: bridleway: Коњичка стаза bus_guideway: Аутобуска трака @@ -591,12 +608,11 @@ sr-EC: byway: Пречица construction: Ауто-пут у изградњи cycleway: Бициклистичка стаза - distance_marker: Ознака удаљености emergency_access_point: Излаз за случај опасности footway: Пешачка стаза ford: Газ - gate: Капија living_street: Улица смиреног промета + milestone: Миљоказ minor: Другоразредни пут motorway: Ауто-пут motorway_junction: Петља @@ -608,14 +624,17 @@ sr-EC: primary_link: Главни пут raceway: Тркачка стаза residential: Улица + rest_area: Одмаралиште road: Пут secondary: Споредни пут secondary_link: Споредни пут service: Сервисни пут services: Услуге на ауто-путу + speed_camera: Фото-радар steps: Степенице stile: Прелаз преко ограде tertiary: Локални пут + tertiary_link: Локални пут track: Макадам trail: Стаза trunk: Магистрални пут @@ -629,6 +648,7 @@ sr-EC: building: Зграда castle: Дворац church: Црква + fort: Утврђивање house: Кућа icon: Икона manor: Племићко имање @@ -653,6 +673,7 @@ sr-EC: farmland: Поље farmyard: Фарма forest: Шума + garages: Гаража grass: Трава greenfield: Зелено поље industrial: Индустријско подручје @@ -660,25 +681,28 @@ sr-EC: meadow: Ливада military: Војно подручје mine: Рудник - mountain: Планина nature_reserve: Резерват природе + orchard: Воћњак park: Парк piste: Скијашка стаза - plaza: Шеталиште quarry: Каменолом railway: Железничка пруга recreation_ground: Рекреацијско подручје reservoir: Резервоар + reservoir_watershed: Акумулациона вододелница residential: Стамбено подручје retail: Малопродаја + road: Путно подручје village_green: Сеоско поље vineyard: Виноград wetland: Мочвара wood: Шума leisure: beach_resort: Морско одмаралиште + bird_hide: Склониште за птице common: Општинско земљиште fishing: Риболовно подручје + fitness_station: Технички преглед garden: Башта golf_course: Голф терен ice_rink: Клизалиште @@ -689,12 +713,17 @@ sr-EC: pitch: Спортско игралиште playground: Игралиште recreation_ground: Рекреацијско подручје + sauna: Сауна slipway: Навоз sports_centre: Спортски центар stadium: Стадион swimming_pool: Базен track: Стаза за трчање water_park: Водени парк + military: + airfield: Војни аеродром + barracks: Касарна + bunker: Бункер natural: bay: Залив beach: Плажа @@ -702,11 +731,12 @@ sr-EC: cave_entrance: Улаз у пећину channel: Канал cliff: Литица - coastline: Обала crater: Кратер + dune: Дина feature: Обележје fell: Брдо fjord: Фјорд + forest: Шума geyser: Гејзир glacier: Глечер heath: Равница @@ -726,6 +756,7 @@ sr-EC: scrub: Гуштара shoal: Спруд spring: Извор + stone: Камен strait: Мореуз tree: Дрво valley: Долина @@ -734,6 +765,19 @@ sr-EC: wetland: Мочвара wetlands: Мочвара wood: Шума + office: + accountant: Рачуновођа + architect: Архитекта + company: Фирма + employment_agency: Агенција за запошљавање + estate_agent: Агенција за некретнине + government: Владина служба + insurance: Служба за осигуравање + lawyer: Адвокат + ngo: НВО канцеларија + telecommunication: Телекомуникациона служба + travel_agent: Туристичка агенција + "yes": Канцеларија place: airport: Аеродром city: Град @@ -745,6 +789,7 @@ sr-EC: houses: Куће island: Острво islet: Хрид + isolated_dwelling: Удаљено пребивалиште locality: Локалитет moor: Мочвара municipality: Општина @@ -768,6 +813,7 @@ sr-EC: junction: Железнички чвор level_crossing: Пружни прелаз light_rail: Лака железница + miniature: Минијатурна железница monorail: Једнотрачна пруга narrow_gauge: Ускотрачна пруга platform: Железничка платформа @@ -782,7 +828,7 @@ sr-EC: yard: Ранжирна станица shop: alcohol: Трговина пићем - apparel: Трговина одећом + antiques: Антикварница art: Атеље bakery: Пекара beauty: Парфимерија @@ -791,7 +837,6 @@ sr-EC: books: Књижара butcher: Месара car: Ауто-кућа - car_dealer: Ауто-дилер car_parts: Ауто-делови car_repair: Ауто-сервис carpet: Продавница тепиха @@ -806,7 +851,6 @@ sr-EC: department_store: Робна кућа discount: Дисконт doityourself: Уради сам - drugstore: Дрогерија dry_cleaning: Хемијско чишћење electronics: Електронска опрема estate_agent: Агент за некретнине @@ -872,7 +916,10 @@ sr-EC: valley: Долина viewpoint: Видиковац zoo: Зоолошки врт + tunnel: + "yes": Тунел waterway: + artificial: Вештачки водени пут boatyard: Бродоградилиште canal: Канал connector: Спој водних путева @@ -893,12 +940,18 @@ sr-EC: water_point: Тачка водотока waterfall: Водопад weir: Брана + prefix_format: "%{name}" + html: + dir: ltr javascripts: map: base: cycle_map: Бициклистичка мапа mapquest: Мапквест опен - transport_map: Саобраћајна карта + standard: Стандардна + transport_map: Саобраћајна мапа + overlays: + maplint: Маплинт site: edit_disabled_tooltip: Увећајте приказ да бисте уредили мапу edit_tooltip: Уредите мапу @@ -907,6 +960,7 @@ sr-EC: history_tooltip: Погледајте измене за ово подручје history_zoom_alert: Морате увећати приказ да бисте видели измене за ово подручје layouts: + community: Заједница community_blogs: Блогови заједнице community_blogs_title: Блогови чланова заједнице copyright: Ауторска права и лиценца @@ -925,20 +979,22 @@ sr-EC: help: Помоћ help_centre: Центар за помоћ help_title: Страница помоћи за пројекат + help_url: http://help.openstreetmap.org/ history: Историја home: дом home_tooltip: Иди на локацију дома - inbox: примљене (%{count}) inbox_tooltip: one: Ваше сандуче садржи једну непрочитану поруку other: Ваше сандуче садржи %{count} непрочитане поруке zero: Ваше сандуче не садржи непрочитане поруке - intro_1: Опенстритмап је слободна карта целог света. Сачињавају је корисници као што сте ви. - intro_2: Опенстритмап вам омогућава да прегледате, уређујете и користите географске податке с било ког места на земљи. - intro_3: Одржавање Опенстритмапа подржава %{ucl}, %{ic} и %{bytemark}. Остале присталице пројекта су на списку %{partners}. - intro_3_ic: Лондонски краљевски колеџ - intro_3_partners: вики + intro_1: Опенстритмап је слободна мапа целог света. Сачињавају је корисници као што сте ви. + intro_2_create_account: Отворите налог + intro_2_download: преузимање + intro_2_html: Подаци су слободни за %{download} и %{use} под условима лиценце %{license}. %{create_account} да побољшате мапу. + intro_2_license: отворена лиценца + intro_2_use: употреба license: + alt: CC BY-SA 2.0 title: Подаци Опенстритмапа су објављени под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0 log_in: пријави ме log_in_tooltip: Пријавите се с постојећим налогом @@ -951,9 +1007,16 @@ sr-EC: title: Подржите Опенстритмап новчаним прилогом osm_offline: База података Опенстритмапа је тренутно недоступна док се не заврше важни радови на одржавању. osm_read_only: Због радова на одржавању базе података Опенстритмапа, исту тренутно није могуће мењати. + partners_bytemark: Хостинг „Бајтмарк“ + partners_html: Хостинг подржава %{ucl}, %{ic} и %{bytemark}, као и други %{partners}. + partners_ic: Лондонски краљевски колеџ + partners_partners: партнери + partners_ucl: VR центар UCL-а + project_name: + h1: Опенстритмап + title: Опенстритмап sign_up: отвори налог sign_up_tooltip: Отворите налог да бисте уређивали - sotm2011: Дођите на Конференцију Опенстритмапа 2011, Стање мапе, од 9. до 11. септембра у Денверу! tag_line: Слободна вики мапа света user_diaries: Дневници user_diaries_tooltip: Погледајте корисничке дневнике @@ -963,12 +1026,36 @@ sr-EC: welcome_user_link_tooltip: Ваша корисничка страница wiki: вики wiki_title: Вики странице пројекта + wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Main_Page?uselang=sr-ec license_page: foreign: english_link: енглеског оригинала text: У случају сукоба између преведене странице и %{english_original_link}, енглеска страница има предност title: О преводу - legal_babble: "<h2>Ауторска права и лиценца</h2>\n<p>\n Опенстритмап чине <i>слободни подаци</i> који су објављени под\n лиценцом <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n Кријејтив комонс Ауторство-Делити под истим условима 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Слободни сте да умножавате, делите, преносите и прилагођавате\n наше мапе и податке, све док именујете Опенстритмап и њене\n уређиваче. Ако желите да мењате и дограђујете наше податке,\n можете их делити само под истом лиценцом.\n Цео <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">\n текст уговора</a> објашњава вам ваша права и одговорности.\n</p>\n\n<h3>Како да именујете Опенстритмап</h3>\n<p>\n Ако користите наше слике мапа, тражимо да заслуге садрже\n бар “© OpenStreetMap\n contributors, CC-BY-SA”. Ако користите само податке мапа,\n наведите “Map data © OpenStreetMap contributors,\n CC-BY-SA”.\n</p>\n<p>\n Где је могуће, Опенстритмап би требало да води ка адреси <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n и CC-BY-SA ка <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n Ако користите медијум где везе није могуће поставити\n (нпр. штампани рад), предлажемо да усмерите ваше\n читаоце на www.openstreetmap.org (по могућству\n проширавањем ‘OpenStreetMap’ на целу адресу)\n и на www.creativecommons.org.\n</p>\n\n<h3>Сазнајте више</h3>\n<p>\n Прочитајте више о коришћењу наших података на <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">ЧПП</a>.\n</p>\n<p>\n ОСМ уређивачи се подсећају да никада не додају податке\n од било ког извора заштићеног ауторским правима (нпр.\n Гугл мапе или штампане мапе) без изричите дозволе\n носиоца ауторског права.\n</p>\n<p>\n Иако Опенстритмап чине слободни подаци, не можемо да\n обезбедимо бесплатне АПИ-је мапа другим програмерима.\n\n Погледајте нашу <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">политику\n о коришћењу АПИ-ја</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">политику\n о приказивању мапа</a> и <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">политику\n о коришћењу Номинатима</a>.\n\n<h3>Наши сарадници</h3>\n<p>\n Наша лиценца CC-BY-SA захтева од вас да “морате\n навести име изворног аутора или даваоца лиценце”.\n Појединачни мапери не захтевају истицање заслуга осим\n “Опенстритмап сарадника”, али када подаци\n припадају националној географској агенцији или другом\n већем извору који је укључен у Опенстритмап, разумно је\n навести извор или оставити хипервезу до извора.\n</p>\n\n<!--\nПодаци за уређиваче страница\n\nСледећи списак садржи само оне организације које захтевају приписивање\nкао услов да се њихови подаци користе у Опенстритмапу. Ово није цели\nкаталог „увоза“ података и не сме се користити осим када се захтева да\nприписивање буде у складу с лиценцом увезених података.\n\nДа бисте било шта додали испод, прво морате попричати с администраторима.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Аустралија</strong>: садржи податке о општинама\n на основу података Аустралијског бироа за статистику.</li>\n<li><strong>Аустрија</strong>: садржи податке из\n <a href=\"http://data.wien.gv.at/\">Штата Виена</a> под лиценцом\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Канада</strong>: садржи податке из\n Беобазе®, Геогратиса (© Одељење за природне\n ресурсе Канаде), Канвек (© Одељење за природне\n ресурсе Канаде) и Статкан (Географски одсек,\n Завод за статистику Канаде).</li>\n <li><strong>Француска</strong>: садржи податке који потичу од\n Генералне дирекције за опорезивање.</li>\n <li><strong>Нови Зеланд</strong>: садржи податке који потичу од\n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Пољска</strong>: садржи податке из <a\n href=\"http://ump.waw.pl/\">UMP-pcPL мапа</a>. Ауторска права\n UMP-pcPL сарадници.</li>\n <li><strong>Уједињено Краљевство</strong>: садржи Званичне\n податке геодетског премеравања © Ауторска права 2010.</li>\n</ul>\n\n<p>\n Укључивање података у Опенстритмап не подразумева да изворни\n власник података прихвата Опенстритмап, обезбеђује било какву\n гаранцију или прихвата одговорност.\n</p>" + legal_babble: + contributors_at_html: "<strong>Аустрија</strong>: садржи податке из\n <a href=\"http://data.wien.gv.at/\">Штата Виена</a> под лиценцом\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Ланд Форарлберг</a> и\n \t+ \t\nЛанд Тирол (под лиценцом <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT са изменама и допунама</a>)." + contributors_au_html: "<strong>Аустралија</strong>: садржи податке о општинама\n на основу података Аустралијског бироа за статистику." + contributors_ca_html: "<strong>Канада</strong>: садржи податке из\n Беобазе®, Геогратиса (© Одељење за природне\n ресурсе Канаде), Канвек (© Одељење за природне\n ресурсе Канаде) и Статкан (Географски одсек,\n Завод за статистику Канаде)." + contributors_footer_1_html: "Више информација о овим и другим изворима коришћеним\nза побољшавање Опенстритмапа можете наћи на страници <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Доприносиоци</a> на нашем викију." + contributors_footer_2_html: " Укључивање података у Опенстритмап не подразумева да изворни\n власник података прихвата Опенстритмап, обезбеђује било какву\n гаранцију или прихвата одговорност." + contributors_fr_html: "<strong>Француска</strong>: садржи податке који потичу од\n Генералне дирекције за опорезивање." + contributors_gb_html: "<strong>Уједињено Краљевство</strong>: садржи Званичне\n податке геодетског премеравања © Ауторска права 2010." + contributors_intro_html: " Наша лиценца CC BY-SA захтева од вас да “морате\n навести име изворног аутора или даваоца лиценце”.\n Појединачни картографи не захтевају истицање заслуга осим\n “Опенстритмап доприносиоца”, али када подаци\n припадају националној географској агенцији или другом\n већем извору који је укључен у Опенстритмап, разумно је\n навести извор или оставити хипервезу до њега." + contributors_nl_html: "<strong>Холандија</strong>: садржи © AND подаци, 2007\n \t+ \t\n (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Нови Зеланд</strong>: садржи податке који потичу од\n Land Information New Zealand. Крунска ауторска права задржана." + contributors_pl_html: "<strong>Пољска</strong>: садржи податке из <a\n href=\"http://ump.waw.pl/\">UMP-pcPL мапа</a>. Ауторска права\n UMP-pcPL доприносиоца.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Више о коришћењу Опенстритмапових UMP података</a></li>\n <li><strong>Јужна Африка</strong>: садржи податке који потичу од \t\n <a href=\"http://www.ngi.gov.za/\">Главног директората:\n Националне геопросторне информације</a>, државна права задржана." + contributors_title_html: Наши сарадници + contributors_za_html: "<strong>Јужноафричка Република</strong>: садржи податке из\n<a href=\"http://www.ngi.gov.za/\">Главне управе:\nНационална катастарска служба</a>, државна ауторска права задржана." + credit_1_html: " Ако користите наше слике мапа, тражимо да заслуге садрже\n бар “© Доприносиоци\n Опенстритмапа, CC BY-SA”. Ако користите само податке мапа,\n наведите “Картографски подаци © Доприносиоци Опенстритмапа,\n CC BY-SA”." + credit_2_html: " Где је могуће, Опенстритмап би требало да води до адресе <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n и CC BY-SA до <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n Ако користите медијум у ком се везе не могу поставити\n (нпр. штампани рад), предлажемо да усмерите ваше\n читаоце на www.openstreetmap.org (по могућству\n проширавањем ‘Опенстритмапа’ на целу адресу)\n и на www.creativecommons.org." + credit_title_html: Како да именујете Опенстритмап + intro_1_html: " Опенстритмап чине <i>слободни подаци</i> који су објављени под\n лиценцом <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n Кријејтив комонс Ауторство-Делити под истим условима 2.0</a> (CC BY-SA)." + intro_2_html: " Можете да умножавате, делите, преносите и прилагођавате\n наше мапе и податке, све док именујете Опенстритмап и њене\n уреднике. Ако желите да мењате и дограђујете наше податке,\n можете их делити само под истом лиценцом.\n Цео <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">\n текст уговора</a> објашњава вам ваша права и одговорности." + more_1_html: " Прочитајте више о коришћењу наших података на <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">ЧПП</a>." + more_2_html: " Подсећамо уреднике Опенстритмапа да никада не додају податке\n од било ког извора заштићеног ауторским правима (нпр.\n Гугл мапе или штампане мапе) без изричите дозволе\n носиоца ауторског права." + more_3_html: " Иако Опенстритмап чине слободни подаци, не можемо да\n обезбедимо бесплатне АПИ-је мапа другим програмерима.\n\n Погледајте нашу <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">политику\n о коришћењу АПИ-ја</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">политику\n о приказивању мапа</a> и <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">политику\n о коришћењу Номинатима</a>." + more_title_html: Сазнајте више + title_html: Ауторска права и лиценца native: mapping_link: почните с мапирањем native_link: српско издање @@ -1014,10 +1101,6 @@ sr-EC: body: Нажалост, нема поруке с тим ИБ. heading: Нема такве поруке title: Нема такве поруке - no_such_user: - body: Нажалост, не постоји корисник с тим именом. - heading: Нема таквог корисника - title: Нема таквог корисника outbox: date: Датум inbox: примљене @@ -1067,14 +1150,15 @@ sr-EC: hopefully_you_2: "%{server_url} на %{new_address}." friend_notification: befriend_them: Можете га/је додати и као пријатеља на %{befriendurl}. - had_added_you: "%{user} вас додаде као пријатеља на Опенстритмапу." + had_added_you: "%{user} вас је додао као пријатеља на Опенстритмапу." see_their_profile: Можете видети његов/њен профил на %{userurl}. - subject: "[OpenStreetMap] %{user} вас додаде као пријатеља" + subject: "[Опенстритмап] %{user} вас је додао као пријатеља" gpx_notification: and_no_tags: и без ознака. and_the_tags: "и са следећим ознакама:" failure: failed_to_import: "Увоз није успео. Грешка:" + import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=sr-ec more_info_1: Више о неуспелом GPX увозу и како то избећи more_info_2: "може се наћи на:" subject: "[OpenStreetMap] GPX увоз није успео" @@ -1100,6 +1184,7 @@ sr-EC: footer2: и можете одговорити на %{replyurl} header: "%{from_user} вам посла поруку преко Опенстритмапа под насловом %{subject}:" hi: Поздрав, %{to_user}, + subject_header: "[Опенстритмап] – %{subject}" signup_confirm: subject: "[OpenStreetMap] Потврдите вашу е-адресу" signup_confirm_html: @@ -1128,9 +1213,11 @@ sr-EC: more_videos: "Више видео-снимака можете наћи овде:" opengeodata: "OpenGeoData.org је блог Стива Коста, оснивача Опенстритмапа:" the_wiki: "Прочитајте више о Опенстритмапу на викију:" + the_wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Beginners'_guide?uselang=sr-ec user_wiki_1: Препоручујемо вам да направите корисничку страницу која укључује user_wiki_2: ознаке категорија које означавају одакле сте, као на пример [[Category:Users_in_London]]. wiki_signup: "Можете и отворити налог на нашем викију:" + wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=sr-ec oauth: oauthorize: allow_read_gpx: чита ваше приватне ГПС трагове. @@ -1189,6 +1276,8 @@ sr-EC: allow_write_gpx: отпрема ГПС трагове. allow_write_prefs: мења корисничке поставке. authorize_url: "Адреса овлашћења:" + confirm: Јесте ли сигурни? + delete: Обриши клијент edit: Детаљи измене key: "Кључ потрошача:" requests: "Захтевање следећих дозвола од корисника:" @@ -1198,8 +1287,42 @@ sr-EC: url: "Адреса захтевног новчића:" update: flash: Подаци о клијенту су успешно ажурирани + printable_name: + with_version: "%{id}, вер. %{version}" + redaction: + create: + flash: Редакција је направљена. + destroy: + error: Дошло је до грешке при уклањању редакције. + flash: Редакција је уклоњена. + not_empty: Редакција није празна. Поништите редиговање свих верзија које припадају овој редакцији пре него што је уклоните. + edit: + description: Опис + heading: Уреди редакцију + submit: Сачувај редакцију + title: Уређивање редакције + index: + empty: Нема редакција. + heading: Списак редакција + title: Списак редакција + new: + description: Опис + heading: Унесите податке за нову редакцију + submit: Направи редакцију + title: Прављење нове редакције + show: + confirm: Јесте ли сигурни? + description: "Опис:" + destroy: Уклони ову редакцију + edit: Уреди ову редакцију + heading: Приказ редакције „%{title}“ + title: Приказ редакције + user: "Творац:" + update: + flash: Измене су сачуване. site: edit: + anon_edits: (%{link}) anon_edits_link_text: Сазнајте зашто је то случај. flash_player_required: Потребан вам је флеш плејер да бисте користили уређивач мапа. Преузмите га <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">одавде</a>. Доступне су и <a href="http://wiki.openstreetmap.org/wiki/Editing">неке друге могућности</a> за уређивање Опенстритмапа. no_iframe_support: Ваш прегледач не подржава HTML iframes, а они су потребни за ову могућност. @@ -1212,7 +1335,6 @@ sr-EC: index: js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили. js_2: Опенстритмап користи јаваскрипт за приказивање мапа. - js_3: Пробајте <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home, прегледач статичних плочица</a> ако не можете да омогућите јаваскрипт. license: license_name: Кријејтив комонс Ауторство-Делити под истим условима 2.0 notice: Објављено под лиценцом %{license_name} од %{project_name} и њених сарадника. @@ -1289,6 +1411,23 @@ sr-EC: unclassified: Некатегорисани пут unsurfaced: Неасфалтирани пут wood: Шума + markdown_help: + alt: Резервни текст + first: Прва ставка + heading: Наслов + headings: Наслови + image: Слика + link: Веза + ordered: Сврстан списак + second: Друга ставка + subheading: Поднаслов + text: Текст + title_html: Рашчлањено са <a href="http://daringfireball.net/projects/markdown/">маркдауном</a> + unordered: Несврстан списак + url: Адреса + richtext_area: + edit: Уреди + preview: Преглед search: search: Претрага search_help: "примери: „Нови Сад“, „Војводе Степе, Београд“ или „железничка станица, Ниш“ <a href='http://wiki.openstreetmap.org/wiki/Search'>више примера…</a>" @@ -1324,17 +1463,15 @@ sr-EC: uploaded_at: "Отпремљено:" visibility: "Видљивост:" visibility_help: шта ово значи? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec list: + empty_html: Овде још нема ништа. <a href='%{upload_link}'>Отпремите нови траг</a> или сазнајте више о ГПС трагању на <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>вики страници</a>. public_traces: Јавни ГПС трагови public_traces_from: Јавни ГПС трагови корисника %{user} tagged_with: " означени са %{tags}" your_traces: Ваши ГПС трагови make_public: made_public: Јавни траг - no_such_user: - body: Жао нам је, али не постоји корисник с именом %{user}. Проверите исправност уписа или везе коју сте кликнули. - heading: Корисник %{user} не постоји - title: Нема таквог корисника offline: heading: GPX остава је ван мреже message: GPX остава и отпремање тренутно нису доступни. @@ -1359,12 +1496,14 @@ sr-EC: trace_form: description: "Опис:" help: Помоћ + help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=sr-ec tags: "Ознаке:" tags_help: раздвојено запетама upload_button: Отпреми upload_gpx: "Отпреми GPX датотеку:" visibility: "Видљивост:" visibility_help: шта ово значи? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec trace_header: see_all_traces: Погледај све трагове see_your_traces: Погледај своје трагове @@ -1373,8 +1512,8 @@ sr-EC: trace_optionals: tags: Ознаке trace_paging_nav: - next: Следећи » - previous: « Претходни + newer: Новији трагови + older: Старији трагови showing_page: Приказ странице %{page} view: delete_track: Обриши овај траг @@ -1406,6 +1545,7 @@ sr-EC: agreed: Прихватили сте нове услове уређивања. agreed_with_pd: Такође се слажете да ваше измене буду у јавном власништву. heading: "Услови уређивања:" + link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec link text: шта је ово? not yet agreed: Нисте прихватили нове услове уређивања. review link text: Пратите ову везу да бисте прегледали и прихватили нове услове уређивања. @@ -1490,6 +1630,7 @@ sr-EC: login_button: Пријави ме lost password link: Заборавили сте лозинку? new to osm: Нови сте на сајту? + no account: Немате налог? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Сазнајте више о предстојећој измени лиценце</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">преводи</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">разговор</a>) notice_terms: Опенстритмап добија нову лиценцу 1. априла 2012. Ова лиценца је отворена исто као и садашња, али правни детаљи су много погоднији нашој картографској бази. Са задовољством би задржали ваше доприносе на Опенстритмапу, али ово је могуће само ако прихватите да они буду објављени под условима нове лиценце. У супротном, мораћемо да их уклонимо из базе.<br /><br />Пријавите се, прочитајте услове и видите да ли се слажете с њима. Хвала! openid: "%{logo} OpenID:" @@ -1558,6 +1699,7 @@ sr-EC: password: "Лозинка:" terms accepted: Хвала вам што прихватате нове услове уређивања. terms declined: Жао нам је што сте одлучили да не прихватите нове услове уређивања. Погледајте <a href="%{url}">ову страницу</a> за више информација. + terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec title: Отварање налога use openid: Резервни начин је да користите %{logo} OpenID no_such_user: @@ -1566,7 +1708,7 @@ sr-EC: title: Нема таквог корисника popup: friend: Пријатељ - nearby mapper: Оближњи мапер + nearby mapper: Оближњи картограф your location: Ваша локација remove_friend: not_a_friend: "%{name} није ваш пријатељ." @@ -1590,7 +1732,9 @@ sr-EC: agree: Прихвати consider_pd: Према горенаведеном уговору, сматрам да моји доприноси припадају јавном власништву consider_pd_why: шта је ово? + consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain?uselang=sr-ec decline: Одбаци + declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec guidance: "Подаци који ће вам помоћи да разумете ове услове: <a href=\"%{summary}\">кратак опис</a> и неки <a href=\"%{translations}\">неформални преводи</a>" heading: Услови уређивања legale_names: @@ -1605,9 +1749,10 @@ sr-EC: activate_user: активирај овог корисника add as friend: додај као пријатеља ago: (пре %{time_in_words_ago}) - block_history: погледај добијене блокаде + block_history: добијене блокаде blocks by me: моја блокирања blocks on me: блокирања на мене + comments: коментари confirm: Потврди confirm_user: потврди овог корисника create_block: блокирај овог корисника @@ -1629,8 +1774,9 @@ sr-EC: km away: удаљено %{count} км latest edit: "Последња измена пре %{ago}:" m away: удаљено %{count} м - mapper since: "Мапер од:" - moderator_history: погледај дате блокаде + mapper since: "Картограф од:" + moderator_history: дате блокаде + my comments: моји коментари my diary: мој дневник my edits: моје измене my settings: моје поставке @@ -1685,7 +1831,6 @@ sr-EC: filter: block_expired: Блокада је већ истекла и не може се уређивати. block_period: Период блокаде мора бити једна од вредности из падајућег списка. - not_a_moderator: Треба да будете модератор да бисте извршили ову радњу. helper: time_future: Завршава се у %{time}. time_past: Завршено пре %{time}. @@ -1715,11 +1860,14 @@ sr-EC: creator_name: Творац display_name: Блокирани корисник edit: Уреди + next: Следеће » not_revoked: (није опозвано) + previous: « Претходно reason: Разлози за блокирање revoke: Опозови revoker_name: Опозвао show: Прикажи + showing_page: Приказ странице %{page} status: Стање period: one: 1 сат diff --git a/config/locales/sv.yml b/config/locales/sv.yml index e6a8d5fd6..185a8861f 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1,4 +1,4 @@ -# Messages for Swedish (Svenska) +# Messages for Swedish (svenska) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Ainali @@ -11,12 +11,16 @@ # Author: Lokal Profil # Author: Luen # Author: Magol +# Author: Nemo bis # Author: Per # Author: Pladask # Author: Poxnar # Author: Sannab +# Author: Sendelbach # Author: Sertion # Author: The real emj +# Author: Ufred +# Author: VickyC # Author: WikiPhoenix # Author: Zvenzzon sv: @@ -60,12 +64,13 @@ sv: changeset_tag: Etikett till ändringsset country: Land diary_comment: Dagbokskommentar - diary_entry: Dagbokspost + diary_entry: Dagboksinlägg friend: Vän language: SprÃ¥k message: Meddelande node: Nod node_tag: Nodtagg + notifier: Meddelande old_node: Gammal nod old_node_tag: Gammal nodtagg old_relation: Gammal relation @@ -80,14 +85,18 @@ sv: session: Session trace: SpÃ¥r tracepoint: SpÃ¥rpunkt + tracetag: SpÃ¥retikett user: Användare user_preference: Användarinställningar + user_token: Användarnyckel way: Sträcka way_node: Sträcknod way_tag: Vägtagg application: require_cookies: cookies_needed: Du verkar ha inaktiverat cookies - aktivera cookies i din webbläsare innan du fortsätter. + require_moderator: + not_a_moderator: Du mÃ¥ste vara administratör för att utföra Ã¥tgärden. setup_user_auth: blocked: Du har blivit blockerad frÃ¥n API:et. Var god logga in via webinterfacet för att fÃ¥ reda pÃ¥ mer. need_to_see_terms: Din tillgÃ¥ng till API:t är tillfälligt avstängd. Logga in pÃ¥ webbgränssnittet för att se bidragsvillkor. Du behöver inte godkänna dem, men du mÃ¥ste se dem. @@ -95,7 +104,6 @@ sv: changeset: changeset: "Ändringsset: %{id}" changesetxml: XML för ändringsset - download: Ladda ner %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Ändringsset %{id} title_comment: Ändringsset %{id} - %{comment} @@ -157,21 +165,19 @@ sv: next_changeset_tooltip: Nästa redigering av %{user} prev_changeset_tooltip: FöregÃ¥ende redigering av %{user} node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Laddda hem XML - edit: redigera + edit: Redigera nod node: Nod node_title: "Nod: %{node_name}" - view_history: se historik + view_history: Visa historik node_details: coordinates: "Koordinater:" part_of: "Del av:" node_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Ladda ner XML node_history: Nodhistorik node_history_title: "Nodhistorik: %{node_name}" - view_details: visa detaljer + view_details: Visa detaljer not_found: sorry: "%{type}en med id %{id} kunde inte hittas" type: @@ -182,8 +188,14 @@ sv: paging_nav: of: av showing_page: Visar sida + redacted: + message_html: Version %{version} av denna %{type} kan inte visas dÃ¥ den har tagits bort. Se %{redaction_link} för detaljer. + redaction: Redaktering %{id} + type: + node: nod + relation: relation + way: väg relation: - download: "%{download_xml_link} eller %{view_history_link}" download_xml: Ladda ner XML relation: Relation relation_title: "Relation: %{relation_name}" @@ -192,11 +204,10 @@ sv: members: "Medlemmar:" part_of: "Del av:" relation_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Ladda hem XML relation_history: Relationhistorik relation_history_title: "Relationshistorik: %{relation_name}" - view_details: visa detaljer + view_details: Visa detaljer relation_member: entry_role: "%{type} %{name} som %{role}" type: @@ -208,14 +219,14 @@ sv: view_data: Visa data för denna karta start_rjs: data_frame_title: Data - data_layer_name: Data + data_layer_name: Bläddra kartdata details: Detaljer drag_a_box: Markera ett omrÃ¥de pÃ¥ kartan. edited_by_user_at_timestamp: Redigerad av [[user]] [[timestamp]] hide_areas: Göm omrÃ¥de history_for_feature: Historik för [[feature]] load_data: Ladda data - loaded_an_area_with_num_features: Detta omrÃ¥de innehÃ¥ller [[num_features]] objekt. En del webbläsare klarar inte av hantering av sÃ¥dana stora mängder data. För att inte riskera att datorn ska slöas ner, bör du hÃ¥lla antalet objekt till 100 eller färre. Om du är säker pÃ¥ att du vill visa datan som det är nu, kan du göra det genom att klicka pÃ¥ knappen nedan. + loaded_an_area_with_num_features: "Du har läst in ett omrÃ¥de som innehÃ¥ller [[num_features]] objekt. En del webbläsare klarar vanligtvis inte av hantering av sÃ¥dana stora mängder data. För att inte riskera att datorn ska slöas ner, bör du hÃ¥lla antalet objekt till 100 eller färre. Vanligtvis arbetar webbläsare bäst när den visar mindre än [[max_features]] objekt samtidigt: Genom att göra nÃ¥gonting annat kan fÃ¥ din webbläsare att bli lÃ¥ngsam eller frysa sig. Om du är säker pÃ¥ att du vill visa denna data kan du göra det genom att klicka pÃ¥ knappen nedan." loading: Laddar... manually_select: Välj en annan area manuellt object_list: @@ -254,10 +265,9 @@ sv: relation: relation way: väg way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" download_xml: Ladda hem XML - edit: redigera - view_history: se historik + edit: Redigera väg + view_history: Visa historik way: Väg way_title: "Väg: %{way_name}" way_details: @@ -267,9 +277,8 @@ sv: nodes: "Noder:" part_of: "Del av:" way_history: - download: "%{download_xml_link} eller %{view_details_link}" download_xml: Ladda hem XML - view_details: visa detaljer + view_details: Visa detaljer way_history: Väghistorik way_history_title: "Väghistorik: %{way_name}" changeset: @@ -294,19 +303,35 @@ sv: list: description: Senaste ändringar description_bbox: Changesets inom %{bbox} + description_friend: Changesets av dina vänner + description_nearby: Changesets av närliggande användare description_user: Ändringsset av %{user} description_user_bbox: Ändringsset av %{user} inom %{bbox} + empty_anon_html: Inga redigeringar har gjorts ännu + empty_user_html: Det verkar som om du ännu inte har gjort nÃ¥gra redigeringar. För att komma igÃ¥ng, kolla <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Nybörjarguiden</a>. heading: Ändringsset heading_bbox: Ändringsset + heading_friend: Changesets + heading_nearby: Changesets heading_user: Ändringsset heading_user_bbox: Ändringsset title: Ändringsset title_bbox: Changesets inom %{bbox} + title_friend: Changesets av dina vänner + title_nearby: Changesets av närliggande användare title_user: Ändringsset av %{user} title_user_bbox: Ändringsset av %{user} inom %{bbox} timeout: sorry: Kunde tyvärr inte lista begärda ändringsset. Begäran tog för lÃ¥ng tid att hämta. diary_entry: + comments: + ago: "%{ago} sedan" + comment: Kommentar + has_commented_on: "%{display_name} har kommenterat följande dagboksinlägg" + newer_comments: Nyare kommentarer + older_comments: Äldre kommentarer + post: Inlägg + when: När diary_comment: comment_from: Kommentar frÃ¥n %{link_user}, %{comment_created_at} confirm: Bekräfta @@ -351,6 +376,8 @@ sv: older_entries: Äldre anteckningar recent_entries: "Aktuella dagboksanteckningar:" title: Användardagböcker + title_friends: Vänners dagböcker + title_nearby: Närliggande användares dagböcker user_title: "%{user}s dagbok" location: edit: Redigera @@ -362,10 +389,6 @@ sv: body: Tyvärr finns inget inlägg med id %{id}. Kontrollera stavning eller sÃ¥ är länken du klickade pÃ¥ felaktig. heading: "Ingen dagboksanteckning med id: %{id}" title: Ingen sÃ¥dan dagboksanteckning - no_such_user: - body: Det finns ingen användare med namnet %{user}. Kontrollera din stavning, eller kanske det är länken du klickade pÃ¥ som är fel. - heading: Användaren %{user} finns inte - title: Ingen sÃ¥dan användare view: leave_a_comment: Lämna en kommentar login: Inloggning @@ -390,7 +413,7 @@ sv: area_to_export: Yta som ska exporteras embeddable_html: Inbäddad HTML export_button: Exportera - export_details: Data frÃ¥n OpenStreetMap är licenscerat som <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>. + export_details: Data frÃ¥n OpenStreetMap har gjorts tillgänglig under licensen <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sv">Creative Commons Erkännande-DelaLika 2.0</a>. format: "Format:" format_to_export: Format för export image_size: "Bildstorlek:" @@ -398,6 +421,7 @@ sv: licence: Licens longitude: "Lon:" manually_select: Välj ett annat omrÃ¥de manuellt + map_image: Kartbild (visar vanliga lager) max: max options: Alternativ osm_xml_data: OpenStreetMap XML-data @@ -458,16 +482,28 @@ sv: suffix_place: ", %{distance} %{direction} om %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Flygplats + apron: Ramp + gate: Gate + helipad: Helikopterplatta + runway: Landningsbana + taxiway: Taxibana + terminal: Terminal amenity: + WLAN: WiFi-Ã¥tkomst airport: Flygplats arts_centre: Konstcenter + artwork: Konstverk atm: Bankomat auditorium: Auditorium bank: Bank bar: Bar + bbq: BBQ bench: Bänk bicycle_parking: Cykelparkering bicycle_rental: Cykeluthyrning + biergarten: ÖlträdgÃ¥rd brothel: Bordell bureau_de_change: Växlingskontor bus_station: Busstation @@ -476,10 +512,12 @@ sv: car_sharing: Bilpool car_wash: Biltvätt casino: Kasino + charging_station: Laddningsstation cinema: Biograf clinic: Klinik club: Klubb college: Gymnasium + community_centre: Användarcenter courthouse: Tingshus crematorium: Krematorium dentist: Tandläkare @@ -493,6 +531,7 @@ sv: ferry_terminal: Färjeterminal fire_hydrant: Brandpost fire_station: Brandstation + food_court: Food Court fountain: Fontän fuel: Bränsle grave_yard: Begravningsplats @@ -533,9 +572,12 @@ sv: shelter: Hydda shop: Affär shopping: Handel + shower: Dusch + social_centre: Nöjescenter social_club: Social klubb studio: Studio supermarket: Stormarknad + swimming_pool: Simbassäng taxi: Taxi telephone: Telefonkiosk theatre: Teater @@ -546,40 +588,21 @@ sv: veterinary: Veterinär village_hall: gemensamhetslokal waste_basket: Papperskorg - wifi: WLAN-accesspunkt + wifi: WiFi-Ã¥tkomst youth_centre: Ungdomscenter boundary: administrative: Administrativ gräns + census: Folkräkningsgräns + national_park: Nationalpark + protected_area: Skyddat omrÃ¥de + bridge: + aqueduct: Akvedukt + suspension: Hängbro + swing: Svängbro + viaduct: Viadukt + "yes": Bro building: - apartments: Flerfamiljshus - block: Byggblock - bunker: Bunker - chapel: Kapell - church: Kyrka - city_hall: RÃ¥dhus - commercial: Kommersiell byggnad - dormitory: Studenthem - entrance: entré - faculty: Fakultetsbyggnad - farm: Ekonomibyggnad - flats: Lägenheter - garage: Garage - hospital: Sjukhusbyggnad - hotel: Hotell - house: Hus - industrial: Industribyggnad - office: Kontorsbyggnad - public: Offentlig byggnad - residential: Bostadsbyggnad - retail: Affärsbyggnad - school: Skolbyggnad - shop: Affär - stadium: Stadium - store: Affär - terrace: Terass - tower: Torn - train_station: Järnvägsstation - university: Universitetsbyggnad + "yes": Byggnad highway: bridleway: Ridstig bus_guideway: SpÃ¥rbussväg @@ -590,8 +613,8 @@ sv: emergency_access_point: Utryckningsplats footway: GÃ¥ngväg ford: Vadställe - gate: Grind living_street: GÃ¥rdsgata + milestone: Milstolpe minor: Mindre väg motorway: Motorväg motorway_junction: Motorvägskorsning @@ -600,19 +623,24 @@ sv: pedestrian: GÃ¥gata platform: Perrong primary: Riksväg (primär väg) - primary_link: PÃ¥fart till riksväg + primary_link: PÃ¥-/avfart till primär väg (riksväg) raceway: Tävlingsbana residential: Bostäder + rest_area: Rastplats road: Väg secondary: Länsväg (sekundärväg) - secondary_link: PÃ¥fart till länsväg + secondary_link: PÃ¥-/avfart till sekundär väg (större länsväg) service: Serviceväg services: Rastplats-väg + speed_camera: Trafiksäkerhetskamera steps: Trappa + stile: Stätta + tertiary: Landsväg + tertiary_link: Landsväg track: Traktorväg trail: Vandringsled trunk: Motortrafikled - trunk_link: PÃ¥fart till motortrafikled + trunk_link: PÃ¥-/avfart till stamväg/motortrafikled unclassified: Oklassificerad väg unsurfaced: Oasfalterad väg historic: @@ -622,6 +650,7 @@ sv: building: Byggnad castle: Slott church: Kyrka + fort: Fort house: Hus icon: Ikon manor: HerrgÃ¥rd @@ -631,38 +660,51 @@ sv: museum: Museum ruins: Ruin tower: Torn + wayside_cross: Landmärke + wayside_shrine: Vägkants-helgedom wreck: Vrak landuse: allotments: Kolonilotter + basin: Bassin + brownfield: Outvecklat omrÃ¥de cemetery: Begravningsplats commercial: Kommersiellt omrÃ¥de + conservation: Skyddat construction: Byggarbetsplats farm: BondgÃ¥rd farmland: Jordbruksmark farmyard: GÃ¥rdstun forest: Skog + garages: Garage grass: Gräs + greenfield: Outvecklat omrÃ¥de industrial: IndustriomrÃ¥de landfill: Soptipp meadow: Äng military: MilitäromrÃ¥de mine: Gruva - mountain: Berg nature_reserve: Naturreservat + orchard: Plantering park: Park piste: Pist - plaza: Torg quarry: Stenbrott railway: Järnväg + recreation_ground: RekreationsomrÃ¥de reservoir: Reservoar + reservoir_watershed: Dammbyggnad residential: BostadsomrÃ¥de + retail: Detaljhandel + road: VägomrÃ¥de + village_green: Landsbypark vineyard: VingÃ¥rd wetland: VÃ¥tmark wood: Skog leisure: beach_resort: Badort + bird_hide: FÃ¥gelnäste common: Allmänning fishing: Fiskevatten + fitness_station: Gym garden: TrädgÃ¥rd golf_course: Golfbana ice_rink: Isrink @@ -673,12 +715,17 @@ sv: pitch: Idrottsplan playground: Lekplats recreation_ground: RekreationsomrÃ¥de + sauna: Bastu slipway: Stapelbädd sports_centre: Sporthall stadium: Stadium swimming_pool: Simbassäng track: Löparbana water_park: Vattenpark + military: + airfield: Militärt flygfält + barracks: Kaserner + bunker: Bunker natural: bay: Bukt beach: Strand @@ -686,11 +733,12 @@ sv: cave_entrance: Grottmynning channel: Kanal cliff: Klippa - coastline: Kustlinje crater: Krater + dune: Sanddyn feature: Funktioner fell: Fjäll fjord: Fjord + forest: Skog geyser: Gejser glacier: Glaciär heath: Ljunghed @@ -701,6 +749,7 @@ sv: moor: Hed mud: Lera peak: Topp + point: Punkt reef: Rev ridge: Bergskam river: Flod @@ -709,6 +758,7 @@ sv: scrub: Buskskog shoal: Sandbank spring: Källa + stone: Sten strait: Sund tree: Träd valley: Dal @@ -717,6 +767,19 @@ sv: wetland: VÃ¥tmark wetlands: VÃ¥tmark wood: Skog + office: + accountant: Revisor + architect: Arkitekt + company: Företag + employment_agency: Bemanningsföretag + estate_agent: Fastighetsmäklare + government: Statligt kontor + insurance: Försäkringskassa + lawyer: Advokat + ngo: Icke-statligt kontor + telecommunication: Telefonbolag + travel_agent: ResebyrÃ¥ + "yes": Kontor place: airport: Flygplats city: Stad @@ -728,6 +791,7 @@ sv: houses: Hus island: Ö islet: Holme + isolated_dwelling: Enslig bostad locality: Läge moor: Hed municipality: Kommun @@ -749,7 +813,9 @@ sv: halt: TÃ¥gstopp historic_station: Historisk Järnvägsstation junction: Järnvägsknutpunkt + level_crossing: Plankorsning light_rail: SpÃ¥rvagn + miniature: Miniatyrjärnväg monorail: EnspÃ¥rsbana narrow_gauge: SmalspÃ¥rsjärnväg platform: TÃ¥gperrong @@ -763,14 +829,16 @@ sv: tram_stop: SpÃ¥rvagnshÃ¥llplats yard: BangÃ¥rd shop: + alcohol: Systembolag + antiques: Antikviteter art: Konstaffär bakery: Bageri beauty: Skönhetssalong + beverages: Dryckesbutik bicycle: Cykelaffär books: Bokhandel butcher: Slaktare car: Bilhandlare - car_dealer: Bilförsäljare car_parts: Bildelar car_repair: Bilverkstad carpet: Mattaffär @@ -780,13 +848,15 @@ sv: computer: Datorbutik confectionery: Godisbutik convenience: Närköp + copyshop: Kopieringsfirma cosmetics: Parfymeri department_store: Varuhus + discount: LÃ¥gprisbutik doityourself: Gör-det-själv - drugstore: Apotek dry_cleaning: Kemtvätt electronics: Elektronikbutik estate_agent: Egendomsmäklare + farm: GÃ¥rdsbutik fashion: Modebutik fish: Fiskhandlare florist: Blommor @@ -848,7 +918,10 @@ sv: valley: Dal viewpoint: Utsiktspunkt zoo: Djurpark + tunnel: + "yes": Tunnel waterway: + artificial: Artificiellt vattendrag boatyard: BÃ¥tvarv canal: Kanal connector: Förbindelsepunkt för farled @@ -866,12 +939,15 @@ sv: riverbank: Älvbank stream: Ström wadi: Uttorkad flod + water_point: Vattenpunkt waterfall: Vattenfall weir: Överfallsvärn javascripts: map: base: cycle_map: Cykelkarta + standard: Standard + transport_map: Transportkarta site: edit_disabled_tooltip: Zooma in för att redigera kartan edit_tooltip: Redigera kartan @@ -880,6 +956,7 @@ sv: history_tooltip: Visa ändringar för detta omrÃ¥de history_zoom_alert: Du mÃ¥ste zooma in för att kunna se karteringshistorik. layouts: + community: Användare community_blogs: Communitybloggar community_blogs_title: Bloggar frÃ¥n OpenStreetMap-medlemmar copyright: Upphovsrätt & licens @@ -901,17 +978,19 @@ sv: history: Historik home: hem home_tooltip: GÃ¥ till hempositionen - inbox: inkorg (%{count}) inbox_tooltip: one: Du har ett oläst meddelande other: Du har %{count} olästa meddelanden zero: Du har inga olästa meddelanden. intro_1: Openstreetmap är en fri redigeringsbar karta av hela världen, den görs av folk precis som du. - intro_2: Openstreetmap lÃ¥ter dig i samarbete med andra visa, ändra pÃ¥ och använda geografisk data frÃ¥n hela världen. - intro_3: OpenStreetMaps serverplats stöds av %{ucl}, %{ic} och %{bytemark}. Andra som stödjer projektet listas i %{partners}. - intro_3_partners: wiki + intro_2_create_account: Skapa ett användarkonto + intro_2_download: ladda ner + intro_2_html: Informationen är fri att %{download} och %{use} under dess %{license}. %{create_account} för att förbättra kartan. + intro_2_license: Öppna licens + intro_2_use: använda + intro_2_use_url: http://wiki.OpenStreetMap.org/wiki/Using_OpenStreetMap license: - title: Openstreetmap datat licensieras som Creative Commons Attribution-Share Alike 2.0 Generic License. + title: Data frÃ¥n OpenStreetMap har gjorts tillgänglig under licensen Creative Commons Erkännande-Dela Lika 2.0 Generisk. log_in: logga in log_in_tooltip: Logga in med ditt konto logo: @@ -923,9 +1002,14 @@ sv: title: Stöd OpenStreetMap med en monetär donation osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, dÃ¥ databasunderhÃ¥ll pÃ¥gÃ¥r. osm_read_only: Det gÃ¥r bara att läsa frÃ¥n OpenStreetMap-databasen just nu, dÃ¥ viktigt underhÃ¥ll utförs pÃ¥ databasen. + partners_bytemark: Bytemark Hosting + partners_html: Hosting via %{ucl}, %{ic} och %{bytemark}, med flera %{partners}. + partners_ic: Imperial College London + partners_partners: partners + partners_ucl: UCL VR Center + partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: registrera sign_up_tooltip: Skapa ett konto för kartering - sotm2011: Kom till 2011 Ã¥rs OpenStreetMapkonferens, The State of the Map, 9:e -11:e september i Denver! tag_line: Den fria wiki-världskartan user_diaries: Användardagböcker user_diaries_tooltip: Visa användardagböcker @@ -940,10 +1024,31 @@ sv: english_link: det engelska originalet text: I händelse av en konflikt mellan denna översatta sida och %{english_original_link} har den engelska texten företräde title: Om denna översättning - legal_babble: "<h2>Upphovsrätt och licens</h2>\n<p>\n OpenStreetMap är <i>Öppen data</i>, licensierad under <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).\n</p>\n<p>\n Du är fri att kopiera, distribuera, överföra och anpassa vÃ¥ra kartor\n och data, sÃ¥ länge du hänvisar till OpenStreetMap och dess\n bidragsgivare. Om du ändrar eller bygger pÃ¥ vÃ¥ra kartor eller data kan du\n distribuera resultatet endast under samma licens. Den\n fullständig<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiska texten</a> förklarar dina rättigheter och skyldigheter.\n</a!n!></p>\n\n<h3>Hur du hänvisar till OpenStreetMap</h3>\n<p>\n Om du använder OpenStreetMaps kartbilder begär vi att\n din hänvisning inehÃ¥ller minst “© OpenStreetMap\n contributors, CC-BY-SA”. Om du enbart använder kartdata\n begär vi “Map data © OpenStreetMap contributors,\n CC-BY-SA”.\n</p>\n<p>\n Om möjligt bör OpenStreetMap bli länkat till <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n och CC-av-SA till <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Om\n du använder ett medium där länkar inte är möjligt (t.ex. ett\n tryckt arbete), föreslÃ¥r vi att du hänvisar läsarna till\n www.openstreetmap.org (kanske genom att expandera\n ‘OpenStreetMap’ till dess fullständiga adress) och till\n www.creativecommons.org.\n</p>\n\n<h3>Hitta mer</h3>\n<p>\n Läs mer om hur du använder vÃ¥r data pÃ¥ vÃ¥r <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiska\n FAQ</a>.\n<p>\n OSM bidragsgivare pÃ¥minns att aldrig att lägga till data frÃ¥n nÃ¥gra\n upphovsrättsskyddade källor (t.ex. Google Maps eller tryckta kartor) utan\n uttryckligt tillstÃ¥nd frÃ¥n upphovsrättsinnehavarna.\n</p>\n<p>\n Även om OpenStreetMap är öppna data, vi kan inte tillhandahÃ¥lla ett\n gratis kart-API för tredjepartsutvecklare.\n\n Se vÃ¥r <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Policy för användning API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Policy för användning av Kartbilder (Tiles)</a>\n och <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Policyn för Nominatim-användning</a>.\n</p>\n\n<h3>VÃ¥ra bidragsgivare</h3>\n<p>\n VÃ¥r CC-av-SA-licens kräver att du “ge ursprunglig\n författaren kredit rimliga för det medium eller syfte du \n utnyttja\". Enskilda OSM-kartografer begär inte en kredit utöver “OpenStreetMap\n contributors”, men där data frÃ¥n en nationell kartläggningsbyrÃ¥n eller annan viktig källa har inkluderats i\n OpenStreetMap kan det vara rimligt att kreditera dem genom att direkt\n lägga till deras kredit eller genom att länkning till det pÃ¥ den här sidan.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Australien</strong>: innehÃ¥ller förortsdata baserade pÃ¥ australiska statistiska data.</li>\n <li><strong>Österrike</strong>: innehÃ¥ller data frÃ¥n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> under\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Kanada</strong>: innehÃ¥ller data frÃ¥n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada) och StatCan (Geography Division, Statistics Canada.</li>\n <li><strong>Frankrike</strong>: innehÃ¥ller data frÃ¥n Direction Générale des Impôts.</li>\n <li><strong>Nya Zeeland</strong>: innehÃ¥ller data frÃ¥n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>Polen</strong>: innehÃ¥ller data frÃ¥n <a\n href=\"http://ump.waw.pl/\">UMP-pcPL kartor</a>. Copyright UMP-pcPL contributors.</</li>\n <li><strong>Storbritanien</strong>: innehÃ¥ller Ordnance Survey data © Crown copyright and database right 2010.</li>\n</ul>\n\n<p>\n Införandet av uppgifter i OpenStreetMap innebär inte att ursprungligt\n databidragare stöder OpenStreetMap, ger garanti eller\n accepterar nÃ¥got ansvar.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: InnehÃ¥ller data frÃ¥n\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> under\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> och\n Land Tirol (under <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT med ändringar</a>)." + contributors_au_html: "<strong>Australia</strong>: InnehÃ¥ller förortsdata baserad\n pÃ¥ data frÃ¥n Australian Bureau of Statistics." + contributors_ca_html: "<strong>Kanada</strong>: InnehÃ¥ller data frÃ¥n\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), och StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_2_html: " Införandet av uppgifter i OpenStreetMap innebär inte att den ursprungliga \n datagivaren stödjer OpenStreetMap, ger nÃ¥gon som helst garanti eller\n tar pÃ¥ sig nÃ¥got ansvar." + contributors_fr_html: "<strong>Frankrike</strong>: InnehÃ¥ller data\n frÃ¥n Direction Générale des Impôts." + contributors_intro_html: " VÃ¥r CC BY-SA-licens kräver att du “ger den ursprungliga\n författaren ett erkännande skäligt nog för det medium eller det syfte du \n nyttjar det för\". Enskilda OSM-kartografer begär inte ett erkännande utöver “OpenStreetMaps\n bidragsgivare”, men där data frÃ¥n en nationell kartläggningsbyrÃ¥ eller annan viktig källa har inkluderats i\n OpenStreetMap kan det vara rimligt att kreditera dem genom att direkt\n lägga till deras erkännande eller genom att länka till det pÃ¥ den här sidan." + contributors_nl_html: "<strong>Nederländerna</strong>: InnehÃ¥ller © AND data, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Nya Zeeland</strong>: InnehÃ¥ller data frÃ¥n\n Land Information New Zealand. Crown äger upphovsrätten." + contributors_pl_html: "<strong>Polen</strong>: InnehÃ¥ller data frÃ¥n <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. UMP-pcPL:s\n bidragsgivare äger upphovsrätten.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Mer om OSM's användande av UMP:s data</a></li>\n <li><strong>Sydafrika</strong>: InnehÃ¥ller data frÃ¥n\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, Staten äger upphovsrätten.</li>\n <li><strong>Storbritannien</strong>: InnehÃ¥ller Ordnance\n Survey data © Crown äger upphovsrätten och\n databasrättigheterna 2010." + contributors_title_html: VÃ¥ra bidragsgivare + credit_1_html: " Om du använder OpenStreetMaps kartbilder begär vi att\n din hänvisning innehÃ¥ller minst “© OpenStreetMaps\n bidragsgivare, CC BY-SA”. Om du enbart använder kartdata\n begär vi “Kartdata © OpenStreetMaps bidragsgivare,\n CC BY-SA”." + credit_2_html: " Där sÃ¥ är möjligt, bör OpenStreetMap bli länkat till <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n och CC BY-SA till <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Om\n du använder ett medium där länkar inte är möjligt (exempelvis ett\n tryckt arbete), föreslÃ¥r vi att du hänvisar läsarna till\n www.openstreetmap.org (kanske genom att expandera\n ‘OpenStreetMap’ till dess fullständiga adress) och till\n www.creativecommons.org." + credit_title_html: Hur du hänvisar till OpenStreetMap + intro_1_html: " OpenStreetMap är <i>öppen data</i>, gjord tillgänglig under licensen<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Erkännande-DelaLika 2.0</a> (CC BY-SA)." + intro_2_html: " Du är fri att kopiera, distribuera, överföra och anpassa vÃ¥ra kartor\n och data, sÃ¥ länge du hänvisar till OpenStreetMap och dess\n bidragsgivare. Om du ändrar eller bygger pÃ¥ vÃ¥ra kartor eller data kan du\n distribuera resultatet endast under samma licens. Den\n fullständig <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiska\n texten</a> förklarar dina rättigheter och skyldigheter." + more_1_html: " Läs mer om hur du använder vÃ¥r data pÃ¥ vÃ¥r <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiska\n FAQ</a>." + more_2_html: " OSM bidragsgivare pÃ¥minns att aldrig att lägga till data frÃ¥n nÃ¥gra\n upphovsrättsskyddade källor (t.ex. Google Maps eller tryckta kartor) utan\n uttryckligt tillstÃ¥nd frÃ¥n upphovsrättsinnehavarna." + more_3_html: " Även om OpenStreetMap är öppna data, kan vi inte tillhandahÃ¥lla ett\n gratis kart-API för tredjepartsutvecklare.\n\n Se vÃ¥r <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Policy för användning API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Policy för användning av Kartbilder (Tiles)</a>\n och <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Policyn för Nominatim-användning</a>." + more_title_html: Hitta mer + title_html: Upphovsrätt och licens native: mapping_link: börja kartlägga native_link: Svensk version + text: Du tittar pÃ¥ den engelska versionen av sidan om upphovsrätt. Du kan gÃ¥ tillbaka till %{native_link} pÃ¥ den här sidan eller sluta läsa om upphovsrätt och %{mapping_link}. title: Om denna sida message: delete: @@ -951,8 +1056,15 @@ sv: inbox: date: Datum from: FrÃ¥n + messages: Du har %{new_messages} och %{old_messages} my_inbox: Min inbox + new_messages: + one: "%{count} nytt meddelande" + other: "%{count} nya meddelanden" no_messages_yet: Du har inga meddelanden ännu. Varför inte ta kontakt med nÃ¥gon %{people_mapping_nearby_link}? + old_messages: + one: "%{count} gammalt meddelande" + other: "%{count} gamla meddelanden" outbox: utbox people_mapping_nearby: folk som kartlägger i närheten subject: Ärende @@ -967,6 +1079,7 @@ sv: unread_button: Markera som oläst new: back_to_inbox: Tillbaks till inboxen + body: Brödtext limit_exceeded: Du har skickat mÃ¥nga meddelanden pÃ¥ kort tid. Var god vänta en stund innan du försöker igen. message_sent: Meddelande skickat send_button: Skicka @@ -977,14 +1090,14 @@ sv: body: Det finns inget meddelande med det ID-et. heading: Inget sÃ¥dant meddelande title: Inget sÃ¥dant meddelande - no_such_user: - body: Tyvärr finns ingen användare med det namnet. - heading: Ingen sÃ¥dan användare - title: Ingen sÃ¥dan användare outbox: date: Datum inbox: inbox + messages: + one: Du har %{count} skickat meddelande + other: Du har %{count} skickade meddelanden my_inbox: Min %{inbox_link} + no_sent_messages: Du had ing a skickade meddelanden ännu. Varför inte ta kontakt med nÃ¥gon av de %{people_mapping_nearby_link}? outbox: utbox people_mapping_nearby: folk som kartlägger i närheten subject: Ärende @@ -1002,10 +1115,14 @@ sv: title: Läs meddelande to: Till unread_button: Markera som oläst + wrong_user: Du är inloggad som '%{user}' men meddelandet du har bett om att fÃ¥ läsa skickades inte till eller av den användaren. Logga in som korrekt användare för att läsa det.. + reply: + wrong_user: Du är inloggad som '%{user}' men meddelandet du har beth om att besvara skickades inte till den användaren. Logga in som den användaren för att svara. sent_message_summary: delete_button: Radera notifier: diary_comment_notification: + footer: Du kan ocksÃ¥ läsa kommentaren pÃ¥ %{readurl} och du kan kommentera pÃ¥ %{commenturl} eller svara pÃ¥ %{replyurl} header: "%{from_user} har lämnat kommentar till ditt OpenStreetMap dagboksinlägg med rubriken %{subject}:" hi: Hej %{to_user}, subject: "[OpenStreetMap] %{user} kommenterade din dagboksanteckning" @@ -1018,6 +1135,7 @@ sv: email_confirm_plain: click_the_link: Om det är du, klicka pÃ¥ länken nedan för att bekräfta ändringen. greeting: Hej, + hopefully_you_1: NÃ¥gon (förhoppningsvis du) skulle vilja ändra sina e-postadress vid hopefully_you_2: "%{server_url} till %{new_address}." friend_notification: befriend_them: Du kan ocksÃ¥ lägga till dem som en vän pÃ¥ %{befriendurl}. @@ -1034,13 +1152,16 @@ sv: subject: "[OpenStreetMap] Misslyckades importera GPX" greeting: Hej, success: + loaded_successfully: inläst med %{trace_points} av %{possible_points} möjliga punkter. subject: "[OpenStreetMap] Lyckades importera GPX" with_description: med beskrivningen your_gpx_file: Det verkar som om din GPX-fil lost_password: subject: "[OpenStreetMap] Begäran om Ã¥terställning av lösenord" lost_password_html: + click_the_link: Om detta är du, klicka pÃ¥ länken nedan för att Ã¥terställa ditt lösenord. greeting: Hej, + hopefully_you: NÃ¥gon (kanske du) har bett att lösenordet för kontot hos openstreetmap.org som tillhör den här e-postadressen Ã¥terställs. lost_password_plain: click_the_link: Om det är du, klicka pÃ¥ länken nedan för att Ã¥terställa ditt lösenord. greeting: Hej, @@ -1055,18 +1176,32 @@ sv: subject: "[OpenStreetMap] Bekräfta din e-postadress" signup_confirm_html: ask_questions: Du kan ställa vilken frÃ¥ga du vill om OpenStreetMap pÃ¥ vÃ¥r <a href="http://help.openstreetmap.org/">frÃ¥gor- och svarsida</a>. + click_the_link: Om detta är du, Välkommen! Klicka pÃ¥ länken nedan för att bekräfta kontot och läsa vidare för mer information om OpenStreetMap + current_user: En lista över nuvarande användare i kategorier, baserat pÃ¥ var i världen de är, finns pÃ¥ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>. get_reading: Kom igÃ¥ng med OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">pÃ¥ wikin</a>, blir uppdaterad om de senaste nyheterna via <a href="http://blog.openstreetmap.org/">OpenStreetMaps blogg</a> eller <a href="http://twitter.com/openstreetmap">Twitter</a>, eller skumma genom OpenStreetMaps grundare Steve Coasts <a href="http://www.opengeodata.org/">OpenGeoData blog</a> för en kortfattad historisk genomgÃ¥ng, som ocksÃ¥ har en <a href="http://www.opengeodata.org/?cat=13">poddradio att lyssna pÃ¥</a>! greeting: Hej där! + hopefully_you: NÃ¥gon (förhoppningsvis du) vill skapa ett konto pÃ¥ + introductory_video: Du kan titta pÃ¥ en %{introductory_video_link}. more_videos: Det finns %{more_videos_link}. more_videos_here: fler videoklipp här + user_wiki_page: "Det rekommenderas att du skapar en användarsida som innehÃ¥ller kategoritaggar som visar var befinner dig, sÃ¥som <a href=\"\nhttp://wiki.openstreetmap.org/wiki/Category:Users_in_London\">[[Category:Users_in_London]]</a>." video_to_openstreetmap: introduktionsvideo om OpenStreetMap + wiki_signup: Du kan ocksÃ¥ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">registrera dig pÃ¥ OpenStreetMap-wikin</a>. signup_confirm_plain: ask_questions: "Du kan ställa valfria frÃ¥gor om OpenStreetMap pÃ¥ vÃ¥r frÃ¥gesida:" + blog_and_twitter: "HÃ¥ll dig uppdaterad med de sensate nyheterna via OpenStreetMap-bloggen eller Twitter:" click_the_link_1: Om detta är du, välkommen! Klicka pÃ¥ länken nedan för att bekräfta ditt click_the_link_2: konto och läs vidare för mer information om OpenStreetMap. + current_user_1: En lista över aktuella användare i kategorier, baserat pÃ¥ var i världen + current_user_2: "de är, finns tillgänglig frÃ¥n:" greeting: Hej där! + hopefully_you: NÃ¥gon (förhoppningsvis du) vill skapa ett konto pÃ¥ + introductory_video: "Du kan titta pÃ¥ en introduktionsvideo till OpenStreetMap här:" more_videos: "Det finns fler filmer här:" + opengeodata: "OpenGeoData.org är OpenStreetMap-grundarens Steve Coasts blogg, och den har även podcasts:" the_wiki: "Läs mer om OpenStreetMap pÃ¥ wikin:" + user_wiki_1: Det rekommenderas att du skapar en användarsida pÃ¥ wikin som innehÃ¥ller + user_wiki_2: "kategorietiketter som visar var du befinner dig, t.ex. [[Category: Users_in_London]]." wiki_signup: "Du kan ocksÃ¥ registrera dig pÃ¥ OpenStreetMap wikin pÃ¥:" oauth: oauthorize: @@ -1081,41 +1216,113 @@ sv: revoke: flash: Du tagit bort OAuth-nyckel för %{application} oauth_clients: + create: + flash: Informationen registrerades framgÃ¥ngsrikt + destroy: + flash: Annulerade registreringen av klientapplikationen edit: submit: Redigera + title: Redigera ditt tillägg form: + allow_read_gpx: läs deras privata GPS-spÃ¥r. + allow_read_prefs: läs deras användarinställningar. allow_write_api: ändra kartan. + allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner. allow_write_gpx: ladda upp GPS-spÃ¥r. + allow_write_prefs: ändra deras användarinställningar. + callback_url: Återkopplingsadress name: Namn + requests: "Be om följande behörigheter frÃ¥n användaren:" required: Nödvändigt support_url: Support URL + url: Programmets huvudadress index: application: Applikationsnamn issued_at: Utfärdad + list_tokens: "Följande token har utfärdats till program i ditt namn:" + my_apps: Mina klientprogram + my_tokens: Mina auktoriserade program + no_apps: Har du ett program som du vill registrera för att användas med oss med % {oauth} standard? Innan du kan göra OAuth-begäranden till den här tjänsten mÃ¥ste du registrera din webbapplikation. register_new: Registrera din applikation + registered_apps: Du har följande klientapplikationer registrerade. revoke: Återkalla! + title: Mina OAuth-detaljer new: submit: Registrera title: Registrera ett nytt program + not_found: + sorry: Tyvärr kunde inte %{type} hittas. show: + access_url: Adress för Ã¥tkomst-Token + allow_read_gpx: läs deras privata GPS-spÃ¥r + allow_read_prefs: Läs deras användarinställningar. allow_write_api: ändra kartan. + allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner. allow_write_gpx: ladda upp GPS-spÃ¥r. + allow_write_prefs: ändra deras användarinställningar. authorize_url: "Godkänn URL:" + confirm: Är du säker? + delete: Ta bort klient edit: Redigera detaljer + key: "Konsumentnyckel:" + requests: "Begär följande behörigheter frÃ¥n användaren:" + secret: "Konsumenthemlighet:" support_notice: Vi stödjer HMAC-SHA1 (rekommenderas) sÃ¥väl som oformaterad text i SSL-läge. + title: OAuth-detaljer för %{app_name} + url: Begäran av Token-adress + update: + flash: Uppdaterade klientinformationen framgÃ¥ngsrikt + redaction: + create: + flash: Redaktering skapad. + destroy: + error: Det uppstod ett fel när redakteringen skulle förstöras. + flash: Redaktering förstörd. + not_empty: Redakteringen är inte tom. Avredaktera alla versioner som tillhör denna redaktering innan den förstörs. + edit: + description: Beskrivning + heading: Redigera redaktering + submit: Spara redaktering + title: Redigera redaktering + index: + empty: Inga bortredigeringar att visa. + heading: Lista över redakteringar + title: Lista över redakteringar + new: + description: Beskrivning + heading: Ange information för ny redaktering + submit: Skapa redaktering + title: Skapa ny redaktering + show: + confirm: Är du säker? + description: "Beskrivning:" + destroy: Ta bort denna redaktering + edit: Redigera denna redaktering + heading: Visa redaktering "%{title}" + title: Visa redaktering + user: "Skapad av:" + update: + flash: Ändringarna sparade. site: edit: anon_edits_link_text: Ta reda pÃ¥ varför det är sÃ¥. flash_player_required: Du mÃ¥ste ha Flash för att kunna använda Potatch, OpenStreetMaps flasheditor. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ladda hem Flash Player frÃ¥n Adobe.com</a>. Det finns <a href="http://wiki.openstreetmap.org/wiki/Editing">flera andra editorer</a> tillgängliga för OpenStreetMap. + no_iframe_support: Din webbläsare stöder inte HTML iframe, som är nödvändiga för den här funktionen. + not_public: Du har into ändrat statusen pÃ¥ dina ändringar till offentliga. + not_public_description: Du kan inte längre redigera kartan om du inte gör det. Du kan göra dina redigeringar offentliga frÃ¥n din %{user_page}. + potlatch2_not_configured: Potlatch 2 har inte konfigurerats - se http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 för mer information + potlatch2_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch 2, bör du klicka pÃ¥ Spara.) + potlatch_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch, bör du avmarkera den nuvarande vägen eller markeringen om du redigerar i realtidsläge, eller klicka pÃ¥ Spara om du har en Spara-knapp.) user_page_link: användarsida index: js_1: Du mÃ¥ste ha javascript pÃ¥slaget, alternativt en webbläsare som stödjer javascript. js_2: OpentStreetMap använder javascript för slippymapen - js_3: Du kan prova <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statiska kartan</a> om du inte kan använda javascript. license: license_name: Creative Commons Erkännande-DelaLika 2.0 + notice: Licensierat under licensen %{license_name} av %{project_name} och dess bidragsgivare.. project_name: OpenStreetMap-projektet permalink: Permanent länk + remote_failed: Redigering misslyckades - kontrollera att JOSM eller Merkaartor är inläst och fjärrkontrollsalternativet är aktiverat shortlink: Kortlänk key: map_key: Kartnyckel @@ -1125,14 +1332,15 @@ sv: admin: Administrativ gräns allotments: KoloniträdgÃ¥rdar apron: - - Flygplatsterminal + - Flygplatsplatta - terminal bridge: Svarta kantar = bro bridleway: Ridstig brownfield: Förfallen industritomt building: Viktig byggnad + byway: Förbifart cable: - - stollift + - Linbana - stollift cemetery: Begravningsplats centre: Idrottsanläggning @@ -1145,9 +1353,9 @@ sv: destination: Förbjuden genomfart farm: BondgÃ¥rd footway: GÃ¥ngväg - forest: skog + forest: Kulturskog golf: Golfbana - heathland: Hed + heathland: hed industrial: Industriellt omrÃ¥de lake: - Sjö @@ -1157,7 +1365,7 @@ sv: park: Park permissive: Endast tillträde för behöriga pitch: Bollplan - primary: Riksväg + primary: Primär väg (riksväg) private: Privat tillgÃ¥ng rail: Järnväg reserve: Naturreservat @@ -1169,27 +1377,45 @@ sv: school: - Skola - universitet - secondary: Länsväg + secondary: Sekundär väg (större länsväg) station: Järnvägsstation - subway: T-bana + subway: Tunnelbana summit: - - Topp + - Höjd - topp tourist: Turistattraktion track: SpÃ¥r tram: - - spÃ¥rvagn - - spÃ¥rvagn - trunk: Motortrafikled + - SnabbspÃ¥rväg + - spÃ¥rväg + trunk: Nationell stamväg/motortrafikled tunnel: Streckade kanter = tunnel unclassified: Oklassificerad väg unsurfaced: Oasfalterad väg - wood: VÃ¥rdad skog + wood: Naturskog + markdown_help: + alt: Alt-text + first: Första objektet + heading: Rubrik + headings: Rubriker + image: Bild + link: Länk + ordered: Sorterad lista + second: Andra objektet + subheading: Underrubrik + text: Text + title_html: Tolkat med <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Osorterad lista + url: Webbadress + richtext_area: + edit: Redigera + preview: Förhandsgranska search: search: Sök search_help: "exempel: 'Delsbo', 'Storgatan, Svedala', <a href='http://wiki.openstreetmap.org/wiki/Sv:Search'>Fler exempel..</a>" submit_text: GÃ¥ where_am_i: Var är jag + where_am_i_title: Beskriv den aktuella platsen med hjälp av sökmotorn sidebar: close: Stäng search_results: Sökresultat @@ -1226,10 +1452,6 @@ sv: your_traces: Dina GPS-spÃ¥r make_public: made_public: SpÃ¥r offentliggjort - no_such_user: - body: Det fanns ingen användare med namnet %{user}. Kontrollera stavningen, och om länken du klickade pÃ¥ var korrekt. - heading: Användaren %{user} finns inte - title: Ingen sÃ¥dan användare offline: heading: GPX förvaring är offlien message: GPX-uppladdningssystemet är för närvarande inte tillgängligt. @@ -1268,8 +1490,8 @@ sv: trace_optionals: tags: Taggar trace_paging_nav: - next: Nästa » - previous: « FöregÃ¥ende + newer: Nyare spÃ¥r + older: Äldre spÃ¥r showing_page: Visar sida %{page} view: delete_track: Radera detta spÃ¥r @@ -1299,9 +1521,11 @@ sv: account: contributor terms: agreed: Du har godkänt de nya bidragsgivarvillkoren. + agreed_with_pd: Du har ocksÃ¥ förklarat att du anser att dina redigeringar är inom Public Domain. heading: "Användarvillkor:" link text: vad är detta? not yet agreed: Du har ännu inte godkänt de nya bidragsgivarvillkoren. + review link text: Följ denna länk när du har tid att granska och godkänna de nya bidragsvillkoren. current email address: "Nuvarande E-postadress:" delete image: Ta bort nuvarande bild email never displayed publicly: (Visas aldrig offentligt) @@ -1319,6 +1543,7 @@ sv: new image: Lägg till en bild no home location: Du har inte angivit nÃ¥gon hemposition. openid: + link: http://wiki.openstreetmap.org/wiki/OpenID link text: vad är detta? openid: "OpenID:" preferred editor: "Önskat redigeringsprogram:" @@ -1340,11 +1565,14 @@ sv: title: Redigera konto update home location on click: Uppdatera hemplatsen när jag klickar pÃ¥ kartan? confirm: + already active: Detta konto har redan bekräftats. before you start: "Vi vet att du knappt kan bärga dig med att komma igÃ¥ng att börja mappa, men först fÃ¥r du gärna fylla i mer information om dig själv i nedanstÃ¥ende formulär:" button: Bekräfta heading: Bekräfta ett användarkonto. press confirm button: Klicka bekräftelseknappen nedan för att aktivera ditt konto. + reconfirm: Om det gÃ¥tt ett tag sedan du registrerade dig kan du behöva <a href="%{reconfirm}">skicka ett nytt bekräftelsemail</a> till dig själv. success: Ditt konto är bekräftat, tack för att du registrerade dig. + unknown token: Den token tycks inte existera. confirm_email: button: Bekräfta failure: En e-postadress har redan bekräftats med den här nyckeln. @@ -1353,6 +1581,7 @@ sv: success: E-postadressen är bekräftad. Tack för att du registrerade dig! confirm_resend: failure: Användaren %{name} hittades inte. + success: Vi har skickat ett nytt bekräftelsemeddelande till %{email} och sÃ¥ snart du bekräftat ditt konto kommer du kunna börja kartlägga.<br><br>Om du använder ett antispamsystem som skickar bekräftelsebegäranden se till att du vitlistar webmaster@openstreetmap.org dÃ¥ vi inte kan svara pÃ¥ nÃ¥gra sÃ¥dana begäranden. filter: not_an_administrator: Du mÃ¥ste vara administratör för att fÃ¥ göra det. go_public: @@ -1369,6 +1598,7 @@ sv: summary_no_ip: "%{name} skapad %{date}" title: Användare login: + account is suspended: "Tyvärr har ditt konto stängts av pÃ¥ grund av tvivelaktig aktivitet.<br />Kontakta <a href=\"%\n{webmaster}\">webbansvarig</a> om du vill diskutera saken." account not active: Ditt konto är inte aktivterat.<br />Vänligen klicka pÃ¥ länken i e-brevet med kontobekräftelsen för att aktivera ditt konto, eller <a href="%{reconfirm}">begär ett nytt bekräftelsebrev</a>. auth failure: Kunde inte logga in med de uppgifterna. create account minute: Skapa ett konto. Det tar bara en minut. @@ -1377,6 +1607,9 @@ sv: login_button: Logga in lost password link: Glömt ditt lösenord? new to osm: Ny pÃ¥ OpenStreetMap? + no account: Har du inget konto? + notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Läs mer om Openstreetmaps kommande licensändring</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">översättningar</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskussion</a>) + notice_terms: OpenStreetMap flyttas till en ny licens 1 april 2012. Den är lika öppen som den nuvarande, men de juridiska bitarna är mycket bättre lämpade för vÃ¥r kartdatabas. Vi vill gärna behÃ¥lla dina bidrag i OpenStreetMap, men vi kan bara göra detta om du samtycker till att lÃ¥ta oss distribuera dem under den nya licensen. Annars kommer vi att ta bort dem frÃ¥n databasen.<br><br>Logga in, och lägg nÃ¥gra sekunder pÃ¥ att granska och godkänna de nya villkoren. Tack! openid: "%{logo} OpenID:" openid invalid: Tyvärr verkar din OpenID vara felaktigt formaterad. openid missing provider: Kunde inte nÃ¥ din OpenID leverantör @@ -1432,17 +1665,19 @@ sv: display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i inställningarna. email address: "E-postadress:" fill_form: Fyll i formuläret sÃ¥ skickar vi ett e-brev för att aktivera ditt konto. - flash create success message: Användaren skapades framgÃ¥ngsrikt. Kontrollera din e-post för en bekräftelse, och du kommer att kunna börja kartlägga pÃ¥ nolltid :-) <br /><br /> Om du använder ett antispam-system som skickar iväg bekräftelsen, var dÃ¥ vänlig och vitlista webmaster@openstreetmap.org dÃ¥ vi inte kan svara pÃ¥ nÃ¥gra bekräftelseförfrÃ¥gningar. + flash create success message: Tack för att du registrerade dig. Vi har skickat ett bekräftelsebegäran till %{email} och sÃ¥ snart du bekräftat ditt konto kommer du kunna kartlägga.<br /><br />Använder du ett antispamsystem som skickar bekräftelsebegäranden se till att du vitlistar webmaster@openstreetmap.org dÃ¥ vi inte kan svara pÃ¥ nÃ¥gra bekräftelsebegäranden. heading: Skapa ett användarkonto license_agreement: När du bekräftar ditt konto mÃ¥ste du samtycka till <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">bidragsgivarvillkoren</a> . no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto Ã¥t dig automatiskt. not displayed publicly: Visas inte offentligt (se <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wikins sekretesspolicy inklusive avsnittet om e-postadresser">sekretesspolicyn</a>) openid: "%{logo} OpenID:" openid association: "<p>Ditt OpenID är ännu inte associerad med ett OpenStreetMap konto</p>\n<ul>\n<li>Om du är ny pÃ¥ OpenStreetMap, skapa ett nytt konto med hjälp av formuläret nedan.</li>\n<li>\n Om du redan har ett konto kan du logga in till ditt konto pÃ¥ vanligt sätt\n med hjälp av ditt användarnamn och lösenord, för att sedan associera kontot\n med ditt OpenID i användarinställningarna.\n</li>\n</ul>" + openid no password: Med OpenID behövs inget lösenord, men en del extra verktyg och vissa servrar kan fortfarande behöva en. password: "Lösenord:" terms accepted: Tack för att du accepterar de nya vilkoren för bidrag till kartan terms declined: Vi beklagar att du bestämt dig för att inte acceptera de nya användarvillkoren. För mer information, se <a href="%{url}">denna wikisida</a>. title: Skapa konto + use openid: Alternativt, använd %{logo} OpenID för att logga in no_such_user: body: Det finns ingen användare med namnet %{user}. Kontrollera stavningen eller kanske länken är trasig. heading: Användaren %{user} finns inte @@ -1465,20 +1700,25 @@ sv: set_home: flash success: Hemposition sparad suspended: + body: "<p>\n Ditt konto har tyvärr stängts av pÃ¥ grund av\n tvivelaktig aktivitet.\n</p>\n<p>\n Detta beslut kommer granskas av en administratör inom kort, eller\n sÃ¥ kan du kontakta %{webmaster} om vill diskutera saken.\n</p>" heading: Kontot avstängt title: Kontot avstängt webmaster: Webbmaster terms: agree: Jag godkänner + consider_pd: Utöver ovan nämnda avtal, anser jag att mina bidrag är inom Public Domain. consider_pd_why: vad är det här? decline: AvslÃ¥ + guidance: "Information som hjälper dig förstÃ¥ dessa termer: en <a href=\"%{summary}\">lättläst sammanfattning</a> och nÃ¥gra <a href=\"%{translations}\">informella översättningar</a>" heading: Vilkor för bidrag till kartan legale_names: france: Frankrike italy: Italien rest_of_world: Resten av världen legale_select: Välj din vistelseort + read and accept: Läs avtalet nedan och klicka pÃ¥ knappen Godkänn för att bekräfta att du godkänner villkoren i detta avtal för dina befintliga och framtida bidrag. title: Villkor för deltagare + you need to accept or decline: Läs igenom och Godkänn eller Avböj de nya bidragsvillkoren för att fortsätta. view: activate_user: aktivera denna användare add as friend: lägg till som vän @@ -1486,16 +1726,23 @@ sv: block_history: visa tilldelade blockeringar blocks by me: blockeringar av mig blocks on me: mina blockeringar + comments: kommentarer confirm: Bekräfta confirm_user: bekräfta denna användare create_block: blockera denna användare created from: "Skapad frÃ¥n:" + ct accepted: Godkända för %{ago} sedan + ct declined: Avböjda + ct status: "Användarvillkor:" + ct undecided: Oavgjorda deactivate_user: deaktivera denna användare delete_user: radera denna användare description: Beskrivning diary: dagbok edits: redigeringar email address: "E-post:" + friends_changesets: Bläddra igenom alla ändringsset bland vänner + friends_diaries: Bläddra igenom alla dagboksinlägg av vänner hide_user: dölj denna användare if set location: Om du sätter din position, sÃ¥ kommer en karta med lite funktioner att dyka upp här nedanför. Du kan sätta din hemposition pÃ¥ din %{settings_link}-sida. km away: "%{count}km bort" @@ -1503,11 +1750,14 @@ sv: m away: "%{count}m bort" mapper since: "Karterar sedan:" moderator_history: visa tilldelade blockeringar + my comments: mina kommentarer my diary: min dagbok my edits: mina redigeringar my settings: mina inställningar my traces: mina GPS-spÃ¥r nearby users: Andra användare nära dig + nearby_changesets: Bläddra igenom alla ändringsset av närbelägna användare + nearby_diaries: Bläddra igenom alla dagboksinlägg av närbelägna användare new diary entry: nytt dagboksinlägg no friends: Du har inte lagt till nÃ¥gra vänner ännu. no nearby users: Det är inga andra användare som uppgett att de mappar i ditt omrÃ¥de ännu. @@ -1532,28 +1782,66 @@ sv: your friends: Dina vänner user_block: blocks_by: + empty: "%{name} har inge gjort nÃ¥gra blockeringar än." + heading: Lista blockeringar av %{name} title: Blockeringar av %{name} + blocks_on: + empty: "%{name} har inte blockerats än." + heading: Lista blockeringar pÃ¥ %{name} + title: Blockeringar pÃ¥ %{name} create: flash: Skapat en blockering av användare %{name}. try_contacting: Försök att kontakta användarenoch ge användaren tid att svara innan du blockerar . + try_waiting: Försök att ge användaren en rimlig svarstid innan denna blockeras. + edit: + back: Visa alla blockeringar + heading: Redigera blockering pÃ¥ %{name} + needs_view: Behöver användaren logga in innan blockeringen upphör? + period: Hur lÃ¥ng tid, frÃ¥n och med nu, som användaren ska vara blockerad frÃ¥n API. + reason: Anledningen till varför %{name} blockeras. Var sÃ¥ lugn och resonabel som möjligt, ge sÃ¥ mÃ¥nga detaljer du kan om situationen. Tänk pÃ¥ att inte alla användare förstÃ¥r community-jargongen, sÃ¥ försök att använda lekmannatermer. + show: Visa denna blockering + submit: Uppdatera blockering + title: Redigera blockering pÃ¥ %{name} + filter: + block_expired: Blockeringen har redan upphört att gälla och kan inte redigeras. + block_period: Blockeringsperioden mÃ¥ste ha ett av värdena i rullgardinslistan. helper: time_future: Slutar om %{time}. + time_past: Avslutades för %{time} sedan. + until_login: Aktiv till dess användaren loggar in. index: empty: Inga blockeringar har gjorts ännu. heading: Lista över blockerade användare title: Användarblockeringar + model: + non_moderator_revoke: MÃ¥ste vara en moderator för att Ã¥terkalla en blockering. + non_moderator_update: MÃ¥ste vara en moderator för att skapa eller uppdatera en blockering. + new: + back: Visa alla blockeringar + heading: Skapa blockering pÃ¥ %{name} + needs_view: Användaren mÃ¥ste logga in innan blockeringen kommer att upphöra. + period: Hur lÃ¥ng tid, frÃ¥n och med nu, användaren ska vara blockerad frÃ¥n API. + reason: Anledning till varför %{name} blockeras. Var sÃ¥ lugn och resonabel som möjligt, ge sÃ¥ sÃ¥ mÃ¥nga detaljer som du kan om situationen med vetskapen att meddelandet kommer vara offentligt i bakhuvudet. Tänk pÃ¥ att inte alla användare förstÃ¥r community-jargongen, sÃ¥ försök att använda lekmannatermer. + submit: Skapa blockering + title: Skapa blockering pÃ¥ %{name} + tried_contacting: Jag har kontaktat användaren och bett honom sluta. + tried_waiting: Jag har gett en rimlig tidsfrist för användaren att svara pÃ¥ dessa meddelanden. not_found: back: Tillbaka till index + sorry: Tyvärr, användarblockeringen med ID %{id} kunde inte hittas. partial: confirm: Är du säker? creator_name: Skapare display_name: Blockerad användare edit: Ändra + next: Nästa » not_revoked: (Inte Ã¥terkallat) + previous: « FöregÃ¥ende reason: Orsak till blockering revoke: Återkalla! revoker_name: Återkallad av show: Visa + showing_page: Visar sida %{page} status: Status period: one: 1 timma @@ -1570,14 +1858,18 @@ sv: back: Se alla blockeringar confirm: Är du säker? edit: Ändra + heading: "%{block_on} blockerad av %{block_by}" needs_view: Användaren mÃ¥ste logga in innan blockeringen upphör. reason: "Anledning för blockering:" revoke: Återkalla! + revoker: "Återställare:" show: Visa status: Status time_future: Upphör om %{time} time_past: Slutade %{time} sedan + title: "%{block_on} blockerad av %{block_by}" update: + only_creator_can_edit: Bara moderatorn som skapade denna blockering kan redigera den. success: Blockering uppdaterad. user_role: filter: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 3013bf08b..49b7cf9e5 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -2,7 +2,9 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Aswn +# Author: Karthi.dr # Author: Krishnaprasaths +# Author: Sank # Author: Shanmugamp7 # Author: Surya Prakash.S.A. # Author: TRYPPN @@ -79,7 +81,6 @@ ta: changeset: changeset: "மாற்றங்கள்: %{id}" changesetxml: மாற்றத்தொடுப்பு XML - download: "%{changeset_xml_link} அல்லது %{osmchange_xml_link} -ஐப் பதிவிறக்கு" feed: title: "மாற்றங்கள்: %{id}" title_comment: மாற்றங்கள் %{id}-%{comment} @@ -131,7 +132,6 @@ ta: next_changeset_tooltip: "%{user} என்ற பயனரின் அடுத்த தொகுப்பு" prev_changeset_tooltip: "%{user} என்ற பயனரின் முந்தைய தொகுப்பு" node: - download: "%{download_xml_link}, %{view_history_link} அல்லது %{edit_link}" download_xml: XML பதிவிறக்கு edit: தொகு node: சந்தி @@ -141,7 +141,6 @@ ta: coordinates: "ஆயக்கூறுகள்:" part_of: "பகுதி:" node_history: - download: "%{download_xml_link} அல்லது %{view_details_link}" download_xml: XML பதிவிறக்கு node_history: "முனைய வரலாறு:" node_history_title: "முனைய வரலாறு: %{node_name}" @@ -156,8 +155,10 @@ ta: paging_nav: of: "," showing_page: காட்டப்பட்டுக் கொண்டிருக்கும் பக்கம் + redacted: + type: + way: வழி relation: - download: "%{download_xml_link} அல்லது %{view_history_link}" download_xml: XML பதிவிறக்கு relation: தொடர்பு relation_title: "தொடர்பு: %{relation_name}" @@ -166,7 +167,6 @@ ta: members: "உறுப்பினர்கள்:" part_of: "பகுதி:" relation_history: - download: "%{download_xml_link} அல்லது %{view_details_link}" download_xml: XML பதிவிறக்கு relation_history: தொடர்பு வரலாறு relation_history_title: "தொடர்பு வரலாறு: %{relation_name}" @@ -233,6 +233,7 @@ ta: changeset: changeset: anonymous: அடையாளமற்றவர் + big_area: (பெரிய) no_comment: (எதுவுமில்லை) no_edits: (திருத்தங்கள் இல்லை) show_area_box: பரப்புப் பெட்டியைக் காட்டு @@ -243,6 +244,7 @@ ta: changesets: area: பகுதி comment: கருத்து + id: அடையாளம் (ID) saved_at: சேமிக்கப்பட்ட user: பயனர் list: @@ -255,8 +257,11 @@ ta: heading_user_bbox: மாற்ற தொகுப்புகள் title: மாற்றங்கள் diary_entry: + comments: + comment: கருத்துரை diary_comment: confirm: உறுதிசெய் + hide_link: இக் கருத்துரையை மறை diary_entry: comment_link: இந்த உள்ளீடு குறித்து கருத்துகூறு confirm: உறுதிசெய் @@ -295,9 +300,6 @@ ta: no_such_entry: heading: இந்த id :%{id} மூலமாக எந்த உள்ளீடும் இல்லை title: இத்தகைய டைரி உள்ளீடு இல்லை. - no_such_user: - heading: பயனர் %{user} இல்லை - title: அப்படியொரு பயனர் இல்லை. view: leave_a_comment: ஒரு குறிப்பை இடவும் login: புகுபதிகை @@ -377,7 +379,9 @@ ta: driving_school: ஓட்டுநர் பயிற்சிப்பள்ளி embassy: தூதரகம் emergency_phone: அவசர தொலைபேசி + fast_food: துரித உணவு fire_station: தீயணைப்பு நிலையம் + food_court: உணவுச்சாலை fountain: நீரூற்று fuel: எரிபொருள் grave_yard: இடுகாடு @@ -401,6 +405,7 @@ ta: police: காவல் post_box: அஞ்சல் பெட்டி post_office: தபால் நிலையம் + preschool: முன் பள்ளி prison: சிறைச்சாலை public_building: பொது கட்டிடம் public_market: பொது சந்தை @@ -412,6 +417,7 @@ ta: shelter: தங்குமிடம் shop: கடை studio: ஸ்டுடியோ + swimming_pool: நீச்சல் தடாகம் taxi: வாடகை வண்டி telephone: பொது தொலைபேசி theatre: திரையரங்கம் @@ -424,42 +430,19 @@ ta: youth_centre: இளைஞர் மையம் boundary: administrative: நிர்வாக எல்லை + bridge: + "yes": பாலம் building: - church: தேவாலயம் - city_hall: மாநகர கூடம் - commercial: வணிக கட்டிடம் - entrance: கட்டட நுழைவுவாயில் - faculty: ஆசிரியர்கள் கட்டிடம் - farm: பண்ணை கட்டிடம் - flats: அடுக்குமாடி குடியிருப்புகள் - garage: வாகனம் நிறுத்தும் அறை - hall: கூடம் - hospital: மருத்துவமனை கட்டிடம் - hotel: விடுதி - house: வீடு - industrial: தொழிற்சாலை கட்டிடம் - office: அலுவலக கட்டிடம் - public: பொது கட்டிடம் - residential: குடியிருப்பு கட்டிடம் - retail: சில்லறை வியாபார கட்டிடம் - school: பள்ளிக் கட்டிடம் - shop: கடை - stadium: விளையாட்டு மைதானம் - store: கடை - terrace: டெரஸ் கட்டடம் - tower: கோபுரம் - train_station: ரயில் நிலையம் - university: பல்கலைக்கழக கட்டிடம் + "yes": கட்டிடம் highway: bus_guideway: வழிநடத்தப்பட்ட பேருந்து தடம் bus_stop: பேருந்து நிறுத்தம் construction: நெடுஞ்சாலை கட்டுமானப் பணிகள் நடந்து கொண்டுள்ளது. cycleway: மிதிவண்டி பாதை - distance_marker: தூரக் குறியீடு emergency_access_point: அவசர அணுகல் புள்ளி footway: நடைபாதை - gate: வாயில் living_street: வாழும் வீதி + milestone: மைல் கல் minor: சிறு சாலை path: பாதை pedestrian: பாதசாரிகள் வழி @@ -478,6 +461,7 @@ ta: boundary_stone: எல்லைக் கல் building: கட்டிடம் castle: கோட்டை + church: தேவாலயம் house: வீடு icon: படவுரு memorial: நினைவிடம் @@ -496,7 +480,6 @@ ta: industrial: தொழிலக பகுதி military: ராணுவ பகுதி mine: சுரங்கம் - mountain: மலை park: பூங்கா railway: தொடர்வண்டி பாதை reservoir: நீர்த்தேக்கம் @@ -521,7 +504,6 @@ ta: bay: வளைகுடா beach: கடற்கரை cave_entrance: குகை நுழைவாயில் - coastline: கடற்கரை பகுதி heath: சுகாதாரம் hill: குன்று island: தீவு @@ -534,6 +516,11 @@ ta: volcano: எரிமலை water: நீர் wood: மரம் + office: + accountant: கணக்காளர் + company: நிறுவனம் + lawyer: வழக்குரைஞர் + "yes": அலுவலகம் place: airport: விமான நிலையம் city: நகரம் @@ -568,7 +555,6 @@ ta: books: புத்தகக் கடை butcher: கசாப்புக்கடை car: மகிழ்வுந்து (கார்) கடை - car_dealer: கார் விற்பனையாளர் car_parts: கார் பாகங்கள் car_repair: கார் சரிசெய்தல் carpet: கம்பளக் கடை @@ -579,6 +565,7 @@ ta: fashion: நாகரிக கடை fish: மீன் கடை food: உணவுக் கடை + gallery: காட்சியகம் insurance: காப்புறுதி jewelry: நகைக் கடை laundry: சலவை @@ -605,7 +592,7 @@ ta: canal: கால்வாய் dam: அணை lock: பூட்டு - river: நதி + river: ஆறு riverbank: நதிக்கரை waterfall: நீர்வீழ்ச்சி javascripts: @@ -624,8 +611,6 @@ ta: history: வரலாறு home: முகப்பு home_tooltip: முகப்பு பகுதிக்கு செல்லவும் - inbox: உள்பெட்டி (%{count}) - intro_3_partners: விக்கி log_in: புகுபதிகை log_in_tooltip: ஏற்கனவே உள்ள கணக்கு மூலம் புகுபதிகை செய் logout: விடுபதிகை @@ -664,10 +649,6 @@ ta: no_such_message: heading: அப்படியொரு தகவல் இல்லை title: அப்படியொரு தகவல் இல்லை - no_such_user: - body: மன்னிக்கவும், அந்த பெயரில் பயனர் யாரும் இல்லை. - heading: அப்படியொரு பயனர் இல்லை. - title: அப்படியொரு பயனர் இல்லை. outbox: date: நாள் inbox: உள்பெட்டி @@ -705,6 +686,9 @@ ta: revoke: திரும்பபெறு new: submit: பதிவுசெய் + redaction: + update: + flash: மாற்றங்கள் சேமிக்கப்பட்டன site: edit: user_page_link: பயனர் பக்கம் @@ -763,9 +747,6 @@ ta: uploaded_at: "பதிவேற்றப்பட்டது:" visibility: "காணும்தூரம்:" visibility_help: இது எதைக் குறிக்கிறது? - no_such_user: - heading: பயனர் %{user} இல்லை - title: அப்படியொரு பயனர் இல்லை. trace: by: மூலம் edit: தொகு @@ -773,6 +754,7 @@ ta: identifiable: அடையாளம் காணக்கூடிய in: உள் map: வரைபடம் + more: மேலும் private: தனியார் public: பொது view_map: வரைபடத்தை காண் @@ -790,9 +772,6 @@ ta: upload_trace: சுவடை பதிவேற்றவும் trace_optionals: tags: குறிச்சொற்கள் - trace_paging_nav: - next: அடுத்து » - previous: « முந்தைய view: delete_track: இந்த சுவடை நீக்கவும் description: "விளக்கம்:" @@ -863,6 +842,7 @@ ta: title: அப்படியொரு பயனர் இல்லை. popup: friend: நண்பர் + your location: உங்களது இருப்பிடம் reset_password: confirm password: "கடவுச்சொல்லை உறுதிசெய்:" flash changed: உங்கள் கடவுச்சொல் மாற்றப்பட்டது. @@ -885,6 +865,7 @@ ta: add as friend: நண்பராக சேர் ago: (%{time_in_words_ago} முன்பு) block_history: பெறப்பட்ட தடுப்புகளை காண் + comments: கருத்துரைகள் confirm: உறுதிசெய் confirm_user: இந்த பயனரை உறுதிசெய் create_block: இப் பயனரைத் தடைசெய் diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 1808eb282..b00785269 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -74,6 +74,8 @@ tl: application: require_cookies: cookies_needed: Tila mayroon kang hindi pinagaganang mga otap - mangyaring paganahin ang mga otap sa loob ng pantingin-tingin mo bago magpatuloy. + require_moderator: + not_a_moderator: Kailangan mong maging isang tagapamagitan upang maisagawa ang galaw na iyan. setup_user_auth: blocked: Hinadlangan ang pagpunta mo sa API. Mangyaring lumagda sa ugnayang-mukha ng web upang makaalam ng marami pa. need_to_see_terms: Pansamantalang inantala ang pagpunta mo sa API. Mangyaring lumagda sa ugnayang-mukha ng web upang tingnan ang mga Tuntunin ng Tagapag-ambag. Hindi mo kailangan sumang-ayon, subalit dapat mong tingnan ang mga ito. @@ -81,7 +83,6 @@ tl: changeset: changeset: "Pangkat ng pagbabago: %{id}" changesetxml: XML ng pangkat ng pagbabago - download: Ikargang paibaba ang %{changeset_xml_link} o %{osmchange_xml_link} feed: title: "%{id} ng pangkat ng pagbabago" title_comment: "%{id} ng angkat ng pagbabago - %{comment}" @@ -114,6 +115,11 @@ tl: entry_role: Kaugnayan %{relation_name} (bilang %{relation_role}) map: deleted: Binura + edit: + area: Baguhin ang pook + node: Baguhin ang buko + relation: Baguhin ang kaugnayan + way: Baguhin ang daan larger: area: Tingnan ang pook sa mas malaking mapa node: Tingnan ang buko sa mas malaking mapa @@ -130,26 +136,31 @@ tl: prev_node_tooltip: Nakaraang buko prev_relation_tooltip: Nakaraang kaugnayan prev_way_tooltip: Dating daan + paging: + all: + next: "%{id} »" + prev: « %{id} + user: + next: "%{id} »" + prev: « %{id} user: name_changeset_tooltip: Tingnan ang mga pamamatnugot ni %{user} next_changeset_tooltip: Susunod na pamamatnugot ni %{user} prev_changeset_tooltip: Nakaraang pagbabagong ginawa ni %{user} node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Ikargang paibaba ang XML - edit: baguhin + edit: Baguhin ang buko node: Buko node_title: "Buko : %{node_name}" - view_history: tingnan ang kasaysayan + view_history: Tingnan ang kasaysayan node_details: coordinates: "Mga tugmaang-pampook:" part_of: "Bahagi ng:" node_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Ikargang paibaba ang XML node_history: Kasaysayan ng Buko node_history_title: "Kasaysayan ng Buko: %{node_name}" - view_details: tingnan ang mga detalye + view_details: Tingnan ang mga detalye not_found: sorry: Paumanhin, ang %{type} na may ID na %{id}, ay hindi matagpuan. type: @@ -160,22 +171,28 @@ tl: paging_nav: of: ang showing_page: Ipinapakita ang pahina + redacted: + message_html: Ang bersiyong %{version} ng %{type} ito ay hindi maipapakita dahil sumailalim na ito sa redaksiyon. Pakitingnan ang %{redaction_link} para sa mga detalye. + redaction: Redaksiyon %{id} + type: + node: buko + relation: kaugnayan + way: daan relation: - download: "%{download_xml_link} o %{view_history_link}" download_xml: Ikargang paibaba ang XML relation: Kaugnayan relation_title: "Kaugnayan: %{relation_name}" - view_history: tingnan ang kasaysayan + view_history: Tingnan ang kasaysayan relation_details: members: "Mga kasapi:" part_of: "Bahagi ng:" relation_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Ikargang paibaba ang XML relation_history: Kasaysayan ng Kaugnayan relation_history_title: "Kasaysayan ng Kaugnayan: %{relation_name}" - view_details: tingnan ang mga detalye + view_details: Tingnan ang mga detalye relation_member: + entry: "%{type} %{name}" entry_role: "%{type} %{name} bilang %{role}" type: node: Buko @@ -186,14 +203,14 @@ tl: view_data: Tingnan ang dato para sa pangkasalukuyang tanawin ng mapa start_rjs: data_frame_title: Dato - data_layer_name: Dato + data_layer_name: Tumingin-tingin sa Dato ng Mapa details: Mga detalye drag_a_box: Kumaladkad ng isang kahon sa mapa upang pumili ng isang lugar edited_by_user_at_timestamp: Binago ni [[user]] sa ganap na [[timestamp]] hide_areas: Itago ang mga lugar history_for_feature: Kasaysayan para sa [[feature]] load_data: Ikarga ang Dato - loaded_an_area_with_num_features: "Nagkarga ka ng isang pook na naglalaman ng mga tamok na [[num_features]]. Sa pangkalahatan, ilang mga pantingin-tingin ang hindi maaaring makaangkop ng mabuti sa pagpapakita ng ganitong dami ng dato. Sa pangkalahatan, gumagana ng pinakamahusay ang mga pantingin-tingin kapag nagpapakita ng mas kakaunti kaysa 100 mga tampok: ang paggawa ng ibang mga bagay ay maaaring makagawa sa iyong pantingin-tingin upang bumagal/hindi tumutugon. Kung nakatitiyak kang nais mong ipakita ang ganitong dato, magagawa mo ito sa pamamagitan ng pagpindot sa pindutang nasa ibaba." + loaded_an_area_with_num_features: "Nagkarga ka ng isang pook na naglalaman ng [[num_features]] na mga tampok. Sa pangkalahatan, ilang mga pantingin-tingin ang hindi maaaring makaangkop ng mabuti sa pagpapakita ng ganitong dami ng dato. Sa pangkalahatan, gumagana ng pinakamahusay ang mga pantingin-tingin kapag nagpapakita ng mas kakaunti kaysa [[max_features]] na mga tampok: ang paggawa ng ibang mga bagay ay maaaring makagawa sa iyong pantingin-tingin upang bumagal/hindi tumutugon. Kung nakatitiyak kang nais mong ipakita ang ganitong dato, magagawa mo ito sa pamamagitan ng pagpindot sa pindutang nasa ibaba." loading: Ikinakarga... manually_select: Kinakamay na pumili ng iba pang lugar object_list: @@ -232,10 +249,9 @@ tl: relation: kaugnayan way: daan way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" download_xml: Ikargang paibaba ang XML - edit: baguhin - view_history: tingnan ang kasaysayan + edit: Baguhin ang daan + view_history: Tingnan ang kasaysayan way: Daan way_title: "Daan: %{way_name}" way_details: @@ -244,15 +260,15 @@ tl: nodes: "Mga buko:" part_of: "Bahagi ng:" way_history: - download: "%{download_xml_link} o %{view_details_link}" download_xml: Ikargang paibaba ang XML - view_details: tingnan ang mga detalye + view_details: Tingnan ang mga detalye way_history: Kasaysayan ng Daan way_history_title: "Kasaysayan ng Daan: %{way_name}" changeset: changeset: anonymous: Hindi nagpapakilala (anonimo) big_area: (malaki) + id: "#%{id}" no_comment: (wala) no_edits: (walang mga pamamatnugot) show_area_box: ipakita ang kahon ng pook @@ -271,19 +287,35 @@ tl: list: description: Kamakailang pagbabago description_bbox: Mga pangkat ng pagbabago sa loob ng %{bbox} + description_friend: Mga pangkat ng pagbabago ng mga kaibigan mo + description_nearby: Mga pangkat ng pagbabago ng kalapit na mga tagagamit description_user: Mga pangkat ng pagbabago ayon sa %{user} description_user_bbox: Mga pangkat ng pagbabago ayon sa %{user} sa loob ng %{bbox} + empty_anon_html: Wala pang ginawang mga pamamatnugot + empty_user_html: Mukhang hindi ka pa gumagawa ng anumang mga pamamatnugot. Upang makapagsimula, siyasatin ang <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Patnubay ng mga Baguhan</a>. heading: Mga pangkat ng pagbabago heading_bbox: Mga pangkat ng pagbabago + heading_friend: Mga pangkat ng pagbabago + heading_nearby: Mga pangkat ng pagbabago heading_user: Mga pangkat ng pagbabago heading_user_bbox: Mga pangkat ng pagbabago title: Mga pangkat ng pagbabago title_bbox: Mga pangkat ng pagbabago sa loob ng %{bbox} + title_friend: Mga pangkat ng pagbabago ng mga kaibigan mo + title_nearby: Mga pangkat ng pagbabago ng kalapit na mga tagagamit title_user: Mga pangkat ng pagbabago ayon sa %{user} title_user_bbox: Mga pangkat ng pagbabago ayon sa %{user} sa loob ng %{bbox} timeout: sorry: Paumanhin, ang talaan ng mga pangkat ng pagbabagong hiniling mo ay naging napakatagal bago nakuhang muli. diary_entry: + comments: + ago: "%{ago} na ang nakalilipas" + comment: Puna + has_commented_on: Pinuna ni %{display_name} ang sumusunod na mga lahok sa talaarawan + newer_comments: Mas Bagong mga Pagpuna + older_comments: Mas Lumang mga Puna + post: Ipaskil + when: Kailan diary_comment: comment_from: Puna mula sa %{link_user} noong %{comment_created_at} confirm: Tiyakin @@ -328,6 +360,8 @@ tl: older_entries: Mas lumang mga Pagpapasok recent_entries: "Kamakailang mga pagpapasok sa talaarawan:" title: Mga talaarawan ng mga tagagamit + title_friends: Mga talaarawan ng mga kaibigan + title_nearby: Mga talaarawan ng Kanugnog na mga Tagagamit user_title: Talaarawan ni %{user} location: edit: Baguhin @@ -339,10 +373,6 @@ tl: body: Paumanhin, walang pagpapasok sa talaarawan o puna na may ID na %{id}. Mangyaring pakisuri ang pagbabaybay mo, o kaya ay mali ang kawing na pinindot mo. heading: "Walang ipinasok na may ID na: %{id}" title: Walang ganyang pagpapasok sa talaarawan - no_such_user: - body: Paumanhin, walang tagagamit na may pangalang %{user}. Mangyaring pakisuri ang pagbabaybay mo, o kaya ay mali ang kawing na pinindot mo. - heading: Hindi umiiral ang tagagamit na %{user} - title: Walang ganyang tagagamit view: leave_a_comment: Mag-iwan ng puna login: Lumagda @@ -375,6 +405,7 @@ tl: licence: Lisensiya longitude: "Longhitud:" manually_select: Kinakamay na pumili ng ibang lugar + map_image: Larawan ng Mapa (nagpapakita ng patong na saligan) max: pinakamataas options: Mga mapagpipilian osm_xml_data: Dato ng XML ng OpenStreetMap @@ -415,7 +446,9 @@ tl: south_west: timog-kanluran west: kanluran distance: - other: sero=mas mababa kaysa 1km + one: humigit-kumulang sa 1km + other: humigit-kumulang sa %{count}km + zero: mas mababa kaysa 1km results: more_results: Marami pang mga kinalabasan no_results: Walang natagpuang mga kinalabasan @@ -431,18 +464,31 @@ tl: search_osm_namefinder: suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} ng %{parentname})" suffix_place: ", %{distance} %{direction} ng %{placename}" + suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Himpilan ng eroplano + apron: Tapis pangkusina + gate: Tarangkahan + helipad: Lapagan at Lunsaran ng Helikopter + runway: Patakbuhan at Daanan + taxiway: Daanan ng Taksi + terminal: Terminal amenity: + WLAN: Pagpunta sa WiFi airport: Paliparan arts_centre: Lunduyan ng Sining + artwork: Likhang Sining atm: ATM auditorium: Awditoryum bank: Bangko bar: Tindahang Inuman ng Alak + bbq: Barbikyuhan bench: Bangko bicycle_parking: Paradahan ng Bisikleta bicycle_rental: Arkilahan ng Bisikleta + biergarten: Inuman ng Serbesa brothel: Bahay-aliwan bureau_de_change: Tanggapang Palitan ng Pera bus_station: Himpilan ng Bus @@ -451,6 +497,7 @@ tl: car_sharing: Paghihiraman ng Kotse car_wash: Paliguan ng Kotse casino: Bahay-pasugalan + charging_station: Himpilang Kargahan cinema: Sinehan clinic: Klinika club: Kapisanan @@ -469,6 +516,7 @@ tl: ferry_terminal: Himpilan ng Barkong Pangtawid fire_hydrant: Panubig ng Bumbero fire_station: Himpilan ng Bumbero + food_court: Korte ng Pagkain fountain: Bukal fuel: Panggatong grave_yard: Sementeryo @@ -509,9 +557,12 @@ tl: shelter: Kanlungan shop: Tindahan shopping: Pamimili + shower: Dutsahan + social_centre: Lunduyan ng Pakikipagkapuwa social_club: Kapisanang Panglipunan studio: Istudyo supermarket: Malaking Pamilihan + swimming_pool: Palanguyan taxi: Taksi telephone: Teleponong Pangmadla theatre: Tanghalan @@ -522,41 +573,21 @@ tl: veterinary: Paninistis na Pangbeterinarya village_hall: Bulwagan ng Nayon waste_basket: Basurahan - wifi: Puntahang WiFi + wifi: Pagpunta sa WiFi youth_centre: Lunduyan ng Kabataan boundary: administrative: Hangganang Pampangangasiwa + census: Hangganan ng Sensus + national_park: Liwasang Pambansa + protected_area: Napuprutektahang Pook + bridge: + aqueduct: Tulay na Daanan ng Tubig + suspension: Tulay na Nakabitin + swing: Tulay na Naikakambiyo + viaduct: Tulay na Tubo + "yes": Tulay building: - apartments: Bloke ng Apartamento - block: Bloke ng Gusali - bunker: Hukay na Pangsundalo - chapel: Kapilya - church: Simbahan - city_hall: Gusaling Panglungsod - commercial: Gusaling Pangkalakal - dormitory: Dormitoryo - entrance: Pasukan ng Gusali - faculty: Gusali ng mga Guro - farm: Gusaling Pambukid - flats: Mga bahay-latagan - garage: Garahe - hall: Bulwagan - hospital: Gusali ng Hospital - hotel: Otel - house: Bahay - industrial: Gusaling Pang-industriya - office: Gusaling Tanggapan - public: Pangmadlang Gusali - residential: Gusaling Tirahan - retail: Gusaling Tingian - school: Gusali ng Paaralan - shop: Tindahan - stadium: Istadyum - store: Bilihan - terrace: Balkonahe - tower: Tore - train_station: Himpilan ng Tren - university: Gusali ng Pamantasan + "yes": Gusali highway: bridleway: Daanan ng Kabayo bus_guideway: Daanan ng Ginagabayang Bus @@ -564,12 +595,11 @@ tl: byway: Landas na Hindi Madaanan construction: Ginagawang Punong Lansangan cycleway: Daanan ng Bisikleta - distance_marker: Pananda ng Layo emergency_access_point: Tuldok na Puntahan na Pangsakuna footway: Makitid na Lakaran ng Tao ford: Bagtasan ng Tao - gate: Tarangkahan living_street: Buhay na Lansangan + milestone: Poste ng Milya minor: Kalsadang Hindi Pangunahin motorway: Daanan ng Sasakyang De-motor motorway_junction: Sugpungan ng Daanan ng Sasakyang De-motor @@ -581,14 +611,17 @@ tl: primary_link: Pangunahing Kalsada raceway: Kanal na Daluyan ng Tubig residential: Pamahayan + rest_area: Pook Pahingahan road: Lansangan secondary: Pampangalawang Lansangan secondary_link: Pampangalawang Lansangan service: Kalyeng Pampalingkuran services: Mga Palingkuran sa Daanan ng Sasakyang De-motor + speed_camera: Kamera ng Tulin steps: Mga hakbang stile: Hagdanan ng Bakod tertiary: Pampangatlong Kalsada + tertiary_link: Pampangatlong Kalsada track: Pinak trail: Bulaos trunk: Pangunahing Ruta @@ -602,6 +635,7 @@ tl: building: Gusali castle: Kastilyo church: Simbahan + fort: Kuta house: Bahay icon: Kinatawang Larawan manor: Manor @@ -626,6 +660,7 @@ tl: farmland: Lupaing Sakahan farmyard: Bakuran ng Bahay sa Bukid forest: Gubat + garages: Mga garahe grass: Damo greenfield: Lupain ng Lunting Bukirin industrial: Pook na Pang-industriya @@ -633,25 +668,28 @@ tl: meadow: Kaparangan military: Pook ng Militar mine: Minahan - mountain: Bundok nature_reserve: Lupaing Laan sa Kalikasan + orchard: Halamanan ng Bunga park: Liwasan piste: Piste ng Iski - plaza: Plasa quarry: Hukay na Tibagan railway: Daambakal recreation_ground: Lupaing Libangan reservoir: Tinggalan ng Tubig + reservoir_watershed: Lunas na Imbakan ng Tubig residential: Pook na Panirahan retail: Tingi + road: Pook na Daanan village_green: Nayong Lunti vineyard: Ubasan wetland: Babad na Lupain wood: Kahoy leisure: beach_resort: Liwaliwang Dalampasigan + bird_hide: Pook-Matyagan ng Ibon common: Karaniwang Lupain fishing: Pook na Palaisdaan + fitness_station: Himpilan na Pangkaangkupan at Kalusugan ng Katawan garden: Halamanan golf_course: Kurso ng Golp ice_rink: Pook Pang-iskeyting @@ -662,12 +700,17 @@ tl: pitch: Hagisang Pampalakasan playground: Palaruan recreation_ground: Lupaing Libangan + sauna: Silid-suuban slipway: Andamyong Pagawaan ng Barko sports_centre: Lunduyang Pampalakasan stadium: Istadyum swimming_pool: Palanguyan track: Landas na Takbuhan water_park: Liwasang Tubigan + military: + airfield: Paliparan at Palapagang Pangmilitar + barracks: Kuwartel + bunker: Hukay na Pangsundalo natural: bay: Look beach: Dalampasigan @@ -675,11 +718,12 @@ tl: cave_entrance: Pasukan ng Yungib channel: Bambang cliff: Bangin - coastline: Baybay-dagat crater: Uka + dune: Burol ng Buhangin feature: Tampok fell: Pulak fjord: Tubigang Mabangin + forest: Gubat geyser: Geyser glacier: Tipak ng Yelong Bundok heath: Lupain ng Halamang Erika @@ -699,6 +743,7 @@ tl: scrub: Palumpong shoal: Banlik spring: Bukal + stone: Bato strait: Kipot tree: Puno valley: Lambak @@ -707,6 +752,19 @@ tl: wetland: Babad na Lupain wetlands: Mga Babad na Lupain wood: Kahoy + office: + accountant: Tagatuos + architect: Arkitekto + company: Kumpanya + employment_agency: Ahensiya ng Patrabaho + estate_agent: Ahente ng Lupain + government: Tanggapang Pampamahalaan + insurance: Tanggapan ng Seguro + lawyer: Manananggol + ngo: Tanggapan ng NGO + telecommunication: Tanggapang Pangtelekomunikasyon + travel_agent: Ahensiya ng Paglalakbay + "yes": Tanggapan place: airport: Paliparan city: Lungsod @@ -718,6 +776,7 @@ tl: houses: Mga Bahay island: Pulo islet: Munting Pulo + isolated_dwelling: Ilang na Tirahan locality: Lokalidad moor: Lupang Pugalan ng Tubig municipality: Munisipalidad @@ -741,6 +800,7 @@ tl: junction: Panulukan ng Daambakal level_crossing: Patag na Tawiran light_rail: Banayad na Riles + miniature: Munting Riles monorail: Isahang Riles narrow_gauge: Daambakal na may Makitid na Luwang platform: Plataporma ng Daambakal @@ -755,7 +815,7 @@ tl: yard: Bakuran ng Daambakal shop: alcohol: Wala sa Lisensiya - apparel: Tindahan ng Kasuotan + antiques: Mga Antigo art: Tindahan ng Sining bakery: Panaderya beauty: Tindahan ng Pampaganda @@ -764,7 +824,6 @@ tl: books: Tindahan ng Aklat butcher: Mangangatay car: Tindahan ng Kotse - car_dealer: Mangangalakal ng Kotse car_parts: Mga Bahagi ng Kotse car_repair: Kumpunihan ng Kotse carpet: Tindahan ng Karpet @@ -779,7 +838,6 @@ tl: department_store: Tindahang Kagawaran discount: Tindahan ng mga Bagay na may Bawas-Presyo doityourself: Gawin ng Sarili Mo - drugstore: Tindahan ng Gamot dry_cleaning: Paglilinis na Tuyo electronics: Tindahan ng Elektroniks estate_agent: Ahente ng Lupain @@ -845,7 +903,10 @@ tl: valley: Lambak viewpoint: Tuldok ng pananaw zoo: Hayupan + tunnel: + "yes": Lagusan waterway: + artificial: Daanan ng Tubig na Gawang-Tao boatyard: Bakuran ng bangka canal: Paralanan connector: Pandugtong sa Daanan ng Tubig @@ -866,10 +927,18 @@ tl: water_point: Tuldok ng Tubigan waterfall: Talon weir: Pilapil + prefix_format: "%{name}" + html: + dir: mula kaliwa pakanan javascripts: map: base: cycle_map: Mapa ng Ikot + mapquest: Bukas ang MapQuest + standard: Pamantayan + transport_map: Mapa ng Biyahe + overlays: + maplint: Maplint site: edit_disabled_tooltip: Lumapit upang baguhin ang mapa edit_tooltip: Baguhin ang mapa @@ -878,6 +947,7 @@ tl: history_tooltip: Tingnan ang mga pagbabago para sa lugar na ito history_zoom_alert: Dapat kang lumapit upang matingnan ang mga pagbabago para sa lugar na ito layouts: + community: Pamayanan community_blogs: Mga Blog ng Pamayanan community_blogs_title: Mga blog mula sa mga kasapi ng pamayanan ng OpenStreetMap copyright: Karapatang-ari at Lisensiya @@ -896,17 +966,24 @@ tl: help: Tulong help_centre: Lunduyan ng Tulong help_title: Lugar ng tulong para sa proyekto + help_url: http://help.openstreetmap.org/ history: Kasaysayan home: tahanan home_tooltip: Pumunta sa kinalalagyan ng tahanan - inbox: kahong-tanggapan (%{count}) + inbox_html: kahong-tanggapan %{count} inbox_tooltip: - other: sero=Ang kahong-tanggapan mo ay walang mga mensaheng hindi pa nababasa + one: Ang kahong-tanggapan mo ay naglalaman ng 1 mensaheng hindi pa nababasa + other: Ang iyong kahong-tanggapan ay naglalaman ng %{count} mga mensaheng hindi pa nababasa + zero: Ang kahong-tanggapan mo ay walang mga mensaheng hindi pa nababasa intro_1: Ang OpenStreetMap ay isang malayang mababagong mapa ng buong mundo. Ginawa ito ng mga taong katulad mo. - intro_2: Ang OpenStreetMap ay nagpapahintulot sa iyong tumingin, magbago at gumamit ng dato pangheograpiya sa isang paraang nagtutulungan magmula sa anumang pook sa ibabaw ng Daigdig. - intro_3: Ang pagpapasinaya ng OpenStreetMap ay malugod na tinatangkilik ng %{ucl} at %{bytemark}. Ang iba pang mga tagapagtangkilik ng proyekto ay mga nakatala sa loob ng %{partners}. - intro_3_partners: wiki + intro_2_create_account: Lumikha ng isang akawnt ng tagagamit + intro_2_download: ikargang paibaba + intro_2_html: Malayang %{download} at %{use} ang dato sa ilalim ng %{license}. %{create_account} upang mapainam ang mapa. + intro_2_license: lisensiyang bukas + intro_2_use: gamitin + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap license: + alt: CC BY-SA 2.0 title: Nilisensiyahan ang dato ng OpenStreetMap sa ilalim ng Pangkalahatang Lisensiya ng Malikhaing mga Pangkaraniwan ng Pagbanggit at Pagbabahaging Magkatulad 2.0 log_in: lumagda log_in_tooltip: Lumagdang papasok sa umiiral na akawnt @@ -919,9 +996,18 @@ tl: title: Tangkilikin ang OpenStreetMap sa pamamagitan ng isang abuloy na pananalapi osm_offline: Ang kalipunan ng dato ng OpenStreetMap ay pangkasalukuyang nakapatay habang isinasagawa ang mahalagang gawain ng pagpapanatili ng kalipunan ng dato. osm_read_only: Ang kalipunan ng dato ng OpenStreetMap ay pangkasalukuyang nasa pamamaraang mababasa lamang habang isinasagawa ang mahalagang gawain ng pagpapanatili ng kalipunan ng dato. + partners_bytemark: Pagpapasinaya ng Bytemark + partners_html: Ang pagpapasinaya ay sinusuportahan ng %{ucl}, %{ic} at %{bytemark}, at iba pang %{partners}. + partners_ic: Dalubhasaang Pang-imperyo Londres + partners_partners: mga kawaksi + partners_ucl: Ang Sentro ng UCL VR + partners_url: http://wiki.openstreetmap.org/wiki/Partners + project_name: + h1: OpenStreetMap + title: OpenStreetMap sign_up: magpatala sign_up_tooltip: Lumikha ng isang akawnt para sa pamamatnugot - sotm2011: Pumunta sa Pulong ng OpenStreetMap ng 2011, Ang Katayuan ng Mapa, ika-9 hanggang ika-11 ng Setyembre sa Denver! + sotm2012: Pumunta sa Pulong ng OpenStreetMap ng 2012, Ang Katayuan ng Mapa, ika-6 hanggang ika-8 ng Setyembre sa Tokyo! tag_line: Ang Malayang Mapa sa Daigdig ng Wiki user_diaries: Mga Talaarawan ng mga Tagagamit user_diaries_tooltip: Tingnan ang mga talaarawan ng tagagamit @@ -931,12 +1017,36 @@ tl: welcome_user_link_tooltip: Ang iyong pahina ng tagagamit wiki: Wiki wiki_title: Lugar ng wiki para sa proyekto + wiki_url: http://wiki.openstreetmap.org/ license_page: foreign: english_link: ang orihinal na nasa Ingles text: Kung sakaling maganap ang isang salungatan sa pagitan ng isinalinwikang pahinang ito at ng %{english_original_link}, mangingibabaw ang pahinang nasa Ingles title: Tungkol sa salinwikang ito - legal_babble: "<h2>Karapatang-ari at Lisensiya</h2>\n<p>\nAng OpenStreetMap ay <i>bukas na dato</i>, na nilisensiyahan sa ilalim ng lisensiyang<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Malikhaing Pangkaraniwang Pagtukoy na Magkatulad 2.0</a> (CC-BY-SA).\n</p>\n<p>\nMalaya mong makokopya, maipapamahagi, maipadadala and iangkop ang aming mga mapa at dato, hangga’t binabanggit mo ang OpenStreetMap at mga tagapag-ambag nito. Kapag binago o pinainam mo ang aming mga mapa o dato, maaari mong ipamahagi ang mga resulta sa ilalim lamang ng katulad na lisensiya. Ang buong <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">kodigong makabatas</a> ay nagpapaliwanag ng iyong mga karapatan at mga pananagutan.\n</p>\n<h3>Paano babanggitin ang OpenStreetMap</h3>\n<p>\nKapag ginagamit mo ang mga larawan ng mapa ng OpenStreetMap, hinihiling naming na ang pagbanggit mo ay mapagbabasahan ng kahit na “© Mga tagapag-ambag sa OpenStreetMap, CC-BY-SA”. Kapag ginagamit mo lamang ang dato ng mapa, hinihiling namin ang “Dato ng mapa © Mga tagapag-ambag ng OpenStreetMap, CC-BY-SA”.\n</p>\n<p>\nKung saan maaari, ang OpenStreetMap ay dapat na ikawing sa <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nat CC-BY-SA sa <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Kung gumagamit ka ng isang midyum kung saan hindi maaari ang mga kawing (katulad halimbawa ng isang nilimbag a akda), iminumungkahi namin na papuntahin ang mga mambabasa mo sa www.openstreetmap.org (marahil sa pamamagitan ng pagpapalawig ng ‘OpenStreetMap’ papunta sa buong tirahang ito) at sa www.creativecommons.org.\n</p>\n\n<h3>Pag-alam ng iba pa</h3>\n<p>Magbasa ng iba pa na ginagamit an gaming dato na nasa <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Mga madalas na tanong na makabatas</a>.\n</p>\n<p>\nAng mga tagapag-ambag sa OSM ay pinaaalalahanang huwag na huwag magdaragdag ng anumang mga dato mula sa anumang mga mapagkukunang may karapatang-ari (katulad ng Google Maps o nakalimbag na mga mapa) na walang hayagang pahintulot mula sa mga tagapaghawak ng karapatan sa kopya.\n</p>\n<p>\nBagaman ang OpenStreetMap ay isang bukas na dato, hindi kami makapagbibigay ng isang hindi binabayarang API ng mapa para sa mga tagapagpaunlad ng pangatlong partido. Tingnan ang aming <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Patakaran sa Paggamit ng API</a>,<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Patakaran sa Paggamit ng Tisa</a> and <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Patakaran sa Paggamit ng Nominatim</a>.\n</p>\n<h3>Mga tagapag-ambag namin</h3>\n<p>\nAng aming lisensiyang CC-BY-SA ay nangangailangan sa iyo na “magbigay ng pagbanggit sa Orihinal na May-akda na makatwiran para sa midya o paraang ginagamit Mo”.Ang indibidwal na mga tagapagmapa ng OSM ay hindi humihiling ng isang pagbanggit sa ibabaw at sa itaas niyan sa “Mga tagapag-ambag ng OpenStreetMap”, subalit kung saan ang dato para sa isang ahensiya ng pagmamapang pambansa o ibang pangunahing kuhanan ay naisama na sa OpenStreetMap,maaaring makatwirang banggitin sila na tuwiran sa pamamagitan ng tuwirang muling pagsipi ng kanilang pagbabanggit o sa pamamagitan ng pagkakawing nito sa pahinang ito.</p>\n<!--\nKabatiran para sa mga patnugot ng pahina\nAng sumusunod ay nagtatala lamang ng mga organisasyon na nangangailangan ng mga pagbabanggit bilang isang pasubali sa paggamit ng kanilang dato sa OpenStreetMap. Hindi ito isang pangkalahatang katalogo ng mga pag-aangkat, at hindi dapat gamitin maliban na lamang kung kailangan ang pagbabanggit upang makasunod sa lisensiya ng inangkat na dato. Ang anumang mga karagdagan ditto ay dapat na talakayin muna na kasama ang mga tagapangasiwa ng sistema ng OSM.\n-->\n<ul id=\"contributors\">\n<li><strong>Australya</strong>: Naglalaman ng dato sa sub-urbanong lugar na nakapaligid sa lungsod na nakabatay sa Tanggapang Pang-estadistika ng Australya</li>\n<li><strong>Canada</strong>: Naglalaman ng mga dato mula sa GeoBase®, GeoGratis (© Kagawaran ng Likas na Yaman ng Canada), CanVec (© Kagawaran ng Likas na Yaman ng Canada), at StatCan (Kahatiang Pangheograpiya,\nEstadistika ng Canada).</li>\n<li><strong>Bagong Selanda</strong>: Naglalaman ng mga datong kinuha mula sa Kabatirang Panglupain ng Bagong Selanda. Nakareserba ang Karapatang-ari ng Korona.</li>\n<li><strong>Polonya</strong>: Naglalaman ng dato mula sa <a\n href=\"http://ump.waw.pl/\">Mga mapa ng UMP-pcPL</a>. Karapatang-ari ng mga tagapag-ambag sa UMP-pcPL.</li>\n<li><strong>Nagkakaisang Kaharian</strong>: Naglalaman ng dato ng May Ordinansiyang Pagtatanong© Karapatang-ari ng korona at karapatan sa kalipun ng dato 2010.</li>\n</ul>\n<p>\nAng pagsasama ng dato sa OpenStreetMap ay hindi nagpapahiwatig na ang nagbigay ng orihinal na dato ay tumatangkilik sa OpenStreetMap, nagbiibigay ng anumang garantiya, o tumatanggap ng anumang pananagutan.\n</p>" + legal_babble: + contributors_at_html: "<strong>Austria</strong>: Naglalaman ng dato magmula sa \n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (na nasa ilalim ng \n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> at ng\nLand Tirol (na nasa ilalim ng <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT na mayroong mga susog</a>)." + contributors_au_html: "<strong>Australiya</strong>: Naglalaman ng datong sub-urbano na nakabatay\nsa dato ng Tanggapan ng Estadistika ng Australiya." + contributors_ca_html: "<strong>Canada</strong>: Naglalaman ng dato mula sa\nGeoBase®, GeoGratis (© Kagawaran ng Likas na Yaman ng \nCanada), CanVec (© Kagawaran ng Likas na Yaman ng Canada), at StatCan \n(Dibisyon ng Heograpiya, Estadistika ng Canada)." + contributors_footer_1_html: "Para sa karagdagang mga detalye ng mga ito, at iba pang pinanggalingan na ginamit \nupang mapainam ang OpenStreetMap, paki tingnan ang <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Pahina ng \ntagapag-ambag</a> na nasa ibabaw ng Wiki ng OpenStreetMap." + contributors_footer_2_html: "Ang pagsasama ng dato sa loob ng OpenStreetMap ay hindi nagpapahiwatig na ang orihinal \nna tagapagbigay ng dato ay tumatangkilik sa OpenStreetMap, nagbibigay ng anumang garantiya, o \ntumatanggap ng anumang pananagutan." + contributors_fr_html: "<strong>Pransiya</strong>: Naglalaman ng dato na nanggaling magmula sa \nDirection Générale des Impôts." + contributors_gb_html: "<strong>Nagkakasiang mga Kaharian</strong>: Naglalaman ng Ordinansiya \nsa dato ng Pagsisiyasat © Karapatan sa Paglalathala ng Korona at karapatan \nsa kalipunan ng dato 2010." + contributors_intro_html: "Nangangailangan ang aming lisensiyang CC BY-SA na ikaw ay “magbigay ng pagbanggit sa Orihinal\nna May-akda na makatwiran sa midyum o kaparaanan na ginagamit Mo”. Ang indibidwal na mga \ntagapagmapa ng OSM ay hindi humihiling ng isang pagbanggit sa ibabaw at sa itaas niyan sa “mga \ntagapag-ambag ng OpenStreetMap”, subalit kung saan ang dato magmula sa isang pambansang\nahensiya ng pagmamapa o ibang pangunahing pinagmulan ay naisama sa loob ng OpenStreetMap,\nmaaaring maging makatwiran na banggitin sila sa pamamagitan ng tuwirang paglikha muli ng kanilang\npagkakabanggit o sa pamamagitan ng pagkakawing dito sa ibabaw ng pahinang ito." + contributors_nl_html: "<strong>Nederlandiya</strong>: Naglalaman ng © dato ng AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Bagong Selanda</strong>: naglalaman ng dato na nanggaling magmula sa\nKabatirang Panlupain ng Bagong Selanda. Nakareserba ang Karapatan sa Paglalatahala\nna Pangkorona." + contributors_pl_html: "<strong>Polonya</strong>: Naglalaman ng dato magmula sa <a\nhref=\"http://ump.waw.pl/\">mga mapa ng UMP-pcPL</a>. Karapatan sa paglalathala ng \nmga tagapag-ambag ng UMP-pcPL.\n<a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\nMas marami pang patungkol sa paggamit ng OSM sa dato ng UMP</a>" + contributors_title_html: Mga tagapag-ambag namin + contributors_za_html: "<strong>Timog Aprika</strong>: Naglalaman ng datong nanggaling magmula sa \n<a href=\"http://www.ngi.gov.za/\">Punong Pangasiwaan: \nPambansang Kabatiran na Pangheograpiya at Pangkalawakan</a>, nakareserba ang \nkarapatan ng paglalathala ng Estado." + credit_1_html: "Kapag gumagamit ka ng mga imahe ng mapa ng OpenStreetMap, hinihiling namin na\nsa pagbanggit mo ay mababasa ang kahit na “© mga tagapag-ambag ng \nOpenStreetMap, CC BY-SA”. Kapag ang ginagamit mo ay ang dato ng mapa lamang,\nhinihiling namin ang “Dato ng mapa © mga tagapag-ambag ng OpenStreetMap,\nCC BY-SA”." + credit_2_html: "Kung saan maaari, dapat na ikawing nang labis (lagyan ng hyperlink) ang OpenStreetMap\nna papunta sa <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nat CC BY-SA sa <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Kung\ngumagamit ka ng isang midyum o kasangkapan kung saan hindi maaari ang mga kawing (iyong isang\nakdang nakalimbag), iminumungkahi namin na ituro ang mga mambabasa mo sa \nwww.openstreetmap.org (marahil sa pamamagitan ng pagpapalawak ng ‘OpenStreetMap’\nupang maging tumuturo sa buong tirahan na ito) at sa www.creativecommons.org." + credit_title_html: Paano babanggitin ang OpenStreetMap + intro_1_html: "Ang OpenStreetMap ay <i>bukas na dato</i>, na nilisensiyahan sa ilalim ng <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC BY-SA)." + intro_2_html: "Malaya mong makokopya, maipapamahagi, maipahahatid at mahahalaw ang aming mga mapa\nat dato, basta't babanggitin mo ang OpenStreetMap at ang mga tagapag-ambag\nnito. Kapag binago mo o nagbuo sa pamamagitan ng aming mga mapa o dato, maaari\nmong ipamahagi ang resulta sa ilalim lamang ng katulad na lisensiya. Ipinapaliwanag \nng buong <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">kodigong pambatas</a> \nang mga karapatan at mga pananagutan mo." + more_1_html: "Magbasa ng mas marami pa hinggil sa paggamit ng dato namin doon sa <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Mga Palaging Itinatanong \nna Makabatas</a>." + more_2_html: "Ipinapaalala sa mga tagapag-ambag ng OpenStreetMap (OSM) na huwag kailanman magdaragdag ng dato magmula sa anumang\nmga pinagmulan na mayroong karapatan sa paglalathala (halimbawa na ang Google Maps o nakalimbag na mga mapa) na wala\nang malinaw na kapahintulutan magmula sa mga tagapaghawak ng karapatan sa paglalathala." + more_3_html: "Bagaman isang bukas na dato ang OpenStreetMap, hindi kami makapagbibigay ng isang\nwalang bayad na Application Programming Interface (API, Ugnayang Mukha na Pampagpoprograma ng Aplikasyon) ng mapa \npara sa mga tagapagpaunlad na pang-ikatlong partido. Tingnan ang aming <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Patakaran \nsa Paggamit ng API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Patakaran sa Paggamit ng Tisa</a>\nat <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Patakaran sa Paggamit ng Nominatim</a>." + more_title_html: Ang pagtuklas ng mas marami pang iba + title_html: Karapatan sa Paglalathala at Lisensiya native: mapping_link: simulan ang pagmamapa native_link: Bersyon ng PANGALAN_NG_WIKANG_ITO_DITO @@ -948,8 +1058,15 @@ tl: inbox: date: Petsa from: Mula sa + messages: Mayroong kang %{new_messages} at %{old_messages} my_inbox: Kahong-tanggapan ko + new_messages: + one: "%{count} bagong mensahe" + other: "%{count} bagong mga mensahe" no_messages_yet: Wala ka pang mga mensahe. Bakit hindi makipag-ugnayan sa ilang mga %{people_mapping_nearby_link}? + old_messages: + one: "%{count} lumang mensahe" + other: "%{count} lumang mga mensahe" outbox: kahong-labasan people_mapping_nearby: mga taong kalapit na nagmamapa subject: Paksa @@ -975,13 +1092,12 @@ tl: body: Paumanhin walang mensahe na may ganyang ID. heading: Walang ganyang mensahe title: Walang ganyang mensahe - no_such_user: - body: Paumanhin walang tagagamit na may ganyang pangalan. - heading: Walang ganyang tagagamit - title: Walang ganyang tagagamit outbox: date: Petsa inbox: kahon ng pumapasok + messages: + one: Mayroon kang %{count} ipinadalang mensahe + other: Mayroon kang %{count} ipinadalang mga mensahe my_inbox: "%{inbox_link} ko" no_sent_messages: Wala ka pang ipinadadalang mga mensahe. Bakit hindi makipag-ugnayan sa ilang mga %{people_mapping_nearby_link}? outbox: kahong-labasan @@ -1033,6 +1149,7 @@ tl: and_the_tags: "at ang sumusunod na mga tatak:" failure: failed_to_import: "nabigo sa pag-angkat. Narito ang kamalian:" + import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures more_info_1: Marami pang kabatiran hinggil sa mga kabiguan ng pag-angkat ng GPX at kung paano maiiwasan more_info_2: "ang mga ito ay matatagpuan sa:" subject: Nabigo ang Pag-angkat ng GPX ng [OpenStreetMap] @@ -1058,6 +1175,7 @@ tl: footer2: at maaari kang tumugon doon sa %{replyurl} header: "Nagpadala sa iyo si %{from_user} ng isang mensahe sa pamamagitan ng OpenStreetMap na may paksang %{subject}:" hi: Kumusta %{to_user}, + subject_header: "[OpenStreetMap] %{subject}" signup_confirm: subject: "[OpenStreetMap] Tiyakin ang iyong tirahan ng e-liham" signup_confirm_html: @@ -1086,9 +1204,11 @@ tl: more_videos: "May marami pang mga bidyo rito:" opengeodata: "Ang OpenGeoData.org ay ang blog ng tagapagtatag ng OpenStreetMap na si Steve Coast, at mayroon din itong mga podkast:" the_wiki: "Kumuha ng mababasa tungkol sa OpenStreetMap doon sa wiki:" + the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide user_wiki_1: Iminumungkahing lumikha ka ng isang pahina ng wiki ng tagagamit, na may kasamang user_wiki_2: mga tatak ng kategorya na nagtatala kung nasaan ka, katulad ng [[Kategorya:Mga tagagamit_sa_Londres]]. wiki_signup: "Marahil ay nais mo ring magpatala sa wiki ng OpenStreetMap doon sa:" + wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page oauth: oauthorize: allow_read_gpx: basahin ang iyong pribadong mga bakas ng GPS. @@ -1098,7 +1218,7 @@ tl: allow_write_diary: lumikha ng mga pagpapasok sa talaarawan, mga puna at makipagkaibigan. allow_write_gpx: ikargang paitaas ang mga bakas ng GPS. allow_write_prefs: baguhin ang iyong mga kanaisan ng tagagamit. - request_access: Ang aplikasyong %{app_name} ay humihiling na makapunta sa akawnt mo. Mangyaring suriin kung nais mong magkaroon ang aplikasyon ng sumusunod na mga kakayahan. Maaari kang pumili ng marami o kaunti ayon sa iyong kagustuhan. + request_access: Ang aplikasyong %{app_name} ay humihiling na mapuntahan ang akawnt mo, %{user}. Mangyaring suriin kung nais mong magkaroon ang aplikasyon ng sumusunod na mga kakayahan. Maaari kang pumili ng marami o kaunti ayon sa nais mo. revoke: flash: Binawi mo ang kahalip para sa %{application} oauth_clients: @@ -1147,6 +1267,8 @@ tl: allow_write_gpx: ikargang paitaas ang mga bakas ng GPS. allow_write_prefs: baguhin ang kanilang mga kanaisan ng tagagamit. authorize_url: "Payagan ang URL:" + confirm: Natitiyak mo ba? + delete: Burahin ang Kliyente edit: Baguhin ang mga Detalye key: "Susi ng Tagaubos:" requests: "Hinihiling ang sumusunod na mga pahintulot mula sa tagagamit:" @@ -1156,8 +1278,42 @@ tl: url: "URL ng Kahalip ng Kahilingan:" update: flash: Matagumpay na naisapanhon ang kabatiran sa kliyente + printable_name: + with_version: "%{id}, v%{version}" + redaction: + create: + flash: Nalikha na ang redaksiyon. + destroy: + error: Nagkaroon ng kamalian sa pagbuwag ng redaksiyong ito. + flash: Nawasak na ang redaksiyon. + not_empty: Mayroong laman ang redaksiyon. Gawing hindi redaktado ang lahat ng mga bersiyong nasa redaksiyong ito bago lansagin ito. + edit: + description: Paglalarawan + heading: Baguhin ang redaksiyon + submit: Sagipin ang redaksiyon + title: Baguhin ang redaksiyon + index: + empty: Walang maipapakitang mga redaksiyon. + heading: Listahan ng mga redaksiyon + title: Listahan ng mga redaksiyon + new: + description: Paglalarawan + heading: Ipasok ang kabatiran para sa bagong paghahanda ng isinulat upang mailathala + submit: Lumikha ng redaksiyon + title: Lumilikha ng bagong redaksiyon + show: + confirm: Natitiyak mo ba? + description: "Paglalarawan:" + destroy: Alisin ang redaksiyong ito + edit: Baguhin ang redaksiyong ito + heading: Ipinapakita ang redaksiyong "%{title}" + title: Ipinapakita ang redaksiyon + user: "Tagapaglikha:" + update: + flash: Nasagip na ang mga pagbabago. site: edit: + anon_edits: (%{link}) anon_edits_link_text: Alamin kung bakit ganito ang katayuan. flash_player_required: Kailangan mo ng isang tagapagpaandar na Flash upang magamit ang Potlatch, ang patnugot na Flash ng OpenStreetMap. Maaari mong <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ikargang paibaba ang Flash Player magmula sa Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Ilang pang mga mapagpipilian</a> ang makukuha rin para sa pamamatnugot ng OpenStreetMap. no_iframe_support: Hindi tinatangkilik ng pantingin-tingin mo ang mga iframe ng HTML, na kailangan para sa tampok na ito. @@ -1170,7 +1326,6 @@ tl: index: js_1: Maaaring gumagamit ka ng isang pantingin-tingin na hindi tumatangkilik ng JavaScript, o hindi mo pinagagana ang JavaScript. js_2: Ang OpenStreetMap ay gumagamit ng JavaScript para sa madulas nitong mapa. - js_3: Maaaring naisin mong subukan ang <a href="http://tah.openstreetmap.org/Browse/">pangtingin-tingin ng hindi tumitinag na tisa ng Tiles@Home</a>. license: license_name: Malikhaing Pangkaraniwang Pagtukoy na Pamamahaging Magkatulad 2.0 notice: Nilisensiyahan sa ilalim ng lisensiyang %{license_name} ng %{project_name} at ng mga tagapag-ambag nito. @@ -1247,6 +1402,23 @@ tl: unclassified: Kalsadang walang kaurian unsurfaced: Kalsadang hindi patag wood: Kahoy + markdown_help: + alt: Kahaliling teksto + first: Unang bagay + heading: Pamulaan + headings: Mga pamulaan + image: Larawan + link: Kawing + ordered: Listahang may pagkakasunud-sunod + second: Ikalawang bagay + subheading: Kabahaging Pamulaan + text: Teksto + title_html: Sinuri sa pamamagitan ng <a href="http://daringfireball.net/projects/markdown/">Pagbabawas</a> + unordered: Listahang walang pagkakasunud-sunod + url: URL + richtext_area: + edit: Baguhin + preview: Paunang tanaw search: search: Maghanap search_help: "mga halimbawa: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', o 'mga padalahan ng liham na malapit sa Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>marami pang mga halimbawa...</a>" @@ -1282,17 +1454,15 @@ tl: uploaded_at: "Naikargang paitaas:" visibility: "Pagkanatatanaw:" visibility_help: ano ba ang kahulugan nito? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces list: + empty_html: Wala pang narito. <a href='%{upload_link}'>Magkarang paitaas ng isang bagong bakas</a> o umalam ng mas marami pa hinggil sa pagbabakas ng GPS doon sa <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pahina ng wiki</a>. public_traces: Mga pagbabakas ng pangmadlang GPS public_traces_from: Pangmadlang pagbakas ng GPS mula kay %{user} tagged_with: tinatakan ng %{tags} your_traces: Mga pagbabakas ng GPS mo make_public: made_public: Ginawang pangmadla ang bakas - no_such_user: - body: Paumanhin, walang tagagamit na may pangalang %{user}. Mangyaring pakisuri ang pagbabaybay mo, o kaya ay mali ang kawing na pinindot mo. - heading: Hindi umiiral ang tagagamit na %{user} - title: Walang ganyang tagagamit offline: heading: Hindi nakaugnay sa Internet na Imbakan ng GPX message: Pangkasalukuyang hindi makukuha ang sistema ng pagkakarga at pag-iimbak ng talaksang GPX. @@ -1315,14 +1485,16 @@ tl: trackable: MATUTUGAYGAYAN view_map: Tingnan ang Mapa trace_form: - description: Paglalarawan + description: "Paglalarawan:" help: Saklolo - tags: Mga tatak + help_url: http://wiki.openstreetmap.org/wiki/Upload + tags: "Mga tatak:" tags_help: hindi hinangganang kuwit upload_button: Ikargang paitaas - upload_gpx: Ikargang paitaas ang Talaksang GPX - visibility: Pagkanatatanaw + upload_gpx: "Ikargang paitaas ang Talaksang GPX:" + visibility: "Pagkanatatanaw:" visibility_help: ano ang kahulugan nito? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces trace_header: see_all_traces: Tingnan ang lahat ng mga pagbabakas see_your_traces: Tingnan ang lahat ng mga pagbabakas mo @@ -1331,8 +1503,8 @@ tl: trace_optionals: tags: Mga tatak trace_paging_nav: - next: Susunod » - previous: « Nakaraan + newer: Mas Bagong mga Bakas + older: Mas Lumang mga Bakas showing_page: Ipinapakita ang pahinang %{page} view: delete_track: Burahin ang bakas na ito @@ -1364,6 +1536,7 @@ tl: agreed: Sumang-ayon ka sa bagong mga Tuntunin na Pangtagapag-ambag. agreed_with_pd: Ipinahayag mo rin na itinuturing mo ang mga pamamatnugot mo bilang nasa loob ng Nasasakupan ng Madla. heading: "Mga Tuntunin sa Tagapag-ambag:" + link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: ano ba ito? not yet agreed: Hindi ka sumang-ayon sa bagong mga Tuntunin na Pangtagapag-ambag. review link text: Mangyaring sundan ang kawing na ito ayon sa kaluwagan ng iyong panahon upang muling suriin at tanggapin ang bagong mga Tuntunin na Pangtagapag-ambag. @@ -1383,6 +1556,10 @@ tl: new email address: "Bagong Tirahan ng E-liham:" new image: Magdagdag ng isang larawan no home location: Hindi mo naipasok ang kinalalagyan ng tahanan mo. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: ano ba ito? + openid: "OpenID:" preferred editor: "Nais na Patnugot:" preferred languages: "Nais na mga Wika:" profile description: "Paglalarawan ng Balangkas:" @@ -1434,6 +1611,7 @@ tl: summary_no_ip: Nilikha ang %{name} noong %{date} title: Mga tagagamit login: + account is suspended: Paumanhin, nasuspindi ang akawnt mo dahil sa kaduda-dudang gawain.<br />Mangyaring makipag-uganayan sa <a href="%{webmaster}">webmaster</a> kung nais mong talakayin ito. account not active: Paumanhin, hindi pa binubuhay ang akawnt mo.<br />Mangyaring gamitin ang kawing na nasa loob ng e-liham ng pagtitiyak ng akawnt upang buhayin ang akawnt mo, o <a href="%{reconfirm}">humiling ng isang panibagong e-liham ng pagtitiyak</a>. auth failure: Paumanhin, hindi makalagda sa pamamagitan ng mga detalyeng iyan. create account minute: Lumikha ng isang akawnt. Aabutin lamang ng isang minuto. @@ -1442,12 +1620,39 @@ tl: login_button: Lumagda lost password link: Nawala ang hudyat mo? new to osm: Bago pa lamang sa OpenStreetMap? + no account: Wala ka pa bang akawnt? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Umalam ng marami pa tungkol sa parating na pagbabago sa lisensiya ng OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">mga salinwika</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">talakayan</a>) + notice_terms: Ang OpenStreetMap ay lilipat sa isang bagong lisensiya pagsapit ng ika-1 ng Abril, 2012. Kasimbukas din ito ng pangkasalukuyan, ngunit ang mga pirasong pambatas ay mas naaakma sa aming kalipunan ng dato ng mapa. Nais naming panatilihin ang mga ambag mo sa OpenStreetMap, subalit magagawa lang namin iyan kapag sasang-ayon ka na ipamahagi namin ang mga ito sa ilalim ng bagong lisensiya. Kung hindi naman, kakailanganin naming tanggalin ang mga ito mula sa kalipunan ng dato.<br /><br />Mangyaring lumagdang papasok, pagkaraan ay gumamit ng ilang mga segundo upang suriin at tanggapin ang bagong mga kasunduan. Salamat sa iyo! + openid: "%{logo} OpenID:" + openid invalid: Paumanhin, tila may pinsala ang OpenID mo + openid missing provider: Paumahin, hindi nagawang makipag-ugnayan sa tagapagbigay mo ng OpenID + openid_logo_alt: Lumagda sa pamamagitan ng isang OpenID + openid_providers: + aol: + alt: Lumagda sa pamamagitan ng isang OpenID ng AOL + title: Lumagda sa pamamagitan ng AOL + google: + alt: Lumagda sa pamamagitan ng OpenID ng Google + title: Lumagda sa pamamagitan ng Google + myopenid: + alt: Lumagda sa pamamagitan ng OpenID ng myOpenID + title: Lumagda sa pamamagitan ng myOpenID + openid: + alt: Lumagda sa pamamagitan ng isang URL ng OpenID + title: Lumagda sa pamamagitan ng OpenID + wordpress: + alt: Lumagda sa pamamagitan ng OpenID ng Wordpress + title: Lumagda sa pamamagitan ng Wordpress + yahoo: + alt: Lumagda sa pamamagitan ng OpenID ng Yahoo + title: Lumagda sa pamamagitan ng Yahoo password: "Hudyat:" register now: Magpatala na ngayon remember: "Tandaan ako:" title: Lumagda to make changes: Upang makagawa ng mga pagbabago sa dato ng OpenStreetMap data, kailangang mayroon kang isang akawnt. + with openid: "O kaya ay gamitin ang OpenID mo upang lumagda:" + with username: "Mayroon ka na bang akawnt sa OpenStreetMap? Mangyaring lumagda sa pamamagitan ng iyong pangalan ng tagagamit at hudyat:" logout: heading: Umalis sa pagkakalagda mula sa OpenStreetMap logout_button: Umalis sa pagkakalagda @@ -1478,10 +1683,15 @@ tl: license_agreement: Kapag tiniyak mo ang iyong akawnt kakailanganin mong sumang-ayon sa <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">mga tuntunin ng tagapag-ambag</a>. no_auto_account_create: Sa kasamaang-palad pangkasalukuyang hindi namin magawang kusang lumikha ng akawnt para sa iyo. not displayed publicly: Hindi ipinapakita sa madla (tingnan ang <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">patakaran sa pagsasarilinan</a>) + openid: "%{logo} OpenID:" + openid association: "<p>Ang OpenID mo ay hindi pa nakaugnay sa isang akawnt ng OpenStreetMap.</p>\n<ul>\n <li>Kung bago ka pa lang sa OpenStreetMap, mangyaring lumikha ng isang bagong akawnt sa pamamagitan ng pormularyong nasa ibaba.</li>\n <li>\n Kung mayroon ka nang akawnt, makakalagda ka na sa akawnt mo\n sa pamamagitan ng iyong pangalan ng tagagamit at hudyat at pagkaraan ay iugnay ang akawnt \n sa OpenID mo doon sa loob ng mga katakdaan mo na pangtagagamit.\n </li>\n</ul>" + openid no password: Hindi kailangan ang hudyat sa OpenID, subalit ang ilan sa dagdag na mga kagamitan o tagapaghain ay maaaring mangailangan ng isa. password: "Hudyat:" terms accepted: Salamat sa pagtanggap ng bagong mga tuntunin ng tagapag-ambag! terms declined: Ikinalulungkot namin na nagpasya kang huwag tanggapin ang bagong mga Tuntunin ng Tagapag-ambag. Para sa mas marami pang kabatiran, pakitingnan ang <a href="%{url}">pahinang ito ng wiki</a>. + terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined title: Likhain ang akawnt + use openid: Bilang kahalili, gamitin ang %{logo} OpenID upang lumagda no_such_user: body: Paumanhin, walang tagagamit na may pangalang %{user}. Mangyaring pakisuri ang pagbabaybay mo, o kaya ay mali ang kawing na pinindot mo. heading: Hindi umiiral ang tagagamit na %{user} @@ -1512,7 +1722,9 @@ tl: agree: Sumang-ayon consider_pd: Bilang karagdagan sa kasunduang nasa itaas, itinuturing ko ang mga ambag ko bilang nasa Nasasaklawan ng Madla. consider_pd_why: ano ba ito? + consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain decline: Tanggihan + declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined guidance: "Kabatiran upang makatulong sa pag-unawa ng mga katagang ito: a <a href=\"%{summary}\">buod na nababasa ng tao</a> at ilang <a href=\"%{translations}\">impormal na mga salinwika</a>" heading: Tuntunin sa taga-ambag legale_names: @@ -1527,31 +1739,41 @@ tl: activate_user: pasiglahin ang tagagamit na ito add as friend: idagdag bilang kaibigan ago: (%{time_in_words_ago} na ang nakalipas) - block_history: tingnan ang natanggap na mga paghadlang + block_history: natanggap na mga paghadlang blocks by me: mga paghahadlang ko blocks on me: mga paghadlang sa akin + comments: mga puna confirm: Tiyakin confirm_user: tiyakin ang tagagamit na ito create_block: hadlangan ang tagagamit na ito created from: "Nilikha magmula sa:" + ct accepted: Tinanggap noong %{ago} na ang nakalilipas + ct declined: Tumanggi + ct status: "Mga tuntunin sa taga-ambag:" + ct undecided: Walang kapasyahan deactivate_user: huwag pasiglahin ang tagagamit na ito delete_user: burahin ang tagagamit na ito description: Paglalarawan diary: talaarawan edits: mga pagbabago email address: "Tirahan ng e-liham:" + friends_changesets: Tumingin-tingin sa lahat ng pagtatakda ng mga pagbabago ng mga kaibigan + friends_diaries: Tumingin-tingin sa lahat ng mga lahok ng mga kaibigan hide_user: itago ang tagagamit na ito if set location: Kapat itinakda mo ang kinalalagyan mo, isang marilag na mapa at mga abubot ang lilitaw dito. Maitatakda mo ang iyong kinalalagyan ng tahanan sa iyong pahina ng %{settings_link}. km away: "%{count}km ang layo" latest edit: "Pinakahuling pagbabago %{ago}:" m away: "%{count}m ang layo" mapper since: "Tagapagmapa mula pa noong:" - moderator_history: tingnan ang ibinigay na mga paghadlang + moderator_history: ibinigay na mga paghadlang + my comments: mga puna ko my diary: talaarawan ko my edits: mga pamamatnugot ko my settings: mga pagtatakda ko my traces: mga pagbabakas ko nearby users: Iba pang kalapit na mga tagagamit + nearby_changesets: Tumingin-tingin sa lahat ng mga pagtatakda ng pagbabago ng kanugnog na mga tagagamit + nearby_diaries: Tumingin-tingin sa lahat ng mga inilahok sa talaarawan ng kanugnog na mga tagagamit new diary entry: Bagong pagpapasok sa talaarawan no friends: Hindi ka pa nagdaragdag ng sinumang mga kaibigan. no nearby users: Wala pang ibang mga tagagamit na umaamin sa pagmamapa ng malapitan. @@ -1599,7 +1821,6 @@ tl: filter: block_expired: Napaso na ang pagharang at hindi na mababago pa. block_period: Ang panahon ng pagharang ay dapat na isa sa mga halagang mapipili sa loob ng talaang naibabagsak na paibaba. - not_a_moderator: Kailangan mong maging isang tagapamagitan upang maisagawa ang galaw na iyan. helper: time_future: Magwawakas sa %{time}. time_past: Nagwakas na noong %{time} na ang nakalilipas. @@ -1629,11 +1850,14 @@ tl: creator_name: Tagapaglikha display_name: Hinadlangang Tagagamit edit: Baguhin + next: Susunod » not_revoked: (hindi binawi) + previous: « Nakaraan reason: Dahilan ng pagharang revoke: Bawiin! revoker_name: Binawi ni show: Ipakita + showing_page: Ipinapakita ang pahinang %{page} status: Kalagayan period: one: 1 oras diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 9307addd1..5795cd2b9 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -3,6 +3,7 @@ # Export driver: syck-pecl # Author: Alerque # Author: Emperyan +# Author: Erdemaslancan # Author: George Animal # Author: Gizemb # Author: Katpatuka @@ -39,7 +40,7 @@ tr: visible: Görünür user: active: Etkin - description: Açıklama + description: Tanıtım display_name: Görünen Ad email: E-posta languages: Diller @@ -54,9 +55,11 @@ tr: friend: Arkadaş language: Dil message: Mesaj + node: Nokta notifier: Bildir old_way: Eski Yol old_way_tag: Eski Yol Etiketi + relation: Ä°lişki session: Oturum user: Kullanıcı user_preference: Kullanıcı Tercihleri @@ -66,7 +69,6 @@ tr: changeset: changeset: "Değişiklik takımı: %{id}" changesetxml: Değişiklik takımı XML - download: "%{changeset_xml_link} veya %{osmchange_xml_link} indir" feed: title: Değişiklik takımı %{id} title_comment: Değişiklik takımı %{id} - %{comment} @@ -118,21 +120,18 @@ tr: next_changeset_tooltip: "%{user} tarafından sonraki düzenleme" prev_changeset_tooltip: "%{user} tarafından önceki düzenleme" node: - download: "%{download_xml_link}, %{view_history_link} veya %{edit_link}" download_xml: XML Ä°ndir - edit: değiştir node: Nokta node_title: "Nokta: %{node_name}" - view_history: geçmişi görüntüle + view_history: Geçmişi görüntüle node_details: coordinates: "Koordinatları:" part_of: "Ortak parça:" node_history: - download: "%{download_xml_link} veya %{view_details_link}" download_xml: XML indir node_history: Nokta Geçmişi node_history_title: "Nokta geçmişi: %{node_name}" - view_details: ayrıntıları göster + view_details: Ayrıntıları göster not_found: sorry: Üzgünüm, %{id} numaralı %{type} bulunamadı. type: @@ -143,8 +142,10 @@ tr: paging_nav: of: toplam showing_page: Gösterilen sayfa + redacted: + type: + node: nokta relation: - download: "%{download_xml_link} veya %{view_history_link}" download_xml: XML indir relation: Ä°lişki relation_title: "Ilişki: %{relation_name}" @@ -153,11 +154,10 @@ tr: members: "Elemanlar:" part_of: "Ortak parça:" relation_history: - download: "%{download_xml_link} veya %{view_details_link}" download_xml: XML Ä°ndir relation_history: Ilişki Geçmişi relation_history_title: "Ä°lişki Geçmişi: %{relation_name}" - view_details: ayrıntıları göster + view_details: Ayrıntıları göster relation_member: entry_role: "%{type} %{name}, adı %{role}" type: @@ -169,7 +169,7 @@ tr: view_data: Geçerli harita alanının verileri görüntüle start_rjs: data_frame_title: Veri - data_layer_name: Veri + data_layer_name: Harita Verisi Gözat details: Ayrıntılar drag_a_box: Fare kullanarak harita üzerinde bir alan seç edited_by_user_at_timestamp: "[[user]] tarafından düzenlendi ([[timestamp]])" @@ -213,7 +213,6 @@ tr: relation: ilişki way: yol way: - download: "%{download_xml_link}, %{view_history_link} veya %{edit_link}" download_xml: XML Ä°ndir edit: Düzenle view_history: Geçmişi görüntüle @@ -223,7 +222,6 @@ tr: nodes: "Noktalar:" part_of: "Ortak parça:" way_history: - download: "%{download_xml_link} veya %{view_details_link}" download_xml: XML Ä°ndir view_details: ayrıntıları göster way_history: Yol Geçmişi @@ -254,6 +252,7 @@ tr: description_nearby: Yakındaki kullanıcıların değişiklik kayıtları description_user: "%{user} tarafından değişiklik setleri" description_user_bbox: "%{user} tarafından %{bbox} alanındaki değişiklik setleri" + empty_anon_html: Henüz hiçbir düzenleme yapılmadı heading: Değişiklik Setleri heading_bbox: Değişiklik Setleri heading_friend: Değişiklik Kayıtları @@ -333,10 +332,6 @@ tr: body: Üzgünüz, %{id} numaralı bir günlük girdisi ya da yorumu yok. Lütfen harfleri kontrol edin, ya da tıkladığınız link yanlış olabilir. heading: "Bu numaraya sahip giriş yok: %{id}" title: Böyle bir günlük kaydı bulunmuyor - no_such_user: - body: Üzgünüz, %{user} isminde bir kullanıcı yok. Lütfen yazım denetimi yapınız ya da tıkladığınız link yanlış olabilir. - heading: "%{user} adlı bir kullanıcı yok" - title: Böyle bir kullanıcı yok view: leave_a_comment: Yorum yaz login: Giriş @@ -426,13 +421,20 @@ tr: us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>'dan sonuçları search_osm_nominatim: prefix: + aeroway: + aerodrome: Havaalanı + helipad: Helikopter alanı + runway: Uçak pisti + terminal: Terminal amenity: + WLAN: WiFi Erişim Noktası airport: Havaalanı arts_centre: Sanat Merkezi atm: Bankamatik auditorium: Oditoryum bank: Banka bar: Bar + bbq: Mangal alanı bench: Bank bicycle_parking: Bisiklet Parkı bicycle_rental: Bisiklet kiralama @@ -500,9 +502,11 @@ tr: shelter: Korunak shop: Dükkan shopping: Alışveriş Merkezi + shower: Duş social_club: Sosyal kulübü studio: Stüdyo supermarket: Süpermarket + swimming_pool: Yüzme Havuzu taxi: Taksi telephone: Telefon theatre: Tiyatro @@ -517,32 +521,12 @@ tr: youth_centre: Gençlik Merkezi boundary: administrative: Ä°dari Sınır + national_park: Milli Park + bridge: + suspension: Asma köprüsü + "yes": Köprü building: - apartments: Apartman - chapel: Şapel - church: Kilise - city_hall: Belediye binası - dormitory: Yurt - entrance: Bina Girişi - faculty: Fakülte Binası - farm: Çiftlik Binası - flats: Daire - garage: Garaj - hall: Toplantı Merkezi - hospital: Hastane Binası - hotel: Hotel - house: Ev - industrial: Sınai Bina - office: Ofis Binası - public: Kamu Binası - school: Okul Binası - shop: Dükkan - stadium: Stadyum - store: Mağaza - terrace: Teras - tower: Kule - train_station: Gar - university: Üniversite Binası + "yes": Bina highway: bridleway: At yürüyüş yolu bus_guideway: Güdümlü otobüs yolu @@ -550,11 +534,9 @@ tr: byway: Yan yolu construction: Ä°nşaa halinde yolu cycleway: Bisiklet Yolu - distance_marker: Mil taşı emergency_access_point: Acil Erişim Noktası footway: Yaya yolu ford: Akarsu geçidi - gate: Kapı living_street: Yaşam sokağı minor: Ufak yol motorway: Otoyol @@ -567,14 +549,17 @@ tr: primary_link: Devlet Yolu bağlantısı raceway: Koşu yolu residential: Sokak + rest_area: Dinlenme Alanı road: Yol secondary: Ä°l yolu secondary_link: Ä°l yolunun bağlantısı service: Servis Yolu services: Dinleme Tesisi + speed_camera: Hız Kamerası steps: Merdiven stile: Çit basamağı tertiary: Köy arası yolu + tertiary_link: Köy arası yolu track: Toprak yolu trail: Ä°z trunk: Bölünmüş anayol @@ -590,6 +575,7 @@ tr: church: Kilise house: Tarihi Konak icon: Simge + manor: Köşk memorial: Anıt mine: Maden Ocağı monument: Anıt @@ -614,10 +600,9 @@ tr: meadow: Çayır military: Askeri Bölge mine: Maden Ocağı - mountain: Dağ nature_reserve: Doğa Koruma Alanı + orchard: Meyve Bahçesi park: Park - plaza: Meydan quarry: Ocak railway: Demiryolu recreation_ground: Eğlence Parkı @@ -631,6 +616,7 @@ tr: leisure: beach_resort: Plajlı tatilköyü fishing: Balıkçılık alanı + fitness_station: Spor Merkezi garden: Bahçe golf_course: Golf Sahası ice_rink: Buz pateni @@ -641,12 +627,16 @@ tr: pitch: Spor sahası playground: Çocuk parkı recreation_ground: Eğlence parkı + sauna: Sauna slipway: Kızak yolu sports_centre: Spor Merkezi stadium: Stadyum swimming_pool: Yüzme Havuzu track: Koşuş yolu water_park: Su Parkı + military: + airfield: Askeri Havaalanı + barracks: Kışla natural: bay: Koy / körfez beach: Plaj @@ -654,11 +644,11 @@ tr: cave_entrance: Mağara girişi channel: Kanal cliff: Uçurum - coastline: Sahil şeridi crater: Krater feature: Özelliği fell: Ağaçsız tepe fjord: Haliç + forest: Orman geyser: Gayzer glacier: Buzul heath: Fundalık @@ -686,6 +676,15 @@ tr: wetland: Sulak alan wetlands: Sulak Alanlar wood: Orman + office: + accountant: Muhasebeci + architect: Mimar + company: Şirket + employment_agency: İş ve İşçi Bulma Kurumu + estate_agent: Emlakçı + lawyer: Avukat + travel_agent: Seyahat Acentası + "yes": Ofis place: airport: Havaalanı city: Büyükşehir / il merkezi @@ -729,24 +728,25 @@ tr: tram_stop: Tramvay Durağı shop: alcohol: Tekel bayii + antiques: Antikacı art: Sanat Galerisi bakery: Fırın beauty: Güzellik Salonu + beverages: İçecek Dükkanı bicycle: Bisikletçi books: Kitap Evi butcher: Kasap car: Araba Galerisi - car_dealer: Araba Satıcısı car_parts: Araba Parçası Dükkanı car_repair: Oto tamir carpet: Halı Dükkanı chemist: Eczacı clothes: Giysi Dükkanı computer: Bilgisayar Mağazası + convenience: Bakkal copyshop: Fotokopi Merkezi cosmetics: Kozmetik Mağazası discount: Ä°ndirimli Ürünler Mağazası - drugstore: Eczane dry_cleaning: Kuru Temizleme electronics: Elektronik Mağazası estate_agent: Emlakçı @@ -759,10 +759,12 @@ tr: garden_centre: Bahçe Merkezi gift: Hediye eşya greengrocer: Manav + grocery: Manav hairdresser: Kuaför hardware: Hırdavatçı insurance: Sigorta jewelry: Kuyumcu + kiosk: Tekel Bayii laundry: Çamaşırhane mall: Alışveriş merkezi market: Market @@ -805,12 +807,15 @@ tr: valley: Dere/vadi viewpoint: Panoramik view zoo: Hayvanat bahçesi + tunnel: + "yes": Tünel waterway: canal: Kanal dam: Baraj ditch: Sulama kanalı dock: Ä°skele drain: Atık su kanalı + lock: Ä°skele mineral_spring: Maden Suyu river: Nehir riverbank: Irmak kenarı @@ -821,6 +826,7 @@ tr: map: base: cycle_map: Topoğrafik Haritası + mapquest: MapQuest Open standard: Standart transport_map: Ulaştırma Haritası site: @@ -831,6 +837,7 @@ tr: history_tooltip: Bu alandaki düzenlemeleri göster history_zoom_alert: Bu alandaki düzenlemeleri görmek için yakınlaştırmak gerekiyor layouts: + community: Topluluk community_blogs: Üye Blogları community_blogs_title: OpenStreetMap üyelerinin blogları copyright: Telif hakkı & Lisans @@ -852,17 +859,16 @@ tr: history: Geçmiş home: konum home_tooltip: Kendin konuma git - inbox: mesajlar (%{count}) inbox_tooltip: one: Bir tane okunmamış mesajın var other: "%{count} okunmamış mesaj var" zero: Okunmamış mesajın yok intro_1: OpenStreetMap herkese serbest ve ücretsiz senin gibi insanlar tarafından oluşturduğu bir dünya haritasıdır. - intro_2: OpenStreetMap dünyanın her köşesinden ortak bir şekilde haritaları görüntülemeyi, düzenlemeyi ve serbestçe kullanmayı sağlar. - intro_3: OpenStreetMap barındırma servisleri %{ucl}, %{ic} ve %{bytemark} çok teşekkür ederiz. Diğer destekçilerimizi %{partners} listesinde bulunmaktadır. - intro_3_bytemark: bytemark - intro_3_partners: Viki - intro_3_ucl: UCL VR Merkezi + intro_2_create_account: hesabı oluşturunuz + intro_2_download: indirmesi + intro_2_html: "%{license} olan verilerinin %{download} ve %{use} tamamen serbesttir. Harita geliştirmek için bir %{create_account}." + intro_2_license: Kamuya açık lisansı + intro_2_use: kullanması license: title: OpenStreetMap veri Creative Commons Attribution-Share Alike 2.0 Genel Lisans altında lisanslanmıştır log_in: Oturum aç @@ -876,9 +882,13 @@ tr: title: OpenStreetMap para bağışı ile destek verebilirsiniz osm_offline: OpenStreetMap veritabanı bakım çalışmaları yürütüldüğü için veritabanı şu anda çevrimdışıdır. osm_read_only: OpenStreetMap veritabanı bakım çalışmaları yürütüldüğü için veritabanı şu anda sadece okunur durumdadır. + partners_bytemark: Bytemark Hosting + partners_html: Barındırma hizmeti, %{ucl}, %{ic}, %{bytemark} ve diğer %{partners} tarafından desteklenmektedir. + partners_ic: Imperial College London + partners_partners: ortaklar + partners_ucl: UCL VR Centre sign_up: Kaydol sign_up_tooltip: Düzenleme moduna girmek için bir hesap oluştur - sotm2011: 2011 OpenStreetMap konferans, The State of the Map (Haritanın Durumu), 9-11 Eylül Denver'de! tag_line: Özgür Viki Dünya Haritası user_diaries: Günlük user_diaries_tooltip: Kullanıcı günlükleri görüntüle @@ -892,6 +902,9 @@ tr: foreign: english_link: Ä°ngilizce orijinal title: Bu çeviri hakkında + legal_babble: + contributors_title_html: Katkıcılarımız + title_html: Telif Hakkı ve Lisans native: mapping_link: harita çizmeye başla native_link: THIS_LANGUAGE_NAME_HERE sürümü @@ -927,10 +940,6 @@ tr: body: Üzgünüz, bu id ile bir mesaj yok. heading: Böyle bir mesaj yok title: Böyle bir mesaj yok - no_such_user: - body: Üzgünüz, bu isimde bir kullanıcı yok. - heading: Böyle bir kullanıcı yok - title: Böyle bir kullanıcı yok outbox: date: Tarih inbox: gelen kutusu @@ -1013,9 +1022,42 @@ tr: new: submit: Kayıt ol show: + confirm: Emin misiniz? edit: Ayrıntıları Düzenle + redaction: + create: + flash: Redaksiyon oluşturuldu. + destroy: + error: Bu redaksiyon kaldırılırken bir hata oluştu. + flash: Redaksiyon kaldırıldı. + not_empty: Redaksiyon boş değil. Lütfen bu redaksiyonu kaldırmadan önce tüm sürümlerini tekrar düzenleyin. + edit: + description: Açıklama + heading: Redaksiyonu düzenle + submit: Redaksiyonu kaydet + title: Redaksiyonu düzenle + index: + empty: Gösterilecek redaksiyon yok. + heading: Redaksiyonların listesi + title: Redaksiyonların listesi + new: + description: Açıklama + heading: Yeni redaksiyon için bilgi giriniz + submit: Redaksiyon oluştur + title: Yeni redaksiyon oluşturma + show: + confirm: Emin misiniz? + description: "Açıklama:" + destroy: Bu redaksiyonu kaldır + edit: Bu redaksiyonu düzenle + heading: Redaksiyon "% {başlık}" göster + title: Redaksiyon göster + user: "Oluşturan:" + update: + flash: Değişiklikler kaydedildi. site: edit: + anon_edits: (%{link}) user_page_link: kullanıcı sayfası index: js_2: OpenStreetMap harita gösterim için JavaScript kullanıyor. @@ -1090,6 +1132,14 @@ tr: unclassified: Sınıflandırılmamış yol unsurfaced: Ham yolu wood: Orman + markdown_help: + image: Görsel + link: Bağlantı + text: Metin + url: URL + richtext_area: + edit: Düzenle + preview: Ön izle search: search: Ara search_help: "örneğin: 'Beyoğlu', 'Ä°stiklal Caddesi, Ä°stanbul', 'CB2 5AQ' ya da 'Fatih yakınlarında postane' <a href='http://wiki.openstreetmap.org/wiki/Search'>daha fazla örnek...</a>" @@ -1130,9 +1180,8 @@ tr: your_traces: Senin GPS izleri make_public: made_public: Iz herkese açık - no_such_user: - heading: "%{user} kullanıcısı mevcut değil" - title: Böyle bir kullanıcı yok + offline: + heading: GPX Yükleme Servisi Çevrimdışı offline_warning: message: GPX dosya gönderme sistemi şu anda kullanılamıyor trace: @@ -1151,13 +1200,13 @@ tr: trace_details: Ä°z Ayrıntılarını Görüntüle view_map: Harita Görüntüle trace_form: - description: Açıklama + description: Tanıtım help: Yardım - tags: Etiketler + tags: "Etiketler:" tags_help: virgül (,) ile ayrılmış upload_button: Gönder - upload_gpx: GPX Dosya Gönder - visibility: Görünürlük + upload_gpx: "GPX Dosyası Gönder:" + visibility: "Görünürlük:" visibility_help: Bu ne demek? trace_header: see_all_traces: Tüm izleri görüntüle @@ -1166,8 +1215,6 @@ tr: trace_optionals: tags: Etiketler trace_paging_nav: - next: Sonraki » - previous: « Önceki showing_page: Sayfa %{page} görüntüleniyor view: delete_track: Bu izi sil @@ -1192,8 +1239,9 @@ tr: account: contributor terms: agreed: Yeni katılımcı şartları kabul ettin. + agreed_with_pd: Ayrıca düzenlediklerin Kamu Malı olsun diye kabul ettin. heading: "Katılımcı Şartları:" - link text: nemiş bu? + link text: Bu nedir? not yet agreed: Yeni katılımcı şartları kabul etmedin. current email address: "Geçerli E-posta Adresi:" delete image: Geçerli resim kaldır @@ -1213,17 +1261,17 @@ tr: no home location: Konumunu girmedin. openid: link: http://wiki.openstreetmap.org/wiki/OpenID - link text: nemiş bu? + link text: Bu nedir? openid: "OpenID:" preferred editor: "Tercih edilen harita düzenleyici:" preferred languages: "Tercih edilen diller (mesela tr,en,de):" - profile description: "Profil Açıklaması:" + profile description: "Tanıtım:" public editing: disabled: Devre dışı ve verileri düzenleyemez; önceki düzenlemeleri hepsi anonimdir. disabled link text: neden düzenleyemiyorum? enabled: Etkin. Anonim değil ve verileri düzenleyebilir. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: bu da ne? + enabled link text: Bu nedir? heading: "Herkese açık düzenleme modu:" public editing note: heading: Herkese açık düzenleme modu @@ -1259,11 +1307,35 @@ tr: lost password link: Şifren mi unuttun? new to osm: OpenStreetMap sitesinde yeni misiniz? no account: Hesabın yok mu? + openid invalid: Üzgünüz, OpenID hatalı biçimlendirilmiş gözüküyor + openid missing provider: Üzgünüz, OpenID sağlayınızla iletişim kurulamadı + openid_logo_alt: OpenID ile giriş + openid_providers: + aol: + alt: AOL OpenID ile giriş + title: AOL ile giriş + google: + alt: Google OpenID ile giriş + title: Google ile giriş + myopenid: + alt: myOpenID OpenID ile giriş + title: MyOpenID ile giriş + openid: + alt: OpenID URL ile giriş + title: OpenID kullanarak oturum aç + wordpress: + alt: Wordpress OpenID ile giriş + title: Wordpress ile giriş + yahoo: + alt: Yahoo OpenID ile giriş + title: Yahoo ile giriş password: "Şifre:" register now: Şimdi kayıt ol remember: "Beni hatırla:" title: Giriş to make changes: OpenStreetMap verileri değiştirmek için bir hesabın olması gerekir. + with openid: "Alternatif olarak OpenID ile giriş yapın:" + with username: "OpenStreetMap hesabınız var mı? Lütfen kullanıcı adı ve şifrenizle giriş yapınız:" logout: heading: OpenStreetMap'den çıkış logout_button: Çıkış @@ -1402,11 +1474,14 @@ tr: creator_name: Oluşturan display_name: Engellenmiş kullanıcı edit: Düzenle + next: Sonraki » not_revoked: (iptal edilmemiş) + previous: « Önceki reason: Engelleme sebebi revoke: Ä°ptal! revoker_name: Ä°ptal eden show: Göster + showing_page: Sayfa %{page} görüntüleniyor status: Durum period: one: 1 saat diff --git a/config/locales/uk.yml b/config/locales/uk.yml index b93dc1ef1..666200fe4 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1,4 +1,4 @@ -# Messages for Ukrainian (Українська) +# Messages for Ukrainian (українська) # Exported from translatewiki.net # Export driver: syck-pecl # Author: AS @@ -6,7 +6,10 @@ # Author: Arturyatsko # Author: Dim Grits # Author: KEL +# Author: Nemo bis +# Author: Olvin # Author: Prima klasy4na +# Author: Riwnodennyk # Author: Yurkoy # Author: Тест uk: @@ -81,6 +84,8 @@ uk: application: require_cookies: cookies_needed: Схоже, що у вас вимкнені куки. Будь ласка, увімкніть куки у вашому оглядачі, перш ніж продовжити. + require_moderator: + not_a_moderator: Ви повинні бути модератором для виконання цієї дії. setup_user_auth: blocked: Ваш доступ до API заблоковано. Будь ласка, увійдіть через веб-інтерфейс, щоб дізнатися подробиці. need_to_see_terms: Ваш доступ до API тимчасово призупинено. Будь ласка, увійдіть в систему, через веб-інтерфейс для перегляду Умов Участі. Вам не обов’язково погоджуватись, але ви повинні переглянути їх. @@ -88,7 +93,6 @@ uk: changeset: changeset: "Набір змін: %{id}" changesetxml: XML набір змін - download: Завантажити %{changeset_xml_link} або %{osmchange_xml_link} feed: title: Набір змін %{id} title_comment: Набір змін %{id} — %{comment} @@ -130,8 +134,8 @@ uk: edit: area: Редагувати область node: Редагувати точку - relation: Редагувати відношення - way: Редагувати шлях + relation: Редагувати зв’язок + way: Редагувати лінію larger: area: Перегляд ділянки на більшій мапі node: Перегляд точки на більшій мапі @@ -153,21 +157,19 @@ uk: next_changeset_tooltip: Наступні зміни %{user} prev_changeset_tooltip: Попередні зміни %{user} node: - download: "%{download_xml_link}, %{view_history_link} або %{edit_link}" download_xml: Завантажити XML - edit: правити + edit: Редагувати точку node: Точка node_title: "Точка: %{node_name}" - view_history: перегляд історії + view_history: Перегляд історії node_details: coordinates: "Координати:" part_of: "Бере участь у:" node_history: - download: "%{download_xml_link} або %{view_details_link}" download_xml: Завантажити XML node_history: Історія Точки node_history_title: "Історія Точки: %{node_name}" - view_details: переглянути подробиці + view_details: Докладніше not_found: sorry: На жаль, %{type} з ідентифікатором %{id} не знайдено. type: @@ -178,21 +180,26 @@ uk: paging_nav: of: з showing_page: Показано сторінку + redacted: + message_html: Версія %{version} типу %{type} не може бути показана так як вона була змінена. Будь ласка, перегляньте %{redaction_link} для отримання деталей. + redaction: Редакція %{id} + type: + node: точка + relation: зв’язок + way: лінія relation: - download: "%{download_xml_link} або %{view_history_link}" download_xml: Завантажити XML relation: Зв’язок relation_title: "Зв’язок: %{relation_name}" - view_history: перегляд історії + view_history: Перегляд історії relation_details: members: "Учасники:" part_of: "Бере участь у:" relation_history: - download: "%{download_xml_link} або %{view_details_link}" download_xml: Завантажити XML relation_history: Історія Зв’язку relation_history_title: "Історія Зв’язку: %{relation_name}" - view_details: переглянути подробиці + view_details: Докладніше relation_member: entry_role: "%{type} %{name} як %{role}" type: @@ -204,14 +211,14 @@ uk: view_data: Переглянути дані з поточного виду start_rjs: data_frame_title: Дані - data_layer_name: Дані + data_layer_name: Переглянути дані мапи details: Подробиці drag_a_box: Для виділення ділянки пересуньте рамку на мапі edited_by_user_at_timestamp: Змінив [[user]] в [[timestamp]] hide_areas: Приховати ділянки history_for_feature: Історія [[feature]] load_data: Завантажити Дані - loaded_an_area_with_num_features: "Ви завантажили ділянку, яка містить [[num_features]] об’єктів. Загалом, деякі оглядачі можуть не впоратися з показом цієї кількості даних. Як правило, оглядачі працюють краще показуючи менше 100 об’єктів одночасно: якщо ви робите ще будь-що інше — це може спричинити сповільнення/відсутність відклику у вашому оглядачі. Якщо ви впевнені, що хочете побачити ці дані, це можна зробити, натиснувши на кнопку нижче." + loaded_an_area_with_num_features: "Ви завантажили ділянку, яка містить [[num_features]] об’єктів. Загалом, деякі оглядачі можуть не впоратися з показом цієї кількості даних. Як правило, оглядачі працюють краще показуючи менше [[max_features]] об’єктів одночасно: якщо ви робите ще щось інше — це може спричинити сповільнення/відсутність відклику у вашому оглядачі. Якщо ви впевнені, що хочете побачити ці дані, це можна зробити, натиснувши на кнопку нижче." loading: Завантаження… manually_select: Виберіть іншу дялінку object_list: @@ -250,10 +257,9 @@ uk: relation: зв’язок way: лінія way: - download: "%{download_xml_link}, %{view_history_link} або %{edit_link}" download_xml: Завантажити XML - edit: редагувати - view_history: переглянути історію + edit: Редагувати лінію + view_history: Перегляд історії way: Лінія way_title: "Лінія: %{way_name}" way_details: @@ -263,9 +269,8 @@ uk: nodes: "Точки:" part_of: "Частина з:" way_history: - download: "%{download_xml_link} або %{view_details_link}" download_xml: Завантажити XML - view_details: переглянути подробиці + view_details: Докладніше way_history: Історія змін лінії way_history_title: "Історія змін лінії: %{way_name}" changeset: @@ -294,6 +299,8 @@ uk: description_nearby: Набори змін близьких користувачів description_user: Набір змін користувача %{user} description_user_bbox: Набір змін користувача %{user} в межах %{bbox} + empty_anon_html: Правки досі відсутні + empty_user_html: Схоже, що ви ще не зробили жодної правки. Перед тим, як розпочати, ознайомтесь з <a href='http://wiki.openstreetmap.org/wiki/Uk:Beginners_Guide_1.3'>Керівництвом для початківців</a> heading: Набір змін heading_bbox: Набір змін heading_friend: Набори змін @@ -309,6 +316,14 @@ uk: timeout: sorry: На жаль, список наборів змін який ви запросили, потребує багато часу для завантаження. diary_entry: + comments: + ago: "%{ago} тому" + comment: Коментарі + has_commented_on: "%{display_name} прокоментував наступні записи щоденника" + newer_comments: Нові коментарі + older_comments: Більш старі коментарі + post: Повідомлення + when: Коли diary_comment: comment_from: Коментар від %{link_user}, %{comment_created_at} confirm: Підтвердити @@ -367,10 +382,6 @@ uk: body: На жаль, запис чи коментар з id %{id} не знайдені. Перевірте правильність введення адреси. Можливо, посилання, по якому ви перейшли, хибне. heading: Немає запису з id %{id} title: Немає такого запису в щоденнику - no_such_user: - body: На жаль, користувача з ім'ям %{user} не знайдено. Перевірте правильність введення. Можливо посилання, по якому ви перейшли, хибне. - heading: Користувача %{user} не існує - title: Немає такого користувача view: leave_a_comment: Лишити коментар login: Ввійдіть @@ -403,6 +414,7 @@ uk: licence: Ліцензія longitude: "Дов.:" manually_select: Виділіть іншу ділянку + map_image: Зображення мапи (показує стандартний шар) max: макс. options: Опції osm_xml_data: Дані OpenStreetMap XML @@ -463,16 +475,28 @@ uk: suffix_place: ", %{distance} %{direction} від %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Аеродром + apron: Перон + gate: Вихід на посадку + helipad: Вертолітний майданчик + runway: Злітно-посадкова смуга + taxiway: Руліжна доріжка + terminal: Термінал amenity: + WLAN: WiFi доступ airport: Аеропорт arts_centre: Мистецький центр + artwork: Образотворче мистецтво atm: Банкомат auditorium: Конференц-зала bank: Банк bar: Бар + bbq: Барбекю bench: Лавка bicycle_parking: Місце стоянки для велосипедів bicycle_rental: Прокат велосипедів + biergarten: Пивний сад brothel: Бордель bureau_de_change: Обмін валют bus_station: Автовокзал @@ -481,6 +505,7 @@ uk: car_sharing: Прокат авто car_wash: Автомийка casino: Казино + charging_station: Станція для зарядки електромобілів cinema: Кинотеатр clinic: Клініка club: Клуб @@ -499,6 +524,7 @@ uk: ferry_terminal: Поромна станція fire_hydrant: Пожежний гідрант fire_station: Пожежна станція + food_court: Фуд-корт fountain: Фонтан fuel: Пальне grave_yard: Цвинтар @@ -539,9 +565,12 @@ uk: shelter: Укриття shop: Магазин shopping: Торговельний центр + shower: Душ + social_centre: Суспільний центр social_club: Клуб за інтересами studio: Студія supermarket: Супермаркет + swimming_pool: Басейн taxi: Таксі telephone: Телефон theatre: Театр @@ -552,41 +581,21 @@ uk: veterinary: Ветлікарня village_hall: Сільрада waste_basket: Контейнер для сміття - wifi: WiFi-зона + wifi: Wi-Fi доступ youth_centre: Молодіжний центр boundary: administrative: Адміністративний кордон + census: Межа переписної ділянки + national_park: Національний парк + protected_area: Охоронювана ділянка + bridge: + aqueduct: Акведук + suspension: Підвісний міст + swing: Поворотний міст + viaduct: Віадук + "yes": Міст building: - apartments: Житловий масив - block: Квартал - bunker: Бункер - chapel: Каплиця - church: Храм - city_hall: Мерія - commercial: Комерційна нерухомість - dormitory: Гуртожиток - entrance: Вхід у будівлю - faculty: Факультет - farm: Ферма - flats: Оселі - garage: Гараж - hall: Зала - hospital: Лікарня - hotel: Готель - house: Будинок - industrial: Промислова споруда - office: Офісний будинок - public: Суспільна будівля - residential: Житловий будинок - retail: Центр роздрібної торгівлі - school: Школа - shop: Магазин - stadium: Стадіон - store: Склад - terrace: Тераса - tower: Башта - train_station: Залізнична станція - university: Університет + "yes": Будівля highway: bridleway: Дорога для їзди верхи bus_guideway: Рейковий автобус @@ -594,12 +603,11 @@ uk: byway: Боковий шлях construction: Будівництво автомагітсралі cycleway: Велосипедна доріжка - distance_marker: Верстовий камінь emergency_access_point: Пункт швидкої допомоги footway: Пішохідна доріжка ford: Броди - gate: Ворота living_street: Житлова зона + milestone: Віха minor: Другорядна дорога motorway: Автомагістраль motorway_junction: В’їзд на автомагістраль @@ -611,14 +619,17 @@ uk: primary_link: З’єднання з головною дорогою raceway: Гоночна траса residential: Жила вулиця + rest_area: Зона відпочинку road: Дорога secondary: Другорядна дорога secondary_link: З’єднання з другорядною дорогою service: Службова дорога services: Придорожній сервіс + speed_camera: Камера контролю швидкості steps: Стежка stile: Турнікет tertiary: Третьорядна дорога + tertiary_link: Третинна дорога track: Неасфальтований шлях. trail: Стежка trunk: Шосе @@ -632,6 +643,7 @@ uk: building: Будівля castle: За́мок church: Храм + fort: Форт house: Дім icon: Ікона manor: Маєток @@ -656,6 +668,7 @@ uk: farmland: Рілля farmyard: Фермерське подвір'я forest: Ліс + garages: Гаражі grass: Трава greenfield: Знесення під забудову industrial: Промзона @@ -663,25 +676,28 @@ uk: meadow: Луг military: Військова зона mine: Копальня - mountain: Гори nature_reserve: Заповідник + orchard: Сад park: Парк piste: Лижня - plaza: Ринкова площа quarry: Кар’єр railway: Залізниця recreation_ground: База відпочинку reservoir: Водосховище + reservoir_watershed: Вододіл водосховища residential: Житловий квартал retail: Роздрібна торгівля + road: Зона дорожньої мережі village_green: Сільська галявина vineyard: Виноградник wetland: Болота wood: Гай leisure: beach_resort: Пляжний курорт + bird_hide: Засідка (пункт спостереження за птахами) common: Громадська земля fishing: Район риболовлі + fitness_station: Фітнес станція garden: Сад golf_course: Поле для гольфу ice_rink: Ковзанка @@ -692,12 +708,17 @@ uk: pitch: Спортмайданчик playground: Дитячий майданчик recreation_ground: База відпочинку + sauna: Сауна slipway: Сліп (спуск на воду) sports_centre: Спортивний центр stadium: Стадіон swimming_pool: Басейн track: Бігова доріжка water_park: Аквапарку + military: + airfield: Військовий аеродром + barracks: Казарма + bunker: Бункер natural: bay: Затока beach: Пляж @@ -705,11 +726,12 @@ uk: cave_entrance: Входу в печеру channel: Канал cliff: Скеля - coastline: Узбережжя crater: Кратер + dune: Дюна feature: Елемент fell: Вирубка fjord: Фіорд + forest: Ліс geyser: Гейзер glacier: Льодовик heath: Степ @@ -729,6 +751,7 @@ uk: scrub: Чагарник shoal: Мілина spring: Джерело + stone: Камінь strait: Перешийок tree: Дерево valley: Долина @@ -737,6 +760,19 @@ uk: wetland: Болото wetlands: Водно-болотні угіддя wood: Гай + office: + accountant: Бухгалтер + architect: Архітектор + company: Компанія + employment_agency: Агентство зайнятості + estate_agent: Агент з нерухомості + government: Державна установа + insurance: Страхова компанія + lawyer: Юрист + ngo: Недержавна установа + telecommunication: Офіс телекомунікаційної компанії + travel_agent: Туристична агенція + "yes": Офіси place: airport: Аеропорт city: Місто @@ -748,6 +784,7 @@ uk: houses: Дома island: Острів islet: Острівець + isolated_dwelling: Ізольоване житло locality: Населений пункт moor: Мур municipality: Муніципалітет @@ -771,6 +808,7 @@ uk: junction: Переїзд level_crossing: Залізничний переїзд light_rail: Швидкісний трамвай + miniature: Мінізалізнця monorail: Монорейка narrow_gauge: Вузькоколійка platform: Залізнична платформа @@ -785,7 +823,7 @@ uk: yard: Депо shop: alcohol: Спритні напої - apparel: Одяг + antiques: Антикваріат art: Художній салон bakery: Хліб beauty: Салон краси @@ -794,7 +832,6 @@ uk: books: Книгарня butcher: М’ясо car: Автомагазин - car_dealer: Автосалон car_parts: Автозапчастини car_repair: Авто майстерня carpet: Килими @@ -809,7 +846,6 @@ uk: department_store: Універмаг discount: Уцінені товари doityourself: Зроби сам - drugstore: Аптека dry_cleaning: Хімчистка electronics: Магазин електроніки estate_agent: Агентство нерухомості @@ -875,7 +911,10 @@ uk: valley: Долина viewpoint: Оглядовий майданчик zoo: Зоопарк + tunnel: + "yes": Тунель waterway: + artificial: Штучні водний шлях boatyard: Верф canal: Канал connector: З’єднання водних шляхів @@ -901,6 +940,7 @@ uk: base: cycle_map: Мапа для велосипедистів mapquest: MapQuest Open + standard: Стандартний transport_map: Мапа Транспорту site: edit_disabled_tooltip: Збільшить масштаб для редагування мапи @@ -910,6 +950,7 @@ uk: history_tooltip: Перегляд правок для цієї ділянки history_zoom_alert: Потрібно збільшити масштаб мапи, щоб побачити історію правок layouts: + community: Спільнота community_blogs: Блоги спільноти community_blogs_title: Блоги членів спільноти OpenStreetMap copyright: Авторські права & Ліцензія @@ -931,19 +972,18 @@ uk: history: Історія home: додому home_tooltip: Показати моє місце знаходження - inbox: вхідні (%{count}) + inbox_html: вхідні (%{count}) inbox_tooltip: few: У вас %{count} непрочитаних повідомлення one: У вас %{count} непрочитане повідомлення other: У вас %{count} непрочитаних повідомлень zero: У вас немає непрочитаних повідомлень intro_1: OpenStreetMap — це мапа Світу, яку можна вільно редагувати. Вона зроблена такими ж людьми, як і ви. - intro_2: OpenStreetMap дозволяє спільно переглядати, змінювати і використовувати географічні дані в будь-якій точці Землі. - intro_3: Послуги хостингу для OpenStreetMap привітно надають %{ucl}, %{ic} та %{bytemark}. Список інших партнерів, що надають підтримку проекту розміщено в %{partners}. - intro_3_bytemark: Bytemark Hosting - intro_3_ic: Імперський коледж Лондона - intro_3_partners: вікі - intro_3_ucl: UCL VR Centre + intro_2_create_account: Створіть обліковий запис + intro_2_download: завантажити + intro_2_html: Дані можна вільно %{download} та %{use} під %{license}. %{create_account}, щоб мати змогу покращити мапу. + intro_2_license: відкритою ліцензією + intro_2_use: використовувати license: title: Дані OpenStreetMap ліцензовано за Загальною Ліцензією Creative Commons Attribution-Share Alike 2.0 log_in: увійти @@ -957,9 +997,14 @@ uk: title: Підтримайте OpenStreetMap грошима osm_offline: База даних OpenStreetMap в даний момент не доступна, так як проводиться необхідне технічне обслуговування. osm_read_only: База даних OpenStreetMap в даний момент доступна тільки для читання, тому що проводиться необхідне технічне обслуговування. + partners_bytemark: Bytemark Hosting + partners_html: Хостинг підтримується %{ucl}, %{ic} та %{bytemark}, та іншими %{partners}. + partners_ic: Імперський коледж Лондона + partners_partners: партнерами + partners_ucl: UCL VR Centre sign_up: реєстрація sign_up_tooltip: Створити обліковий запис для редагування - sotm2011: Відвідайте конференцію OpenStreetMap 2011, «The State of the Map», яка відбудеться у Денвері 9-11 вересня! + sotm2012: Відвідайте конференцію OpenStreetMap 2012, «The State of the Map», яка відбудеться у Токіо 6-8 вересня! tag_line: Вільна Вікі-мапа Світу user_diaries: Щоденники user_diaries_tooltip: Подивитись щоденники @@ -975,7 +1020,30 @@ uk: english_link: оригіналом англійською text: У разі суперечностей між цим перекладом та %{english_original_link}, оригінал англійською має перевагу. title: Про цей переклад - legal_babble: "<h2>Авторські права та Ліцензування</h2>\n<p>\n Дані OpenStreetMap є <i>відкрити даними</i>, що ліцензуються на\n умовах Ліцензії <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n Ви можете вільно копіювати, поширювати, передавати і адаптувати наші\n мапи і дані, до тих пір, поки ви посилаєтесь на OpenStreetMap та його\n спільноту. Якщо ви змінюєте або щось створюєте на основі нашої мапи\n чи даних, ви повинні розповсюджувати результати під такою ж Ліцензією.\n Повний, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">чинний текст</a> Ліцензії роз’яснює ваші права та обов’язки.\n</p>\n\n<h3>Як вказувати посилання на OpenStreetMap</h3>\n<p>\n Якщо ви використовуєте зображення мапи OpenStreetMap, ми вимагаємо, щоб ви зазначали, принаймні, “© OpenStreetMap\n contributors, CC-BY-SA”. Якщо ви використовуєте тільки картографічні дані, ми вимагаємо наявності “Map data © OpenStreetMap contributors, CC-BY-SA”.\n</p>\n<p>\n Будь-де, де це можливо, повинне бути гіпертекстове посилання на OpenStreetMap <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n та на CC-BY-SA <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Якщо ви використовуєте\n носії де використання гіпертекстових посилань не можливе (наприклад:\n друковані твори), ми пропонуємо вам направляти ваших читачів\n безпосередньо до www.openstreetmap.org (можливо, шляхом розширення\n ‘OpenStreetMap’ до повної адреси) та до\n www.creativecommons.org.\n</p>\n\n<h3>Дізнатися більше</h3>\n<p>\n Дізнайтеся більше про використання наших даних у <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">відповідях з правових питань</a>.\n</p>\n<p>\n Учасники спільноти OSM повинні завжди пам’ятати про те, що\n забороняється додавати дані з будь-яких захищених авторським правом\n джерел (наприклад: Google Maps чи друковані мапи) без отримання\n попередньої згоди правовласників.\n</p>\n<p>\n Хоча OpenStreetMap містить вільні дані, ми не в змозі надавати\n безкоштовний API до наших мап стороннім розробникам.\n\n Дивіться <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Правила використання API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Правила використання частин мапи</a>\n та <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Правила використання сервісу Nominatim</a>.\n</p>\n\n<h3>З нами співпрацюють</h3>\n<p>\n Наша Ліцензія CC-BY-SA вимагає від вас “вказувати на Автора\n оригіналу певним чином, відповідно до носія даних, чи умов\n використання”. Окремі члени спільноти OSM не вимагатимуть\n вказувати більше ніж “OpenStreetMap contributors”, але\n якщо дані в OpenStreetMap отримані від національних картографічних\n агенцій чи інших важливих джерел, можливо має сенс вказати\n безпосередньо на них, зазначивши їх внесок або додавши посилання на\n цій сторінці.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Австралія</strong>: дані передмість від Австралійського Бюро Статистики.</li>\n <li><strong>Австрія</strong>: дані від\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> на умовах ліцензії\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Канада</strong>: дані від GeoBase®, GeoGratis (© Департамент природних ресурсів Канади), CanVec (© Департамент природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство Канади).</li>\n <li><strong>Нова Зеландія</strong>: дані отримані з інформації про земельні ресурси Нової Зеландії. Crown Copyright reserved.</li>\n <li><strong>Польща</strong>: містить дані з <a\n href=\"http://ump.waw.pl/\">мап UMP-pcPL</a>. Copyright\n UMP-pcPL contributors.</li>\n <li><strong>Сполучене Королівство Великобританії</strong>: дані Ordnance\n Survey © Crown copyright and database right\n 2010.</li>\n <li><strong>Франція</strong>: Дані отримані від Direction Générale des Impôts (Генеральне управління з оподаткування).</li>\n</ul>\n\n<p>\n Включення даних до OpenStreetMap не означає, що постачальник\n первинних даних якимось чином підтримує OpenStreetMap, чи надає\n підтримку або будь-які гарантії, або приймає на себе будь-яку\n відповідальність.\n</p>" + legal_babble: + contributors_at_html: "<strong>Австрія</strong>: дані від\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (на умовах ліцензії\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> та Земля Тіроль (на умовах <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT з виправленнями</a>)." + contributors_au_html: "<strong>Австралія</strong>: дані передмість від Австралійського Бюро Статистики." + contributors_ca_html: "<strong>Канада</strong>: дані від GeoBase®, GeoGratis (© Департамент природних ресурсів Канади), CanVec (© Департамент природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство Канади)." + contributors_footer_1_html: Щоб отримати більш докладну інформацію про ці та інші джерела, що були використані для покращення мапи OpenStreetMap, будь ласка, перегляньте сторінку <a href="http://wiki.openstreetmap.org/wiki/Contributors">Учасники</a> у OpenStreetMap Вікі. + contributors_footer_2_html: " Включення даних до OpenStreetMap не означає, що постачальник\n цих даних якимось чином підтримує OpenStreetMap, надає\n які-небудь гарантії чи бере на себе якусь відповідальність." + contributors_fr_html: "<strong>Франція</strong>: Дані отримані від Direction Générale des Impôts (Генеральне управління з оподаткування)." + contributors_gb_html: "<strong>Сполучене Королівство Великобританії</strong>: дані Ordnance\n Survey © Crown copyright and database right\n 2010." + contributors_intro_html: " Наша Ліцензія CC BY-SA вимагає від Вас “ певним чином зазначати Автора\n оригіналу відповідно до носія даних чи умов\n використання”. Окремі члени спільноти OSM не вимагають\n зазначати більше, ніж “OpenStreetMap contributors”, але\n якщо дані для OpenStreetMap було отримано від національних картографічних\n агенцій чи з інших великих джерел, можливо, має сенс вказати\n безпосередньо на них, зазначивши їх внесок або додавши посилання на них\n на цій сторінці." + contributors_nl_html: "<strong>Нідерланди</strong>: Дані від © AND, 2007 \n (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>Нова Зеландія</strong>: дані отримані з інформації про земельні ресурси Нової Зеландії. Crown Copyright reserved." + contributors_pl_html: " <strong>Польща</strong>: містить дані з <a\n href=\"http://ump.waw.pl/\">мап UMP-pcPL</a>. Copyright\n учасники UMP-pcPL.\n <a href=\"http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing\">\n Більше про використання даних UMP в OSM</a>" + contributors_title_html: З нами співпрацюють + contributors_za_html: "<strong>Південна Африка</strong>: Містить дані з \n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, State copyright reserved." + credit_1_html: " Якщо ви використовуєте зображення мапи OpenStreetMap, ми вимагаємо, щоб ви зазначали, принаймні, “© OpenStreetMap\n contributors, CC BY-SA”. Якщо ви використовуєте тільки картографічні дані, ми вимагаємо наявності “Map data © OpenStreetMap contributors, CC BY-SA”." + credit_2_html: " Будь-де, де це можливо, повинне бути гіпертекстове посилання на OpenStreetMap <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n та на CC BY-SA <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Якщо ви користуєтесь\n носіями, де використання гіпертекстових посилань неможливе (наприклад:\n друковані твори), ми пропонуємо вам спрямувати ваших читачів\n безпосередньо до www.openstreetmap.org (можливо, шляхом розширення\n ‘OpenStreetMap’ до повної адреси) та до\n www.creativecommons.org." + credit_title_html: Як вказувати посилання на OpenStreetMap + intro_1_html: " Дані OpenStreetMap є <i>відкрити даними</i>, що ліцензуються на\n умовах Ліцензії <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA)." + intro_2_html: " Ви можете вільно копіювати, поширювати, передавати й адаптувати наші\n мапи й дані доти, доки ви посилаєтесь на OpenStreetMap та його\n спільноту. Якщо ви переробляєте наші мапи або дані чи будуєте на їх основі свої, \n ви повинні розповсюджувати результати під такою ж Ліцензією.\n Повний <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">чинний текст</a> Ліцензії пояснює ваші права та обов’язки." + more_1_html: " Дізнайтеся більше про використання наших даних у <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">відповідях з правових питань</a>." + more_2_html: " Члени спільноти OSM повинні завжди пам’ятати про те, що\n забороняється додавати дані з будь-яких захищених авторським правом\n джерел (наприклад, з Google Maps чи з друкованих мап) без отримання\n попереднього дозволу правовласників." + more_3_html: " Хоча OpenStreetMap містить вільні дані, ми не в змозі надавати\n безкоштовний API до наших мап стороннім розробникам.\n\n Дивіться <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Правила використання API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Правила використання частин мапи</a>\n та <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Правила використання сервісу Nominatim</a>." + more_title_html: Дізнатися більше + title_html: Авторські права та Ліцензування native: mapping_link: почати створення мапи native_link: української версії @@ -1021,10 +1089,6 @@ uk: body: Вибачте, але повідомлення з цим ідентифікатором не існує. heading: Повідомлення відсутнє title: Повідомлення відсутнє - no_such_user: - body: На жаль, немає користувача з таким ім'ям. - heading: Немає такого користувача - title: Немає такого користувача outbox: date: Дата inbox: вхідні @@ -1198,6 +1262,8 @@ uk: allow_write_gpx: передавати GPS-треки на сервер. allow_write_prefs: змінювати налаштування користувача. authorize_url: "URL автентифікації:" + confirm: Ви впевнені? + delete: Вилучити клієнта edit: Змінити подробиці key: "Позначки абонента:" requests: "Запит наступних дозволів з боку користувача:" @@ -1207,6 +1273,37 @@ uk: url: "URL маркеру запита:" update: flash: Інформацію клієнта успішно оновлено + redaction: + create: + flash: Редакція створена. + destroy: + error: Помилка під час знищення цієї редакції. + flash: Редакцію знищено. + not_empty: Редакція не порожня. Будь ласка, відмініть всі версії що належать до цієї редакції перед тим як її знищити. + edit: + description: Опис + heading: Правити редакцію + submit: Зберегти редакцію + title: Правити редакцію + index: + empty: Редакції для показу відсутні. + heading: Перелік редакцій + title: Перелік редакцій + new: + description: Опис + heading: Введіть інформацію для нової редакції + submit: Створити редакцію + title: Створення нової редакції + show: + confirm: Ви впевнені? + description: "Опис:" + destroy: Вилучення цієї редакції + edit: Редагування цієї редакції + heading: Показ редакції "%{title}" + title: Показана редакція + user: "Автор:" + update: + flash: Зміни збережено. site: edit: anon_edits_link_text: З’ясувати в чому справа. @@ -1221,7 +1318,6 @@ uk: index: js_1: Ви користуєтесь оглядачем, в якому не підтримується або відключений JavaScript. js_2: OpenStreetMap використовує JavaScript для мапи. - js_3: Ви можете спробувати <a href "http://tah.openstreetmap.org/Browse/">статичну мапу від Tiles@Home</a>, якщо ви не в змозі включити JavaScript. license: license_name: Creative Commons Attribution-Share Alike 2.0 notice: Ліцензовано на умовах %{license_name} проектом %{project_name} та його користувачами. @@ -1255,7 +1351,7 @@ uk: - луг construction: Будівництво дороги cycleway: Вело-доріжка - destination: Мета доступу + destination: Цільовий доступ farm: Ферма footway: Пішохідна доріжка forest: Ліс @@ -1298,11 +1394,28 @@ uk: unclassified: Дорога без класифікації unsurfaced: Дорога без покриття wood: Гай + markdown_help: + alt: Alt текст + first: Перший елемент + heading: Заголовок + headings: Заголовки + image: Зображення + link: Посилання + ordered: Впорядкований список + second: Другий елемент + subheading: Підзаголовок + text: Текст + title_html: Оброблено <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Невпорядкований список + url: URL + richtext_area: + edit: Правити + preview: Попередній перегляд search: search: Пошук search_help: "наприклад: 'Кобеляки', 'Regent Street, Cambridge', 'CB2 5AQ', чи 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>ще приклади…</a>" submit_text: ↵ - where_am_i: Де я? + where_am_i: Що на мапі? where_am_i_title: Опишіть ваше місце знаходження, скориставшись інструментом пошуку sidebar: close: Закрити @@ -1334,16 +1447,13 @@ uk: visibility: "Видимість:" visibility_help: ще це означає? list: + empty_html: Досі нічого не має. <a href='%{upload_link}'>Завантажте нові треки</a> або дізнайтесь більше про створення GPS-треків на <a href='http://wiki.openstreetmap.org/wiki/Uk:Beginners_Guide_1.2'>сторінці вікі</a>. public_traces: Загальнодоступні GPS-треки public_traces_from: Загальнодоступні GPS треки користувача %{user} tagged_with: " позначені %{tags}" your_traces: Ваші GPS-треки make_public: made_public: Трек зроблено загальнодоступним - no_such_user: - body: На жаль, користувача з іменем %{user} не існує. Будь ласка, перевірте правильність написання. Можливо посилання, за яким ви перейшли, помилкове. - heading: Користувача %{user} не існує - title: Немає такого користувача offline: heading: Сховище GPX відключено message: Доступ до сховища GPX-файлів та системи завантаження на поточний момент відсутній. @@ -1383,8 +1493,8 @@ uk: trace_optionals: tags: "Теґи:" trace_paging_nav: - next: Наступна → - previous: ← Попередня + newer: Новіші треки + older: Старіші треки showing_page: Сторінка %{page} view: delete_track: Вилучити цей трек @@ -1502,6 +1612,7 @@ uk: login_button: Увійти lost password link: Забули пароль? new to osm: Вперше на OpenStreetMap? + no account: Не маєте облікового запису? notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Дізнайтеся більше про майбутні зміни ліцензії OpenStreetMap</a> ( <a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">переклади</a> ) ( <a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">обговорення</a> ) notice_terms: OpenStreetMap переходить на нову ліцензію з 1 квітня 2012 року. Вона така ж відкрита як діюча, але юридично набагато краще підходить для нашої картографічної бази даних. Ми хотіли б зберегти ваш внесок у OpenStreetMap, але це буде можливо тільки якщо ви згодні поширювати ваші правки на умовах нової ліцензії. В іншому разі, нам доведеться видалити їх з бази даних. <br /> <br /> Будь ласка, ввійдіть в систему і потратьте декілька секунд на ознайомлення і прийняття нових умов. Спасибі! openid: "%{logo} OpenID:" @@ -1620,6 +1731,7 @@ uk: block_history: отримані блокування blocks by me: заблоковано мною blocks on me: мої блокування + comments: коментарі confirm: Підтвердити confirm_user: підтвердити користувача create_block: блокувати користувача @@ -1643,6 +1755,7 @@ uk: m away: "%{count} м від вас" mapper since: "Зареєстрований:" moderator_history: створені блокування + my comments: мої коментарі my diary: мій щоденник my edits: мої правки my settings: мої налаштування @@ -1697,7 +1810,6 @@ uk: filter: block_expired: Блокування вже закінчилось і не може бути змінено. block_period: Період блокування повинен бути одним із значень з списку, що розкривається. - not_a_moderator: Ви повинні бути модератором для виконання цієї дії. helper: time_future: Закінчується в %{time}. time_past: Закінчилось %{time} тому. @@ -1727,11 +1839,14 @@ uk: creator_name: Автор display_name: Заблокований користувач edit: Правити + next: Наступна → not_revoked: (не розблокований) + previous: ← Попередня reason: Причина блокування revoke: Розблокувати! revoker_name: Розблокував show: Показати + showing_page: Сторінка %{page} status: Стан period: few: "%{count} години" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 25f2608e3..08410d01e 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Minh Nguyen +# Author: Nemo bis # Author: Ninomax # Author: Trần Nguyễn Minh Huy vi: @@ -76,6 +77,8 @@ vi: application: require_cookies: cookies_needed: Hình nhÆ° đã tắt cookie. Xin hãy bật lên chức năng cookie trong trình duyệt để tiếp tục. + require_moderator: + not_a_moderator: Chỉ có các điều hành viên được phép thá»±c hiện tác vụ đó. setup_user_auth: blocked: Bạn bị chặn không được truy cập qua API. Vui lòng đăng nhập vào giao diện Web để biết chi tiết. need_to_see_terms: Bạn tạm không có quyền truy cập API. Xin vui lòng đăng nhập giao diện Web để đọc các Điều khoản Đóng góp. Bạn không cần phải chấp nhận các điều khoản nhÆ°ng ít nhất phải đọc chúng. @@ -83,7 +86,6 @@ vi: changeset: changeset: "Bộ thay đổi: %{id}" changesetxml: Bộ thay đổi XML - download: Tải về %{changeset_xml_link} hoặc %{osmchange_xml_link} feed: title: Bộ thay đổi %{id} title_comment: Bộ thay đổi %{id} – %{comment} @@ -145,21 +147,19 @@ vi: next_changeset_tooltip: Đóng góp sau của %{user} prev_changeset_tooltip: Đóng góp trước của %{user} node: - download: "%{download_xml_link}, %{view_history_link}, hoặc %{edit_link}" download_xml: Tải về XML - edit: sá»­a đổi + edit: Sá»­a đổi nốt node: Nốt node_title: "Nốt: %{node_name}" - view_history: xem lịch sá»­ + view_history: Xem lịch sá»­ node_details: coordinates: "Tọa độ:" part_of: "Trá»±c thuộc:" node_history: - download: "%{download_xml_link} hoặc %{view_details_link}" download_xml: Tải về XML node_history: Lịch sá»­ Nốt node_history_title: "Lịch sá»­ Nốt: %{node_name}" - view_details: xem chi tiết + view_details: Xem chi tiết not_found: sorry: Rất tiếc, không thể tìm thấy %{type} với ID %{id}. type: @@ -170,21 +170,26 @@ vi: paging_nav: of: trong showing_page: Đang hiện trang + redacted: + message_html: Không thể xem phiên bản %{version} của %{type} này vì nó đã bị ẩn. Xin vui lòng xem chi tiết tại %{redaction_link}. + redaction: Dãy ẩn %{id} + type: + node: nốt + relation: quan hệ + way: lối relation: - download: "%{download_xml_link} hoặc %{view_history_link}" download_xml: Tải về XML relation: Quan hệ relation_title: "Quan hệ: %{relation_name}" - view_history: xem lịch sá»­ + view_history: Xem lịch sá»­ relation_details: members: "Thành viên:" part_of: "Trá»±c thuộc:" relation_history: - download: "%{download_xml_link} hoặc %{view_details_link}" download_xml: Tải về XML relation_history: Lịch sá»­ Quan hệ relation_history_title: "Lịch sá»­ Quan hệ: %{relation_name}" - view_details: xem chi tiết + view_details: Xem chi tiết relation_member: entry_role: "%{type} %{name} với vai trò %{role}" type: @@ -196,14 +201,14 @@ vi: view_data: Xem dữ liệu của phần bản đồ đang xem start_rjs: data_frame_title: Dữ liệu - data_layer_name: Dữ liệu + data_layer_name: Xem Dữ liệu Bản đồ details: Chi tiết drag_a_box: Kéo hộp trên bản đồ để chọn vùng edited_by_user_at_timestamp: Được sá»­a đổi bởi [[user]] lúc [[timestamp]] hide_areas: Ẩn các khu vá»±c - history_for_feature: Lịch sá»­ [[feature]] + history_for_feature: Lịch sá»­ [[đối tượng]] load_data: Tải Dữ liệu - loaded_an_area_with_num_features: "Bạn đã tải vùng chứa [[num_features]] nét. Một số trình duyệt không hiển thị nổi nhiều dữ liệu nhÆ° thế. Nói chung, trình duyệt hoạt động tốt khi nào chỉ có 100 nét cùng lúc: hÆ¡n thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới." + loaded_an_area_with_num_features: Bạn đã tải vùng chứa [[num_features]] đối tượng. Một số trình duyệt bị trục trặc khi hiển thị nhiều dữ liệu nhÆ° thế. Nói chung, các trình duyệt hoạt động tốt với tối đa 100 đối tượng cùng lúc; nếu hÆ¡n thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới. loading: Đang tải… manually_select: Chọn vùng khác thủ công object_list: @@ -242,10 +247,9 @@ vi: relation: quan hệ way: lối way: - download: "%{download_xml_link}, %{view_history_link}, hoặc %{edit_link}" download_xml: Tải về XML - edit: sá»­a đổi - view_history: xem lịch sá»­ + edit: Sá»­a đổi lối + view_history: Xem lịch sá»­ way: Lối way_title: "Lối: %{way_name}" way_details: @@ -253,11 +257,10 @@ vi: one: cÅ©ng thuộc về lối %{related_ways} other: cÅ©ng thuộc về các lối %{related_ways} nodes: "Nốt:" - part_of: "Thuộc về:" + part_of: "Trá»±c thuộc:" way_history: - download: "%{download_xml_link} hoặc %{view_details_link}" download_xml: Tải về XML - view_details: xem chi tiết + view_details: Xem chi tiết way_history: Lịch sá»­ Lối way_history_title: "Lịch sá»­ Lối: %{way_name}" changeset: @@ -286,6 +289,8 @@ vi: description_nearby: Những bộ thay đổi của người dùng ở gần description_user: Những bộ thay đổi của %{user} description_user_bbox: Những bộ thay đổi của %{user} ở trong %{bbox} + empty_anon_html: ChÆ°a sá»­a đổi lần nào. + empty_user_html: Hình nhÆ° bạn chÆ°a đóng góp sá»­a đổi nào. Hãy bắt đầu với <a href="http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3?uselang=vi">Hướng dẫn Bắt đầu</a>. heading: Các bộ thay đổi heading_bbox: Các bộ thay đổi heading_friend: Các bộ thay đổi @@ -366,10 +371,6 @@ vi: body: Rất tiếc, không có mục hoặc bình luận trong nhật ký với ID %{id}. Xin hãy kiểm tra chính tả, hoặc có lẽ bạn đã theo một liên kết sai. heading: "Không có mục với ID: %{id}" title: Mục nhật ký không tồn tại - no_such_user: - body: Rất tiếc, không có người dùng với tên %{user}. Xin hãy kiểm tra chính tả, hoặc có lẽ bạn đã theo một liên kết sai. - heading: Người dùng %{user} không tồn tại - title: Người dùng không tồn tại view: leave_a_comment: Bình luận login: Đăng nhập @@ -463,16 +464,28 @@ vi: suffix_place: ", %{distance} về phía %{direction} của %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Sân bay + apron: Sân Đậu Máy bay + gate: Cổng + helipad: Sân bay Trá»±c thăng + runway: Đường băng + taxiway: Đường lăn + terminal: Nhà ga Sân bay amenity: - airport: Sân bay + WLAN: Điểm Truy cập Wi-Fi + airport: Phi trường arts_centre: Trung tâm Nghệ thuật + artwork: Tác phẩm Nghệ thuật atm: Máy Rút tiền Tá»± động auditorium: Phòng hội họp bank: Ngân hàng - bar: Quán Rượu + bar: Quán rượu + bbq: Bếp Nướng Ngoài trời bench: Ghế bicycle_parking: Chỗ Đậu Xe đạp bicycle_rental: Chỗ Mướn Xe đạp + biergarten: Quán rượu Ngoài trời brothel: Nhà chứa bureau_de_change: Tiệm Đổi tiền bus_station: Trạm Xe buýt @@ -481,6 +494,7 @@ vi: car_sharing: Chia sẻ Xe cộ car_wash: Tiệm Rá»­a Xe casino: Sòng bạc + charging_station: Trạm Sạc Pin cinema: Rạp phim clinic: Phòng khám club: Câu lạc bộ @@ -499,6 +513,7 @@ vi: ferry_terminal: Trạm Phà fire_hydrant: Vòi nước Máy fire_station: Trạm Cứu hỏa + food_court: Khu Ẩm thá»±c fountain: Vòi nước fuel: Cây xăng grave_yard: NghÄ©a địa @@ -539,9 +554,12 @@ vi: shelter: NÆ¡i Trú ẩn shop: Tiệm shopping: Tiệm + shower: Vòi tắm + social_centre: Hội trường social_club: Câu lạc bộ Xã hội studio: Studio supermarket: Siêu thị + swimming_pool: Hồ tắm taxi: Taxi telephone: Điện thoại Công cộng theatre: Nhà hát @@ -556,37 +574,17 @@ vi: youth_centre: Trung tâm Thanh niên boundary: administrative: Biên giới Hành chính + census: Biên giới Điều tra Dân số + national_park: Vườn quốc gia + protected_area: Khu bảo tồn + bridge: + aqueduct: Cống nước + suspension: Cầu Treo + swing: Cầu Quay + viaduct: Cầu Cạn + "yes": Cầu building: - apartments: Khối Căn hộ - block: Khối cao ốc - bunker: Boong ke - chapel: Nhà nguyện - church: Nhà thờ - city_hall: Trụ sở Thành phố - commercial: Tòa nhà ThÆ°Æ¡ng mại - dormitory: Ký túc xá - entrance: Cá»­a vào - faculty: Tòa nhà Trường học - farm: Công trình Nông trại - flats: Khu chung cÆ° - garage: Ga ra - hall: Hội trường - hospital: Tòa nhà Bệnh viện - hotel: Khách sạn - house: Nhà ở - industrial: Tòa nhà Công nghiệp - office: Tòa nhà Văn phòng - public: Tòa nhà Công cộng - residential: Nhà ở - retail: Tòa nhà Cá»­a hàng - school: Nhà trường - shop: Tiệm - stadium: Sân vận động - store: Tiệm - terrace: Thềm - tower: Tháp - train_station: Nhà ga - university: Tòa nhà Đại học + "yes": Tòa nhà highway: bridleway: Đường Cưỡi ngá»±a bus_guideway: Làn đường Dẫn Xe buýt @@ -594,12 +592,11 @@ vi: byway: Đường mòn Đa mốt construction: Đường Đang Xây cycleway: Đường Xe đạp - distance_marker: Cây số emergency_access_point: Địa điểm Truy nhập Khẩn cấp footway: Đường bộ ford: Khúc Sông Cạn - gate: Cổng living_street: Đường Hàng xóm + milestone: Mốc minor: Đường Nhỏ motorway: Đường Cao tốc motorway_junction: Ngã tÆ° Đường Cao tốc @@ -611,14 +608,17 @@ vi: primary_link: Đường Chính raceway: Đường đua residential: Đường Nhà ở + rest_area: Trạm Nghỉ Dọc đường road: Đường secondary: Đường Lớn secondary_link: Đường Lớn service: Đường phụ services: Dịch vụ Dọc đường Cao tốc + speed_camera: Máy chụp hình Tốc độ steps: Cầu thang stile: Cá»­a xoay tertiary: Đường Lớn + tertiary_link: Đường Lớn track: Đường mòn trail: Đường mòn trunk: Xa lộ @@ -632,6 +632,7 @@ vi: building: Tòa nhà castle: Lâu đài church: Nhà thờ + fort: Pháo đài house: Nhà ở icon: Thánh tượng manor: Trang viên @@ -656,6 +657,7 @@ vi: farmland: Trại farmyard: Sân Trại forest: Rừng Trồng Cây + garages: Ga ra grass: Cỏ greenfield: Cánh đồng Xanh industrial: Khu vá»±c Công nghiệp @@ -663,25 +665,28 @@ vi: meadow: Đồng cỏ military: Khu vá»±c Quân sá»± mine: Mỏ - mountain: Núi nature_reserve: Khu Bảo tồn Thiên niên + orchard: Vườn Cây park: Công viên piste: Đường Trượt tuyết - plaza: Quảng trường quarry: Mỏ Đá railway: Đường sắt recreation_ground: Sân chÆ¡i reservoir: Bể nước + reservoir_watershed: LÆ°u vá»±c Hồ Nhân tạo residential: Khu vá»±c Nhà ở retail: Khu vá»±c Buôn bán + road: Đất của con Đường village_green: Sân Làng vineyard: Vườn Nho wetland: Đầm lầy wood: Rừng leisure: beach_resort: Khu Nghỉ mát Ven biển + bird_hide: Căn nhà Quan sát Chim common: Đất Công fishing: Hồ Đánh cá + fitness_station: Trạm Thể dục garden: Vườn golf_course: Sân Golf ice_rink: Sân băng @@ -692,12 +697,17 @@ vi: pitch: Bãi Thể thao playground: Sân chÆ¡i recreation_ground: Sân Giải trí + sauna: Nhà Tắm hÆ¡i slipway: Bến tàu sports_centre: Trung tâm Thể thao stadium: Sân vận động swimming_pool: Hồ BÆ¡i track: Đường Chạy water_park: Công viên Nước + military: + airfield: Sân bay Không quân + barracks: Trại Lính + bunker: Boong ke natural: bay: Vịnh beach: Bãi biển @@ -705,11 +715,12 @@ vi: cave_entrance: Cá»­a vào Hang channel: Eo biển cliff: Vách đá - coastline: Bờ biển crater: Miệng Núi + dune: Cồn cát feature: Đối tượng Thiên nhiên fell: Đồi đá fjord: Vịnh hẹp + forest: Rừng geyser: Mạch nước Phun glacier: Sông băng heath: Bãi Hoang @@ -729,6 +740,7 @@ vi: scrub: Đất Bụi rậm shoal: Bãi cạn spring: Suối + stone: Đá strait: Eo biển tree: Cây valley: Thung lÅ©ng @@ -737,8 +749,21 @@ vi: wetland: Đầm lầy wetlands: Đầm lầy wood: Rừng + office: + accountant: Kế toán viên + architect: Kiến trúc sÆ° + company: Công ty + employment_agency: Trung tâm Tuyển dụng + estate_agent: Văn phòng Bất động sản + government: Văn phòng Chính phủ + insurance: Văn phòng Bảo hiểm + lawyer: Luật sÆ° + ngo: Văn phòng Tổ chức Phi chính phủ + telecommunication: Văn phòng Viễn thông + travel_agent: Văn phòng Du lịch + "yes": Văn phòng place: - airport: Sân bay + airport: Phi trường city: Thành phố country: Quốc gia county: Quận hạt @@ -748,6 +773,7 @@ vi: houses: Dãy Nhà island: Đảo islet: Đảo Nhỏ + isolated_dwelling: Chỗ ở Cô đơn locality: Địa phÆ°Æ¡ng moor: Truông municipality: Đô thị @@ -771,6 +797,7 @@ vi: junction: Ga Đầu mối level_crossing: Điểm giao Đường sắt light_rail: Đường sắt Nhẹ + miniature: Đường sắt Nhỏ monorail: Đường Một Ray narrow_gauge: Đường sắt Khổ hẹp platform: Ke ga @@ -785,7 +812,7 @@ vi: yard: Sân ga shop: alcohol: Tiệm Rượu - apparel: Tiệm May mặc + antiques: Tiệm Đồ cổ art: Tiệm Nghệ phẩm bakery: Tiệm Bánh beauty: Tiệm Mỹ phẩm @@ -794,7 +821,6 @@ vi: books: Tiệm Sách butcher: Tiệm Thịt car: Tiệm Xe hÆ¡i - car_dealer: Cá»­a hàng Xe hÆ¡i car_parts: Phụ tùng Xe hÆ¡i car_repair: Tiệm Sá»­a Xe carpet: Tiệm Thảm @@ -809,7 +835,6 @@ vi: department_store: Cá»­a hàng Bách hóa discount: Cá»­a hàng Giảm giá doityourself: Tiệm NgÅ© kim - drugstore: Nhà thuốc dry_cleaning: Hấp tẩy electronics: Tiệm Thiết bị Điện tá»­ estate_agent: Văn phòng Bất động sản @@ -875,7 +900,10 @@ vi: valley: Thung lÅ©ng viewpoint: Thắng cảnh zoo: Vườn thú + tunnel: + "yes": Đường hầm waterway: + artificial: Dòng nước Nhân tạo boatyard: Bãi Thuyền canal: Kênh connector: Đường thủy Nối @@ -913,7 +941,8 @@ vi: history_tooltip: Xem danh sách sá»­a đổi trong khu vá»±c này history_zoom_alert: Hãy phóng to hÆ¡n để xem lịch sá»­ sá»­a đổi layouts: - community_blogs: Blog của Cộng đồng + community: Cộng đồng + community_blogs: Các Blog của Cộng đồng community_blogs_title: Các blog của thành viên cộng đồng OpenStreetMap copyright: Bản quyền & Giấy phép documentation: Tài liệu @@ -929,23 +958,23 @@ vi: gps_traces: Tuyến đường GPS gps_traces_tooltip: Quản lý tuyến đường GPS help: Trợ giúp - help_centre: Trung tâm Trợ giúp + help_centre: Hỏi đáp help_title: Trang trợ giúp của dá»± án history: Lịch sá»­ home: nhà home_tooltip: Về vị trí nhà - inbox: hộp thÆ° (%{count}) + inbox_html: hộp thÆ° %{count} inbox_tooltip: one: Hộp thÆ° của bạn có 1 thÆ° chÆ°a đọc other: Hộp thÆ° của bạn có %{count} thÆ° chÆ°a đọc zero: Hộp thÆ° của bạn không có thÆ° chÆ°a đọc intro_1: OpenStreetMap là bản đồ thế giới nguồn mở, do những người nhÆ° bạn vẽ. - intro_2: OpenStreetMap cho phép xem, sá»­a đổi, và sá»­ dụng dữ liệu địa lý một cách cộng tác ở mọi nÆ¡i trên thế giới. - intro_3: OpenStreetMap hoạt động nhờ sá»± hỗ trợ hosting của %{ucl}, %{ic}, và %{bytemark}. Các nhà bảo trợ khác được liệt kê tại %{partners}. - intro_3_ic: Đại học Hoàng gia Luân Đôn - intro_3_partners: wiki - intro_3_partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=vi - intro_3_ucl: Trung tâm VR tại UCL + intro_2_create_account: Mở tài khoản mới + intro_2_download: tải về + intro_2_html: Bạn được phép %{download} và %{use} theo %{license}. Hãy %{create_account} để cải tiến bản đồ. + intro_2_license: giấy phép mở + intro_2_use: sá»­ dụng + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap?uselang=vi license: alt: CC BY-SA 2.0 title: Dữ liệu OpenStreetMap được phát hành theo Giấy phép Creative Commons Ghi công–Chia sẻ tÆ°Æ¡ng tá»± 2.0 Chung @@ -960,10 +989,16 @@ vi: title: Quyên góp tiền để hỗ trợ OpenStreetMap osm_offline: CÆ¡ sở dữ liệu OpenStreetMap đang ngoại tuyến trong lúc đang thá»±c hiện những công việc bảo quản cÆ¡ sở dữ liệu cần thiết. osm_read_only: CÆ¡ sở dữ liệu OpenStreetMap đang bị khóa không được sá»­a đổi trong lúc đang thá»±c hiện những công việc bảo quản cÆ¡ sở dữ liệu cần thiết. + partners_bytemark: Bytemark Hosting + partners_html: Dịch vụ nhờ sá»± hỗ trợ hosting của %{ucl}, %{ic}, và %{bytemark}, cÅ©ng nhÆ° %{partners} khác. + partners_ic: Đại học Hoàng gia Luân Đôn + partners_partners: các công ty bảo trợ + partners_ucl: Trung tâm VR tại UCL + partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=vi sign_up: đăng ký sign_up_tooltip: Mở tài khoản để sá»­a đổi - sotm2011: Mời tham dá»± Hội nghị OpenStreetMap 2011, Tình trạng Bản đồ, 9–11 tháng 9 tại Denver! - tag_line: Bản đồ Wiki của Thế giới Mở + sotm2012: Mời tham dá»± Hội nghị OpenStreetMap 2012, Tình trạng Bản đồ, 6–8 tháng 9 tại Tokyo! + tag_line: Bản đồ Thế giới trên Wiki Mở user_diaries: Nhật ký Cá nhân user_diaries_tooltip: Đọc các nhật ký cá nhân view: Xem @@ -978,7 +1013,30 @@ vi: english_link: nguyên bản tiếng Anh text: Trong trường hợp có xung đột giữa trang dịch và trang %{english_original_link}, trang tiếng Anh sẽ được Æ°u tiên title: Thông tin về bản dịch này - legal_babble: "<h2>Bản quyền và Giấy phép</h2>\n<p>\n OpenStreetMap là <i>dữ liệu mở</i> được phát hành theo giấy phép <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative Commons Ghi công–Chia sẻ tÆ°Æ¡ng tá»± 2.0</a> (CC BY-SA).\n</p>\n<p>\n Bạn được tá»± do sao chép, phân phối, truyền, và tạo ra các tác phẩm phái sinh từ các bản đồ và dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap và những người đóng góp vào nó. Nếu bạn sá»­a đổi hoặc tạo sản phẩm dá»±a trên các bản đồ và dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng giấy phép. <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">mã pháp lý</a> đầy đủ giải thích các quyền và trách nhiệm của bạn.\n</p>\n\n<h3>Cách ghi công OpenStreetMap</h3>\n<p>\n Nếu bạn đang sá»­ dụng các hình ảnh bản đồ OpenStreetMap, chúng tôi yêu cầu rằng lời ghi công của bạn ít nhất đề “© những người đóng góp vào OpenStreetMap, CC BY-SA”. Nếu bạn chỉ đang sá»­ dụng dữ liệu bản đồ, chúng tôi xin câu “Dữ liệu © những người đóng góp vào OpenStreetMap, CC BY-SA”.\n</p>\n<p>\n Lúc nào có thể, “OpenStreetMap” nên có liên kết đến <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> và “CC BY-SA” đến <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Nếu bạn đang sá»­ dụng phÆ°Æ¡ng tiện không cho phép đặt liên kết (thí dụ trong tác phẩm in giấy), chúng tôi gợi ý chỉ các độc giả đến www.openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap” trở thành địa chỉ đầy đủ này) và đến www.creativecommons.org.\n</p>\n\n<h3>Tìm hiểu thêm</h3>\n<p>\n Hãy đọc thêm chi tiết về việc sá»­ dụng dữ liệu của chúng tôi trong <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=vi\">Hỏi đáp Pháp lý</a>.\n</p>\n<p>\n Những người đóng góp vào OSM được khuyên không bao giờ bổ sung dữ liệu từ những nguồn có bản quyền (chẳng hạn Bản đồ Google hoặc các bản đồ trên giấy) trước khi người hay công ty giữ bản quyền cho phép rõ ràng.\n</p>\n<p>\n Tuy OpenStreetMap là dữ liệu mở, nhÆ°ng chúng tôi không thể cung cấp API miễn phí để cho những nhà phát triển bên thứ ba truy cập bản đồ. Hãy xem <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy?uselang=vi\">Quy định Sá»­ dụng API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy?uselang=vi\">Quy định Sá»­ dụng Hình ảnh Bản đồ</a>, và <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim?uselang=vi#Usage_Policy\">Quy định Sá»­ dụng Nominatim</a>.\n</p>\n\n<h3>Những người đóng góp vào đây</h3>\n<p>\n Giấy phép CC BY-SA của chúng tôi bắt bạn phải “ghi công Tác giả Đầu tiên bằng cách hợp với phÆ°Æ¡ng tiện Bạn đang sá»­ dụng”. Những cá nhân vẽ bản đồ OSM không yêu cầu lời ghi công dứt khoát hÆ¡n “những người đóng góp vào OpenStreetMap”, nhÆ°ng trong những trường hợp dữ liệu của cÆ¡ quan khảo sát quốc gia hoặc nguồn lớn khác đã được nhập vào OpenStreetMap, có thể có lý ghi công nguồn này bằng cách ghi công họ thẳng hoặc đặt liên kết đến trang này.\n</p>\n\n<!--\nThông tin cho những người giữ gìn trang này\n\nSau đây chỉ là những tổ chức có điều khoản bắt phải ghi công họ trước khi OpenStreetMap nhập dữ liệu của họ được. Đây không phải là tập hợp thông tin đầy đủ về các lượt nhập. Phần này chỉ có được sá»­ dụng khi nào cần thiết để tuân theo các điều khoản trong giấy phép của dữ liệu được nhập.\n\nTrước khi bổ sung vào phần này, hãy thảo luận với các quản lý viên hệ thống của OSM.\n-->\n\n<ul id=\"contributors\">\n <li><strong>Áo</strong>: Bao gồm dữ liệu từ <a href=\"http://data.wien.gv.at/\">Tiểu bang Viên</a> theo <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.vi\">CC BY</a>.</li>\n <li><strong>Ba Lan</strong>: Bao gồm dữ liệu từ các <a\n href=\"http://ump.waw.pl/\">bản đồ UMP-pcPL</a>. Bản quyền những người đóng góp UMP-pcPL. Xem thêm chi tiết về <a href=\"http://wiki.openstreetmap.org/wiki/Pl:UMP2OSM/Import?uselang=vi\">cách sá»­ dụng dữ liệu UMP tại OpenStreetMap</a>.</li></li>\n <li><strong>Canada</strong>: Bao gồm dữ liệu từ GeoBase®, GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở Địa lý, Statistics Canada).</li>\n <li><strong>Nam Phi</strong>: Bao gồm dữ liệu từ <a href=\"http://www.ngi.gov.za/\">Tổng cục: Thông tin Không gian địa lý Quốc gia</a>, bản quyền nhà nước được bảo lÆ°u.</li>\n <li><strong>New Zealand</strong>: Bao gồm dữ liệu bắt nguồn từ Land Information New Zealand. Bản quyền Crown Copyright được bảo lÆ°u.</li>\n <li><strong>Pháp</strong>: Bao gồm dữ liệu từ Sở thuế Pháp (<i lang=\"fr\" xml:lang=\"fr\">Direction générale des Impôts</i>).</li>\n <li><strong>Úc</strong>: Bao gồm dữ liệu về ngoại ô dá»±a trên dữ liệu của Cục Thống kê Úc.</li>\n <li><strong>VÆ°Æ¡ng quốc Anh</strong>: Bao gồm dữ liệu Ordnance Survey © bản quyền Crown Copyright và quyền cÆ¡ sở dữ liệu 2010.</li>\n</ul>\n\n<p>\n Việc bao gồm dữ liệu trong OpenStreetMap không ngụ ý rằng nhà cung cấp dữ liệu đầu tiên ủng hộ OpenStreetMap, biện hộ sá»± chính xác của nó, hoặc nhận trách nhiệm pháp lý nào.\n</p>" + legal_babble: + contributors_at_html: "<strong>Áo</strong>: Bao gồm dữ liệu từ <a href=\"http://data.wien.gv.at/\">Bang Viên</a> (theo <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.vi\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Bang Vorarlberg</a>, và Bang Tyrol (theo <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">bản sá»­a đổi CC BY Áo</a>)." + contributors_au_html: "<strong>Úc</strong>: Bao gồm dữ liệu về ngoại ô dá»±a trên dữ liệu của Cục Thống kê Úc." + contributors_ca_html: "<strong>Canada</strong>: Bao gồm dữ liệu từ GeoBase®, GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở Địa lý, Statistics Canada)." + contributors_footer_1_html: "Xem thêm chi tiết và các nguồn gốc khác dùng để cải tiến OpenStreetMap tại <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors?uselang=vi\">trang Người đóng góp</a> trên OpenStreetMap Wiki." + contributors_footer_2_html: " Việc bao gồm dữ liệu trong OpenStreetMap không ngụ ý rằng nhà cung cấp dữ liệu đầu tiên ủng hộ OpenStreetMap, biện hộ sá»± chính xác của nó, hoặc nhận trách nhiệm pháp lý nào." + contributors_fr_html: "<strong>Pháp</strong>: Bao gồm dữ liệu từ Sở thuế Pháp (<i lang=\"fr\" xml:lang=\"fr\">Direction générale des Impôts</i>)." + contributors_gb_html: "<strong>VÆ°Æ¡ng quốc Anh</strong>: Bao gồm dữ liệu Ordnance Survey © bản quyền Crown Copyright và quyền cÆ¡ sở dữ liệu 2010." + contributors_intro_html: " Giấy phép CC BY-SA của chúng tôi bắt bạn phải “ghi công Tác giả Đầu tiên bằng cách hợp với phÆ°Æ¡ng tiện Bạn đang sá»­ dụng”. Những cá nhân vẽ bản đồ OSM không yêu cầu lời ghi công dứt khoát hÆ¡n “những người đóng góp vào OpenStreetMap”, nhÆ°ng trong những trường hợp dữ liệu của cÆ¡ quan khảo sát quốc gia hoặc nguồn lớn khác đã được nhập vào OpenStreetMap, có thể có lý ghi công nguồn này bằng cách ghi công họ thẳng hoặc đặt liên kết đến trang này." + contributors_nl_html: "<strong>Hà Lan</strong>: Bao gồm dữ liệu © 2007 AND (<a href=\"http://www.and.com\">www.and.com</a>)" + contributors_nz_html: "<strong>New Zealand</strong>: Bao gồm dữ liệu bắt nguồn từ Land Information New Zealand. Bản quyền Crown Copyright được bảo lÆ°u." + contributors_pl_html: "<strong>Ba Lan</strong>: Bao gồm dữ liệu từ các <a\n href=\"http://ump.waw.pl/\">bản đồ UMP-pcPL</a>. Bản quyền những người đóng góp UMP-pcPL. Xem thêm chi tiết về <a href=\"http://wiki.openstreetmap.org/wiki/Pl:UMP2OSM/Import?uselang=vi\">cách sá»­ dụng dữ liệu UMP tại OpenStreetMap</a>." + contributors_title_html: Những người đóng góp vào đây + contributors_za_html: "<strong>Nam Phi</strong>: Bao gồm dữ liệu từ <a href=\"http://www.ngi.gov.za/\">Tổng cục: Thông tin Không gian địa lý Quốc gia</a>, bản quyền nhà nước được bảo lÆ°u." + credit_1_html: " Nếu bạn đang sá»­ dụng các hình ảnh bản đồ OpenStreetMap, chúng tôi yêu cầu rằng lời ghi công của bạn ít nhất đề “© những người đóng góp vào OpenStreetMap, CC BY-SA”. Nếu bạn chỉ đang sá»­ dụng dữ liệu bản đồ, chúng tôi xin câu “Dữ liệu © những người đóng góp vào OpenStreetMap, CC BY-SA”." + credit_2_html: " Lúc nào có thể, “OpenStreetMap” nên có liên kết đến <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> và “CC BY-SA” đến <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Nếu bạn đang sá»­ dụng phÆ°Æ¡ng tiện không cho phép đặt liên kết (thí dụ trong tác phẩm in giấy), chúng tôi gợi ý chỉ các độc giả đến www.openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap” trở thành địa chỉ đầy đủ này) và đến www.creativecommons.org." + credit_title_html: Cách ghi công OpenStreetMap + intro_1_html: " OpenStreetMap là <i>dữ liệu mở</i> được phát hành theo giấy phép <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative Commons Ghi công–Chia sẻ tÆ°Æ¡ng tá»± 2.0</a> (CC BY-SA)." + intro_2_html: Bạn được tá»± do sao chép, phân phối, truyền, và tạo ra các tác phẩm phái sinh từ các bản đồ và dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap và những người đóng góp vào nó. Nếu bạn sá»­a đổi hoặc tạo sản phẩm dá»±a trên các bản đồ và dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng giấy phép. <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">mã pháp lý</a> đầy đủ giải thích các quyền và trách nhiệm của bạn. + more_1_html: " Hãy đọc thêm chi tiết về việc sá»­ dụng dữ liệu của chúng tôi trong <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=vi\">Hỏi đáp Pháp lý</a>." + more_2_html: " Những người đóng góp vào OSM được khuyên không bao giờ bổ sung dữ liệu từ những nguồn có bản quyền (chẳng hạn Bản đồ Google hoặc các bản đồ trên giấy) trước khi người hay công ty giữ bản quyền cho phép rõ ràng." + more_3_html: " Tuy OpenStreetMap là dữ liệu mở, nhÆ°ng chúng tôi không thể cung cấp API miễn phí để cho những nhà phát triển bên thứ ba truy cập bản đồ. Hãy xem <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy?uselang=vi\">Quy định Sá»­ dụng API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy?uselang=vi\">Quy định Sá»­ dụng Hình ảnh Bản đồ</a>, và <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim?uselang=vi#Usage_Policy\">Quy định Sá»­ dụng Nominatim</a>." + more_title_html: Tìm hiểu thêm + title_html: Bản quyền và Giấy phép native: mapping_link: bắt đầu vẽ bản đồ native_link: bản dịch tiếng Việt @@ -1020,10 +1078,6 @@ vi: body: Rất tiếc, không có thÆ° nào với ID đó. heading: ThÆ° không tồn tại title: ThÆ° không tồn tại - no_such_user: - body: Rất tiếc, không có người dùng với tên đó. - heading: Người dùng không tồn tại - title: Người dùng không tồn tại outbox: date: Ngày inbox: thÆ° đến @@ -1196,6 +1250,8 @@ vi: allow_write_gpx: tải lên tuyến đường GPS. allow_write_prefs: thay đổi tùy chọn cá nhân. authorize_url: "Cho phép URL:" + confirm: Bạn có chắc không? + delete: Xóa Trình khách edit: Sá»­a đổi Chi tiết key: "Từ khóa Tiêu dùng:" requests: "Yêu cầu các khả năng của người dùng ở dưới:" @@ -1205,6 +1261,37 @@ vi: url: "URL của Dấu Yêu cầu:" update: flash: Đã cập nhật thông tin trình khách thành công + redaction: + create: + flash: Các phiên bản đã được ẩn. + destroy: + error: Xuất hiện lỗi khi xóa dãy ẩn này. + flash: Đã xóa dãy ẩn. + not_empty: Dãy ẩn vẫn còn chứa phiên bản. Xin vui lòng hiện các phiên bản nằm trong trước khi xóa dãy ẩn. + edit: + description: Miêu tả + heading: Sá»­a đổi dãy ẩn + submit: LÆ°u dãy ẩn + title: Sá»­a đổi dãy ẩn + index: + empty: Không có dãy ẩn để xem. + heading: Danh sách dãy ẩn + title: Danh sách dãy ẩn + new: + description: Miêu tả + heading: Ghi thông tin của dãy ẩn mới + submit: Ẩn dãy phiên bản + title: Đang ẩn dãy phiên bản + show: + confirm: Bạn có chắc không? + description: "Miêu tả:" + destroy: Xóa dãy ẩn này + edit: Sá»­a đổi dãy ẩn này + heading: Đang xem dãy ẩn “%{title}” + title: Đang xem dãy ẩn + user: "Người ẩn:" + update: + flash: Các thay đổi đã được lÆ°u. site: edit: anon_edits_link_text: Tại sao vậy? @@ -1219,7 +1306,6 @@ vi: index: js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript. js_2: OpenStreetMap sá»­ dụng JavaScript cho chức năng bản đồ trÆ¡n. - js_3: Bạn vẫn có thể sá»­ dụng <a href="http://tah.openstreetmap.org/Browse/">bản đồ tÄ©nh Tiles@Home</a> nếu không bật lên JavaScript được. license: license_name: Creative Commons Ghi công–Chia sẻ tÆ°Æ¡ng tá»± 2.0 notice: "%{project_name} và những người đóng góp cho phép sá»­ dụng theo giấy phép %{license_name}." @@ -1244,7 +1330,7 @@ vi: byway: Đường mòn đa mốt cable: - Đường xe cáp - - ski lift + - thang kéo trượt tuyết cemetery: NghÄ©a địa centre: Trung tâm thể thao commercial: Khu vá»±c thÆ°Æ¡ng mại @@ -1276,7 +1362,7 @@ vi: retail: Khu vá»±c buôn bán runway: - Đường băng - - đường lăn + - đường băng school: - Trường học - đại học @@ -1296,9 +1382,26 @@ vi: unclassified: Đường không phân loại unsurfaced: Đường không lát wood: Rừng + markdown_help: + alt: Văn bản thay thế + first: Khoản mục đầu tiên + heading: Đề mục + headings: Đề mục + image: Hình ảnh + link: Liên kết + ordered: Danh sách đánh số + second: Khoản mục sau + subheading: Đề mục con + text: Văn bản + title_html: Trang trí dùng cú pháp <a href="http://daringfireball.net/projects/markdown/">Markdown</a> + unordered: Danh sách không đánh số + url: URL + richtext_area: + edit: Sá»­a đổi + preview: Xem trước search: search: Tìm kiếm - search_help: "thí dụ: “Hoa Thịnh Đốn”, “Hai Bà TrÆ°ng, Hà Nội”, “CB2 5AQ”, hoặc “bÆ°u điện gần Tân SÆ¡n Nhất” – <a href=\"http://wiki.openstreetmap.org/wiki/Search?uselang=vi\">thêm thí dụ…</a>" + search_help: "thí dụ: “Thượng Hải”, “Hai Bà TrÆ°ng, Hà Nội”, “CB2 5AQ”, hoặc “bÆ°u điện gần Tân SÆ¡n Nhất” – <a href=\"http://wiki.openstreetmap.org/wiki/Search?uselang=vi\">thêm thí dụ…</a>" submit_text: Đi where_am_i: Tôi ở đâu? where_am_i_title: Miêu tả vị trí đang ở dùng máy tìm kiếm @@ -1333,16 +1436,13 @@ vi: visibility_help: có nghÄ©a là gì? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi list: + empty_html: ChÆ°a có gì ở đây. <a href="%{upload_link}">Tải lên tuyến đường mới</a> hoặc tìm hiểu thêm về tuyến đường GPS tại <a href="http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2">trang wiki</a>. public_traces: Tuyến đường GPS công khai public_traces_from: Tuyến đường GPS công khai của %{user} tagged_with: " có thẻ %{tags}" your_traces: Tuyến đường GPS của bạn make_public: made_public: Tuyến đường được phát hành công khai - no_such_user: - body: Rất tiếc, không có người dùng nào với tên %{user}. Xin hãy kiểm tra chính tả, hoặc có lẽ bạn đã theo một liên kết sai. - heading: Người dùng %{user} không tồn tại - title: Người dùng không tồn tại offline: heading: Kho GPX Ngoại tuyến message: Hệ thống lÆ°u giữ và tải lên tập tin GPX tạm ngừng hoạt động. @@ -1383,8 +1483,8 @@ vi: trace_optionals: tags: Thẻ trace_paging_nav: - next: Sau » - previous: « Trước + newer: Tuyến đường Mới hÆ¡n + older: Tuyến đường CÅ© hÆ¡n showing_page: Đang hiện trang %{page} view: delete_track: Xóa tuyến đường này @@ -1529,7 +1629,7 @@ vi: title: Đăng nhập với Yahoo! password: "Mật khẩu:" register now: Đăng ký ngay - remember: "Nhớ tôi:" + remember: Nhớ tôi title: Đăng nhập to make changes: Bạn phải có tài khoản để thay đổi dữ liệu OpenStreetMap. with openid: "Hoặc đăng nhập dùng OpenID của bạn:" @@ -1620,7 +1720,7 @@ vi: activate_user: kích hoạt tài khoản này add as friend: thêm là người bạn ago: (cách đây %{time_in_words_ago}) - block_history: xem các tác vụ cấm người này + block_history: tác vụ cấm người này blocks by me: tác vụ cấm bởi tôi blocks on me: tác vụ cấm tôi comments: bình luận @@ -1646,7 +1746,7 @@ vi: latest edit: "Sá»­a đổi gần đây nhất cách đây %{ago}:" m away: cách %{count} m mapper since: "Tham gia:" - moderator_history: xem các tác vụ cấm bởi người này + moderator_history: tác vụ cấm bởi người này my comments: bình luận của tôi my diary: nhật ký của tôi my edits: đóng góp của tôi @@ -1702,7 +1802,6 @@ vi: filter: block_expired: Không thể sá»­a đổi tác vụ cấm này vì nó đã hết hạn. block_period: Thời hạn cấm phải là một trong những giá trị từ danh sách kéo xuống. - not_a_moderator: Chỉ có các điều hành viên được phép thá»±c hiện tác vụ đó. helper: time_future: Hết hạn %{time}. time_past: Đã hết hạn cách đây %{time}. @@ -1732,11 +1831,14 @@ vi: creator_name: Người cấm display_name: Người bị cấm edit: Sá»­a đổi + next: Sau » not_revoked: (không bị hủy) + previous: « Trước reason: Lý do cấm revoke: Bỏ cấm! revoker_name: Người bỏ cấm show: Hiện + showing_page: Đang hiện trang %{page} status: Trạng thái period: "%{count} giờ" revoke: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 60a01d391..2df5f00ac 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1,10 +1,11 @@ -# Messages for Simplified Chinese (‪中文(简体)‬) +# Messages for Simplified Chinese (‪中文（简体）‬) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Anakmalaysia # Author: Hydra # Author: Liangent # Author: Mmyangfl +# Author: Nemo bis # Author: PhiLiP # Author: Shizhao # Author: Xiaomingyan @@ -87,7 +88,6 @@ zh-CN: changeset: changeset: 修改集合：%{id} changesetxml: 修改集合 XML - download: 下载%{changeset_xml_link} 或 %{osmchange_xml_link} feed: title: 修改集合 %{id} title_comment: 修改集合 %{id} - %{comment} @@ -105,7 +105,7 @@ zh-CN: no_bounding_box: 没有为该修改集合所储存的限定窗口。 show_area_box: 显示区域窗口 common_details: - changeset_comment: 注释： + changeset_comment: 评论： deleted_at: 删除于： deleted_by: 删除由： edited_at: 编辑于： @@ -150,7 +150,6 @@ zh-CN: next_changeset_tooltip: 下一个 %{user} 的编辑 prev_changeset_tooltip: 上一个 %{user} 的编辑 node: - download: "%{download_xml_link}、%{view_history_link}或%{edit_link}" download_xml: 下载 XML edit: 编辑 node: 节点 @@ -160,7 +159,6 @@ zh-CN: coordinates: 坐标： part_of: 部分： node_history: - download: "%{download_xml_link} 或%{view_details_link}" download_xml: 下载 XML node_history: 节点历史 node_history_title: 节点历史：%{node_name} @@ -175,8 +173,12 @@ zh-CN: paging_nav: of: / showing_page: 显示页面 + redacted: + type: + node: 节点 + relation: 关系 + way: 路径 relation: - download: "%{download_xml_link} 或%{view_history_link}" download_xml: 下载 XML relation: 关系 relation_title: 关系：%{relation_name} @@ -185,7 +187,6 @@ zh-CN: members: 成员： part_of: 部分： relation_history: - download: "%{download_xml_link} 或%{view_details_link}" download_xml: 下载 XML relation_history: 关系历史 relation_history_title: 关系历史：%{relation_name} @@ -202,14 +203,14 @@ zh-CN: view_data: 查看当前地图视图中的数据 start_rjs: data_frame_title: 数据 - data_layer_name: 数据 + data_layer_name: 浏览地图数据 details: 详细信息 drag_a_box: 通过拖曳窗口来选择区域 edited_by_user_at_timestamp: 由 [[user]] 于 [[timestamp]] 编辑 hide_areas: 隐藏区域 history_for_feature: 历史 [[feature]] load_data: 加载数据 - loaded_an_area_with_num_features: 您已经选择了包含 [[num_features]] 项特征的区域。通常，有些浏览器无法正常显示这么多的数据。一般而言，浏览器一次显示 100 个以下特征时效果最好；超过这个数量会使您的浏览器变慢/无响应。如果确定要显示这个数据，请按下面的按钮。 + loaded_an_area_with_num_features: 您已选择了包含 [[num_features]] 项特征的区域。通常，有些浏览器无法正常显示这么多的数据。一般而言，浏览器一次显示少于 [[max_features]] 项特征时效果最好：执行其他任务会使您的浏览器变慢/无响应。如果确定要显示这些数据，请按下面的按钮。 loading: 载入中... manually_select: 手动选择一个不同区域 object_list: @@ -248,7 +249,6 @@ zh-CN: relation: 关系 way: 路径 way: - download: "%{download_xml_link}，%{view_history_link}或%{edit_link}" download_xml: 下载 XML edit: 编辑 view_history: 查看历史 @@ -259,7 +259,6 @@ zh-CN: nodes: 节点： part_of: 部分： way_history: - download: "%{download_xml_link} 或者%{view_details_link}" download_xml: 下载 XML view_details: 查看详细信息 way_history: 路径历史 @@ -280,7 +279,7 @@ zh-CN: showing_page: 显示第 %{page} 页 changesets: area: 区域 - comment: 注释 + comment: 评论 id: ID saved_at: 保存时间 user: 用户 @@ -371,10 +370,6 @@ zh-CN: body: 对不起，没有 id 为 %{id} 的日记条目或者评论。请检查拼写，或者您点击的链接有误。 heading: 关于此 id：%{id} 没有条目 title: 没有这个日记条目 - no_such_user: - body: 对不起，没有名为 %{user} 的用户。请检查拼写，或者您点击的链接有误。 - heading: 用户 %{user} 不存在 - title: 没有这个用户 view: leave_a_comment: 留下评论 login: 登录 @@ -470,16 +465,28 @@ zh-CN: suffix_suburb: "%{suffix}，%{parentname}" search_osm_nominatim: prefix: + aeroway: + aerodrome: 机场 + apron: 机坪 + gate: 门 + helipad: 直升机停机坪 + runway: 跑道 + taxiway: 滑行道 + terminal: 航站楼 amenity: + WLAN: WiFi 接入 airport: 机场 arts_centre: 艺术中心 + artwork: 艺术品 atm: 自动取款机(ATM) auditorium: 礼堂 bank: 银行 bar: 酒吧 + bbq: 烧烤 bench: 长凳 bicycle_parking: 自行车停车 bicycle_rental: 自行车租赁 + biergarten: 啤酒花园 brothel: 妓院 bureau_de_change: 货币兑换 bus_station: 公交主站 @@ -488,6 +495,7 @@ zh-CN: car_sharing: 汽车共享 car_wash: 洗车 casino: 赌场 + charging_station: 充电站 cinema: 电影院 clinic: 诊所 club: 俱乐部 @@ -506,6 +514,7 @@ zh-CN: ferry_terminal: 轮渡码头 fire_hydrant: 消防栓 fire_station: 消防局 + food_court: 食阁 fountain: 喷泉 fuel: 燃料 grave_yard: 墓地 @@ -546,9 +555,12 @@ zh-CN: shelter: 庇护所 shop: 商店 shopping: 购物 + shower: 淋浴 + social_centre: 社区中心 social_club: 社交俱乐部 studio: 工作室 supermarket: 超市 + swimming_pool: 游泳池 taxi: 出租车 telephone: 公共电话 theatre: 剧院 @@ -563,37 +575,17 @@ zh-CN: youth_centre: 青少年中心 boundary: administrative: 行政区边界 + census: 人口普查边界 + national_park: 国家公园 + protected_area: 保护区 + bridge: + aqueduct: 输水管道 + suspension: 悬索桥 + swing: 索桥 + viaduct: 高架桥 + "yes": æ¡¥ building: - apartments: 公寓楼 - block: 建筑楼 - bunker: 碉堡 - chapel: 教堂 - church: 教堂 - city_hall: 市政厅 - commercial: 商业建筑物 - dormitory: 宿舍 - entrance: 建筑入口 - faculty: 师资队伍建设 - farm: 农场建筑物 - flats: 公寓 - garage: 车库 - hall: 小山 - hospital: 医院建筑物 - hotel: 酒店 - house: 房屋 - industrial: 工业建筑物 - office: 办公楼 - public: 公共建筑物 - residential: 住宅建筑物 - retail: 零售建筑物 - school: 学校建筑物 - shop: 商店 - stadium: 体育场 - store: 商店 - terrace: 阳台 - tower: 塔 - train_station: 火车站 - university: 大学建筑物 + "yes": 建筑物 highway: bridleway: 马道 bus_guideway: 导轨公交专用道 @@ -601,12 +593,11 @@ zh-CN: byway: 非机动车道(英国) construction: 在建道路 cycleway: 单车径 - distance_marker: 距离标记 emergency_access_point: 紧急接入点 footway: 步行道 ford: 浅滩 - gate: 门 living_street: 生活街道 + milestone: 里程碑 minor: 次要道路 motorway: 高速公路 motorway_junction: 高速公路连接线 @@ -618,18 +609,21 @@ zh-CN: primary_link: 一级道路 raceway: 滚道 residential: 住宅 + rest_area: 休息区 road: 道路 secondary: 二级公路 secondary_link: 二级公路 service: 服务道路 services: 高速公路服务区 + speed_camera: 超速照相机 steps: 楼梯 stile: 跨越围栏的台阶 tertiary: 三级道路 + tertiary_link: 三级道路 track: 辙迹 trail: 轨迹 - trunk: 主干道路 - trunk_link: 主干道路 + trunk: 快速道路 + trunk_link: 快速道路 unclassified: 未分类道路 unsurfaced: 无铺面道路 historic: @@ -639,6 +633,7 @@ zh-CN: building: 建筑物 castle: 城堡 church: 教堂 + fort: å ¡ house: 房屋 icon: 圣像画 manor: 庄园 @@ -663,6 +658,7 @@ zh-CN: farmland: 农田 farmyard: 农家庭院 forest: 森林 + garages: 车库 grass: 草地 greenfield: 绿色地带 industrial: 工业区 @@ -670,25 +666,28 @@ zh-CN: meadow: 草甸 military: 军事区 mine: 矿区 - mountain: å±± nature_reserve: 自然保护区 + orchard: 果园 park: 公园 piste: 滑雪场 - plaza: 广场 quarry: 采石场 railway: 铁路 recreation_ground: 游乐场 reservoir: 水库 + reservoir_watershed: 库区 residential: 住宅区 retail: 零售 + road: 道路面积 village_green: 绿色村庄 vineyard: 葡萄园 wetland: 湿地 wood: 林 leisure: beach_resort: 海滩度假村 + bird_hide: 鸟隐藏 common: 公共土地 fishing: 垂钓区 + fitness_station: 健身站 garden: 花园 golf_course: 高尔夫球场 ice_rink: 冰场 @@ -699,12 +698,17 @@ zh-CN: pitch: 体育场 playground: 游乐场 recreation_ground: 游乐场 + sauna: 桑拿 slipway: 船入水滑道 sports_centre: 体育馆 stadium: 体育场 swimming_pool: 游泳池 track: 赛道 water_park: 水上乐园 + military: + airfield: 军用机场 + barracks: 军营 + bunker: 碉堡 natural: bay: æµ·æ¹¾ beach: 海滩 @@ -712,11 +716,12 @@ zh-CN: cave_entrance: 洞口 channel: 海峡 cliff: 悬崖 - coastline: 海岸线 crater: 火山口 + dune: 沙丘 feature: 特征 fell: 下跌 fjord: 峡湾 + forest: 森林 geyser: 喷泉 glacier: 冰川 heath: 荒地 @@ -736,6 +741,7 @@ zh-CN: scrub: 灌木 shoal: 浅滩 spring: 泉 + stone: 商店 strait: 海峡 tree: 树 valley: 山谷 @@ -744,6 +750,18 @@ zh-CN: wetland: 湿地 wetlands: 湿地 wood: 林 + office: + accountant: 会计事务所 + company: 公司 + employment_agency: 职业中介 + estate_agent: 房产中介 + government: 政府办事处 + insurance: 保险 + lawyer: 律师事务所 + ngo: 非政府组织办事处 + telecommunication: 电信办公室 + travel_agent: 旅行社 + "yes": 办公室 place: airport: 机场 city: 城市 @@ -755,6 +773,7 @@ zh-CN: houses: 房屋 island: 岛 islet: 屿 + isolated_dwelling: 独立的住宅 locality: 地区 moor: 系泊 municipality: 都市 @@ -778,6 +797,7 @@ zh-CN: junction: 铁路枢纽 level_crossing: 平交道口 light_rail: 轻轨 + miniature: 微型铁路 monorail: 单轨 narrow_gauge: 窄轨铁路 platform: 站台 @@ -792,7 +812,7 @@ zh-CN: yard: 铁路货场 shop: alcohol: 无许可证 - apparel: 服装店 + antiques: 古玩店 art: 艺术品店 bakery: 面包店 beauty: 美容店 @@ -801,7 +821,6 @@ zh-CN: books: 书店 butcher: å± å®° car: 车店 - car_dealer: 汽车销售 car_parts: 汽车零件 car_repair: 汽车维修 carpet: 地毯店 @@ -816,7 +835,6 @@ zh-CN: department_store: 百货商店 discount: 折扣精品店 doityourself: DIY - drugstore: 药店 dry_cleaning: 干洗 electronics: 电子产品商店 estate_agent: 房产中介 @@ -882,7 +900,10 @@ zh-CN: valley: è°· viewpoint: 景点 zoo: 动物园 + tunnel: + "yes": 隧道 waterway: + artificial: 运河 boatyard: 船坞 canal: 运河 connector: 航道连接器 @@ -923,12 +944,13 @@ zh-CN: history_tooltip: 查看对此区域的编辑 history_zoom_alert: 您必须先放大才能编辑此区域 layouts: + community: 社区 community_blogs: 社区博客 community_blogs_title: OpenStreetMap 社区成员的博客 copyright: 版权及许可 documentation: 文档 documentation_title: 该项目的文档 - donate: 给硬件升级基金%{link}以支持 OpenStreetMap。 + donate: 给硬件升级基金会%{link}以支持 OpenStreetMap。 donate_link_text: 捐款 edit: 编辑 edit_with: 使用 %{editor} 编辑 @@ -945,19 +967,16 @@ zh-CN: history: 历史 home: 主页 home_tooltip: 回到主页位置 - inbox: 收件箱(%{count}) inbox_tooltip: one: 您的收件箱有 1 封未读消息 other: 您的收件箱有 %{count} 封未读消息 zero: 您的收件箱中没有未读消息 - intro_1: OpenStreetMap 是一个可供自由编辑的世界地图，它是由像您这样的用户创造的 - intro_2: OpenStreetMap 允许您查看，编辑或者使用世界各地的地理数据来帮助您。 - intro_3: OpenStreetMap 的主机是由%{ucl}、%{ic}和 %{bytemark}大力支持的。这个项目的其他支持者都列在%{partners}中。 - intro_3_bytemark: Bytemark 虚拟主机 - intro_3_ic: 英国伦敦帝国学院 - intro_3_partners: 维基 - intro_3_partners_url: http://wiki.openstreetmap.org/wiki/Partners - intro_3_ucl: 伦敦大学学院 VR 中心 + intro_1: OpenStreetMap 是一个可供自由编辑的世界地图，它是由像您这样的用户创造的。 + intro_2_create_account: 创建用户帐户 + intro_2_download: 下载 + intro_2_html: 数据可以免费%{download}，并依据%{license}%{use}。%{create_account}以改善地图。 + intro_2_license: 开放许可协议 + intro_2_use: 使用 license: alt: 知识共享 署名-相同方式共享 2.0 title: OpenStreetMap 数据是以知识共享 署名-相同方式共享 2.0 通用许可授权 @@ -972,6 +991,11 @@ zh-CN: title: 捐款支持 OpenStreetMap osm_offline: OpenStreetMap 的数据库目前离线中，直到必要的数据库维护工作完成为止。 osm_read_only: OpenStreetMap 数据库目前处于只读模式中，数据库的维护工作正在进行中。 + partners_bytemark: Bytemark 主机 + partners_html: 主机由%{ucl}、%{ic}、%{bytemark}和其他%{partners}所支持。 + partners_ic: 英国伦敦帝国学院 + partners_partners: 合作伙伴 + partners_ucl: 伦敦大学学院 VR 中心 project_name: h1: OpenStreetMap title: OpenStreetMap @@ -992,7 +1016,14 @@ zh-CN: english_link: 英文原文 text: 这个翻译页面和%{english_original_link}在事件上有冲突时，以英文页面为准 title: 关于这个翻译 - legal_babble: "<h2>版权和许可</h2>\n<p>\n OpenStreetMap 是<i>开放数据</i>的，采用<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">知识\n 共享 署名-相同方式共享 2.0</a>协议(CC-BY-SA)授权。\n</p>\n<p>\n 您可以自由地复制、发行、传播和创作演绎我们的地图\n 和数据，只要您信任 OpenStreetMap 和它的\n 贡献者。如果您改变、转换或者以我们的地图或数据为基础进行创作，您\n 只能采用与本协议相同的许可协议发布您的作品。完整\n 的<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">法律\n 文本</a>阐明了您的权利和义务。\n</p>\n\n<h3>How to credit OpenStreetMap</h3>\n<p>\n If you are using OpenStreetMap map images, we request that\n your credit reads at least “© OpenStreetMap\n contributors, CC-BY-SA”. If you are using map data only,\n we request “Map data © OpenStreetMap contributors,\n CC-BY-SA”.\n</p>\n<p>\n Where possible, OpenStreetMap should be hyperlinked to <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n and CC-BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. If\n you are using a medium where links are not possible (e.g. a\n printed work), we suggest you direct your readers to\n www.openstreetmap.org (perhaps by expanding\n ‘OpenStreetMap’ to this full address) and to\n www.creativecommons.org.\n</p>\n\n<h3>了解更多</h3>\n<p>\n 阅读更多关于使用我们数据的 <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">常见\n 法律问题</a>。\n</p>\n<p>\n OSM contributors are reminded never to add data from any\n copyrighted sources (e.g. Google Maps or printed maps) without\n explicit permission from the copyright holders.\n</p>\n<p>\n 虽然 OpenStreetMap 是开放数据的，我们无法为\n 第三方开发者提供一个免费的地图 API。\n\n 请参阅我们的 <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API 使用政策</a>、\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">拼贴使用政策</a>\n 和 <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim 使用政策</a>。\n</p>\n\n<h3>我们的贡献者</h3>\n<p>\n Our CC-BY-SA licence requires you to “give the Original\n Author credit reasonable to the medium or means You are\n utilising”. Individual OSM mappers do not request a\n credit over and above that to “OpenStreetMap\n contributors”, but where data from a national mapping\n agency or other major source has been included in\n OpenStreetMap, it may be reasonable to credit them by directly\n reproducing their credit or by linking to it on this page.\n</p>\n\n<!--\n致页面编辑者的信息\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\n在这里添加任何东西，必须首先与 OSM 系统管理员讨论。\n-->\n\n<ul id=\"contributors\">\n <li><strong>澳大利亚</strong>：Contains suburb data based\n on Australian Bureau of Statistics data.</li>\n <li><strong>奥地利</strong>：包含来自于 \n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> 基于 \n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a> 授权的数据。</li>\n <li><strong>加拿大</strong>：Contains data from\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada).</li>\n <li><strong>法国</strong>：Contains data sourced from\n Direction Générale des Impôts.</li>\n <li><strong>新西兰</strong>：Contains data sourced from\n Land Information New Zealand. Crown Copyright reserved.</li>\n <li><strong>波兰</strong>：Contains data from <a\n href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n UMP-pcPL contributors.</li>\n <li><strong>英国</strong>：Contains Ordnance\n Survey data © Crown copyright and database right\n 2010.</li>\n</ul>\n\n<p>\n Inclusion of data in OpenStreetMap does not imply that the original\n data provider endorses OpenStreetMap, provides any warranty, or\n accepts any liability.\n</p>" + legal_babble: + contributors_title_html: 我们的贡献者 + intro_1_html: " OpenStreetMap 是<i>开放数据</i>的，采用<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">知识\n 共享 署名-相同方式共享 2.0</a>协议(CC BY-SA)授权。" + intro_2_html: " 您可以自由地复制、发行、传播和创作演绎我们的地图\n 和数据，只要您信任 OpenStreetMap 和它的\n 贡献者。如果您改变、转换或者以我们的地图或数据为基础进行创作，您\n 只能采用与本协议相同的许可协议发布您的作品。完整\n 的<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">法律\n 文本</a>阐明了您的权利和义务。" + more_1_html: " 阅读更多关于使用我们数据的 <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">常见\n 法律问题</a>。" + more_3_html: " 虽然 OpenStreetMap 是开放数据的，我们无法为\n 第三方开发者提供一个免费的地图 API。\n\n 请参阅我们的 <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API 使用政策</a>、\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">瓦片使用政策</a>\n 和 <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim 使用政策</a>。" + more_title_html: 了解更多 + title_html: 版权和许可 native: mapping_link: 开始制图 native_link: 简体中文版 @@ -1024,7 +1055,7 @@ zh-CN: new: back_to_inbox: 返回收件箱 body: 主体 - limit_exceeded: 您刚刚发送了很多消息。在尝试发送其他消息之前请稍等一会儿。 + limit_exceeded: 您刚发送了很多消息。在尝试发送其他消息之前，请稍等一会儿。 message_sent: 已发送消息 send_button: 发送 send_message_to: 发送新消息给 %{name} @@ -1034,10 +1065,6 @@ zh-CN: body: 对不起，没有具有该 id 的消息。 heading: 没有此消息 title: 没有此消息 - no_such_user: - body: 对不起，没有使用该名称的用户。 - heading: 没有此用户 - title: 没有此用户 outbox: date: 日期 inbox: 收件箱 @@ -1104,7 +1131,7 @@ zh-CN: with_description: 带有描述 your_gpx_file: 看起来像是您的 GPX 文件 lost_password: - subject: "[OpenStreetMap] 密码重设请求" + subject: "[OpenStreetMap] 密码重置请求" lost_password_html: click_the_link: 如果这是您，请点击下面的链接重置您的密码。 greeting: 您好， @@ -1130,18 +1157,18 @@ zh-CN: greeting: 您好！ hopefully_you: 某人(希望是您)想要建立一个账户 introductory_video: 您可以观看一部%{introductory_video_link}。 - more_videos: 这里有更多%{more_videos_link}。 - more_videos_here: 有更多的影片 + more_videos: 这里有%{more_videos_link}。 + more_videos_here: 更多的影片 user_wiki_page: 推荐您创立一个用户维基页面，它包括分类标签，用来提醒您所在位置，例如 <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>。 - video_to_openstreetmap: 关于 OpenStreetMap 的介绍影片 + video_to_openstreetmap: OpenStreetMap 的介绍片 wiki_signup: 您可能也想要<a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">注册到 OpenStreetMap 维基</a>。 signup_confirm_plain: ask_questions: 您可以在我们的问答站点问关于 OpenStreetMap 的任何问题： blog_and_twitter: 通过 OpenStreetMap 的博客或 Twitter 以了解最新消息： click_the_link_1: 如果这是您，欢迎您！请点击下面的链接来确认您的 click_the_link_2: 帐户，并阅读更多 OpenStreetMap 的信息。 - current_user_1: 一个当前不同分类的用户列表，他们是基于所在地理位置来分类 - current_user_2: 来自于： + current_user_1: 一个基于所在位置分类的当前用户列表 + current_user_2: 在此： greeting: 您好！ hopefully_you: 某人(希望是您)希望创建一个账号 introductory_video: 您可以在这里观看 OpenStreetMap 的介绍视频： @@ -1150,7 +1177,7 @@ zh-CN: the_wiki: 在维基上阅读 OpenStreetMap 的介绍： the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide user_wiki_1: 推荐您创建一个维基的用户页，它包括 - user_wiki_2: 分类标签表明您的位置，例如 [[Category:Users_in_London]]。 + user_wiki_2: 分类标签以表明您的位置，例如 [[Category:Users_in_London]]。 wiki_signup: 您可能也想在 OpenStreetMap 维基上注册： wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page oauth: @@ -1211,6 +1238,7 @@ zh-CN: allow_write_gpx: 上传 GPS 轨迹。 allow_write_prefs: 修改他们的用户首选项。 authorize_url: 授权 URL： + confirm: 您确定吗？ edit: 编辑详细信息 key: 用户键： requests: 要向用户要求下列权限： @@ -1224,6 +1252,17 @@ zh-CN: with_id: "%{id}" with_name: "%{name} (%{id})" with_version: "%{id}，版本 %{version}" + redaction: + edit: + description: 说明 + new: + description: 说明 + show: + confirm: 您确定吗？ + description: 说明： + user: "创建者:" + update: + flash: 更改已保存。 site: edit: anon_edits: (%{link}) @@ -1240,7 +1279,6 @@ zh-CN: index: js_1: 您或许正在使用不支持 JavaScript 的浏览器，或许您禁用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。 - js_3: 如果您无法启用 JavaScript，可以尝试 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home 静态拼贴浏览器</a>。 license: license_name: 知识共享 署名-相同方式共享 2.0 license_url: http://creativecommons.org/licenses/by-sa/2.0/ @@ -1306,18 +1344,35 @@ zh-CN: station: 火车站 subway: 地铁 summit: - - 首脑会议 + - 山峰 - 高峰 tourist: 旅游景点 track: 辙迹 tram: - 轻轨 - 电车 - trunk: 主干道路 + trunk: 快速道路 tunnel: 虚线套管 = 隧道 unclassified: 未分类道路 unsurfaced: 无铺面道路 wood: 林 + markdown_help: + alt: 替代文本 + first: 第一项 + heading: 标题 + headings: 标题 + image: 图像 + link: 链接 + ordered: 有序列表 + second: 第二项 + subheading: 副标题 + text: 文本 + title_html: 按照 <a href="http://daringfireball.net/projects/markdown/">Markdown</a> 来解析 + unordered: 无序列表 + url: URL + richtext_area: + edit: 编辑 + preview: 预览 search: search: 搜索 search_help: 例如：'Alkmaar'，'Regent Street, Cambridge'，'CB2 5AQ'，或 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多例子...</a> @@ -1329,7 +1384,7 @@ zh-CN: search_results: 搜索结果 time: formats: - friendly: "%Y å¹´%B %e 日 %H:%M" + friendly: "%Y å¹´ %B %e 日 %H:%M" trace: create: trace_uploaded: 您的 GPX 文件已经被上传，正等待被输入数据库。这通常在半小时之内，当上传结束后会发邮件通知您。 @@ -1361,10 +1416,6 @@ zh-CN: your_traces: 您的 GPS 轨迹 make_public: made_public: 公开化路径 - no_such_user: - body: 对不起，没有名为 %{user} 的用户。请查看您的拼写，或者可能您点击有误。 - heading: 用户 %{user} 不存在 - title: 没有此用户 offline: heading: GPX 脱机存储 message: GPX 文件存储和上传系统当前不可用。 @@ -1405,8 +1456,6 @@ zh-CN: trace_optionals: tags: 标签 trace_paging_nav: - next: 下一页 » - previous: « 上一页 showing_page: 显示第 %{page} 页 view: delete_track: 删除这条轨迹 @@ -1563,10 +1612,10 @@ zh-CN: lost_password: email address: 电子邮件地址： heading: 忘记密码? - help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，而您可以用它来重设密码。 - new password button: 发送新密码 + help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，这样您就可以用它来重置密码。 + new password button: 重置密码 notice email cannot find: 对不起，无法找到邮箱。 - notice email on way: 对不起您的密码丢失 ：-( 但是您可以根据发送的邮件重设密码。 + notice email on way: 对不起，您忘记了密码 :-( 但是邮件正在发送，一会您就可以重置它。 title: 丢失密码 make_friend: already_a_friend: 您已经和 %{name} 是朋友了。 @@ -1650,7 +1699,7 @@ zh-CN: confirm_user: 确认此用户 create_block: 阻止此用户 created from: 建立于： - ct accepted: 于%{ago}以前接受 + ct accepted: 于%{ago}之前接受 ct declined: 已拒绝 ct status: 贡献者条款： ct undecided: 未决定 @@ -1667,7 +1716,7 @@ zh-CN: km away: "%{count} 公里之外" latest edit: 上次编辑于%{ago}： m away: "%{count} 米之外" - mapper since: 成为制图者于： + mapper since: 成为制图者： moderator_history: 查看封禁来自 my comments: 我的评论 my diary: 我的日记 @@ -1724,7 +1773,6 @@ zh-CN: filter: block_expired: 这个封禁已经过期，并且不能再编辑。 block_period: 封禁时期必须是在下拉菜单中可选择的数值之一。 - not_a_moderator: 您必须是管理员才能执行该操作。 helper: time_future: 结束于 %{time}。 time_past: "%{time}前已结束。" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 11eabfb12..34ed38bf8 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1,9 +1,10 @@ -# Messages for Traditional Chinese (‪中文(繁體)‬) +# Messages for Traditional Chinese (‪中文（繁體）‬) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Anakmalaysia # Author: Mmyangfl # Author: Pesder +# Author: Simon Shek # Author: Wrightbus zh-TW: activerecord: @@ -84,7 +85,6 @@ zh-TW: changeset: changeset: 變更組合： changesetxml: 變更組合 XML - download: 下載 %{changeset_xml_link} 或 %{osmchange_xml_link} feed: title: 變更組合 %{id} title_comment: 變更組合 %{id} - %{comment} @@ -139,7 +139,6 @@ zh-TW: next_changeset_tooltip: 下一個 %{user} 的編輯 prev_changeset_tooltip: 上一個 %{user} 的編輯 node: - download: "%{download_xml_link} 或 %{view_history_link}" download_xml: 下載 XML edit: 編輯 node: 節點 @@ -149,7 +148,6 @@ zh-TW: coordinates: 坐標： part_of: 部分： node_history: - download: "%{download_xml_link} 或 %{view_details_link}" download_xml: 下載 XML node_history: 節點歷史 node_history_title: 節點歷史： %{node_name} @@ -165,7 +163,6 @@ zh-TW: of: ／ showing_page: 正在顯示頁面 relation: - download: "%{download_xml_link} 或 %{view_history_link}" download_xml: 下載 XML relation: 關係 relation_title: 關係： %{relation_name} @@ -174,7 +171,6 @@ zh-TW: members: 成員： part_of: 部分： relation_history: - download: "%{download_xml_link} 或 %{view_details_link}" download_xml: 下載 XML relation_history: 關係歷史 relation_history_title: 關係歷史： %{relation_name} @@ -190,7 +186,7 @@ zh-TW: view_data: 目前地圖檢視的檢視資料 start_rjs: data_frame_title: 資料 - data_layer_name: 資料 + data_layer_name: 流覽地圖資料 details: 詳細資訊 drag_a_box: 在地圖上拖曳出一個方塊來選擇一個區域 edited_by_user_at_timestamp: 由 [[user]] 於 [[timestamp]] 編輯 @@ -236,7 +232,6 @@ zh-TW: relation: 關係 way: 路徑 way: - download: "%{download_xml_link} 或 %{view_history_link}" download_xml: 下載 XML edit: 編輯 view_history: 檢視歷史 @@ -249,7 +244,6 @@ zh-TW: nodes: 節點： part_of: 部分： way_history: - download: "%{download_xml_link} 或 %{view_details_link}" download_xml: 下載 XML view_details: 檢視詳細資訊 way_history: 路徑歷史 @@ -258,7 +252,7 @@ zh-TW: changeset: anonymous: 匿名 big_area: (大) - no_comment: (沒有) + no_comment: (無) no_edits: (沒有編輯) show_area_box: 顯示區域方塊 still_editing: (尚在編輯) @@ -344,10 +338,6 @@ zh-TW: body: 抱歉，沒有日記項目或評論的 id 是 %{id}。請檢查您的拼字，或者可能是按到錯誤的連結。 heading: 沒有項目的 id 為： %{id} title: 沒有這個日記項目 - no_such_user: - body: 抱歉，沒有名為 %{user} 的使用者。請檢查您的拼字，或者可能是按到錯誤的連結。 - heading: 使用者 %{user} 不存在 - title: 沒有這個使用者 view: leave_a_comment: 留下評論 login: 登入 @@ -355,6 +345,8 @@ zh-TW: save_button: 儲存 title: "%{user} 的日記 | %{title}" user_title: "%{user}的日記" + editor: + default: 預設 (目前 %{name}) export: start: add_marker: 在地圖加上標記 @@ -429,6 +421,9 @@ zh-TW: suffix_place: ", %{direction} %{distance} ／ %{placename}" search_osm_nominatim: prefix: + aeroway: + helipad: 直升機停機坪 + runway: 跑道 amenity: airport: 機場 atm: ATM @@ -455,21 +450,23 @@ zh-TW: library: 圖書館 nightclub: 夜總會 office: 辦公室 + park: 公園 pharmacy: 藥房 place_of_worship: 宗教場所 police: 警察 post_box: 郵箱 post_office: 郵局 prison: 監獄 + pub: 酒吧 + public_building: 公共建築 sauna: 桑拿 school: 學校 supermarket: 超級市場 + swimming_pool: 游泳池 taxi: 出租車 telephone: 公共電話 toilets: 洗手間 university: 大學 - building: - church: 教堂 historic: museum: 博物館 landuse: @@ -477,7 +474,6 @@ zh-TW: military: 軍事區 reservoir: 水庫 natural: - coastline: 海岸線 volcano: 火山 place: airport: 機場 @@ -564,15 +560,11 @@ zh-TW: history: 歷史 home: 家 home_tooltip: 移至家位置 - inbox: 收件匣 (%{count}) inbox_tooltip: one: 您的收件匣有 1 個未閱讀的訊息 other: 您的收件匣有 %{count} 個未閱讀的訊息 zero: 您的收件匣沒有未閱讀的訊息 intro_1: OpenStreetMap 是一個自由、可編輯的全世界地圖。它是由像您這樣的人所製作的。 - intro_2: OpenStreetMap 讓您可以從地球上的任何地方以合作的方式檢視、編輯與使用地圖資料。 - intro_3: OpenStreetMap 的主機是由 %{ucl} 和 %{bytemark} 大力支援的。這個專案的其他支持者都列在 %{partners}。 - intro_3_partners: wiki license: title: OpenStreetMap 資料是以創用 CC 姓名標示-相同方式分享 2.0 通用條款授權 log_in: 登入 @@ -640,10 +632,6 @@ zh-TW: body: 抱歉，並沒有這個 id 的訊息。 heading: 沒有這個訊息 title: 沒有這個訊息 - no_such_user: - body: 抱歉沒有這個名字的使用者。 - heading: 沒有這個使用者 - title: 沒有這個使用者 outbox: date: 日期 inbox: 收件匣 @@ -832,12 +820,11 @@ zh-TW: index: js_1: 您使用不支援 JavaScript 的瀏覽器，或者停用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 讓地圖更平順。 - js_3: 如果您無法啟用 JavaScript，可以試試 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home 靜態拼貼瀏覽器</a>。 license: license_name: 創用 CC 姓名標示-相同方式分享 2.0 notice: 由 %{project_name} 和它的貢獻者依 %{license_name} 條款授權。 project_name: OpenStreetMap 計畫 - permalink: 靜態連結 + permalink: 永久鏈接 remote_failed: 編輯失敗 - 請確定已載入 JOSM 或 Merkaartor 並啟用遠端控制選項 shortlink: 簡短連結 key: @@ -940,10 +927,6 @@ zh-TW: your_traces: 您的 GPS 軌跡 make_public: made_public: 軌跡標記為公開 - no_such_user: - body: 抱歉，沒有名為 %{user} 的使用者。請檢查您的拼字，或者可能是按到錯誤的連結。 - heading: 使用者 %{user} 不存在 - title: 沒有這個使用者 offline: heading: GPX 離線儲存 message: GPX 檔案儲存，上傳系統目前無法使用。 @@ -982,8 +965,6 @@ zh-TW: trace_optionals: tags: 標籤 trace_paging_nav: - next: 下一頁 » - previous: « 上一頁 showing_page: 顯示頁面 %{page} view: delete_track: 刪除這個軌跡 @@ -1199,7 +1180,7 @@ zh-TW: role: administrator: 這個使用者是管理者 send message: 傳送訊息 - settings_link_text: 設定值 + settings_link_text: 設定 spam score: 垃圾郵件分數： status: 狀態： traces: 軌跡 diff --git a/config/openlayers.cfg b/config/openlayers.cfg index 64c76fcd1..1d4f45a56 100644 --- a/config/openlayers.cfg +++ b/config/openlayers.cfg @@ -1,10 +1,4 @@ [first] -OpenLayers/SingleFile.js -OpenLayers.js -OpenLayers/BaseTypes.js -OpenLayers/BaseTypes/Class.js -OpenLayers/Util.js -Rico/Corner.js [last] @@ -17,6 +11,7 @@ OpenLayers/Control/DrawFeature.js OpenLayers/Control/LayerSwitcher.js OpenLayers/Control/Navigation.js OpenLayers/Control/PanZoomBar.js +OpenLayers/Control/Zoom.js OpenLayers/Control/PinchZoom.js OpenLayers/Control/ScaleLine.js OpenLayers/Control/SelectFeature.js @@ -25,19 +20,20 @@ OpenLayers/Layer.js OpenLayers/Layer/GML.js OpenLayers/Layer/Markers.js OpenLayers/Layer/SphericalMercator.js -OpenLayers/Layer/XYZ.js +OpenLayers/Layer/OSM.js OpenLayers/Layer/Vector.js OpenLayers/Tile.js OpenLayers/Tile/Image.js OpenLayers/Feature/Vector.js +OpenLayers/Strategy/Fixed.js +OpenLayers/Strategy/BBOX.js +OpenLayers/Protocol/HTTP.js OpenLayers/Format/GeoJSON.js -OpenLayers/Format/GML.js OpenLayers/Format/OSM.js OpenLayers/Geometry/Point.js OpenLayers/Geometry/LinearRing.js OpenLayers/Handler/Point.js OpenLayers/Handler/RegularPolygon.js -OpenLayers/Strategy/BBOX.js OpenLayers/Protocol/HTTP.js OpenLayers/Renderer.js OpenLayers/Renderer/Canvas.js diff --git a/config/potlatch/locales/be-TARASK.yml b/config/potlatch/locales/be-Tarask.yml similarity index 100% rename from config/potlatch/locales/be-TARASK.yml rename to config/potlatch/locales/be-Tarask.yml diff --git a/config/potlatch/locales/sr-EC.yml b/config/potlatch/locales/sr.yml similarity index 100% rename from config/potlatch/locales/sr-EC.yml rename to config/potlatch/locales/sr.yml diff --git a/config/routes.rb b/config/routes.rb index a3d503b33..6fbe07f8e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ OpenStreetMap::Application.routes.draw do # API match 'api/capabilities' => 'api#capabilities', :via => :get match 'api/0.6/capabilities' => 'api#capabilities', :via => :get + match 'api/0.6/permissions' => 'api#permissions', :via => :get match 'api/0.6/changeset/create' => 'changeset#create', :via => :put match 'api/0.6/changeset/:id/upload' => 'changeset#upload', :via => :post, :id => /\d+/ @@ -16,6 +17,7 @@ OpenStreetMap::Application.routes.draw do match 'api/0.6/node/:id/ways' => 'way#ways_for_node', :via => :get, :id => /\d+/ match 'api/0.6/node/:id/relations' => 'relation#relations_for_node', :via => :get, :id => /\d+/ match 'api/0.6/node/:id/history' => 'old_node#history', :via => :get, :id => /\d+/ + match 'api/0.6/node/:id/:version/redact' => 'old_node#redact', :via => :post, :version => /\d+/, :id => /\d+/ match 'api/0.6/node/:id/:version' => 'old_node#version', :via => :get, :id => /\d+/, :version => /\d+/ match 'api/0.6/node/:id' => 'node#read', :via => :get, :id => /\d+/ match 'api/0.6/node/:id' => 'node#update', :via => :put, :id => /\d+/ @@ -26,6 +28,7 @@ OpenStreetMap::Application.routes.draw do match 'api/0.6/way/:id/history' => 'old_way#history', :via => :get, :id => /\d+/ match 'api/0.6/way/:id/full' => 'way#full', :via => :get, :id => /\d+/ match 'api/0.6/way/:id/relations' => 'relation#relations_for_way', :via => :get, :id => /\d+/ + match 'api/0.6/way/:id/:version/redact' => 'old_way#redact', :via => :post, :version => /\d+/, :id => /\d+/ match 'api/0.6/way/:id/:version' => 'old_way#version', :via => :get, :id => /\d+/, :version => /\d+/ match 'api/0.6/way/:id' => 'way#read', :via => :get, :id => /\d+/ match 'api/0.6/way/:id' => 'way#update', :via => :put, :id => /\d+/ @@ -36,6 +39,7 @@ OpenStreetMap::Application.routes.draw do match 'api/0.6/relation/:id/relations' => 'relation#relations_for_relation', :via => :get, :id => /\d+/ match 'api/0.6/relation/:id/history' => 'old_relation#history', :via => :get, :id => /\d+/ match 'api/0.6/relation/:id/full' => 'relation#full', :via => :get, :id => /\d+/ + match 'api/0.6/relation/:id/:version/redact' => 'old_relation#redact', :via => :post, :version => /\d+/, :id => /\d+/ match 'api/0.6/relation/:id/:version' => 'old_relation#version', :via => :get, :id => /\d+/, :version => /\d+/ match 'api/0.6/relation/:id' => 'relation#read', :via => :get, :id => /\d+/ match 'api/0.6/relation/:id' => 'relation#update', :via => :put, :id => /\d+/ @@ -114,7 +118,7 @@ OpenStreetMap::Application.routes.draw do match '/browse' => 'changeset#list', :via => :get # web site - root :to => 'site#index', :via => :get + root :to => 'site#index', :via => [:get, :post] match '/edit' => 'site#edit', :via => :get match '/copyright/:copyright_locale' => 'site#copyright', :via => :get match '/copyright' => 'site#copyright', :via => :get @@ -144,6 +148,9 @@ OpenStreetMap::Application.routes.draw do # permalink match '/go/:code' => 'site#permalink', :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/ + # rich text preview + match '/preview/:format' => 'site#preview', :as => :preview + # traces match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list', :via => :get match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get @@ -184,16 +191,16 @@ OpenStreetMap::Application.routes.draw do match '/user/:display_name/diary/:id' => 'diary_entry#view', :via => :get, :id => /\d+/ match '/user/:display_name/diary/:id/newcomment' => 'diary_entry#comment', :via => :post, :id => /\d+/ match '/user/:display_name/diary/:id/edit' => 'diary_entry#edit', :via => [:get, :post], :id => /\d+/ - match '/user/:display_name/diary/:id/hide' => 'diary_entry#hide', :via => :post, :id => /\d+/ - match '/user/:display_name/diary/:id/hidecomment/:comment' => 'diary_entry#hidecomment', :via => :post, :id => /\d+/, :comment => /\d+/ + match '/user/:display_name/diary/:id/hide' => 'diary_entry#hide', :via => :post, :id => /\d+/, :as => :hide_diary_entry + match '/user/:display_name/diary/:id/hidecomment/:comment' => 'diary_entry#hidecomment', :via => :post, :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment # user pages - match '/user/:display_name' => 'user#view', :via => :get - match '/user/:display_name/make_friend' => 'user#make_friend', :via => :get - match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => :get + match '/user/:display_name' => 'user#view', :via => :get, :as => "user" + match '/user/:display_name/make_friend' => 'user#make_friend', :via => [:get, :post], :as => "make_friend" + match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => [:get, :post], :as => "remove_friend" match '/user/:display_name/account' => 'user#account', :via => [:get, :post] - match '/user/:display_name/set_status' => 'user#set_status', :via => :get - match '/user/:display_name/delete' => 'user#delete', :via => :get + match '/user/:display_name/set_status' => 'user#set_status', :via => :get, :as => :set_status_user + match '/user/:display_name/delete' => 'user#delete', :via => :get, :as => :delete_user # user lists match '/users' => 'user#list', :via => [:get, :post] @@ -220,11 +227,11 @@ OpenStreetMap::Application.routes.draw do # messages match '/user/:display_name/inbox' => 'message#inbox', :via => :get, :as => "inbox" match '/user/:display_name/outbox' => 'message#outbox', :via => :get, :as => "outbox" - match '/message/new/:display_name' => 'message#new', :via => [:get, :post] - match '/message/read/:message_id' => 'message#read', :via => :get - match '/message/mark/:message_id' => 'message#mark', :via => :post - match '/message/reply/:message_id' => 'message#reply', :via => [:get, :post] - match '/message/delete/:message_id' => 'message#delete', :via => :post + match '/message/new/:display_name' => 'message#new', :via => [:get, :post], :as => "new_message" + match '/message/read/:message_id' => 'message#read', :via => :get, :as => "read_message" + match '/message/mark/:message_id' => 'message#mark', :via => :post, :as => "mark_message" + match '/message/reply/:message_id' => 'message#reply', :via => [:get, :post], :as => "reply_message" + match '/message/delete/:message_id' => 'message#delete', :via => :post, :as => "delete_message" # oauth admin pages (i.e: for setting up new clients, etc...) scope "/user/:display_name" do @@ -238,11 +245,14 @@ OpenStreetMap::Application.routes.draw do match '/oauth/test_request' => 'oauth#test_request', :as => :test_request # roles and banning pages - match '/user/:display_name/role/:role/grant' => 'user_roles#grant', :via => [:get, :post] - match '/user/:display_name/role/:role/revoke' => 'user_roles#revoke', :via => [:get, :post] + match '/user/:display_name/role/:role/grant' => 'user_roles#grant', :via => :post, :as => "grant_role" + match '/user/:display_name/role/:role/revoke' => 'user_roles#revoke', :via => :post, :as => "revoke_role" match '/user/:display_name/blocks' => 'user_blocks#blocks_on', :via => :get match '/user/:display_name/blocks_by' => 'user_blocks#blocks_by', :via => :get - match '/blocks/new/:display_name' => 'user_blocks#new', :via => :get + match '/blocks/new/:display_name' => 'user_blocks#new', :via => :get, :as => "new_user_block" resources :user_blocks - match '/blocks/:id/revoke' => 'user_blocks#revoke', :via => [:get, :post] + match '/blocks/:id/revoke' => 'user_blocks#revoke', :via => [:get, :post], :as => "revoke_user_block" + + # redactions + resources :redactions end diff --git a/db/migrate/20120214210114_add_text_format.rb b/db/migrate/20120214210114_add_text_format.rb new file mode 100644 index 000000000..5b4455f58 --- /dev/null +++ b/db/migrate/20120214210114_add_text_format.rb @@ -0,0 +1,21 @@ +require 'migrate' + +class AddTextFormat < ActiveRecord::Migration + def up + create_enumeration :format_enum, ["html", "markdown", "text"] + add_column :users, :description_format, :format_enum, :null => false, :default => "html" + add_column :user_blocks, :reason_format, :format_enum, :null => false, :default => "html" + add_column :diary_entries, :body_format, :format_enum, :null => false, :default => "html" + add_column :diary_comments, :body_format, :format_enum, :null => false, :default => "html" + add_column :messages, :body_format, :format_enum, :null => false, :default => "html" + end + + def down + remove_column :messages, :body_format + remove_column :diary_comments, :body_format + remove_column :diary_entries, :body_format + remove_column :user_blocks, :reason_format + remove_column :users, :description_format + drop_enumeration :format_enum + end +end diff --git a/db/migrate/20120318201948_create_redactions.rb b/db/migrate/20120318201948_create_redactions.rb new file mode 100644 index 000000000..b6ee96037 --- /dev/null +++ b/db/migrate/20120318201948_create_redactions.rb @@ -0,0 +1,26 @@ +require 'migrate' + +class CreateRedactions < ActiveRecord::Migration + def up + create_table :redactions do |t| + t.string :title + t.text :description + + t.timestamps + end + + [:nodes, :ways, :relations].each do |tbl| + add_column tbl, :redaction_id, :integer, :null => true + add_foreign_key tbl, [:redaction_id], :redactions, [:id] + end + end + + def down + [:nodes, :ways, :relations].each do |tbl| + remove_foreign_key tbl, [:redaction_id], :redactions, [:id] + remove_column tbl, :redaction_id + end + + drop_table :redactions + end +end diff --git a/db/migrate/20120328090602_drop_session_table.rb b/db/migrate/20120328090602_drop_session_table.rb new file mode 100644 index 000000000..e5f9739a5 --- /dev/null +++ b/db/migrate/20120328090602_drop_session_table.rb @@ -0,0 +1,17 @@ +require 'migrate' + +class DropSessionTable < ActiveRecord::Migration + def up + drop_table "sessions" + end + + def down + create_table "sessions", :options => innodb_option do |t| + t.column "session_id", :string + t.column "data", :text + t.column "created_at", :timestamp + t.column "updated_at", :timestamp + end + add_index "sessions", ["session_id"], :name => "sessions_session_id_idx", :unique => true + end +end diff --git a/db/migrate/20120404205604_add_user_and_description_to_redaction.rb b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb new file mode 100644 index 000000000..05c75d37e --- /dev/null +++ b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb @@ -0,0 +1,17 @@ +require 'migrate' + +class AddUserAndDescriptionToRedaction < ActiveRecord::Migration + def up + add_column :redactions, :user_id, :bigint, :null => false + add_column :redactions, :description_format, :format_enum, :null => false, :default => "markdown" + + add_foreign_key :redactions, [:user_id], :users, [:id] + end + + def down + remove_foreign_key :redactions, [:user_id], :users, [:id] + + remove_column :redactions, :description_format + remove_column :redactions, :user_id + end +end diff --git a/db/migrate/20120808231205_add_counter_caches.rb b/db/migrate/20120808231205_add_counter_caches.rb new file mode 100644 index 000000000..a26f204da --- /dev/null +++ b/db/migrate/20120808231205_add_counter_caches.rb @@ -0,0 +1,19 @@ +class AddCounterCaches < ActiveRecord::Migration + def self.up + add_column :users, :changesets_count, :integer, :null => false, :default => 0 + add_column :users, :traces_count, :integer, :null => false, :default => 0 + + Changeset.group(:user_id).pluck(:user_id).each do |user_id| + User.reset_counters(user_id, :changesets) + end + + Trace.group(:user_id).pluck(:user_id).each do |user_id| + User.reset_counters(user_id, :traces) + end + end + + def self.down + remove_column :users, :changesets_count + remove_column :users, :traces_count + end +end diff --git a/db/structure.sql b/db/structure.sql index 0cd89a11d..fb5069bf9 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -38,6 +38,17 @@ COMMENT ON EXTENSION btree_gist IS 'support for indexing common datatypes in GiS SET search_path = public, pg_catalog; +-- +-- Name: format_enum; Type: TYPE; Schema: public; Owner: - +-- + +CREATE TYPE format_enum AS ENUM ( + 'html', + 'markdown', + 'text' +); + + -- -- Name: gpx_visibility_enum; Type: TYPE; Schema: public; Owner: - -- @@ -461,7 +472,8 @@ CREATE TABLE diary_comments ( body text NOT NULL, created_at timestamp without time zone NOT NULL, updated_at timestamp without time zone NOT NULL, - visible boolean DEFAULT true NOT NULL + visible boolean DEFAULT true NOT NULL, + body_format format_enum DEFAULT 'html'::format_enum NOT NULL ); @@ -498,7 +510,8 @@ CREATE TABLE diary_entries ( latitude double precision, longitude double precision, language_code character varying(255) DEFAULT 'en'::character varying NOT NULL, - visible boolean DEFAULT true NOT NULL + visible boolean DEFAULT true NOT NULL, + body_format format_enum DEFAULT 'html'::format_enum NOT NULL ); @@ -658,7 +671,8 @@ CREATE TABLE messages ( message_read boolean DEFAULT false NOT NULL, to_user_id bigint NOT NULL, to_user_visible boolean DEFAULT true NOT NULL, - from_user_visible boolean DEFAULT true NOT NULL + from_user_visible boolean DEFAULT true NOT NULL, + body_format format_enum DEFAULT 'html'::format_enum NOT NULL ); @@ -705,7 +719,8 @@ CREATE TABLE nodes ( visible boolean NOT NULL, "timestamp" timestamp without time zone NOT NULL, tile bigint NOT NULL, - version bigint NOT NULL + version bigint NOT NULL, + redaction_id integer ); @@ -860,6 +875,40 @@ CREATE SEQUENCE oauth_tokens_id_seq ALTER SEQUENCE oauth_tokens_id_seq OWNED BY oauth_tokens.id; +-- +-- Name: redactions; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- + +CREATE TABLE redactions ( + id integer NOT NULL, + title character varying(255), + description text, + created_at timestamp without time zone NOT NULL, + updated_at timestamp without time zone NOT NULL, + user_id bigint NOT NULL, + description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL +); + + +-- +-- Name: redactions_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE redactions_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: redactions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE redactions_id_seq OWNED BY redactions.id; + + -- -- Name: relation_members; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -895,7 +944,8 @@ CREATE TABLE relations ( changeset_id bigint NOT NULL, "timestamp" timestamp without time zone NOT NULL, version bigint NOT NULL, - visible boolean DEFAULT true NOT NULL + visible boolean DEFAULT true NOT NULL, + redaction_id integer ); @@ -908,38 +958,6 @@ CREATE TABLE schema_migrations ( ); --- --- Name: sessions; Type: TABLE; Schema: public; Owner: -; Tablespace: --- - -CREATE TABLE sessions ( - id integer NOT NULL, - session_id character varying(255), - data text, - created_at timestamp without time zone, - updated_at timestamp without time zone -); - - --- --- Name: sessions_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE sessions_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: sessions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE sessions_id_seq OWNED BY sessions.id; - - -- -- Name: user_blocks; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -953,7 +971,8 @@ CREATE TABLE user_blocks ( needs_view boolean DEFAULT false NOT NULL, revoker_id bigint, created_at timestamp without time zone, - updated_at timestamp without time zone + updated_at timestamp without time zone, + reason_format format_enum DEFAULT 'html'::format_enum NOT NULL ); @@ -1080,7 +1099,10 @@ CREATE TABLE users ( openid_url character varying(255), preferred_editor character varying(255), terms_seen boolean DEFAULT false NOT NULL, - image_fingerprint character varying(255) + image_fingerprint character varying(255), + description_format format_enum DEFAULT 'html'::format_enum NOT NULL, + changesets_count integer DEFAULT 0 NOT NULL, + traces_count integer DEFAULT 0 NOT NULL ); @@ -1136,7 +1158,8 @@ CREATE TABLE ways ( changeset_id bigint NOT NULL, "timestamp" timestamp without time zone NOT NULL, version bigint NOT NULL, - visible boolean DEFAULT true NOT NULL + visible boolean DEFAULT true NOT NULL, + redaction_id integer ); @@ -1263,7 +1286,7 @@ ALTER TABLE ONLY oauth_tokens ALTER COLUMN id SET DEFAULT nextval('oauth_tokens_ -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- -ALTER TABLE ONLY sessions ALTER COLUMN id SET DEFAULT nextval('sessions_id_seq'::regclass); +ALTER TABLE ONLY redactions ALTER COLUMN id SET DEFAULT nextval('redactions_id_seq'::regclass); -- @@ -1494,6 +1517,14 @@ ALTER TABLE ONLY oauth_tokens ADD CONSTRAINT oauth_tokens_pkey PRIMARY KEY (id); +-- +-- Name: redactions_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- + +ALTER TABLE ONLY redactions + ADD CONSTRAINT redactions_pkey PRIMARY KEY (id); + + -- -- Name: relation_members_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -1518,14 +1549,6 @@ ALTER TABLE ONLY relations ADD CONSTRAINT relations_pkey PRIMARY KEY (relation_id, version); --- --- Name: sessions_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: --- - -ALTER TABLE ONLY sessions - ADD CONSTRAINT sessions_pkey PRIMARY KEY (id); - - -- -- Name: user_blocks_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -1891,13 +1914,6 @@ CREATE INDEX relations_changeset_id_idx ON relations USING btree (changeset_id); CREATE INDEX relations_timestamp_idx ON relations USING btree ("timestamp"); --- --- Name: sessions_session_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE UNIQUE INDEX sessions_session_id_idx ON sessions USING btree (session_id); - - -- -- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -2189,6 +2205,14 @@ ALTER TABLE ONLY nodes ADD CONSTRAINT nodes_changeset_id_fkey FOREIGN KEY (changeset_id) REFERENCES changesets(id); +-- +-- Name: nodes_redaction_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY nodes + ADD CONSTRAINT nodes_redaction_id_fkey FOREIGN KEY (redaction_id) REFERENCES redactions(id); + + -- -- Name: note_comments_author_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -2221,6 +2245,14 @@ ALTER TABLE ONLY oauth_tokens ADD CONSTRAINT oauth_tokens_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id); +-- +-- Name: redactions_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY redactions + ADD CONSTRAINT redactions_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id); + + -- -- Name: relation_members_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -2245,6 +2277,14 @@ ALTER TABLE ONLY relations ADD CONSTRAINT relations_changeset_id_fkey FOREIGN KEY (changeset_id) REFERENCES changesets(id); +-- +-- Name: relations_redaction_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY relations + ADD CONSTRAINT relations_redaction_id_fkey FOREIGN KEY (redaction_id) REFERENCES redactions(id); + + -- -- Name: user_blocks_moderator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -2325,6 +2365,14 @@ ALTER TABLE ONLY ways ADD CONSTRAINT ways_changeset_id_fkey FOREIGN KEY (changeset_id) REFERENCES changesets(id); +-- +-- Name: ways_redaction_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY ways + ADD CONSTRAINT ways_redaction_id_fkey FOREIGN KEY (redaction_id) REFERENCES redactions(id); + + -- -- PostgreSQL database dump complete -- @@ -2381,8 +2429,18 @@ INSERT INTO schema_migrations (version) VALUES ('20120208122334'); INSERT INTO schema_migrations (version) VALUES ('20120208194454'); +INSERT INTO schema_migrations (version) VALUES ('20120214210114'); + INSERT INTO schema_migrations (version) VALUES ('20120219161649'); +INSERT INTO schema_migrations (version) VALUES ('20120318201948'); + +INSERT INTO schema_migrations (version) VALUES ('20120328090602'); + +INSERT INTO schema_migrations (version) VALUES ('20120404205604'); + +INSERT INTO schema_migrations (version) VALUES ('20120808231205'); + INSERT INTO schema_migrations (version) VALUES ('21'); INSERT INTO schema_migrations (version) VALUES ('22'); diff --git a/lib/not_redactable.rb b/lib/not_redactable.rb new file mode 100644 index 000000000..d7c952463 --- /dev/null +++ b/lib/not_redactable.rb @@ -0,0 +1,11 @@ +require 'osm' + +module NotRedactable + def redacted? + false + end + + def redact!(r) + raise OSM::APICannotRedactError.new + end +end diff --git a/lib/osm.rb b/lib/osm.rb index c85abc0f3..8902e6c9e 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -6,7 +6,6 @@ module OSM require 'rexml/text' require 'xml/libxml' require 'digest/md5' - require 'nokogiri' if defined?(SystemTimer) Timer = SystemTimer @@ -269,6 +268,19 @@ module OSM end end + ## + # raised when someone tries to redact a current version of + # an element - only historical versions can be redacted. + class APICannotRedactError < APIError + def status + :bad_request + end + + def to_s + "Cannot redact current version of element, only historical versions may be redacted." + end + end + # Helper methods for going to/from mercator and lat/lng. class Mercator include Math @@ -511,27 +523,6 @@ module OSM "AND #{prefix}longitude BETWEEN #{bbox.min_lon} AND #{bbox.max_lon}" end - # Return a spam score for a chunk of text - def self.spam_score(text) - link_count = 0 - link_size = 0 - - doc = Nokogiri::HTML(Rinku.auto_link(text, :urls)) - - if doc.content.length > 0 - doc.xpath("//a").each do |link| - link_count += 1 - link_size += link.content.length - end - - link_proportion = link_size.to_f / doc.content.length.to_f - else - link_proportion = 0 - end - - return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20 - end - def self.legal_text_for_country(country_code) file_name = File.join(Rails.root, "config", "legales", country_code.to_s + ".yml") file_name = File.join(Rails.root, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name diff --git a/lib/potlatch.rb b/lib/potlatch.rb index 43be2f8b4..919eb0122 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -8,18 +8,20 @@ module Potlatch # Return two-byte integer def self.getint(s) - s.getc*256+s.getc + s.getbyte*256+s.getbyte end # Return four-byte long def self.getlong(s) - ((s.getc*256+s.getc)*256+s.getc)*256+s.getc + ((s.getbyte*256+s.getbyte)*256+s.getbyte)*256+s.getbyte end # Return string with two-byte length def self.getstring(s) - len=s.getc*256+s.getc - s.read(len) + len=s.getbyte*256+s.getbyte + str=s.read(len) + str.force_encoding("UTF-8") if str.respond_to?("force_encoding") + str end # Return eight-byte double-precision float @@ -45,23 +47,23 @@ module Potlatch if (key=='') then break end arr[key]=getvalue(s) end - s.getc # skip the 9 'end of object' value + s.getbyte # skip the 9 'end of object' value arr end # Parse and get value def self.getvalue(s) - case s.getc + case s.getbyte when 0; return getdouble(s) # number - when 1; return s.getc # boolean + when 1; return s.getbyte # boolean when 2; return getstring(s) # string when 3; return getobject(s) # object/hash - when 5; return nil # null - when 6; return nil # undefined - when 8; s.read(4) # mixedArray - return getobject(s) # | - when 10;return getarray(s) # array - else; return nil # error + when 5; return nil # null + when 6; return nil # undefined + when 8; s.read(4) # mixedArray + return getobject(s) # | + when 10; return getarray(s) # array + else; return nil # error end end @@ -134,7 +136,7 @@ module Potlatch # Skip headers AMF.getint(@request).times do # Read number of headers and loop AMF.getstring(@request) # | skip name - req.getc # | skip boolean + req.getbyte # | skip boolean AMF.getvalue(@request) # | skip value end diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb index 45c0ccde9..31d0e9076 100644 --- a/lib/potlatch2.rb +++ b/lib/potlatch2.rb @@ -1,16 +1,36 @@ module Potlatch2 LOCALES = { + "ar" => "ar", "ast" => "ast", + "be" => "be-tarask", "br" => "br", + "ca" => "ca", + "cs" => "cs_CZ", + "da" => "da", "de" => "de_DE", + "diq" => "diq", + "dsb" => "dsb", "en" => "en_US", "en-GB" => "en_GB", + "el" => "el", "es" => "es_ES", + "et" => "et", + "fa" => "fa", "fi" => "fi", "fr" => "fr_FR", + "ga" => "ga", + "gl" => "gl", "he" => "he", "hsb" => "hsb", + "hu" => "hu", + "ia" => "ia", + "it" => "it_IT", "ja" => "ja_JP", + "ka" => "ka", + "ko" => "ko", + "lb" => "lb", + "lt" => "lt", + "lv" => "lv", "mk" => "mk", "ms" => "ms", "nb" => "nb_NO", @@ -18,9 +38,20 @@ module Potlatch2 "nn" => "nn_NO", "no" => "nb_NO", "pl" => "pl_PL", + "pt" => "pt_PT", + "pt-BR" => "pt_BR", "ru" => "ru", + "rue" => "rue", + "sk" => "sk", + "sl" => "sl", "sq" => "sq", + "sr-EC" => "sr-ec", + "sr-EL" => "sr-el", + "sv" => "sv_SE", + "ta" => "ta", + "tl" => "tl", "tr" => "tr", + "uk" => "uk", "vi" => "vi_VN", "zh" => "zh_CN" } diff --git a/lib/redactable.rb b/lib/redactable.rb new file mode 100644 index 000000000..d8367d7bd --- /dev/null +++ b/lib/redactable.rb @@ -0,0 +1,22 @@ +require 'osm' + +module Redactable + def self.included(base) + # this is used to extend activerecord bases, as these aren't + # in scope for the module itself. + base.scope :unredacted, base.where(:redaction_id => nil) + end + + def redacted? + not self.redaction.nil? + end + + def redact!(redaction) + # check that this version isn't the current version + raise OSM::APICannotRedactError.new if self.is_latest_version? + + # make the change + self.redaction = redaction + self.save! + end +end diff --git a/lib/rich_text.rb b/lib/rich_text.rb new file mode 100644 index 000000000..87ea58933 --- /dev/null +++ b/lib/rich_text.rb @@ -0,0 +1,117 @@ +module RichText + def self.new(format, text) + case format + when "html"; HTML.new(text || "") + when "markdown"; Markdown.new(text || "") + when "text"; Text.new(text || "") + else; nil + end + end + + class SimpleFormat + include ActionView::Helpers::TextHelper + + def sanitize(text) + Sanitize.clean(text, Sanitize::Config::OSM).html_safe + end + end + + class Base < String + include ActionView::Helpers::TagHelper + + def spam_score + link_count = 0 + link_size = 0 + + doc = Nokogiri::HTML(to_html) + + if doc.content.length > 0 + doc.xpath("//a").each do |link| + link_count += 1 + link_size += link.content.length + end + + link_proportion = link_size.to_f / doc.content.length.to_f + else + link_proportion = 0 + end + + return [link_proportion - 0.2, 0.0].max * 200 + link_count * 40 + end + + protected + + def simple_format(text) + SimpleFormat.new.simple_format(text) + end + + def linkify(text) + if text.html_safe? + Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe + else + Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")) + end + end + end + + class HTML < Base + def to_html + linkify(sanitize(simple_format(self))) + end + + def to_text + self.to_s + end + + private + + def sanitize(text) + Sanitize.clean(text, Sanitize::Config::OSM).html_safe + end + end + + class Markdown < Base + def to_html + html_parser.render(self).html_safe + end + + def to_text + self.to_s + end + + private + + def html_parser + @@html_renderer ||= Renderer.new({ + :filter_html => true, :safe_links_only => true + }) + @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer, { + :no_intra_emphasis => true, :autolink => true, :space_after_headers => true + }) + end + + class Renderer < Redcarpet::Render::XHTML + def link(link, title, alt_text) + "<a rel=\"nofollow\" href=\"#{link}\">#{alt_text}</a>" + end + + def autolink(link, link_type) + if link_type == :email + "<a rel=\"nofollow\" href=\"mailto:#{link}\">#{link}</a>" + else + "<a rel=\"nofollow\" href=\"#{link}\">#{link}</a>" + end + end + end + end + + class Text < Base + def to_html + linkify(simple_format(ERB::Util.html_escape(self))) + end + + def to_text + self.to_s + end + end +end diff --git a/lib/utf8.rb b/lib/utf8.rb index 90b8f0413..c6e1918af 100644 --- a/lib/utf8.rb +++ b/lib/utf8.rb @@ -1,16 +1,21 @@ -require 'iconv' - module UTF8 ## # Checks that a string is valid UTF-8 by trying to convert it to UTF-8 # using the iconv library, which is in the standard library. - def self.valid?(str) - return true if str.nil? - Iconv.conv("UTF-8", "UTF-8", str) - return true - - rescue - return false - end -end + if String.new.respond_to?("valid_encoding?") + def self.valid?(str) + return true if str.nil? + return str.valid_encoding? + end + else + require 'iconv' + def self.valid?(str) + return true if str.nil? + Iconv.conv("UTF-8", "UTF-8", str) + return true + rescue + return false + end + end +end diff --git a/public/export/embed.html b/public/export/embed.html index 43678db03..a0398ab94 100644 --- a/public/export/embed.html +++ b/public/export/embed.html @@ -42,27 +42,38 @@ var attribution = '(C) <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, <a target="_parent" href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>'; var args = OpenLayers.Util.getParameters(); - if (!args.layer || args.layer == "mapnik") { + if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") { var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true, wrapDateLine: true, attribution: attribution }); map.addLayer(mapnik); - } else if (args.layer == "osmarender") { - var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { + } else if (args.layer == "cyclemap" || args.layer == "cycle map") { + var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", { displayOutsideMaxExtent: true, wrapDateLine: true, attribution: attribution }); - map.addLayer(osmarender); - } else if (args.layer == "cyclemap" || args.layer == "cycle map") { - var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", { + map.addLayer(cyclemap); + } else if (args.layer == "transportmap") { + var transportmap = new OpenLayers.Layer.OSM.TransportMap("Transport Map", { displayOutsideMaxExtent: true, wrapDateLine: true, attribution: attribution }); - map.addLayer(cyclemap); + map.addLayer(transportmap); + } else if (args.layer == "mapquest") { + var mapquestmap = new OpenLayers.Layer.OSM("MapQuest Open Map", [ + "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png"], { + displayOutsideMaxExtent: true, + wrapDateLine: true, + attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>" + }); + map.addLayer(mapquestmap); } if (args.marker) { @@ -83,7 +94,7 @@ if (size.h > 320) { map.addControl(new OpenLayers.Control.PanZoomBar()); } else { - map.addControl(new OpenLayers.Control.PanZoom()); + map.addControl(new OpenLayers.Control.Zoom()); } } // --> diff --git a/public/googlefac54c35e800caab.html b/public/googlefac54c35e800caab.html new file mode 100644 index 000000000..550556d3d --- /dev/null +++ b/public/googlefac54c35e800caab.html @@ -0,0 +1 @@ +google-site-verification: googlefac54c35e800caab.html diff --git a/public/potlatch2/bing_maps.png b/public/potlatch2/bing_maps.png deleted file mode 100644 index bbc4b1dfa..000000000 Binary files a/public/potlatch2/bing_maps.png and /dev/null differ diff --git a/public/potlatch2/features/aeroway__aerodrome.png b/public/potlatch2/features/aeroway__aerodrome.png deleted file mode 100644 index 1f3e08852..000000000 Binary files a/public/potlatch2/features/aeroway__aerodrome.png and /dev/null differ diff --git a/public/potlatch2/features/aeroway__apron.png b/public/potlatch2/features/aeroway__apron.png deleted file mode 100644 index 57bca99a2..000000000 Binary files a/public/potlatch2/features/aeroway__apron.png and /dev/null differ diff --git a/public/potlatch2/features/aeroway__helipad.png b/public/potlatch2/features/aeroway__helipad.png deleted file mode 100644 index 2e575dbbc..000000000 Binary files a/public/potlatch2/features/aeroway__helipad.png and /dev/null differ diff --git a/public/potlatch2/features/aeroway__runway.png b/public/potlatch2/features/aeroway__runway.png deleted file mode 100644 index bbac49e8e..000000000 Binary files a/public/potlatch2/features/aeroway__runway.png and /dev/null differ diff --git a/public/potlatch2/features/aeroway__taxiway.png b/public/potlatch2/features/aeroway__taxiway.png deleted file mode 100644 index a5eda4d6a..000000000 Binary files a/public/potlatch2/features/aeroway__taxiway.png and /dev/null differ diff --git a/public/potlatch2/features/aeroway__terminal.png b/public/potlatch2/features/aeroway__terminal.png deleted file mode 100644 index 1f5857534..000000000 Binary files a/public/potlatch2/features/aeroway__terminal.png and /dev/null differ diff --git a/public/potlatch2/features/amenity__bus_station.png b/public/potlatch2/features/amenity__bus_station.png deleted file mode 100644 index b39567edd..000000000 Binary files a/public/potlatch2/features/amenity__bus_station.png and /dev/null differ diff --git a/public/potlatch2/features/amenity__parking.png b/public/potlatch2/features/amenity__parking.png deleted file mode 100644 index 0ea905139..000000000 Binary files a/public/potlatch2/features/amenity__parking.png and /dev/null differ diff --git a/public/potlatch2/features/barrier_generic.png b/public/potlatch2/features/barrier_generic.png deleted file mode 100644 index fe72ab408..000000000 Binary files a/public/potlatch2/features/barrier_generic.png and /dev/null differ diff --git a/public/potlatch2/features/bike-shop.png b/public/potlatch2/features/bike-shop.png deleted file mode 100644 index b7a0c68ac..000000000 Binary files a/public/potlatch2/features/bike-shop.png and /dev/null differ diff --git a/public/potlatch2/features/bugs/fixed.png b/public/potlatch2/features/bugs/fixed.png deleted file mode 100644 index 99c265bf4..000000000 Binary files a/public/potlatch2/features/bugs/fixed.png and /dev/null differ diff --git a/public/potlatch2/features/bugs/invalid.png b/public/potlatch2/features/bugs/invalid.png deleted file mode 100644 index 35bddf13f..000000000 Binary files a/public/potlatch2/features/bugs/invalid.png and /dev/null differ diff --git a/public/potlatch2/features/bugs/open.png b/public/potlatch2/features/bugs/open.png deleted file mode 100644 index 4432db938..000000000 Binary files a/public/potlatch2/features/bugs/open.png and /dev/null differ diff --git a/public/potlatch2/features/highway__living_street.png b/public/potlatch2/features/highway__living_street.png deleted file mode 100644 index 1143ec613..000000000 Binary files a/public/potlatch2/features/highway__living_street.png and /dev/null differ diff --git a/public/potlatch2/features/highway__motorway.png b/public/potlatch2/features/highway__motorway.png deleted file mode 100644 index d57e808b8..000000000 Binary files a/public/potlatch2/features/highway__motorway.png and /dev/null differ diff --git a/public/potlatch2/features/highway__motorway_link.png b/public/potlatch2/features/highway__motorway_link.png deleted file mode 100644 index db29b4ba5..000000000 Binary files a/public/potlatch2/features/highway__motorway_link.png and /dev/null differ diff --git a/public/potlatch2/features/highway__primary.png b/public/potlatch2/features/highway__primary.png deleted file mode 100644 index 096e69579..000000000 Binary files a/public/potlatch2/features/highway__primary.png and /dev/null differ diff --git a/public/potlatch2/features/highway__primary_link.png b/public/potlatch2/features/highway__primary_link.png deleted file mode 100644 index cf5528a13..000000000 Binary files a/public/potlatch2/features/highway__primary_link.png and /dev/null differ diff --git a/public/potlatch2/features/highway__residential.png b/public/potlatch2/features/highway__residential.png deleted file mode 100644 index 5632f52d3..000000000 Binary files a/public/potlatch2/features/highway__residential.png and /dev/null differ diff --git a/public/potlatch2/features/highway__secondary.png b/public/potlatch2/features/highway__secondary.png deleted file mode 100644 index 6d826c4d7..000000000 Binary files a/public/potlatch2/features/highway__secondary.png and /dev/null differ diff --git a/public/potlatch2/features/highway__secondary_link.png b/public/potlatch2/features/highway__secondary_link.png deleted file mode 100644 index fd348a8d0..000000000 Binary files a/public/potlatch2/features/highway__secondary_link.png and /dev/null differ diff --git a/public/potlatch2/features/highway__service.png b/public/potlatch2/features/highway__service.png deleted file mode 100644 index 4c356394f..000000000 Binary files a/public/potlatch2/features/highway__service.png and /dev/null differ diff --git a/public/potlatch2/features/highway__tertiary.png b/public/potlatch2/features/highway__tertiary.png deleted file mode 100644 index 16daae046..000000000 Binary files a/public/potlatch2/features/highway__tertiary.png and /dev/null differ diff --git a/public/potlatch2/features/highway__tertiary_link.png b/public/potlatch2/features/highway__tertiary_link.png deleted file mode 100644 index bc1010208..000000000 Binary files a/public/potlatch2/features/highway__tertiary_link.png and /dev/null differ diff --git a/public/potlatch2/features/highway__track.png b/public/potlatch2/features/highway__track.png deleted file mode 100644 index ce5855ed2..000000000 Binary files a/public/potlatch2/features/highway__track.png and /dev/null differ diff --git a/public/potlatch2/features/highway__trunk.png b/public/potlatch2/features/highway__trunk.png deleted file mode 100644 index 5018b4712..000000000 Binary files a/public/potlatch2/features/highway__trunk.png and /dev/null differ diff --git a/public/potlatch2/features/highway__trunk_link.png b/public/potlatch2/features/highway__trunk_link.png deleted file mode 100644 index 32a489621..000000000 Binary files a/public/potlatch2/features/highway__trunk_link.png and /dev/null differ diff --git a/public/potlatch2/features/highway__unclassified.png b/public/potlatch2/features/highway__unclassified.png deleted file mode 100644 index ae6ea7ba3..000000000 Binary files a/public/potlatch2/features/highway__unclassified.png and /dev/null differ diff --git a/public/potlatch2/features/highway__unknown.png b/public/potlatch2/features/highway__unknown.png deleted file mode 100644 index d61d54a91..000000000 Binary files a/public/potlatch2/features/highway__unknown.png and /dev/null differ diff --git a/public/potlatch2/features/manmade_lighthouse.png b/public/potlatch2/features/manmade_lighthouse.png deleted file mode 100644 index 6aaf5f9ff..000000000 Binary files a/public/potlatch2/features/manmade_lighthouse.png and /dev/null differ diff --git a/public/potlatch2/features/manmade_silo.png b/public/potlatch2/features/manmade_silo.png deleted file mode 100644 index be207ce02..000000000 Binary files a/public/potlatch2/features/manmade_silo.png and /dev/null differ diff --git a/public/potlatch2/features/manmade_tower.png b/public/potlatch2/features/manmade_tower.png deleted file mode 100644 index bcb4e3f40..000000000 Binary files a/public/potlatch2/features/manmade_tower.png and /dev/null differ diff --git a/public/potlatch2/features/oneway__-1.png b/public/potlatch2/features/oneway__-1.png deleted file mode 100644 index e8e680574..000000000 Binary files a/public/potlatch2/features/oneway__-1.png and /dev/null differ diff --git a/public/potlatch2/features/oneway__no.png b/public/potlatch2/features/oneway__no.png deleted file mode 100644 index a50e12ffa..000000000 Binary files a/public/potlatch2/features/oneway__no.png and /dev/null differ diff --git a/public/potlatch2/features/oneway__yes.png b/public/potlatch2/features/oneway__yes.png deleted file mode 100644 index 4236836ad..000000000 Binary files a/public/potlatch2/features/oneway__yes.png and /dev/null differ diff --git a/public/potlatch2/features/paths__bike.png b/public/potlatch2/features/paths__bike.png deleted file mode 100644 index 0d9c01285..000000000 Binary files a/public/potlatch2/features/paths__bike.png and /dev/null differ diff --git a/public/potlatch2/features/paths__bridleway.png b/public/potlatch2/features/paths__bridleway.png deleted file mode 100644 index 94772d018..000000000 Binary files a/public/potlatch2/features/paths__bridleway.png and /dev/null differ diff --git a/public/potlatch2/features/paths__footway.png b/public/potlatch2/features/paths__footway.png deleted file mode 100644 index c7c476e63..000000000 Binary files a/public/potlatch2/features/paths__footway.png and /dev/null differ diff --git a/public/potlatch2/features/paths__pedestrian.png b/public/potlatch2/features/paths__pedestrian.png deleted file mode 100644 index 3ad754937..000000000 Binary files a/public/potlatch2/features/paths__pedestrian.png and /dev/null differ diff --git a/public/potlatch2/features/paths__steps.png b/public/potlatch2/features/paths__steps.png deleted file mode 100644 index e32cfd8c7..000000000 Binary files a/public/potlatch2/features/paths__steps.png and /dev/null differ diff --git a/public/potlatch2/features/paths__unofficial.png b/public/potlatch2/features/paths__unofficial.png deleted file mode 100644 index fa428df53..000000000 Binary files a/public/potlatch2/features/paths__unofficial.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png b/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png deleted file mode 100644 index 2a6ec573a..000000000 Binary files a/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png b/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png deleted file mode 100644 index e40e3d80e..000000000 Binary files a/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_camping.n.24.png b/public/potlatch2/features/pois/accommodation_camping.n.24.png deleted file mode 100644 index 926bd4a40..000000000 Binary files a/public/potlatch2/features/pois/accommodation_camping.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png b/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png deleted file mode 100644 index 6a0c952d2..000000000 Binary files a/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_chalet.n.24.png b/public/potlatch2/features/pois/accommodation_chalet.n.24.png deleted file mode 100644 index 57d531ed4..000000000 Binary files a/public/potlatch2/features/pois/accommodation_chalet.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_hotel.n.24.png b/public/potlatch2/features/pois/accommodation_hotel.n.24.png deleted file mode 100644 index 129a44c6d..000000000 Binary files a/public/potlatch2/features/pois/accommodation_hotel.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_motel.n.24.png b/public/potlatch2/features/pois/accommodation_motel.n.24.png deleted file mode 100644 index d7a85b777..000000000 Binary files a/public/potlatch2/features/pois/accommodation_motel.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png deleted file mode 100644 index 68b8b04ef..000000000 Binary files a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png b/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png deleted file mode 100644 index 13f18df6d..000000000 Binary files a/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_bench.n.24.png b/public/potlatch2/features/pois/amenity_bench.n.24.png deleted file mode 100644 index 08c66b07a..000000000 Binary files a/public/potlatch2/features/pois/amenity_bench.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_firestation2.n.24.png b/public/potlatch2/features/pois/amenity_firestation2.n.24.png deleted file mode 100644 index 443189fba..000000000 Binary files a/public/potlatch2/features/pois/amenity_firestation2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_fountain2.n.24.png b/public/potlatch2/features/pois/amenity_fountain2.n.24.png deleted file mode 100644 index f8c5e3755..000000000 Binary files a/public/potlatch2/features/pois/amenity_fountain2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_information.n.24.png b/public/potlatch2/features/pois/amenity_information.n.24.png deleted file mode 100644 index c7fddf7bc..000000000 Binary files a/public/potlatch2/features/pois/amenity_information.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_library.n.24.png b/public/potlatch2/features/pois/amenity_library.n.24.png deleted file mode 100644 index 658e1f1ba..000000000 Binary files a/public/potlatch2/features/pois/amenity_library.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_playground.n.24.png b/public/potlatch2/features/pois/amenity_playground.n.24.png deleted file mode 100644 index 1e8494739..000000000 Binary files a/public/potlatch2/features/pois/amenity_playground.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_police2.n.24.png b/public/potlatch2/features/pois/amenity_police2.n.24.png deleted file mode 100644 index a9d6566f8..000000000 Binary files a/public/potlatch2/features/pois/amenity_police2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_post_box.n.24.png b/public/potlatch2/features/pois/amenity_post_box.n.24.png deleted file mode 100644 index 4b5eb86af..000000000 Binary files a/public/potlatch2/features/pois/amenity_post_box.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_post_office.n.24.png b/public/potlatch2/features/pois/amenity_post_office.n.24.png deleted file mode 100644 index 803665d05..000000000 Binary files a/public/potlatch2/features/pois/amenity_post_office.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_recycling.n.24.png b/public/potlatch2/features/pois/amenity_recycling.n.24.png deleted file mode 100644 index d608f7d7f..000000000 Binary files a/public/potlatch2/features/pois/amenity_recycling.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_telephone.n.24.png b/public/potlatch2/features/pois/amenity_telephone.n.24.png deleted file mode 100644 index 0fc460d20..000000000 Binary files a/public/potlatch2/features/pois/amenity_telephone.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_toilets.n.24.png b/public/potlatch2/features/pois/amenity_toilets.n.24.png deleted file mode 100644 index f8475f06f..000000000 Binary files a/public/potlatch2/features/pois/amenity_toilets.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_town_hall.n.24.png b/public/potlatch2/features/pois/amenity_town_hall.n.24.png deleted file mode 100644 index 390289c4d..000000000 Binary files a/public/potlatch2/features/pois/amenity_town_hall.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/amenity_waste_bin.n.24.png b/public/potlatch2/features/pois/amenity_waste_bin.n.24.png deleted file mode 100644 index fb06a04b7..000000000 Binary files a/public/potlatch2/features/pois/amenity_waste_bin.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_blocks.24.png b/public/potlatch2/features/pois/barrier_blocks.24.png deleted file mode 100644 index b6671478b..000000000 Binary files a/public/potlatch2/features/pois/barrier_blocks.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_bollard.n.24.png b/public/potlatch2/features/pois/barrier_bollard.n.24.png deleted file mode 100644 index 3000661f9..000000000 Binary files a/public/potlatch2/features/pois/barrier_bollard.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_cattle_grid.24.png b/public/potlatch2/features/pois/barrier_cattle_grid.24.png deleted file mode 100644 index 102da8984..000000000 Binary files a/public/potlatch2/features/pois/barrier_cattle_grid.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_cycle_barrier.24.png b/public/potlatch2/features/pois/barrier_cycle_barrier.24.png deleted file mode 100644 index 474efd6ba..000000000 Binary files a/public/potlatch2/features/pois/barrier_cycle_barrier.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_gate.n.24.png b/public/potlatch2/features/pois/barrier_gate.n.24.png deleted file mode 100644 index 0c18c5edd..000000000 Binary files a/public/potlatch2/features/pois/barrier_gate.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_kissing_gate.24.png b/public/potlatch2/features/pois/barrier_kissing_gate.24.png deleted file mode 100644 index a2c3e55b8..000000000 Binary files a/public/potlatch2/features/pois/barrier_kissing_gate.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_lift_gate.n.24.png b/public/potlatch2/features/pois/barrier_lift_gate.n.24.png deleted file mode 100644 index a41a3679e..000000000 Binary files a/public/potlatch2/features/pois/barrier_lift_gate.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_stile.n.24.png b/public/potlatch2/features/pois/barrier_stile.n.24.png deleted file mode 100644 index 9e04ae23d..000000000 Binary files a/public/potlatch2/features/pois/barrier_stile.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/barrier_toll_booth.n.24.png b/public/potlatch2/features/pois/barrier_toll_booth.n.24.png deleted file mode 100644 index 302492ada..000000000 Binary files a/public/potlatch2/features/pois/barrier_toll_booth.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/building_generic.png b/public/potlatch2/features/pois/building_generic.png deleted file mode 100644 index 669fb027f..000000000 Binary files a/public/potlatch2/features/pois/building_generic.png and /dev/null differ diff --git a/public/potlatch2/features/pois/education_nursery3.n.24.png b/public/potlatch2/features/pois/education_nursery3.n.24.png deleted file mode 100644 index b0314ff3e..000000000 Binary files a/public/potlatch2/features/pois/education_nursery3.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/education_school.n.24.png b/public/potlatch2/features/pois/education_school.n.24.png deleted file mode 100644 index 40abf2b68..000000000 Binary files a/public/potlatch2/features/pois/education_school.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/education_university.n.24.png b/public/potlatch2/features/pois/education_university.n.24.png deleted file mode 100644 index 62936341d..000000000 Binary files a/public/potlatch2/features/pois/education_university.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/emergency-telephone-24.png b/public/potlatch2/features/pois/emergency-telephone-24.png deleted file mode 100644 index 466ef96b7..000000000 Binary files a/public/potlatch2/features/pois/emergency-telephone-24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/food_bar.n.24.png b/public/potlatch2/features/pois/food_bar.n.24.png deleted file mode 100644 index a63a09d4d..000000000 Binary files a/public/potlatch2/features/pois/food_bar.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/food_cafe.n.24.png b/public/potlatch2/features/pois/food_cafe.n.24.png deleted file mode 100644 index 9e9b3173e..000000000 Binary files a/public/potlatch2/features/pois/food_cafe.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/food_drinkingtap.n.24.png b/public/potlatch2/features/pois/food_drinkingtap.n.24.png deleted file mode 100644 index 313572e50..000000000 Binary files a/public/potlatch2/features/pois/food_drinkingtap.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/food_fastfood.n.24.png b/public/potlatch2/features/pois/food_fastfood.n.24.png deleted file mode 100644 index 96f5e7706..000000000 Binary files a/public/potlatch2/features/pois/food_fastfood.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/food_pub.n.24.png b/public/potlatch2/features/pois/food_pub.n.24.png deleted file mode 100644 index 714914f7a..000000000 Binary files a/public/potlatch2/features/pois/food_pub.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/food_restaurant.n.24.png b/public/potlatch2/features/pois/food_restaurant.n.24.png deleted file mode 100644 index e7813ea2a..000000000 Binary files a/public/potlatch2/features/pois/food_restaurant.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/health_hospital.n.24.png b/public/potlatch2/features/pois/health_hospital.n.24.png deleted file mode 100644 index 62e68fb87..000000000 Binary files a/public/potlatch2/features/pois/health_hospital.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/health_pharmacy.n.24.png b/public/potlatch2/features/pois/health_pharmacy.n.24.png deleted file mode 100644 index d2aa8c2ec..000000000 Binary files a/public/potlatch2/features/pois/health_pharmacy.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/landuse_coniferous.n.24.png b/public/potlatch2/features/pois/landuse_coniferous.n.24.png deleted file mode 100644 index 93f6c0df2..000000000 Binary files a/public/potlatch2/features/pois/landuse_coniferous.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/landuse_grass.n.24.png b/public/potlatch2/features/pois/landuse_grass.n.24.png deleted file mode 100644 index f65bde37e..000000000 Binary files a/public/potlatch2/features/pois/landuse_grass.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/money_atm.n.24.png b/public/potlatch2/features/pois/money_atm.n.24.png deleted file mode 100644 index f1e55e803..000000000 Binary files a/public/potlatch2/features/pois/money_atm.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/money_bank2.n.24.png b/public/potlatch2/features/pois/money_bank2.n.24.png deleted file mode 100644 index 74c511472..000000000 Binary files a/public/potlatch2/features/pois/money_bank2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png b/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png deleted file mode 100644 index 103a21b2a..000000000 Binary files a/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png b/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png deleted file mode 100644 index 2f9169166..000000000 Binary files a/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png b/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png deleted file mode 100644 index 7e2bd19af..000000000 Binary files a/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_military_bunker.n.24.png b/public/potlatch2/features/pois/poi_military_bunker.n.24.png deleted file mode 100644 index 3bcc77a00..000000000 Binary files a/public/potlatch2/features/pois/poi_military_bunker.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_mine.n.24.png b/public/potlatch2/features/pois/poi_mine.n.24.png deleted file mode 100644 index 57c6d9435..000000000 Binary files a/public/potlatch2/features/pois/poi_mine.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_place_city.p.24.png b/public/potlatch2/features/pois/poi_place_city.p.24.png deleted file mode 100644 index d2f629cf9..000000000 Binary files a/public/potlatch2/features/pois/poi_place_city.p.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_place_hamlet.p.24.png b/public/potlatch2/features/pois/poi_place_hamlet.p.24.png deleted file mode 100644 index 1a938cef9..000000000 Binary files a/public/potlatch2/features/pois/poi_place_hamlet.p.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_place_suburb.p.24.png b/public/potlatch2/features/pois/poi_place_suburb.p.24.png deleted file mode 100644 index 633e1804c..000000000 Binary files a/public/potlatch2/features/pois/poi_place_suburb.p.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_place_town.p.24.png b/public/potlatch2/features/pois/poi_place_town.p.24.png deleted file mode 100644 index b456dc22b..000000000 Binary files a/public/potlatch2/features/pois/poi_place_town.p.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/poi_place_village.p.24.png b/public/potlatch2/features/pois/poi_place_village.p.24.png deleted file mode 100644 index ee050b4e6..000000000 Binary files a/public/potlatch2/features/pois/poi_place_village.p.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/power_station.png b/public/potlatch2/features/pois/power_station.png deleted file mode 100644 index 3417b4d3c..000000000 Binary files a/public/potlatch2/features/pois/power_station.png and /dev/null differ diff --git a/public/potlatch2/features/pois/power_substation.n.24.png b/public/potlatch2/features/pois/power_substation.n.24.png deleted file mode 100644 index 3cf3bff40..000000000 Binary files a/public/potlatch2/features/pois/power_substation.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/power_tower_high2.n.24.png b/public/potlatch2/features/pois/power_tower_high2.n.24.png deleted file mode 100644 index 98822fa7e..000000000 Binary files a/public/potlatch2/features/pois/power_tower_high2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/power_tower_low.n.24.png b/public/potlatch2/features/pois/power_tower_low.n.24.png deleted file mode 100644 index de3d6dbbd..000000000 Binary files a/public/potlatch2/features/pois/power_tower_low.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/power_transformer.n.24.png b/public/potlatch2/features/pois/power_transformer.n.24.png deleted file mode 100644 index 87a43eb64..000000000 Binary files a/public/potlatch2/features/pois/power_transformer.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_alcohol.n.24.png b/public/potlatch2/features/pois/shopping_alcohol.n.24.png deleted file mode 100644 index c22cc3b67..000000000 Binary files a/public/potlatch2/features/pois/shopping_alcohol.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_bakery.n.24.png b/public/potlatch2/features/pois/shopping_bakery.n.24.png deleted file mode 100644 index f588a198a..000000000 Binary files a/public/potlatch2/features/pois/shopping_bakery.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_bicycle.n.24.png b/public/potlatch2/features/pois/shopping_bicycle.n.24.png deleted file mode 100644 index dce1d15d4..000000000 Binary files a/public/potlatch2/features/pois/shopping_bicycle.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_book.n.24.png b/public/potlatch2/features/pois/shopping_book.n.24.png deleted file mode 100644 index 51441eaeb..000000000 Binary files a/public/potlatch2/features/pois/shopping_book.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_butcher.n.24.png b/public/potlatch2/features/pois/shopping_butcher.n.24.png deleted file mode 100644 index 8efbb3f0f..000000000 Binary files a/public/potlatch2/features/pois/shopping_butcher.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_car.n.24.png b/public/potlatch2/features/pois/shopping_car.n.24.png deleted file mode 100644 index cefb9124a..000000000 Binary files a/public/potlatch2/features/pois/shopping_car.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_car_repair.n.24.png b/public/potlatch2/features/pois/shopping_car_repair.n.24.png deleted file mode 100644 index 6abdcb7f0..000000000 Binary files a/public/potlatch2/features/pois/shopping_car_repair.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_clothes.n.24.png b/public/potlatch2/features/pois/shopping_clothes.n.24.png deleted file mode 100644 index e5c7089d1..000000000 Binary files a/public/potlatch2/features/pois/shopping_clothes.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_confectionery.n.24.png b/public/potlatch2/features/pois/shopping_confectionery.n.24.png deleted file mode 100644 index 2e1dbaef7..000000000 Binary files a/public/potlatch2/features/pois/shopping_confectionery.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_convenience.n.24.png b/public/potlatch2/features/pois/shopping_convenience.n.24.png deleted file mode 100644 index 7a3563391..000000000 Binary files a/public/potlatch2/features/pois/shopping_convenience.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_diy.n.24.png b/public/potlatch2/features/pois/shopping_diy.n.24.png deleted file mode 100644 index c8236cba9..000000000 Binary files a/public/potlatch2/features/pois/shopping_diy.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_fish.n.24.png b/public/potlatch2/features/pois/shopping_fish.n.24.png deleted file mode 100644 index fe5eccee6..000000000 Binary files a/public/potlatch2/features/pois/shopping_fish.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_florist.n.24.png b/public/potlatch2/features/pois/shopping_florist.n.24.png deleted file mode 100644 index 6dd9376b3..000000000 Binary files a/public/potlatch2/features/pois/shopping_florist.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_garden_centre.n.24.png b/public/potlatch2/features/pois/shopping_garden_centre.n.24.png deleted file mode 100644 index a4f9b3260..000000000 Binary files a/public/potlatch2/features/pois/shopping_garden_centre.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_gift.n.24.png b/public/potlatch2/features/pois/shopping_gift.n.24.png deleted file mode 100644 index a81617805..000000000 Binary files a/public/potlatch2/features/pois/shopping_gift.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_greengrocer.n.24.png b/public/potlatch2/features/pois/shopping_greengrocer.n.24.png deleted file mode 100644 index ad402d550..000000000 Binary files a/public/potlatch2/features/pois/shopping_greengrocer.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_hairdresser.n.24.png b/public/potlatch2/features/pois/shopping_hairdresser.n.24.png deleted file mode 100644 index e844989fd..000000000 Binary files a/public/potlatch2/features/pois/shopping_hairdresser.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_hifi.n.24.png b/public/potlatch2/features/pois/shopping_hifi.n.24.png deleted file mode 100644 index 66ec0b950..000000000 Binary files a/public/potlatch2/features/pois/shopping_hifi.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_jewelry.n.24.png b/public/potlatch2/features/pois/shopping_jewelry.n.24.png deleted file mode 100644 index c3e8a519f..000000000 Binary files a/public/potlatch2/features/pois/shopping_jewelry.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_kiosk.n.24.png b/public/potlatch2/features/pois/shopping_kiosk.n.24.png deleted file mode 100644 index de4ab5a60..000000000 Binary files a/public/potlatch2/features/pois/shopping_kiosk.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_laundrette.n.24.png b/public/potlatch2/features/pois/shopping_laundrette.n.24.png deleted file mode 100644 index 55a0ca2e1..000000000 Binary files a/public/potlatch2/features/pois/shopping_laundrette.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_marketplace.n.24.png b/public/potlatch2/features/pois/shopping_marketplace.n.24.png deleted file mode 100644 index 4fba55a7f..000000000 Binary files a/public/potlatch2/features/pois/shopping_marketplace.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_motorcycle.n.24.png b/public/potlatch2/features/pois/shopping_motorcycle.n.24.png deleted file mode 100644 index cf4248f33..000000000 Binary files a/public/potlatch2/features/pois/shopping_motorcycle.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_music.n.24.png b/public/potlatch2/features/pois/shopping_music.n.24.png deleted file mode 100644 index 17df5c563..000000000 Binary files a/public/potlatch2/features/pois/shopping_music.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_supermarket.n.24.png b/public/potlatch2/features/pois/shopping_supermarket.n.24.png deleted file mode 100644 index fd2584686..000000000 Binary files a/public/potlatch2/features/pois/shopping_supermarket.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_toys.n.24.png b/public/potlatch2/features/pois/shopping_toys.n.24.png deleted file mode 100644 index 63500028d..000000000 Binary files a/public/potlatch2/features/pois/shopping_toys.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/shopping_vending_machine.n.24.png b/public/potlatch2/features/pois/shopping_vending_machine.n.24.png deleted file mode 100644 index 1a18e63af..000000000 Binary files a/public/potlatch2/features/pois/shopping_vending_machine.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/sport_golf.n.24.png b/public/potlatch2/features/pois/sport_golf.n.24.png deleted file mode 100644 index ad42a4e51..000000000 Binary files a/public/potlatch2/features/pois/sport_golf.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/sport_leisure_centre.n.24.png b/public/potlatch2/features/pois/sport_leisure_centre.n.24.png deleted file mode 100644 index dd6d636c8..000000000 Binary files a/public/potlatch2/features/pois/sport_leisure_centre.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/sport_shooting.n.24.png b/public/potlatch2/features/pois/sport_shooting.n.24.png deleted file mode 100644 index f26d78de4..000000000 Binary files a/public/potlatch2/features/pois/sport_shooting.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/sport_stadium.n.24.png b/public/potlatch2/features/pois/sport_stadium.n.24.png deleted file mode 100644 index f1349e437..000000000 Binary files a/public/potlatch2/features/pois/sport_stadium.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png b/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png deleted file mode 100644 index a0e0c61a7..000000000 Binary files a/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_archaeological.n.24.png b/public/potlatch2/features/pois/tourist_archaeological.n.24.png deleted file mode 100644 index a75a358bd..000000000 Binary files a/public/potlatch2/features/pois/tourist_archaeological.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png b/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png deleted file mode 100644 index 5cd89b60b..000000000 Binary files a/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_attraction.n.24.png b/public/potlatch2/features/pois/tourist_attraction.n.24.png deleted file mode 100644 index 2f849d85f..000000000 Binary files a/public/potlatch2/features/pois/tourist_attraction.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_battlefield.n.24.png b/public/potlatch2/features/pois/tourist_battlefield.n.24.png deleted file mode 100644 index b502bfc7b..000000000 Binary files a/public/potlatch2/features/pois/tourist_battlefield.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_castle.n.24.png b/public/potlatch2/features/pois/tourist_castle.n.24.png deleted file mode 100644 index 75734d678..000000000 Binary files a/public/potlatch2/features/pois/tourist_castle.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_cinema.n.24.png b/public/potlatch2/features/pois/tourist_cinema.n.24.png deleted file mode 100644 index 4207e8427..000000000 Binary files a/public/potlatch2/features/pois/tourist_cinema.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_memorial.n.24.png b/public/potlatch2/features/pois/tourist_memorial.n.24.png deleted file mode 100644 index 2729e68de..000000000 Binary files a/public/potlatch2/features/pois/tourist_memorial.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_monument.n.24.png b/public/potlatch2/features/pois/tourist_monument.n.24.png deleted file mode 100644 index 853632b0b..000000000 Binary files a/public/potlatch2/features/pois/tourist_monument.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_museum.n.24.png b/public/potlatch2/features/pois/tourist_museum.n.24.png deleted file mode 100644 index 3cdea51d5..000000000 Binary files a/public/potlatch2/features/pois/tourist_museum.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_picnic.n.24.png b/public/potlatch2/features/pois/tourist_picnic.n.24.png deleted file mode 100644 index 6943ab48e..000000000 Binary files a/public/potlatch2/features/pois/tourist_picnic.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_ruin.n.24.png b/public/potlatch2/features/pois/tourist_ruin.n.24.png deleted file mode 100644 index d8650c1fc..000000000 Binary files a/public/potlatch2/features/pois/tourist_ruin.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_theatre.n.24.png b/public/potlatch2/features/pois/tourist_theatre.n.24.png deleted file mode 100644 index a5db00bd6..000000000 Binary files a/public/potlatch2/features/pois/tourist_theatre.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_theme_park.n.24.png b/public/potlatch2/features/pois/tourist_theme_park.n.24.png deleted file mode 100644 index 733f03f4d..000000000 Binary files a/public/potlatch2/features/pois/tourist_theme_park.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_view_point.n.24.png b/public/potlatch2/features/pois/tourist_view_point.n.24.png deleted file mode 100644 index a2dde9ebb..000000000 Binary files a/public/potlatch2/features/pois/tourist_view_point.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/tourist_zoo.n.24.png b/public/potlatch2/features/pois/tourist_zoo.n.24.png deleted file mode 100644 index f33b9d861..000000000 Binary files a/public/potlatch2/features/pois/tourist_zoo.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_aerodrome.n.24.png b/public/potlatch2/features/pois/transport_aerodrome.n.24.png deleted file mode 100644 index 83b7eccf1..000000000 Binary files a/public/potlatch2/features/pois/transport_aerodrome.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_airport.n.24.png b/public/potlatch2/features/pois/transport_airport.n.24.png deleted file mode 100644 index 4e6bddb53..000000000 Binary files a/public/potlatch2/features/pois/transport_airport.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_airport_gate.n.24.png b/public/potlatch2/features/pois/transport_airport_gate.n.24.png deleted file mode 100644 index 455a311df..000000000 Binary files a/public/potlatch2/features/pois/transport_airport_gate.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_airport_terminal.n.24.png b/public/potlatch2/features/pois/transport_airport_terminal.n.24.png deleted file mode 100644 index 33bbd5450..000000000 Binary files a/public/potlatch2/features/pois/transport_airport_terminal.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_bus_station.n.24.png b/public/potlatch2/features/pois/transport_bus_station.n.24.png deleted file mode 100644 index e9cdc7e13..000000000 Binary files a/public/potlatch2/features/pois/transport_bus_station.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_bus_stop2.n.24.png b/public/potlatch2/features/pois/transport_bus_stop2.n.24.png deleted file mode 100644 index d81484abd..000000000 Binary files a/public/potlatch2/features/pois/transport_bus_stop2.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_car_wash.n.24.png b/public/potlatch2/features/pois/transport_car_wash.n.24.png deleted file mode 100644 index 1c173e21a..000000000 Binary files a/public/potlatch2/features/pois/transport_car_wash.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_fuel.n.24.png b/public/potlatch2/features/pois/transport_fuel.n.24.png deleted file mode 100644 index 736e943b7..000000000 Binary files a/public/potlatch2/features/pois/transport_fuel.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png b/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png deleted file mode 100644 index e5e4e2fe7..000000000 Binary files a/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_marina.n.24.png b/public/potlatch2/features/pois/transport_marina.n.24.png deleted file mode 100644 index 5024e3e82..000000000 Binary files a/public/potlatch2/features/pois/transport_marina.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png b/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png deleted file mode 100644 index 41b1de3dc..000000000 Binary files a/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png b/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png deleted file mode 100644 index 42f2e54c1..000000000 Binary files a/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_parking_car.n.24.png b/public/potlatch2/features/pois/transport_parking_car.n.24.png deleted file mode 100644 index 6aa900cb9..000000000 Binary files a/public/potlatch2/features/pois/transport_parking_car.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_port.n.24.png b/public/potlatch2/features/pois/transport_port.n.24.png deleted file mode 100644 index 6e5f6e19d..000000000 Binary files a/public/potlatch2/features/pois/transport_port.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png b/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png deleted file mode 100644 index 773ac431a..000000000 Binary files a/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_rental_car.n.24.png b/public/potlatch2/features/pois/transport_rental_car.n.24.png deleted file mode 100644 index 5570e708c..000000000 Binary files a/public/potlatch2/features/pois/transport_rental_car.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_slipway.n.24.png b/public/potlatch2/features/pois/transport_slipway.n.24.png deleted file mode 100644 index 5a34dcbc7..000000000 Binary files a/public/potlatch2/features/pois/transport_slipway.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_speedbump.n.24.png b/public/potlatch2/features/pois/transport_speedbump.n.24.png deleted file mode 100644 index a4f5efd6c..000000000 Binary files a/public/potlatch2/features/pois/transport_speedbump.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_taxi_rank.n.24.png b/public/potlatch2/features/pois/transport_taxi_rank.n.24.png deleted file mode 100644 index 8fd307345..000000000 Binary files a/public/potlatch2/features/pois/transport_taxi_rank.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_traffic_calming.n.24.png b/public/potlatch2/features/pois/transport_traffic_calming.n.24.png deleted file mode 100644 index 5c50233cd..000000000 Binary files a/public/potlatch2/features/pois/transport_traffic_calming.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_train_station.n.24.png b/public/potlatch2/features/pois/transport_train_station.n.24.png deleted file mode 100644 index 6e1cb10a9..000000000 Binary files a/public/potlatch2/features/pois/transport_train_station.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_tram_stop.n.24.png b/public/potlatch2/features/pois/transport_tram_stop.n.24.png deleted file mode 100644 index edf534845..000000000 Binary files a/public/potlatch2/features/pois/transport_tram_stop.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_turning_circle.n.24.png b/public/potlatch2/features/pois/transport_turning_circle.n.24.png deleted file mode 100644 index 47736bc34..000000000 Binary files a/public/potlatch2/features/pois/transport_turning_circle.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/pois/transport_weir.n.24.png b/public/potlatch2/features/pois/transport_weir.n.24.png deleted file mode 100644 index e699d3b05..000000000 Binary files a/public/potlatch2/features/pois/transport_weir.n.24.png and /dev/null differ diff --git a/public/potlatch2/features/power_high.png b/public/potlatch2/features/power_high.png deleted file mode 100644 index c8b102d49..000000000 Binary files a/public/potlatch2/features/power_high.png and /dev/null differ diff --git a/public/potlatch2/features/power_low.png b/public/potlatch2/features/power_low.png deleted file mode 100644 index e45f405c1..000000000 Binary files a/public/potlatch2/features/power_low.png and /dev/null differ diff --git a/public/potlatch2/features/railway__abandoned.png b/public/potlatch2/features/railway__abandoned.png deleted file mode 100644 index 3b7a02ed5..000000000 Binary files a/public/potlatch2/features/railway__abandoned.png and /dev/null differ diff --git a/public/potlatch2/features/railway__disused.png b/public/potlatch2/features/railway__disused.png deleted file mode 100644 index 2b24f69a8..000000000 Binary files a/public/potlatch2/features/railway__disused.png and /dev/null differ diff --git a/public/potlatch2/features/railway__light.png b/public/potlatch2/features/railway__light.png deleted file mode 100644 index 0e2eca7c2..000000000 Binary files a/public/potlatch2/features/railway__light.png and /dev/null differ diff --git a/public/potlatch2/features/railway__platform.png b/public/potlatch2/features/railway__platform.png deleted file mode 100644 index e6d591979..000000000 Binary files a/public/potlatch2/features/railway__platform.png and /dev/null differ diff --git a/public/potlatch2/features/railway__preserved.png b/public/potlatch2/features/railway__preserved.png deleted file mode 100644 index 28d4f5ccd..000000000 Binary files a/public/potlatch2/features/railway__preserved.png and /dev/null differ diff --git a/public/potlatch2/features/railway__rail.png b/public/potlatch2/features/railway__rail.png deleted file mode 100644 index 0aa4e66d6..000000000 Binary files a/public/potlatch2/features/railway__rail.png and /dev/null differ diff --git a/public/potlatch2/features/railway__siding.png b/public/potlatch2/features/railway__siding.png deleted file mode 100644 index 9519ee0a1..000000000 Binary files a/public/potlatch2/features/railway__siding.png and /dev/null differ diff --git a/public/potlatch2/features/railway__spur.png b/public/potlatch2/features/railway__spur.png deleted file mode 100644 index 4cde3d8e7..000000000 Binary files a/public/potlatch2/features/railway__spur.png and /dev/null differ diff --git a/public/potlatch2/features/railway__subway.png b/public/potlatch2/features/railway__subway.png deleted file mode 100644 index 7e13bd022..000000000 Binary files a/public/potlatch2/features/railway__subway.png and /dev/null differ diff --git a/public/potlatch2/features/railway__tram.png b/public/potlatch2/features/railway__tram.png deleted file mode 100644 index 2940c7a8f..000000000 Binary files a/public/potlatch2/features/railway__tram.png and /dev/null differ diff --git a/public/potlatch2/features/restriction__no_left_turn.png b/public/potlatch2/features/restriction__no_left_turn.png deleted file mode 100644 index 9d1695291..000000000 Binary files a/public/potlatch2/features/restriction__no_left_turn.png and /dev/null differ diff --git a/public/potlatch2/features/restriction__no_right_turn.png b/public/potlatch2/features/restriction__no_right_turn.png deleted file mode 100644 index 1cd51f03e..000000000 Binary files a/public/potlatch2/features/restriction__no_right_turn.png and /dev/null differ diff --git a/public/potlatch2/features/restriction__no_straight_on.png b/public/potlatch2/features/restriction__no_straight_on.png deleted file mode 100644 index 9cc66283a..000000000 Binary files a/public/potlatch2/features/restriction__no_straight_on.png and /dev/null differ diff --git a/public/potlatch2/features/restriction__no_u_turn.png b/public/potlatch2/features/restriction__no_u_turn.png deleted file mode 100644 index 2dba9bb0f..000000000 Binary files a/public/potlatch2/features/restriction__no_u_turn.png and /dev/null differ diff --git a/public/potlatch2/features/restriction__only_left_turn.png b/public/potlatch2/features/restriction__only_left_turn.png deleted file mode 100644 index 0c71faf5b..000000000 Binary files a/public/potlatch2/features/restriction__only_left_turn.png and /dev/null differ diff --git a/public/potlatch2/features/restriction__only_right_turn.png b/public/potlatch2/features/restriction__only_right_turn.png deleted file mode 100644 index d4ed16258..000000000 Binary files a/public/potlatch2/features/restriction__only_right_turn.png and /dev/null differ diff --git a/public/potlatch2/features/restriction__only_straight_on.png b/public/potlatch2/features/restriction__only_straight_on.png deleted file mode 100644 index d62b11193..000000000 Binary files a/public/potlatch2/features/restriction__only_straight_on.png and /dev/null differ diff --git a/public/potlatch2/features/route__bus.png b/public/potlatch2/features/route__bus.png deleted file mode 100644 index bb816ac83..000000000 Binary files a/public/potlatch2/features/route__bus.png and /dev/null differ diff --git a/public/potlatch2/features/route__lcn.png b/public/potlatch2/features/route__lcn.png deleted file mode 100644 index 21d59163e..000000000 Binary files a/public/potlatch2/features/route__lcn.png and /dev/null differ diff --git a/public/potlatch2/features/route__lwn.png b/public/potlatch2/features/route__lwn.png deleted file mode 100644 index 50ee446bd..000000000 Binary files a/public/potlatch2/features/route__lwn.png and /dev/null differ diff --git a/public/potlatch2/features/route__mtb.png b/public/potlatch2/features/route__mtb.png deleted file mode 100644 index 824360712..000000000 Binary files a/public/potlatch2/features/route__mtb.png and /dev/null differ diff --git a/public/potlatch2/features/route__ncn.png b/public/potlatch2/features/route__ncn.png deleted file mode 100644 index 7cc777919..000000000 Binary files a/public/potlatch2/features/route__ncn.png and /dev/null differ diff --git a/public/potlatch2/features/route__nwn.png b/public/potlatch2/features/route__nwn.png deleted file mode 100644 index 92ac04879..000000000 Binary files a/public/potlatch2/features/route__nwn.png and /dev/null differ diff --git a/public/potlatch2/features/route__rcn.png b/public/potlatch2/features/route__rcn.png deleted file mode 100644 index 614ac951f..000000000 Binary files a/public/potlatch2/features/route__rcn.png and /dev/null differ diff --git a/public/potlatch2/features/route__rwn.png b/public/potlatch2/features/route__rwn.png deleted file mode 100644 index fff9b233a..000000000 Binary files a/public/potlatch2/features/route__rwn.png and /dev/null differ diff --git a/public/potlatch2/features/transport__railway.png b/public/potlatch2/features/transport__railway.png deleted file mode 100644 index e50b18693..000000000 Binary files a/public/potlatch2/features/transport__railway.png and /dev/null differ diff --git a/public/potlatch2/features/transport__railway_abandoned.png b/public/potlatch2/features/transport__railway_abandoned.png deleted file mode 100644 index 81717b82d..000000000 Binary files a/public/potlatch2/features/transport__railway_abandoned.png and /dev/null differ diff --git a/public/potlatch2/features/transport__railway_disused.png b/public/potlatch2/features/transport__railway_disused.png deleted file mode 100644 index 347b1c330..000000000 Binary files a/public/potlatch2/features/transport__railway_disused.png and /dev/null differ diff --git a/public/potlatch2/features/transport__railway_platform.png b/public/potlatch2/features/transport__railway_platform.png deleted file mode 100644 index f1a5628ec..000000000 Binary files a/public/potlatch2/features/transport__railway_platform.png and /dev/null differ diff --git a/public/potlatch2/features/transport__subway.png b/public/potlatch2/features/transport__subway.png deleted file mode 100644 index 2989d3e69..000000000 Binary files a/public/potlatch2/features/transport__subway.png and /dev/null differ diff --git a/public/potlatch2/features/transport__tram.png b/public/potlatch2/features/transport__tram.png deleted file mode 100644 index e676eab84..000000000 Binary files a/public/potlatch2/features/transport__tram.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__basin.png b/public/potlatch2/features/waterway__basin.png deleted file mode 100644 index 29798db20..000000000 Binary files a/public/potlatch2/features/waterway__basin.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__canal.png b/public/potlatch2/features/waterway__canal.png deleted file mode 100644 index 8f04ccd3f..000000000 Binary files a/public/potlatch2/features/waterway__canal.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__coastline.png b/public/potlatch2/features/waterway__coastline.png deleted file mode 100644 index 2239eb097..000000000 Binary files a/public/potlatch2/features/waterway__coastline.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__dam.png b/public/potlatch2/features/waterway__dam.png deleted file mode 100644 index c5f720e89..000000000 Binary files a/public/potlatch2/features/waterway__dam.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__dock.png b/public/potlatch2/features/waterway__dock.png deleted file mode 100644 index e6e40d1ff..000000000 Binary files a/public/potlatch2/features/waterway__dock.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__drain.png b/public/potlatch2/features/waterway__drain.png deleted file mode 100644 index 6351862c8..000000000 Binary files a/public/potlatch2/features/waterway__drain.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__lake.png b/public/potlatch2/features/waterway__lake.png deleted file mode 100644 index 275bb5722..000000000 Binary files a/public/potlatch2/features/waterway__lake.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__marina.png b/public/potlatch2/features/waterway__marina.png deleted file mode 100644 index 3704b0011..000000000 Binary files a/public/potlatch2/features/waterway__marina.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__reservoir.png b/public/potlatch2/features/waterway__reservoir.png deleted file mode 100644 index bd118e6db..000000000 Binary files a/public/potlatch2/features/waterway__reservoir.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__river.png b/public/potlatch2/features/waterway__river.png deleted file mode 100644 index 79f7256ab..000000000 Binary files a/public/potlatch2/features/waterway__river.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__riverbank.png b/public/potlatch2/features/waterway__riverbank.png deleted file mode 100644 index 7152808d5..000000000 Binary files a/public/potlatch2/features/waterway__riverbank.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__slipway.png b/public/potlatch2/features/waterway__slipway.png deleted file mode 100644 index f50633b56..000000000 Binary files a/public/potlatch2/features/waterway__slipway.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__stream.png b/public/potlatch2/features/waterway__stream.png deleted file mode 100644 index 888956e52..000000000 Binary files a/public/potlatch2/features/waterway__stream.png and /dev/null differ diff --git a/public/potlatch2/features/waterway__weir.png b/public/potlatch2/features/waterway__weir.png deleted file mode 100644 index 3b12080d2..000000000 Binary files a/public/potlatch2/features/waterway__weir.png and /dev/null differ diff --git a/public/potlatch2/fills/grass.jpg b/public/potlatch2/fills/grass.jpg deleted file mode 100644 index 26dcd2f78..000000000 Binary files a/public/potlatch2/fills/grass.jpg and /dev/null differ diff --git a/public/potlatch2/icons/accommodation_alpinehut.n.16.png b/public/potlatch2/icons/accommodation_alpinehut.n.16.png deleted file mode 100644 index 2fdad623b..000000000 Binary files a/public/potlatch2/icons/accommodation_alpinehut.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png b/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png deleted file mode 100644 index ab2d3bef4..000000000 Binary files a/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/accommodation_camping.n.16.png b/public/potlatch2/icons/accommodation_camping.n.16.png deleted file mode 100644 index b2e7a24e5..000000000 Binary files a/public/potlatch2/icons/accommodation_camping.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/accommodation_caravan_park.n.16.png b/public/potlatch2/icons/accommodation_caravan_park.n.16.png deleted file mode 100644 index aeae7df3c..000000000 Binary files a/public/potlatch2/icons/accommodation_caravan_park.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/accommodation_hotel.n.16.png b/public/potlatch2/icons/accommodation_hotel.n.16.png deleted file mode 100644 index 4c3bb706c..000000000 Binary files a/public/potlatch2/icons/accommodation_hotel.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/accommodation_youth_hostel.n.16.png b/public/potlatch2/icons/accommodation_youth_hostel.n.16.png deleted file mode 100644 index d2ca4feed..000000000 Binary files a/public/potlatch2/icons/accommodation_youth_hostel.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/airport.png b/public/potlatch2/icons/airport.png deleted file mode 100644 index b104403d1..000000000 Binary files a/public/potlatch2/icons/airport.png and /dev/null differ diff --git a/public/potlatch2/icons/amenity_firestation2.n.16.png b/public/potlatch2/icons/amenity_firestation2.n.16.png deleted file mode 100644 index 8a980bef0..000000000 Binary files a/public/potlatch2/icons/amenity_firestation2.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/amenity_police2.n.16.png b/public/potlatch2/icons/amenity_police2.n.16.png deleted file mode 100644 index b2a4aab5c..000000000 Binary files a/public/potlatch2/icons/amenity_police2.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/amenity_post_box.n.16.png b/public/potlatch2/icons/amenity_post_box.n.16.png deleted file mode 100644 index f72efcf7e..000000000 Binary files a/public/potlatch2/icons/amenity_post_box.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/amenity_recycling.n.16.png b/public/potlatch2/icons/amenity_recycling.n.16.png deleted file mode 100644 index 567779b2b..000000000 Binary files a/public/potlatch2/icons/amenity_recycling.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/atm.png b/public/potlatch2/icons/atm.png deleted file mode 100644 index 6a953d348..000000000 Binary files a/public/potlatch2/icons/atm.png and /dev/null differ diff --git a/public/potlatch2/icons/bank.png b/public/potlatch2/icons/bank.png deleted file mode 100644 index 6a953d348..000000000 Binary files a/public/potlatch2/icons/bank.png and /dev/null differ diff --git a/public/potlatch2/icons/bar.png b/public/potlatch2/icons/bar.png deleted file mode 100644 index 13f97e359..000000000 Binary files a/public/potlatch2/icons/bar.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_blocks.16.png b/public/potlatch2/icons/barrier_blocks.16.png deleted file mode 100644 index f8fda705d..000000000 Binary files a/public/potlatch2/icons/barrier_blocks.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_bollard.n.16.png b/public/potlatch2/icons/barrier_bollard.n.16.png deleted file mode 100644 index 989feae56..000000000 Binary files a/public/potlatch2/icons/barrier_bollard.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_cattle_grid.16.png b/public/potlatch2/icons/barrier_cattle_grid.16.png deleted file mode 100644 index 117bb80ba..000000000 Binary files a/public/potlatch2/icons/barrier_cattle_grid.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_cycle_barrier.16.png b/public/potlatch2/icons/barrier_cycle_barrier.16.png deleted file mode 100644 index 8afe098ef..000000000 Binary files a/public/potlatch2/icons/barrier_cycle_barrier.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_gate.n.16.png b/public/potlatch2/icons/barrier_gate.n.16.png deleted file mode 100644 index f8c2f58a8..000000000 Binary files a/public/potlatch2/icons/barrier_gate.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_kissing_gate.16.png b/public/potlatch2/icons/barrier_kissing_gate.16.png deleted file mode 100644 index 7acc51926..000000000 Binary files a/public/potlatch2/icons/barrier_kissing_gate.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_lift_gate.n.16.png b/public/potlatch2/icons/barrier_lift_gate.n.16.png deleted file mode 100644 index 80ef74bd7..000000000 Binary files a/public/potlatch2/icons/barrier_lift_gate.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_stile.n.16.png b/public/potlatch2/icons/barrier_stile.n.16.png deleted file mode 100644 index 3b18ae701..000000000 Binary files a/public/potlatch2/icons/barrier_stile.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/barrier_toll_booth.n.16.png b/public/potlatch2/icons/barrier_toll_booth.n.16.png deleted file mode 100644 index cc78d874e..000000000 Binary files a/public/potlatch2/icons/barrier_toll_booth.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/bus_stop.png b/public/potlatch2/icons/bus_stop.png deleted file mode 100644 index 989e9c382..000000000 Binary files a/public/potlatch2/icons/bus_stop.png and /dev/null differ diff --git a/public/potlatch2/icons/cafe.png b/public/potlatch2/icons/cafe.png deleted file mode 100644 index d9c1f77f6..000000000 Binary files a/public/potlatch2/icons/cafe.png and /dev/null differ diff --git a/public/potlatch2/icons/cattle_grid.png b/public/potlatch2/icons/cattle_grid.png deleted file mode 100644 index b5e4ddc13..000000000 Binary files a/public/potlatch2/icons/cattle_grid.png and /dev/null differ diff --git a/public/potlatch2/icons/cinema.png b/public/potlatch2/icons/cinema.png deleted file mode 100644 index f43cabab2..000000000 Binary files a/public/potlatch2/icons/cinema.png and /dev/null differ diff --git a/public/potlatch2/icons/convenience.png b/public/potlatch2/icons/convenience.png deleted file mode 100644 index ad6cd2c86..000000000 Binary files a/public/potlatch2/icons/convenience.png and /dev/null differ diff --git a/public/potlatch2/icons/education_school.n.16.png b/public/potlatch2/icons/education_school.n.16.png deleted file mode 100644 index a93e2d3cf..000000000 Binary files a/public/potlatch2/icons/education_school.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/fast_food.png b/public/potlatch2/icons/fast_food.png deleted file mode 100644 index ad2c39cc4..000000000 Binary files a/public/potlatch2/icons/fast_food.png and /dev/null differ diff --git a/public/potlatch2/icons/ferry_terminal.png b/public/potlatch2/icons/ferry_terminal.png deleted file mode 100644 index f387c03d8..000000000 Binary files a/public/potlatch2/icons/ferry_terminal.png and /dev/null differ diff --git a/public/potlatch2/icons/fire_station.png b/public/potlatch2/icons/fire_station.png deleted file mode 100644 index 897c526fc..000000000 Binary files a/public/potlatch2/icons/fire_station.png and /dev/null differ diff --git a/public/potlatch2/icons/food_bar.n.16.png b/public/potlatch2/icons/food_bar.n.16.png deleted file mode 100644 index fadd3e268..000000000 Binary files a/public/potlatch2/icons/food_bar.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/food_cafe.n.16.png b/public/potlatch2/icons/food_cafe.n.16.png deleted file mode 100644 index d5cc5a86f..000000000 Binary files a/public/potlatch2/icons/food_cafe.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/food_fastfood.n.16.png b/public/potlatch2/icons/food_fastfood.n.16.png deleted file mode 100644 index 075fc803a..000000000 Binary files a/public/potlatch2/icons/food_fastfood.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/food_pub.n.16.png b/public/potlatch2/icons/food_pub.n.16.png deleted file mode 100644 index c3d339de5..000000000 Binary files a/public/potlatch2/icons/food_pub.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/food_restaurant.n.16.png b/public/potlatch2/icons/food_restaurant.n.16.png deleted file mode 100644 index 30682b2cf..000000000 Binary files a/public/potlatch2/icons/food_restaurant.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/gate.png b/public/potlatch2/icons/gate.png deleted file mode 100644 index b33e55625..000000000 Binary files a/public/potlatch2/icons/gate.png and /dev/null differ diff --git a/public/potlatch2/icons/health_hospital.n.16.png b/public/potlatch2/icons/health_hospital.n.16.png deleted file mode 100644 index 41ad28dd4..000000000 Binary files a/public/potlatch2/icons/health_hospital.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/health_pharmacy.n.16.png b/public/potlatch2/icons/health_pharmacy.n.16.png deleted file mode 100644 index 1827b0a69..000000000 Binary files a/public/potlatch2/icons/health_pharmacy.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/hospital.png b/public/potlatch2/icons/hospital.png deleted file mode 100644 index 6cc0380db..000000000 Binary files a/public/potlatch2/icons/hospital.png and /dev/null differ diff --git a/public/potlatch2/icons/hotel.png b/public/potlatch2/icons/hotel.png deleted file mode 100644 index f951247cf..000000000 Binary files a/public/potlatch2/icons/hotel.png and /dev/null differ diff --git a/public/potlatch2/icons/icons_grid.png b/public/potlatch2/icons/icons_grid.png deleted file mode 100644 index 9b6d628de..000000000 Binary files a/public/potlatch2/icons/icons_grid.png and /dev/null differ diff --git a/public/potlatch2/icons/logo_nls70-nq8.png b/public/potlatch2/icons/logo_nls70-nq8.png deleted file mode 100644 index d845d8539..000000000 Binary files a/public/potlatch2/icons/logo_nls70-nq8.png and /dev/null differ diff --git a/public/potlatch2/icons/money_atm.n.16.png b/public/potlatch2/icons/money_atm.n.16.png deleted file mode 100644 index 8656f0c44..000000000 Binary files a/public/potlatch2/icons/money_atm.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/money_bank2.n.16.png b/public/potlatch2/icons/money_bank2.n.16.png deleted file mode 100644 index 7264bcbc6..000000000 Binary files a/public/potlatch2/icons/money_bank2.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/museum.png b/public/potlatch2/icons/museum.png deleted file mode 100644 index 79346ab2b..000000000 Binary files a/public/potlatch2/icons/museum.png and /dev/null differ diff --git a/public/potlatch2/icons/natural_blank.png b/public/potlatch2/icons/natural_blank.png deleted file mode 100644 index 33e76fba0..000000000 Binary files a/public/potlatch2/icons/natural_blank.png and /dev/null differ diff --git a/public/potlatch2/icons/parking.png b/public/potlatch2/icons/parking.png deleted file mode 100644 index a2675d018..000000000 Binary files a/public/potlatch2/icons/parking.png and /dev/null differ diff --git a/public/potlatch2/icons/parking_cycle.png b/public/potlatch2/icons/parking_cycle.png deleted file mode 100644 index a2675d018..000000000 Binary files a/public/potlatch2/icons/parking_cycle.png and /dev/null differ diff --git a/public/potlatch2/icons/pharmacy.png b/public/potlatch2/icons/pharmacy.png deleted file mode 100644 index 5254d93b5..000000000 Binary files a/public/potlatch2/icons/pharmacy.png and /dev/null differ diff --git a/public/potlatch2/icons/pharmacy_dispensing.png b/public/potlatch2/icons/pharmacy_dispensing.png deleted file mode 100644 index 9e3a4c5ff..000000000 Binary files a/public/potlatch2/icons/pharmacy_dispensing.png and /dev/null differ diff --git a/public/potlatch2/icons/place.png b/public/potlatch2/icons/place.png deleted file mode 100644 index 488218c07..000000000 Binary files a/public/potlatch2/icons/place.png and /dev/null differ diff --git a/public/potlatch2/icons/place_of_worship.png b/public/potlatch2/icons/place_of_worship.png deleted file mode 100644 index 3ef2b4388..000000000 Binary files a/public/potlatch2/icons/place_of_worship.png and /dev/null differ diff --git a/public/potlatch2/icons/police.png b/public/potlatch2/icons/police.png deleted file mode 100644 index da271d398..000000000 Binary files a/public/potlatch2/icons/police.png and /dev/null differ diff --git a/public/potlatch2/icons/post_box.png b/public/potlatch2/icons/post_box.png deleted file mode 100644 index 8690ebb6e..000000000 Binary files a/public/potlatch2/icons/post_box.png and /dev/null differ diff --git a/public/potlatch2/icons/pub.png b/public/potlatch2/icons/pub.png deleted file mode 100644 index b03e915ba..000000000 Binary files a/public/potlatch2/icons/pub.png and /dev/null differ diff --git a/public/potlatch2/icons/recycling.png b/public/potlatch2/icons/recycling.png deleted file mode 100644 index aa613d510..000000000 Binary files a/public/potlatch2/icons/recycling.png and /dev/null differ diff --git a/public/potlatch2/icons/restaurant.png b/public/potlatch2/icons/restaurant.png deleted file mode 100644 index 5b6da1444..000000000 Binary files a/public/potlatch2/icons/restaurant.png and /dev/null differ diff --git a/public/potlatch2/icons/restriction.png b/public/potlatch2/icons/restriction.png deleted file mode 100644 index 45671d4ae..000000000 Binary files a/public/potlatch2/icons/restriction.png and /dev/null differ diff --git a/public/potlatch2/icons/school.png b/public/potlatch2/icons/school.png deleted file mode 100644 index 1067beb88..000000000 Binary files a/public/potlatch2/icons/school.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_alcohol.n.16.png b/public/potlatch2/icons/shopping_alcohol.n.16.png deleted file mode 100644 index 205100225..000000000 Binary files a/public/potlatch2/icons/shopping_alcohol.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_bakery.n.16.png b/public/potlatch2/icons/shopping_bakery.n.16.png deleted file mode 100644 index 76a52d2d6..000000000 Binary files a/public/potlatch2/icons/shopping_bakery.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_bicycle.n.16.png b/public/potlatch2/icons/shopping_bicycle.n.16.png deleted file mode 100644 index ef5b36624..000000000 Binary files a/public/potlatch2/icons/shopping_bicycle.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_book.n.16.png b/public/potlatch2/icons/shopping_book.n.16.png deleted file mode 100644 index 172bd286f..000000000 Binary files a/public/potlatch2/icons/shopping_book.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_butcher.n.16.png b/public/potlatch2/icons/shopping_butcher.n.16.png deleted file mode 100644 index b48859182..000000000 Binary files a/public/potlatch2/icons/shopping_butcher.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_car.n.16.png b/public/potlatch2/icons/shopping_car.n.16.png deleted file mode 100644 index d80076058..000000000 Binary files a/public/potlatch2/icons/shopping_car.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_car_repair.n.16.png b/public/potlatch2/icons/shopping_car_repair.n.16.png deleted file mode 100644 index 78c578d71..000000000 Binary files a/public/potlatch2/icons/shopping_car_repair.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_clothes.n.16.png b/public/potlatch2/icons/shopping_clothes.n.16.png deleted file mode 100644 index d467b786e..000000000 Binary files a/public/potlatch2/icons/shopping_clothes.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_confectionery.n.16.png b/public/potlatch2/icons/shopping_confectionery.n.16.png deleted file mode 100644 index b293dfdc7..000000000 Binary files a/public/potlatch2/icons/shopping_confectionery.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_convenience.n.16.png b/public/potlatch2/icons/shopping_convenience.n.16.png deleted file mode 100644 index 40fa49d9c..000000000 Binary files a/public/potlatch2/icons/shopping_convenience.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_diy.n.16.png b/public/potlatch2/icons/shopping_diy.n.16.png deleted file mode 100644 index 045696cad..000000000 Binary files a/public/potlatch2/icons/shopping_diy.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_fish.n.16.png b/public/potlatch2/icons/shopping_fish.n.16.png deleted file mode 100644 index f49d4e9f1..000000000 Binary files a/public/potlatch2/icons/shopping_fish.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_garden_centre.n.16.png b/public/potlatch2/icons/shopping_garden_centre.n.16.png deleted file mode 100644 index 7af4465d0..000000000 Binary files a/public/potlatch2/icons/shopping_garden_centre.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_gift.n.16.png b/public/potlatch2/icons/shopping_gift.n.16.png deleted file mode 100644 index 2d11d0417..000000000 Binary files a/public/potlatch2/icons/shopping_gift.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_greengrocer.n.16.png b/public/potlatch2/icons/shopping_greengrocer.n.16.png deleted file mode 100644 index 7d60e3598..000000000 Binary files a/public/potlatch2/icons/shopping_greengrocer.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_hairdresser.n.16.png b/public/potlatch2/icons/shopping_hairdresser.n.16.png deleted file mode 100644 index bcb07fdfe..000000000 Binary files a/public/potlatch2/icons/shopping_hairdresser.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_hifi.n.16.png b/public/potlatch2/icons/shopping_hifi.n.16.png deleted file mode 100644 index f55ad666f..000000000 Binary files a/public/potlatch2/icons/shopping_hifi.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_jewelry.n.16.png b/public/potlatch2/icons/shopping_jewelry.n.16.png deleted file mode 100644 index 49ee19c29..000000000 Binary files a/public/potlatch2/icons/shopping_jewelry.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_laundrette.n.16.png b/public/potlatch2/icons/shopping_laundrette.n.16.png deleted file mode 100644 index 266660a2d..000000000 Binary files a/public/potlatch2/icons/shopping_laundrette.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_motorcycle.n.16.png b/public/potlatch2/icons/shopping_motorcycle.n.16.png deleted file mode 100644 index 8f7ddff0f..000000000 Binary files a/public/potlatch2/icons/shopping_motorcycle.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_music.n.16.png b/public/potlatch2/icons/shopping_music.n.16.png deleted file mode 100644 index 8e875c7f7..000000000 Binary files a/public/potlatch2/icons/shopping_music.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/shopping_supermarket.n.16.png b/public/potlatch2/icons/shopping_supermarket.n.16.png deleted file mode 100644 index f4dc6d1e2..000000000 Binary files a/public/potlatch2/icons/shopping_supermarket.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/speed_hump_16.png b/public/potlatch2/icons/speed_hump_16.png deleted file mode 100644 index 410769237..000000000 Binary files a/public/potlatch2/icons/speed_hump_16.png and /dev/null differ diff --git a/public/potlatch2/icons/station.png b/public/potlatch2/icons/station.png deleted file mode 100644 index 1e198259e..000000000 Binary files a/public/potlatch2/icons/station.png and /dev/null differ diff --git a/public/potlatch2/icons/supermarket.png b/public/potlatch2/icons/supermarket.png deleted file mode 100644 index 04944d16a..000000000 Binary files a/public/potlatch2/icons/supermarket.png and /dev/null differ diff --git a/public/potlatch2/icons/taxi.png b/public/potlatch2/icons/taxi.png deleted file mode 100644 index 42c6f9203..000000000 Binary files a/public/potlatch2/icons/taxi.png and /dev/null differ diff --git a/public/potlatch2/icons/telephone.png b/public/potlatch2/icons/telephone.png deleted file mode 100644 index c2a2d6242..000000000 Binary files a/public/potlatch2/icons/telephone.png and /dev/null differ diff --git a/public/potlatch2/icons/theatre.png b/public/potlatch2/icons/theatre.png deleted file mode 100644 index 897a1e145..000000000 Binary files a/public/potlatch2/icons/theatre.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_archaeological.n.16.png b/public/potlatch2/icons/tourist_archaeological.n.16.png deleted file mode 100644 index 87c49763e..000000000 Binary files a/public/potlatch2/icons/tourist_archaeological.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_battlefield.n.16.png b/public/potlatch2/icons/tourist_battlefield.n.16.png deleted file mode 100644 index d96688929..000000000 Binary files a/public/potlatch2/icons/tourist_battlefield.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_castle.n.16.png b/public/potlatch2/icons/tourist_castle.n.16.png deleted file mode 100644 index bd9a42bf0..000000000 Binary files a/public/potlatch2/icons/tourist_castle.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_cinema.n.16.png b/public/potlatch2/icons/tourist_cinema.n.16.png deleted file mode 100644 index 42f281523..000000000 Binary files a/public/potlatch2/icons/tourist_cinema.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_information.png b/public/potlatch2/icons/tourist_information.png deleted file mode 100644 index ccfbe7e49..000000000 Binary files a/public/potlatch2/icons/tourist_information.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_memorial.n.16.png b/public/potlatch2/icons/tourist_memorial.n.16.png deleted file mode 100644 index 944e27b10..000000000 Binary files a/public/potlatch2/icons/tourist_memorial.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_monument.n.16.png b/public/potlatch2/icons/tourist_monument.n.16.png deleted file mode 100644 index 8b7e7f81a..000000000 Binary files a/public/potlatch2/icons/tourist_monument.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_museum.n.16.png b/public/potlatch2/icons/tourist_museum.n.16.png deleted file mode 100644 index 36a4c450b..000000000 Binary files a/public/potlatch2/icons/tourist_museum.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_picnic.n.16.png b/public/potlatch2/icons/tourist_picnic.n.16.png deleted file mode 100644 index f52923649..000000000 Binary files a/public/potlatch2/icons/tourist_picnic.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_ruin.n.16.png b/public/potlatch2/icons/tourist_ruin.n.16.png deleted file mode 100644 index 65ad843db..000000000 Binary files a/public/potlatch2/icons/tourist_ruin.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_theatre.n.16.png b/public/potlatch2/icons/tourist_theatre.n.16.png deleted file mode 100644 index c0c82dfdd..000000000 Binary files a/public/potlatch2/icons/tourist_theatre.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_view_point.n.16.png b/public/potlatch2/icons/tourist_view_point.n.16.png deleted file mode 100644 index 781e74990..000000000 Binary files a/public/potlatch2/icons/tourist_view_point.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/tourist_zoo.n.16.png b/public/potlatch2/icons/tourist_zoo.n.16.png deleted file mode 100644 index 2a9ecb088..000000000 Binary files a/public/potlatch2/icons/tourist_zoo.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_aerodrome.n.16.png b/public/potlatch2/icons/transport_aerodrome.n.16.png deleted file mode 100644 index a86124b20..000000000 Binary files a/public/potlatch2/icons/transport_aerodrome.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_bus_station.n.16.png b/public/potlatch2/icons/transport_bus_station.n.16.png deleted file mode 100644 index aa93c115b..000000000 Binary files a/public/potlatch2/icons/transport_bus_station.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_bus_stop2.n.16.png b/public/potlatch2/icons/transport_bus_stop2.n.16.png deleted file mode 100644 index 81fe31f34..000000000 Binary files a/public/potlatch2/icons/transport_bus_stop2.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_car_wash.n.16.png b/public/potlatch2/icons/transport_car_wash.n.16.png deleted file mode 100644 index 07acd4ec6..000000000 Binary files a/public/potlatch2/icons/transport_car_wash.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_fuel.n.16.png b/public/potlatch2/icons/transport_fuel.n.16.png deleted file mode 100644 index 1571502e4..000000000 Binary files a/public/potlatch2/icons/transport_fuel.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_marina.n.16.png b/public/potlatch2/icons/transport_marina.n.16.png deleted file mode 100644 index 796005631..000000000 Binary files a/public/potlatch2/icons/transport_marina.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_parking_bicycle.n.16.png b/public/potlatch2/icons/transport_parking_bicycle.n.16.png deleted file mode 100644 index dfd7f83dd..000000000 Binary files a/public/potlatch2/icons/transport_parking_bicycle.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_parking_car.n.16.png b/public/potlatch2/icons/transport_parking_car.n.16.png deleted file mode 100644 index 567c4f551..000000000 Binary files a/public/potlatch2/icons/transport_parking_car.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_port.n.16.png b/public/potlatch2/icons/transport_port.n.16.png deleted file mode 100644 index 471c4daa5..000000000 Binary files a/public/potlatch2/icons/transport_port.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_rental_bicycle.n.16.png b/public/potlatch2/icons/transport_rental_bicycle.n.16.png deleted file mode 100644 index 6659d1e16..000000000 Binary files a/public/potlatch2/icons/transport_rental_bicycle.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_rental_car.n.16.png b/public/potlatch2/icons/transport_rental_car.n.16.png deleted file mode 100644 index 0c9f7b470..000000000 Binary files a/public/potlatch2/icons/transport_rental_car.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_taxi_rank.n.16.png b/public/potlatch2/icons/transport_taxi_rank.n.16.png deleted file mode 100644 index 23e6f1b16..000000000 Binary files a/public/potlatch2/icons/transport_taxi_rank.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_train_station.n.16.png b/public/potlatch2/icons/transport_train_station.n.16.png deleted file mode 100644 index 29ddcc122..000000000 Binary files a/public/potlatch2/icons/transport_train_station.n.16.png and /dev/null differ diff --git a/public/potlatch2/icons/transport_tram_stop.n.16.png b/public/potlatch2/icons/transport_tram_stop.n.16.png deleted file mode 100644 index ddbbc4c5c..000000000 Binary files a/public/potlatch2/icons/transport_tram_stop.n.16.png and /dev/null differ diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml deleted file mode 100644 index 3d12a1dd0..000000000 --- a/public/potlatch2/imagery.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<imagery> - <set> - <name>Bing aerial imagery</name> - <url>http://ecn.t0.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&mkt=en-gb&n=z</url> - <scheme>microsoft</scheme> - <sourcetag>Bing</sourcetag> - <attribution_url>http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/0,0?zl=1&mapVersion=v1&key=Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU&include=ImageryProviders&output=xml</attribution_url> - <logo>bing_maps.png</logo> - <logo_url>http://www.bing.com/maps</logo_url> - <terms_url>http://opengeodata.org/microsoft-imagery-details</terms_url> - <default>yes</default> - </set> - <set> - <name>MapQuest Open Aerial</name> - <url>http://oatile1.mqcdn.com/naip/$z/$x/$y.png</url> - </set> - <set> - <name>OSM - Mapnik</name> - <url>http://c.tile.openstreetmap.org/$z/$x/$y.png</url> - </set> - <set> - <name>OSM - Osmarender</name> - <url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url> - </set> - <set> - <name>OSM - OpenCycleMap</name> - <url>http://tile.opencyclemap.org/cycle/$z/$x/$y.png</url> - </set> - <set> - <name>OSM - MapQuest</name> - <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/$z/$x/$y.png</url> - </set> - <set minlat="17" minlon="175" maxlat="72" maxlon="-46"> - <name>OSM - Tiger Edited Map</name> - <type>900913</type> - <url>http://tiger-osm.mapquest.com/tiles/1.0.0/tiger/$z/$x/$y.png</url> - </set> - <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9"> - <name>OS OpenData Streetview</name> - <url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url> - <sourcetag>OS_OpenData_StreetView</sourcetag> - </set> - <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9"> - <name>OS OpenData Locator</name> - <url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url> - <sourcetag>OS_OpenData_Locator</sourcetag> - <sourcekey>source:name</sourcekey> - </set> - <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9"> - <name>OS 1:25k historic</name> - <url>http://ooc.openstreetmap.org/os1/$z/$x/$y.jpg</url> - <sourcetag>OS 1:25k</sourcetag> - </set> - <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9"> - <name>OS 7th Series historic</name> - <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.jpg</url> - <sourcetag>OS7</sourcetag> - </set> - <set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9"> - <name>OS New Popular Edition historic</name> - <url>http://ooc.openstreetmap.org/npe/$z/$x/$y.png</url> - <sourcetag>NPE</sourcetag> - </set> - <set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1"> - <name>OS Scottish Popular historic</name> - <url>http://ooc.openstreetmap.org/npescotland/tiles/$z/$x/$y.jpg</url> - <sourcetag>NPE</sourcetag> - </set> - <set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062"> - <name>Surrey aerial</name> - <url>http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png</url> - <sourcetag>Surrey aerial</sourcetag> - </set> - <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58"> - <name>Haiti - GeoEye Jan 13</name> - <url>http://gravitystorm.dev.openstreetmap.org/imagery/haiti/$z/$x/$y.jpg</url> - <sourcetag>Haiti GeoEye</sourcetag> - </set> - <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58"> - <name>Haiti - GeoEye Jan 13+</name> - <url>http://maps.nypl.org/tilecache/1/geoeye/$z/$x/$y.jpg</url> - <sourcetag>Haiti GeoEye</sourcetag> - </set> - <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58"> - <name>Haiti - DigitalGlobe</name> - <url>http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg</url> - <sourcetag>Haiti DigitalGlobe</sourcetag> - </set> - <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58"> - <name>Haiti - Street names</name> - <url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url> - <sourcetag>Haiti streetnames</sourcetag> - </set> - <set minlat="24.2" minlon="-125.8" maxlat="49.5" maxlon="-62.3"> - <name>National Agriculture Imagery Program</name> - <url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url> - <sourcetag>NAIP</sourcetag> - </set> - <set minlat="55.3" minlon="-168.5" maxlat="71.5" maxlon="-140"> - <name>National Agriculture Imagery Program</name> - <url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url> - <sourcetag>NAIP</sourcetag> - </set> - <set minlat='51.32' minlon='-10.71' maxlat='55.46' maxlon='-5.37'> - <name>Ireland - NLS Historic Maps</name> - <scheme>tms</scheme> - <sourcetag>NLS Historic Maps</sourcetag> - <url>http://geo.nls.uk/maps/ireland/gsgs4136/$z/$x/$y.png</url> - <logo>icons/logo_nls70-nq8.png</logo> - <logo_url>http://geo.nls.uk/maps/</logo_url> - </set> - <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49"> - <name>Denmark - Fugro Aerial Imagery</name> - <url>http://tile.openstreetmap.dk/fugro2005/$z/$x/$y.jpg</url> - <sourcetag>Fugro (2005)</sourcetag> - </set> - <set minlat="55.23403" minlon="12.09144" maxlat="55.43647" maxlon="12.47712"> - <name>Denmark - Stevns Kommune</name> - <url>http://tile.openstreetmap.dk/stevns/2009/$z/$x/$y.jpg</url> - <sourcetag>Stevns Kommune (2009)</sourcetag> - </set> - <set minlat="46.33" minlon="9.36" maxlat="49.09" maxlon="17.28"> - <name>Austria - geoimage.at</name> - <url>http://geoimage.openstreetmap.at/4d80de696cd562a63ce463a58a61488d/$z/$x/$y.jpg</url> - <sourcetag>geoimage.at</sourcetag> - </set> - <set minlon="19.02" minlat="40.96" maxlon="77.34" maxlat="70.48"> - <name>Russia - Kosmosnimki.ru IRS Satellite</name> - <url>http://irs.gis-lab.info/?layers=irs&request=GetTile&z=$z&x=$x&y=$y</url> - <sourcetag>Kosmosnimki.ru IRS</sourcetag> - </set> - <set minlon="23.16" minlat="51.25" maxlon="32.83" maxlat="56.19"> - <name>Belarus - Kosmosnimki.ru SPOT4 Satellite</name> - <url>http://irs.gis-lab.info/?layers=spot&request=GetTile&z=$z&x=$x&y=$y</url> - <sourcetag>Kosmosnimki.ru SPOT4</sourcetag> - </set> -</imagery> diff --git a/public/potlatch2/locales/ast.swf b/public/potlatch2/locales/ast.swf deleted file mode 100644 index 15822bd7d..000000000 Binary files a/public/potlatch2/locales/ast.swf and /dev/null differ diff --git a/public/potlatch2/locales/br.swf b/public/potlatch2/locales/br.swf deleted file mode 100644 index 1d6296aa2..000000000 Binary files a/public/potlatch2/locales/br.swf and /dev/null differ diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf deleted file mode 100644 index 7d1361a7d..000000000 Binary files a/public/potlatch2/locales/de_DE.swf and /dev/null differ diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf deleted file mode 100644 index bd25d16e1..000000000 Binary files a/public/potlatch2/locales/en_GB.swf and /dev/null differ diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf deleted file mode 100644 index 9dc8630b4..000000000 Binary files a/public/potlatch2/locales/en_US.swf and /dev/null differ diff --git a/public/potlatch2/locales/es_ES.swf b/public/potlatch2/locales/es_ES.swf deleted file mode 100644 index 298d7cfe7..000000000 Binary files a/public/potlatch2/locales/es_ES.swf and /dev/null differ diff --git a/public/potlatch2/locales/fi.swf b/public/potlatch2/locales/fi.swf deleted file mode 100644 index e334f2039..000000000 Binary files a/public/potlatch2/locales/fi.swf and /dev/null differ diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf deleted file mode 100644 index b65e3ede3..000000000 Binary files a/public/potlatch2/locales/fr_FR.swf and /dev/null differ diff --git a/public/potlatch2/locales/he.swf b/public/potlatch2/locales/he.swf deleted file mode 100644 index dd61e160b..000000000 Binary files a/public/potlatch2/locales/he.swf and /dev/null differ diff --git a/public/potlatch2/locales/hsb.swf b/public/potlatch2/locales/hsb.swf deleted file mode 100644 index 772b366da..000000000 Binary files a/public/potlatch2/locales/hsb.swf and /dev/null differ diff --git a/public/potlatch2/locales/ja_JP.swf b/public/potlatch2/locales/ja_JP.swf deleted file mode 100644 index a0dd94810..000000000 Binary files a/public/potlatch2/locales/ja_JP.swf and /dev/null differ diff --git a/public/potlatch2/locales/mk.swf b/public/potlatch2/locales/mk.swf deleted file mode 100644 index 4c90b424e..000000000 Binary files a/public/potlatch2/locales/mk.swf and /dev/null differ diff --git a/public/potlatch2/locales/ms.swf b/public/potlatch2/locales/ms.swf deleted file mode 100644 index 851623e23..000000000 Binary files a/public/potlatch2/locales/ms.swf and /dev/null differ diff --git a/public/potlatch2/locales/nb_NO.swf b/public/potlatch2/locales/nb_NO.swf deleted file mode 100644 index 9287969dd..000000000 Binary files a/public/potlatch2/locales/nb_NO.swf and /dev/null differ diff --git a/public/potlatch2/locales/nl_NL.swf b/public/potlatch2/locales/nl_NL.swf deleted file mode 100644 index c4abcad7b..000000000 Binary files a/public/potlatch2/locales/nl_NL.swf and /dev/null differ diff --git a/public/potlatch2/locales/nn_NO.swf b/public/potlatch2/locales/nn_NO.swf deleted file mode 100644 index 006c5d236..000000000 Binary files a/public/potlatch2/locales/nn_NO.swf and /dev/null differ diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf deleted file mode 100644 index 02024b5f2..000000000 Binary files a/public/potlatch2/locales/pl_PL.swf and /dev/null differ diff --git a/public/potlatch2/locales/ru.swf b/public/potlatch2/locales/ru.swf deleted file mode 100644 index 6c506069d..000000000 Binary files a/public/potlatch2/locales/ru.swf and /dev/null differ diff --git a/public/potlatch2/locales/sq.swf b/public/potlatch2/locales/sq.swf deleted file mode 100644 index f65de2380..000000000 Binary files a/public/potlatch2/locales/sq.swf and /dev/null differ diff --git a/public/potlatch2/locales/tr.swf b/public/potlatch2/locales/tr.swf deleted file mode 100644 index 89e2e16e6..000000000 Binary files a/public/potlatch2/locales/tr.swf and /dev/null differ diff --git a/public/potlatch2/locales/vi_VN.swf b/public/potlatch2/locales/vi_VN.swf deleted file mode 100644 index 9a00b3770..000000000 Binary files a/public/potlatch2/locales/vi_VN.swf and /dev/null differ diff --git a/public/potlatch2/locales/zh_CN.swf b/public/potlatch2/locales/zh_CN.swf deleted file mode 100644 index d0a7076db..000000000 Binary files a/public/potlatch2/locales/zh_CN.swf and /dev/null differ diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml deleted file mode 100644 index 2e296e964..000000000 --- a/public/potlatch2/map_features.xml +++ /dev/null @@ -1,655 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - See http://wiki.openstreetmap.org/wiki/Potlatch_2/Developer_Documentation/Map_Features for documentation. - Files can be included like this: <include file="map_features/roads.xml"> ---> - -<mapFeatures> - - <!-- Categories --> - <category name="Roads" id="roads"/> - <category name="Paths" id="paths"/> - <category name="Shopping" id="shopping"/> - <category name="Food and Drink" id="foodanddrink"/> - <category name="Amenity" id="amenity"/> - <category name="Tourism" id="tourism"/> - <category name="Accommodation" id="accommodation"/> - <category name="Transport" id="transport"/> - <category name="Water" id="water"/> - <category name="Natural" id="natural"/> - <category name="Barrier" id="barrier"/> - <category name="Power" id="power"/> - <category name="Admin" id="admin"/> - <category name="Buildings" id="buildings"/> - <category name="Landuse" id="landuse"/> - <category name="Agriculture" id="agriculture"/> - <category name="Advanced" id="advanced"/> - <category name="Places" id="places"/> - <category name="Sport and Leisure" id="sport"/> - <category name="Man-made" id="manmade"/> - - <!-- Common input sets --> - - <inputSet id="simpleName"> - <input type="freetext" presence="always" name="Name" key="name" description="The name" priority="highest"/> - </inputSet> - - <inputSet id="nameAndRef"> - <inputSet ref="simpleName" /> - <input type="freetext" presence="always" name="Reference number" key="ref" description="A reference number or code used to identify this thing." /> - </inputSet> - - <inputSet id="simpleBrand"> - <input type="freetext" category="Naming" presence="always" name="Brand" key="brand" description="Brand, i.e. Acme"/> - </inputSet> - - <inputSet id="simpleOperator"> - <input type="freetext" category="Naming" presence="always" name="Operator" key="operator" description="Operator, i.e. Acme Springfield Ltd"/> - </inputSet> - - <inputSet id="source"> - <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/> - </inputSet> - - <inputSet id="designation"> - <input type="freetext" category="Details" presence="onTagMatch" description="Official designation or classification" name="Designation" key="designation" priority="lowest" /> - </inputSet> - - <inputSet id="common"> - <inputSet ref="source"/> - <inputSet ref="designation"/> - </inputSet> - - <inputSet id="names"> - <input type="freetext" presence="always" - name="Name" category="Details" priority="highest" - key="name" description="The most common name"/> - <input type="freetext" presence="onTagMatch" - name="International Name" category="Details" subcategory="Additional names" - key="int_name" description="The internationally recognised name"/> - <input type="freetext" presence="onTagMatch" - name="Historical Name" category="Details" subcategory="Additional names" priority="low" - key="old_name" description="The historic or previous name"/> - <input type="freetext" presence="onTagMatch" - name="Alternative Name" category="Details" subcategory="Additional names" priority="low" - key="alt_name" description="An alternative, currently used, name"/> - </inputSet> - - <inputSet id="wifi"> - <input type="choice" presence="onTagMatch" category="Details" name="Wifi" key="wifi"> - <choice value="free" text="Free"/> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - </inputSet> - - <inputSet id="buildingAddress"> - <input type="freetext" presence="onTagMatch" category="Address" description="The number of the house, e.g. 156 or 10-12" name="House Number" key="addr:housenumber"/> - <input type="freetext" presence="onTagMatch" category="Address" description="The name of the house, e.g. Riverbank Cottage" name="Building Name" key="addr:housename"/> - <input type="freetext" presence="onTagMatch" category="Address" description="The Street Name (optional)" name="Street Name" key="addr:street"/> - <input type="freetext" presence="onTagMatch" category="Address" description="The postcode" name="Postcode" key="addr:postcode"/> - </inputSet> - - <inputSet id="web"> - <input type="freetext" presence="onTagMatch" category="Address" description="The URL of the website" name="Website" key="website"/> - </inputSet> - - <inputSet id="cuisine"> - <input type="choice" presence="always" name="Cuisine" category="Details" description="The type of food that they serve" key="cuisine"> - <!-- The 30 most popular values according to taginfo 23/12/2010 --> - <choice value="burger" text="Burger"/> - <choice value="chicken" text="Chicken"/> - <choice value="chinese" text="Chinese"/> - <choice value="coffee_shop" text="Coffee Shop"/> - <choice value="greek" text="Greek"/> - <choice value="pizza" text="Pizza"/> - <choice value="sandwich" text="Sandwich"/> - <choice value="seafood" text="Sea Food"/> - <choice value="regional" text="Regional"/> - <choice value="italian" text="Italian"/> - <choice value="german" text="German"/> - <choice value="kebab" text="Kebab/souvlaki/gyro"/> - <choice value="indian" text="Indian"/> - <choice value="asian" text="Asian"/> - <choice value="mexican" text="Mexican"/> - <choice value="thai" text="Thai"/> - <choice value="japanese" text="Japanese"/> - <choice value="ice_cream" text="Ice-cream"/> - <choice value="fish_and_chips" text="Fish & Chips"/> - <choice value="turkish" text="Turkish"/> - <choice value="french" text="French"/> - <choice value="sushi" text="Sushi"/> - <choice value="american" text="American"/> - <choice value="steak_house" text="Steak House"/> - <choice value="international" text="International"/> - <choice value="spanish" text="Spanish"/> - <choice value="vietnamese" text="Vietnamese"/> - <choice value="fish" text="Fish"/> - <choice value="bavarian" text="Bavarian"/> - <choice value="vegetarian" text="Vegetarian"/> - - <help>http://wiki.openstreetmap.org/wiki/Key:cuisine</help> - </input> - </inputSet> - - <!-- Roads --> - - <inputSet id="majorRoad"> - <inputSet ref="names"/> - <inputSet ref="roadRefs"/> - <inputSet ref="roadRestrictions"/> - <inputSet ref="roadPhysical"/> - <inputSet ref="cycle"/> - <inputSet ref="bicycle-lane"/> - <inputSet ref="bus-route"/> - <inputSet ref="pedestrians"/> - <inputSet ref="roadLanes"/> - <inputSet ref="roadRoundabout"/> - <inputSet ref="permissions"/> - </inputSet> - - - <inputSet id="minorRoad"> - <inputSet ref="names"/> - <inputSet ref="roadRestrictions"/> - <inputSet ref="roadPhysical"/> - <inputSet ref="cycle"/> - <inputSet ref="bicycle-lane"/> - <inputSet ref="bus-route"/> - <inputSet ref="pedestrians"/> - <inputSet ref="roadLanes"/> - <inputSet ref="roadRoundabout"/> - <inputSet ref="permissions"/> - </inputSet> - - <inputSet id="path"> - <inputSet ref="simpleName"/> - <inputSet ref="roadPhysical"/> - <inputSet ref="cycle"/> - <inputSet ref="ldp"/> - <inputSet ref="pedestrians"/> - <inputSet ref="permissions"/> - </inputSet> - - <inputSet id="junctionNode"> - <inputSet ref="turnRestrictions"/> - </inputSet> - - <inputSet id="roadRefs"> - <input type="freetext" presence="always" - name="Reference" category="Details" priority="high" - key="ref" description="The official reference number"/> - <input type="freetext" presence="onTagMatch" - name="International Reference" category="Details" subcategory="Additional names" - key="int_ref" description="The official international reference number"/> - <input type="freetext" presence="onTagMatch" - name="Old Reference" category="Details" subcategory="Additional names" priority="low" - key="old_ref" description="The historic or previous reference number"/> - </inputSet> - - <inputSet id="roadPhysical"> - <input type="freetext" presence="onTagMatch" - name="Width" category="Details" subcategory="Physical" - key="width" description="Width of the road" layout="horizontal"/> - <input type="choice" presence="onTagMatch" - name="Surface" category="Details" description="Type of road surface" - key="surface" layout="horizontal"> - <choice value="unpaved" text="Unpaved" description="Road surface is unsealed"/> - <choice value="paved" text="Paved" description="Road surface is sealed"/> - <choice value="asphalt" text="Asphalt"/> - <choice value="concrete" text="Concrete"/> - <choice value="paving_stones" text="Paving stones"/> - <choice value="cobblestone" text="Cobblestone"/> - <choice value="sand" text="Sand"/> - <choice value="gravel" text="Gravel"/> - <choice value="dirt" text="Dirt"/> - <choice value="grass" text="Grass"/> - </input> - <inputSet ref="bridge"/> - <inputSet ref="tunnel"/> - <inputSet ref="embankment-cutting"/> - <!-- not sure which category best suits put area=yes --> - <input type="checkbox" presence="onTagMatch" category="Details" subcategory="Physical" key="area" name="Open area" description="The way is a large open space, like at a dock, where vehicles can move anywhere within the space, rather than just along the edge." /> - </inputSet> - - <inputSet id="roadLanes"> - <input presence="onTagMatch" type="number" name="Lanes" category="Details" description="Total number of lanes, counting both directions" - key="lanes" minimum="1" maximum="10" layout="horizontal"/> - </inputSet> - - <inputSet id="bridge"> - <input type="choice" presence="onTagMatch" - name="Bridge" category="Details" description="Road goes over a bridge" - key="bridge" layout="horizontal"> - <choice value="yes" text="Generic Bridge" description="Generic bridge -- type unknown"/> - <choice value="viaduct" text="Viaduct" description="Viaduct"/> - <choice value="suspension" text="Suspension bridge"/> - </input> - <input type="slider" presence="onTagMatch" - name="Layer" category="Details" description="Relative vertical positions (-5 lowest, +5 highest)" - key="layer" minimum="-5" maximum="5" default="0" snapInterval="1" labels="Lowest,Ground,Highest" - defaultName="Ground"/> - </inputSet> - <inputSet id="tunnel"> - <!-- Not ideal, used for non-roads too. --> - <input type="choice" presence="onTagMatch" - name="Tunnel" category="Details" subcategory="Physical" description="Road goes into a tunnel" - key="tunnel" layout="horizontal"> - <choice value="yes" text="Tunnel" description="Generic tunnel"/> - </input> - </inputSet> - - <inputSet id="embankment-cutting"> - <input type="choice" - name="Embankment" category="Details" subcategory="Physical" description="Road supported on a raised bed of earth and rock." - key="embankment" layout="horizontal"> - <choice value="yes" text="Embankment"/> - </input> - <input type="choice" - name="Cutting" category="Details" subcategory="Physical" description="Road carved out of hill on one or both sides." - key="cutting" layout="horizontal"> - <choice value="yes" text="Cutting"/> - </input> - - </inputSet> - - <inputSet id="rail-electrification"> - <input type="choice" name="Electrified" category="Details" subcategory="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?" - key="electrified"> - <choice value="yes" text="Yes"/> - <choice value="contact_line" text="Overhead line"/> - <choice value="rail" text="Third rail"/> - <choice value="no" text="No"/> - </input> - <input type="choice" name="Voltage" category="Details" subcategory="Electrification" description="Nominal voltage of electric wires" - key="voltage" presence="withCategory"> - <choice value="600" text="600V"/> - <choice value="750" text="750V"/> - <choice value="1500" text="1500V"/> - <choice value="3000" text="3000V"/> - <choice value="15000" text="15kV"/> - <choice value="25000" text="25kV"/> - </input> - <input type="choice" name="Frequency" category="Details" subcategory="Electrification" description="Frequency in Hertz of alternating current power supply" - key="frequency" presence="withCategory"> - <choice value="0" text="DC"/> - <choice value="16.67" text="16.67 Hz"/> - <choice value="16.7" text="16.7 Hz"/> - <choice value="25" text="25 Hz"/> - <choice value="50" text="50 Hz"/> - <choice value="60" text="60 Hz"/> - </input> - </inputSet> - - <inputSet id="fee"> - <input type="freetext" presence="onTagMatch" category="Restrictions" description="The charge/cost of using this amenity" name="Fee" key="fee"/> - </inputSet> - - <inputSet id="roadRestrictions"> - <input type="choice" presence="always" - name="Oneway" category="Restrictions" description="Oneway roads" - key="oneway"> - <choice value="yes" match="yes|true|1" text="One way" - description="Road can only be travelled in direction of way" icon="features/oneway__yes.png"/> - <choice value="no" match="no|false|0" text="Two way" - description="Road can be travelled in both directions" icon="features/oneway__no.png"/> - <choice value="-1" match="-1|reverse" text="One way reverse" - description="Road can be travelled in opposite direction to way" icon="features/oneway__-1.png"/> - </input> - <input type="speed" presence="onTagMatch" - name="Speed Limit" category="Restrictions" description="Maximum permitted speed on this road" - key="maxspeed"/> - </inputSet> - - <inputSet id="roadRoundabout"> - <!-- review the choice of category --> - <input type="choice" presence="onTagMatch" name="Roundabout" category="Restrictions" description="Whether this road is a roundabout. Make the way face the direction appropriate for the country." - key="junction"> - <choice value="roundabout" text="Yes"/> - </input> - </inputSet> - - <inputSet id="turnRestrictions"> - <input type="turn" name="Turn restriction" description="Turn restriction" category="Restrictions" priority="normal" presence="onTagMatch"> - <match k="type" v="restriction"/> - <role role="via"/> - </input> - </inputSet> - - <inputSet id="pedestrians"> - <input type="choice" name="Pedestrians" description="Can pedestrians use this road, including footpaths if any?" category="Walk" key="foot"> - <choice value="yes" text="Allowed"/> - <choice value="no" text="Prohibited"/> - <choice value="designated" text="Designated"/> - </input> - </inputSet> - - <inputSet id="naptan"> - <input type="freetext" presence="onTagMatch" category="Transport" description="12 character internal Naptan ID" name="Atco Code" key="naptan:AtcoCode"/> - <input type="choice" presence="onTagMatch" category="Transport" description="The eight-point compass bearning" name="Naptan Bearing" key="naptan:Bearing" > - <choice value="N" match="N" text="N" description=""/> - <choice value="NE" match="NE" text="NE" description=""/> - <choice value="E" match="E" text="E" description=""/> - <choice value="SE" match="SE" text="SE" description=""/> - <choice value="S" match="S" text="S" description=""/> - <choice value="SW" match="SW" text="SW" description=""/> - <choice value="W" match="W" text="W" description=""/> - <choice value="NW" match="NW" text="NW" description=""/> - </input> - <input type="freetext" presence="onTagMatch" category="Transport" description="The naptan common name" name="Naptan Common Name (read-only)" key="naptan:CommonName"/> - <input type="freetext" presence="onTagMatch" category="Transport" description="" name="Naptan Indicator (read-only)" key="naptan:Indicator"/> - <input type="freetext" presence="onTagMatch" category="Transport" description="" name="Naptan Street (read-only)" key="naptan:Street"/> - <input type="freetext" presence="onTagMatch" category="Transport" description="Delete this when the details have been verified on-the-ground" name="Naptan Verified?" key="naptan:verified"/> - </inputSet> - - <inputSet id="buses"> - <input type="freetext" presence="always" category="Transport" name="Stop Name" key="name" description="The name of the bus stop"/> - <input type="freetext" presence="always" category="Transport" name="Local Ref" key="local_ref" description="The local reference of the stop, usually one or two letters above the main flag, used at bus interchanges, e.g. L, BX"/> - <inputSet ref="naptan"/> - </inputSet> - - <inputSet id="bus-route"> - <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch"> - <match k="type" v="route"/> - <match k="route" v="bus"/> - <icon image="features/route__bus.png"> - <font size="12pt">${operator} <b>${ref}</b></font> - </icon> - </input> - </inputSet> - - <inputSet id="tram-route"> - <input type="route" name="Tram Route" description="Tram route" category="Transport" priority="low" presence="onTagMatch"> - <match k="type" v="route"/> - <match k="route" v="tram"/> - <icon image="features/transport__tram.png"> - <font size="12pt">${operator} <b>${ref}</b></font> - </icon> - </input> - </inputSet> - - <inputSet id="cycle"> - <inputSet ref="bicycle-permission"/> - <input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low"> - <match k="type" v="route"/> - <match k="route" v="bicycle"/> - <match k="network" v="ncn"/> - <icon image="features/route__ncn.png" background="#ff6f7a" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - </input> - <input type="route" name="Regional Cycle Routes" description="A signposted route in a Regional Cycle Network, or nearest equivalent." category="Cycle" priority="low"> - <match k="type" v="route"/> - <match k="route" v="bicycle"/> - <match k="network" v="rcn"/> - <icon image="features/route__rcn.png" background="#6ff7ff" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - </input> - <input type="route" name="Local Cycle Routes" description="A signposted route in a Local Cycle Network, or nearest equivalent." category="Cycle" priority="lowest"> - <match k="type" v="route"/> - <match k="route" v="bicycle"/> - <match k="network" v="lcn"/> - <icon image="features/route__lcn.png" background="#7d6fff" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - </input> - <input type="route" name="Mountain bike route" description="A signposted route for mountain biking." category="Cycle" priority="lowest"> - <match k="type" v="route"/> - <match k="route" v="mtb"/> - <icon image="features/route__mtb.png" background="#9f4404" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - </input> - </inputSet> - - <inputSet id="bicycle-permission"> - <input type="choice" - name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?" - key="bicycle"> - <choice value="yes" text="Allowed"/> - <choice value="no" text="Prohibited" desciption="Cycling is not allowed. Pushing your bicycle is not allowed either."/> - <choice value="private" text="Private"/> - <choice value="dismount" text="Cyclists dismount" description="Signage states that cyclists should dismount and push their bike for the selected path or road."/> - <choice value="designated" text="Designated"/> - <help>http://wiki.openstreetmap.org/wiki/Key:access</help> - </input> - </inputSet> - - <inputSet id="bicycle-lane"> - <input type="choice" - name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface" - key="cycleway" layout="horizontal"> - <choice value="no" text="No bike lanes"/> - <choice value="lane" text="On-road bike lane" description="Separated by painted line on the road from cars"/> - <choice value="track" text="Parallel track" description="Separated by kerb or parked cars"/> - <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/> - <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/> - <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/> - <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help> - </input> - </inputSet> - - <inputSet id="ldp"> - <input type="route" name="National Walking Route" description="National walking route" category="Walk" priority="normal"> - <match k="type" v="route"/> - <match k="route" v="hiking|foot"/> - <match k="network" v="nwn"/> - <icon image="features/route__nwn.png" background="red" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - </input> - <input type="route" name="Regional Walking Route" description="Regional walking route" category="Walk" priority="low"> - <match k="type" v="route"/> - <match k="route" v="hiking|foot"/> - <match k="network" v="rwn"/> - <icon image="features/route__rwn.png" background="cyan" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - </input> - <input type="route" name="Local Walking Route" description="Local walking route" category="Walk" priority="lowest"> - <match k="type" v="route"/> - <match k="route" v="hiking|foot"/> - <match k="network" v="lwn"/> - <icon image="features/route__lwn.png" background="blue" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - </input> - </inputSet> - - <inputSet id="route"> - <inputSet ref="names"/> - <inputSet ref="roadRefs"/> - </inputSet> - - <inputSet id="waterways"> - <inputSet ref="simpleName"/> - <input type="freetext" presence="always" name="Width" category="Details" key="width" description="The width in metres"/> - <inputSet ref="boatPermissions"/> - </inputSet> -<!-- Would be good to have a dedicated 'access' type of input --> - <!-- all the description fields are identical at the moment for ease of maintenance, should be tailored in future. --> - <inputSet id="boatPermissions"> - <input type="choice" name="Boat permission" category="Restrictions" key="boat" description="Are boats allowed to use this waterway?"> - <choice value="yes" text="Allowed" description="General right of way."/> - <choice value="no" text="Prohibited" description="No access to the public."/> - <choice value="permissive" text="Permissive" description="Access permitted through private land."/> - <choice value="private" text="Private" description="No access to the public, except individual exceptions."/> - <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/> - </input> - </inputSet> - - <inputSet id="permissions"> - <input type="choice" name="General access" category="Restrictions" key="access" description="Is there a general right of access, regardless of mode of transport?"> - <choice value="yes" text="Allowed" description="General right of way."/> - <choice value="no" text="Prohibited" description="No access to the public."/> - <choice value="permissive" text="Permissive" description="Access permitted through private land."/> - <choice value="private" text="Private" description="No access to the public, except individual exceptions."/> - <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/> - </input> - - <input type="choice" name="Motor vehicles" category="Restrictions" key="motor_vehicle" description="Are cars and other private vehicles allowed?"> - <choice value="yes" text="Allowed" description="General right of way."/> - <choice value="no" text="Prohibited" description="No access to the public."/> - <choice value="permissive" text="Permissive" description="Access permitted through private land."/> - <choice value="private" text="Private" description="No access to the public, except individual exceptions."/> - <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/> - </input> - - <input type="choice" name="Horses" category="Restrictions" key="horse" description="Are cars and other private vehicles allowed?"> - <choice value="yes" text="Allowed" description="General right of way."/> - <choice value="no" text="Prohibited" description="No access to the public."/> - <choice value="permissive" text="Permissive" description="Access permitted through private land."/> - <choice value="private" text="Private" description="No access to the public, except individual exceptions."/> - <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/> - </input> - - </inputSet> - - <inputSet id="places"> - <input type="choice" name="Type of Place" presence="always" key="place"> - <choice value="locality" text="Locality"/> - <choice value="hamlet" text="Hamlet"/> - <choice value="village" text="Village"/> - <choice value="suburb" text="Suburb"/> - <choice value="town" text="Town"/> - <choice value="city" text="City"/> - <choice value="county" text="County"/> - <choice value="region" text="Region"/> - <choice value="state" text="State"/> - <choice value="country" text="Country"/> - <choice value="continent" text="Continent"/> - <choice value="island" text="Island"/> - <choice value="islet" text="Islet"/> - </input> - </inputSet> - - <inputSet id="isBuilding"> - <input type="choice" presence="withCategory" category="Details" name="Building type, if it is one" key="building"> - <choice value="yes" text="Generic building"/> - <choice value="residential" text="Generic residential"/> - <choice value="apartments" text="Big apartments house"/> - <choice value="terrace" text="Terraced house"/> - <choice value="house" text="Family house"/> - <choice value="hut" text="Small hut"/> - <choice value="garage" text="A garage"/> - <choice value="garages" text="Block of garages"/> - <choice value="office" text="Office building"/> - <choice value="public" text="Public building"/> - <choice value="industrial" text="Generic industrial"/> - <choice value="manufacture" text="Manufacture"/> - <choice value="warehouse" text="Warehouse"/> - <choice value="hangar" text="Hangar"/> - <choice value="storage_tank" text="Fluids storage tank"/> - <choice value="retail" text="Retail"/> - <choice value="supermarket" text="Supermarket"/> - <choice value="train_station" text="Train station"/> - <choice value="church" text="Church"/> - <choice value="school" text="School"/> - <choice value="bunker" text="Military bunker"/> - <choice value="collapsed" text="Collapsed building"/> - <choice value="roof" text="Just a roof"/> - <help>http://wiki.openstreetmap.org/wiki/Key:building</help> - </input> - </inputSet> - - <inputSet id="powerCables"> - <input type="choice" name="Cables" key="cables" presence="always" category="Details"> - <choice value="2" text="2"/> - <choice value="3" text="3"/> - <choice value="4" text="4"/> - <choice value="6" text="6"/> - <choice value="8" text="8"/> - <choice value="10" text="10"/> - <choice value="12" text="12"/> - </input> - <input type="choice" name="Voltage" key="voltage" presence="always" category="Details"> - <!-- choices based on http://osmdoc.com/en/tag/voltage/#values--> - <choice value="400" text="400 V"/> - <choice value="600" text="600 V"/> - <choice value="750" text="750 V"/> - <choice value="1500" text="1500 V"/> - <choice value="3000" text="3000 V"/> - <choice value="15000" text="15 kV"/> - <choice value="20000" text="20 kV"/> - <choice value="35000" text="35 kV"/> - <choice value="110000" text="110 kV"/> - <choice value="132000" text="132 kV"/> - <choice value="138000" text="238 kV"/> - <choice value="220000" text="220 kV"/> - <choice value="380000" text="380 kV"/> - </input> - </inputSet> - - <inputSet id="pitchSport"> - <input name="Sport" presence="always" category="Details" key="sport" type="choice" description="The sport that is predominantly played here."> - <choice value="9pin" text="9 pin bowling"/> - <choice value="10pin" text="10 pin bowling"/> - <choice value="american_football" text="American football"/> - <choice value="archery" text="Archery"/> - <choice value="athletics" text="Athletics"/> - <choice value="australian_football" text="Australian Rules Football"/> - <choice value="baseball" text="Baseball"/> - <choice value="basketball" text="Basketball"/> - <choice value="beachvolleyball" text="Beach volleyball"/> - <choice value="boules" text="Boules/petanque/bocci"/> - <choice value="bowls" text="Lawn bowls"/> - <choice value="canadian_football" text="Canadian football"/> - <choice value="chess" text="Chess"/> - <choice value="cricket" text="Cricket"/> - <choice value="cricket_nets" text="Cricket nets"/> - <choice value="croquet" text="Croquet"/> - <choice value="equestrian" text="Equestrian"/> - <choice value="gaelic_football" text="Gaelic football"/> - <choice value="gymnastics" text="Gymnastics"/> - <choice value="team_handball" text="(Team) handball"/> - <choice value="hockey" text="(Field) hockey"/> - <choice value="korfball" text="Korball"/> - <choice value="pelota" text="Pelota"/> - <choice value="rugby_league" text="Rugby league"/> - <choice value="rugby_union" text="Rugby union"/> - <choice value="shooting" text="Shooting"/> - <choice value="skating" text="Ice skating"/> - <choice value="skateboard" text="Skateboarding"/> - <choice value="soccer" text="Soccer/football"/> - <choice value="swimming" text="Swimming"/> - <choice value="table_tennis" text="Table tennis"/> - <choice value="tennis" text="Tennis"/> - <choice value="volleyball" text="Volleyball"/> - </input> - </inputSet> - -<!-- Features --> - - <include file="map_features/roads.xml" /> <!-- includes traffic calming, roundabouts, race track --> - <include file="map_features/paths.xml" /> <!-- includes steps, highway=pedestrian, bike/hike routes --> - <include file="map_features/water.xml" /> <!-- includes coastline --> - <include file="map_features/transport.xml" /> <!-- includes rail, trams, bus, airports, car rental, bike parking... --> - <include file="map_features/power.xml" /> <!-- includes power lines, pylons, stations --> - <include file="map_features/places.xml" /> <!-- includes boundaries (inc. NP) --> - <include file="map_features/tourism.xml" /> <!-- includes accommodation --> - <include file="map_features/barriers.xml" /> - <include file="map_features/shopping.xml" /> <!-- no clear distinction between this, amenities and buildings --> - <include file="map_features/amenities.xml" /> <!-- includes cafe, bar... --> - <include file="map_features/landuse.xml" /> <!-- includes outdoor leisure/sporting stuff, agriculture, natural. --> - <include file="map_features/man_made.xml" /> - <include file="map_features/buildings.xml" /> <!-- a bit of a dumping ground, includes sports centre, shopping centre, hospital... --> - - - - <!-- Relations --> - <feature name="Multipolygon"> - <category>advanced</category> - <relation/> - <tag k="type" v="multipolygon"/> - <inputSet ref="common"/> - </feature> - -</mapFeatures> diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml deleted file mode 100644 index 3dbd64a9d..000000000 --- a/public/potlatch2/map_features/amenities.xml +++ /dev/null @@ -1,493 +0,0 @@ -<featureGroup> - <!-- =========== Amenity ============ --> - - <feature name="Fire station"> - <category>amenity</category> - <icon image="features/pois/amenity_firestation2.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help> - <point/> - <tag k="amenity" v="fire_station"/> - <inputSet ref="simpleName" /> - <inputSet ref="common"/> - </feature> - - - <feature name="Police Station"> - <category>amenity</category> - <icon image="features/pois/amenity_police2.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help> - <point/> - <area/> - <tag k="amenity" v="police"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Library"> - <category>amenity</category> - <icon image="features/pois/amenity_library.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary</help> - <point/> - <area/> - <tag k="amenity" v="library"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Hospital"> - <category>amenity</category> - <icon image="features/pois/health_hospital.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help> - <point/> - <area/> - <tag k="amenity" v="hospital"/> - <inputSet ref="simpleName"/> - <input type="choice" presence="always" category="Details" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <inputSet ref="common"/> - </feature> - - - <feature name="Place of Worship"> - <category>amenity</category> - <icon image="features/pois/place_of_worship_unknown.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help> - <point/> - <tag k="amenity" v="place_of_worship"/> - <inputSet ref="simpleName" /> - <input type="choice" presence="always" category="Details" name="Religion" key="religion" description="The religion worshipped here."> - <choice value="christian" text="Christianity (church)"/> - <choice value="jewish" text="Judaism (synagogue)"/> - <choice value="muslim" text="Islam (mosque)"/> - <choice value="hindu" text="Hinduism (temple)"/> - <choice value="buddhist" text="Buddhism (temple)"/> - <choice value="sikh" text="Sikhism (gurdwara)"/> - <choice value="shinto" text="Shinto (shrine)"/> - </input> - - <input type="freetext" presence="always" category="Details" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/> - <inputSet ref="common"/> - </feature> - - - <feature name="ATM"> - <category>amenity</category> - <icon image="features/pois/money_atm.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Atm</help> - <point/> - <tag k="amenity" v="atm"/> - <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/> - <input type="freetext" presence="always" category="Details" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Bank"> - <category>amenity</category> - <icon image="features/pois/money_bank2.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help> - <point/> - <tag k="amenity" v="bank"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <input type="choice" presence="always" category="Details" name="Public ATM available" key="atm" description="Is there a public ATM available?"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <inputSet ref="common"/> - </feature> - - - <feature name="Recycling"> - <category>amenity</category> - <icon image="features/pois/amenity_recycling.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help> - <point/> - <area/> - <tag k="amenity" v="recycling"/> - <inputSet ref="simpleName"/> - <input type="choice" presence="always" category="Details" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high"> - <choice value="container" text="Container"/> - <choice value="centre" text="Recycling centre"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Books" key="recycling:books" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Green waste" key="recycling:green_waste" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Newspaper" key="recycling:newspaper" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Paper" key="recycling:paper" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Plastic" key="recycling:plastic" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Wood" key="recycling:wood" description="" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <inputSet ref="common"/> - </feature> - - <feature name="School"> - <category>amenity</category> - <icon image="features/pois/education_school.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help> - <point/> - <tag k="amenity" v="school"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - <feature name="Kindergarten"> - <category>amenity</category> - <category>buildings</category> - <icon image="features/pois/education_nursery3.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten</help> - <point/> - <tag k="amenity" v="kindergarten"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - <feature name="Town hall"> - <category>amenity</category> - <icon image="features/pois/amenity_town_hall.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall</help> - <point/> - <tag k="amenity" v="townhall"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Post Box"> - <category>amenity</category> - <icon image="features/pois/amenity_post_box.n.24.png"> - ${ref} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Post_box</help> - <point/> - <tag k="amenity" v="post_box"/> - <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post box"/> - <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/> - <inputSet ref="common"/> - </feature> - - <feature name="Post Office"> - <category>amenity</category> - <category>buildings</category> - <icon image="features/pois/amenity_post_office.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office</help> - <point/> - <area/> - <tag k="amenity" v="post_office"/> - <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post office"/> - <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/> - <inputSet ref="common"/> - <inputSet ref="simpleName"/> - </feature> - - <feature name="Trash/rubbish bin"> - <category>amenity</category> - <icon image="features/pois/amenity_waste_bin.n.24.png"> - ${ref} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket</help> - <point/> - <tag k="amenity" v="waste_basket"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Toilets"> - <category>amenity</category> - <icon image="features/pois/amenity_toilets.n.24.png"> - ${ref} - </icon> - <point/> - <tag k="amenity" v="toilets"/> - <inputSet ref="common"/> - </feature> - - <feature name="Water fountain"> - <category>amenity</category> - <category>foodanddrink</category> - <icon image="features/pois/food_drinkingtap.n.24.png"> - ${ref} - </icon> - <point/> - <tag k="amenity" v="drinking_water"/> - <inputSet ref="common"/> - </feature> - - <feature name="Shelter"> - <category>amenity</category> - <icon image="features/pois/accommodation_shelter2.n.24.png"> - ${name} - </icon> - <point/> - <area/> - <tag k="amenity" v="shelter"/> - <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter."> - <choice value="picnic_shelter" text="Picnic shelter"/> - <choice value="public_transport" text="Public transport"/> - <choice value="weather_shelter" text="Weather shelter"/> - <choice value="wildlife_hide" text="Wildlife hide"/> - </input> - <inputSet ref="names"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Barbecue"> - <category>amenity</category> - <icon image="features/pois/tourist_picnic.n.24.png"/> - <!-- specific icon needed --> - <point/> - <tag k="amenity" v="bbq"/> - <inputSet ref="common"/> - </feature> - - <feature name="Hunting stand"> - <category>sport</category> - <icon image="features/pois/sport_shooting.n.24.png"/> - <point/> - <tag k="amenity" v="hunting_stand"/> - <inputSet ref="common"/> - <inputSet ref="names"/> - </feature> - - - <feature name="Park bench"> - <category>amenity</category> - <icon image="features/pois/amenity_bench.n.24.png" /> - <point/> - <tag k="amenity" v="bench"/> - <inputSet ref="common"/> - </feature> - - <feature name="Public telephone"> - <category>amenity</category> - <icon image="features/pois/amenity_telephone.n.24.png" /> - <point/> - <tag k="amenity" v="telephone"/> - <inputSet ref="common"/> - </feature> - - <feature name="Emergency phone"> - <category>amenity</category> - <icon image="features/pois/emergency-telephone-24.png" /> - <!-- icon from http://www.clker.com/clipart-emergency-telephone-blue.html, feel free to (re)move this notice --> - <point/> - <tag k="amenity" v="emergency_phone"/> - <inputSet ref="common"/> - <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of emergency phone."/> - </feature> - - - <feature name="Swimming pool"> - <category>amenity</category> - <category>sport</category> - <icon image="features/pois/sport_swimming_outdoor.n.24.png"> - ${name} - </icon> - <point/> - <area/> - <tag k="amenity" v="swimming_pool"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - - </feature> - - <feature name="Fountain"> - <category>amenity</category> - <icon image="features/pois/amenity_fountain2.n.24.png"> - ${name} - </icon> - <point/> - <tag k="amenity" v="fountain"/> - <inputSet ref="common"/> - <inputSet ref="simpleName"/> - </feature> - - <feature name="Vending machine"> - <category>amenity</category> - <category>foodanddrink</category> - <icon image="features/pois/shopping_vending_machine.n.24.png">A vending machine.</icon> - - <point/> - <tag k="amenity" v="vending_machine"/> - <inputSet ref="common"/> - <inputSet ref="simpleName"/> - <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/> - <inputSet ref="simpleOperator" /> - </feature> - - <!-- ========= Entertainment ========= --> - - <feature name="Pub"> - <category>foodanddrink</category> - <icon image="features/pois/food_pub.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help> - <point/> - <tag k="amenity" v="pub"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="wifi"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Bar"> - <category>foodanddrink</category> - <icon image="features/pois/food_bar.n.24.png"> - ${name} - </icon> - <point/> - <tag k="amenity" v="bar"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="wifi"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Restaurant"> - <category>foodanddrink</category> - <icon image="features/pois/food_restaurant.n.24.png"> - ${name} - </icon> - <point/> - <tag k="amenity" v="restaurant"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="cuisine"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Cafe"> - <category>foodanddrink</category> - <icon image="features/pois/food_cafe.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help> - <point/> - <tag k="amenity" v="cafe"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="cuisine"/> - <inputSet ref="wifi"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Fast Food"> - <category>foodanddrink</category> - <icon image="features/pois/food_fastfood.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help> - <point/> - <tag k="amenity" v="fast_food"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="cuisine"/> - <inputSet ref="common"/> - </feature> - -</featureGroup> \ No newline at end of file diff --git a/public/potlatch2/map_features/barriers.xml b/public/potlatch2/map_features/barriers.xml deleted file mode 100644 index 916de11eb..000000000 --- a/public/potlatch2/map_features/barriers.xml +++ /dev/null @@ -1,191 +0,0 @@ -<featureGroup> - <feature name="Wall"> - <category>barrier</category> - <icon image="features/barrier_generic.png"/> - <icon> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help> - - <line/> - <tag k="barrier" v="wall"/> - <inputSet ref="common"/> - </feature> - - <feature name="Ditch"> - <category>barrier</category> - <icon image="features/barrier_generic.png"/> - <icon> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help> - - <line/> - <tag k="barrier" v="ditch"/> - <inputSet ref="common"/> - </feature> - - <feature name="Retaining wall"> - <category>barrier</category> - <icon image="features/barrier_generic.png"/> - <icon> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help> - - <line/> - <tag k="barrier" v="retaining_wall"/> - <inputSet ref="common"/> - </feature> - - <feature name="City wall"> - <category>barrier</category> - <icon image="features/barrier_generic.png"/> - <icon> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help> - - <line/> - <tag k="barrier" v="city_wall"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Fence"> - <category>barrier</category> - <icon image="features/barrier_generic.png"/> - <icon> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help> - - <line/> - <tag k="barrier" v="fence"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Hedge"> - <category>barrier</category> - <icon image="features/barrier_generic.png"/> - <icon> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help> - - <line/> - <tag k="barrier" v="hedge"/> - <inputSet ref="common"/> - </feature> - - <feature name="Bollard"> - <category>barrier</category> - <icon image="features/pois/barrier_bollard.n.24.png"> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help> - - <point/> - <tag k="barrier" v="bollard"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Gate"> - <category>barrier</category> - <icon image="features/pois/barrier_gate.n.24.png"> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help> - - <point/> - <tag k="barrier" v="gate"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Lift Gate"> - <category>barrier</category> - <icon image="features/pois/barrier_lift_gate.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate</help> - <point/> - <tag k="barrier" v="lift_gate"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Kissing Gate"> - <category>barrier</category> - <icon image="features/pois/barrier_kissing_gate.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate</help> - <point/> - <tag k="barrier" v="kissing_gate"/> - <inputSet ref="common"/> - </feature> - - - - <feature name="Cycle Barrier"> - <category>barrier</category> - <icon image="features/pois/barrier_cycle_barrier.24.png"> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help> - - <point/> - <tag k="barrier" v="cycle_barrier"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Big Concrete Blocks"> - <category>barrier</category> - <icon image="features/pois/barrier_blocks.24.png"> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help> - - <point/> - <tag k="barrier" v="block"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Cattle Grid"> - <category>barrier</category> - <icon image="features/pois/barrier_cattle_grid.24.png"> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help> - - <point/> - <tag k="barrier" v="cattle_grid"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Toll Booth"> - <category>barrier</category> - <icon image="features/pois/barrier_toll_booth.n.24.png"> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help> - - <point/> - <tag k="barrier" v="toll_booth"/> - <inputSet ref="fee"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the toll" priority="low"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Stile"> - <category>barrier</category> - <icon image="features/pois/barrier_stile.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile</help> - <point/> - <tag k="barrier" v="stile"/> - <inputSet ref="common"/> - </feature> - - <feature name="Wire fence"> - <!-- no idea, but taginfo says 2700 uses --> - <category>barrier</category> - <icon image="features/barrier_generic.png"/> - - <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence</help> - - <line/> - <tag k="barrier" v="wire_fence"/> - <inputSet ref="common"/> - </feature> -</featureGroup> \ No newline at end of file diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml deleted file mode 100644 index e82502689..000000000 --- a/public/potlatch2/map_features/buildings.xml +++ /dev/null @@ -1,255 +0,0 @@ -<featureGroup> - <feature name="School"> - <category>buildings</category> - <icon image="features/pois/education_school.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="amenity" v="school"/> - <inputSet ref="isBuilding"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - - <feature name="College"> - <category>buildings</category> - <icon image="features/pois/education_university.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="amenity" v="college"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - <feature name="University"> - <category>buildings</category> - <icon image="features/pois/education_university.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="amenity" v="university"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Supermarket"> - <category>buildings</category> - <icon image="features/pois/shopping_supermarket.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="shop" v="supermarket"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Place of worship"> - <category>buildings</category> - <icon image="icons/place_of_worship.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="amenity" v="place_of_worship"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <!-- sorted in reverse order of popularity in taginfo. --> - <input type="choice" category="Details" name="Religion" key="religion" description="The religion to which this place of worship belongs." presence="always"> - <choice value="christian" text="Christianity (church)"/> - <choice value="muslim" text="Islam (mosque)"/> - <choice value="buddhist" text="Buddhist (temple)"/> - <choice value="jewish" text="Judaism (synagogue)"/> - <choice value="hindu" text="Hindu (temple)"/> - <choice value="sikh" text="Sikh (gurdwara)"/> - <choice value="spiritualist" text="Spiritualism"/> - <choice value="unitarian" text="Unitarianism"/> - <choice value="taoist" text="Taoism"/> - <choice value="multifaith" text="Multi-faith"/> - <choice value="scientologist" text="Scientology"/> - <choice value="bahai" text="Bahai"/> - </input> - <!-- sorted in reverse order of popularity in taginfo. --> - <input type="choice" category="Details" name="Denomination" key="denomination" description="The denomination, or sub-branch of the main religion." presence="always"> - <choice value="catholic" text="Catholic"/> - <choice value="baptist" text="Baptist"/> - <choice value="methodist" text="Methodist"/> - <choice value="lutheran" text="Lutheran"/> - <choice value="protestant" text="Prostant"/> - <choice value="orthodox" text="Orthodox"/> - <choice value="presbyterian" text="Presbyterian"/> - <choice value="anglican" text="Anglican"/> - <choice value="roman_catholic" text="Roman Catholic"/> - <choice value="evangelical" text="Evangelical"/> - <choice value="pentecostal" text="Pentecostal"/> - <choice value="mormon" text="Mormon"/> - <choice value="sunni" text="Sunni"/> - <choice value="jehovahs_witness" text="Jehovah's Witness"/> - <!-- duplicate of Anglican? --> - <choice value="church_of_england" text="Church of England"/> - <choice value="greek_orthodox" text="Greek Orthodox"/> - <choice value="new_apostolic" text="New Apostolic"/> - <choice value="episcopal" text="Episcopal"/> - <choice value="russian_orthodox" text="Russian Orthodox"/> - <choice value="adventist" text="Adventist"/> - <choice value="seventh_day_adventist" text="Seventh Day Adventist"/> - <choice value="united_reformed" text="United Reformed"/> - <choice value="reformed" text="Reformed"/> - <choice value="iglesia_ni_cristo" text="Iglesia Ni Cristo"/> - <choice value="uniting" text="Uniting"/> - <choice value="salvation_army" text="Salvation Army"/> - <choice value="church_of_scotland" text="Church of Scotland"/> - <choice value="quaker" text="Quaker"/> - <choice value="scientist" text="Scientist"/> - <choice value="shia" text="Shia"/> - <choice value="congregational" text="Congregational"/> - <choice value="assembly_of_god" text="Assembly of God"/> - <choice value="united" text="United"/> - <choice value="mennonite" text="Mennonite"/> - <choice value="nazarene" text="Nazarene"/> - <!-- duplicate of Mormon? --> - <choice value="latter_day_saints" text="Latter Day Saints"/> - <choice value="dutch_reformed" text="Dutch Reformed"/> - <choice value="tibetan" text="Tibetan"/> - <choice value="shingon" text="Shingon"/> - <choice value="georgian_orthodox" text="Georgian Orthodox"/> - <choice value="unitarian" text="Unitarian"/> - <choice value="brethren" text="Brethren"/> - <choice value="armenian_apostolic" text="Armenian Apostolic"/> - <choice value="maronite" text="Maronite"/> - </input> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Public building"> - <category>buildings</category> - <icon image="features/pois/building_generic.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="amenity" v="public_building"/> - <tag k="building" v="yes"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Hospital"> - <category>buildings</category> - <icon image="features/pois/health_hospital.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="amenity" v="hospital"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - - - <feature name="Museum"> - <category>buildings</category> - <icon image="features/pois/tourist_museum.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="tourism" v="museum"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - <feature name="Shopping centre"> - <category>buildings</category> - <category>shopping</category> - <node/> - <area/> - <tag k="shop" v="mall"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - <feature name="Zoo"> - <category>buildings</category> - <icon image="features/pois/tourist_zoo.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="tourism" v="zoo"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Stadium"> - <category>buildings</category> - <icon image="features/pois/sport_stadium.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="leisure" v="stadium"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - - <!-- Generic building. Should be last in the entire xml chain --> - <!-- When user changes feature to some amenity, building tag is cleared. This should not be. --> - <feature name="Building"> - <category>buildings</category> - <icon image="features/pois/building_generic.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <point/> - <tag k="building" v="yes" vmatch="*"/> - <inputSet ref="isBuilding"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> -</featureGroup> - \ No newline at end of file diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml deleted file mode 100644 index 5a8eb1066..000000000 --- a/public/potlatch2/map_features/landuse.xml +++ /dev/null @@ -1,305 +0,0 @@ -<!-- This is a bit of a dumping ground for real landuse=*, but also outdoor natural/leisure/agriculture type keys. --> -<featureGroup> - <feature name="Industrial Area"> - <category>landuse</category> - <area/> - <icon image="features/pois/building_generic.png"> - <b>${name}</b> - </icon> - <tag k="landuse" v="industrial"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Offices"> - <category>landuse</category> - <area/> - <icon image="features/pois/building_generic.png"> - <b>${name}</b> - </icon> - <tag k="landuse" v="commercial"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Residential Area"> - <category>landuse</category> - <area/> - <icon image="features/pois/building_generic.png"> - <b>${name}</b> - </icon> - <tag k="landuse" v="residential"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Retail Area"> - <category>landuse</category> - <area/> - <icon image="features/pois/building_generic.png"> - <b>${name}</b> - </icon> - <tag k="landuse" v="retail"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Construction Site"> - <category>landuse</category> - <area/> - <icon image="features/pois/building_generic.png"> - <b>${name}</b> - </icon> - <tag k="landuse" v="construction"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Marketplace"> - <category>shopping</category> - <point /> - <area/> - <icon image="features/pois/shopping_marketplace.n.24.png"> - <b>${name}</b> - </icon> - <tag k="amenity" v="marketplace"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Cemetery"> - <category>landuse</category> - <point /> - <area/> - <icon image="features/pois/place_of_worship_unknown3.n.24.png"> - <b>${name}</b> - </icon> - <tag k="landuse" v="cemetery"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Graveyard"> - <category>landuse</category> - <point /> - <area/> - <icon image="features/pois/place_of_worship_unknown3.n.24.png"> - <b>${name}</b> - </icon> - <tag k="amenity" v="grave_yard"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Quarry"> - <category>landuse</category> - <icon image="features/pois/poi_mine.n.24.png"/> - <area/> - <tag k="landuse" v="quarry"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Military"> - <category>landuse</category> - <icon image="features/pois/poi_military_bunker.n.24.png"/> - <area/> - <tag k="landuse" v="military"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Conservation"> - <category>natural</category> - <icon image="icons/natural_blank.png"/> - <area/> - <tag k="landuse" v="conservation"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - - - - <feature name="Playground"> - <category>sport</category> - <area/> - <point/> - <icon image="features/pois/amenity_playground.n.24.png"> - <b>${name}</b> - </icon> - <tag k="leisure" v="playground"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Golf course"> - <category>sport</category> - <area/> - <icon image="features/pois/sport_golf.n.24.png"> - <b>${name}</b> - </icon> - <tag k="leisure" v="golf_course"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Recreation ground"> - <category>sport</category> - <area/> - <icon image="features/pois/sport_leisure_centre.n.24.png"> - <b>${name}</b> - </icon> - <tag k="leisure" v="recreation_ground"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Sports pitch"> - <category>sport</category> - <area/> - <icon image="features/pois/sport_leisure_centre.n.24.png"> - <b>${name}</b> - </icon> - <tag k="leisure" v="pitch"/> - <inputSet ref="simpleName"/> - <inputSet ref="pitchSport"/> - <inputSet ref="common"/> - </feature> - - <feature name="Sports track"> - <category>sport</category> - <area/> - <line/> - <icon image="features/pois/sport_leisure_centre.n.24.png"> - <b>${name}</b> - <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font> - </icon> - <tag k="leisure" v="track"/> - <inputSet ref="simpleName"/> - <inputSet ref="roadPhysical"/> - <inputSet ref="common"/> - </feature> - - <feature name="Sports centre"> - <category>sport</category> - <icon image="features/pois/sport_leisure_centre.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <point/> - <tag k="leisure" v="sports_centre"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="pitchSport"/> - <inputSet ref="isBuilding"/> - <inputSet ref="common"/> - </feature> - - - <!-- **************** Agriculture *************** --> - <feature name="Farm"> - <category>agriculture</category> - <icon image="features/pois/landuse_grass.n.24.png"/> - <area/> - <tag k="landuse" v="farm"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Farmyard"> - <category>agriculture</category> - <icon image="features/pois/landuse_grass.n.24.png"/> - <area/> - <tag k="landuse" v="farmyard"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Farmland"> - <category>agriculture</category> - <icon image="features/pois/landuse_grass.n.24.png"/> - <area/> - <tag k="landuse" v="farmland"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Field"> - <category>agriculture</category> - <icon image="features/pois/landuse_grass.n.24.png"/> - <area/> - <tag k="landuse" v="meadow"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Orchard"> - <category>agriculture</category> - <icon image="features/pois/landuse_grass.n.24.png"/> - <area/> - <tag k="landuse" v="orchard"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Vineyard"> - <category>agriculture</category> - <icon image="features/pois/landuse_grass.n.24.png"/> - <area/> - <tag k="landuse" v="vineyard"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - -<!-- ************************************************************************ - Natural - ************************************************************************ --> - - <feature name="Park"> - <category>natural</category> - <category>sport</category> - <icon image="icons/natural_blank.png"> - <b>${name}</b> - <br/> - </icon> - - <area/> - <tag k="leisure" v="park"/> - <inputSet ref="common"/> - </feature> - - <feature name="Forest"> - <category>natural</category> - <icon image="features/pois/landuse_coniferous.n.24.png"/> - - <area/> - <tag k="landuse" v="forest"/> - <inputSet ref="common"/> - </feature> - - <feature name="Meadow"> - <category>natural</category> - <icon image="icons/natural_blank.png"/> - - <area/> - <tag k="landuse" v="meadow"/> - <inputSet ref="common"/> - </feature> -</featureGroup> diff --git a/public/potlatch2/map_features/man_made.xml b/public/potlatch2/map_features/man_made.xml deleted file mode 100644 index 52db9362c..000000000 --- a/public/potlatch2/map_features/man_made.xml +++ /dev/null @@ -1,65 +0,0 @@ -<featureGroup> - <feature name="Tower/mast"> - <category>manmade</category> - <icon image="features/manmade_tower.png"/> - <point/> - <tag k="man_made" v="tower" vmatch="tower|water_tower|lighthouse|chimney|mast|communications_tower|flagpole|antenna|pole|cross"/> - <input type="choice" key="man_made" name="Object" presence="always" priority="highest"> - <choice value="tower" text="Tower"/> - <choice value="water_tower" text="Water tower"/> - <choice value="lookout_tower" text="Lookout tower"/> - <choice value="lighthouse" text="Lighthouse"/> - <choice value="chimney" text="Chimney"/> - <choice value="mast" text="Mast"/> - <choice value="flagpole" text="Flagpole"/> - <choice value="pole" text="Pole"/> - <choice value="cross" text="Cross"/> - <choice value="communications_tower" text="Comm. tower"/> - <choice value="communications_transponder" text="Comm. transponder"/> - <choice value="antenna" text="Antenna"/> - </input> - <inputSet ref="nameAndRef" /> - <inputSet ref="common"/> - </feature> - - <feature name="Navigation mark"> - <category>manmade</category> - <icon image="features/manmade_lighthouse.png"/> - <point/> - <tag k="man_made" v="survey_point" vmatch="survey_point|lighthouse|beacon|cairn|buoy"/> - <input type="choice" key="man_made" name="Object" presence="always" priority="highest"> - <choice value="survey_point" text="Trig point"/> - <choice value="lighthouse" text="Lighthouse"/> - <choice value="beacon" text="Beacon"/> - <choice value="cairn" text="Cairn"/> - <choice value="buoy" text="Buoy"/> - </input> - <inputSet ref="nameAndRef" /> - <inputSet ref="common"/> - </feature> - - - <feature name="Silo/tank"> - <category>manmade</category> - <icon image="features/manmade_silo.png"/> - <point/> - <area/> - <tag k="man_made" v="silo" vmatch="silo|storage_tank|tank|oil_tank|water_tank|fuel_storage_tank|reservoir|reservoir_covered|gasometer|bladder"/> - <input type="choice" key="man_made" name="Object" presence="always" priority="highest"> - <choice value="silo" text="Silo"/> - <choice value="storage_tank" text="Storage tank"/> - <choice value="tank" text="Tank"/> - <choice value="oil_tank" text="Oil tank"/> - <choice value="water_tank" text="Water tank"/> - <choice value="water_tower" text="Water tower"/> <!-- supported here but grouped under "tower/mast" --> - <choice value="fuel_storage_tank" text="Fuel storage tank"/> - <choice value="reservoir" text="Reservoir"/> - <choice value="reservoir_covered" text="Covered reservoir"/> - <choice value="gasometer" text="Gasometer"/> - <choice value="bladder" text="Bladder"/> - </input> - <inputSet ref="nameAndRef" /> - <inputSet ref="common"/> - </feature> -</featureGroup> - diff --git a/public/potlatch2/map_features/paths.xml b/public/potlatch2/map_features/paths.xml deleted file mode 100644 index b737f1637..000000000 --- a/public/potlatch2/map_features/paths.xml +++ /dev/null @@ -1,192 +0,0 @@ -<featureGroup> - <feature name="Footpath"> - <category>paths</category> - <icon image="features/paths__footway.png"> - ${name} <i>${ref}</i> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help> - <line/> - <tag k="highway" v="footway"/> - <inputSet ref="path"/> - <inputSet ref="common"/> - </feature> - - <feature name="Cycle path"> - <category>paths</category> - <icon image="features/paths__bike.png"> - ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help> - <line/> - <tag k="highway" v="cycleway"/> - <inputSet ref="path"/> - <inputSet ref="common"/> - <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low"> - <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." /> - <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." /> - </input> - </feature> - - <feature name="Pedestrian street"> - <category>paths</category> - <icon image="features/paths__pedestrian.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <tag k="highway" v="pedestrian"/> - <!-- pedestrian roads can be lines or areas, with different tags --> - <!-- TODO - implement this! --> - <line> - <tag k="highway" v="pedestrian"/> - </line> - <area> - <tag k="highway" v="pedestrian"/> - <tag k="area" v="yes"/> - </area> - <inputSet ref="minorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Bridleway"> - <category>paths</category> - <icon image="features/paths__bridleway.png"> - </icon> - - <line/> - <tag k="highway" v="bridleway"/> - <inputSet ref="path"/> - <inputSet ref="common"/> - </feature> - - <feature name="Steps"> - <category>paths</category> - <icon image="features/paths__steps.png"> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help> - - <line/> - <tag k="highway" v="steps"/> - <inputSet ref="path"/> - <input type="freetext" presence="always" category="Details" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/> - <inputSet ref="common"/> - </feature> - - <feature name="Generic path"> - <category>paths</category> - <icon image="features/paths__unofficial.png"> - ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath</help> - - <line/> - <tag k="highway" v="path"/> - <inputSet ref="path"/> - <inputSet ref="common"/> - </feature> - - - <!-- Bicycle routes --> - <feature name="National Cycle Network"> - <category>paths</category> - <icon image="features/route__ncn.png" background="red" foreground="white"> - <font size="14pt"> - <b>${ref}</b> - </font> - <br/> - <font size="12pt">${name}</font> - </icon> - - <relation/> - <tag k="type" v="route"/> - <tag k="route" v="bicycle"/> - <tag k="network" v="ncn"/> - - <inputSet ref="route"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Regional Cycle Network"> - <category>paths</category> - <icon image="features/route__rcn.png" background="cyan" foreground="white"> - <font size="14pt"><b>${ref}</b></font><br/> - <font size="12pt">${name}</font> - </icon> - - <relation/> - <tag k="type" v="route"/> - <tag k="route" v="bicycle"/> - <tag k="network" v="rcn"/> - - <inputSet ref="route"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Local Cycle Network"> - <category>paths</category> - <icon image="features/route__lcn.png" background="blue" foreground="white"> - <font size="14pt"> - <b>${ref}</b> - </font> - <br/> - <font size="12pt">${name}</font> - </icon> - - <relation/> - <tag k="type" v="route"/> - <tag k="route" v="bicycle"/> - <tag k="network" v="lcn"/> - - <inputSet ref="route"/> - <inputSet ref="common"/> - </feature> - - <feature name="Mountain bike route"> - <category>paths</category> - <icon image="features/route__mtb.png" background="#9f4404" foreground="white"> - <font size="14pt"> - <b>${ref}</b> - </font> - <br/> - <font size="12pt">${name}</font> - </icon> - - <relation/> - <tag k="type" v="route"/> - <tag k="route" v="mtb"/> - - <input type="choice" presence="always" category="Details" name="Route type" key="mtb:type" description="What type of route is it?"> - <choice value="crosscountry" text="Cross-country"/> - <choice value="allmountain" text="All-mountain"/> - <choice value="freeride" text="Freeride"/> - <choice value="downhill" text="Downhill"/> - <choice value="trial" text="Trial"/> - </input> - <inputSet ref="route"/> - <inputSet ref="common"/> - </feature> - - <!-- hiking --> - - <feature name="Long Distance Path"> - <category>paths</category> - <icon image="features/route__nwn.png" background="green" foreground="white"> - <font size="14pt"> - <b>${ref}</b> - </font> - <br/> - <font size="12pt">${name}</font> - </icon> - - <relation/> - <tag k="type" v="route"/> - <tag k="route" v="hiking" vmatch="hiking|foot"/> - - <inputSet ref="route"/> - <inputSet ref="common"/> - </feature> - -</featureGroup> diff --git a/public/potlatch2/map_features/places.xml b/public/potlatch2/map_features/places.xml deleted file mode 100644 index 0beea2377..000000000 --- a/public/potlatch2/map_features/places.xml +++ /dev/null @@ -1,114 +0,0 @@ -<featureGroup> - <feature name="Hamlet"> - <category>places</category> - <icon image="features/pois/poi_place_hamlet.p.24.png"/> - <point/> - <area/> - <tag k="place" v="hamlet" /> - <inputSet ref="names"/> - <inputSet ref="places"/> - <inputSet ref="common"/> - </feature> - - <feature name="Village"> - <category>places</category> - <icon image="features/pois/poi_place_village.p.24.png"/> - <point/> - <area/> - <tag k="place" v="village" /> - <inputSet ref="names"/> - <inputSet ref="places"/> - <inputSet ref="common"/> - </feature> - - <feature name="Town"> - <category>places</category> - <icon image="features/pois/poi_place_town.p.24.png"/> - <point/> - <area/> - <tag k="place" v="town" /> - <inputSet ref="names"/> - <inputSet ref="places"/> - <inputSet ref="common"/> - </feature> - - <feature name="Suburb"> - <category>places</category> - <icon image="features/pois/poi_place_suburb.p.24.png"/> - <point/> - <area/> - <tag k="place" v="suburb" /> - <inputSet ref="names"/> - <inputSet ref="places"/> - <inputSet ref="common"/> - </feature> - - <feature name="City"> - <category>places</category> - <icon image="features/pois/poi_place_city.p.24.png"/> - <point/> - <area/> - <tag k="place" v="city" /> - <inputSet ref="names"/> - <inputSet ref="places"/> - <inputSet ref="common"/> - </feature> - -<!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de --> - - <feature name="Admin Boundary"> - <category>places</category> - <line/> - <icon image="features/pois/poi_boundary_administrative.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help> - <tag k="boundary" v="administrative"/> - <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" /> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="National Park"> - <category>places</category> - <category>natural</category> - <line/> - <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help> - <tag k="boundary" v="national_park"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Protected Area"> - <category>places</category> - <category>natural</category> - <line/> - <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help> - <tag k="boundary" v="protected_area"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <feature name="Town boundary"> - <category>places</category> - <line/> - <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help> - <tag k="boundary" v="town"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <!-- boundary=landuse goes here. no idea what it is.--> - - <feature name="Census boundary"> - <category>places</category> - <line/> - <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help> - <tag k="boundary" v="census"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - <!-- next three are marker, postcode_area, administrative. all seem dubious --> - - - -</featureGroup> \ No newline at end of file diff --git a/public/potlatch2/map_features/power.xml b/public/potlatch2/map_features/power.xml deleted file mode 100644 index 87ff63f91..000000000 --- a/public/potlatch2/map_features/power.xml +++ /dev/null @@ -1,82 +0,0 @@ -<featureGroup> - <feature name="High-voltage line"> - <category>power</category> - <icon image="features/power_high.png"/> - <line/> - <tag k="power" v="line"/> - <inputSet ref="powerCables"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Low-voltage line"> - <category>power</category> - <icon image="features/power_low.png"/> - <line/> - <tag k="power" v="minor_line"/> - <inputSet ref="powerCables"/> - <inputSet ref="common"/> - </feature> - - - <feature name="High-voltage pylon"> - <category>power</category> - <icon image="features/pois/power_tower_high2.n.24.png"/> - <point/> - <tag k="power" v="tower"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Power pole"> - <category>power</category> - <icon image="features/pois/power_tower_low.n.24.png"/> - <point/> - <tag k="power" v="pole"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Plant (station)"> - <category>power</category> - <icon image="features/pois/power_station.png"/> - <area/> - <point/> - <tag k="power" v="generator"/> - <inputSet ref="names"/> - <input type="choice" presence="always" name="Energy source" key="power_source" category="Details"> - <choice value="coal" text="Coal"/> - <choice value="gas" text="Gas"/> - <choice value="oil" text="Oil"/> - <choice value="fossil" text="Unspecified fossil fuel"/> - <choice value="hydro" text="Hydroelectric"/> - <choice value="geothermal" text="Geothermal"/> - <choice value="nuclear" text="Nuclear"/> - <choice value="wind" text="Wind"/> - <choice value="photovoltaic" text="Solar PV"/> - <choice value="solar_thermal" text="Solar thermal"/> - <choice value="biofuel" text="Biofuel"/> - </input> - <inputSet ref="common"/> - </feature> - - - <feature name="Substation"> - <category>power</category> - <icon image="features/pois/power_substation.n.24.png"/>" - <area/> - <point/> - <tag k="power" v="station"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Transformer"> - <category>power</category> - <icon image="features/pois/power_transformer.n.24.png"/> - <area/> - <point/> - <tag k="power" v="sub_station"/> - <inputSet ref="common"/> - </feature> -</featureGroup> \ No newline at end of file diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml deleted file mode 100644 index 8fe62ba82..000000000 --- a/public/potlatch2/map_features/roads.xml +++ /dev/null @@ -1,343 +0,0 @@ -<featureGroup> - <!-- ************************************************************************ - Roads - ************************************************************************ --> - - - <feature name="Motorway"> - <category>roads</category> - <icon image="features/highway__motorway.png"> - <font size="16pt"><b>${ref}</b></font><br/> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway</help> - - <line/> - <tag k="highway" v="motorway"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Motorway link"> - <category>roads</category> - <icon image="features/highway__motorway_link.png"/> - <line/> - <tag k="highway" v="motorway_link"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Trunk road"> - <category>roads</category> - <icon image="features/highway__trunk.png"> - <font size="16pt"><b>${ref}</b></font><br/> - <font size="10pt">${name}</font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrunk</help> - - <line/> - <tag k="highway" v="trunk"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Trunk link"> - <category>roads</category> - <icon image="features/highway__trunk_link.png"/> - <line/> - <tag k="highway" v="trunk_link"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Primary road"> - <category>roads</category> - <icon image="features/highway__primary.png"> - <font size="16pt"><b>${ref}</b></font><br/> - <font size="10pt">${name}</font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary</help> - - <line/> - <tag k="highway" v="primary"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Primary link"> - <category>roads</category> - <icon image="features/highway__primary_link.png"> - <font size="16pt"><b>${ref}</b></font><br/> - <font size="10pt">${name}</font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary_link</help> - - <line/> - <tag k="highway" v="primary_link"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Secondary road"> - <category>roads</category> - <icon image="features/highway__secondary.png"> - <font size="16pt"><b>${ref}</b></font><br/> - <font size="10pt">${name}</font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary</help> - - <line/> - <tag k="highway" v="secondary"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Secondary link"> - <category>roads</category> - <icon image="features/highway__secondary_link.png"> - <font size="16pt"> - <b>${ref}</b> - </font> - <br/> - <font size="10pt">${name}</font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary_link</help> - - <line/> - <tag k="highway" v="secondary_link"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - - - <feature name="Tertiary road"> - <category>roads</category> - <icon image="features/highway__tertiary.png"> - <font size="14pt"><b>${name}</b></font><br/> - <font size="10pt">${ref}</font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary</help> - - <line/> - <tag k="highway" v="tertiary"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Tertiary link"> - <category>roads</category> - <icon image="features/highway__tertiary_link.png"> - <font size="14pt"><b>${name}</b></font><br/> - <font size="10pt">${ref}</font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary_link</help> - - <line/> - <tag k="highway" v="tertiary_link"/> - - <inputSet ref="majorRoad"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Minor road"> - <category>roads</category> - <icon image="features/highway__unclassified.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified</help> - - <line/> - <tag k="highway" v="unclassified"/> - - <inputSet ref="minorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Residential road"> - <category>roads</category> - <icon image="features/highway__residential.png"> - <font size="14pt"> - <b>${name}</b> - </font> - <br/> - <font size="8pt">${postal_code}</font> - <br/> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help> - - <line/> - <tag k="highway" v="residential"/> - - <inputSet ref="minorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Service road"> - <category>roads</category> - <icon image="features/highway__service.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dservice</help> - <description> - Access roads - </description> - - <line/> - <tag k="highway" v="service"/> - - <inputSet ref="minorRoad"/> - <input type="choice" presence="always" name="Type of service road" key="service" category=""> - <choice value="alley" text="Alleyway/laneway"/> - <choice value="parking_aisle" text="Parking aisle" description="The path that cars drive on through a parking lot."/> - <choice value="driveway" text="Driveway"/> - <choice value="drive-through" text="Drive-through" description="For drive-through restaurants, bottle shops etc."/> - <choice value="emergency_access" text="Emergency access" description="For firefighters and other emergency services."/> - </input> - <inputSet ref="common"/> - </feature> - - <feature name="Unknown road"> - <category>roads</category> - <icon image="features/highway__unknown.png"> - <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font> - </icon> - - <line/> - <tag k="highway" v="road"/> - - <inputSet ref="minorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Living Street"> - <category>roads</category> - <icon image="features/highway__living_street.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help> - - <line/> - <tag k="highway" v="living_street"/> - - <inputSet ref="minorRoad"/> - <inputSet ref="common"/> - </feature> - - <feature name="Track"> - <category>roads</category> - <icon image="features/highway__track.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - - <line/> - <tag k="highway" v="track"/> - - <inputSet ref="path"/> - <inputSet ref="common"/> - </feature> - - <feature name="Raceway/racing track"> - <category>sport</category> - <icon> - <font size="10pt">A purpose built track for racing motor vehicles.</font> - </icon> - - <line/> - <area/> - <tag k="highway" v="raceway"/> - - <inputSet ref="simpleName"/> - <inputSet ref="roadPhysical"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Turning circle"> - <category>transport</category> - <icon image="features/pois/transport_turning_circle.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle</help> - <point draganddrop="no"/> - <tag k="highway" v="turning_circle"/> - <inputSet ref="common"/> - </feature> - - <feature name="Mini Roundabout"> - <category>transport</category> - <icon image="features/pois/transport_miniroundabout_anticlockwise.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help> - <point/> - <tag k="highway" v="mini_roundabout"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Traffic calming"> - <category>transport</category> - <icon image="features/pois/transport_speedbump.n.24.png"/> -<!-- <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>--> - <point/> - <tag k="traffic_calming" v="yes" vmatch="*"/> - <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch"> - <choice value="yes" text="Unspecified"/> - <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/> - <choice value="hump" text="Speed hump" description="A gentler, longer bump, typically slowing cars to 30 kph or less."/> - <choice value="cushion" text="Speed cushion" description="A narrow speed bump allowing emergency vehicles and buses to pass without slowing."/> - <choice value="table" text="Speed table" description="A very long speed hump allowing the whole wheelbase to rest on top."/> - <choice value="chicane" text="Chicane" description="A set of obstacles causing vehicles to weave through."/> - <choice value="rumble_strip" text="Rumble strip" description="A series of very small bumps causing vibration or noise."/> - <choice value="choker" text="Choker" description="An artificial narrowing of the road."/> - </input> - - <inputSet ref="common"/> - </feature> - - <feature name="Turn restriction"> - <category>advanced</category> - <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help> - <relation/> - <tag k="type" v="restriction"/> - <input type="choice" category="Restrictions" presence="always" name="Type" key="restriction" description="What's the restriction?" layout="horizontal" priority="high"> - <choice value="no_left_turn" text="No left turn"/> - <choice value="no_right_turn" text="No right turn"/> - <choice value="no_u_turn" text="No U turns"/> - <choice value="no_straight_on" text="No straight on"/> - <choice value="only_left_turn" text="Left turn only"/> - <choice value="only_right_turn" text="Right turn only"/> - <choice value="only_straight_on" text="Straight on only"/> - </input> - <input type="choice" category="Restrictions" presence="always" name="Except" key="except" description="Are any vehicles exempt?" layout="horizontal"> - <choice value="psv" text="Bus"/> - <choice value="bicycle" text="Bicycle"/> - <choice value="motorcar" text="Car"/> - <choice value="hgv" text="HGV"/> - </input> - <input type="freetext" category="Restrictions" presence="always" name="Start day" key="day_on" description="What day of the week does it start?" layout="horizontal" priority="low"/> - <input type="freetext" category="Restrictions" presence="always" name="Start time" key="hour_on" description="What time of day does it start?" layout="horizontal" priority="low"/> - <input type="freetext" category="Restrictions" presence="always" name="End day" key="day_off" description="What day of the week does it end?" layout="horizontal" priority="lowest"/> - <input type="freetext" category="Restrictions" presence="always" name="End time" key="hour_off" description="What time of day does it end?" layout="horizontal" priority="lowest"/> - <inputSet ref="common"/> - </feature> - - - <!-- Junction nodes (for turn restrictions) --> - - <feature> - <point/> - <within entity="way" k="highway" minimum="2"/> - <inputSet ref="junctionNode"/> - <inputSet ref="common"/> - </feature> - - -</featureGroup> \ No newline at end of file diff --git a/public/potlatch2/map_features/shopping.xml b/public/potlatch2/map_features/shopping.xml deleted file mode 100644 index dc46eaf9e..000000000 --- a/public/potlatch2/map_features/shopping.xml +++ /dev/null @@ -1,347 +0,0 @@ -<featureGroup> - <feature name="Supermarket"> - <category>shopping</category> - <icon image="features/pois/shopping_supermarket.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help> - <point/> - <area/> - <tag k="shop" v="supermarket"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - <feature name="Small Convenience Store"> - <category>shopping</category> - <icon image="features/pois/shopping_convenience.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help> - <point/> - <area/> - <tag k="shop" v="convenience"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - <feature name="Bakery"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_bakery.n.24.png"/> - <tag k="shop" v="bakery"/> - <inputSet ref="common"/> - </feature> - - - - - <feature name="Alcohol shop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_alcohol.n.24.png"/> - <tag k="shop" v="alcohol"/> - <inputSet ref="common"/> - </feature> - - - - <feature name="Bike shop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_bicycle.n.24.png"/> - <tag k="shop" v="bicycle"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Bookshop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_book.n.24.png"/> - <tag k="shop" v="books"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Butcher"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_butcher.n.24.png"/> - <tag k="shop" v="butcher"/> - <inputSet ref="common"/> - </feature> - - <feature name="Car sales"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_car.n.24.png"/> - <tag k="shop" v="car"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Car repair"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_car_repair.n.24.png"/> - <tag k="shop" v="car_repair"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Clothes shop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_clothes.n.24.png"/> - <tag k="shop" v="clothes"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Confectionery"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_confectionery.n.24.png"/> - <tag k="shop" v="confectionery"/> - <inputSet ref="common"/> - </feature> - - - <feature name="DIY"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_diy.n.24.png"/> - <tag k="shop" v="doityourself"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Fishmonger"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_fish.n.24.png"/> - <tag k="shop" v="fishmonger"/> - <inputSet ref="common"/> - </feature> - - <feature name="Florist"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_florist.n.24.png"/> - <tag k="shop" v="florist"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Garden centre"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_garden_centre.n.24.png"/> - <tag k="shop" v="garden_centre"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Gift shop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_gift.n.24.png"/> - <tag k="shop" v="gift"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Greengrocer"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_greengrocer.n.24.png"/> - <tag k="shop" v="greengrocer"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Hairdresser"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_hairdresser.n.24.png"/> - <tag k="shop" v="hairdresser"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Hifi shop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_hifi.n.24.png"/> - <tag k="shop" v="hifi"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Jewellery"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_jewelry.n.24.png"/> - <tag k="shop" v="jewelry"/> - <inputSet ref="common"/> - </feature> - - <feature name="Kiosk"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_kiosk.n.24.png"/> - <tag k="shop" v="kiosk"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Laundrette"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_laundrette.n.24.png"/> - <tag k="shop" v="laundry"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Motorbike shop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_motorcycle.n.24.png"/> - <tag k="shop" v="motorcycle"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Music shop"> - <category>shopping</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <icon image="features/pois/shopping_music.n.24.png"/> - <tag k="shop" v="music"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Pharmacy"> - <category>shopping</category> - <icon image="features/pois/health_pharmacy.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Pharmacy</help> - <point/> - <area/> - <tag k="amenity" v="pharmacy"/> - <inputSet ref="names"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <input type="checkbox" category="Details" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/> - <inputSet ref="common"/> - </feature> - - <feature name="Toy shop"> - <category>shopping</category> - <icon image="features/pois/shopping_toys.n.24.png" /> - <point/> - <area/> - <inputSet ref="simpleName"/> - <inputSet ref="web"/> - <inputSet ref="buildingAddress"/> - <tag k="shop" v="toys"/> - <inputSet ref="common"/> - </feature> -</featureGroup> - - \ No newline at end of file diff --git a/public/potlatch2/map_features/tourism.xml b/public/potlatch2/map_features/tourism.xml deleted file mode 100644 index 1ad78ae1d..000000000 --- a/public/potlatch2/map_features/tourism.xml +++ /dev/null @@ -1,271 +0,0 @@ -<featureGroup> -<!-- ========= Accommodation ========= --> - <feature name="Hotel"> - <category>accommodation</category> - <icon image="features/pois/accommodation_hotel.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help> - <point/> - <area/> - <tag k="tourism" v="hotel"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Motel"> - <category>accommodation</category> - <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel</help> - <point/> - <area/> - <icon image="features/pois/accommodation_motel.n.24.png"/> - <tag k="tourism" v="motel"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - - <feature name="Hostel"> - <category>accommodation</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/accommodation_youth_hostel.n.24.png"/> - <tag k="tourism" v="hostel"/> - <inputSet ref="common"/> - </feature> - - - <!-- Note that tourism=bed_and_breakfast also gets some use. --> - <feature name="Guesthouse (B&B)"> - <category>accommodation</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/> - <tag k="tourism" v="guest_house"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Campsite"> - <category>accommodation</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/accommodation_camping.n.24.png"/> - <tag k="tourism" v="camp_site"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Caravan park"> - <category>accommodation</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/accommodation_caravan_park.n.24.png"/> - <tag k="tourism" v="caravan_site"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Alpine hut"> - <category>accommodation</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/accommodation_alpinehut.n.24.png"/> - <tag k="tourism" v="alpine_hut"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Chalet"> - <category>accommodation</category> - <icon image="features/pois/accommodation_chalet.n.24.png"/> - <point/> - <area/> - <inputSet ref="simpleName"/> - <tag k="tourism" v="chalet"/> - <inputSet ref="common"/> - </feature> - - - - <!-- ========= Tourism ========= --> - <feature name="Attraction"> - <category>tourism</category> - <icon image="features/pois/tourist_attraction.n.24.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="tourism" v="attraction"/> - <inputSet ref="names"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - <feature name="Museum"> - <category>tourism</category> - <icon image="features/pois/tourist_museum.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum</help> - <point/> - <area/> - <tag k="tourism" v="museum"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Archaeological"> - <category>tourism</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_archaeological.n.24.png"/> - <tag k="historic" v="archaeological_site"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Battlefield"> - <category>tourism</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_battlefield.n.24.png"/> - <tag k="historic" v="battlefield"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Castle"> - <category>tourism</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_castle.n.24.png"/> - <tag k="historic" v="castle"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Memorial"> - <category>tourism</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_memorial.n.24.png"/> - <tag k="historic" v="memorial"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Monument"> - <category>tourism</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_monument.n.24.png"/> - <tag k="historic" v="monument"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Picnic site"> - <category>tourism</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_picnic.n.24.png"/> - <tag k="tourism" v="picnic_site"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Ruins"> - <category>tourism</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_ruin.n.24.png"/> - <tag k="historic" v="ruins"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Cinema"> - <category>tourism</category> - <icon image="features/pois/tourist_cinema.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema</help> - <point/> - <area/> - <tag k="amenity" v="cinema"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Theatre"> - <category>tourism</category> - <point/> - <area/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_theatre.n.24.png"/> - <tag k="amenity" v="theatre"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Viewpoint"> - <category>tourism</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/tourist_view_point.n.24.png"/> - <tag k="tourism" v="viewpoint"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Zoo"> - <category>tourism</category> - <point/> - <area/> - <icon image="features/pois/tourist_zoo.n.24.png"/> - <tag k="tourism" v="zoo"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Information"> - <category>tourism</category> - <icon image="features/pois/amenity_information.n.24.png"/> - <point/> - <tag k="tourism" v="information"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Artwork"> - <category>tourism</category> - <icon image="features/pois/tourist_art_gallery2.n.24.png"/> - <point/> - <inputSet ref="simpleName"/> - <tag k="tourism" v="artwork"/> - <inputSet ref="common"/> - </feature> - - - - <feature name="Theme park"> - <category>tourism</category> - <icon image="features/pois/tourist_theme_park.n.24.png"/> - <point/> - <area/> - <inputSet ref="simpleName"/> - <tag k="tourism" v="theme_park"/> - <inputSet ref="common"/> - </feature> -</featureGroup> diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml deleted file mode 100644 index acd9be449..000000000 --- a/public/potlatch2/map_features/transport.xml +++ /dev/null @@ -1,530 +0,0 @@ -<featureGroup> - <feature name="Railway line"> - <category>transport</category> - <icon image="features/railway__rail.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="railway" v="rail"/> - <inputSet ref="bridge"/> - <inputSet ref="tunnel"/> - <inputSet ref="embankment-cutting"/> - <inputSet ref="rail-electrification"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Railway spur"> - <category>transport</category> - <icon image="features/railway__spur.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="railway" v="rail"/> - <tag k="service" v="spur"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Railway siding"> - <category>transport</category> - <icon image="features/railway__siding.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="railway" v="rail"/> - <tag k="service" v="siding"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Preserved line"> - <category>transport</category> - <icon image="features/railway__preserved.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - - <line/> - <tag k="railway" v="preserved"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Disused tracks"> - <category>transport</category> - <icon image="features/railway__disused.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="railway" v="disused"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Old trackbed"> - <category>transport</category> - <icon image="features/railway__abandoned.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - - <line/> - <tag k="railway" v="abandoned"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Light rail line"> - <category>transport</category> - <icon image="features/railway__light.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="railway" v="light_rail"/> - <inputSet ref="bridge"/> - <inputSet ref="tunnel"/> - <inputSet ref="embankment-cutting"/> - <inputSet ref="rail-electrification"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Tram line"> - <category>transport</category> - <icon image="features/railway__tram.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - - <line/> - <tag k="railway" v="tram"/> - <input ref="tram-route"/> - <inputSet ref="bridge"/> - <inputSet ref="tunnel"/> - <inputSet ref="embankment-cutting"/> - <inputSet ref="rail-electrification"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Subway line"> - <category>transport</category> - <icon image="features/railway__subway.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="railway" v="subway"/> - <inputSet ref="bridge"/> - <inputSet ref="tunnel"/> - <inputSet ref="embankment-cutting"/> - <inputSet ref="rail-electrification"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Railway platform"> - <category>transport</category> - <icon image="features/railway__platform.png"/> - <line/> - <area/> - <tag k="railway" v="platform"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Reference" key="ref" description="The number of the platform" priority="low"/> - <inputSet ref="common"/> - </feature> - - <feature name="Car Wash"> - <category>transport</category> - <icon image="features/pois/transport_car_wash.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcar_wash</help> - <point/> - <tag k="amenity" v="car_wash"/> - <inputSet ref="names"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The company/organisation that runs the car wash" priority="low"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Opening hours" key="opening_hours" priority="normal"/> - <input type="choice" presence="onTagMatch" category="Details" name="Self service" key="self_service" priority="low"> - <choice value="yes" text="Yes" /> - <choice value="no" text="No" /> - </input> - <input type="choice" presence="onTagMatch" category="Details" name="Automated" key="automated" priority="low"> - <choice value="yes" text="Yes" /> - <choice value="no" text="No" /> - </input> - - <inputSet ref="common"/> - </feature> - - <feature name="Bus station"> - <category>transport</category> - <icon image="features/amenity__bus_station.png"> - <b>${name} ${addr:housename}</b><br/> - ${addr:housenumber} ${addr:street} ${addr:postcode} - </icon> - - <area/> - <tag k="amenity" v="bus_station"/> - <inputSet ref="names"/> - <inputSet ref="isBuilding"/> - <inputSet ref="buildingAddress"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Airport"> - <category>transport</category> - <icon image="features/aeroway__aerodrome.png" dnd="features/pois/transport_airport.n.24.png"/> - <tag k="aeroway" v="aerodrome"/> - <area/> - <point/> - <inputSet ref="names"/> - <input type="freetext" presence="always" category="Details" name="International Air Transport Association (IATA) airport code" key="ref"/> - <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help> - <inputSet ref="common"/> - </feature> - - - <feature name="Airport terminal"> - <category>transport</category> - <icon image="features/aeroway__terminal.png" dnd="features/pois/transport_airport_terminal.n.24.png"/> - <tag k="aeroway" v="terminal"/> - <area/> - <point/> - <inputSet ref="names"/> - <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help> - <inputSet ref="common"/> - </feature> - - - <feature name="Helipad"> - <category>transport</category> - <icon image="features/aeroway__helipad.png" dnd="features/pois/transport_helicopter_pad.n.24.png"/> - <tag k="aeroway" v="helipad"/> - <area/> - <point/> - <inputSet ref="names"/> - <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help> - <inputSet ref="common"/> - </feature> - - - <feature name="Airport runway"> - <category>transport</category> - <icon image="features/aeroway__runway.png"/> - <tag k="aeroway" v="runway"/> - <line/> - <inputSet ref="names"/> - <input type="freetext" presence="always" category="Details" name="Runway number (01-36)" key="ref"/> - <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help> - <inputSet ref="common"/> - </feature> - - - <feature name="Airport taxiway"> - <category>transport</category> - <icon image="features/aeroway__taxiway.png"/> - <tag k="aeroway" v="taxiway"/> - <line/> - <inputSet ref="names"/> - <input type="freetext" presence="always" category="Details" name="Taxiway number" key="ref" /> - <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help> - <inputSet ref="common"/> - </feature> - - - <feature name="Airport apron"> - <category>transport</category> - <icon image="features/aeroway__apron.png"/> - <tag k="aeroway" v="apron"/> - <area/> - <inputSet ref="names"/> - <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help> - <inputSet ref="common"/> - </feature> - - - <feature name="Airport gate"> - <category>transport</category> - <icon image="features/pois/transport_airport_gate.n.24.png"/> - <tag k="aeroway" v="gate"/> - <point/> - <input type="freetext" presence="always" category="Details" name="Gate number" key="ref"/> - <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help> - <inputSet ref="common"/> - </feature> - - -<feature name="Aerodrome"> - <category>aeroway</category> - <icon image="features/aeroway__aerodrome.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help> - <point/> - <tag k="aeroway" v="aerodrome"/> - <inputSet ref="simpleName"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Bus Stop"> - <category>transport</category> - <icon image="features/pois/transport_bus_stop2.n.24.png"> - ${name} ${local_ref} - </icon> - <point/> - <tag k="highway" v="bus_stop"/> - <inputSet ref="buses"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Car Parking"> - <category>transport</category> - <icon image="features/amenity__parking.png" dnd="features/pois/transport_parking_car.n.24.png"> - ${name} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking</help> - <point/> - <area/> - <tag k="amenity" v="parking"/> - <inputSet ref="names"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/> - <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/> - <inputSet ref="fee"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Bicycle Parking"> - <category>transport</category> - <icon image="features/pois/transport_parking_bicycle.n.24.png"> - ${name} ${capacity} - </icon> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking</help> - <point/> - <tag k="amenity" v="bicycle_parking"/> - <inputSet ref="names"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/> - <input type="number" minimum="0" maximum="99999" stepSize="1" - presence="always" category="Cycle" name="Capacity" key="capacity" - description="The number of bicycles that can be parked in the group of bicycle parking racks"/> - <inputSet ref="fee"/> - <input type="choice" presence="always" category="Cycle" name="Covered" key="covered" description="Is the cycle parking covered, so that the bikes are kept dry?"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <inputSet ref="common"/> - </feature> - - - <feature name="Railway station"> - <category>transport</category> - <icon image="features/pois/transport_train_station.n.24.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <point/> - <tag k="railway" v="station"/> - <inputSet ref="names"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the service" priority="low"/> - <input type="number" minimum="1" maximum="99999" stepSize="1" presence="onTagMatch" category="Details" name="Platforms" key="platforms" description="The number of passenger platforms at the station" priority="low"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Fuel"> - <category>transport</category> - <point /> - <inputSet ref="simpleName" /> - <icon image="features/pois/transport_fuel.n.24.png" /> - <tag k="amenity" v="fuel"/> - <inputSet ref="simpleBrand"/> - <inputSet ref="simpleOperator"/> - - <input type="choice" category="Details" name="Diesel" key="fuel:diesel" description="Is diesel fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="GTL Diesel" key="fuel:GTL_diesel" description="Is GTL diesel fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="HGV Diesel" key="fuel:HGV_diesel" description="Is HGV diesel fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Biodiesel" key="fuel:biodiesel" description="Is biodiesel unleaded fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Octane 91" key="fuel:octane_91" description="Is octane 91 unleaded fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Octane 95" key="fuel:octane_95" description="Is octane 95 unleaded fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Octane 98" key="fuel:octane_98" description="Is octane 98 unleaded fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Octane 100" key="fuel:octane_100" description="Is octane 100 unleaded fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Mixture 1:25" key="fuel:1_25" description="Is mixture 1:25 fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Mixture 1:50" key="fuel:1_50" description="Is mixture 1:50 fuel sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="E10" key="fuel:e10" description="Is E10 sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="E85" key="fuel:e85" description="Is E85 sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Biogas" key="fuel:biogas" description="Is biogas sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="CNG" key="fuel:cng" description="Is CNG sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="LPG" key="fuel:lpg" description="Is LPG sold here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <input type="choice" category="Details" name="Electricity" key="fuel:electricity" description="Is it possible to charge an electric car here?" priority="low"> - <choice value="yes" text="Yes"/> - <choice value="no" text="No"/> - </input> - <inputSet ref="common"/> - </feature> - - - <feature name="Bus station"> - <category>transport</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/transport_bus_station.n.24.png"/> - <tag k="amenity" v="bus_station"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Taxi rank"> - <category>transport</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/transport_taxi_rank.n.24.png"/> - <tag k="amenity" v="taxi"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Tram stop"> - <category>transport</category><point/><inputSet ref="simpleName" /> - <icon image="features/pois/transport_tram_stop.n.24.png"/> - <tag k="railway" v="tram_stop"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Bicycle rental"> - <category>transport</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/transport_rental_bicycle.n.24.png"/> - <tag k="amenity" v="bicycle_rental"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Car rental"> - <category>transport</category> - <point/> - <inputSet ref="simpleName"/> - <icon image="features/pois/transport_rental_car.n.24.png"/> - <tag k="amenity" v="car_rental"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Ferry Terminal"> - <category>transport</category> - <icon image="features/pois/transport_port.n.24.png"/> - <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help> - <point/> - <tag k="amenity" v="ferry_terminal"/> - <inputSet ref="simpleName" /> - <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/> - <input type="freetext" presence="onTagMatch" category="Details" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/> - <inputSet ref="common"/> - </feature> - - - <!-- public transit routes --> - <feature name="Bus Route"> - <category>transport</category> - <icon image="features/route__bus.png"> - <font size="12pt"> - ${operator} <b>${ref}</b> - </font> - </icon> - - <relation/> - <tag k="type" v="route"/> - <tag k="route" v="bus"/> - - <inputSet ref="route"/> - <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the bus service" priority="low"/> - <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the bus service" priority="low"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Tram Route"> - <category>transport</category> - <icon image="features/transport__tram.png"> - <font size="12pt"> - ${operator} <b>${reg}</b> - </font> - </icon> - - <relation/> - <tag k="type" v="route"/> - <tag k="route" v="tram"/> - - <inputSet ref="route"/> - <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the tram service" priority="low"/> - <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the tram service" priority="low"/> - <inputSet ref="common"/> - </feature> - - -</featureGroup> diff --git a/public/potlatch2/map_features/water.xml b/public/potlatch2/map_features/water.xml deleted file mode 100644 index e58c0c331..000000000 --- a/public/potlatch2/map_features/water.xml +++ /dev/null @@ -1,196 +0,0 @@ -<featureGroup> - <feature name="Stream"> - <category>water</category> - <description>A very narrow river.</description> - <icon image="features/waterway__stream.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="waterway" v="stream"/> - <inputSet ref="waterways"/> - <inputSet ref="common"/> - </feature> - - - <feature name="River"> - <category>water</category> - <icon image="features/waterway__river.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - - <line/> - <tag k="waterway" v="river"/> - <inputSet ref="waterways"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Canal"> - <category>water</category> - <icon image="features/waterway__canal.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <tag k="waterway" v="canal"/> - <inputSet ref="waterways"/> - <inputSet ref="tunnel"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Drain"> - <category>water</category> - <icon image="features/waterway__drain.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - - <line/> - <tag k="waterway" v="drain"/> - <inputSet ref="tunnel"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Dam"> - <category>water</category> - <description>A structure for holding water in a reservoir</description> - <icon image="features/waterway__dam.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <area/> - <tag k="waterway" v="dam"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Riverbank"> - <category>water</category> - <icon image="features/waterway__riverbank.png"> - <font size="14pt"><b>${name}</b></font> - </icon> - - <area/> - <tag k="waterway" v="riverbank"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Reservoir"> - <category>water</category> - <icon image="features/waterway__reservoir.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <area/> - <tag k="landuse" v="reservoir"/> - <inputSet ref="boatPermissions"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Lake"> - <category>water</category> - <icon image="features/waterway__lake.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - <area/> - <tag k="natural" v="water"/> - <inputSet ref="names"/> - <inputSet ref="boatPermissions"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Basin"> - <category>water</category> - <icon image="features/waterway__basin.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <area/> - <tag k="landuse" v="basin"/> - <inputSet ref="boatPermissions"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Weir"> - <category>water</category> - <icon image="features/waterway__weir.png" dnd="features/pois/transport_weir.n.24.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <line/> - <point/> - <tag k="waterway" v="weir"/> - <inputSet ref="common"/> - </feature> - - <feature name="Dock"> - <category>water</category> - <icon image="features/waterway__dock.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <area/> - <tag k="waterway" v="dock"/> - <inputSet ref="names"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Marina"> - <category>water</category> - <icon image="features/waterway__marina.png" dnd="features/pois/transport_marina.n.24.png"> - <font size="14pt"> - <b>${name}</b> - </font> - </icon> - - <area/> - <point/> - <tag k="leisure" v="marina"/> - <inputSet ref="names"/> - <inputSet ref="common"/> - </feature> - - - <feature name="Slipway"> - <category>water</category> - <icon image="features/waterway__slipway.png" dnd="features/pois/transport_slipway.n.24.png"/> - <point/> - <line/> - <tag k="leisure" v="slipway"/> - <inputSet ref="names"/> - <inputSet ref="common"/> - </feature> - - <feature name="Coastline"> - <category>water</category> - <description>The average high tide line, with water on the right-hand side</description> - <icon image="features/waterway__coastline.png" /> - <line/> - <tag k="natural" v="coastline"/> - <inputSet ref="common"/> - </feature> -</featureGroup> \ No newline at end of file diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf deleted file mode 100644 index d2a082b2a..000000000 Binary files a/public/potlatch2/potlatch2.swf and /dev/null differ diff --git a/public/potlatch2/stylesheets.xml b/public/potlatch2/stylesheets.xml deleted file mode 100644 index 0e1d910a3..000000000 --- a/public/potlatch2/stylesheets.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<stylesheets> - <stylesheet> - <name>Potlatch</name> - <url>stylesheets/potlatch.css</url> - </stylesheet> - <stylesheet> - <name>Wireframe</name> - <url>stylesheets/wireframe.css</url> - </stylesheet> - <stylesheet> - <name>Enhanced</name> - <url>stylesheets/enhanced.css</url> - </stylesheet> - <stylesheet> - <name>Network</name> - <url>stylesheets/network.css</url> - </stylesheet> - <stylesheet> - <name>OpenCycleMap</name> - <url>stylesheets/opencyclemap.css</url> - </stylesheet> - <stylesheet> - <name>GPS</name> - <url>stylesheets/gpx.css</url> - <corestyle>no</corestyle> - </stylesheet> - <stylesheet> - <name>Bugs</name> - <url>stylesheets/bugs.css</url> - <corestyle>no</corestyle> - </stylesheet> -</stylesheets> diff --git a/public/potlatch2/stylesheets/bikeshops.css b/public/potlatch2/stylesheets/bikeshops.css deleted file mode 100644 index cd74a7fff..000000000 --- a/public/potlatch2/stylesheets/bikeshops.css +++ /dev/null @@ -1,3 +0,0 @@ -node { z-index: 9; - icon-image: features/bike-shop.png; - text-offset: 28; font-family: DejaVu; text: name; font-size: 9; text_color: red; width: 50;} \ No newline at end of file diff --git a/public/potlatch2/stylesheets/bugs.css b/public/potlatch2/stylesheets/bugs.css deleted file mode 100644 index 68bd474f9..000000000 --- a/public/potlatch2/stylesheets/bugs.css +++ /dev/null @@ -1,9 +0,0 @@ -node[status=fixed] { z-index: 2; - icon-image: features/bugs/fixed.png; } - -node[status=invalid] { z-index: 2; - icon-image: features/bugs/invalid.png; } - -node[status=open] { z-index: 2; - icon-image: features/bugs/open.png; - text-offset: 14; font-family: DejaVu; text: name; font-size: 9; text_color: red; } \ No newline at end of file diff --git a/public/potlatch2/stylesheets/core_interactive.css b/public/potlatch2/stylesheets/core_interactive.css deleted file mode 100644 index 3fd9ea777..000000000 --- a/public/potlatch2/stylesheets/core_interactive.css +++ /dev/null @@ -1,28 +0,0 @@ -/* Turn restrictions */ - -relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; } - -/* Interactive way behaviour */ - -way::highlight :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } -way::highlight :hover :background { color: lightcyan; } -way::highlight :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} -way::highlight :selected :background { color: cyan; } -way::highlight :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;} -way::highlight :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;} -/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/ -way !:drawn { z-index:10; width: 1; color: #333333; } -way :tiger { casing-color: #ff00ff;} - -/* Interactive node behaviour */ - -node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; } -node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; } -node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; } -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: #BBB; casing-color: #333; casing-width: 1; } -node !:drawn :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; } -node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; } -node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; } -node::selectedNode :selected :background { color: cyan; } -node::junctionNode :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; } diff --git a/public/potlatch2/stylesheets/core_landuse.css b/public/potlatch2/stylesheets/core_landuse.css deleted file mode 100644 index a113cc7e1..000000000 --- a/public/potlatch2/stylesheets/core_landuse.css +++ /dev/null @@ -1,43 +0,0 @@ -/* Landuse */ - -way[natural] :area { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } -way[natural=beach] :area { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; set .area_small_name;} -way[natural=coastline] { color: black; width: 3; } -way[landuse] :area { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } -way[landuse=residential] :area { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } -way[landuse=retail] :area { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } -way[landuse=commercial] :area { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } -way[landuse=military] :area { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; } -way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */ -way[leisure] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } -way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;} -way[historic],way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;} -way[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;} -way[building] :area { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } -way[natural=water], -way[waterway][waterway!=dam] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; set .area_small_name;} -way[waterway=dam] { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;} -way[man_made] :area { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[man_made=reservoir_covered] :area { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[landuse=reservoir] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; set .area_small_name;} -way[landuse=forest],way[natural=wood] :area { color: green; width: 2; fill-color: green; fill-opacity: 0.2; set .area_small_name;} -way[leisure=park] :area { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;} -way[leisure=garden] :area { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;} -way[leisure=pitch] :area { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; set .area_small_name;} -way[landuse=recreation_ground] :area { color: green; fill-color: green; set .area_small_name;} -way[amenity=parking] :area { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } -way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} -way[man_made=pier][floating=yes] { dashes: 4,2; casing-color: #444;} -way[leisure=marina] :area { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;} -way[leisure=slipway] { color: grey; width: 3; casing-color: blue; casing-width: 2; } -way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;} -way[boundary] { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -/* Perhaps should be filled, on lower zooms. */ -way[boundary=national_park] { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -way[boundary=protected_area] { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;} -way[boundary=administrative] { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} -way[boundary=administrative][waterway] { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } -way[landuse=cemetery] { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;} -/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ diff --git a/public/potlatch2/stylesheets/core_pois.css b/public/potlatch2/stylesheets/core_pois.css deleted file mode 100644 index 62d804088..000000000 --- a/public/potlatch2/stylesheets/core_pois.css +++ /dev/null @@ -1,88 +0,0 @@ -node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; } -node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } -node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; } -node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } -node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } -node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; } -node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } -node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } -node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } -node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; } -node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; } -node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; } -node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; } -node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; } -node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; } -node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; } -node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; } -node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; } -node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; } -way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } -node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } -node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } -node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } -node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } -node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } -node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } -node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } -node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } -node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } -node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; } -node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; } -node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; } -node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; } -node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } -node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } -node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } -node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } -node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; } -node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; } -node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } -node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } -node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } -node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } -node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } -node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } -node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } -node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; } -node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; } -node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; } -node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } -node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } -node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } -node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } -node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } -node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } -node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } -node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } -node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } -node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } -node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; } -node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } -node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } -node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; } -node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } -node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; } -node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } -node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } - -/* Addressing */ - -node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } -way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} diff --git a/public/potlatch2/stylesheets/core_relations.css b/public/potlatch2/stylesheets/core_relations.css deleted file mode 100644 index a2d5a7437..000000000 --- a/public/potlatch2/stylesheets/core_relations.css +++ /dev/null @@ -1,8 +0,0 @@ -/* Route relations */ - -relation[type=route] way::route { z-index: 1; width: 13; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way::route { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way::route { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way::route { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=mtb] way::route { z-index: 1; width: 12; color: brown; opacity: 0.3; } -relation[type=route][route=foot] way::route { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; } diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css deleted file mode 100644 index 6c260b0fc..000000000 --- a/public/potlatch2/stylesheets/core_ways.css +++ /dev/null @@ -1,136 +0,0 @@ - -/* Roads */ - -way[highway=motorway],way[highway=motorway_link], -way[highway=trunk],way[highway=trunk_link], -way[highway=primary],way[highway=primary_link], -way[highway=secondary],way[highway=secondary_link], -way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential],way[highway=unclassified] { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 1; } -way[highway=tertiary] { z-index: 6; color: #FEFECB; width: 5; casing-width: 1; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } -way[highway=tertiary_link] { z-index: 5; color: #FEFECB; width: 4; casing-width: 1; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } -way[highway=service][service!=parking_aisle] { color: white; width: 3; casing-color: gray; casing-width: 1; } -way[highway=service][service=parking_aisle] { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } -way[highway=service][service=alley] { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } -way[highway=road] { color: gray; width: 5; casing-color: white; casing-width: 1; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } - -/* Road areas */ - -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} -way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } - -/* Paths */ - -way[highway=steps] { color: #FF6644; width: 6; dashes: 2, 2; } -way[highway=footway] { color: #FF6644; width: 2; dashes: 6, 3; set .path;} -way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } -way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;} -way[highway=track] { color: #996644; width: 2; dashes: 4, 2; set .path;} -way[highway=path] { color: brown; width: 2; dashes: 2, 2; set .path;} -way[highway=cycleway] { color: blue; width: 2; dashes: 4, 2; set .path;} -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } -way .path { text:name; text-color: black; text-position: offset; text-offset: 5;} - -/* Under construction */ - -way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; } -way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} - -/* Railways */ - -way[railway=rail] { z-index: 6; color: black; width: 5; } -way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; } - -way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} -way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } - -way[railway=platform] { color:black; width: 2; } - -way[railway=subway] { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } - -way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } -way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} - -way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } -way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } - -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } -way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } - -way[railway=light_rail] { z-index: 6; color: black; width: 4; } -way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } - -way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } -way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } - -/* Waterways */ - -way[waterway=river], -way[waterway=canal], -way[waterway=stream] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;} -way[waterway=drain] {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;} -way[waterway][tunnel=yes] {dashes: 8,4;} - -/* Aeroways */ - -way[aeroway=aerodrome] :area - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } -way|z-15[aeroway=aerodrome] :area - { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;} -way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } -way[aeroway=taxiway] :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } - -way|z17-[aeroway=runway] !:area { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; } -way|z17-[aeroway=runway]::aa !:area { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } -way|z17-[aeroway=runway]::bb !:area { z-index: 11; color: black; width: 7; } -way|z17-[aeroway=runway]::cc !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way|z17-[aeroway=runway]::dd !:area { z-index: 13; color: black; width: 3; } -way|z17-[aeroway=runway]::ee !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -way|z15-16[aeroway=runway] !:area { z-index: 9; color: black; width: 5; } -way|z15-16[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way|z15-16[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; } -way|z15-16[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -way|z-14[aeroway=runway] !:area { z-index: 9; color: #444444; width: 3; } - -way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; } -way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} - -/* Barriers */ - -way[barrier] {color: #000000; width: 1} -way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; } - -/* Power */ - -way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} -way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} -way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;} -way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;} - -/* Leisure */ - -way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 2; } -way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; } - - -/* Physical decoration */ - -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); } -way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); } -way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } - -/* Attribute decoration */ - -way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; } -way[oneway=-1]::arrows { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; } diff --git a/public/potlatch2/stylesheets/enhanced.css b/public/potlatch2/stylesheets/enhanced.css deleted file mode 100644 index 23966e004..000000000 --- a/public/potlatch2/stylesheets/enhanced.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - Potlatch 2 enhanced stylesheet - - The aim of this stylesheet is to provide a fuller, more detailed rendering of additional attributes - (e.g. direction, access) used at times by the moderately experienced mapper. - -*/ - -@import("stylesheets/core_ways.css"); -@import("stylesheets/core_pois.css"); -@import("stylesheets/core_landuse.css"); - -/* Access */ - -way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} - -/* Physical */ - -way[embankment=yes]::hatches, way[cutting=yes]::hatches - { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } - -/* Interactive behaviour */ - -@import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -@import("stylesheets/core_interactive.css"); - -/* Direction on selected ways */ - -way[highway][!oneway][junction!=roundabout]::direction :selected, -way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } - diff --git a/public/potlatch2/stylesheets/gpx.css b/public/potlatch2/stylesheets/gpx.css deleted file mode 100644 index fe08e31ac..000000000 --- a/public/potlatch2/stylesheets/gpx.css +++ /dev/null @@ -1,12 +0,0 @@ -/* - - Wireframe stylesheet for GPS tracks - -*/ - -way { z-index: 2; width: 1; color: cyan; } -node :poi { z-index: 2; - icon-image: circle; icon-width: 4; color: orange; - casing-color: red; casing-width: 1; - text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; } - diff --git a/public/potlatch2/stylesheets/network.css b/public/potlatch2/stylesheets/network.css deleted file mode 100644 index d2a60a9fb..000000000 --- a/public/potlatch2/stylesheets/network.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - Potlatch 2 network stylesheet - - This is a variant of the enhanced stylesheet _without_ landuse and similar polygons. The aim is to - prevent such items distracting the mapper and leading to unwanted junctions (and slowing down - rendering!). - -*/ - -@import("stylesheets/core_ways.css"); -@import("stylesheets/core_pois.css"); - -/* Access */ - -way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} - -/* Physical */ - -way[embankment=yes]::hatches, way[cutting=yes]::hatches - { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } - -/* Interactive behaviour */ - -@import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -@import("stylesheets/core_interactive.css"); - -/* Direction on selected ways */ - -way[highway][!oneway][junction!=roundabout]::direction :selected, -way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } - diff --git a/public/potlatch2/stylesheets/opencyclemap.css b/public/potlatch2/stylesheets/opencyclemap.css deleted file mode 100644 index 1270ba26c..000000000 --- a/public/potlatch2/stylesheets/opencyclemap.css +++ /dev/null @@ -1,147 +0,0 @@ -/* - - Stylesheet that mimicks, to a certain extent, opencyclemap - Andy Allan, June 2010 - - Based heavily on: - MapCSS demonstration stylesheet - Richard Fairhurst, October 2009 - -*/ - -/* This rule applies to all areas (closed ways). Note that rules are applied in the order - they appear in the file, so later rules may replace this one for some ways. - This is used as a debugger for finding unstyled areas; it's obviously oversimplistic since - it picks up closed-loop highways. */ - -way :area { color: grey; width: 1; fill-color: red; fill-opacity: 0.1; } - -/* A set of fairly standard rules. - We use z-index to make sure high-priority roads appear above minor ones. - The default z-index is 5. If an object matches multiple rules with the same - z-index then the rules are "merged" (but individual properties become one or the other) */ - -/*way[highway=motorway],way[highway=motorway_link], -way[highway=trunk],way[highway=trunk_link], -way[highway=primary],way[highway=primary_link], -way[highway=secondary],way[highway=secondary_link], -way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential] { text: name; text-color: black; font-size: 7; text-position: line;}*/ -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 1; } -way[highway=tertiary],way[highway=unclassified] { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 1; } -way[highway=residential] { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 1; } -way[highway=service] { color: white; width: 3; casing-color: #999; casing-width: 1; } - -/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit -area=yes tag should be filled. The below doesn't yet work as intended. */ -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; } -way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } - -way[highway=steps] { color: #be6c6c; width: 2; dashes: 4, 2; } -way[highway=footway] { color: #be6c6c; width: 2; dashes: 6, 3; } -way[highway=cycleway] { color: blue; width: 1.6; dashes: 5, 4; } -way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; } -way[highway=track] { color: #996644; width: 2; dashes: 4, 2; } -way[highway=path] { color: lightgreen; width: 2; dashes: 2, 2; } - -way[waterway=river], way[waterway=canal] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;} - -way[barrier] {color: #000000; width: 1} - -/* Fills can be solid colour or bitmap images */ - - -way[natural] :area { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } -way[landuse] :area { color: #efefef; width: 1; fill-color: #f5f5f5; fill-opacity: 0.3; } -way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -way[leisure],way[sport] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } -way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; } -way[historic],way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; } -way[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; } -way[building] :area { color: #8d8d8d; width: 1; fill-color: #e0e0e0; fill-opacity: 0.2; } -way[natural=water], -way[waterway] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; } -way[landuse=forest],way[natural=wood] :area { color: green; width: 2; fill-color: green; fill-opacity: 0.2; } -way[leisure=pitch],way[leisure=park] { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.2; } -way[amenity=parking] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.2; } -way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } - -/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ - -node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } -way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} - -/* POIs, too, can have bitmap icons - they can even be transparent */ - -node[amenity=pub] { icon-image: icons/pub.png; text-offset: 15; font-family: DejaVu; text: name; font-size: 9; } -/*node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; } -node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; } -node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; } -node[amenity=atm] { icon-image: icons/atm.png; } -node[amenity=bank] { icon-image: icons/bank.png; text-offset: 15; text: name; } -node[highway=bus_stop] { icon-image: icons/bus_stop.png; } -node[amenity=cafe] { icon-image: icons/cafe.png; text-offset: 15; text: name; } -node[shop=convenience] { icon-image: icons/convenience.png; text-offset:15; text:name; } -node[shop=supermarket] { icon-image: icons/supermarket.png; text-offset:15; text:name; } -node[amenity=fast_food] { icon-image: icons/fast_food.png; text-offset:15; text: name; } -node[amenity=fire_station] { icon-image: icons/fire_station.png; } -node[amenity=hospital] { icon-image: icons/hospital.png; } -node[tourism=hotel] { icon-image: icons/hotel.png; } -node[amenity=parking] { icon-image: icons/parking.png; } */ -node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; text-color: blue } -/* node[amenity=pharmacy] { icon-image: icons/pharmacy.png; } -node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; } -node[amenity=police] { icon-image: icons/police.png; } -node[amenity=post_box] { icon-image: icons/post_box.png; } -node[amenity=recycling] { icon-image: icons/recycling.png; } -node[amenity=restaurant] { icon-image: icons/restaurant.png; } -node[amenity=school] { icon-image: icons/school.png; } -node[amenity=taxi] { icon-image: icons/taxi.png; } -node[amenity=telephone] { icon-image: icons/telephone.png; } -way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; } -node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/ - -/* We can stack styles at different z-index (depth) */ - -way[railway=rail] { z-index: 6; color: #444444; width: 5; } -way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; } -way[railway=platform] { color:black; width: 2; } -way[railway=subway] { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } - -/* Bridge */ -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); } - -/* Tunnel */ -way[tunnel=yes]::tunnel1 { z-index: 4; color: white; width: eval('_width+2'); } -way[tunnel=yes]::tunnel2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } - -/* Oneway */ -way[oneway=yes]::arrows { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; } - - -/* Change the road colour based on dynamically set "highlighted" tag (see earlier) */ - -way .highlighted { color: pink; } - -/* Interactive editors may choose different behaviour when a user mouses-over or selects - an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */ - -@import("stylesheets/core_interactive.css"); - -/* Descendant selectors provide an easy way to style relations: this example means "any way - which is part of a relation whose type=route". */ - -relation[type=route] way::routeline { z-index: 1; width: 17; color: yellow; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way::routeline { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way::routeline { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way::routeline { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=mtb] way::routeline { z-index: 1; width: 12; color: #48a448; opacity: 0.3; } - - - diff --git a/public/potlatch2/stylesheets/potlatch.css b/public/potlatch2/stylesheets/potlatch.css deleted file mode 100644 index 1598735d8..000000000 --- a/public/potlatch2/stylesheets/potlatch.css +++ /dev/null @@ -1,28 +0,0 @@ -/* - - Potlatch 2 core stylesheet - - This stylesheet should contain commonly used features and only the most essential extra attributes - (e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in - order not to kill performance on slower systems and those with a less effective Flash Player (i.e. - Linux). - - It is expected that experienced mappers will switch between this and other stylesheets as required. - -*/ - -@import("stylesheets/core_ways.css"); -@import("stylesheets/core_pois.css"); -@import("stylesheets/core_landuse.css"); -@import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -@import("stylesheets/core_interactive.css"); - -/* Rendering for licence status */ - -way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } -way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } -node[_status=no]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; } -node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -node[_status=unsure]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; } diff --git a/public/potlatch2/stylesheets/snapshot.css b/public/potlatch2/stylesheets/snapshot.css deleted file mode 100644 index 5450546e3..000000000 --- a/public/potlatch2/stylesheets/snapshot.css +++ /dev/null @@ -1,26 +0,0 @@ -/* - - Stylesheet that does simple wireframe display - -*/ - -way :hover { z-index: 2; width: 14; color: yellow; linecap: round; } -way :selected { z-index: 2; width: 14; color: yellow; linecap: round; } -way !:drawn { z-index: 1; width: 14; color: #444444; linecap: round; } - -node :selectedway { z-index: 8; icon-image: circle; icon-width: 8; color: green; } -node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; } -node :selected { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: black; casing-width: 1; } -node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 8; color: green; casing-color: black; casing-width: 1; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; } -node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: black; } - -way[_status=incomplete]::statushighlight { z-index: 0; width: 20; color: #d95f02; linecap: round; } -way[_status=complete]::statushighlight { z-index: 0; width: 18; color: #1b9e77; opacity: 0.4; linecap: round; } -way[_status=complete] { opacity: 0.7; } -node[_status=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 12; color: #d95f02; } -node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 10; color: #1b9e77; opacity: 0.4; } -node[_status=complete] { opacity: 0.7; } - - - diff --git a/public/potlatch2/stylesheets/wireframe.css b/public/potlatch2/stylesheets/wireframe.css deleted file mode 100644 index 9fbb829ce..000000000 --- a/public/potlatch2/stylesheets/wireframe.css +++ /dev/null @@ -1,17 +0,0 @@ -/* - - Stylesheet that does simple wireframe display - -*/ - -way :hover { z-index: 2; width: 1; color: blue; } -way :selected { z-index: 2; width: 1; color: red; } -way !:drawn { z-index:10; width: 1; color: black; } - -node :selectedway { z-index: 8; icon-image: square; icon-width: 6; color: green; } -node :hoverway { z-index: 9; icon-image: square; icon-width: 6; color: blue; } -node :selected { z-index: 9; icon-image: square; icon-width: 6; color: red; casing-color: black; casing-width: 1; } -node !:drawn :poi { z-index: 2; icon-image: square; icon-width: 4; color: green; casing-color: black; casing-width: 1; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 3; color: black; } -node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; } - diff --git a/public/potlatch2/vectors.xml b/public/potlatch2/vectors.xml deleted file mode 100644 index 3d260d45d..000000000 --- a/public/potlatch2/vectors.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<vectors> - <set loaded="true"> - <name>Mapdust Bugs</name> - <loader>BugLoader</loader> - <url>http://www.mapdust.com/api/</url> - <details>http://www.mapdust.com/detail/</details> - <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey> - </set> - <set disabled="true" loaded="true"> - <name>Mapdust Bugs - Test server</name> - <loader>BugLoader</loader> - <url>http://80.242.147.84/osmbugs/api/</url> - <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey> - </set> - <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9"> - <name>Bike Shop Locator - Missing Shops</name> - <loader>BikeShopLoader</loader> - <url>http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/</url> - </set> - <set> - <name>Everyone's GPS tracks</name> - <loader>TrackLoader</loader> - <!-- doesn't need a URL --> - </set> - <set disabled="true"> - <name>CNXC</name> - <loader>SnapshotLoader</loader> - <policyfile>http://localhost:3000/crossdomain.xml</policyfile> - <url>http://localhost:3000/api/</url> - </set> -</vectors> diff --git a/script/deliver-message b/script/deliver-message index 669e54a66..3fd641f8d 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -18,21 +18,11 @@ end exit 0 unless recipient[3] == digest[0,6] -mail = Mail.new(STDIN.readlines.join) +message.update_attribute(:message_read, true) if message -if mail.multipart? - body = mail.html_part || mail.text_part -else - body = mail -end +mail = Mail.new(STDIN.readlines.join) -message = Message.new({ - :sender => from, - :recipient => to, - :sent_on => mail.date.new_offset(0), - :title => mail.subject.sub(/\[OpenStreetMap\] */, ""), - :body => body.decoded -}, :without_protection => true) +message = Message.from_mail(mail, from, to) message.save! Notifier.message_notification(message).deliver diff --git a/script/update-spam-blocks b/script/update-spam-blocks index 3cb9dcedd..c21b17cff 100755 --- a/script/update-spam-blocks +++ b/script/update-spam-blocks @@ -18,11 +18,11 @@ addresses.each do |address,count| }) unless acl - Acl.create( + Acl.create({ :address => address, :k => "no_account_creation", :v => "auto_spam_block" - ) + }, :without_protection => true) puts "Blocked #{address}" end diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml index b0761a264..3f34ddabe 100644 --- a/test/fixtures/current_nodes.yml +++ b/test/fixtures/current_nodes.yml @@ -161,3 +161,13 @@ public_visible_node: tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 +redacted_node: + id: 17 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: false + version: 2 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 + diff --git a/test/fixtures/current_relations.yml b/test/fixtures/current_relations.yml index 1f4fb46fe..fd95f60ce 100644 --- a/test/fixtures/current_relations.yml +++ b/test/fixtures/current_relations.yml @@ -39,3 +39,17 @@ public_visible_relation: timestamp: 2009-04-22 00:34:12 visible: true version: 1 + +relation_with_redacted_versions: + id: 7 + changeset_id: 4 + timestamp: 2008-01-01 00:04:13 + visible: true + version: 4 + +relation_with_versions: + id: 8 + changeset_id: 4 + timestamp: 2008-01-01 00:04:00 + visible: true + version: 4 diff --git a/test/fixtures/current_ways.yml b/test/fixtures/current_ways.yml index cd06d06d3..255be4a97 100644 --- a/test/fixtures/current_ways.yml +++ b/test/fixtures/current_ways.yml @@ -32,3 +32,10 @@ way_with_duplicate_nodes: timestamp: 2007-01-01 00:00:00 visible: true version: 1 + +way_with_redacted_versions: + id: 6 + changeset_id: 4 + timestamp: 2008-01-01 00:04:13 + visible: true + version: 4 diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml index 22fab1863..0a54cce87 100644 --- a/test/fixtures/messages.yml +++ b/test/fixtures/messages.yml @@ -1,16 +1,21 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -one: +unread_message: + id: 1 from_user_id: 1 title: test message 1 body: some body text sent_on: "2008-05-01 12:34:56" message_read: false to_user_id: 2 + from_user_visible: true + to_user_visible: true -two: +read_message: + id: 2 from_user_id: 2 title: test message 2 body: some body test sent_on: "2008-05-02 12:45:23" message_read: true to_user_id: 1 + from_user_visible: true + to_user_visible: true diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml index 5125e7146..5de3d94af 100644 --- a/test/fixtures/nodes.yml +++ b/test/fixtures/nodes.yml @@ -191,3 +191,23 @@ public_visible_node: tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 +redacted_node_redacted_version: + node_id: 17 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: true + version: 1 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 + redaction_id: 1 + +redacted_node_current_version: + node_id: 17 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: false + version: 2 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 diff --git a/test/fixtures/redactions.yml b/test/fixtures/redactions.yml new file mode 100644 index 000000000..c6e8569ab --- /dev/null +++ b/test/fixtures/redactions.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +example: + id: 1 + user_id: 5 # the moderator user + title: Example redaction + description: Usually some text would go here to say something about why the redaction happened. diff --git a/test/fixtures/relations.yml b/test/fixtures/relations.yml index 059528f62..0640bf2f3 100644 --- a/test/fixtures/relations.yml +++ b/test/fixtures/relations.yml @@ -39,3 +39,61 @@ public_visible_relation: timestamp: 2009-04-22 00:34:12 visible: true version: 1 + +relation_with_redacted_versions_v1: + relation_id: 7 + changeset_id: 4 + timestamp: 2008-01-01 00:04:10 + visible: true + version: 1 + +relation_with_redacted_versions_v2: + relation_id: 7 + changeset_id: 4 + timestamp: 2008-01-01 00:04:11 + visible: true + version: 2 + redaction_id: 1 + +relation_with_redacted_versions_v3: + relation_id: 7 + changeset_id: 4 + timestamp: 2008-01-01 00:04:12 + visible: true + version: 3 + redaction_id: 1 + +relation_with_redacted_versions_v4: + relation_id: 7 + changeset_id: 4 + timestamp: 2008-01-01 00:04:13 + visible: true + version: 4 + +relation_with_versions_v1: + relation_id: 8 + changeset_id: 4 + timestamp: 2008-01-01 00:01:00 + visible: true + version: 1 + +relation_with_versions_v2: + relation_id: 8 + changeset_id: 4 + timestamp: 2008-01-01 00:02:00 + visible: true + version: 2 + +relation_with_versions_v3: + relation_id: 8 + changeset_id: 4 + timestamp: 2008-01-01 00:03:00 + visible: true + version: 3 + +relation_with_versions_v4: + relation_id: 8 + changeset_id: 4 + timestamp: 2008-01-01 00:04:00 + visible: true + version: 4 diff --git a/test/fixtures/user_blocks.yml b/test/fixtures/user_blocks.yml index e69de29bb..0566d3085 100644 --- a/test/fixtures/user_blocks.yml +++ b/test/fixtures/user_blocks.yml @@ -0,0 +1,29 @@ +active_block: + id: 1 + user_id: 13 + creator_id: 5 + reason: "Active block" + reason_format: "markdown" + ends_at: "2032-05-01 11:22:33" + needs_view: true + revoker_id: + +expired_block: + id: 2 + user_id: 14 + creator_id: 15 + reason: "Expired block" + reason_format: "markdown" + ends_at: "2012-05-01 11:22:33" + needs_view: false + revoker_id: + +revoked_block: + id: 3 + user_id: 13 + creator_id: 15 + reason: "Revoked block" + reason_format: "markdown" + ends_at: "2012-05-01 11:22:33" + needs_view: false + revoker_id: 1 diff --git a/test/fixtures/user_roles.yml b/test/fixtures/user_roles.yml index a5f814255..980d5e89c 100644 --- a/test/fixtures/user_roles.yml +++ b/test/fixtures/user_roles.yml @@ -9,3 +9,18 @@ moderator: user_id: 5 role: moderator granter_id: 6 + +second_moderator: + user_id: 15 + role: moderator + granter_id: 6 + +super_moderator: + user_id: 16 + role: moderator + granter_id: 6 + +super_administrator: + user_id: 16 + role: administrator + granter_id: 6 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 34ac9ce42..c1b7244cb 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -162,3 +162,53 @@ confirmed_user: terms_agreed: "2010-01-01 11:22:33" terms_seen: true languages: en + +blocked_user: + id: 13 + email: blocked@openstreetmap.org + status: active + pass_crypt: <%= Digest::MD5.hexdigest('test') %> + creation_time: "2007-01-01 00:00:00" + display_name: blocked + data_public: true + description: test + terms_agreed: "2010-01-01 11:22:33" + terms_seen: true + languages: en + +unblocked_user: + id: 14 + email: unblocked@openstreetmap.org + status: active + pass_crypt: <%= Digest::MD5.hexdigest('test') %> + creation_time: "2007-01-01 00:00:00" + display_name: unblocked + data_public: true + description: test + terms_agreed: "2010-01-01 11:22:33" + terms_seen: true + languages: en + +second_moderator_user: + id: 15 + email: second_moderator@example.com + status: active + pass_crypt: <%= Digest::MD5.hexdigest('test') %> + creation_time: "2008-05-01 01:23:45" + display_name: second_moderator + data_public: true + terms_agreed: "2010-01-01 11:22:33" + terms_seen: true + languages: en + +super_user: + id: 16 + email: super@example.com + status: active + pass_crypt: <%= Digest::MD5.hexdigest('test') %> + creation_time: "2008-05-01 01:23:45" + display_name: super + data_public: true + terms_agreed: "2010-01-01 11:22:33" + terms_seen: true + languages: en diff --git a/test/fixtures/way_nodes.yml b/test/fixtures/way_nodes.yml index 19541d19a..262f29b31 100644 --- a/test/fixtures/way_nodes.yml +++ b/test/fixtures/way_nodes.yml @@ -75,3 +75,61 @@ w5_n2: node_id: 4 sequence_id: 2 version: 1 + +w6_v1_n1: + way_id: 6 + node_id: 3 + sequence_id: 1 + version: 1 + +w6_v1_n2: + way_id: 6 + node_id: 2 + sequence_id: 2 + version: 1 + +w6_v2_n1: + way_id: 6 + node_id: 3 + sequence_id: 1 + version: 2 + +w6_v2_n2: + way_id: 6 + node_id: 2 + sequence_id: 2 + version: 2 + +w6_v3_n1: + way_id: 6 + node_id: 3 + sequence_id: 1 + version: 3 + +w6_v3_n2: + way_id: 6 + node_id: 2 + sequence_id: 2 + version: 3 + +w6_v4_n1: + way_id: 6 + node_id: 3 + sequence_id: 1 + version: 4 + +w6_v4_n2: + way_id: 6 + node_id: 2 + sequence_id: 2 + version: 4 + +w6_v4_n3: + way_id: 6 + node_id: 4 + sequence_id: 3 + version: 4 + + + + diff --git a/test/fixtures/way_tags.yml b/test/fixtures/way_tags.yml index dc727b5f5..6fb77d71b 100644 --- a/test/fixtures/way_tags.yml +++ b/test/fixtures/way_tags.yml @@ -15,3 +15,27 @@ t3: k: 'test' v: 'yes' version: 1 + +t6_v1: + way_id: 6 + k: 'test' + v: 'yes' + version: 1 + +t6_v2: + way_id: 6 + k: 'test' + v: 'yes' + version: 2 + +t6_v3: + way_id: 6 + k: 'test' + v: 'yes' + version: 3 + +t6_v4: + way_id: 6 + k: 'test' + v: 'yes' + version: 4 diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml index 95c001c30..dfb48b450 100644 --- a/test/fixtures/ways.yml +++ b/test/fixtures/ways.yml @@ -33,7 +33,7 @@ way_with_versions_v2: visible: true version: 2 -way_with_versions: +way_with_versions_v3: way_id: 4 changeset_id: 4 timestamp: 2008-01-01 00:03:00 @@ -53,3 +53,33 @@ way_with_duplicate_nodes: timestamp: 2007-01-01 00:00:00 visible: true version: 1 + +way_with_redacted_versions_v1: + way_id: 6 + changeset_id: 4 + timestamp: 2008-01-01 00:04:10 + visible: true + version: 1 + +way_with_redacted_versions_v2: + way_id: 6 + changeset_id: 4 + timestamp: 2008-01-01 00:04:11 + visible: true + version: 2 + redaction_id: 1 + +way_with_redacted_versions_v3: + way_id: 6 + changeset_id: 4 + timestamp: 2008-01-01 00:04:12 + visible: true + version: 3 + redaction_id: 1 + +way_with_redacted_versions_v4: + way_id: 6 + changeset_id: 4 + timestamp: 2008-01-01 00:04:13 + visible: true + version: 4 diff --git a/test/functional/amf_controller_test.rb b/test/functional/amf_controller_test.rb index 46ff71eb7..757acf6ac 100644 --- a/test/functional/amf_controller_test.rb +++ b/test/functional/amf_controller_test.rb @@ -295,11 +295,10 @@ class AmfControllerTest < ActionController::TestCase assert_equal latest.id, history[1] # We use dates rather than version numbers here, because you might # have moved a node within a way (i.e. way version not incremented). - # The timestamp is +1 (timestamp.succ) because we say "give me the - # revision of 15:33:02", but that might actually include changes at - # 15:33:02.457. - assert_equal latest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), history[2].first[0] - assert_equal oldest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), history[2].last[0] + # The timestamp is +1 because we say "give me the revision of 15:33:02", + # but that might actually include changes at 15:33:02.457. + assert_equal (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].first[0] + assert_equal (oldest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].last[0] end def test_getway_history_nonexistent @@ -331,10 +330,10 @@ class AmfControllerTest < ActionController::TestCase assert_equal history[1], latest.id, 'second element should be the input node ID' assert_equal history[2].first[0], - latest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), + (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), 'first element in third element (array) should be the latest version' assert_equal history[2].last[0], - nodes(:node_with_versions_v1).timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), + (nodes(:node_with_versions_v1).timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), 'last element in third element (array) should be the initial version' end diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb index adc433fe0..01a227b37 100644 --- a/test/functional/api_controller_test.rb +++ b/test/functional/api_controller_test.rb @@ -29,6 +29,10 @@ class ApiControllerTest < ActionController::TestCase { :controller => "api", :action => "capabilities" }, { :path => "/api/0.6/capabilities", :method => :get } ) + assert_routing( + { :path => "/api/0.6/permissions", :method => :get }, + { :controller => "api", :action => "permissions" } + ) assert_routing( { :path => "/api/0.6/map", :method => :get }, { :controller => "api", :action => "map" } @@ -298,4 +302,41 @@ class ApiControllerTest < ActionController::TestCase end end end + + def test_permissions_anonymous + get :permissions + assert_response :success + assert_select "osm > permissions", :count => 1 do + assert_select "permission", :count => 0 + end + end + + def test_permissions_basic_auth + basic_authorization(users(:normal_user).email, "test") + get :permissions + assert_response :success + assert_select "osm > permissions", :count => 1 do + assert_select "permission", :count => ClientApplication.all_permissions.size + ClientApplication.all_permissions.each do |p| + assert_select "permission[name=#{p}]", :count => 1 + end + end + end + + def test_permissions_oauth + @request.env["oauth.token"] = AccessToken.new do |token| + # Just to test a few + token.allow_read_prefs = true + token.allow_write_api = true + token.allow_read_gpx = false + end + get :permissions + assert_response :success + assert_select "osm > permissions", :count => 1 do + assert_select "permission", :count => 2 + assert_select "permission[name=allow_read_prefs]", :count => 1 + assert_select "permission[name=allow_write_api]", :count => 1 + assert_select "permission[name=allow_read_gpx]", :count => 0 + end + end end diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index 3e4c07daf..63c3d0b04 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -77,18 +77,63 @@ class BrowseControllerTest < ActionController::TestCase def test_read_changeset browse_check 'changeset', changesets(:normal_user_first_change).id end + + ## + # Methods to check redaction. + # + # note that these are presently highly reliant on the structure of the + # page for the selection tests, which doesn't work out particularly + # well if that structure changes. so... if you change the page layout + # then please make it more easily (and robustly) testable! + ## + def test_redacted_node_history + get :node_history, :id => nodes(:redacted_node_redacted_version).node_id + assert_response :success + assert_template 'node_history' + + # there are 2 revisions of the redacted node, but only one + # should be showing up here. + assert_select "body div[id=content] table[class=browse_details]", 1 + assert_select "body div[id=content] table[class=browse_details][id=1]", 0 + end + + def test_redacted_way_history + get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id + assert_response :success + assert_template 'way_history' + + # there are 4 revisions of the redacted way, but only 2 + # should be showing up here. + assert_select "body div[id=content] table[class=browse_details]", 2 + # redacted revisions are 2 & 3 + assert_select "body div[id=content] table[class=browse_details][id=2]", 0 + assert_select "body div[id=content] table[class=browse_details][id=3]", 0 + end + + def test_redacted_relation_history + get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id + assert_response :success + assert_template 'relation_history' + + # there are 4 revisions of the redacted relation, but only 2 + # should be showing up here. + assert_select "body div[id=content] table[class=browse_details]", 2 + # redacted revisions are 2 & 3 + assert_select "body div[id=content] table[class=browse_details][id=2]", 0 + assert_select "body div[id=content] table[class=browse_details][id=3]", 0 + end # This is a convenience method for most of the above checks # First we check that when we don't have an id, it will correctly return a 404 # then we check that we get the correct 404 when a non-existant id is passed # then we check that it will get a successful response, when we do pass an id def browse_check(type, id) - get type - assert_response :not_found - assert_template 'not_found' - get type, {:id => -10} # we won't have an id that's negative - assert_response :not_found - assert_template 'not_found' + assert_raise ActionController::RoutingError do + get type + end + assert_raise ActionController::RoutingError do + get type, {:id => -10} # we won't have an id that's negative + end get type, {:id => id} assert_response :success assert_template type diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb index a586b3dee..21cae1f00 100644 --- a/test/functional/changeset_controller_test.rb +++ b/test/functional/changeset_controller_test.rb @@ -172,8 +172,12 @@ class ChangesetControllerTest < ActionController::TestCase # check that a changeset that doesn't exist returns an appropriate message def test_read_not_found [0, -32, 233455644, "afg", "213"].each do |id| - get :read, :id => id - assert_response :not_found, "should get a not found" + begin + get :read, :id => id + assert_response :not_found, "should get a not found" + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s + end end end @@ -234,15 +238,23 @@ class ChangesetControllerTest < ActionController::TestCase # First try to do it with no auth cs_ids.each do |id| - put :close, :id => id - assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" + begin + put :close, :id => id + assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s + end end # Now try with auth basic_authorization users(:public_user).email, "test" cs_ids.each do |id| - put :close, :id => id - assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" + begin + put :close, :id => id + assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s + end end end @@ -1746,7 +1758,56 @@ EOF assert_response :not_found assert_template 'user/no_such_user' end + + ## + # This should display the last 20 changesets closed. + def test_feed + changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['num_changes > 0'], :limit=> 20) + assert changesets.size <= 20 + get :feed, {:format => "atom"} + assert_response :success + assert_template "list" + # Now check that all 20 (or however many were returned) changesets are in the html + assert_select "feed", :count => 1 + assert_select "entry", :count => changesets.size + changesets.each do |changeset| + # FIXME this test needs rewriting - test for feed contents + end + end + + ## + # Checks the display of the user changesets feed + def test_feed_user + user = users(:public_user) + get :feed, {:format => "atom", :display_name => user.display_name} + assert_response :success + assert_template "changeset/_user" + ## FIXME need to add more checks to see which if edits are actually shown if your data is public + end + + ## + # Check the not found of the user changesets feed + def test_feed_user_not_found + get :feed, {:format => "atom", :display_name => "Some random user"} + assert_response :not_found + end + ## + # check that the changeset download for a changeset with a redacted + # element in it doesn't contain that element. + def test_diff_download_redacted + changeset_id = changesets(:public_user_first_change).id + + get :download, :id => changeset_id + assert_response :success + + assert_select "osmChange", 1 + # this changeset contains node 17 in versions 1 & 2, but 1 should + # be hidden. + assert_select "osmChange node[id=17]", 1 + assert_select "osmChange node[id=17][version=1]", 0 + end + #------------------------------------------------------------ # utility functions #------------------------------------------------------------ diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb index 7981edd95..d799ddf5a 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/functional/diary_entry_controller_test.rb @@ -104,7 +104,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end assert_select "body", :count => 1 do assert_select "div#content", :count => 1 do - assert_select "h1", "New Diary Entry", :count => 1 + assert_select "h1", :text => "New Diary Entry", :count => 1 # We don't care about the layout, we just care about the form fields # that are available assert_select "form[action='/diary/new']", :count => 1 do @@ -159,7 +159,9 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 assert_select "input[name=commit][type=submit][value=Save]", :count => 1 - assert_select "input", :count => 5 + assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 + assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 + assert_select "input", :count => 7 end end end @@ -188,7 +190,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end assert_select "body", :count => 1 do assert_select "div#content", :count => 1 do - assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 + assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 assert_select "b", :text => /#{new_title}/, :count => 1 # This next line won't work if the text has been run through the htmlize function # due to formatting that could be introduced @@ -213,7 +215,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end assert_select "body", :count => 1 do assert_select "div#content", :count => 1 do - assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 + assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 assert_select "b", :text => /#{new_title}/, :count => 1 # This next line won't work if the text has been run through the htmlize function # due to formatting that could be introduced @@ -233,7 +235,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_edit_diary_entry_i18n @request.cookies["_osm_username"] = users(:normal_user).display_name - get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id}) + get :edit, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id} assert_response :success assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" end diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb index 75ed34a4a..6b49700d8 100644 --- a/test/functional/export_controller_test.rb +++ b/test/functional/export_controller_test.rb @@ -30,10 +30,5 @@ class ExportControllerTest < ActionController::TestCase get :finish, {:minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => 'mapnik', :mapnik_format => 'test', :mapnik_scale => '12'} assert_response :redirect end - - def test_finish_osmarender - get :finish, {:minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => 'osmarender', :osmarender_format => 'test', :osmarender_zoom => '12'} - assert_response :redirect - end - + end diff --git a/test/functional/message_controller_test.rb b/test/functional/message_controller_test.rb index a2bb1f805..8cb00c048 100644 --- a/test/functional/message_controller_test.rb +++ b/test/functional/message_controller_test.rb @@ -1,7 +1,8 @@ require File.dirname(__FILE__) + '/../test_helper' -require 'message_controller' class MessageControllerTest < ActionController::TestCase + fixtures :users, :messages + ## # test all routes which lead to this controller def test_routes @@ -42,4 +43,296 @@ class MessageControllerTest < ActionController::TestCase { :controller => "message", :action => "delete", :message_id => "1" } ) end + + ## + # test the new action + def test_new + # Check that the new message page requires us to login + get :new, :display_name => users(:public_user).display_name + assert_redirected_to login_path(:referer => new_message_path(:display_name => users(:public_user).display_name)) + + # Login as a normal user + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Check that the new message page loads + get :new, :display_name => users(:public_user).display_name + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Send message" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title", :count => 1 + assert_select "textarea#message_body", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + + # Check that sending a message works + assert_difference "ActionMailer::Base.deliveries.size", 1 do + assert_difference "Message.count", 1 do + post :new, + :display_name => users(:public_user).display_name, + :message => { :title => "Test Message", :body => "Test message body" } + end + end + assert_redirected_to inbox_path(:display_name => users(:normal_user).display_name) + assert_equal "Message sent", flash[:notice] + e = ActionMailer::Base.deliveries.first + assert_equal [ users(:public_user).email ], e.to + assert_equal "[OpenStreetMap] Test Message", e.subject + assert_match /Test message body/, e.text_part.decoded + assert_match /Test message body/, e.html_part.decoded + ActionMailer::Base.deliveries.clear + m = Message.find(3) + assert_equal users(:normal_user).id, m.from_user_id + assert_equal users(:public_user).id, m.to_user_id + assert_in_delta Time.now, m.sent_on, 1 + assert_equal "Test Message", m.title + assert_equal "Test message body", m.body + assert_equal "markdown", m.body_format + + # Asking to send a message with a bogus user name should fail + get :new, :display_name => "non_existent_user" + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user non_existent_user does not exist" + end + + ## + # test the reply action + def test_reply + # Check that the message reply page requires us to login + get :reply, :message_id => messages(:read_message).id + assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:read_message).id)) + + # Login as the wrong user + session[:user] = users(:second_public_user).id + cookies["_osm_username"] = users(:second_public_user).display_name + + # Check that we can't reply to somebody else's message + get :reply, :message_id => messages(:read_message).id + assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:read_message).id)) + assert_equal "You are logged in as `pulibc_test2' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply.", flash[:notice] + + # Login as the right user + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Check that the message reply page loads + get :reply, :message_id => messages(:read_message).id + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Re: test message 2" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title[value='Re: test message 2']", :count => 1 + assert_select "textarea#message_body", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + + # Asking to reply to a message with no ID should fail + assert_raise ActionController::RoutingError do + get :reply + end + + # Asking to reply to a message with a bogus ID should fail + get :reply, :message_id => 99999 + assert_response :not_found + assert_template "no_such_message" + end + + ## + # test the read action + def test_read + # Check that the read message page requires us to login + get :read, :message_id => messages(:unread_message).id + assert_redirected_to login_path(:referer => read_message_path(:message_id => messages(:unread_message).id)) + + # Login as the wrong user + session[:user] = users(:second_public_user).id + cookies["_osm_username"] = users(:second_public_user).display_name + + # Check that we can't read the message + get :read, :message_id => messages(:unread_message).id + assert_redirected_to login_path(:referer => read_message_path(:message_id => messages(:unread_message).id)) + assert_equal "You are logged in as `pulibc_test2' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it.", flash[:notice] + + # Login as the message sender + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Check that the message sender can read the message + get :read, :message_id => messages(:unread_message).id + assert_response :success + assert_template "read" + assert_equal false, Message.find(messages(:unread_message).id).message_read + + # Login as the message recipient + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Check that the message recipient can read the message + get :read, :message_id => messages(:unread_message).id + assert_response :success + assert_template "read" + assert_equal true, Message.find(messages(:unread_message).id).message_read + + # Asking to read a message with no ID should fail + assert_raise ActionController::RoutingError do + get :read + end + + # Asking to read a message with a bogus ID should fail + get :read, :message_id => 99999 + assert_response :not_found + assert_template "no_such_message" + end + + ## + # test the inbox action + def test_inbox + # Check that the inbox page requires us to login + get :inbox, :display_name => users(:normal_user).display_name + assert_redirected_to login_path(:referer => inbox_path(:display_name => users(:normal_user).display_name)) + + # Login + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Check that we can view our inbox when logged in + get :inbox, :display_name => users(:normal_user).display_name + assert_response :success + assert_template "inbox" + assert_select "table.messages", :count => 1 do + assert_select "tr", :count => 2 + assert_select "tr#inbox-#{messages(:read_message).id}.inbox-row", :count => 1 + end + + # Check that we can't view somebody else's inbox when logged in + get :inbox, :display_name => users(:public_user).display_name + assert_redirected_to inbox_path(:display_name => users(:normal_user).display_name) + end + + ## + # test the outbox action + def test_outbox + # Check that the outbox page requires us to login + get :outbox, :display_name => users(:normal_user).display_name + assert_redirected_to login_path(:referer => outbox_path(:display_name => users(:normal_user).display_name)) + + # Login + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Check that we can view our outbox when logged in + get :outbox, :display_name => users(:normal_user).display_name + assert_response :success + assert_template "outbox" + assert_select "table.messages", :count => 1 do + assert_select "tr", :count => 2 + assert_select "tr.inbox-row", :count => 1 + end + + # Check that we can't view somebody else's outbox when logged in + get :outbox, :display_name => users(:public_user).display_name + assert_redirected_to outbox_path(:display_name => users(:normal_user).display_name) + end + + ## + # test the mark action + def test_mark + # Check that the marking a message requires us to login + post :mark, :message_id => messages(:unread_message).id + assert_response :forbidden + + # Login as a user with no messages + session[:user] = users(:second_public_user).id + cookies["_osm_username"] = users(:second_public_user).display_name + + # Check that marking a message we didn't send or receive fails + post :mark, :message_id => messages(:read_message).id + assert_response :not_found + assert_template "no_such_message" + + # Login as the message recipient + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Check that the marking a message read works + post :mark, :message_id => messages(:unread_message).id, :mark => "read" + assert_redirected_to inbox_path(:display_name => users(:public_user).display_name) + assert_equal true, Message.find(messages(:unread_message).id).message_read + + # Check that the marking a message unread works + post :mark, :message_id => messages(:unread_message).id, :mark => "unread" + assert_redirected_to inbox_path(:display_name => users(:public_user).display_name) + assert_equal false, Message.find(messages(:unread_message).id).message_read + + # Check that the marking a message read via XHR works + xhr :post, :mark, :message_id => messages(:unread_message).id, :mark => "read" + assert_response :success + assert_template "mark" + assert_equal true, Message.find(messages(:unread_message).id).message_read + + # Check that the marking a message unread via XHR works + xhr :post, :mark, :message_id => messages(:unread_message).id, :mark => "unread" + assert_response :success + assert_template "mark" + assert_equal false, Message.find(messages(:unread_message).id).message_read + + # Asking to mark a message with no ID should fail + assert_raise ActionController::RoutingError do + post :mark + end + + # Asking to mark a message with a bogus ID should fail + post :mark, :message_id => 99999 + assert_response :not_found + assert_template "no_such_message" + end + + ## + # test the delete action + def test_delete + # Check that the deleting a message requires us to login + post :delete, :message_id => messages(:read_message).id + assert_response :forbidden + + # Login as a user with no messages + session[:user] = users(:second_public_user).id + cookies["_osm_username"] = users(:second_public_user).display_name + + # Check that deleting a message we didn't send or receive fails + post :delete, :message_id => messages(:read_message).id + assert_response :not_found + assert_template "no_such_message" + + # Login as the message recipient + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Check that the deleting a received message works + post :delete, :message_id => messages(:read_message).id + assert_redirected_to inbox_path(:display_name => users(:normal_user).display_name) + assert_equal "Message deleted", flash[:notice] + m = Message.find(messages(:read_message).id) + assert_equal true, m.from_user_visible + assert_equal false, m.to_user_visible + + # Check that the deleting a sent message works + post :delete, :message_id => messages(:unread_message).id + assert_redirected_to inbox_path(:display_name => users(:normal_user).display_name) + assert_equal "Message deleted", flash[:notice] + m = Message.find(messages(:unread_message).id) + assert_equal false, m.from_user_visible + assert_equal true, m.to_user_visible + + # Asking to delete a message with no ID should fail + assert_raise ActionController::RoutingError do + post :delete + end + + # Asking to delete a message with a bogus ID should fail + post :delete, :message_id => 99999 + assert_response :not_found + assert_template "no_such_message" + end end diff --git a/test/functional/node_controller_test.rb b/test/functional/node_controller_test.rb index 5544728f1..6903dd60b 100644 --- a/test/functional/node_controller_test.rb +++ b/test/functional/node_controller_test.rb @@ -231,9 +231,9 @@ class NodeControllerTest < ActionController::TestCase assert @response.body.to_i > current_nodes(:public_visible_node).version, "delete request should return a new version number for node" - # this won't work since the node is already deleted - content(nodes(:invisible_node).to_xml) - delete :delete, :id => current_nodes(:invisible_node).id + # deleting the same node twice doesn't work + content(nodes(:public_visible_node).to_xml) + delete :delete, :id => current_nodes(:public_visible_node).id assert_response :gone # this won't work since the node never existed diff --git a/test/functional/old_node_controller_test.rb b/test/functional/old_node_controller_test.rb index 3c0358c2b..44edc06a2 100644 --- a/test/functional/old_node_controller_test.rb +++ b/test/functional/old_node_controller_test.rb @@ -19,6 +19,10 @@ class OldNodeControllerTest < ActionController::TestCase { :path => "/api/0.6/node/1/2", :method => :get }, { :controller => "old_node", :action => "version", :id => "1", :version => "2" } ) + assert_routing( + { :path => "/api/0.6/node/1/2/redact", :method => :post }, + { :controller => "old_node", :action => "redact", :id => "1", :version => "2" } + ) end ## @@ -152,6 +156,8 @@ class OldNodeControllerTest < ActionController::TestCase def check_not_found_id_version(id, version) get :version, :id => id, :version => version assert_response :not_found + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s end ## @@ -164,7 +170,125 @@ class OldNodeControllerTest < ActionController::TestCase check_current_version(current_nodes(:node_used_by_relationship)) check_current_version(current_nodes(:node_with_versions)) end - + + ## + # test the redaction of an old version of a node, while not being + # authorised. + def test_redact_node_unauthorised + do_redact_node(nodes(:node_with_versions_v3), + redactions(:example)) + assert_response :unauthorized, "should need to be authenticated to redact." + end + + ## + # test the redaction of an old version of a node, while being + # authorised as a normal user. + def test_redact_node_normal_user + basic_authorization(users(:public_user).email, "test") + + do_redact_node(nodes(:node_with_versions_v3), + redactions(:example)) + assert_response :forbidden, "should need to be moderator to redact." + end + + ## + # test that, even as moderator, the current version of a node + # can't be redacted. + def test_redact_node_current_version + basic_authorization(users(:moderator_user).email, "test") + + do_redact_node(nodes(:node_with_versions_v4), + redactions(:example)) + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + end + + ## + # test that redacted nodes aren't visible, regardless of + # authorisation except as moderator... + def test_version_redacted + node = nodes(:redacted_node_redacted_version) + + get :version, :id => node.node_id, :version => node.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :version, :id => node.node_id, :version => node.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." + end + + ## + # test that redacted nodes aren't visible in the history + def test_history_redacted + node = nodes(:redacted_node_redacted_version) + + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history, even when logged in." + end + + ## + # test the redaction of an old version of a node, while being + # authorised as a moderator. + def test_redact_node_moderator + node = nodes(:node_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_node(node, redactions(:example)) + assert_response :success, "should be OK to redact old version as moderator." + + # check moderator can still see the redacted data, when passing + # the appropriate flag + get :version, :id => node.node_id, :version => node.version + assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." + get :version, :id => node.node_id, :version => node.version, :show_redactions => 'true' + assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." + + # and when accessed via history + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "node #{node.node_id} version #{node.version} should not be present in the history for moderators when not passing flag." + get :history, :id => node.node_id, :show_redactions => 'true' + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators when passing flag." + end + + # testing that if the moderator drops auth, he can't see the + # redacted stuff any more. + def test_redact_node_is_redacted + node = nodes(:node_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_node(node, redactions(:example)) + assert_response :success, "should be OK to redact old version as moderator." + + # re-auth as non-moderator + basic_authorization(users(:public_user).email, "test") + + # check can't see the redacted data + get :version, :id => node.node_id, :version => node.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # and when accessed via history + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history." + end + + def do_redact_node(node, redaction) + get :version, :id => node.node_id, :version => node.version + assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}." + + # now redact it + post :redact, :id => node.node_id, :version => node.version, :redaction => redaction.id + end + def check_current_version(node_id) # get the current version of the node current_node = with_controller(NodeController.new) do diff --git a/test/functional/old_relation_controller_test.rb b/test/functional/old_relation_controller_test.rb index 89676a175..55e8a7377 100644 --- a/test/functional/old_relation_controller_test.rb +++ b/test/functional/old_relation_controller_test.rb @@ -15,6 +15,10 @@ class OldRelationControllerTest < ActionController::TestCase { :path => "/api/0.6/relation/1/2", :method => :get }, { :controller => "old_relation", :action => "version", :id => "1", :version => "2" } ) + assert_routing( + { :path => "/api/0.6/relation/1/2/redact", :method => :post }, + { :controller => "old_relation", :action => "redact", :id => "1", :version => "2" } + ) end # ------------------------------------- @@ -29,4 +33,166 @@ class OldRelationControllerTest < ActionController::TestCase get :history, :id => 0 assert_response :not_found end + + ## + # test the redaction of an old version of a relation, while not being + # authorised. + def test_redact_relation_unauthorised + do_redact_relation(relations(:relation_with_versions_v3), + redactions(:example)) + assert_response :unauthorized, "should need to be authenticated to redact." + end + + ## + # test the redaction of an old version of a relation, while being + # authorised as a normal user. + def test_redact_relation_normal_user + basic_authorization(users(:public_user).email, "test") + + do_redact_relation(relations(:relation_with_versions_v3), + redactions(:example)) + assert_response :forbidden, "should need to be moderator to redact." + end + + ## + # test that, even as moderator, the current version of a relation + # can't be redacted. + def test_redact_relation_current_version + basic_authorization(users(:moderator_user).email, "test") + + do_redact_relation(relations(:relation_with_versions_v4), + redactions(:example)) + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + end + + ## + # test that redacted relations aren't visible, regardless of + # authorisation except as moderator... + def test_version_redacted + relation = relations(:relation_with_redacted_versions_v2) + + get :version, :id => relation.relation_id, :version => relation.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :version, :id => relation.relation_id, :version => relation.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." + end + + ## + # test that redacted nodes aren't visible in the history + def test_history_redacted + relation = relations(:relation_with_redacted_versions_v2) + + get :history, :id => relation.relation_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm relation[id=#{relation.relation_id}][version=#{relation.version}]", 0, "redacted relation #{relation.relation_id} version #{relation.version} shouldn't be present in the history." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :version, :id => relation.relation_id, :version => relation.version + get :history, :id => relation.relation_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm relation[id=#{relation.relation_id}][version=#{relation.version}]", 0, "redacted node #{relation.relation_id} version #{relation.version} shouldn't be present in the history, even when logged in." + end + + ## + # test the redaction of an old version of a relation, while being + # authorised as a moderator. + def test_redact_relation_moderator + relation = relations(:relation_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_relation(relation, redactions(:example)) + assert_response :success, "should be OK to redact old version as moderator." + + # check moderator can still see the redacted data, when passing + # the appropriate flag + get :version, :id => relation.relation_id, :version => relation.version + assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." + get :version, :id => relation.relation_id, :version => relation.version, :show_redactions => 'true' + assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." + + # and when accessed via history + get :history, :id => relation.relation_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm relation[id=#{relation.relation_id}][version=#{relation.version}]", 0, "relation #{relation.relation_id} version #{relation.version} should not be present in the history for moderators when not passing flag." + get :history, :id => relation.relation_id, :show_redactions => 'true' + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm relation[id=#{relation.relation_id}][version=#{relation.version}]", 1, "relation #{relation.relation_id} version #{relation.version} should still be present in the history for moderators when passing flag." + end + + # testing that if the moderator drops auth, he can't see the + # redacted stuff any more. + def test_redact_relation_is_redacted + relation = relations(:relation_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_relation(relation, redactions(:example)) + assert_response :success, "should be OK to redact old version as moderator." + + # re-auth as non-moderator + basic_authorization(users(:public_user).email, "test") + + # check can't see the redacted data + get :version, :id => relation.relation_id, :version => relation.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # and when accessed via history + get :history, :id => relation.relation_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm relation[id=#{relation.relation_id}][version=#{relation.version}]", 0, "redacted relation #{relation.relation_id} version #{relation.version} shouldn't be present in the history." + end + + ## + # check that the current version of a relation is equivalent to the + # version which we're getting from the versions call. + def check_current_version(relation_id) + # get the current version + current_relation = with_controller(RelationController.new) do + get :read, :id => relation_id + assert_response :success, "can't get current relation #{relation_id}" + Relation.from_xml(@response.body) + end + assert_not_nil current_relation, "getting relation #{relation_id} returned nil" + + # get the "old" version of the relation from the version method + get :version, :id => relation_id, :version => current_relation.version + assert_response :success, "can't get old relation #{relation_id}, v#{current_relation.version}" + old_relation = Relation.from_xml(@response.body) + + # check that the relations are identical + assert_relations_are_equal current_relation, old_relation + end + + ## + # look at all the versions of the relation in the history and get each version from + # the versions call. check that they're the same. + def check_history_equals_versions(relation_id) + get :history, :id => relation_id + assert_response :success, "can't get relation #{relation_id} from API" + history_doc = XML::Parser.string(@response.body).parse + assert_not_nil history_doc, "parsing relation #{relation_id} history failed" + + history_doc.find("//osm/relation").each do |relation_doc| + history_relation = Relation.from_xml_node(relation_doc) + assert_not_nil history_relation, "parsing relation #{relation_id} version failed" + + get :version, :id => relation_id, :version => history_relation.version + assert_response :success, "couldn't get relation #{relation_id}, v#{history_relation.version}" + version_relation = Relation.from_xml(@response.body) + assert_not_nil version_relation, "failed to parse #{relation_id}, v#{history_relation.version}" + + assert_relations_are_equal history_relation, version_relation + end + end + + def do_redact_relation(relation, redaction) + get :version, :id => relation.relation_id, :version => relation.version + assert_response :success, "should be able to get version #{relation.version} of node #{relation.relation_id}." + + # now redact it + post :redact, :id => relation.relation_id, :version => relation.version, :redaction => redaction.id + end end diff --git a/test/functional/old_way_controller_test.rb b/test/functional/old_way_controller_test.rb index f0ab6bd85..2e9ec8263 100644 --- a/test/functional/old_way_controller_test.rb +++ b/test/functional/old_way_controller_test.rb @@ -15,6 +15,10 @@ class OldWayControllerTest < ActionController::TestCase { :path => "/api/0.6/way/1/2", :method => :get }, { :controller => "old_way", :action => "version", :id => "1", :version => "2" } ) + assert_routing( + { :path => "/api/0.6/way/1/2/redact", :method => :post }, + { :controller => "old_way", :action => "redact", :id => "1", :version => "2" } + ) end # ------------------------------------- @@ -56,6 +60,117 @@ class OldWayControllerTest < ActionController::TestCase check_history_equals_versions(current_ways(:way_with_versions).id) end + ## + # test the redaction of an old version of a way, while not being + # authorised. + def test_redact_way_unauthorised + do_redact_way(ways(:way_with_versions_v3), + redactions(:example)) + assert_response :unauthorized, "should need to be authenticated to redact." + end + + ## + # test the redaction of an old version of a way, while being + # authorised as a normal user. + def test_redact_way_normal_user + basic_authorization(users(:public_user).email, "test") + + do_redact_way(ways(:way_with_versions_v3), + redactions(:example)) + assert_response :forbidden, "should need to be moderator to redact." + end + + ## + # test that, even as moderator, the current version of a way + # can't be redacted. + def test_redact_way_current_version + basic_authorization(users(:moderator_user).email, "test") + + do_redact_way(ways(:way_with_versions_v4), + redactions(:example)) + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + end + + ## + # test that redacted ways aren't visible, regardless of + # authorisation except as moderator... + def test_version_redacted + way = ways(:way_with_redacted_versions_v2) + + get :version, :id => way.way_id, :version => way.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :version, :id => way.way_id, :version => way.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." + end + + ## + # test that redacted nodes aren't visible in the history + def test_history_redacted + way = ways(:way_with_redacted_versions_v2) + + get :history, :id => way.way_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "redacted way #{way.way_id} version #{way.version} shouldn't be present in the history." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :version, :id => way.way_id, :version => way.version + get :history, :id => way.way_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "redacted node #{way.way_id} version #{way.version} shouldn't be present in the history, even when logged in." + end + + ## + # test the redaction of an old version of a way, while being + # authorised as a moderator. + def test_redact_way_moderator + way = ways(:way_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_way(way, redactions(:example)) + assert_response :success, "should be OK to redact old version as moderator." + + # check moderator can still see the redacted data, when passing + # the appropriate flag + get :version, :id => way.way_id, :version => way.version + assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." + get :version, :id => way.way_id, :version => way.version, :show_redactions => 'true' + assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." + + # and when accessed via history + get :history, :id => way.way_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "way #{way.way_id} version #{way.version} should not be present in the history for moderators when not passing flag." + get :history, :id => way.way_id, :show_redactions => 'true' + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 1, "way #{way.way_id} version #{way.version} should still be present in the history for moderators when passing flag." + end + + # testing that if the moderator drops auth, he can't see the + # redacted stuff any more. + def test_redact_way_is_redacted + way = ways(:way_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_way(way, redactions(:example)) + assert_response :success, "should be OK to redact old version as moderator." + + # re-auth as non-moderator + basic_authorization(users(:public_user).email, "test") + + # check can't see the redacted data + get :version, :id => way.way_id, :version => way.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # and when accessed via history + get :history, :id => way.way_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "redacted way #{way.way_id} version #{way.version} shouldn't be present in the history." + end + ## # check that the current version of a way is equivalent to the # version which we're getting from the versions call. @@ -99,4 +214,12 @@ class OldWayControllerTest < ActionController::TestCase end end + def do_redact_way(way, redaction) + get :version, :id => way.way_id, :version => way.version + assert_response :success, "should be able to get version #{way.version} of node #{way.way_id}." + + # now redact it + post :redact, :id => way.way_id, :version => way.version, :redaction => redaction.id + end + end diff --git a/test/functional/redactions_controller_test.rb b/test/functional/redactions_controller_test.rb new file mode 100644 index 000000000..a2bd75b10 --- /dev/null +++ b/test/functional/redactions_controller_test.rb @@ -0,0 +1,130 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'redactions_controller' + +class RedactionsControllerTest < ActionController::TestCase + api_fixtures + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/redactions", :method => :get }, + { :controller => "redactions", :action => "index" } + ) + assert_routing( + { :path => "/redactions/new", :method => :get }, + { :controller => "redactions", :action => "new" } + ) + assert_routing( + { :path => "/redactions", :method => :post }, + { :controller => "redactions", :action => "create" } + ) + assert_routing( + { :path => "/redactions/1", :method => :get }, + { :controller => "redactions", :action => "show", :id => "1" } + ) + assert_routing( + { :path => "/redactions/1/edit", :method => :get }, + { :controller => "redactions", :action => "edit", :id => "1" } + ) + assert_routing( + { :path => "/redactions/1", :method => :put }, + { :controller => "redactions", :action => "update", :id => "1" } + ) + assert_routing( + { :path => "/redactions/1", :method => :delete }, + { :controller => "redactions", :action => "destroy", :id => "1" } + ) + end + + def test_moderators_can_create + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + post :create, :redaction => { :title => "Foo", :description => "Description here." } + assert_response :redirect + assert_redirected_to(redaction_path(Redaction.find_by_title("Foo"))) + end + + def test_non_moderators_cant_create + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + post :create, :redaction => { :title => "Foo", :description => "Description here." } + assert_response :forbidden + end + + def test_moderators_can_delete_empty + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # remove all elements from the redaction + redaction = redactions(:example) + redaction.old_nodes.each { |n| n.redaction = nil; n.save! } + redaction.old_ways.each { |w| w.redaction = nil; w.save! } + redaction.old_relations.each { |r| r.redaction = nil; r.save! } + + delete :destroy, :id => redaction.id + assert_response :redirect + assert_redirected_to(redactions_path) + end + + def test_moderators_cant_delete_nonempty + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # leave elements in the redaction + redaction = redactions(:example) + + delete :destroy, :id => redaction.id + assert_response :redirect + assert_redirected_to(redaction_path(redaction)) + assert_match /^Redaction is not empty/, flash[:error] + end + + def test_non_moderators_cant_delete + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + delete :destroy, :id => redactions(:example).id + assert_response :forbidden + end + + def test_moderators_can_edit + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + get :edit, :id => redactions(:example).id + assert_response :success + end + + def test_non_moderators_cant_edit + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + get :edit, :id => redactions(:example).id + assert_response :redirect + assert_redirected_to(redactions_path) + end + + def test_moderators_can_update + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + redaction = redactions(:example) + + put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } + assert_response :redirect + assert_redirected_to(redaction_path(redaction)) + end + + def test_non_moderators_cant_update + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + redaction = redactions(:example) + + put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } + assert_response :forbidden + end +end diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb index caef3481b..86445e551 100644 --- a/test/functional/site_controller_test.rb +++ b/test/functional/site_controller_test.rb @@ -10,6 +10,10 @@ class SiteControllerTest < ActionController::TestCase { :path => "/", :method => :get }, { :controller => "site", :action => "index" } ) + assert_routing( + { :path => "/", :method => :post }, + { :controller => "site", :action => "index" } + ) assert_recognizes( { :controller => "site", :action => "index" }, { :path => "/index.html", :method => :get } @@ -50,6 +54,10 @@ class SiteControllerTest < ActionController::TestCase { :path => "/go/shortcode", :method => :get }, { :controller => "site", :action => "permalink", :code => "shortcode" } ) + assert_routing( + { :path => "/preview/formatname", :method => :get }, + { :controller => "site", :action => "preview", :format => "formatname" } + ) end ## Lets check that we can get all the pages without any errors diff --git a/test/functional/user_blocks_controller_test.rb b/test/functional/user_blocks_controller_test.rb index adf0f3631..297245929 100644 --- a/test/functional/user_blocks_controller_test.rb +++ b/test/functional/user_blocks_controller_test.rb @@ -1,6 +1,8 @@ require File.dirname(__FILE__) + '/../test_helper' class UserBlocksControllerTest < ActionController::TestCase + fixtures :users, :user_roles, :user_blocks + ## # test all routes which lead to this controller def test_routes @@ -55,4 +57,391 @@ class UserBlocksControllerTest < ActionController::TestCase { :controller => "user_blocks", :action => "blocks_by", :display_name => "username" } ) end + + ## + # test the index action + def test_index + # The list of blocks should load + get :index + assert_response :success + assert_select "table#block_list", :count => 1 do + assert_select "tr", 4 + assert_select "a[href='#{user_block_path(user_blocks(:active_block))}']", 1 + assert_select "a[href='#{user_block_path(user_blocks(:expired_block))}']", 1 + assert_select "a[href='#{user_block_path(user_blocks(:revoked_block))}']", 1 + end + end + + ## + # test the show action + def test_show + # Viewing a block should fail when no ID is given + assert_raise ActionController::RoutingError do + get :show + end + + # Viewing a block should fail when a bogus ID is given + get :show, :id => 99999 + assert_response :not_found + assert_template "not_found" + assert_select "p", "Sorry, the user block with ID 99999 could not be found." + + # Viewing an expired block should work + get :show, :id => user_blocks(:expired_block) + assert_response :success + + # Viewing a revoked block should work + get :show, :id => user_blocks(:revoked_block) + assert_response :success + + # Viewing an active block should work, but shouldn't mark it as seen + get :show, :id => user_blocks(:active_block) + assert_response :success + assert_equal true, UserBlock.find(user_blocks(:active_block).id).needs_view + + # Login as the blocked user + session[:user] = users(:blocked_user).id + cookies["_osm_username"] = users(:blocked_user).display_name + + # Now viewing it should mark it as seen + get :show, :id => user_blocks(:active_block) + assert_response :success + assert_equal false, UserBlock.find(user_blocks(:active_block).id).needs_view + end + + ## + # test the new action + def test_new + # Check that the block creation page requires us to login + get :new, :display_name => users(:normal_user).display_name + assert_redirected_to login_path(:referer => new_user_block_path(:display_name => users(:normal_user).display_name)) + + # Login as a normal user + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Check that normal users can't load the block creation page + get :new, :display_name => users(:normal_user).display_name + assert_redirected_to user_blocks_path + assert_equal "You need to be a moderator to perform that action.", flash[:error] + + # Login as a moderator + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # Check that the block creation page loads for moderators + get :new, :display_name => users(:normal_user).display_name + assert_response :success + assert_select "form#new_user_block", :count => 1 do + assert_select "textarea#user_block_reason", :count => 1 + assert_select "select#user_block_period", :count => 1 + assert_select "input#user_block_needs_view[type='checkbox']", :count => 1 + assert_select "input#display_name[type='hidden']", :count => 1 + assert_select "input[type='submit'][value='Create block']", :count => 1 + end + + # We should get an error if no user is specified + get :new + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user does not exist" + + # We should get an error if the user doesn't exist + get :new, :display_name => "non_existent_user" + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user non_existent_user does not exist" + end + + ## + # test the edit action + def test_edit + # Check that the block edit page requires us to login + get :edit, :id => user_blocks(:active_block).id + assert_redirected_to login_path(:referer => edit_user_block_path(:id => user_blocks(:active_block).id)) + + # Login as a normal user + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Check that normal users can't load the block edit page + get :edit, :id => user_blocks(:active_block).id + assert_redirected_to user_blocks_path + assert_equal "You need to be a moderator to perform that action.", flash[:error] + + # Login as a moderator + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # Check that the block edit page loads for moderators + get :edit, :id => user_blocks(:active_block).id + assert_response :success + assert_select "form#edit_user_block_#{user_blocks(:active_block).id}", :count => 1 do + assert_select "textarea#user_block_reason", :count => 1 + assert_select "select#user_block_period", :count => 1 + assert_select "input#user_block_needs_view[type='checkbox']", :count => 1 + assert_select "input[type='submit'][value='Update block']", :count => 1 + end + + # We should get an error if no user is specified + assert_raise ActionController::RoutingError do + get :edit + end + + # We should get an error if the user doesn't exist + get :edit, :id => 99999 + assert_response :not_found + assert_template "not_found" + assert_select "p", "Sorry, the user block with ID 99999 could not be found." + end + + ## + # test the create action + def test_create + # Not logged in yet, so creating a block should fail + post :create + assert_response :forbidden + + # Login as a normal user + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Check that normal users can't create blocks + post :create + assert_response :forbidden + + # Login as a moderator + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # A bogus block period should result in an error + assert_no_difference "UserBlock.count" do + post :create, + :display_name => users(:unblocked_user).display_name, + :user_block_period => "99" + end + assert_redirected_to new_user_block_path(:display_name => users(:unblocked_user).display_name) + assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error] + + # Check that creating a block works + assert_difference "UserBlock.count", 1 do + post :create, + :display_name => users(:unblocked_user).display_name, + :user_block_period => "12", + :user_block => { :needs_view => false, :reason => "Vandalism" } + end + assert_redirected_to user_block_path(:id => 4) + assert_equal "Created a block on user #{users(:unblocked_user).display_name}.", flash[:notice] + b = UserBlock.find(4) + assert_in_delta Time.now, b.created_at, 1 + assert_in_delta Time.now, b.updated_at, 1 + assert_in_delta Time.now + 12.hour, b.ends_at, 1 + assert_equal false, b.needs_view + assert_equal "Vandalism", b.reason + assert_equal "markdown", b.reason_format + assert_equal users(:moderator_user).id, b.creator_id + + # We should get an error if no user is specified + post :create + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user does not exist" + + # We should get an error if the user doesn't exist + post :create, :display_name => "non_existent_user" + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user non_existent_user does not exist" + end + + ## + # test the update action + def test_update + # Not logged in yet, so updating a block should fail + put :update, :id => user_blocks(:active_block).id + assert_response :forbidden + + # Login as a normal user + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Check that normal users can't update blocks + put :update, :id => user_blocks(:active_block).id + assert_response :forbidden + + # Login as the wrong moderator + session[:user] = users(:second_moderator_user).id + cookies["_osm_username"] = users(:second_moderator_user).display_name + + # Check that only the person who created a block can update it + assert_no_difference "UserBlock.count" do + put :update, + :id => user_blocks(:active_block).id, + :user_block_period => "12", + :user_block => { :needs_view => true, :reason => "Vandalism" } + end + assert_redirected_to edit_user_block_path(:id => user_blocks(:active_block).id) + assert_equal "Only the moderator who created this block can edit it.", flash[:error] + + # Login as the correct moderator + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # A bogus block period should result in an error + assert_no_difference "UserBlock.count" do + put :update, + :id => user_blocks(:active_block).id, + :user_block_period => "99" + end + assert_redirected_to edit_user_block_path(:id => user_blocks(:active_block).id) + assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error] + + # Check that updating a block works + assert_no_difference "UserBlock.count" do + put :update, + :id => user_blocks(:active_block).id, + :user_block_period => "12", + :user_block => { :needs_view => true, :reason => "Vandalism" } + end + assert_redirected_to user_block_path(:id => user_blocks(:active_block).id) + assert_equal "Block updated.", flash[:notice] + b = UserBlock.find(user_blocks(:active_block).id) + assert_in_delta Time.now, b.updated_at, 1 + assert_equal true, b.needs_view + assert_equal "Vandalism", b.reason + + # We should get an error if no block ID is specified + assert_raise ActionController::RoutingError do + put :update + end + + # We should get an error if the block doesn't exist + put :update, :id => 99999 + assert_response :not_found + assert_template "not_found" + assert_select "p", "Sorry, the user block with ID 99999 could not be found." + end + + ## + # test the revoke action + def test_revoke + # Check that the block revoke page requires us to login + get :revoke, :id => user_blocks(:active_block).id + assert_redirected_to login_path(:referer => revoke_user_block_path(:id => user_blocks(:active_block).id)) + + # Login as a normal user + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Check that normal users can't load the block revoke page + get :revoke, :id => user_blocks(:active_block).id + assert_redirected_to user_blocks_path + assert_equal "You need to be a moderator to perform that action.", flash[:error] + + # Login as a moderator + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # Check that the block revoke page loads for moderators + get :revoke, :id => user_blocks(:active_block).id + assert_response :success + assert_template "revoke" + assert_select "form", :count => 1 do + assert_select "input#confirm[type='checkbox']", :count => 1 + assert_select "input[type='submit'][value='Revoke!']", :count => 1 + end + + # Check that revoking a block works + post :revoke, :id => user_blocks(:active_block).id, :confirm => true + assert_redirected_to user_block_path(:id => user_blocks(:active_block).id) + b = UserBlock.find(user_blocks(:active_block).id) + assert_in_delta Time.now, b.ends_at, 1 + + # We should get an error if no block ID is specified + assert_raise ActionController::RoutingError do + get :revoke + end + + # We should get an error if the block doesn't exist + get :revoke, :id => 99999 + assert_response :not_found + assert_template "not_found" + assert_select "p", "Sorry, the user block with ID 99999 could not be found." + end + + ## + # test the blocks_on action + def test_blocks_on + # Asking for a list of blocks with no user name should fail + assert_raise ActionController::RoutingError do + get :blocks_on + end + + # Asking for a list of blocks with a bogus user name should fail + get :blocks_on, :display_name => "non_existent_user" + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user non_existent_user does not exist" + + # Check the list of blocks for a user that has never been blocked + get :blocks_on, :display_name => users(:normal_user).display_name + assert_response :success + assert_select "table#block_list", false + assert_select "p", "#{users(:normal_user).display_name} has not been blocked yet." + + # Check the list of blocks for a user that is currently blocked + get :blocks_on, :display_name => users(:blocked_user).display_name + assert_response :success + assert_select "table#block_list", :count => 1 do + assert_select "tr", 3 + assert_select "a[href='#{user_block_path(user_blocks(:active_block))}']", 1 + assert_select "a[href='#{user_block_path(user_blocks(:revoked_block))}']", 1 + end + + # Check the list of blocks for a user that has previously been blocked + get :blocks_on, :display_name => users(:unblocked_user).display_name + assert_response :success + assert_select "table#block_list", :count => 1 do + assert_select "tr", 2 + assert_select "a[href='#{user_block_path(user_blocks(:expired_block))}']", 1 + end + end + + ## + # test the blocks_by action + def test_blocks_by + # Asking for a list of blocks with no user name should fail + assert_raise ActionController::RoutingError do + get :blocks_by + end + + # Asking for a list of blocks with a bogus user name should fail + get :blocks_by, :display_name => "non_existent_user" + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user non_existent_user does not exist" + + # Check the list of blocks given by one moderator + get :blocks_by, :display_name => users(:moderator_user).display_name + assert_response :success + assert_select "table#block_list", :count => 1 do + assert_select "tr", 2 + assert_select "a[href='#{user_block_path(user_blocks(:active_block))}']", 1 + end + + # Check the list of blocks given by a different moderator + get :blocks_by, :display_name => users(:second_moderator_user).display_name + assert_response :success + assert_select "table#block_list", :count => 1 do + assert_select "tr", 3 + assert_select "a[href='#{user_block_path(user_blocks(:expired_block))}']", 1 + assert_select "a[href='#{user_block_path(user_blocks(:revoked_block))}']", 1 + end + + # Check the list of blocks (not) given by a normal user + get :blocks_by, :display_name => users(:normal_user).display_name + assert_response :success + assert_select "table#block_list", false + assert_select "p", "#{users(:normal_user).display_name} has not made any blocks yet." + end end diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 24daa1a6c..f756b0514 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -143,10 +143,18 @@ class UserControllerTest < ActionController::TestCase { :path => "/user/username/make_friend", :method => :get }, { :controller => "user", :action => "make_friend", :display_name => "username" } ) + assert_routing( + { :path => "/user/username/make_friend", :method => :post }, + { :controller => "user", :action => "make_friend", :display_name => "username" } + ) assert_routing( { :path => "/user/username/remove_friend", :method => :get }, { :controller => "user", :action => "remove_friend", :display_name => "username" } ) + assert_routing( + { :path => "/user/username/remove_friend", :method => :post }, + { :controller => "user", :action => "remove_friend", :display_name => "username" } + ) assert_routing( { :path => "/user/username/set_status", :method => :get }, @@ -212,7 +220,7 @@ class UserControllerTest < ActionController::TestCase register_email = ActionMailer::Base.deliveries.first assert_equal register_email.to[0], new_email - assert_match /#{@url}/, register_email.body + assert_match /#{@url}/, register_email.body.to_s # Check the page assert_redirected_to :action => 'login', :referer => nil @@ -367,7 +375,7 @@ class UserControllerTest < ActionController::TestCase assert_template :account assert_select "div#errorExplanation", false assert_select "div#notice", /^User information updated successfully/ - assert_select "table#accountForm > tr > td > textarea#user_description", user.description + assert_select "table#accountForm > tr > td > div#user_description_container > div#user_description_content > textarea#user_description", user.description # Changing name to one that exists should fail user.display_name = users(:public_user).display_name @@ -429,12 +437,88 @@ class UserControllerTest < ActionController::TestCase # Check that the user account page will display and contains some relevant # information for the user - def test_view_user_account + def test_user_view_account + # Test a non-existent user get :view, {:display_name => "unknown"} assert_response :not_found + # Test a normal user get :view, {:display_name => "test"} assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href=/user/test/traces]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 0 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 0 + end + + # Test a user who has been blocked + get :view, {:display_name => "blocked"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/blocked/edits]", 1 + assert_select "a[href=/user/blocked/traces]", 1 + assert_select "a[href=/user/blocked/diary]", 1 + assert_select "a[href=/user/blocked/diary/comments]", 1 + assert_select "a[href=/user/blocked/account]", 0 + assert_select "a[href=/user/blocked/blocks]", 1 + assert_select "a[href=/user/blocked/blocks_by]", 0 + assert_select "a[href=/blocks/new/blocked]", 0 + end + + # Test a moderator who has applied blocks + get :view, {:display_name => "moderator"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/moderator/edits]", 1 + assert_select "a[href=/user/moderator/traces]", 1 + assert_select "a[href=/user/moderator/diary]", 1 + assert_select "a[href=/user/moderator/diary/comments]", 1 + assert_select "a[href=/user/moderator/account]", 0 + assert_select "a[href=/user/moderator/blocks]", 0 + assert_select "a[href=/user/moderator/blocks_by]", 1 + assert_select "a[href=/blocks/new/moderator]", 0 + end + + # Login as a normal user + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Test the normal user + get :view, {:display_name => "test"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href=/traces/mine]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 1 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 0 + end + + # Login as a moderator + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # Test the normal user + get :view, {:display_name => "test"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href=/user/test/traces]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 0 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 1 + end end def test_user_api_details @@ -445,4 +529,110 @@ class UserControllerTest < ActionController::TestCase get :api_details assert_response :success end + + def test_user_make_friend + # Get users to work with + user = users(:normal_user) + friend = users(:second_public_user) + + # Check that the users aren't already friends + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # Set the username cookie + @request.cookies["_osm_username"] = user.display_name + + # When not logged in a GET should ask us to login + get :make_friend, {:display_name => friend.display_name} + assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name) + + # When not logged in a POST should error + post :make_friend, {:display_name => friend.display_name} + assert_response :forbidden + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a GET should get a confirmation page + get :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_response :success + assert_template :make_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer]", 0 + assert_select "input[type=submit]", 1 + end + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # The GET should preserve any referer + get :make_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user} + assert_response :success + assert_template :make_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer][value=/test]", 1 + assert_select "input[type=submit]", 1 + end + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a POST should add the friendship + post :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /is now your friend/, flash[:notice] + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # A second POST should report that the friendship already exists + post :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /You are already friends with/, flash[:warning] + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + end + + def test_user_remove_friend + # Get users to work with + user = users(:normal_user) + friend = users(:public_user) + + # Check that the users are friends + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # Set the username cookie + @request.cookies["_osm_username"] = user.display_name + + # When not logged in a GET should ask us to login + get :remove_friend, {:display_name => friend.display_name} + assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name) + + # When not logged in a POST should error + post :remove_friend, {:display_name => friend.display_name} + assert_response :forbidden + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a GET should get a confirmation page + get :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_response :success + assert_template :remove_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer]", 0 + assert_select "input[type=submit]", 1 + end + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # The GET should preserve any referer + get :remove_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user} + assert_response :success + assert_template :remove_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer][value=/test]", 1 + assert_select "input[type=submit]", 1 + end + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a POST should remove the friendship + post :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /was removed from your friends/, flash[:notice] + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # A second POST should report that the friendship does not exist + post :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /is not one of your friends/, flash[:error] + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + end end diff --git a/test/functional/user_roles_controller_test.rb b/test/functional/user_roles_controller_test.rb index 1e2d29b45..ed5d1a17d 100644 --- a/test/functional/user_roles_controller_test.rb +++ b/test/functional/user_roles_controller_test.rb @@ -1,24 +1,138 @@ require File.dirname(__FILE__) + '/../test_helper' class UserRolesControllerTest < ActionController::TestCase + fixtures :users, :user_roles + ## # test all routes which lead to this controller def test_routes - assert_routing( - { :path => "/user/username/role/rolename/grant", :method => :get }, - { :controller => "user_roles", :action => "grant", :display_name => "username", :role => "rolename" } - ) assert_routing( { :path => "/user/username/role/rolename/grant", :method => :post }, { :controller => "user_roles", :action => "grant", :display_name => "username", :role => "rolename" } ) - assert_routing( - { :path => "/user/username/role/rolename/revoke", :method => :get }, - { :controller => "user_roles", :action => "revoke", :display_name => "username", :role => "rolename" } - ) assert_routing( { :path => "/user/username/role/rolename/revoke", :method => :post }, { :controller => "user_roles", :action => "revoke", :display_name => "username", :role => "rolename" } ) end + + ## + # test the grant action + def test_grant + # Granting should fail when not logged in + post :grant, :display_name => users(:normal_user).display_name, :role => "moderator" + assert_response :forbidden + + # Login as an unprivileged user + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Granting should still fail + post :grant, :display_name => users(:normal_user).display_name, :role => "moderator" + assert_redirected_to user_path(users(:normal_user).display_name) + assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error] + + # Login as an administrator + session[:user] = users(:administrator_user).id + cookies["_osm_username"] = users(:administrator_user).display_name + + UserRole::ALL_ROLES.each do |role| + + # Granting a role to a non-existent user should fail + assert_difference "UserRole.count", 0 do + post :grant, :display_name => "non_existent_user", :role => role + end + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user non_existent_user does not exist" + + # Granting a role from a user that already has it should fail + assert_no_difference "UserRole.count" do + post :grant, :display_name => users(:super_user).display_name, :role => role + end + assert_redirected_to user_path(users(:super_user).display_name) + assert_equal "The user already has role #{role}.", flash[:error] + + # Granting a role to a user that doesn't have it should work... + assert_difference "UserRole.count", 1 do + post :grant, :display_name => users(:normal_user).display_name, :role => role + end + assert_redirected_to user_path(users(:normal_user).display_name) + + # ...but trying a second time should fail + assert_no_difference "UserRole.count" do + post :grant, :display_name => users(:normal_user).display_name, :role => role + end + assert_redirected_to user_path(users(:normal_user).display_name) + assert_equal "The user already has role #{role}.", flash[:error] + + end + + # Granting a non-existent role should fail + assert_difference "UserRole.count", 0 do + post :grant, :display_name => users(:normal_user).display_name, :role => "no_such_role" + end + assert_redirected_to user_path(users(:normal_user).display_name) + assert_equal "The string `no_such_role' is not a valid role.", flash[:error] + end + + ## + # test the revoke action + def test_revoke + # Revoking should fail when not logged in + post :revoke, :display_name => users(:normal_user).display_name, :role => "moderator" + assert_response :forbidden + + # Login as an unprivileged user + session[:user] = users(:public_user).id + cookies["_osm_username"] = users(:public_user).display_name + + # Revoking should still fail + post :revoke, :display_name => users(:normal_user).display_name, :role => "moderator" + assert_redirected_to user_path(users(:normal_user).display_name) + assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error] + + # Login as an administrator + session[:user] = users(:administrator_user).id + cookies["_osm_username"] = users(:administrator_user).display_name + + UserRole::ALL_ROLES.each do |role| + + # Removing a role from a non-existent user should fail + assert_difference "UserRole.count", 0 do + post :revoke, :display_name => "non_existent_user", :role => role + end + assert_response :not_found + assert_template "user/no_such_user" + assert_select "h2", "The user non_existent_user does not exist" + + # Removing a role from a user that doesn't have it should fail + assert_no_difference "UserRole.count" do + post :revoke, :display_name => users(:normal_user).display_name, :role => role + end + assert_redirected_to user_path(users(:normal_user).display_name) + assert_equal "The user does not have role #{role}.", flash[:error] + + # Removing a role' from a user that has it should work... + assert_difference "UserRole.count", -1 do + post :revoke, :display_name => users(:super_user).display_name, :role => role + end + assert_redirected_to user_path(users(:super_user).display_name) + + # ...but trying a second time should fail + assert_no_difference "UserRole.count" do + post :revoke, :display_name => users(:super_user).display_name, :role => role + end + assert_redirected_to user_path(users(:super_user).display_name) + assert_equal "The user does not have role #{role}.", flash[:error] + + end + + # Revoking a non-existent role should fail + assert_difference "UserRole.count", 0 do + post :revoke, :display_name => users(:normal_user).display_name, :role => "no_such_role" + end + assert_redirected_to user_path(users(:normal_user).display_name) + assert_equal "The string `no_such_role' is not a valid role.", flash[:error] + end end diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index 80da36deb..9ab32ca78 100644 --- a/test/integration/client_application_test.rb +++ b/test/integration/client_application_test.rb @@ -17,6 +17,9 @@ class ClientApplicationTest < ActionController::IntegrationTest follow_redirect! assert_response :success assert_template 'user/view' + get '/user/test2/account' + assert_response :success + assert_template 'user/account' # check that the form to allow new client application creations exists assert_in_body do diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index 9c37ff739..2bda77379 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' class OAuthTest < ActionController::IntegrationTest - fixtures :users, :client_applications + fixtures :users, :client_applications, :gpx_files include OAuth::Helper @@ -45,6 +45,17 @@ class OAuthTest < ActionController::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [ :allow_read_prefs ] + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :success + + post "/oauth/revoke", :token => token.token + assert_redirected_to oauth_clients_url(token.user.display_name) + token = OauthToken.find_by_token(token.token) + assert_not_nil token.invalidated_at + + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :unauthorized + signed_get "/oauth/request_token", :consumer => client assert_response :success token = parse_token(response) @@ -78,6 +89,17 @@ class OAuthTest < ActionController::IntegrationTest assert_not_nil token.authorized_at assert_nil token.invalidated_at assert_allowed token, [ :allow_write_api, :allow_read_gpx ] + + signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + assert_response :success + + post "/oauth/revoke", :token => token.token + assert_redirected_to oauth_clients_url(token.user.display_name) + token = OauthToken.find_by_token(token.token) + assert_not_nil token.invalidated_at + + signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + assert_response :unauthorized end def test_oauth10_desktop_app @@ -119,6 +141,17 @@ class OAuthTest < ActionController::IntegrationTest assert_not_nil token.authorized_at assert_nil token.invalidated_at assert_allowed token, [ :allow_read_prefs ] + + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :success + + post "/oauth/revoke", :token => token.token + assert_redirected_to oauth_clients_url(token.user.display_name) + token = OauthToken.find_by_token(token.token) + assert_not_nil token.invalidated_at + + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :unauthorized end def test_oauth10a_web_app @@ -167,6 +200,17 @@ class OAuthTest < ActionController::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [ :allow_read_prefs ] + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :success + + post "/oauth/revoke", :token => token.token + assert_redirected_to oauth_clients_url(token.user.display_name) + token = OauthToken.find_by_token(token.token) + assert_not_nil token.invalidated_at + + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :unauthorized + signed_get "/oauth/request_token", :consumer => client, :oauth_callback => "http://another.web.app.org/callback" @@ -206,6 +250,17 @@ class OAuthTest < ActionController::IntegrationTest assert_not_nil token.authorized_at assert_nil token.invalidated_at assert_allowed token, [ :allow_write_api, :allow_read_gpx ] + + signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + assert_response :success + + post "/oauth/revoke", :token => token.token + assert_redirected_to oauth_clients_url(token.user.display_name) + token = OauthToken.find_by_token(token.token) + assert_not_nil token.invalidated_at + + signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + assert_response :unauthorized end def test_oauth10a_desktop_app @@ -255,6 +310,17 @@ class OAuthTest < ActionController::IntegrationTest assert_not_nil token.authorized_at assert_nil token.invalidated_at assert_allowed token, [ :allow_read_prefs ] + + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :success + + post "/oauth/revoke", :token => token.token + assert_redirected_to oauth_clients_url(token.user.display_name) + token = OauthToken.find_by_token(token.token) + assert_not_nil token.invalidated_at + + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + assert_response :unauthorized end private diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 3c716e99e..b5b3e91c7 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -71,7 +71,7 @@ class UserCreationTest < ActionController::IntegrationTest assert_equal register_email.to[0], new_email # Check that the confirm account url is correct - assert_match /#{@url}/, register_email.body + assert_match /#{@url}/, register_email.body.to_s # Check the page assert_response :success @@ -114,7 +114,7 @@ class UserCreationTest < ActionController::IntegrationTest # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)") register_email.parts.each do |part| - assert_match(confirm_regex, part.body) + assert_match confirm_regex, part.body.to_s end confirm_string = register_email.parts[0].body.match(confirm_regex)[1] @@ -211,7 +211,7 @@ class UserCreationTest < ActionController::IntegrationTest # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)") register_email.parts.each do |part| - assert_match(confirm_regex, part.body) + assert_match confirm_regex, part.body.to_s end confirm_string = register_email.parts[0].body.match(confirm_regex)[1] diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb index 17531ef3f..948bb895c 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -16,6 +16,8 @@ class UserRolesTest < ActionController::IntegrationTest check_fail(:revoke, :administrator_user, :moderator) end +private + def check_fail(action, user, role) get '/login' assert_response :redirect @@ -27,8 +29,7 @@ class UserRolesTest < ActionController::IntegrationTest follow_redirect! assert_response :success - get "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" - assert_response :redirect + post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name reset! @@ -45,10 +46,7 @@ class UserRolesTest < ActionController::IntegrationTest follow_redirect! assert_response :success - get "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" - assert_response :success - post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}", {:confirm => "yes", :nonce => session[:nonce]} - assert_response :redirect + post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name reset! diff --git a/test/test_helper.rb b/test/test_helper.rb index 8fcc7a94f..703347c9c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -7,7 +7,7 @@ class ActiveSupport::TestCase # Load standard fixtures needed to test API methods def self.api_fixtures #print "setting up the api_fixtures" - fixtures :users, :changesets, :changeset_tags + fixtures :users, :user_roles, :changesets, :changeset_tags fixtures :current_nodes, :nodes set_fixture_class :current_nodes => 'Node' @@ -51,6 +51,8 @@ class ActiveSupport::TestCase set_fixture_class :gpx_file_tags => 'Tracetag' fixtures :client_applications + + fixtures :redactions end ## diff --git a/test/unit/i18n_test.rb b/test/unit/i18n_test.rb index 73f893455..c1dacbff2 100644 --- a/test/unit/i18n_test.rb +++ b/test/unit/i18n_test.rb @@ -30,8 +30,10 @@ class I18nTest < ActiveSupport::TestCase value.each do |subkey,subvalue| # assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key" - subvalue.scan(/%\{(\w+)\}/) do - assert variables.include?($1), "#{key}.#{subkey} uses unknown interpolation variable #{$1}" + unless subvalue.nil? + subvalue.scan(/%\{(\w+)\}/) do + assert variables.include?($1), "#{key}.#{subkey} uses unknown interpolation variable #{$1}" + end end end else diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb index 58523ca88..3da91de38 100644 --- a/test/unit/message_test.rb +++ b/test/unit/message_test.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- require File.dirname(__FILE__) + '/../test_helper' class MessageTest < ActiveSupport::TestCase @@ -18,18 +19,18 @@ class MessageTest < ActiveSupport::TestCase assert message.errors[:title].any? assert message.errors[:body].any? assert message.errors[:sent_on].any? - assert true, message.message_read + assert !message.message_read end def test_validating_msgs - message = messages(:one) + message = messages(:unread_message) assert message.valid? - massage = messages(:two) + massage = messages(:read_message) assert message.valid? end def test_invalid_send_recipient - message = messages(:one) + message = messages(:unread_message) message.sender = nil message.recipient = nil assert !message.valid? @@ -75,14 +76,118 @@ class MessageTest < ActiveSupport::TestCase db_msg = msg.class.find(msg.id) assert_equal char, db_msg.title, "Database silently truncated message title" + rescue ArgumentError => ex + assert_equal ex.to_s, "invalid byte sequence in UTF-8" + rescue ActiveRecord::RecordInvalid # because we only test invalid sequences it is OK to barf on them end end end + def test_from_mail_plain + mail = Mail.new do + from "from@example.com" + to "to@example.com" + subject "Test message" + date Time.now + content_type 'text/plain; charset=utf-8' + body "This is a test & a message" + end + message = Message.from_mail(mail, users(:normal_user), users(:public_user)) + assert_equal users(:normal_user), message.sender + assert_equal users(:public_user), message.recipient + assert_equal mail.date, message.sent_on + assert_equal "Test message", message.title + assert_equal "This is a test & a message", message.body + assert_equal "text", message.body_format + end + + def test_from_mail_html + mail = Mail.new do + from "from@example.com" + to "to@example.com" + subject "Test message" + date Time.now + content_type 'text/html; charset=utf-8' + body "<p>This is a <b>test</b> & a message</p>" + end + message = Message.from_mail(mail, users(:normal_user), users(:public_user)) + assert_equal users(:normal_user), message.sender + assert_equal users(:public_user), message.recipient + assert_equal mail.date, message.sent_on + assert_equal "Test message", message.title + assert_match /^ *This is a test & a message *$/, message.body + assert_equal "text", message.body_format + end + + def test_from_mail_multipart + mail = Mail.new do + from "from@example.com" + to "to@example.com" + subject "Test message" + date Time.now + + text_part do + content_type 'text/plain; charset=utf-8' + body "This is a test & a message in text format" + end + + html_part do + content_type 'text/html; charset=utf-8' + body "<p>This is a <b>test</b> & a message in HTML format</p>" + end + end + message = Message.from_mail(mail, users(:normal_user), users(:public_user)) + assert_equal users(:normal_user), message.sender + assert_equal users(:public_user), message.recipient + assert_equal mail.date, message.sent_on + assert_equal "Test message", message.title + assert_equal "This is a test & a message in text format", message.body + assert_equal "text", message.body_format + + mail = Mail.new do + from "from@example.com" + to "to@example.com" + subject "Test message" + date Time.now + + html_part do + content_type 'text/html; charset=utf-8' + body "<p>This is a <b>test</b> & a message in HTML format</p>" + end + end + message = Message.from_mail(mail, users(:normal_user), users(:public_user)) + assert_equal users(:normal_user), message.sender + assert_equal users(:public_user), message.recipient + assert_equal mail.date, message.sent_on + assert_equal "Test message", message.title + assert_match /^ *This is a test & a message in HTML format *$/, message.body + assert_equal "text", message.body_format + end + + def test_from_mail_prefix + mail = Mail.new do + from "from@example.com" + to "to@example.com" + subject "[OpenStreetMap] Test message" + date Time.now + content_type 'text/plain; charset=utf-8' + body "This is a test & a message" + end + message = Message.from_mail(mail, users(:normal_user), users(:public_user)) + assert_equal users(:normal_user), message.sender + assert_equal users(:public_user), message.recipient + assert_equal mail.date, message.sent_on + assert_equal "Test message", message.title + assert_equal "This is a test & a message", message.body + assert_equal "text", message.body_format + end + +private + def make_message(char, count) - message = messages(:one) + message = messages(:unread_message) message.title = char * count return message end @@ -93,5 +198,4 @@ class MessageTest < ActiveSupport::TestCase response = message.class.find(message.id) # stand by for some über-generalisation... assert_equal char * count, response.title, "message with #{count} #{char} chars (i.e. #{char.length*count} bytes) fails" end - end diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb index 78f060678..753e6a95c 100644 --- a/test/unit/node_test.rb +++ b/test/unit/node_test.rb @@ -4,7 +4,7 @@ class NodeTest < ActiveSupport::TestCase api_fixtures def test_node_count - assert_equal 16, Node.count + assert_equal 17, Node.count end def test_node_too_far_north diff --git a/test/unit/old_node_test.rb b/test/unit/old_node_test.rb index e6f3d8035..84ea65b68 100644 --- a/test/unit/old_node_test.rb +++ b/test/unit/old_node_test.rb @@ -4,7 +4,7 @@ class OldNodeTest < ActiveSupport::TestCase api_fixtures def test_old_node_count - assert_equal 19, OldNode.count + assert_equal 21, OldNode.count end def test_node_too_far_north diff --git a/test/unit/old_way_tag_test.rb b/test/unit/old_way_tag_test.rb index 334e7b86a..38023bb52 100644 --- a/test/unit/old_way_tag_test.rb +++ b/test/unit/old_way_tag_test.rb @@ -4,7 +4,7 @@ class WayTagTest < ActiveSupport::TestCase api_fixtures def test_tag_count - assert_equal 3, OldWayTag.count + assert_equal 7, OldWayTag.count end def test_length_key_valid diff --git a/test/unit/redaction_test.rb b/test/unit/redaction_test.rb new file mode 100644 index 000000000..c19570fc4 --- /dev/null +++ b/test/unit/redaction_test.rb @@ -0,0 +1,36 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'osm' + +class RedactionTest < ActiveSupport::TestCase + api_fixtures + fixtures :redactions + + def test_cannot_redact_current + n = current_nodes(:node_with_versions) + r = redactions(:example) + assert_equal(false, n.redacted?, "Expected node to not be redacted already.") + assert_raise(OSM::APICannotRedactError) do + n.redact!(r) + end + end + + def test_cannot_redact_current_via_old + n = nodes(:node_with_versions_v4) + r = redactions(:example) + assert_equal(false, n.redacted?, "Expected node to not be redacted already.") + assert_raise(OSM::APICannotRedactError) do + n.redact!(r) + end + end + + def test_can_redact_old + n = nodes(:node_with_versions_v3) + r = redactions(:example) + assert_equal(false, n.redacted?, "Expected node to not be redacted already.") + assert_nothing_raised(OSM::APICannotRedactError) do + n.redact!(r) + end + assert_equal(true, n.redacted?, "Expected node to be redacted after redact! call.") + end + +end diff --git a/test/unit/relation_test.rb b/test/unit/relation_test.rb index b1fbc0fcd..a62320cc7 100644 --- a/test/unit/relation_test.rb +++ b/test/unit/relation_test.rb @@ -4,7 +4,7 @@ class RelationTest < ActiveSupport::TestCase api_fixtures def test_relation_count - assert_equal 6, Relation.count + assert_equal 8, Relation.count end def test_from_xml_no_id diff --git a/test/unit/rich_text_test.rb b/test/unit/rich_text_test.rb new file mode 100644 index 000000000..c43dd0e9a --- /dev/null +++ b/test/unit/rich_text_test.rb @@ -0,0 +1,169 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class RichTextTest < ActiveSupport::TestCase + include ActionDispatch::Assertions::SelectorAssertions + + def test_html_to_html + r = RichText.new("html", "foo http://example.com/ bar") + assert_html r do + assert_select "a", 1 + assert_select "a[href='http://example.com/']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("html", "foo <a href='http://example.com/'>bar</a> baz") + assert_html r do + assert_select "a", 1 + assert_select "a[href='http://example.com/']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("html", "foo example@example.com bar") + assert_html r do + assert_select "a", 0 + end + + r = RichText.new("html", "foo <a href='mailto:example@example.com'>bar</a> baz") + assert_html r do + assert_select "a", 1 + assert_select "a[href='mailto:example@example.com']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("html", "foo <div>bar</div> baz") + assert_html r do + assert_select "div", false + assert_select "p", /^foo *bar *baz$/ + end + + r = RichText.new("html", "foo <script>bar = 1;</script> baz") + assert_html r do + assert_select "script", false + assert_select "p", /^foo *baz$/ + end + + r = RichText.new("html", "foo <style>div { display: none; }</style> baz") + assert_html r do + assert_select "style", false + assert_select "p", /^foo *baz$/ + end + end + + def test_markdown_to_html + r = RichText.new("markdown", "foo http://example.com/ bar") + assert_html r do + assert_select "a", 1 + assert_select "a[href='http://example.com/']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("markdown", "foo [bar](http://example.com/) baz") + assert_html r do + assert_select "a", 1 + assert_select "a[href='http://example.com/']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("markdown", "foo example@example.com bar") + assert_html r do + assert_select "a", 1 + assert_select "a[href='mailto:example@example.com']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("markdown", "foo [bar](mailto:example@example.com) bar") + assert_html r do + assert_select "a", 1 + assert_select "a[href='mailto:example@example.com']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("markdown", "foo ![bar](http://example.com/example.png) bar") + assert_html r do + assert_select "img", 1 + assert_select "img[alt='bar']", 1 + assert_select "img[src='http://example.com/example.png']", 1 + end + + r = RichText.new("markdown", "# foo bar baz") + assert_html r do + assert_select "h1", "foo bar baz" + end + + r = RichText.new("markdown", "## foo bar baz") + assert_html r do + assert_select "h2", "foo bar baz" + end + + r = RichText.new("markdown", "### foo bar baz") + assert_html r do + assert_select "h3", "foo bar baz" + end + + r = RichText.new("markdown", "* foo bar baz") + assert_html r do + assert_select "ul" do + assert_select "li", "foo bar baz" + end + end + + r = RichText.new("markdown", "1. foo bar baz") + assert_html r do + assert_select "ol" do + assert_select "li", "foo bar baz" + end + end + + r = RichText.new("markdown", "foo *bar* _baz_ qux") + assert_html r do + assert_select "em", "bar" + assert_select "em", "baz" + end + + r = RichText.new("markdown", "foo **bar** __baz__ qux") + assert_html r do + assert_select "strong", "bar" + assert_select "strong", "baz" + end + + r = RichText.new("markdown", "foo `bar` baz") + assert_html r do + assert_select "code", "bar" + end + + r = RichText.new("markdown", " foo bar baz") + assert_html r do + assert_select "pre", /^\s*foo bar baz\s*$/ + end + end + + def test_text_to_html + r = RichText.new("text", "foo http://example.com/ bar") + assert_html r do + assert_select "a", 1 + assert_select "a[href='http://example.com/']", 1 + assert_select "a[rel='nofollow']", 1 + end + + r = RichText.new("text", "foo example@example.com bar") + assert_html r do + assert_select "a", 0 + end + + r = RichText.new("text", "foo < bar & baz > qux") + assert_html r do + assert_select "p", "foo < bar & baz > qux" + end + end + +private + + def assert_html(richtext, &block) + html = richtext.to_html + assert html.html_safe? + root = HTML::Document.new(richtext.to_html, false, true).root + assert_select root, "*" do + yield block + end + end +end diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index eb2f2a959..88019e2f5 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -52,7 +52,7 @@ class UserTest < ActiveSupport::TestCase ok.each do |name| user = users(:normal_user) user.email = name - assert user.valid?(:save), user.errors.full_messages + assert user.valid?(:save), user.errors.full_messages.join(",") end bad.each do |name| @@ -81,12 +81,12 @@ class UserTest < ActiveSupport::TestCase # Due to sanitisation in the view some of these that you might not # expact are allowed # However, would they affect the xml planet dumps? - ok = [ "Name", "'me", "he\"", "#ping", "<hr>", "*ho", "\"help\"@", + ok = [ "Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@", "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲" ] # These need to be 3 chars in length, otherwise the length test above # should be used. bad = [ "<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.", - "aa,", "aa?", "/;.,?", "も対応します/" ] + "aa,", "aa?", "/;.,?", "も対応します/", "#ping" ] ok.each do |display_name| user = users(:normal_user) user.display_name = display_name @@ -155,7 +155,7 @@ class UserTest < ActiveSupport::TestCase end def test_visible - assert_equal 10, User.visible.count + assert_equal 14, User.visible.count assert_raise ActiveRecord::RecordNotFound do User.visible.find(users(:suspended_user).id) end @@ -165,7 +165,7 @@ class UserTest < ActiveSupport::TestCase end def test_active - assert_equal 9, User.active.count + assert_equal 13, User.active.count assert_raise ActiveRecord::RecordNotFound do User.active.find(users(:inactive_user).id) end @@ -178,7 +178,7 @@ class UserTest < ActiveSupport::TestCase end def test_public - assert_equal 11, User.public.count + assert_equal 15, User.public.count assert_raise ActiveRecord::RecordNotFound do User.public.find(users(:normal_user).id) end diff --git a/test/unit/way_test.rb b/test/unit/way_test.rb index ca5b75176..d2a447e40 100644 --- a/test/unit/way_test.rb +++ b/test/unit/way_test.rb @@ -6,7 +6,7 @@ class WayTest < ActiveSupport::TestCase # Check that we have the correct number of currnet ways in the db # This will need to updated whenever the current_ways.yml is updated def test_db_count - assert_equal 5, Way.count + assert_equal 6, Way.count end def test_bbox diff --git a/vendor/assets/jquery/jquery.autogrowtextarea.js b/vendor/assets/jquery/jquery.autogrowtextarea.js new file mode 100644 index 000000000..8666c5578 --- /dev/null +++ b/vendor/assets/jquery/jquery.autogrowtextarea.js @@ -0,0 +1,61 @@ +/*! + * Autogrow Textarea Plugin Version v2.0 + * http://www.technoreply.com/autogrow-textarea-plugin-version-2-0 + * + * Copyright 2011, Jevin O. Sewaruth + * + * Date: March 13, 2011 + */ +jQuery.fn.autoGrow = function(){ + return this.each(function(){ + // Variables + var colsDefault = this.cols; + var rowsDefault = this.rows; + + //Functions + var grow = function() { + growByRef(this); + } + + var growByRef = function(obj) { + var linesCount = 0; + var lines = obj.value.split('\n'); + + for (var i=lines.length-1; i>=0; --i) + { + linesCount += Math.floor((lines[i].length / colsDefault) + 1); + } + + if (linesCount >= rowsDefault) + obj.rows = linesCount + 1; + else + obj.rows = rowsDefault; + } + + var characterWidth = function (obj){ + var characterWidth = 0; + var temp1 = 0; + var temp2 = 0; + var tempCols = obj.cols; + + obj.cols = 1; + temp1 = obj.offsetWidth; + obj.cols = 2; + temp2 = obj.offsetWidth; + characterWidth = temp2 - temp1; + obj.cols = tempCols; + + return characterWidth; + } + + // Manipulations + this.style.width = "auto"; + this.style.height = "auto"; + this.style.overflow = "hidden"; + this.style.width = ((characterWidth(this) * this.cols) + 6) + "px"; + this.onkeyup = grow; + this.onfocus = grow; + this.onblur = grow; + growByRef(this); + }); +}; diff --git a/vendor/assets/jquery/jquery.timers.js b/vendor/assets/jquery/jquery.timers.js new file mode 100644 index 000000000..ce66eaf47 --- /dev/null +++ b/vendor/assets/jquery/jquery.timers.js @@ -0,0 +1,138 @@ +/** + * jQuery.timers - Timer abstractions for jQuery + * Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com) + * Licensed under the WTFPL (http://sam.zoy.org/wtfpl/). + * Date: 2009/10/16 + * + * @author Blair Mitchelmore + * @version 1.2 + * + **/ + +jQuery.fn.extend({ + everyTime: function(interval, label, fn, times) { + return this.each(function() { + jQuery.timer.add(this, interval, label, fn, times); + }); + }, + oneTime: function(interval, label, fn) { + return this.each(function() { + jQuery.timer.add(this, interval, label, fn, 1); + }); + }, + stopTime: function(label, fn) { + return this.each(function() { + jQuery.timer.remove(this, label, fn); + }); + } +}); + +jQuery.extend({ + timer: { + global: [], + guid: 1, + dataKey: "jQuery.timer", + regex: /^([0-9]+(?:\.[0-9]*)?)\s*(.*s)?$/, + powers: { + // Yeah this is major overkill... + 'ms': 1, + 'cs': 10, + 'ds': 100, + 's': 1000, + 'das': 10000, + 'hs': 100000, + 'ks': 1000000 + }, + timeParse: function(value) { + if (value == undefined || value == null) + return null; + var result = this.regex.exec(jQuery.trim(value.toString())); + if (result[2]) { + var num = parseFloat(result[1]); + var mult = this.powers[result[2]] || 1; + return num * mult; + } else { + return value; + } + }, + add: function(element, interval, label, fn, times) { + var counter = 0; + + if (jQuery.isFunction(label)) { + if (!times) + times = fn; + fn = label; + label = interval; + } + + interval = jQuery.timer.timeParse(interval); + + if (typeof interval != 'number' || isNaN(interval) || interval < 0) + return; + + if (typeof times != 'number' || isNaN(times) || times < 0) + times = 0; + + times = times || 0; + + var timers = jQuery.data(element, this.dataKey) || jQuery.data(element, this.dataKey, {}); + + if (!timers[label]) + timers[label] = {}; + + fn.timerID = fn.timerID || this.guid++; + + var handler = function() { + if ((++counter > times && times !== 0) || fn.call(element, counter) === false) + jQuery.timer.remove(element, label, fn); + }; + + handler.timerID = fn.timerID; + + if (!timers[label][fn.timerID]) + timers[label][fn.timerID] = window.setInterval(handler,interval); + + this.global.push( element ); + + }, + remove: function(element, label, fn) { + var timers = jQuery.data(element, this.dataKey), ret; + + if ( timers ) { + + if (!label) { + for ( label in timers ) + this.remove(element, label, fn); + } else if ( timers[label] ) { + if ( fn ) { + if ( fn.timerID ) { + window.clearInterval(timers[label][fn.timerID]); + delete timers[label][fn.timerID]; + } + } else { + for ( var fn in timers[label] ) { + window.clearInterval(timers[label][fn]); + delete timers[label][fn]; + } + } + + for ( ret in timers[label] ) break; + if ( !ret ) { + ret = null; + delete timers[label]; + } + } + + for ( ret in timers ) break; + if ( !ret ) + jQuery.removeData(element, this.dataKey); + } + } + } +}); + +jQuery(window).bind("unload", function() { + jQuery.each(jQuery.timer.global, function(index, item) { + jQuery.timer.remove(item); + }); +}); \ No newline at end of file diff --git a/vendor/assets/openlayers/OpenLayers.js b/vendor/assets/openlayers/OpenLayers.js index 5c254b4fd..b3705cb90 100644 --- a/vendor/assets/openlayers/OpenLayers.js +++ b/vendor/assets/openlayers/OpenLayers.js @@ -2,47 +2,17 @@ OpenLayers.js -- OpenLayers Map Viewer Library - Copyright 2005-2011 OpenLayers Contributors, released under the FreeBSD - license. Please see http://svn.openlayers.org/trunk/openlayers/license.txt - for the full text of the license. + Copyright (c) 2006-2012 by OpenLayers Contributors + Published under the 2-clause BSD license. + See http://openlayers.org/dev/license.txt for the full text of the license, and http://openlayers.org/dev/authors.txt for full list of contributors. Includes compressed code under the following licenses: - (For uncompressed versions of the code used please see the - OpenLayers SVN repository: <http://openlayers.org/>) + (For uncompressed versions of the code used, please see the + OpenLayers Github repository: <https://github.com/openlayers/openlayers>) */ -/* Contains portions of Prototype.js: - * - * Prototype JavaScript framework, version 1.4.0 - * (c) 2005 Sam Stephenson <sam@conio.net> - * - * Prototype is freely distributable under the terms of an MIT-style license. - * For details, see the Prototype web site: http://prototype.conio.net/ - * - *--------------------------------------------------------------------------*/ - -/** -* -* Contains portions of Rico <http://openrico.org/> -* -* Copyright 2005 Sabre Airline Solutions -* -* Licensed under the Apache License, Version 2.0 (the "License"); you -* may not use this file except in compliance with the License. You -* may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -* implied. See the License for the specific language governing -* permissions and limitations under the License. -* -**/ - /** * Contains XMLHttpRequest.js <http://code.google.com/p/xmlhttprequest/> * Copyright 2007 Sergey Ilinsky (http://www.ilinsky.com) @@ -53,44 +23,6 @@ * http://www.apache.org/licenses/LICENSE-2.0 */ -/** - * Contains portions of Gears <http://code.google.com/apis/gears/> - * - * Copyright 2007, Google Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of Google Inc. nor the names of its contributors may be - * used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Sets up google.gears.*, which is *the only* supported way to access Gears. - * - * Circumvent this file at your own risk! - * - * In the future, Gears may automatically define google.gears.* without this - * file. Gears may use these objects to transparently fix bugs and compatibility - * issues. Applications that use the code below will continue to work seamlessly - * when that happens. - */ - /** * OpenLayers.Util.pagePosition is based on Yahoo's getXY method, which is * Copyright (c) 2006, Yahoo! Inc. @@ -122,40 +54,82 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - */var OpenLayers={VERSION_NUMBER:"Release 2.11",singleFile:true,_getScriptLocation:(function(){var r=new RegExp("(^|(.*?\\/))(OpenLayers\.js)(\\?|$)"),s=document.getElementsByTagName('script'),src,m,l="";for(var i=0,len=s.length;i<len;i++){src=s[i].getAttribute('src');if(src){var m=src.match(r);if(m){l=m[1];break;}}} -return(function(){return l;});})()};(function(){var singleFile=(typeof OpenLayers=="object"&&OpenLayers.singleFile);var scriptName=(!singleFile)?"lib/OpenLayers.js":"OpenLayers.js";var jsFiles=window.OpenLayers;window.OpenLayers={_getScriptLocation:(function(){var r=new RegExp("(^|(.*?\\/))("+scriptName+")(\\?|$)"),s=document.getElementsByTagName('script'),src,m,l="";for(var i=0,len=s.length;i<len;i++){src=s[i].getAttribute('src');if(src){var m=src.match(r);if(m){l=m[1];break;}}} -return(function(){return l;});})()};if(!singleFile){if(!jsFiles){jsFiles=["OpenLayers/BaseTypes/Class.js","OpenLayers/Util.js","OpenLayers/BaseTypes.js","OpenLayers/BaseTypes/Bounds.js","OpenLayers/BaseTypes/Date.js","OpenLayers/BaseTypes/Element.js","OpenLayers/BaseTypes/LonLat.js","OpenLayers/BaseTypes/Pixel.js","OpenLayers/BaseTypes/Size.js","OpenLayers/Console.js","OpenLayers/Tween.js","OpenLayers/Kinetic.js","Rico/Corner.js","Rico/Color.js","OpenLayers/Ajax.js","OpenLayers/Events.js","OpenLayers/Request.js","OpenLayers/Request/XMLHttpRequest.js","OpenLayers/Projection.js","OpenLayers/Map.js","OpenLayers/Layer.js","OpenLayers/Icon.js","OpenLayers/Marker.js","OpenLayers/Marker/Box.js","OpenLayers/Popup.js","OpenLayers/Tile.js","OpenLayers/Tile/Image.js","OpenLayers/Tile/Image/IFrame.js","OpenLayers/Tile/WFS.js","OpenLayers/Layer/Image.js","OpenLayers/Layer/SphericalMercator.js","OpenLayers/Layer/EventPane.js","OpenLayers/Layer/FixedZoomLevels.js","OpenLayers/Layer/Google.js","OpenLayers/Layer/Google/v3.js","OpenLayers/Layer/VirtualEarth.js","OpenLayers/Layer/Yahoo.js","OpenLayers/Layer/HTTPRequest.js","OpenLayers/Layer/Grid.js","OpenLayers/Layer/MapGuide.js","OpenLayers/Layer/MapServer.js","OpenLayers/Layer/MapServer/Untiled.js","OpenLayers/Layer/KaMap.js","OpenLayers/Layer/KaMapCache.js","OpenLayers/Layer/MultiMap.js","OpenLayers/Layer/Markers.js","OpenLayers/Layer/Text.js","OpenLayers/Layer/WorldWind.js","OpenLayers/Layer/ArcGIS93Rest.js","OpenLayers/Layer/WMS.js","OpenLayers/Layer/WMS/Untiled.js","OpenLayers/Layer/WMS/Post.js","OpenLayers/Layer/WMTS.js","OpenLayers/Layer/ArcIMS.js","OpenLayers/Layer/GeoRSS.js","OpenLayers/Layer/Boxes.js","OpenLayers/Layer/XYZ.js","OpenLayers/Layer/Bing.js","OpenLayers/Layer/TMS.js","OpenLayers/Layer/TileCache.js","OpenLayers/Layer/Zoomify.js","OpenLayers/Layer/ArcGISCache.js","OpenLayers/Popup/Anchored.js","OpenLayers/Popup/AnchoredBubble.js","OpenLayers/Popup/Framed.js","OpenLayers/Popup/FramedCloud.js","OpenLayers/Feature.js","OpenLayers/Feature/Vector.js","OpenLayers/Feature/WFS.js","OpenLayers/Handler.js","OpenLayers/Handler/Click.js","OpenLayers/Handler/Hover.js","OpenLayers/Handler/Point.js","OpenLayers/Handler/Path.js","OpenLayers/Handler/Polygon.js","OpenLayers/Handler/Feature.js","OpenLayers/Handler/Drag.js","OpenLayers/Handler/Pinch.js","OpenLayers/Handler/RegularPolygon.js","OpenLayers/Handler/Box.js","OpenLayers/Handler/MouseWheel.js","OpenLayers/Handler/Keyboard.js","OpenLayers/Control.js","OpenLayers/Control/Attribution.js","OpenLayers/Control/Button.js","OpenLayers/Control/ZoomBox.js","OpenLayers/Control/ZoomToMaxExtent.js","OpenLayers/Control/DragPan.js","OpenLayers/Control/Navigation.js","OpenLayers/Control/PinchZoom.js","OpenLayers/Control/TouchNavigation.js","OpenLayers/Control/MouseDefaults.js","OpenLayers/Control/MousePosition.js","OpenLayers/Control/OverviewMap.js","OpenLayers/Control/KeyboardDefaults.js","OpenLayers/Control/PanZoom.js","OpenLayers/Control/PanZoomBar.js","OpenLayers/Control/ArgParser.js","OpenLayers/Control/Permalink.js","OpenLayers/Control/Scale.js","OpenLayers/Control/ScaleLine.js","OpenLayers/Control/Snapping.js","OpenLayers/Control/Split.js","OpenLayers/Control/LayerSwitcher.js","OpenLayers/Control/DrawFeature.js","OpenLayers/Control/DragFeature.js","OpenLayers/Control/ModifyFeature.js","OpenLayers/Control/Panel.js","OpenLayers/Control/SelectFeature.js","OpenLayers/Control/NavigationHistory.js","OpenLayers/Control/Measure.js","OpenLayers/Control/WMSGetFeatureInfo.js","OpenLayers/Control/WMTSGetFeatureInfo.js","OpenLayers/Control/Graticule.js","OpenLayers/Control/TransformFeature.js","OpenLayers/Control/SLDSelect.js","OpenLayers/Geometry.js","OpenLayers/Geometry/Rectangle.js","OpenLayers/Geometry/Collection.js","OpenLayers/Geometry/Point.js","OpenLayers/Geometry/MultiPoint.js","OpenLayers/Geometry/Curve.js","OpenLayers/Geometry/LineString.js","OpenLayers/Geometry/LinearRing.js","OpenLayers/Geometry/Polygon.js","OpenLayers/Geometry/MultiLineString.js","OpenLayers/Geometry/MultiPolygon.js","OpenLayers/Geometry/Surface.js","OpenLayers/Renderer.js","OpenLayers/Renderer/Elements.js","OpenLayers/Renderer/NG.js","OpenLayers/Renderer/SVG.js","OpenLayers/Renderer/SVG2.js","OpenLayers/Renderer/Canvas.js","OpenLayers/Renderer/VML.js","OpenLayers/Layer/Vector.js","OpenLayers/Layer/PointGrid.js","OpenLayers/Layer/Vector/RootContainer.js","OpenLayers/Strategy.js","OpenLayers/Strategy/Filter.js","OpenLayers/Strategy/Fixed.js","OpenLayers/Strategy/Cluster.js","OpenLayers/Strategy/Paging.js","OpenLayers/Strategy/BBOX.js","OpenLayers/Strategy/Save.js","OpenLayers/Strategy/Refresh.js","OpenLayers/Filter.js","OpenLayers/Filter/FeatureId.js","OpenLayers/Filter/Logical.js","OpenLayers/Filter/Comparison.js","OpenLayers/Filter/Spatial.js","OpenLayers/Filter/Function.js","OpenLayers/Protocol.js","OpenLayers/Protocol/HTTP.js","OpenLayers/Protocol/SQL.js","OpenLayers/Protocol/SQL/Gears.js","OpenLayers/Protocol/WFS.js","OpenLayers/Protocol/WFS/v1.js","OpenLayers/Protocol/WFS/v1_0_0.js","OpenLayers/Protocol/WFS/v1_1_0.js","OpenLayers/Protocol/Script.js","OpenLayers/Protocol/SOS.js","OpenLayers/Protocol/SOS/v1_0_0.js","OpenLayers/Layer/PointTrack.js","OpenLayers/Layer/GML.js","OpenLayers/Style.js","OpenLayers/Style2.js","OpenLayers/StyleMap.js","OpenLayers/Rule.js","OpenLayers/Format.js","OpenLayers/Format/QueryStringFilter.js","OpenLayers/Format/XML.js","OpenLayers/Format/XML/VersionedOGC.js","OpenLayers/Format/Context.js","OpenLayers/Format/ArcXML.js","OpenLayers/Format/ArcXML/Features.js","OpenLayers/Format/GML.js","OpenLayers/Format/GML/Base.js","OpenLayers/Format/GML/v2.js","OpenLayers/Format/GML/v3.js","OpenLayers/Format/Atom.js","OpenLayers/Format/KML.js","OpenLayers/Format/GeoRSS.js","OpenLayers/Format/WFS.js","OpenLayers/Format/WFSCapabilities.js","OpenLayers/Format/WFSCapabilities/v1.js","OpenLayers/Format/WFSCapabilities/v1_0_0.js","OpenLayers/Format/WFSCapabilities/v1_1_0.js","OpenLayers/Format/WFSDescribeFeatureType.js","OpenLayers/Format/WMSDescribeLayer.js","OpenLayers/Format/WMSDescribeLayer/v1_1.js","OpenLayers/Format/WKT.js","OpenLayers/Format/CQL.js","OpenLayers/Format/OSM.js","OpenLayers/Format/GPX.js","OpenLayers/Format/Filter.js","OpenLayers/Format/Filter/v1.js","OpenLayers/Format/Filter/v1_0_0.js","OpenLayers/Format/Filter/v1_1_0.js","OpenLayers/Format/SLD.js","OpenLayers/Format/SLD/v1.js","OpenLayers/Format/SLD/v1_0_0.js","OpenLayers/Format/OWSCommon.js","OpenLayers/Format/OWSCommon/v1.js","OpenLayers/Format/OWSCommon/v1_0_0.js","OpenLayers/Format/OWSCommon/v1_1_0.js","OpenLayers/Format/CSWGetDomain.js","OpenLayers/Format/CSWGetDomain/v2_0_2.js","OpenLayers/Format/CSWGetRecords.js","OpenLayers/Format/CSWGetRecords/v2_0_2.js","OpenLayers/Format/WFST.js","OpenLayers/Format/WFST/v1.js","OpenLayers/Format/WFST/v1_0_0.js","OpenLayers/Format/WFST/v1_1_0.js","OpenLayers/Format/Text.js","OpenLayers/Format/JSON.js","OpenLayers/Format/GeoJSON.js","OpenLayers/Format/WMC.js","OpenLayers/Format/WMC/v1.js","OpenLayers/Format/WMC/v1_0_0.js","OpenLayers/Format/WMC/v1_1_0.js","OpenLayers/Format/WCSGetCoverage.js","OpenLayers/Format/WMSCapabilities.js","OpenLayers/Format/WMSCapabilities/v1.js","OpenLayers/Format/WMSCapabilities/v1_1.js","OpenLayers/Format/WMSCapabilities/v1_1_0.js","OpenLayers/Format/WMSCapabilities/v1_1_1.js","OpenLayers/Format/WMSCapabilities/v1_3.js","OpenLayers/Format/WMSCapabilities/v1_3_0.js","OpenLayers/Format/WMSCapabilities/v1_1_1_WMSC.js","OpenLayers/Format/WMSGetFeatureInfo.js","OpenLayers/Format/SOSCapabilities.js","OpenLayers/Format/SOSCapabilities/v1_0_0.js","OpenLayers/Format/SOSGetFeatureOfInterest.js","OpenLayers/Format/SOSGetObservation.js","OpenLayers/Format/OWSContext.js","OpenLayers/Format/OWSContext/v0_3_1.js","OpenLayers/Format/WMTSCapabilities.js","OpenLayers/Format/WMTSCapabilities/v1_0_0.js","OpenLayers/Format/WPSCapabilities.js","OpenLayers/Format/WPSCapabilities/v1_0_0.js","OpenLayers/Format/WPSDescribeProcess.js","OpenLayers/Format/WPSExecute.js","OpenLayers/Format/XLS.js","OpenLayers/Format/XLS/v1.js","OpenLayers/Format/XLS/v1_1_0.js","OpenLayers/Format/OGCExceptionReport.js","OpenLayers/Layer/WFS.js","OpenLayers/Control/GetFeature.js","OpenLayers/Control/MouseToolbar.js","OpenLayers/Control/NavToolbar.js","OpenLayers/Control/PanPanel.js","OpenLayers/Control/Pan.js","OpenLayers/Control/ZoomIn.js","OpenLayers/Control/ZoomOut.js","OpenLayers/Control/ZoomPanel.js","OpenLayers/Control/EditingToolbar.js","OpenLayers/Control/Geolocate.js","OpenLayers/Symbolizer.js","OpenLayers/Symbolizer/Point.js","OpenLayers/Symbolizer/Line.js","OpenLayers/Symbolizer/Polygon.js","OpenLayers/Symbolizer/Text.js","OpenLayers/Symbolizer/Raster.js","OpenLayers/Lang.js","OpenLayers/Lang/en.js"];} -var scriptTags=new Array(jsFiles.length);var host=OpenLayers._getScriptLocation()+"lib/";for(var i=0,len=jsFiles.length;i<len;i++){scriptTags[i]="<script src='"+host+jsFiles[i]+"'></script>";} -if(scriptTags.length>0){document.write(scriptTags.join(""));}}})();OpenLayers.VERSION_NUMBER="Release 2.11";OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);} + */ +var OpenLayers={VERSION_NUMBER:"Release 2.12",singleFile:true,_getScriptLocation:(function(){var r=new RegExp("(^|(.*?\\/))(OpenLayers[^\\/]*?\\.js)(\\?|$)"),s=document.getElementsByTagName('script'),src,m,l="";for(var i=0,len=s.length;i<len;i++){src=s[i].getAttribute('src');if(src){m=src.match(r);if(m){l=m[1];break;}}} +return(function(){return l;});})(),ImgPath:''};OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);} return camelizedString;},format:function(template,context,args){if(!context){context=window;} var replacer=function(str,match){var replacement;var subs=match.split(/\.+/);for(var i=0;i<subs.length;i++){if(i==0){replacement=context;} replacement=replacement[subs[i]];} if(typeof replacement=="function"){replacement=args?replacement.apply(null,args):replacement();} -if(typeof replacement=='undefined'){return'undefined';}else{return replacement;}};return template.replace(OpenLayers.String.tokenRegEx,replacer);},tokenRegEx:/\$\{([\w.]+?)\}/g,numberRegEx:/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,isNumeric:function(value){return OpenLayers.String.numberRegEx.test(value);},numericIf:function(value){return OpenLayers.String.isNumeric(value)?parseFloat(value):value;}};if(!String.prototype.startsWith){String.prototype.startsWith=function(sStart){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.startsWith'}));return OpenLayers.String.startsWith(this,sStart);};} -if(!String.prototype.contains){String.prototype.contains=function(str){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.contains'}));return OpenLayers.String.contains(this,str);};} -if(!String.prototype.trim){String.prototype.trim=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.trim'}));return OpenLayers.String.trim(this);};} -if(!String.prototype.camelize){String.prototype.camelize=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.camelize'}));return OpenLayers.String.camelize(this);};} -OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(num,sig){var fig=0;if(sig>0){fig=parseFloat(num.toPrecision(sig));} +if(typeof replacement=='undefined'){return'undefined';}else{return replacement;}};return template.replace(OpenLayers.String.tokenRegEx,replacer);},tokenRegEx:/\$\{([\w.]+?)\}/g,numberRegEx:/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,isNumeric:function(value){return OpenLayers.String.numberRegEx.test(value);},numericIf:function(value){return OpenLayers.String.isNumeric(value)?parseFloat(value):value;}};OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(num,sig){var fig=0;if(sig>0){fig=parseFloat(num.toPrecision(sig));} return fig;},format:function(num,dec,tsep,dsep){dec=(typeof dec!="undefined")?dec:0;tsep=(typeof tsep!="undefined")?tsep:OpenLayers.Number.thousandsSeparator;dsep=(typeof dsep!="undefined")?dsep:OpenLayers.Number.decimalSeparator;if(dec!=null){num=parseFloat(num.toFixed(dec));} var parts=num.toString().split(".");if(parts.length==1&&dec==null){dec=0;} var integer=parts[0];if(tsep){var thousands=/(-?[0-9]+)([0-9]{3})/;while(thousands.test(integer)){integer=integer.replace(thousands,"$1"+tsep+"$2");}} var str;if(dec==0){str=integer;}else{var rem=parts.length>1?parts[1]:"0";if(dec!=null){rem=rem+new Array(dec-rem.length+1).join("0");} str=integer+dsep+rem;} -return str;}};if(!Number.prototype.limitSigDigs){Number.prototype.limitSigDigs=function(sig){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Number.limitSigDigs'}));return OpenLayers.Number.limitSigDigs(this,sig);};} -OpenLayers.Function={bind:function(func,object){var args=Array.prototype.slice.apply(arguments,[2]);return function(){var newArgs=args.concat(Array.prototype.slice.apply(arguments,[0]));return func.apply(object,newArgs);};},bindAsEventListener:function(func,object){return function(event){return func.call(object,event||window.event);};},False:function(){return false;},True:function(){return true;},Void:function(){}};if(!Function.prototype.bind){Function.prototype.bind=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Function.bind'}));Array.prototype.unshift.apply(arguments,[this]);return OpenLayers.Function.bind.apply(null,arguments);};} -if(!Function.prototype.bindAsEventListener){Function.prototype.bindAsEventListener=function(object){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Function.bindAsEventListener'}));return OpenLayers.Function.bindAsEventListener(this,object);};} -OpenLayers.Array={filter:function(array,callback,caller){var selected=[];if(Array.prototype.filter){selected=array.filter(callback,caller);}else{var len=array.length;if(typeof callback!="function"){throw new TypeError();} +return str;}};OpenLayers.Function={bind:function(func,object){var args=Array.prototype.slice.apply(arguments,[2]);return function(){var newArgs=args.concat(Array.prototype.slice.apply(arguments,[0]));return func.apply(object,newArgs);};},bindAsEventListener:function(func,object){return function(event){return func.call(object,event||window.event);};},False:function(){return false;},True:function(){return true;},Void:function(){}};OpenLayers.Array={filter:function(array,callback,caller){var selected=[];if(Array.prototype.filter){selected=array.filter(callback,caller);}else{var len=array.length;if(typeof callback!="function"){throw new TypeError();} for(var i=0;i<len;i++){if(i in array){var val=array[i];if(callback.call(caller,val,i,array)){selected.push(val);}}}} return selected;}};OpenLayers.Class=function(){var len=arguments.length;var P=arguments[0];var F=arguments[len-1];var C=typeof F.initialize=="function"?F.initialize:function(){P.prototype.initialize.apply(this,arguments);};if(len>1){var newArgs=[C,P].concat(Array.prototype.slice.call(arguments).slice(1,len-1),F);OpenLayers.inherit.apply(null,newArgs);}else{C.prototype=F;} -return C;};OpenLayers.Class.isPrototype=function(){};OpenLayers.Class.create=function(){return function(){if(arguments&&arguments[0]!=OpenLayers.Class.isPrototype){this.initialize.apply(this,arguments);}};};OpenLayers.Class.inherit=function(P){var C=function(){P.call(this);};var newArgs=[C].concat(Array.prototype.slice.call(arguments));OpenLayers.inherit.apply(null,newArgs);return C.prototype;};OpenLayers.inherit=function(C,P){var F=function(){};F.prototype=P.prototype;C.prototype=new F;var i,l,o;for(i=2,l=arguments.length;i<l;i++){o=arguments[i];if(typeof o==="function"){o=o.prototype;} +return C;};OpenLayers.inherit=function(C,P){var F=function(){};F.prototype=P.prototype;C.prototype=new F;var i,l,o;for(i=2,l=arguments.length;i<l;i++){o=arguments[i];if(typeof o==="function"){o=o.prototype;} OpenLayers.Util.extend(C.prototype,o);}};OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.extend=function(destination,source){destination=destination||{};if(source){for(var property in source){var value=source[property];if(value!==undefined){destination[property]=value;}} var sourceIsEvt=typeof window.Event=="function"&&source instanceof window.Event;if(!sourceIsEvt&&source.hasOwnProperty&&source.hasOwnProperty("toString")){destination.toString=source.toString;}} -return destination;};OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.getElement=function(){var elements=[];for(var i=0,len=arguments.length;i<len;i++){var element=arguments[i];if(typeof element=='string'){element=document.getElementById(element);} +return destination;};OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(left,bottom,right,top){if(OpenLayers.Util.isArray(left)){top=left[3];right=left[2];bottom=left[1];left=left[0];} +if(left!=null){this.left=OpenLayers.Util.toFloat(left);} +if(bottom!=null){this.bottom=OpenLayers.Util.toFloat(bottom);} +if(right!=null){this.right=OpenLayers.Util.toFloat(right);} +if(top!=null){this.top=OpenLayers.Util.toFloat(top);}},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top);},equals:function(bounds){var equals=false;if(bounds!=null){equals=((this.left==bounds.left)&&(this.right==bounds.right)&&(this.top==bounds.top)&&(this.bottom==bounds.bottom));} +return equals;},toString:function(){return[this.left,this.bottom,this.right,this.top].join(",");},toArray:function(reverseAxisOrder){if(reverseAxisOrder===true){return[this.bottom,this.left,this.top,this.right];}else{return[this.left,this.bottom,this.right,this.top];}},toBBOX:function(decimal,reverseAxisOrder){if(decimal==null){decimal=6;} +var mult=Math.pow(10,decimal);var xmin=Math.round(this.left*mult)/mult;var ymin=Math.round(this.bottom*mult)/mult;var xmax=Math.round(this.right*mult)/mult;var ymax=Math.round(this.top*mult)/mult;if(reverseAxisOrder===true){return ymin+","+xmin+","+ymax+","+xmax;}else{return xmin+","+ymin+","+xmax+","+ymax;}},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])]);},getWidth:function(){return(this.right-this.left);},getHeight:function(){return(this.top-this.bottom);},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight());},getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2);},getCenterLonLat:function(){if(!this.centerLonLat){this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2);} +return this.centerLonLat;},scale:function(ratio,origin){if(origin==null){origin=this.getCenterLonLat();} +var origx,origy;if(origin.CLASS_NAME=="OpenLayers.LonLat"){origx=origin.lon;origy=origin.lat;}else{origx=origin.x;origy=origin.y;} +var left=(this.left-origx)*ratio+origx;var bottom=(this.bottom-origy)*ratio+origy;var right=(this.right-origx)*ratio+origx;var top=(this.top-origy)*ratio+origy;return new OpenLayers.Bounds(left,bottom,right,top);},add:function(x,y){if((x==null)||(y==null)){throw new TypeError('Bounds.add cannot receive null values');} +return new OpenLayers.Bounds(this.left+x,this.bottom+y,this.right+x,this.top+y);},extend:function(object){var bounds=null;if(object){switch(object.CLASS_NAME){case"OpenLayers.LonLat":bounds=new OpenLayers.Bounds(object.lon,object.lat,object.lon,object.lat);break;case"OpenLayers.Geometry.Point":bounds=new OpenLayers.Bounds(object.x,object.y,object.x,object.y);break;case"OpenLayers.Bounds":bounds=object;break;} +if(bounds){this.centerLonLat=null;if((this.left==null)||(bounds.left<this.left)){this.left=bounds.left;} +if((this.bottom==null)||(bounds.bottom<this.bottom)){this.bottom=bounds.bottom;} +if((this.right==null)||(bounds.right>this.right)){this.right=bounds.right;} +if((this.top==null)||(bounds.top>this.top)){this.top=bounds.top;}}}},containsLonLat:function(ll,options){if(typeof options==="boolean"){options={inclusive:options};} +options=options||{};var contains=this.contains(ll.lon,ll.lat,options.inclusive),worldBounds=options.worldBounds;if(worldBounds&&!contains){var worldWidth=worldBounds.getWidth();var worldCenterX=(worldBounds.left+worldBounds.right)/2;var worldsAway=Math.round((ll.lon-worldCenterX)/worldWidth);contains=this.containsLonLat({lon:ll.lon-worldsAway*worldWidth,lat:ll.lat},{inclusive:options.inclusive});} +return contains;},containsPixel:function(px,inclusive){return this.contains(px.x,px.y,inclusive);},contains:function(x,y,inclusive){if(inclusive==null){inclusive=true;} +if(x==null||y==null){return false;} +x=OpenLayers.Util.toFloat(x);y=OpenLayers.Util.toFloat(y);var contains=false;if(inclusive){contains=((x>=this.left)&&(x<=this.right)&&(y>=this.bottom)&&(y<=this.top));}else{contains=((x>this.left)&&(x<this.right)&&(y>this.bottom)&&(y<this.top));} +return contains;},intersectsBounds:function(bounds,options){if(typeof options==="boolean"){options={inclusive:options};} +options=options||{};if(options.worldBounds){var self=this.wrapDateLine(options.worldBounds);bounds=bounds.wrapDateLine(options.worldBounds);}else{self=this;} +if(options.inclusive==null){options.inclusive=true;} +var intersects=false;var mightTouch=(self.left==bounds.right||self.right==bounds.left||self.top==bounds.bottom||self.bottom==bounds.top);if(options.inclusive||!mightTouch){var inBottom=(((bounds.bottom>=self.bottom)&&(bounds.bottom<=self.top))||((self.bottom>=bounds.bottom)&&(self.bottom<=bounds.top)));var inTop=(((bounds.top>=self.bottom)&&(bounds.top<=self.top))||((self.top>bounds.bottom)&&(self.top<bounds.top)));var inLeft=(((bounds.left>=self.left)&&(bounds.left<=self.right))||((self.left>=bounds.left)&&(self.left<=bounds.right)));var inRight=(((bounds.right>=self.left)&&(bounds.right<=self.right))||((self.right>=bounds.left)&&(self.right<=bounds.right)));intersects=((inBottom||inTop)&&(inLeft||inRight));} +if(options.worldBounds&&!intersects){var world=options.worldBounds;var width=world.getWidth();var selfCrosses=!world.containsBounds(self);var boundsCrosses=!world.containsBounds(bounds);if(selfCrosses&&!boundsCrosses){bounds=bounds.add(-width,0);intersects=self.intersectsBounds(bounds,{inclusive:options.inclusive});}else if(boundsCrosses&&!selfCrosses){self=self.add(-width,0);intersects=bounds.intersectsBounds(self,{inclusive:options.inclusive});}} +return intersects;},containsBounds:function(bounds,partial,inclusive){if(partial==null){partial=false;} +if(inclusive==null){inclusive=true;} +var bottomLeft=this.contains(bounds.left,bounds.bottom,inclusive);var bottomRight=this.contains(bounds.right,bounds.bottom,inclusive);var topLeft=this.contains(bounds.left,bounds.top,inclusive);var topRight=this.contains(bounds.right,bounds.top,inclusive);return(partial)?(bottomLeft||bottomRight||topLeft||topRight):(bottomLeft&&bottomRight&&topLeft&&topRight);},determineQuadrant:function(lonlat){var quadrant="";var center=this.getCenterLonLat();quadrant+=(lonlat.lat<center.lat)?"b":"t";quadrant+=(lonlat.lon<center.lon)?"l":"r";return quadrant;},transform:function(source,dest){this.centerLonLat=null;var ll=OpenLayers.Projection.transform({'x':this.left,'y':this.bottom},source,dest);var lr=OpenLayers.Projection.transform({'x':this.right,'y':this.bottom},source,dest);var ul=OpenLayers.Projection.transform({'x':this.left,'y':this.top},source,dest);var ur=OpenLayers.Projection.transform({'x':this.right,'y':this.top},source,dest);this.left=Math.min(ll.x,ul.x);this.bottom=Math.min(ll.y,lr.y);this.right=Math.max(lr.x,ur.x);this.top=Math.max(ul.y,ur.y);return this;},wrapDateLine:function(maxExtent,options){options=options||{};var leftTolerance=options.leftTolerance||0;var rightTolerance=options.rightTolerance||0;var newBounds=this.clone();if(maxExtent){var width=maxExtent.getWidth();while(newBounds.left<maxExtent.left&&newBounds.right-rightTolerance<=maxExtent.left){newBounds=newBounds.add(width,0);} +while(newBounds.left+leftTolerance>=maxExtent.right&&newBounds.right>maxExtent.right){newBounds=newBounds.add(-width,0);} +var newLeft=newBounds.left+leftTolerance;if(newLeft<maxExtent.right&&newLeft>maxExtent.left&&newBounds.right-rightTolerance>maxExtent.right){newBounds=newBounds.add(-width,0);}} +return newBounds;},CLASS_NAME:"OpenLayers.Bounds"});OpenLayers.Bounds.fromString=function(str,reverseAxisOrder){var bounds=str.split(",");return OpenLayers.Bounds.fromArray(bounds,reverseAxisOrder);};OpenLayers.Bounds.fromArray=function(bbox,reverseAxisOrder){return reverseAxisOrder===true?new OpenLayers.Bounds(bbox[1],bbox[0],bbox[3],bbox[2]):new OpenLayers.Bounds(bbox[0],bbox[1],bbox[2],bbox[3]);};OpenLayers.Bounds.fromSize=function(size){return new OpenLayers.Bounds(0,size.h,size.w,0);};OpenLayers.Bounds.oppositeQuadrant=function(quadrant){var opp="";opp+=(quadrant.charAt(0)=='t')?'b':'t';opp+=(quadrant.charAt(1)=='l')?'r':'l';return opp;};OpenLayers.Element={visible:function(element){return OpenLayers.Util.getElement(element).style.display!='none';},toggle:function(){for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);var display=OpenLayers.Element.visible(element)?'none':'';element.style.display=display;}},remove:function(element){element=OpenLayers.Util.getElement(element);element.parentNode.removeChild(element);},getHeight:function(element){element=OpenLayers.Util.getElement(element);return element.offsetHeight;},hasClass:function(element,name){var names=element.className;return(!!names&&new RegExp("(^|\\s)"+name+"(\\s|$)").test(names));},addClass:function(element,name){if(!OpenLayers.Element.hasClass(element,name)){element.className+=(element.className?" ":"")+name;} +return element;},removeClass:function(element,name){var names=element.className;if(names){element.className=OpenLayers.String.trim(names.replace(new RegExp("(^|\\s+)"+name+"(\\s+|$)")," "));} +return element;},toggleClass:function(element,name){if(OpenLayers.Element.hasClass(element,name)){OpenLayers.Element.removeClass(element,name);}else{OpenLayers.Element.addClass(element,name);} +return element;},getStyle:function(element,style){element=OpenLayers.Util.getElement(element);var value=null;if(element&&element.style){value=element.style[OpenLayers.String.camelize(style)];if(!value){if(document.defaultView&&document.defaultView.getComputedStyle){var css=document.defaultView.getComputedStyle(element,null);value=css?css.getPropertyValue(style):null;}else if(element.currentStyle){value=element.currentStyle[OpenLayers.String.camelize(style)];}} +var positions=['left','top','right','bottom'];if(window.opera&&(OpenLayers.Util.indexOf(positions,style)!=-1)&&(OpenLayers.Element.getStyle(element,'position')=='static')){value='auto';}} +return value=='auto'?null:value;}};OpenLayers.LonLat=OpenLayers.Class({lon:0.0,lat:0.0,initialize:function(lon,lat){if(OpenLayers.Util.isArray(lon)){lat=lon[1];lon=lon[0];} +this.lon=OpenLayers.Util.toFloat(lon);this.lat=OpenLayers.Util.toFloat(lat);},toString:function(){return("lon="+this.lon+",lat="+this.lat);},toShortString:function(){return(this.lon+", "+this.lat);},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat);},add:function(lon,lat){if((lon==null)||(lat==null)){throw new TypeError('LonLat.add cannot receive null values');} +return new OpenLayers.LonLat(this.lon+OpenLayers.Util.toFloat(lon),this.lat+OpenLayers.Util.toFloat(lat));},equals:function(ll){var equals=false;if(ll!=null){equals=((this.lon==ll.lon&&this.lat==ll.lat)||(isNaN(this.lon)&&isNaN(this.lat)&&isNaN(ll.lon)&&isNaN(ll.lat)));} +return equals;},transform:function(source,dest){var point=OpenLayers.Projection.transform({'x':this.lon,'y':this.lat},source,dest);this.lon=point.x;this.lat=point.y;return this;},wrapDateLine:function(maxExtent){var newLonLat=this.clone();if(maxExtent){while(newLonLat.lon<maxExtent.left){newLonLat.lon+=maxExtent.getWidth();} +while(newLonLat.lon>maxExtent.right){newLonLat.lon-=maxExtent.getWidth();}} +return newLonLat;},CLASS_NAME:"OpenLayers.LonLat"});OpenLayers.LonLat.fromString=function(str){var pair=str.split(",");return new OpenLayers.LonLat(pair[0],pair[1]);};OpenLayers.LonLat.fromArray=function(arr){var gotArr=OpenLayers.Util.isArray(arr),lon=gotArr&&arr[0],lat=gotArr&&arr[1];return new OpenLayers.LonLat(lon,lat);};OpenLayers.Pixel=OpenLayers.Class({x:0.0,y:0.0,initialize:function(x,y){this.x=parseFloat(x);this.y=parseFloat(y);},toString:function(){return("x="+this.x+",y="+this.y);},clone:function(){return new OpenLayers.Pixel(this.x,this.y);},equals:function(px){var equals=false;if(px!=null){equals=((this.x==px.x&&this.y==px.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(px.x)&&isNaN(px.y)));} +return equals;},distanceTo:function(px){return Math.sqrt(Math.pow(this.x-px.x,2)+ +Math.pow(this.y-px.y,2));},add:function(x,y){if((x==null)||(y==null)){throw new TypeError('Pixel.add cannot receive null values');} +return new OpenLayers.Pixel(this.x+x,this.y+y);},offset:function(px){var newPx=this.clone();if(px){newPx=this.add(px.x,px.y);} +return newPx;},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0.0,h:0.0,initialize:function(w,h){this.w=parseFloat(w);this.h=parseFloat(h);},toString:function(){return("w="+this.w+",h="+this.h);},clone:function(){return new OpenLayers.Size(this.w,this.h);},equals:function(sz){var equals=false;if(sz!=null){equals=((this.w==sz.w&&this.h==sz.h)||(isNaN(this.w)&&isNaN(this.h)&&isNaN(sz.w)&&isNaN(sz.h)));} +return equals;},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(error){alert(error);},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"};(function(){var scripts=document.getElementsByTagName("script");for(var i=0,len=scripts.length;i<len;++i){if(scripts[i].src.indexOf("firebug.js")!=-1){if(console){OpenLayers.Util.extend(OpenLayers.Console,console);break;}}}})();OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){if(!OpenLayers.Lang.code){OpenLayers.Lang.setCode();} +return OpenLayers.Lang.code;},setCode:function(code){var lang;if(!code){code=(OpenLayers.BROWSER_NAME=="msie")?navigator.userLanguage:navigator.language;} +var parts=code.split('-');parts[0]=parts[0].toLowerCase();if(typeof OpenLayers.Lang[parts[0]]=="object"){lang=parts[0];} +if(parts[1]){var testLang=parts[0]+'-'+parts[1].toUpperCase();if(typeof OpenLayers.Lang[testLang]=="object"){lang=testLang;}} +if(!lang){OpenLayers.Console.warn('Failed to find OpenLayers.Lang.'+parts.join("-")+' dictionary, falling back to default language');lang=OpenLayers.Lang.defaultCode;} +OpenLayers.Lang.code=lang;},translate:function(key,context){var dictionary=OpenLayers.Lang[OpenLayers.Lang.getCode()];var message=dictionary&&dictionary[key];if(!message){message=key;} +if(context){message=OpenLayers.String.format(message,context);} +return message;}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.getElement=function(){var elements=[];for(var i=0,len=arguments.length;i<len;i++){var element=arguments[i];if(typeof element=='string'){element=document.getElementById(element);} if(arguments.length==1){return element;} elements.push(element);} return elements;};OpenLayers.Util.isElement=function(o){return!!(o&&o.nodeType===1);};OpenLayers.Util.isArray=function(a){return(Object.prototype.toString.call(a)==='[object Array]');};if(typeof window.$==="undefined"){window.$=OpenLayers.Util.getElement;} OpenLayers.Util.removeItem=function(array,item){for(var i=array.length-1;i>=0;i--){if(array[i]==item){array.splice(i,1);}} -return array;};OpenLayers.Util.clearArray=function(array){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'array = []'}));array.length=0;};OpenLayers.Util.indexOf=function(array,obj){if(typeof array.indexOf=="function"){return array.indexOf(obj);}else{for(var i=0,len=array.length;i<len;i++){if(array[i]==obj){return i;}} +return array;};OpenLayers.Util.indexOf=function(array,obj){if(typeof array.indexOf=="function"){return array.indexOf(obj);}else{for(var i=0,len=array.length;i<len;i++){if(array[i]==obj){return i;}} return-1;}};OpenLayers.Util.modifyDOMElement=function(element,id,px,sz,position,border,overflow,opacity){if(id){element.id=id;} if(px){element.style.left=px.x+"px";element.style.top=px.y+"px";} if(sz){element.style.width=sz.w+"px";element.style.height=sz.h+"px";} @@ -167,20 +141,16 @@ if(!id){id=OpenLayers.Util.createUniqueID("OpenLayersDiv");} if(!position){position="absolute";} OpenLayers.Util.modifyDOMElement(dom,id,px,sz,position,border,overflow,opacity);return dom;};OpenLayers.Util.createImage=function(id,px,sz,imgURL,position,border,opacity,delayDisplay){var image=document.createElement("img");if(!id){id=OpenLayers.Util.createUniqueID("OpenLayersDiv");} if(!position){position="relative";} -OpenLayers.Util.modifyDOMElement(image,id,px,sz,position,border,null,opacity);if(delayDisplay){image.style.display="none";OpenLayers.Event.observe(image,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,image));OpenLayers.Event.observe(image,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,image));} +OpenLayers.Util.modifyDOMElement(image,id,px,sz,position,border,null,opacity);if(delayDisplay){image.style.display="none";function display(){image.style.display="";OpenLayers.Event.stopObservingElement(image);} +OpenLayers.Event.observe(image,"load",display);OpenLayers.Event.observe(image,"error",display);} image.style.alt=id;image.galleryImg="no";if(imgURL){image.src=imgURL;} -return image;};OpenLayers.Util.setOpacity=function(element,opacity){OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);};OpenLayers.Util.onImageLoad=function(){if(!this.viewRequestID||(this.map&&this.viewRequestID==this.map.viewRequestID)){this.style.display="";} -OpenLayers.Element.removeClass(this,"olImageLoadError");};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;OpenLayers.Util.onImageLoadError=function(){this._attempts=(this._attempts)?(this._attempts+1):1;if(this._attempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS){var urls=this.urls;if(urls&&OpenLayers.Util.isArray(urls)&&urls.length>1){var src=this.src.toString();var current_url,k;for(k=0;current_url=urls[k];k++){if(src.indexOf(current_url)!=-1){break;}} -var guess=Math.floor(urls.length*Math.random());var new_url=urls[guess];k=0;while(new_url==current_url&&k++<4){guess=Math.floor(urls.length*Math.random());new_url=urls[guess];} -this.src=src.replace(current_url,new_url);}else{this.src=this.src;}}else{OpenLayers.Element.addClass(this,"olImageLoadError");} -this.style.display="";};OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(OpenLayers.Util.alphaHackNeeded==null){var arVersion=navigator.appVersion.split("MSIE");var version=parseFloat(arVersion[1]);var filter=false;try{filter=!!(document.body.filters);}catch(e){} +return image;};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(OpenLayers.Util.alphaHackNeeded==null){var arVersion=navigator.appVersion.split("MSIE");var version=parseFloat(arVersion[1]);var filter=false;try{filter=!!(document.body.filters);}catch(e){} OpenLayers.Util.alphaHackNeeded=(filter&&(version>=5.5)&&(version<7));} return OpenLayers.Util.alphaHackNeeded;};OpenLayers.Util.modifyAlphaImageDiv=function(div,id,px,sz,imgURL,position,border,sizing,opacity){OpenLayers.Util.modifyDOMElement(div,id,px,sz,position,null,null,opacity);var img=div.childNodes[0];if(imgURL){img.src=imgURL;} OpenLayers.Util.modifyDOMElement(img,div.id+"_innerImage",null,sz,"relative",border);if(OpenLayers.Util.alphaHack()){if(div.style.display!="none"){div.style.display="inline-block";} if(sizing==null){sizing="scale";} div.style.filter="progid:DXImageTransform.Microsoft"+".AlphaImageLoader(src='"+img.src+"', "+"sizingMethod='"+sizing+"')";if(parseFloat(div.style.opacity)>=0.0&&parseFloat(div.style.opacity)<1.0){div.style.filter+=" alpha(opacity="+div.style.opacity*100+")";} -img.style.filter="alpha(opacity=0)";}};OpenLayers.Util.createAlphaImageDiv=function(id,px,sz,imgURL,position,border,sizing,opacity,delayDisplay){var div=OpenLayers.Util.createDiv();var img=OpenLayers.Util.createImage(null,null,null,null,null,null,null,false);div.appendChild(img);if(delayDisplay){img.style.display="none";OpenLayers.Event.observe(img,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,div));OpenLayers.Event.observe(img,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,div));} -OpenLayers.Util.modifyAlphaImageDiv(div,id,px,sz,imgURL,position,border,sizing,opacity);return div;};OpenLayers.Util.upperCaseObject=function(object){var uObject={};for(var key in object){uObject[key.toUpperCase()]=object[key];} +img.style.filter="alpha(opacity=0)";}};OpenLayers.Util.createAlphaImageDiv=function(id,px,sz,imgURL,position,border,sizing,opacity,delayDisplay){var div=OpenLayers.Util.createDiv();var img=OpenLayers.Util.createImage(null,null,null,null,null,null,null,delayDisplay);img.className="olAlphaImg";div.appendChild(img);OpenLayers.Util.modifyAlphaImageDiv(div,id,px,sz,imgURL,position,border,sizing,opacity);return div;};OpenLayers.Util.upperCaseObject=function(object){var uObject={};for(var key in object){uObject[key.toUpperCase()]=object[key];} return uObject;};OpenLayers.Util.applyDefaults=function(to,from){to=to||{};var fromIsEvt=typeof window.Event=="function"&&from instanceof window.Event;for(var key in from){if(to[key]===undefined||(!fromIsEvt&&from.hasOwnProperty&&from.hasOwnProperty(key)&&!to.hasOwnProperty(key))){to[key]=from[key];}} if(!fromIsEvt&&from&&from.hasOwnProperty&&from.hasOwnProperty('toString')&&!to.hasOwnProperty('toString')){to.toString=from.toString;} return to;};OpenLayers.Util.getParameterString=function(params){var paramsArray=[];for(var key in params){var value=params[key];if((value!=null)&&(typeof value!='function')){var encodedValue;if(typeof value=='object'&&value.constructor==Array){var encodedItemArray=[];var item;for(var itemIndex=0,len=value.length;itemIndex<len;itemIndex++){item=value[itemIndex];encodedItemArray.push(encodeURIComponent((item===null||item===undefined)?"":item));} @@ -188,7 +158,7 @@ encodedValue=encodedItemArray.join(",");} else{encodedValue=encodeURIComponent(value);} paramsArray.push(encodeURIComponent(key)+"="+encodedValue);}} return paramsArray.join("&");};OpenLayers.Util.urlAppend=function(url,paramStr){var newUrl=url;if(paramStr){var parts=(url+" ").split(/[?&]/);newUrl+=(parts.pop()===" "?paramStr:parts.length?"&"+paramStr:"?"+paramStr);} -return newUrl;};OpenLayers.ImgPath='';OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||(OpenLayers._getScriptLocation()+"img/");};OpenLayers.Util.getImageLocation=function(image){return OpenLayers.Util.getImagesLocation()+image;};OpenLayers.Util.Try=function(){var returnValue=null;for(var i=0,len=arguments.length;i<len;i++){var lambda=arguments[i];try{returnValue=lambda();break;}catch(e){}} +return newUrl;};OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||(OpenLayers._getScriptLocation()+"img/");};OpenLayers.Util.getImageLocation=function(image){return OpenLayers.Util.getImagesLocation()+image;};OpenLayers.Util.Try=function(){var returnValue=null;for(var i=0,len=arguments.length;i<len;i++){var lambda=arguments[i];try{returnValue=lambda();break;}catch(e){}} return returnValue;};OpenLayers.Util.getXmlNodeValue=function(node){var val=null;OpenLayers.Util.Try(function(){val=node.text;if(!val){val=node.textContent;} if(!val){val=node.firstChild.nodeValue;}},function(){val=node.textContent;});return val;};OpenLayers.Util.mouseLeft=function(evt,div){var target=(evt.relatedTarget)?evt.relatedTarget:evt.toElement;while(target!=div&&target!=null){target=target.parentNode;} return(target!=div);};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(number,precision){if(precision==null){precision=OpenLayers.Util.DEFAULT_PRECISION;} @@ -205,11 +175,11 @@ var parameters={};var pairs=paramsString.split(/[&;]/);for(var i=0,len=pairs.len var value=(keyValue[1]||'').replace(/\+/g," ");try{value=decodeURIComponent(value);}catch(err){value=unescape(value);} value=value.split(",");if(value.length==1){value=value[0];} parameters[key]=value;}} -return parameters;};OpenLayers.Util.getArgs=function(url){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Util.getParameters'}));return OpenLayers.Util.getParameters(url);};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(prefix){if(prefix==null){prefix="id_";} +return parameters;};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(prefix){if(prefix==null){prefix="id_";} OpenLayers.Util.lastSeqID+=1;return prefix+OpenLayers.Util.lastSeqID;};OpenLayers.INCHES_PER_UNIT={'inches':1.0,'ft':12.0,'mi':63360.0,'m':39.3701,'km':39370.1,'dd':4374754,'yd':36};OpenLayers.INCHES_PER_UNIT["in"]=OpenLayers.INCHES_PER_UNIT.inches;OpenLayers.INCHES_PER_UNIT["degrees"]=OpenLayers.INCHES_PER_UNIT.dd;OpenLayers.INCHES_PER_UNIT["nmi"]=1852*OpenLayers.INCHES_PER_UNIT.m;OpenLayers.METERS_PER_INCH=0.02540005080010160020;OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{"Inch":OpenLayers.INCHES_PER_UNIT.inches,"Meter":1.0/OpenLayers.METERS_PER_INCH,"Foot":0.30480060960121920243/OpenLayers.METERS_PER_INCH,"IFoot":0.30480000000000000000/OpenLayers.METERS_PER_INCH,"ClarkeFoot":0.3047972651151/OpenLayers.METERS_PER_INCH,"SearsFoot":0.30479947153867624624/OpenLayers.METERS_PER_INCH,"GoldCoastFoot":0.30479971018150881758/OpenLayers.METERS_PER_INCH,"IInch":0.02540000000000000000/OpenLayers.METERS_PER_INCH,"MicroInch":0.00002540000000000000/OpenLayers.METERS_PER_INCH,"Mil":0.00000002540000000000/OpenLayers.METERS_PER_INCH,"Centimeter":0.01000000000000000000/OpenLayers.METERS_PER_INCH,"Kilometer":1000.00000000000000000000/OpenLayers.METERS_PER_INCH,"Yard":0.91440182880365760731/OpenLayers.METERS_PER_INCH,"SearsYard":0.914398414616029/OpenLayers.METERS_PER_INCH,"IndianYard":0.91439853074444079983/OpenLayers.METERS_PER_INCH,"IndianYd37":0.91439523/OpenLayers.METERS_PER_INCH,"IndianYd62":0.9143988/OpenLayers.METERS_PER_INCH,"IndianYd75":0.9143985/OpenLayers.METERS_PER_INCH,"IndianFoot":0.30479951/OpenLayers.METERS_PER_INCH,"IndianFt37":0.30479841/OpenLayers.METERS_PER_INCH,"IndianFt62":0.3047996/OpenLayers.METERS_PER_INCH,"IndianFt75":0.3047995/OpenLayers.METERS_PER_INCH,"Mile":1609.34721869443738887477/OpenLayers.METERS_PER_INCH,"IYard":0.91440000000000000000/OpenLayers.METERS_PER_INCH,"IMile":1609.34400000000000000000/OpenLayers.METERS_PER_INCH,"NautM":1852.00000000000000000000/OpenLayers.METERS_PER_INCH,"Lat-66":110943.316488932731/OpenLayers.METERS_PER_INCH,"Lat-83":110946.25736872234125/OpenLayers.METERS_PER_INCH,"Decimeter":0.10000000000000000000/OpenLayers.METERS_PER_INCH,"Millimeter":0.00100000000000000000/OpenLayers.METERS_PER_INCH,"Dekameter":10.00000000000000000000/OpenLayers.METERS_PER_INCH,"Decameter":10.00000000000000000000/OpenLayers.METERS_PER_INCH,"Hectometer":100.00000000000000000000/OpenLayers.METERS_PER_INCH,"GermanMeter":1.0000135965/OpenLayers.METERS_PER_INCH,"CaGrid":0.999738/OpenLayers.METERS_PER_INCH,"ClarkeChain":20.1166194976/OpenLayers.METERS_PER_INCH,"GunterChain":20.11684023368047/OpenLayers.METERS_PER_INCH,"BenoitChain":20.116782494375872/OpenLayers.METERS_PER_INCH,"SearsChain":20.11676512155/OpenLayers.METERS_PER_INCH,"ClarkeLink":0.201166194976/OpenLayers.METERS_PER_INCH,"GunterLink":0.2011684023368047/OpenLayers.METERS_PER_INCH,"BenoitLink":0.20116782494375872/OpenLayers.METERS_PER_INCH,"SearsLink":0.2011676512155/OpenLayers.METERS_PER_INCH,"Rod":5.02921005842012/OpenLayers.METERS_PER_INCH,"IntnlChain":20.1168/OpenLayers.METERS_PER_INCH,"IntnlLink":0.201168/OpenLayers.METERS_PER_INCH,"Perch":5.02921005842012/OpenLayers.METERS_PER_INCH,"Pole":5.02921005842012/OpenLayers.METERS_PER_INCH,"Furlong":201.1684023368046/OpenLayers.METERS_PER_INCH,"Rood":3.778266898/OpenLayers.METERS_PER_INCH,"CapeFoot":0.3047972615/OpenLayers.METERS_PER_INCH,"Brealey":375.00000000000000000000/OpenLayers.METERS_PER_INCH,"ModAmFt":0.304812252984505969011938/OpenLayers.METERS_PER_INCH,"Fathom":1.8288/OpenLayers.METERS_PER_INCH,"NautM-UK":1853.184/OpenLayers.METERS_PER_INCH,"50kilometers":50000.0/OpenLayers.METERS_PER_INCH,"150kilometers":150000.0/OpenLayers.METERS_PER_INCH});OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{"mm":OpenLayers.INCHES_PER_UNIT["Meter"]/1000.0,"cm":OpenLayers.INCHES_PER_UNIT["Meter"]/100.0,"dm":OpenLayers.INCHES_PER_UNIT["Meter"]*100.0,"km":OpenLayers.INCHES_PER_UNIT["Meter"]*1000.0,"kmi":OpenLayers.INCHES_PER_UNIT["nmi"],"fath":OpenLayers.INCHES_PER_UNIT["Fathom"],"ch":OpenLayers.INCHES_PER_UNIT["IntnlChain"],"link":OpenLayers.INCHES_PER_UNIT["IntnlLink"],"us-in":OpenLayers.INCHES_PER_UNIT["inches"],"us-ft":OpenLayers.INCHES_PER_UNIT["Foot"],"us-yd":OpenLayers.INCHES_PER_UNIT["Yard"],"us-ch":OpenLayers.INCHES_PER_UNIT["GunterChain"],"us-mi":OpenLayers.INCHES_PER_UNIT["Mile"],"ind-yd":OpenLayers.INCHES_PER_UNIT["IndianYd37"],"ind-ft":OpenLayers.INCHES_PER_UNIT["IndianFt37"],"ind-ch":20.11669506/OpenLayers.METERS_PER_INCH});OpenLayers.DOTS_PER_INCH=72;OpenLayers.Util.normalizeScale=function(scale){var normScale=(scale>1.0)?(1.0/scale):scale;return normScale;};OpenLayers.Util.getResolutionFromScale=function(scale,units){var resolution;if(scale){if(units==null){units="degrees";} var normScale=OpenLayers.Util.normalizeScale(scale);resolution=1/(normScale*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH);} return resolution;};OpenLayers.Util.getScaleFromResolution=function(resolution,units){if(units==null){units="degrees";} -var scale=resolution*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH;return scale;};OpenLayers.Util.safeStopPropagation=function(evt){OpenLayers.Event.stop(evt,true);};OpenLayers.Util.pagePosition=function(forElement){var pos=[0,0];var viewportElement=OpenLayers.Util.getViewportElement();if(!forElement||forElement==window||forElement==viewportElement){return pos;} +var scale=resolution*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH;return scale;};OpenLayers.Util.pagePosition=function(forElement){var pos=[0,0];var viewportElement=OpenLayers.Util.getViewportElement();if(!forElement||forElement==window||forElement==viewportElement){return pos;} var BUGGY_GECKO_BOX_OBJECT=OpenLayers.IS_GECKO&&document.getBoxObjectFor&&OpenLayers.Element.getStyle(forElement,'position')=='absolute'&&(forElement.style.top==''||forElement.style.left=='');var parent=null;var box;if(forElement.getBoundingClientRect){box=forElement.getBoundingClientRect();var scrollTop=viewportElement.scrollTop;var scrollLeft=viewportElement.scrollLeft;pos[0]=box.left+scrollLeft;pos[1]=box.top+scrollTop;}else if(document.getBoxObjectFor&&!BUGGY_GECKO_BOX_OBJECT){box=document.getBoxObjectFor(forElement);var vpBox=document.getBoxObjectFor(viewportElement);pos[0]=box.screenX-vpBox.screenX;pos[1]=box.screenY-vpBox.screenY;}else{pos[0]=forElement.offsetLeft;pos[1]=forElement.offsetTop;parent=forElement.offsetParent;if(parent!=forElement){while(parent){pos[0]+=parent.offsetLeft;pos[1]+=parent.offsetTop;parent=parent.offsetParent;}} var browser=OpenLayers.BROWSER_NAME;if(browser=="opera"||(browser=="safari"&&OpenLayers.Element.getStyle(forElement,'position')=='absolute')){pos[1]-=document.body.offsetTop;} parent=forElement.offsetParent;while(parent&&parent!=document.body){pos[0]-=parent.scrollLeft;if(browser!="opera"||parent.tagName!='TR'){pos[1]-=parent.scrollTop;} @@ -224,16 +194,18 @@ if(options.ignoreCase){url=url.toLowerCase();} var a=document.createElement('a');a.href=url;var urlObject={};urlObject.host=a.host.split(":").shift();urlObject.protocol=a.protocol;if(options.ignorePort80){urlObject.port=(a.port=="80"||a.port=="0")?"":a.port;}else{urlObject.port=(a.port==""||a.port=="0")?"80":a.port;} urlObject.hash=(options.ignoreHash||a.hash==="#")?"":a.hash;var queryString=a.search;if(!queryString){var qMark=url.indexOf("?");queryString=(qMark!=-1)?url.substr(qMark):"";} urlObject.args=OpenLayers.Util.getParameters(queryString);urlObject.pathname=(a.pathname.charAt(0)=="/")?a.pathname:"/"+a.pathname;return urlObject;};OpenLayers.Util.removeTail=function(url){var head=null;var qMark=url.indexOf("?");var hashMark=url.indexOf("#");if(qMark==-1){head=(hashMark!=-1)?url.substr(0,hashMark):url;}else{head=(hashMark!=-1)?url.substr(0,Math.min(qMark,hashMark)):url.substr(0,qMark);} -return head;};OpenLayers.IS_GECKO=(function(){var ua=navigator.userAgent.toLowerCase();return ua.indexOf("webkit")==-1&&ua.indexOf("gecko")!=-1;})();OpenLayers.BROWSER_NAME=(function(){var name="";var ua=navigator.userAgent.toLowerCase();if(ua.indexOf("opera")!=-1){name="opera";}else if(ua.indexOf("msie")!=-1){name="msie";}else if(ua.indexOf("safari")!=-1){name="safari";}else if(ua.indexOf("mozilla")!=-1){if(ua.indexOf("firefox")!=-1){name="firefox";}else{name="mozilla";}} -return name;})();OpenLayers.Util.getBrowserName=function(){return OpenLayers.BROWSER_NAME;};OpenLayers.Util.getRenderedDimensions=function(contentHTML,size,options){var w,h;var container=document.createElement("div");container.style.visibility="hidden";var containerElement=(options&&options.containerElement)?options.containerElement:document.body;if(size){if(size.w){w=size.w;container.style.width=w+"px";}else if(size.h){h=size.h;container.style.height=h+"px";}} +return head;};OpenLayers.IS_GECKO=(function(){var ua=navigator.userAgent.toLowerCase();return ua.indexOf("webkit")==-1&&ua.indexOf("gecko")!=-1;})();OpenLayers.CANVAS_SUPPORTED=(function(){var elem=document.createElement('canvas');return!!(elem.getContext&&elem.getContext('2d'));})();OpenLayers.BROWSER_NAME=(function(){var name="";var ua=navigator.userAgent.toLowerCase();if(ua.indexOf("opera")!=-1){name="opera";}else if(ua.indexOf("msie")!=-1){name="msie";}else if(ua.indexOf("safari")!=-1){name="safari";}else if(ua.indexOf("mozilla")!=-1){if(ua.indexOf("firefox")!=-1){name="firefox";}else{name="mozilla";}} +return name;})();OpenLayers.Util.getBrowserName=function(){return OpenLayers.BROWSER_NAME;};OpenLayers.Util.getRenderedDimensions=function(contentHTML,size,options){var w,h;var container=document.createElement("div");container.style.visibility="hidden";var containerElement=(options&&options.containerElement)?options.containerElement:document.body;var parentHasPositionAbsolute=false;var superContainer=null;var parent=containerElement;while(parent&&parent.tagName.toLowerCase()!="body"){var parentPosition=OpenLayers.Element.getStyle(parent,"position");if(parentPosition=="absolute"){parentHasPositionAbsolute=true;break;}else if(parentPosition&&parentPosition!="static"){break;} +parent=parent.parentNode;} +if(parentHasPositionAbsolute&&(containerElement.clientHeight===0||containerElement.clientWidth===0)){superContainer=document.createElement("div");superContainer.style.visibility="hidden";superContainer.style.position="absolute";superContainer.style.overflow="visible";superContainer.style.width=document.body.clientWidth+"px";superContainer.style.height=document.body.clientHeight+"px";superContainer.appendChild(container);} +container.style.position="absolute";if(size){if(size.w){w=size.w;container.style.width=w+"px";}else if(size.h){h=size.h;container.style.height=h+"px";}} if(options&&options.displayClass){container.className=options.displayClass;} var content=document.createElement("div");content.innerHTML=contentHTML;content.style.overflow="visible";if(content.childNodes){for(var i=0,l=content.childNodes.length;i<l;i++){if(!content.childNodes[i].style)continue;content.childNodes[i].style.overflow="visible";}} -container.appendChild(content);containerElement.appendChild(container);var parentHasPositionAbsolute=false;var parent=container.parentNode;while(parent&&parent.tagName.toLowerCase()!="body"){var parentPosition=OpenLayers.Element.getStyle(parent,"position");if(parentPosition=="absolute"){parentHasPositionAbsolute=true;break;}else if(parentPosition&&parentPosition!="static"){break;} -parent=parent.parentNode;} -if(!parentHasPositionAbsolute){container.style.position="absolute";} +container.appendChild(content);if(superContainer){containerElement.appendChild(superContainer);}else{containerElement.appendChild(container);} if(!w){w=parseInt(content.scrollWidth);container.style.width=w+"px";} if(!h){h=parseInt(content.scrollHeight);} -container.removeChild(content);containerElement.removeChild(container);return new OpenLayers.Size(w,h);};OpenLayers.Util.getScrollbarWidth=function(){var scrollbarWidth=OpenLayers.Util._scrollbarWidth;if(scrollbarWidth==null){var scr=null;var inn=null;var wNoScroll=0;var wScroll=0;scr=document.createElement('div');scr.style.position='absolute';scr.style.top='-1000px';scr.style.left='-1000px';scr.style.width='100px';scr.style.height='50px';scr.style.overflow='hidden';inn=document.createElement('div');inn.style.width='100%';inn.style.height='200px';scr.appendChild(inn);document.body.appendChild(scr);wNoScroll=inn.offsetWidth;scr.style.overflow='scroll';wScroll=inn.offsetWidth;document.body.removeChild(document.body.lastChild);OpenLayers.Util._scrollbarWidth=(wNoScroll-wScroll);scrollbarWidth=OpenLayers.Util._scrollbarWidth;} +container.removeChild(content);if(superContainer){superContainer.removeChild(container);containerElement.removeChild(superContainer);}else{containerElement.removeChild(container);} +return new OpenLayers.Size(w,h);};OpenLayers.Util.getScrollbarWidth=function(){var scrollbarWidth=OpenLayers.Util._scrollbarWidth;if(scrollbarWidth==null){var scr=null;var inn=null;var wNoScroll=0;var wScroll=0;scr=document.createElement('div');scr.style.position='absolute';scr.style.top='-1000px';scr.style.left='-1000px';scr.style.width='100px';scr.style.height='50px';scr.style.overflow='hidden';inn=document.createElement('div');inn.style.width='100%';inn.style.height='200px';scr.appendChild(inn);document.body.appendChild(scr);wNoScroll=inn.offsetWidth;scr.style.overflow='scroll';wScroll=inn.offsetWidth;document.body.removeChild(document.body.lastChild);OpenLayers.Util._scrollbarWidth=(wNoScroll-wScroll);scrollbarWidth=OpenLayers.Util._scrollbarWidth;} return scrollbarWidth;};OpenLayers.Util.getFormattedLonLat=function(coordinate,axis,dmsOption){if(!dmsOption){dmsOption='dms';} coordinate=(coordinate+540)%360-180;var abscoordinate=Math.abs(coordinate);var coordinatedegrees=Math.floor(abscoordinate);var coordinateminutes=(abscoordinate-coordinatedegrees)/(1/60);var tempcoordinateminutes=coordinateminutes;coordinateminutes=Math.floor(coordinateminutes);var coordinateseconds=(tempcoordinateminutes-coordinateminutes)/(1/60);coordinateseconds=Math.round(coordinateseconds*10);coordinateseconds/=10;if(coordinateseconds>=60){coordinateseconds-=60;coordinateminutes+=1;if(coordinateminutes>=60){coordinateminutes-=60;coordinatedegrees+=1;}} if(coordinatedegrees<10){coordinatedegrees="0"+coordinatedegrees;} @@ -241,122 +213,83 @@ var str=coordinatedegrees+"\u00B0";if(dmsOption.indexOf('dm')>=0){if(coordinatem str+=coordinateminutes+"'";if(dmsOption.indexOf('dms')>=0){if(coordinateseconds<10){coordinateseconds="0"+coordinateseconds;} str+=coordinateseconds+'"';}} if(axis=="lon"){str+=coordinate<0?OpenLayers.i18n("W"):OpenLayers.i18n("E");}else{str+=coordinate<0?OpenLayers.i18n("S"):OpenLayers.i18n("N");} -return str;};OpenLayers.Rico=OpenLayers.Rico||{};OpenLayers.Rico.Corner={round:function(e,options){e=OpenLayers.Util.getElement(e);this._setOptions(options);var color=this.options.color;if(this.options.color=="fromElement"){color=this._background(e);} -var bgColor=this.options.bgColor;if(this.options.bgColor=="fromParent"){bgColor=this._background(e.offsetParent);} -this._roundCornersImpl(e,color,bgColor);},changeColor:function(theDiv,newColor){theDiv.style.backgroundColor=newColor;var spanElements=theDiv.parentNode.getElementsByTagName("span");for(var currIdx=0;currIdx<spanElements.length;currIdx++){spanElements[currIdx].style.backgroundColor=newColor;}},changeOpacity:function(theDiv,newOpacity){var mozillaOpacity=newOpacity;var ieOpacity='alpha(opacity='+newOpacity*100+')';theDiv.style.opacity=mozillaOpacity;theDiv.style.filter=ieOpacity;var spanElements=theDiv.parentNode.getElementsByTagName("span");for(var currIdx=0;currIdx<spanElements.length;currIdx++){spanElements[currIdx].style.opacity=mozillaOpacity;spanElements[currIdx].style.filter=ieOpacity;}},reRound:function(theDiv,options){var topRico=theDiv.parentNode.childNodes[0];var bottomRico=theDiv.parentNode.childNodes[2];theDiv.parentNode.removeChild(topRico);theDiv.parentNode.removeChild(bottomRico);this.round(theDiv.parentNode,options);},_roundCornersImpl:function(e,color,bgColor){if(this.options.border){this._renderBorder(e,bgColor);} -if(this._isTopRounded()){this._roundTopCorners(e,color,bgColor);} -if(this._isBottomRounded()){this._roundBottomCorners(e,color,bgColor);}},_renderBorder:function(el,bgColor){var borderValue="1px solid "+this._borderColor(bgColor);var borderL="border-left: "+borderValue;var borderR="border-right: "+borderValue;var style="style='"+borderL+";"+borderR+"'";el.innerHTML="<div "+style+">"+el.innerHTML+"</div>";},_roundTopCorners:function(el,color,bgColor){var corner=this._createCorner(bgColor);for(var i=0;i<this.options.numSlices;i++){corner.appendChild(this._createCornerSlice(color,bgColor,i,"top"));} -el.style.paddingTop=0;el.insertBefore(corner,el.firstChild);},_roundBottomCorners:function(el,color,bgColor){var corner=this._createCorner(bgColor);for(var i=(this.options.numSlices-1);i>=0;i--){corner.appendChild(this._createCornerSlice(color,bgColor,i,"bottom"));} -el.style.paddingBottom=0;el.appendChild(corner);},_createCorner:function(bgColor){var corner=document.createElement("div");corner.style.backgroundColor=(this._isTransparent()?"transparent":bgColor);return corner;},_createCornerSlice:function(color,bgColor,n,position){var slice=document.createElement("span");var inStyle=slice.style;inStyle.backgroundColor=color;inStyle.display="block";inStyle.height="1px";inStyle.overflow="hidden";inStyle.fontSize="1px";var borderColor=this._borderColor(color,bgColor);if(this.options.border&&n==0){inStyle.borderTopStyle="solid";inStyle.borderTopWidth="1px";inStyle.borderLeftWidth="0px";inStyle.borderRightWidth="0px";inStyle.borderBottomWidth="0px";inStyle.height="0px";inStyle.borderColor=borderColor;} -else if(borderColor){inStyle.borderColor=borderColor;inStyle.borderStyle="solid";inStyle.borderWidth="0px 1px";} -if(!this.options.compact&&(n==(this.options.numSlices-1))){inStyle.height="2px";} -this._setMargin(slice,n,position);this._setBorder(slice,n,position);return slice;},_setOptions:function(options){this.options={corners:"all",color:"fromElement",bgColor:"fromParent",blend:true,border:false,compact:false};OpenLayers.Util.extend(this.options,options||{});this.options.numSlices=this.options.compact?2:4;if(this._isTransparent()){this.options.blend=false;}},_whichSideTop:function(){if(this._hasString(this.options.corners,"all","top")){return"";} -if(this.options.corners.indexOf("tl")>=0&&this.options.corners.indexOf("tr")>=0){return"";} -if(this.options.corners.indexOf("tl")>=0){return"left";}else if(this.options.corners.indexOf("tr")>=0){return"right";} -return"";},_whichSideBottom:function(){if(this._hasString(this.options.corners,"all","bottom")){return"";} -if(this.options.corners.indexOf("bl")>=0&&this.options.corners.indexOf("br")>=0){return"";} -if(this.options.corners.indexOf("bl")>=0){return"left";}else if(this.options.corners.indexOf("br")>=0){return"right";} -return"";},_borderColor:function(color,bgColor){if(color=="transparent"){return bgColor;}else if(this.options.border){return this.options.border;}else if(this.options.blend){return this._blend(bgColor,color);}else{return"";}},_setMargin:function(el,n,corners){var marginSize=this._marginSize(n);var whichSide=corners=="top"?this._whichSideTop():this._whichSideBottom();if(whichSide=="left"){el.style.marginLeft=marginSize+"px";el.style.marginRight="0px";} -else if(whichSide=="right"){el.style.marginRight=marginSize+"px";el.style.marginLeft="0px";} -else{el.style.marginLeft=marginSize+"px";el.style.marginRight=marginSize+"px";}},_setBorder:function(el,n,corners){var borderSize=this._borderSize(n);var whichSide=corners=="top"?this._whichSideTop():this._whichSideBottom();if(whichSide=="left"){el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth="0px";} -else if(whichSide=="right"){el.style.borderRightWidth=borderSize+"px";el.style.borderLeftWidth="0px";} -else{el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth=borderSize+"px";} -if(this.options.border!=false){el.style.borderLeftWidth=borderSize+"px";el.style.borderRightWidth=borderSize+"px";}},_marginSize:function(n){if(this._isTransparent()){return 0;} -var marginSizes=[5,3,2,1];var blendedMarginSizes=[3,2,1,0];var compactMarginSizes=[2,1];var smBlendedMarginSizes=[1,0];if(this.options.compact&&this.options.blend){return smBlendedMarginSizes[n];}else if(this.options.compact){return compactMarginSizes[n];}else if(this.options.blend){return blendedMarginSizes[n];}else{return marginSizes[n];}},_borderSize:function(n){var transparentBorderSizes=[5,3,2,1];var blendedBorderSizes=[2,1,1,1];var compactBorderSizes=[1,0];var actualBorderSizes=[0,2,0,0];if(this.options.compact&&(this.options.blend||this._isTransparent())){return 1;}else if(this.options.compact){return compactBorderSizes[n];}else if(this.options.blend){return blendedBorderSizes[n];}else if(this.options.border){return actualBorderSizes[n];}else if(this._isTransparent()){return transparentBorderSizes[n];} -return 0;},_hasString:function(str){for(var i=1;i<arguments.length;i++)if(str.indexOf(arguments[i])>=0){return true;}return false;},_blend:function(c1,c2){var cc1=OpenLayers.Rico.Color.createFromHex(c1);cc1.blend(OpenLayers.Rico.Color.createFromHex(c2));return cc1;},_background:function(el){try{return OpenLayers.Rico.Color.createColorFromBackground(el).asHex();}catch(err){return"#ffffff";}},_isTransparent:function(){return this.options.color=="transparent";},_isTopRounded:function(){return this._hasString(this.options.corners,"all","top","tl","tr");},_isBottomRounded:function(){return this._hasString(this.options.corners,"all","bottom","bl","br");},_hasSingleTextChild:function(el){return el.childNodes.length==1&&el.childNodes[0].nodeType==3;}};OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(error){alert(error);},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"};(function(){var scripts=document.getElementsByTagName("script");for(var i=0,len=scripts.length;i<len;++i){if(scripts[i].src.indexOf("firebug.js")!=-1){if(console){OpenLayers.Util.extend(OpenLayers.Console,console);break;}}}})();OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){if(!OpenLayers.Lang.code){OpenLayers.Lang.setCode();} -return OpenLayers.Lang.code;},setCode:function(code){var lang;if(!code){code=(OpenLayers.BROWSER_NAME=="msie")?navigator.userLanguage:navigator.language;} -var parts=code.split('-');parts[0]=parts[0].toLowerCase();if(typeof OpenLayers.Lang[parts[0]]=="object"){lang=parts[0];} -if(parts[1]){var testLang=parts[0]+'-'+parts[1].toUpperCase();if(typeof OpenLayers.Lang[testLang]=="object"){lang=testLang;}} -if(!lang){OpenLayers.Console.warn('Failed to find OpenLayers.Lang.'+parts.join("-")+' dictionary, falling back to default language');lang=OpenLayers.Lang.defaultCode;} -OpenLayers.Lang.code=lang;},translate:function(key,context){var dictionary=OpenLayers.Lang[OpenLayers.Lang.getCode()];var message=dictionary&&dictionary[key];if(!message){message=key;} -if(context){message=OpenLayers.String.format(message,context);} -return message;}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Lang["is"]=OpenLayers.Util.applyDefaults({'Permalink':"Varanlegur tengill",'Overlays':"Þekjur",'Base Layer':"Grunnlag",'readNotImplemented':"Skrifun er óútfærð.",'writeNotImplemented':"Lestur er óútfærður.",'errorLoadingGML':"Villa kom upp við að hlaða inn GML skránni ${url}",'Scale = 1 : ${scaleDenom}':"Skali = 1 : ${scaleDenom}",'layerAlreadyAdded':"Þú reyndir að bæta laginu ${layerName} á kortið en það er þegar búið að bæta því við",'methodDeprecated':"Þetta fall hefur verið úrelt og verður fjarlægt í 3.0. Notaðu ${newMethod} í staðin."});OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(left,bottom,right,top){if(left!=null){this.left=OpenLayers.Util.toFloat(left);} -if(bottom!=null){this.bottom=OpenLayers.Util.toFloat(bottom);} -if(right!=null){this.right=OpenLayers.Util.toFloat(right);} -if(top!=null){this.top=OpenLayers.Util.toFloat(top);}},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top);},equals:function(bounds){var equals=false;if(bounds!=null){equals=((this.left==bounds.left)&&(this.right==bounds.right)&&(this.top==bounds.top)&&(this.bottom==bounds.bottom));} -return equals;},toString:function(){return[this.left,this.bottom,this.right,this.top].join(",");},toArray:function(reverseAxisOrder){if(reverseAxisOrder===true){return[this.bottom,this.left,this.top,this.right];}else{return[this.left,this.bottom,this.right,this.top];}},toBBOX:function(decimal,reverseAxisOrder){if(decimal==null){decimal=6;} -var mult=Math.pow(10,decimal);var xmin=Math.round(this.left*mult)/mult;var ymin=Math.round(this.bottom*mult)/mult;var xmax=Math.round(this.right*mult)/mult;var ymax=Math.round(this.top*mult)/mult;if(reverseAxisOrder===true){return ymin+","+xmin+","+ymax+","+xmax;}else{return xmin+","+ymin+","+xmax+","+ymax;}},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])]);},getWidth:function(){return(this.right-this.left);},getHeight:function(){return(this.top-this.bottom);},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight());},getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2);},getCenterLonLat:function(){if(!this.centerLonLat){this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2);} -return this.centerLonLat;},scale:function(ratio,origin){if(origin==null){origin=this.getCenterLonLat();} -var origx,origy;if(origin.CLASS_NAME=="OpenLayers.LonLat"){origx=origin.lon;origy=origin.lat;}else{origx=origin.x;origy=origin.y;} -var left=(this.left-origx)*ratio+origx;var bottom=(this.bottom-origy)*ratio+origy;var right=(this.right-origx)*ratio+origx;var top=(this.top-origy)*ratio+origy;return new OpenLayers.Bounds(left,bottom,right,top);},add:function(x,y){if((x==null)||(y==null)){var msg=OpenLayers.i18n("boundsAddError");OpenLayers.Console.error(msg);return null;} -return new OpenLayers.Bounds(this.left+x,this.bottom+y,this.right+x,this.top+y);},extend:function(object){var bounds=null;if(object){switch(object.CLASS_NAME){case"OpenLayers.LonLat":bounds=new OpenLayers.Bounds(object.lon,object.lat,object.lon,object.lat);break;case"OpenLayers.Geometry.Point":bounds=new OpenLayers.Bounds(object.x,object.y,object.x,object.y);break;case"OpenLayers.Bounds":bounds=object;break;} -if(bounds){this.centerLonLat=null;if((this.left==null)||(bounds.left<this.left)){this.left=bounds.left;} -if((this.bottom==null)||(bounds.bottom<this.bottom)){this.bottom=bounds.bottom;} -if((this.right==null)||(bounds.right>this.right)){this.right=bounds.right;} -if((this.top==null)||(bounds.top>this.top)){this.top=bounds.top;}}}},containsLonLat:function(ll,inclusive){return this.contains(ll.lon,ll.lat,inclusive);},containsPixel:function(px,inclusive){return this.contains(px.x,px.y,inclusive);},contains:function(x,y,inclusive){if(inclusive==null){inclusive=true;} -if(x==null||y==null){return false;} -x=OpenLayers.Util.toFloat(x);y=OpenLayers.Util.toFloat(y);var contains=false;if(inclusive){contains=((x>=this.left)&&(x<=this.right)&&(y>=this.bottom)&&(y<=this.top));}else{contains=((x>this.left)&&(x<this.right)&&(y>this.bottom)&&(y<this.top));} -return contains;},intersectsBounds:function(bounds,inclusive){if(inclusive==null){inclusive=true;} -var intersects=false;var mightTouch=(this.left==bounds.right||this.right==bounds.left||this.top==bounds.bottom||this.bottom==bounds.top);if(inclusive||!mightTouch){var inBottom=(((bounds.bottom>=this.bottom)&&(bounds.bottom<=this.top))||((this.bottom>=bounds.bottom)&&(this.bottom<=bounds.top)));var inTop=(((bounds.top>=this.bottom)&&(bounds.top<=this.top))||((this.top>bounds.bottom)&&(this.top<bounds.top)));var inLeft=(((bounds.left>=this.left)&&(bounds.left<=this.right))||((this.left>=bounds.left)&&(this.left<=bounds.right)));var inRight=(((bounds.right>=this.left)&&(bounds.right<=this.right))||((this.right>=bounds.left)&&(this.right<=bounds.right)));intersects=((inBottom||inTop)&&(inLeft||inRight));} -return intersects;},containsBounds:function(bounds,partial,inclusive){if(partial==null){partial=false;} -if(inclusive==null){inclusive=true;} -var bottomLeft=this.contains(bounds.left,bounds.bottom,inclusive);var bottomRight=this.contains(bounds.right,bounds.bottom,inclusive);var topLeft=this.contains(bounds.left,bounds.top,inclusive);var topRight=this.contains(bounds.right,bounds.top,inclusive);return(partial)?(bottomLeft||bottomRight||topLeft||topRight):(bottomLeft&&bottomRight&&topLeft&&topRight);},determineQuadrant:function(lonlat){var quadrant="";var center=this.getCenterLonLat();quadrant+=(lonlat.lat<center.lat)?"b":"t";quadrant+=(lonlat.lon<center.lon)?"l":"r";return quadrant;},transform:function(source,dest){this.centerLonLat=null;var ll=OpenLayers.Projection.transform({'x':this.left,'y':this.bottom},source,dest);var lr=OpenLayers.Projection.transform({'x':this.right,'y':this.bottom},source,dest);var ul=OpenLayers.Projection.transform({'x':this.left,'y':this.top},source,dest);var ur=OpenLayers.Projection.transform({'x':this.right,'y':this.top},source,dest);this.left=Math.min(ll.x,ul.x);this.bottom=Math.min(ll.y,lr.y);this.right=Math.max(lr.x,ur.x);this.top=Math.max(ul.y,ur.y);return this;},wrapDateLine:function(maxExtent,options){options=options||{};var leftTolerance=options.leftTolerance||0;var rightTolerance=options.rightTolerance||0;var newBounds=this.clone();if(maxExtent){while(newBounds.left<maxExtent.left&&(newBounds.right-rightTolerance)<=maxExtent.left){newBounds=newBounds.add(maxExtent.getWidth(),0);} -while((newBounds.left+leftTolerance)>=maxExtent.right&&newBounds.right>maxExtent.right){newBounds=newBounds.add(-maxExtent.getWidth(),0);}} -return newBounds;},CLASS_NAME:"OpenLayers.Bounds"});OpenLayers.Bounds.fromString=function(str,reverseAxisOrder){var bounds=str.split(",");return OpenLayers.Bounds.fromArray(bounds,reverseAxisOrder);};OpenLayers.Bounds.fromArray=function(bbox,reverseAxisOrder){return reverseAxisOrder===true?new OpenLayers.Bounds(parseFloat(bbox[1]),parseFloat(bbox[0]),parseFloat(bbox[3]),parseFloat(bbox[2])):new OpenLayers.Bounds(parseFloat(bbox[0]),parseFloat(bbox[1]),parseFloat(bbox[2]),parseFloat(bbox[3]));};OpenLayers.Bounds.fromSize=function(size){return new OpenLayers.Bounds(0,size.h,size.w,0);};OpenLayers.Bounds.oppositeQuadrant=function(quadrant){var opp="";opp+=(quadrant.charAt(0)=='t')?'b':'t';opp+=(quadrant.charAt(1)=='l')?'r':'l';return opp;};OpenLayers.Element={visible:function(element){return OpenLayers.Util.getElement(element).style.display!='none';},toggle:function(){for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);var display=OpenLayers.Element.visible(element)?'hide':'show';OpenLayers.Element[display](element);}},hide:function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"element.style.display = 'none';"}));for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);if(element){element.style.display='none';}}},show:function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"element.style.display = '';"}));for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);if(element){element.style.display='';}}},remove:function(element){element=OpenLayers.Util.getElement(element);element.parentNode.removeChild(element);},getHeight:function(element){element=OpenLayers.Util.getElement(element);return element.offsetHeight;},getDimensions:function(element){element=OpenLayers.Util.getElement(element);if(OpenLayers.Element.getStyle(element,'display')!='none'){return{width:element.offsetWidth,height:element.offsetHeight};} -var els=element.style;var originalVisibility=els.visibility;var originalPosition=els.position;var originalDisplay=els.display;els.visibility='hidden';els.position='absolute';els.display='';var originalWidth=element.clientWidth;var originalHeight=element.clientHeight;els.display=originalDisplay;els.position=originalPosition;els.visibility=originalVisibility;return{width:originalWidth,height:originalHeight};},hasClass:function(element,name){var names=element.className;return(!!names&&new RegExp("(^|\\s)"+name+"(\\s|$)").test(names));},addClass:function(element,name){if(!OpenLayers.Element.hasClass(element,name)){element.className+=(element.className?" ":"")+name;} -return element;},removeClass:function(element,name){var names=element.className;if(names){element.className=OpenLayers.String.trim(names.replace(new RegExp("(^|\\s+)"+name+"(\\s+|$)")," "));} -return element;},toggleClass:function(element,name){if(OpenLayers.Element.hasClass(element,name)){OpenLayers.Element.removeClass(element,name);}else{OpenLayers.Element.addClass(element,name);} -return element;},getStyle:function(element,style){element=OpenLayers.Util.getElement(element);var value=null;if(element&&element.style){value=element.style[OpenLayers.String.camelize(style)];if(!value){if(document.defaultView&&document.defaultView.getComputedStyle){var css=document.defaultView.getComputedStyle(element,null);value=css?css.getPropertyValue(style):null;}else if(element.currentStyle){value=element.currentStyle[OpenLayers.String.camelize(style)];}} -var positions=['left','top','right','bottom'];if(window.opera&&(OpenLayers.Util.indexOf(positions,style)!=-1)&&(OpenLayers.Element.getStyle(element,'position')=='static')){value='auto';}} -return value=='auto'?null:value;}};OpenLayers.LonLat=OpenLayers.Class({lon:0.0,lat:0.0,initialize:function(lon,lat){this.lon=OpenLayers.Util.toFloat(lon);this.lat=OpenLayers.Util.toFloat(lat);},toString:function(){return("lon="+this.lon+",lat="+this.lat);},toShortString:function(){return(this.lon+", "+this.lat);},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat);},add:function(lon,lat){if((lon==null)||(lat==null)){var msg=OpenLayers.i18n("lonlatAddError");OpenLayers.Console.error(msg);return null;} -return new OpenLayers.LonLat(this.lon+OpenLayers.Util.toFloat(lon),this.lat+OpenLayers.Util.toFloat(lat));},equals:function(ll){var equals=false;if(ll!=null){equals=((this.lon==ll.lon&&this.lat==ll.lat)||(isNaN(this.lon)&&isNaN(this.lat)&&isNaN(ll.lon)&&isNaN(ll.lat)));} -return equals;},transform:function(source,dest){var point=OpenLayers.Projection.transform({'x':this.lon,'y':this.lat},source,dest);this.lon=point.x;this.lat=point.y;return this;},wrapDateLine:function(maxExtent){var newLonLat=this.clone();if(maxExtent){while(newLonLat.lon<maxExtent.left){newLonLat.lon+=maxExtent.getWidth();} -while(newLonLat.lon>maxExtent.right){newLonLat.lon-=maxExtent.getWidth();}} -return newLonLat;},CLASS_NAME:"OpenLayers.LonLat"});OpenLayers.LonLat.fromString=function(str){var pair=str.split(",");return new OpenLayers.LonLat(pair[0],pair[1]);};OpenLayers.LonLat.fromArray=function(arr){var gotArr=OpenLayers.Util.isArray(arr),lon=gotArr&&arr[0],lat=gotArr&&arr[1];return new OpenLayers.LonLat(lon,lat);};OpenLayers.Pixel=OpenLayers.Class({x:0.0,y:0.0,initialize:function(x,y){this.x=parseFloat(x);this.y=parseFloat(y);},toString:function(){return("x="+this.x+",y="+this.y);},clone:function(){return new OpenLayers.Pixel(this.x,this.y);},equals:function(px){var equals=false;if(px!=null){equals=((this.x==px.x&&this.y==px.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(px.x)&&isNaN(px.y)));} -return equals;},distanceTo:function(px){return Math.sqrt(Math.pow(this.x-px.x,2)+ -Math.pow(this.y-px.y,2));},add:function(x,y){if((x==null)||(y==null)){var msg=OpenLayers.i18n("pixelAddError");OpenLayers.Console.error(msg);return null;} -return new OpenLayers.Pixel(this.x+x,this.y+y);},offset:function(px){var newPx=this.clone();if(px){newPx=this.add(px.x,px.y);} -return newPx;},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0.0,h:0.0,initialize:function(w,h){this.w=parseFloat(w);this.h=parseFloat(h);},toString:function(){return("w="+this.w+",h="+this.h);},clone:function(){return new OpenLayers.Size(this.w,this.h);},equals:function(sz){var equals=false;if(sz!=null){equals=((this.w==sz.w&&this.h==sz.h)||(isNaN(this.w)&&isNaN(this.h)&&isNaN(sz.w)&&isNaN(sz.h)));} -return equals;},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:false,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;},destroy:function(){},read:function(data){OpenLayers.Console.userError(OpenLayers.i18n("readNotImplemented"));},write:function(object){OpenLayers.Console.userError(OpenLayers.i18n("writeNotImplemented"));},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(layer,lonlat,data){this.layer=layer;this.lonlat=lonlat;this.data=(data!=null)?data:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup);}} -if(this.layer!=null&&this.marker!=null){this.layer.removeMarker(this.marker);} -this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null;} -if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null;}},onScreen:function(){var onScreen=false;if((this.layer!=null)&&(this.layer.map!=null)){var screenBounds=this.layer.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);} -return onScreen;},createMarker:function(){if(this.lonlat!=null){this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon);} -return this.marker;},destroyMarker:function(){this.marker.destroy();},createPopup:function(closeBox){if(this.lonlat!=null){if(!this.popup){var anchor=(this.marker)?this.marker.icon:null;var popupClass=this.popupClass?this.popupClass:OpenLayers.Popup.AnchoredBubble;this.popup=new popupClass(this.id+"_popup",this.lonlat,this.data.popupSize,this.data.popupContentHTML,anchor,closeBox);} -if(this.data.overflow!=null){this.popup.contentDiv.style.overflow=this.data.overflow;} -this.popup.feature=this;} -return this.popup;},destroyPopup:function(){if(this.popup){this.popup.feature=null;this.popup.destroy();this.popup=null;}},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.State={UNKNOWN:'Unknown',INSERT:'Insert',UPDATE:'Update',DELETE:'Delete'};OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,bounds:null,state:null,style:null,url:null,renderIntent:"default",modified:null,initialize:function(geometry,attributes,style){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,attributes]);this.lonlat=null;this.geometry=geometry?geometry:null;this.state=null;this.attributes={};if(attributes){this.attributes=OpenLayers.Util.extend(this.attributes,attributes);} -this.style=style?style:null;},destroy:function(){if(this.layer){this.layer.removeFeatures(this);this.layer=null;} -this.geometry=null;this.modified=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments);},clone:function(){return new OpenLayers.Feature.Vector(this.geometry?this.geometry.clone():null,this.attributes,this.style);},onScreen:function(boundsOnly){var onScreen=false;if(this.layer&&this.layer.map){var screenBounds=this.layer.map.getExtent();if(boundsOnly){var featureBounds=this.geometry.getBounds();onScreen=screenBounds.intersectsBounds(featureBounds);}else{var screenPoly=screenBounds.toGeometry();onScreen=screenPoly.intersects(this.geometry);}} -return onScreen;},getVisibility:function(){return!(this.style&&this.style.display=='none'||!this.layer||this.layer&&this.layer.styleMap&&this.layer.styleMap.createSymbolizer(this,this.renderIntent).display=='none'||this.layer&&!this.layer.getVisibility());},createMarker:function(){return null;},destroyMarker:function(){},createPopup:function(){return null;},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;if(this.geometry){atPoint=this.geometry.atPoint(lonlat,toleranceLon,toleranceLat);} -return atPoint;},destroyPopup:function(){},move:function(location){if(!this.layer||!this.geometry.move){return undefined;} -var pixel;if(location.CLASS_NAME=="OpenLayers.LonLat"){pixel=this.layer.getViewPortPxFromLonLat(location);}else{pixel=location;} -var lastPixel=this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat());var res=this.layer.map.getResolution();this.geometry.move(res*(pixel.x-lastPixel.x),res*(lastPixel.y-pixel.y));this.layer.drawFeature(this);return lastPixel;},toState:function(state){if(state==OpenLayers.State.UPDATE){switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=state;break;case OpenLayers.State.UPDATE:case OpenLayers.State.INSERT:break;}}else if(state==OpenLayers.State.INSERT){switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=state;break;}}else if(state==OpenLayers.State.DELETE){switch(this.state){case OpenLayers.State.INSERT:break;case OpenLayers.State.DELETE:break;case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=state;break;}}else if(state==OpenLayers.State.UNKNOWN){this.state=state;}},CLASS_NAME:"OpenLayers.Feature.Vector"});OpenLayers.Feature.Vector.style={'default':{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'select':{fillColor:"blue",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer"},'temporary':{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'delete':{display:"none"}};OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(options){this.regExes={'typeStr':/^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,'spaces':/\s+/,'parenComma':/\)\s*,\s*\(/,'doubleParenComma':/\)\s*\)\s*,\s*\(\s*\(/,'trimParens':/^\s*\(?(.*?)\)?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(wkt){var features,type,str;wkt=wkt.replace(/[\n\r]/g," ");var matches=this.regExes.typeStr.exec(wkt);if(matches){type=matches[1].toLowerCase();str=matches[2];if(this.parse[type]){features=this.parse[type].apply(this,[str]);} -if(this.internalProjection&&this.externalProjection){if(features&&features.CLASS_NAME=="OpenLayers.Feature.Vector"){features.geometry.transform(this.externalProjection,this.internalProjection);}else if(features&&type!="geometrycollection"&&typeof features=="object"){for(var i=0,len=features.length;i<len;i++){var component=features[i];component.geometry.transform(this.externalProjection,this.internalProjection);}}}} -return features;},write:function(features){var collection,geometry,type,data,isCollection;if(features.constructor==Array){collection=features;isCollection=true;}else{collection=[features];isCollection=false;} -var pieces=[];if(isCollection){pieces.push('GEOMETRYCOLLECTION(');} -for(var i=0,len=collection.length;i<len;++i){if(isCollection&&i>0){pieces.push(',');} -geometry=collection[i].geometry;pieces.push(this.extractGeometry(geometry));} -if(isCollection){pieces.push(')');} -return pieces.join('');},extractGeometry:function(geometry){var type=geometry.CLASS_NAME.split('.')[2].toLowerCase();if(!this.extract[type]){return null;} -if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);} -var wktType=type=='collection'?'GEOMETRYCOLLECTION':type.toUpperCase();var data=wktType+'('+this.extract[type].apply(this,[geometry])+')';return data;},extract:{'point':function(point){return point.x+' '+point.y;},'multipoint':function(multipoint){var array=[];for(var i=0,len=multipoint.components.length;i<len;++i){array.push('('+ -this.extract.point.apply(this,[multipoint.components[i]])+')');} -return array.join(',');},'linestring':function(linestring){var array=[];for(var i=0,len=linestring.components.length;i<len;++i){array.push(this.extract.point.apply(this,[linestring.components[i]]));} -return array.join(',');},'multilinestring':function(multilinestring){var array=[];for(var i=0,len=multilinestring.components.length;i<len;++i){array.push('('+ -this.extract.linestring.apply(this,[multilinestring.components[i]])+')');} -return array.join(',');},'polygon':function(polygon){var array=[];for(var i=0,len=polygon.components.length;i<len;++i){array.push('('+ -this.extract.linestring.apply(this,[polygon.components[i]])+')');} -return array.join(',');},'multipolygon':function(multipolygon){var array=[];for(var i=0,len=multipolygon.components.length;i<len;++i){array.push('('+ -this.extract.polygon.apply(this,[multipolygon.components[i]])+')');} -return array.join(',');},'collection':function(collection){var array=[];for(var i=0,len=collection.components.length;i<len;++i){array.push(this.extractGeometry.apply(this,[collection.components[i]]));} -return array.join(',');}},parse:{'point':function(str){var coords=OpenLayers.String.trim(str).split(this.regExes.spaces);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(coords[0],coords[1]));},'multipoint':function(str){var point;var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0,len=points.length;i<len;++i){point=points[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.point.apply(this,[point]).geometry);} -return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPoint(components));},'linestring':function(str){var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0,len=points.length;i<len;++i){components.push(this.parse.point.apply(this,[points[i]]).geometry);} -return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString(components));},'multilinestring':function(str){var line;var lines=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0,len=lines.length;i<len;++i){line=lines[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.linestring.apply(this,[line]).geometry);} -return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiLineString(components));},'polygon':function(str){var ring,linestring,linearring;var rings=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0,len=rings.length;i<len;++i){ring=rings[i].replace(this.regExes.trimParens,'$1');linestring=this.parse.linestring.apply(this,[ring]).geometry;linearring=new OpenLayers.Geometry.LinearRing(linestring.components);components.push(linearring);} -return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(components));},'multipolygon':function(str){var polygon;var polygons=OpenLayers.String.trim(str).split(this.regExes.doubleParenComma);var components=[];for(var i=0,len=polygons.length;i<len;++i){polygon=polygons[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.polygon.apply(this,[polygon]).geometry);} -return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPolygon(components));},'geometrycollection':function(str){str=str.replace(/,\s*([A-Za-z])/g,'|$1');var wktArray=OpenLayers.String.trim(str).split('|');var components=[];for(var i=0,len=wktArray.length;i<len;++i){components.push(OpenLayers.Format.WKT.prototype.read.apply(this,[wktArray[i]]));} -return components;}},CLASS_NAME:"OpenLayers.Format.WKT"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){this.id=null;this.bounds=null;},clone:function(){return new OpenLayers.Geometry();},setBounds:function(bounds){if(bounds){this.bounds=bounds.clone();}},clearBounds:function(){this.bounds=null;if(this.parent){this.parent.clearBounds();}},extendBounds:function(newBounds){var bounds=this.getBounds();if(!bounds){this.setBounds(newBounds);}else{this.bounds.extend(newBounds);}},getBounds:function(){if(this.bounds==null){this.calculateBounds();} +return str;};OpenLayers.Event={observers:false,KEY_SPACE:32,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(event){return event.target||event.srcElement;},isSingleTouch:function(event){return event.touches&&event.touches.length==1;},isMultiTouch:function(event){return event.touches&&event.touches.length>1;},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)));},isRightClick:function(event){return(((event.which)&&(event.which==3))||((event.button)&&(event.button==2)));},stop:function(event,allowDefault){if(!allowDefault){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}} +if(event.stopPropagation){event.stopPropagation();}else{event.cancelBubble=true;}},findElement:function(event,tagName){var element=OpenLayers.Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase()))){element=element.parentNode;} +return element;},observe:function(elementParam,name,observer,useCapture){var element=OpenLayers.Util.getElement(elementParam);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent)){name='keydown';} +if(!this.observers){this.observers={};} +if(!element._eventCacheID){var idPrefix="eventCacheID_";if(element.id){idPrefix=element.id+"_"+idPrefix;} +element._eventCacheID=OpenLayers.Util.createUniqueID(idPrefix);} +var cacheID=element._eventCacheID;if(!this.observers[cacheID]){this.observers[cacheID]=[];} +this.observers[cacheID].push({'element':element,'name':name,'observer':observer,'useCapture':useCapture});if(element.addEventListener){element.addEventListener(name,observer,useCapture);}else if(element.attachEvent){element.attachEvent('on'+name,observer);}},stopObservingElement:function(elementParam){var element=OpenLayers.Util.getElement(elementParam);var cacheID=element._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[cacheID]);},_removeElementObservers:function(elementObservers){if(elementObservers){for(var i=elementObservers.length-1;i>=0;i--){var entry=elementObservers[i];var args=new Array(entry.element,entry.name,entry.observer,entry.useCapture);var removed=OpenLayers.Event.stopObserving.apply(this,args);}}},stopObserving:function(elementParam,name,observer,useCapture){useCapture=useCapture||false;var element=OpenLayers.Util.getElement(elementParam);var cacheID=element._eventCacheID;if(name=='keypress'){if(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.detachEvent){name='keydown';}} +var foundEntry=false;var elementObservers=OpenLayers.Event.observers[cacheID];if(elementObservers){var i=0;while(!foundEntry&&i<elementObservers.length){var cacheEntry=elementObservers[i];if((cacheEntry.name==name)&&(cacheEntry.observer==observer)&&(cacheEntry.useCapture==useCapture)){elementObservers.splice(i,1);if(elementObservers.length==0){delete OpenLayers.Event.observers[cacheID];} +foundEntry=true;break;} +i++;}} +if(foundEntry){if(element.removeEventListener){element.removeEventListener(name,observer,useCapture);}else if(element&&element.detachEvent){element.detachEvent('on'+name,observer);}} +return foundEntry;},unloadCache:function(){if(OpenLayers.Event&&OpenLayers.Event.observers){for(var cacheID in OpenLayers.Event.observers){var elementObservers=OpenLayers.Event.observers[cacheID];OpenLayers.Event._removeElementObservers.apply(this,[elementObservers]);} +OpenLayers.Event.observers=false;}},CLASS_NAME:"OpenLayers.Event"};OpenLayers.Event.observe(window,'unload',OpenLayers.Event.unloadCache,false);OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:["mouseover","mouseout","mousedown","mouseup","mousemove","click","dblclick","rightclick","dblrightclick","resize","focus","blur","touchstart","touchmove","touchend","keydown"],listeners:null,object:null,element:null,eventHandler:null,fallThrough:null,includeXY:false,extensions:null,extensionCount:null,clearMouseListener:null,initialize:function(object,element,eventTypes,fallThrough,options){OpenLayers.Util.extend(this,options);this.object=object;this.fallThrough=fallThrough;this.listeners={};this.extensions={};this.extensionCount={};if(element!=null){this.attachToElement(element);}},destroy:function(){for(var e in this.extensions){if(typeof this.extensions[e]!=="boolean"){this.extensions[e].destroy();}} +this.extensions=null;if(this.element){OpenLayers.Event.stopObservingElement(this.element);if(this.element.hasScrollEvent){OpenLayers.Event.stopObserving(window,"scroll",this.clearMouseListener);}} +this.element=null;this.listeners=null;this.object=null;this.fallThrough=null;this.eventHandler=null;},addEventType:function(eventName){},attachToElement:function(element){if(this.element){OpenLayers.Event.stopObservingElement(this.element);}else{this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this);this.clearMouseListener=OpenLayers.Function.bind(this.clearMouseCache,this);} +this.element=element;for(var i=0,len=this.BROWSER_EVENTS.length;i<len;i++){OpenLayers.Event.observe(element,this.BROWSER_EVENTS[i],this.eventHandler);} +OpenLayers.Event.observe(element,"dragstart",OpenLayers.Event.stop);},on:function(object){for(var type in object){if(type!="scope"&&object.hasOwnProperty(type)){this.register(type,object.scope,object[type]);}}},register:function(type,obj,func,priority){if(type in OpenLayers.Events&&!this.extensions[type]){this.extensions[type]=new OpenLayers.Events[type](this);} +if(func!=null){if(obj==null){obj=this.object;} +var listeners=this.listeners[type];if(!listeners){listeners=[];this.listeners[type]=listeners;this.extensionCount[type]=0;} +var listener={obj:obj,func:func};if(priority){listeners.splice(this.extensionCount[type],0,listener);if(typeof priority==="object"&&priority.extension){this.extensionCount[type]++;}}else{listeners.push(listener);}}},registerPriority:function(type,obj,func){this.register(type,obj,func,true);},un:function(object){for(var type in object){if(type!="scope"&&object.hasOwnProperty(type)){this.unregister(type,object.scope,object[type]);}}},unregister:function(type,obj,func){if(obj==null){obj=this.object;} +var listeners=this.listeners[type];if(listeners!=null){for(var i=0,len=listeners.length;i<len;i++){if(listeners[i].obj==obj&&listeners[i].func==func){listeners.splice(i,1);break;}}}},remove:function(type){if(this.listeners[type]!=null){this.listeners[type]=[];}},triggerEvent:function(type,evt){var listeners=this.listeners[type];if(!listeners||listeners.length==0){return undefined;} +if(evt==null){evt={};} +evt.object=this.object;evt.element=this.element;if(!evt.type){evt.type=type;} +listeners=listeners.slice();var continueChain;for(var i=0,len=listeners.length;i<len;i++){var callback=listeners[i];continueChain=callback.func.apply(callback.obj,[evt]);if((continueChain!=undefined)&&(continueChain==false)){break;}} +if(!this.fallThrough){OpenLayers.Event.stop(evt,true);} +return continueChain;},handleBrowserEvent:function(evt){var type=evt.type,listeners=this.listeners[type];if(!listeners||listeners.length==0){return;} +var touches=evt.touches;if(touches&&touches[0]){var x=0;var y=0;var num=touches.length;var touch;for(var i=0;i<num;++i){touch=touches[i];x+=touch.clientX;y+=touch.clientY;} +evt.clientX=x/num;evt.clientY=y/num;} +if(this.includeXY){evt.xy=this.getMousePosition(evt);} +this.triggerEvent(type,evt);},clearMouseCache:function(){this.element.scrolls=null;this.element.lefttop=null;var body=document.body;if(body&&!((body.scrollTop!=0||body.scrollLeft!=0)&&navigator.userAgent.match(/iPhone/i))){this.element.offsets=null;}},getMousePosition:function(evt){if(!this.includeXY){this.clearMouseCache();}else if(!this.element.hasScrollEvent){OpenLayers.Event.observe(window,"scroll",this.clearMouseListener);this.element.hasScrollEvent=true;} +if(!this.element.scrolls){var viewportElement=OpenLayers.Util.getViewportElement();this.element.scrolls=[viewportElement.scrollLeft,viewportElement.scrollTop];} +if(!this.element.lefttop){this.element.lefttop=[(document.documentElement.clientLeft||0),(document.documentElement.clientTop||0)];} +if(!this.element.offsets){this.element.offsets=OpenLayers.Util.pagePosition(this.element);} +return new OpenLayers.Pixel((evt.clientX+this.element.scrolls[0])-this.element.offsets[0] +-this.element.lefttop[0],(evt.clientY+this.element.scrolls[1])-this.element.offsets[1] +-this.element.lefttop[1]);},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Events.buttonclick=OpenLayers.Class({target:null,events:['mousedown','mouseup','click','dblclick','touchstart','touchmove','touchend','keydown'],startRegEx:/^mousedown|touchstart$/,cancelRegEx:/^touchmove$/,completeRegEx:/^mouseup|touchend$/,initialize:function(target){this.target=target;for(var i=this.events.length-1;i>=0;--i){this.target.register(this.events[i],this,this.buttonClick,{extension:true});}},destroy:function(){for(var i=this.events.length-1;i>=0;--i){this.target.unregister(this.events[i],this,this.buttonClick);} +delete this.target;},getPressedButton:function(element){var depth=3,button;do{if(OpenLayers.Element.hasClass(element,"olButton")){button=element;break;} +element=element.parentNode;}while(--depth>0&&element);return button;},buttonClick:function(evt){var propagate=true,element=OpenLayers.Event.element(evt);if(element&&(OpenLayers.Event.isLeftClick(evt)||!~evt.type.indexOf("mouse"))){var button=this.getPressedButton(element);if(button){if(evt.type==="keydown"){switch(evt.keyCode){case OpenLayers.Event.KEY_RETURN:case OpenLayers.Event.KEY_SPACE:this.target.triggerEvent("buttonclick",{buttonElement:button});OpenLayers.Event.stop(evt);propagate=false;break;}}else if(this.startEvt){if(this.completeRegEx.test(evt.type)){var pos=OpenLayers.Util.pagePosition(button);this.target.triggerEvent("buttonclick",{buttonElement:button,buttonXY:{x:this.startEvt.clientX-pos[0],y:this.startEvt.clientY-pos[1]}});} +if(this.cancelRegEx.test(evt.type)){delete this.startEvt;} +OpenLayers.Event.stop(evt);propagate=false;} +if(this.startRegEx.test(evt.type)){this.startEvt=evt;OpenLayers.Event.stop(evt);propagate=false;}}else{delete this.startEvt;}} +return propagate;}});OpenLayers.Lang["is"]=OpenLayers.Util.applyDefaults({'Permalink':"Varanlegur tengill",'Overlays':"Þekjur",'Base Layer':"Grunnlag",'Scale = 1 : ${scaleDenom}':"Skali = 1 : ${scaleDenom}",'methodDeprecated':"Þetta fall hefur verið úrelt og verður fjarlægt í 3.0. Notaðu ${newMethod} í staðin."});OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:false,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;},destroy:function(){},read:function(data){throw new Error('Read not implemented.');},write:function(object){throw new Error('Write not implemented.');},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:" ",space:" ",newline:"\n",level:0,pretty:false,nativeJSON:(function(){return!!(window.JSON&&typeof JSON.parse=="function"&&typeof JSON.stringify=="function");})(),read:function(json,filter){var object;if(this.nativeJSON){object=JSON.parse(json,filter);}else try{if(/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){object=eval('('+json+')');if(typeof filter==='function'){function walk(k,v){if(v&&typeof v==='object'){for(var i in v){if(v.hasOwnProperty(i)){v[i]=walk(i,v[i]);}}} +return filter(k,v);} +object=walk('',object);}}}catch(e){} +if(this.keepData){this.data=object;} +return object;},write:function(value,pretty){this.pretty=!!pretty;var json=null;var type=typeof value;if(this.serialize[type]){try{json=(!this.pretty&&this.nativeJSON)?JSON.stringify(value):this.serialize[type].apply(this,[value]);}catch(err){OpenLayers.Console.error("Trouble serializing: "+err);}} +return json;},writeIndent:function(){var pieces=[];if(this.pretty){for(var i=0;i<this.level;++i){pieces.push(this.indent);}} +return pieces.join('');},writeNewline:function(){return(this.pretty)?this.newline:'';},writeSpace:function(){return(this.pretty)?this.space:'';},serialize:{'object':function(object){if(object==null){return"null";} +if(object.constructor==Date){return this.serialize.date.apply(this,[object]);} +if(object.constructor==Array){return this.serialize.array.apply(this,[object]);} +var pieces=['{'];this.level+=1;var key,keyJSON,valueJSON;var addComma=false;for(key in object){if(object.hasOwnProperty(key)){keyJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[key,this.pretty]);valueJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[object[key],this.pretty]);if(keyJSON!=null&&valueJSON!=null){if(addComma){pieces.push(',');} +pieces.push(this.writeNewline(),this.writeIndent(),keyJSON,':',this.writeSpace(),valueJSON);addComma=true;}}} +this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),'}');return pieces.join('');},'array':function(array){var json;var pieces=['['];this.level+=1;for(var i=0,len=array.length;i<len;++i){json=OpenLayers.Format.JSON.prototype.write.apply(this,[array[i],this.pretty]);if(json!=null){if(i>0){pieces.push(',');} +pieces.push(this.writeNewline(),this.writeIndent(),json);}} +this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),']');return pieces.join('');},'string':function(string){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};if(/["\\\x00-\x1f]/.test(string)){return'"'+string.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c;} +c=b.charCodeAt();return'\\u00'+ +Math.floor(c/16).toString(16)+ +(c%16).toString(16);})+'"';} +return'"'+string+'"';},'number':function(number){return isFinite(number)?String(number):"null";},'boolean':function(bool){return String(bool);},'date':function(date){function format(number){return(number<10)?'0'+number:number;} +return'"'+date.getFullYear()+'-'+ +format(date.getMonth()+1)+'-'+ +format(date.getDate())+'T'+ +format(date.getHours())+':'+ +format(date.getMinutes())+':'+ +format(date.getSeconds())+'"';}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){this.id=null;this.bounds=null;},clone:function(){return new OpenLayers.Geometry();},setBounds:function(bounds){if(bounds){this.bounds=bounds.clone();}},clearBounds:function(){this.bounds=null;if(this.parent){this.parent.clearBounds();}},extendBounds:function(newBounds){var bounds=this.getBounds();if(!bounds){this.setBounds(newBounds);}else{this.bounds.extend(newBounds);}},getBounds:function(){if(this.bounds==null){this.calculateBounds();} return this.bounds;},calculateBounds:function(){},distanceTo:function(geometry,options){},getVertices:function(nodes){},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;var bounds=this.getBounds();if((bounds!=null)&&(lonlat!=null)){var dX=(toleranceLon!=null)?toleranceLon:0;var dY=(toleranceLat!=null)?toleranceLat:0;var toleranceBounds=new OpenLayers.Bounds(this.bounds.left-dX,this.bounds.bottom-dY,this.bounds.right+dX,this.bounds.top+dY);atPoint=toleranceBounds.containsLonLat(lonlat);} -return atPoint;},getLength:function(){return 0.0;},getArea:function(){return 0.0;},getCentroid:function(){return null;},toString:function(){return OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this));},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(wkt){var format=arguments.callee.format;if(!format){format=new OpenLayers.Format.WKT();arguments.callee.format=format;} -var geom;var result=format.read(wkt);if(result instanceof OpenLayers.Feature.Vector){geom=result.geometry;}else if(OpenLayers.Util.isArray(result)){var len=result.length;var components=new Array(len);for(var i=0;i<len;++i){components[i]=result[i].geometry;} -geom=new OpenLayers.Geometry.Collection(components);} +return atPoint;},getLength:function(){return 0.0;},getArea:function(){return 0.0;},getCentroid:function(){return null;},toString:function(){var string;if(OpenLayers.Format&&OpenLayers.Format.WKT){string=OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this));}else{string=Object.prototype.toString.call(this);} +return string;},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(wkt){var geom;if(OpenLayers.Format&&OpenLayers.Format.WKT){var format=OpenLayers.Geometry.fromWKT.format;if(!format){format=new OpenLayers.Format.WKT();OpenLayers.Geometry.fromWKT.format=format;} +var result=format.read(wkt);if(result instanceof OpenLayers.Feature.Vector){geom=result.geometry;}else if(OpenLayers.Util.isArray(result)){var len=result.length;var components=new Array(len);for(var i=0;i<len;++i){components[i]=result[i].geometry;} +geom=new OpenLayers.Geometry.Collection(components);}} return geom;};OpenLayers.Geometry.segmentsIntersect=function(seg1,seg2,options){var point=options&&options.point;var tolerance=options&&options.tolerance;var intersection=false;var x11_21=seg1.x1-seg2.x1;var y11_21=seg1.y1-seg2.y1;var x12_11=seg1.x2-seg1.x1;var y12_11=seg1.y2-seg1.y1;var y22_21=seg2.y2-seg2.y1;var x22_21=seg2.x2-seg2.x1;var d=(y22_21*x12_11)-(x22_21*y12_11);var n1=(x22_21*y11_21)-(y22_21*x11_21);var n2=(x12_11*y11_21)-(y12_11*x11_21);if(d==0){if(n1==0&&n2==0){intersection=true;}}else{var along1=n1/d;var along2=n2/d;if(along1>=0&&along1<=1&&along2>=0&&along2<=1){if(!point){intersection=true;}else{var x=seg1.x1+(along1*x12_11);var y=seg1.y1+(along1*y12_11);intersection=new OpenLayers.Geometry.Point(x,y);}}} if(tolerance){var dist;if(intersection){if(point){var segs=[seg1,seg2];var seg,x,y;outer:for(var i=0;i<2;++i){seg=segs[i];for(var j=1;j<3;++j){x=seg["x"+j];y=seg["y"+j];dist=Math.sqrt(Math.pow(x-intersection.x,2)+ Math.pow(y-intersection.y,2));if(dist<tolerance){intersection.x=x;intersection.y=y;break outer;}}}}}else{var segs=[seg1,seg2];var source,target,x,y,p,result;outer:for(var i=0;i<2;++i){source=segs[i];target=segs[(i+1)%2];for(var j=1;j<3;++j){p={x:source["x"+j],y:source["y"+j]};result=OpenLayers.Geometry.distanceToSegment(p,target);if(result.distance<tolerance){if(point){intersection=new OpenLayers.Geometry.Point(p.x,p.y);}else{intersection=true;} break outer;}}}}} return intersection;};OpenLayers.Geometry.distanceToSegment=function(point,segment){var x0=point.x;var y0=point.y;var x1=segment.x1;var y1=segment.y1;var x2=segment.x2;var y2=segment.y2;var dx=x2-x1;var dy=y2-y1;var along=((dx*(x0-x1))+(dy*(y0-y1)))/(Math.pow(dx,2)+Math.pow(dy,2));var x,y;if(along<=0.0){x=x1;y=y1;}else if(along>=1.0){x=x2;y=y2;}else{x=x1+along*dx;y=y1+along*dy;} -return{distance:Math.sqrt(Math.pow(x-x0,2)+Math.pow(y-y0,2)),x:x,y:y};};OpenLayers.Lang["te"]=OpenLayers.Util.applyDefaults({'Permalink':"స్థిరలింకు",'W':"à°ª",'E':"తూ",'N':"ఉ",'S':"à°¦"});OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",autoActivate:false,active:null,handler:null,eventListeners:null,events:null,EVENT_TYPES:["activate","deactivate"],initialize:function(options){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} +return{distance:Math.sqrt(Math.pow(x-x0,2)+Math.pow(y-y0,2)),x:x,y:y};};OpenLayers.Lang["te"]=OpenLayers.Util.applyDefaults({'Permalink':"స్థిరలింకు",'W':"à°ª",'E':"తూ",'N':"ఉ",'S':"à°¦"});OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",autoActivate:false,active:null,handler:null,eventListeners:null,events:null,initialize:function(options){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");}},destroy:function(){if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);} this.events.destroy();this.events=null;} this.eventListeners=null;if(this.handler){this.handler.destroy();this.handler=null;} @@ -372,18 +305,15 @@ this.active=true;if(this.map){OpenLayers.Element.addClass(this.map.viewPortDiv,t this.events.triggerEvent("activate");return true;},deactivate:function(){if(this.active){if(this.handler){this.handler.deactivate();} this.active=false;if(this.map){OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");} this.events.triggerEvent("deactivate");return true;} -return false;},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,buttons:null,position:null,initialize:function(options){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){this.removeButtons();this.buttons=null;this.position=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position;this.buttons=[];var sz=new OpenLayers.Size(18,18);var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);this._addButton("panright","east-mini.png",px.add(sz.w,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);this._addButton("zoomworld","zoom-world-mini.png",centered.add(0,sz.h*4+5),sz);this._addButton("zoomout","zoom-minus-mini.png",centered.add(0,sz.h*5+5),sz);return this.div;},_addButton:function(id,img,xy,sz){var imgLocation=OpenLayers.Util.getImageLocation(img);var btn=OpenLayers.Util.createAlphaImageDiv(this.id+"_"+id,xy,sz,imgLocation,"absolute");btn.style.cursor="pointer";this.div.appendChild(btn);OpenLayers.Event.observe(btn,"mousedown",OpenLayers.Function.bindAsEventListener(this.buttonDown,btn));OpenLayers.Event.observe(btn,"dblclick",OpenLayers.Function.bindAsEventListener(this.doubleClick,btn));OpenLayers.Event.observe(btn,"click",OpenLayers.Function.bindAsEventListener(this.doubleClick,btn));btn.action=id;btn.map=this.map;if(!this.slideRatio){var slideFactorPixels=this.slideFactor;var getSlideFactor=function(){return slideFactorPixels;};}else{var slideRatio=this.slideRatio;var getSlideFactor=function(dim){return this.map.getSize()[dim]*slideRatio;};} -btn.getSlideFactor=getSlideFactor;this.buttons.push(btn);return btn;},_removeButton:function(btn){OpenLayers.Event.stopObservingElement(btn);btn.map=null;btn.getSlideFactor=null;this.div.removeChild(btn);OpenLayers.Util.removeItem(this.buttons,btn);},removeButtons:function(){for(var i=this.buttons.length-1;i>=0;--i){this._removeButton(this.buttons[i]);}},doubleClick:function(evt){OpenLayers.Event.stop(evt);return false;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;} -switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;} -OpenLayers.Event.stop(evt);},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Control.PanZoomBar=OpenLayers.Class(OpenLayers.Control.PanZoom,{zoomStopWidth:18,zoomStopHeight:11,slider:null,sliderEvents:null,zoombarDiv:null,divEvents:null,zoomWorldIcon:false,panIcons:true,forceFixedZoomLevel:false,mouseDragStart:null,deltaY:null,zoomStart:null,destroy:function(){this._removeZoomBar();this.map.events.un({"changebaselayer":this.redraw,scope:this});OpenLayers.Control.PanZoom.prototype.destroy.apply(this,arguments);delete this.mouseDragStart;delete this.zoomStart;},setMap:function(map){OpenLayers.Control.PanZoom.prototype.setMap.apply(this,arguments);this.map.events.register("changebaselayer",this,this.redraw);},redraw:function(){if(this.div!=null){this.removeButtons();this._removeZoomBar();} -this.draw();},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position.clone();this.buttons=[];var sz=new OpenLayers.Size(18,18);if(this.panIcons){var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);var wposition=sz.w;if(this.zoomWorldIcon){centered=new OpenLayers.Pixel(px.x+sz.w,px.y);} +return false;},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,buttons:null,position:null,initialize:function(options){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){if(this.map){this.map.events.unregister("buttonclick",this,this.onButtonClick);} +this.removeButtons();this.buttons=null;this.position=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.register("buttonclick",this,this.onButtonClick);},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position;this.buttons=[];var sz={w:18,h:18};var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);this._addButton("panright","east-mini.png",px.add(sz.w,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);this._addButton("zoomworld","zoom-world-mini.png",centered.add(0,sz.h*4+5),sz);this._addButton("zoomout","zoom-minus-mini.png",centered.add(0,sz.h*5+5),sz);return this.div;},_addButton:function(id,img,xy,sz){var imgLocation=OpenLayers.Util.getImageLocation(img);var btn=OpenLayers.Util.createAlphaImageDiv(this.id+"_"+id,xy,sz,imgLocation,"absolute");btn.style.cursor="pointer";this.div.appendChild(btn);btn.action=id;btn.className="olButton";this.buttons.push(btn);return btn;},_removeButton:function(btn){this.div.removeChild(btn);OpenLayers.Util.removeItem(this.buttons,btn);},removeButtons:function(){for(var i=this.buttons.length-1;i>=0;--i){this._removeButton(this.buttons[i]);}},onButtonClick:function(evt){var btn=evt.buttonElement;switch(btn.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;}},getSlideFactor:function(dim){return this.slideRatio?this.map.getSize()[dim]*this.slideRatio:this.slideFactor;},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Control.PanZoomBar=OpenLayers.Class(OpenLayers.Control.PanZoom,{zoomStopWidth:18,zoomStopHeight:11,slider:null,sliderEvents:null,zoombarDiv:null,zoomWorldIcon:false,panIcons:true,forceFixedZoomLevel:false,mouseDragStart:null,deltaY:null,zoomStart:null,destroy:function(){this._removeZoomBar();this.map.events.un({"changebaselayer":this.redraw,scope:this});OpenLayers.Control.PanZoom.prototype.destroy.apply(this,arguments);delete this.mouseDragStart;delete this.zoomStart;},setMap:function(map){OpenLayers.Control.PanZoom.prototype.setMap.apply(this,arguments);this.map.events.register("changebaselayer",this,this.redraw);},redraw:function(){if(this.div!=null){this.removeButtons();this._removeZoomBar();} +this.draw();},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position.clone();this.buttons=[];var sz={w:18,h:18};if(this.panIcons){var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);var wposition=sz.w;if(this.zoomWorldIcon){centered=new OpenLayers.Pixel(px.x+sz.w,px.y);} this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);if(this.zoomWorldIcon){this._addButton("zoomworld","zoom-world-mini.png",px.add(sz.w,0),sz);wposition*=2;} this._addButton("panright","east-mini.png",px.add(wposition,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);centered=this._addZoomBar(centered.add(0,sz.h*4+5));this._addButton("zoomout","zoom-minus-mini.png",centered,sz);} else{this._addButton("zoomin","zoom-plus-mini.png",px,sz);centered=this._addZoomBar(px.add(0,sz.h));this._addButton("zoomout","zoom-minus-mini.png",centered,sz);if(this.zoomWorldIcon){centered=centered.add(0,sz.h+3);this._addButton("zoomworld","zoom-world-mini.png",centered,sz);}} -return this.div;},_addZoomBar:function(centered){var imgLocation=OpenLayers.Util.getImageLocation("slider.png");var id=this.id+"_"+this.map.id;var zoomsToEnd=this.map.getNumZoomLevels()-1-this.map.getZoom();var slider=OpenLayers.Util.createAlphaImageDiv(id,centered.add(-1,zoomsToEnd*this.zoomStopHeight),new OpenLayers.Size(20,9),imgLocation,"absolute");slider.style.cursor="move";this.slider=slider;this.sliderEvents=new OpenLayers.Events(this,slider,null,true,{includeXY:true});this.sliderEvents.on({"touchstart":this.zoomBarDown,"touchmove":this.zoomBarDrag,"touchend":this.zoomBarUp,"mousedown":this.zoomBarDown,"mousemove":this.zoomBarDrag,"mouseup":this.zoomBarUp,"dblclick":this.doubleClick,"click":this.doubleClick});var sz=new OpenLayers.Size();sz.h=this.zoomStopHeight*this.map.getNumZoomLevels();sz.w=this.zoomStopWidth;var imgLocation=OpenLayers.Util.getImageLocation("zoombar.png");var div=null;if(OpenLayers.Util.alphaHack()){var id=this.id+"_"+this.map.id;div=OpenLayers.Util.createAlphaImageDiv(id,centered,new OpenLayers.Size(sz.w,this.zoomStopHeight),imgLocation,"absolute",null,"crop");div.style.height=sz.h+"px";}else{div=OpenLayers.Util.createDiv('OpenLayers_Control_PanZoomBar_Zoombar'+this.map.id,centered,sz,imgLocation);} -div.style.cursor="pointer";this.zoombarDiv=div;this.divEvents=new OpenLayers.Events(this,div,null,true,{includeXY:true});this.divEvents.on({"touchmove":this.passEventToSlider,"mousedown":this.divClick,"mousemove":this.passEventToSlider,"dblclick":this.doubleClick,"click":this.doubleClick});this.div.appendChild(div);this.startTop=parseInt(div.style.top);this.div.appendChild(slider);this.map.events.register("zoomend",this,this.moveZoomBar);centered=centered.add(0,this.zoomStopHeight*this.map.getNumZoomLevels());return centered;},_removeZoomBar:function(){this.sliderEvents.un({"touchmove":this.zoomBarDrag,"mousedown":this.zoomBarDown,"mousemove":this.zoomBarDrag,"mouseup":this.zoomBarUp,"dblclick":this.doubleClick,"click":this.doubleClick});this.sliderEvents.destroy();this.divEvents.un({"touchmove":this.passEventToSlider,"mousedown":this.divClick,"mousemove":this.passEventToSlider,"dblclick":this.doubleClick,"click":this.doubleClick});this.divEvents.destroy();this.div.removeChild(this.zoombarDiv);this.zoombarDiv=null;this.div.removeChild(this.slider);this.slider=null;this.map.events.unregister("zoomend",this,this.moveZoomBar);},passEventToSlider:function(evt){this.sliderEvents.handleBrowserEvent(evt);},divClick:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;} -var levels=evt.xy.y/this.zoomStopHeight;if(this.forceFixedZoomLevel||!this.map.fractionalZoom){levels=Math.floor(levels);} -var zoom=(this.map.getNumZoomLevels()-1)-levels;zoom=Math.min(Math.max(zoom,0),this.map.getNumZoomLevels()-1);this.map.zoomTo(zoom);OpenLayers.Event.stop(evt);},zoomBarDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)&&!OpenLayers.Event.isSingleTouch(evt)){return;} +return this.div;},_addZoomBar:function(centered){var imgLocation=OpenLayers.Util.getImageLocation("slider.png");var id=this.id+"_"+this.map.id;var zoomsToEnd=this.map.getNumZoomLevels()-1-this.map.getZoom();var slider=OpenLayers.Util.createAlphaImageDiv(id,centered.add(-1,zoomsToEnd*this.zoomStopHeight),{w:20,h:9},imgLocation,"absolute");slider.style.cursor="move";this.slider=slider;this.sliderEvents=new OpenLayers.Events(this,slider,null,true,{includeXY:true});this.sliderEvents.on({"touchstart":this.zoomBarDown,"touchmove":this.zoomBarDrag,"touchend":this.zoomBarUp,"mousedown":this.zoomBarDown,"mousemove":this.zoomBarDrag,"mouseup":this.zoomBarUp});var sz={w:this.zoomStopWidth,h:this.zoomStopHeight*this.map.getNumZoomLevels()};var imgLocation=OpenLayers.Util.getImageLocation("zoombar.png");var div=null;if(OpenLayers.Util.alphaHack()){var id=this.id+"_"+this.map.id;div=OpenLayers.Util.createAlphaImageDiv(id,centered,{w:sz.w,h:this.zoomStopHeight},imgLocation,"absolute",null,"crop");div.style.height=sz.h+"px";}else{div=OpenLayers.Util.createDiv('OpenLayers_Control_PanZoomBar_Zoombar'+this.map.id,centered,sz,imgLocation);} +div.style.cursor="pointer";div.className="olButton";this.zoombarDiv=div;this.div.appendChild(div);this.startTop=parseInt(div.style.top);this.div.appendChild(slider);this.map.events.register("zoomend",this,this.moveZoomBar);centered=centered.add(0,this.zoomStopHeight*this.map.getNumZoomLevels());return centered;},_removeZoomBar:function(){this.sliderEvents.un({"touchstart":this.zoomBarDown,"touchmove":this.zoomBarDrag,"touchend":this.zoomBarUp,"mousedown":this.zoomBarDown,"mousemove":this.zoomBarDrag,"mouseup":this.zoomBarUp});this.sliderEvents.destroy();this.div.removeChild(this.zoombarDiv);this.zoombarDiv=null;this.div.removeChild(this.slider);this.slider=null;this.map.events.unregister("zoomend",this,this.moveZoomBar);},onButtonClick:function(evt){OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this,arguments);if(evt.buttonElement===this.zoombarDiv){var levels=evt.buttonXY.y/this.zoomStopHeight;if(this.forceFixedZoomLevel||!this.map.fractionalZoom){levels=Math.floor(levels);} +var zoom=(this.map.getNumZoomLevels()-1)-levels;zoom=Math.min(Math.max(zoom,0),this.map.getNumZoomLevels()-1);this.map.zoomTo(zoom);}},passEventToSlider:function(evt){this.sliderEvents.handleBrowserEvent(evt);},zoomBarDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)&&!OpenLayers.Event.isSingleTouch(evt)){return;} this.map.events.on({"touchmove":this.passEventToSlider,"mousemove":this.passEventToSlider,"mouseup":this.passEventToSlider,scope:this});this.mouseDragStart=evt.xy.clone();this.zoomStart=evt.xy.clone();this.div.style.cursor="move";this.zoombarDiv.offsets=null;OpenLayers.Event.stop(evt);},zoomBarDrag:function(evt){if(this.mouseDragStart!=null){var deltaY=this.mouseDragStart.y-evt.xy.y;var offsets=OpenLayers.Util.pagePosition(this.zoombarDiv);if((evt.clientY-offsets[1])>0&&(evt.clientY-offsets[1])<parseInt(this.zoombarDiv.style.height)-2){var newTop=parseInt(this.slider.style.top)-deltaY;this.slider.style.top=newTop+"px";this.mouseDragStart=evt.xy.clone();} this.deltaY=this.zoomStart.y-evt.xy.y;OpenLayers.Event.stop(evt);}},zoomBarUp:function(evt){if(!OpenLayers.Event.isLeftClick(evt)&&evt.type!=="touchend"){return;} if(this.mouseDragStart){this.div.style.cursor="";this.map.events.un({"touchmove":this.passEventToSlider,"mouseup":this.passEventToSlider,"mousemove":this.passEventToSlider,scope:this});var zoomLevel=this.map.zoom;if(!this.forceFixedZoomLevel&&this.map.fractionalZoom){zoomLevel+=this.deltaY/this.zoomStopHeight;zoomLevel=Math.min(Math.max(zoomLevel,0),this.map.getNumZoomLevels()-1);}else{zoomLevel+=this.deltaY/this.zoomStopHeight;zoomLevel=Math.max(Math.round(zoomLevel),0);} @@ -419,10 +349,10 @@ OpenLayers.Util.applyDefaults(obj,this);return obj;},calculateBounds:function(){ return result;},equals:function(geom){var equals=false;if(geom!=null){equals=((this.x==geom.x&&this.y==geom.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(geom.x)&&isNaN(geom.y)));} return equals;},toShortString:function(){return(this.x+", "+this.y);},move:function(x,y){this.x=this.x+x;this.y=this.y+y;this.clearBounds();},rotate:function(angle,origin){angle*=Math.PI/180;var radius=this.distanceTo(origin);var theta=angle+Math.atan2(this.y-origin.y,this.x-origin.x);this.x=origin.x+(radius*Math.cos(theta));this.y=origin.y+(radius*Math.sin(theta));this.clearBounds();},getCentroid:function(){return new OpenLayers.Geometry.Point(this.x,this.y);},resize:function(scale,origin,ratio){ratio=(ratio==undefined)?1:ratio;this.x=origin.x+(scale*ratio*(this.x-origin.x));this.y=origin.y+(scale*(this.y-origin.y));this.clearBounds();return this;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.equals(geometry);}else{intersect=geometry.intersects(this);} return intersect;},transform:function(source,dest){if((source&&dest)){OpenLayers.Projection.transform(this,source,dest);this.bounds=null;} -return this;},getVertices:function(nodes){return[this];},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},addPoint:function(point,index){this.addComponent(point,index);},removePoint:function(point){this.removeComponent(point);},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(points){OpenLayers.Geometry.MultiPoint.prototype.initialize.apply(this,arguments);},getLength:function(){var length=0.0;if(this.components&&(this.components.length>1)){for(var i=1,len=this.components.length;i<len;i++){length+=this.components[i-1].distanceTo(this.components[i]);}} +return this;},getVertices:function(nodes){return[this];},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],addPoint:function(point,index){this.addComponent(point,index);},removePoint:function(point){this.removeComponent(point);},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],getLength:function(){var length=0.0;if(this.components&&(this.components.length>1)){for(var i=1,len=this.components.length;i<len;i++){length+=this.components[i-1].distanceTo(this.components[i]);}} return length;},getGeodesicLength:function(projection){var geom=this;if(projection){var gg=new OpenLayers.Projection("EPSG:4326");if(!gg.equals(projection)){geom=this.clone().transform(projection,gg);}} var length=0.0;if(geom.components&&(geom.components.length>1)){var p1,p2;for(var i=1,len=geom.components.length;i<len;i++){p1=geom.components[i-1];p2=geom.components[i];length+=OpenLayers.Util.distVincenty({lon:p1.x,lat:p1.y},{lon:p2.x,lat:p2.y});}} -return length*1000;},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{initialize:function(points){OpenLayers.Geometry.Curve.prototype.initialize.apply(this,arguments);},removeComponent:function(point){var removed=this.components&&(this.components.length>2);if(removed){OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);} +return length*1000;},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{removeComponent:function(point){var removed=this.components&&(this.components.length>2);if(removed){OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);} return removed;},intersects:function(geometry){var intersect=false;var type=geometry.CLASS_NAME;if(type=="OpenLayers.Geometry.LineString"||type=="OpenLayers.Geometry.LinearRing"||type=="OpenLayers.Geometry.Point"){var segs1=this.getSortedSegments();var segs2;if(type=="OpenLayers.Geometry.Point"){segs2=[{x1:geometry.x,y1:geometry.y,x2:geometry.x,y2:geometry.y}];}else{segs2=geometry.getSortedSegments();} var seg1,seg1x1,seg1x2,seg1y1,seg1y2,seg2,seg2y1,seg2y2;outer:for(var i=0,len=segs1.length;i<len;++i){seg1=segs1[i];seg1x1=seg1.x1;seg1x2=seg1.x2;seg1y1=seg1.y1;seg1y2=seg1.y2;inner:for(var j=0,jlen=segs2.length;j<jlen;++j){seg2=segs2[j];if(seg2.x1>seg1x2){break;} if(seg2.x2<seg1x1){continue;} @@ -456,7 +386,7 @@ var compareNumbers=function(a,b){return(a-b);};var douglasPeuckerReduction=funct if(maxDistance>tolerance&&indexFarthest!=firstPoint){pointIndexsToKeep.push(indexFarthest);douglasPeuckerReduction(points,firstPoint,indexFarthest,tolerance);douglasPeuckerReduction(points,indexFarthest,lastPoint,tolerance);}};var perpendicularDistance=function(point1,point2,point){var area=Math.abs(0.5*(point1.x*point2.y+point2.x*point.y+point.x*point1.y-point2.x*point1.y-point.x*point2.y-point1.x*point.y));var bottom=Math.sqrt(Math.pow(point1.x-point2.x,2)+Math.pow(point1.y-point2.y,2));var height=area/bottom*2;return height;};var firstPoint=0;var lastPoint=points.length-1;var pointIndexsToKeep=[];pointIndexsToKeep.push(firstPoint);pointIndexsToKeep.push(lastPoint);while(points[firstPoint].equals(points[lastPoint])){lastPoint--;pointIndexsToKeep.push(lastPoint);} douglasPeuckerReduction(points,firstPoint,lastPoint,tolerance);var returnPoints=[];pointIndexsToKeep.sort(compareNumbers);for(var index=0;index<pointIndexsToKeep.length;index++){returnPoints.push(points[pointIndexsToKeep[index]]);} return new OpenLayers.Geometry.LineString(returnPoints);} -else{return this;}},CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(points){OpenLayers.Geometry.LineString.prototype.initialize.apply(this,arguments);},addComponent:function(point,index){var added=false;var lastPoint=this.components.pop();if(index!=null||!point.equals(lastPoint)){added=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments);} +else{return this;}},CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],addComponent:function(point,index){var added=false;var lastPoint=this.components.pop();if(index!=null||!point.equals(lastPoint)){added=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments);} var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);return added;},removeComponent:function(point){var removed=this.components&&(this.components.length>3);if(removed){this.components.pop();OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);} return removed;},move:function(x,y){for(var i=0,len=this.components.length;i<len-1;i++){this.components[i].move(x,y);}},rotate:function(angle,origin){for(var i=0,len=this.components.length;i<len-1;++i){this.components[i].rotate(angle,origin);}},resize:function(scale,origin,ratio){for(var i=0,len=this.components.length;i<len-1;++i){this.components[i].resize(scale,origin,ratio);} return this;},transform:function(source,dest){if(source&&dest){for(var i=0,len=this.components.length;i<len-1;i++){var component=this.components[i];component.transform(source,dest);} @@ -468,7 +398,7 @@ return area;},getGeodesicArea:function(projection){var ring=this;if(projection){ var area=0.0;var len=ring.components&&ring.components.length;if(len>2){var p1,p2;for(var i=0;i<len-1;i++){p1=ring.components[i];p2=ring.components[i+1];area+=OpenLayers.Util.rad(p2.x-p1.x)*(2+Math.sin(OpenLayers.Util.rad(p1.y))+ Math.sin(OpenLayers.Util.rad(p2.y)));} area=area*6378137.0*6378137.0/2.0;} -return area;},containsPoint:function(point){var approx=OpenLayers.Number.limitSigDigs;var digs=14;var px=approx(point.x,digs);var py=approx(point.y,digs);function getX(y,x1,y1,x2,y2){return(((x1-x2)*y)+((x2*y1)-(x1*y2)))/(y1-y2);} +return area;},containsPoint:function(point){var approx=OpenLayers.Number.limitSigDigs;var digs=14;var px=approx(point.x,digs);var py=approx(point.y,digs);function getX(y,x1,y1,x2,y2){return(y-y2)*((x2-x1)/(y2-y1))+x2;} var numSeg=this.components.length-1;var start,end,x1,y1,x2,y2,cx,cy;var crosses=0;for(var i=0;i<numSeg;++i){start=this.components[i];x1=approx(start.x,digs);y1=approx(start.y,digs);end=this.components[i+1];x2=approx(end.x,digs);y2=approx(end.y,digs);if(y1==y2){if(py==y1){if(x1<=x2&&(px>=x1&&px<=x2)||x1>=x2&&(px<=x1&&px>=x2)){crosses=-1;break;}} continue;} cx=approx(getX(py,x1,y1,x2,y2),digs);if(cx==px){if(y1<y2&&(py>=y1&&py<=y2)||y1>y2&&(py<=y1&&py>=y2)){crosses=-1;break;}} @@ -476,14 +406,284 @@ if(cx<=px){continue;} if(x1!=x2&&(cx<Math.min(x1,x2)||cx>Math.max(x1,x2))){continue;} if(y1<y2&&(py>=y1&&py<y2)||y1>y2&&(py<y1&&py>=y2)){++crosses;}} var contained=(crosses==-1)?1:!!(crosses&1);return contained;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"){intersect=geometry.intersects(this);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){intersect=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[geometry]);}else{for(var i=0,len=geometry.components.length;i<len;++i){intersect=geometry.components[i].intersects(this);if(intersect){break;}}} -return intersect;},getVertices:function(nodes){return(nodes===true)?[]:this.components.slice(0,this.components.length-1);},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:false,size:null,resolution:null,map:null,initialize:function(containerID,options){this.container=OpenLayers.Util.getElement(containerID);OpenLayers.Util.extend(this,options);},destroy:function(){this.container=null;this.extent=null;this.size=null;this.resolution=null;this.map=null;},supported:function(){return false;},setExtent:function(extent,resolutionChanged){this.extent=extent.clone();if(resolutionChanged){this.resolution=null;}},setSize:function(size){this.size=size.clone();this.resolution=null;},getResolution:function(){this.resolution=this.resolution||this.map.getResolution();return this.resolution;},drawFeature:function(feature,style){if(style==null){style=feature.style;} -if(feature.geometry){var bounds=feature.geometry.getBounds();if(bounds){if(!bounds.intersectsBounds(this.extent)){style={display:"none"};} +return intersect;},getVertices:function(nodes){return(nodes===true)?[]:this.components.slice(0,this.components.length-1);},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Animation=(function(window){var isNative=!!(window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame);var requestFrame=(function(){var request=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(callback,element){window.setTimeout(callback,16);};return function(callback,element){request.apply(window,[callback,element]);};})();var counter=0;var loops={};function start(callback,duration,element){duration=duration>0?duration:Number.POSITIVE_INFINITY;var id=++counter;var start=+new Date;loops[id]=function(){if(loops[id]&&+new Date-start<=duration){callback();if(loops[id]){requestFrame(loops[id],element);}}else{delete loops[id];}};requestFrame(loops[id],element);return id;} +function stop(id){delete loops[id];} +return{isNative:isNative,requestFrame:requestFrame,start:start,stop:stop};})(window);OpenLayers.Tween=OpenLayers.Class({easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,animationId:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;OpenLayers.Animation.stop(this.animationId);this.animationId=null;if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);} +this.animationId=OpenLayers.Animation.start(OpenLayers.Function.bind(this.play,this));},stop:function(){if(!this.playing){return;} +if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);} +OpenLayers.Animation.stop(this.animationId);this.animationId=null;this.playing=false;},play:function(){var value={};for(var i in this.begin){var b=this.begin[i];var f=this.finish[i];if(b==null||f==null||isNaN(b)||isNaN(f)){throw new TypeError('invalid value for Tween');} +var c=f-b;value[i]=this.easing.apply(this,[this.time,b,c,this.duration]);} +this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,value);} +if(this.time>this.duration){this.stop();}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(t,b,c,d){return c*t/d+b;},easeOut:function(t,b,c,d){return c*t/d+b;},easeInOut:function(t,b,c,d){return c*t/d+b;},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(t,b,c,d){return(t==0)?b:c*Math.pow(2,10*(t/d-1))+b;},easeOut:function(t,b,c,d){return(t==d)?b+c:c*(-Math.pow(2,-10*t/d)+1)+b;},easeInOut:function(t,b,c,d){if(t==0)return b;if(t==d)return b+c;if((t/=d/2)<1)return c/2*Math.pow(2,10*(t-1))+b;return c/2*(-Math.pow(2,-10*--t)+2)+b;},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(t,b,c,d){return c*(t/=d)*t+b;},easeOut:function(t,b,c,d){return-c*(t/=d)*(t-2)+b;},easeInOut:function(t,b,c,d){if((t/=d/2)<1)return c/2*t*t+b;return-c/2*((--t)*(t-2)-1)+b;},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,titleRegEx:/\+title=[^\+]*/,initialize:function(projCode,options){OpenLayers.Util.extend(this,options);this.projCode=projCode;if(window.Proj4js){this.proj=new Proj4js.Proj(projCode);}},getCode:function(){return this.proj?this.proj.srsCode:this.projCode;},getUnits:function(){return this.proj?this.proj.units:null;},toString:function(){return this.getCode();},equals:function(projection){var p=projection,equals=false;if(p){if(!(p instanceof OpenLayers.Projection)){p=new OpenLayers.Projection(p);} +if(window.Proj4js&&this.proj.defData&&p.proj.defData){equals=this.proj.defData.replace(this.titleRegEx,"")==p.proj.defData.replace(this.titleRegEx,"");}else if(p.getCode){var source=this.getCode(),target=p.getCode();equals=source==target||!!OpenLayers.Projection.transforms[source]&&OpenLayers.Projection.transforms[source][target]===OpenLayers.Projection.nullTransform;}} +return equals;},destroy:function(){delete this.proj;delete this.projCode;},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};OpenLayers.Projection.defaults={"EPSG:4326":{units:"degrees",maxExtent:[-180,-90,180,90],yx:true},"CRS:84":{units:"degrees",maxExtent:[-180,-90,180,90]},"EPSG:900913":{units:"m",maxExtent:[-20037508.34,-20037508.34,20037508.34,20037508.34]}};OpenLayers.Projection.addTransform=function(from,to,method){if(method===OpenLayers.Projection.nullTransform){var defaults=OpenLayers.Projection.defaults[from];if(defaults&&!OpenLayers.Projection.defaults[to]){OpenLayers.Projection.defaults[to]=defaults;}} +if(!OpenLayers.Projection.transforms[from]){OpenLayers.Projection.transforms[from]={};} +OpenLayers.Projection.transforms[from][to]=method;};OpenLayers.Projection.transform=function(point,source,dest){if(source&&dest){if(!(source instanceof OpenLayers.Projection)){source=new OpenLayers.Projection(source);} +if(!(dest instanceof OpenLayers.Projection)){dest=new OpenLayers.Projection(dest);} +if(source.proj&&dest.proj){point=Proj4js.transform(source.proj,dest.proj,point);}else{var sourceCode=source.getCode();var destCode=dest.getCode();var transforms=OpenLayers.Projection.transforms;if(transforms[sourceCode]&&transforms[sourceCode][destCode]){transforms[sourceCode][destCode](point);}}} +return point;};OpenLayers.Projection.nullTransform=function(point){return point;};(function(){var pole=20037508.34;function inverseMercator(xy){xy.x=180*xy.x/pole;xy.y=180/Math.PI*(2*Math.atan(Math.exp((xy.y/pole)*Math.PI))-Math.PI/2);return xy;} +function forwardMercator(xy){xy.x=xy.x*pole/180;xy.y=Math.log(Math.tan((90+xy.y)*Math.PI/360))/Math.PI*pole;return xy;} +function map(base,codes){var add=OpenLayers.Projection.addTransform;var same=OpenLayers.Projection.nullTransform;var i,len,code,other,j;for(i=0,len=codes.length;i<len;++i){code=codes[i];add(base,code,forwardMercator);add(code,base,inverseMercator);for(j=i+1;j<len;++j){other=codes[j];add(code,other,same);add(other,code,same);}}} +var mercator=["EPSG:900913","EPSG:3857","EPSG:102113","EPSG:102100"],geographic=["CRS:84","urn:ogc:def:crs:EPSG:6.6:4326","EPSG:4326"],i;for(i=mercator.length-1;i>=0;--i){map(mercator[i],geographic);} +for(i=geographic.length-1;i>=0;--i){map(geographic[i],mercator);}})();OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1000},id:null,fractionalZoom:false,events:null,allOverlays:false,div:null,dragging:false,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,options:null,tileSize:null,projection:"EPSG:4326",units:null,resolutions:null,maxResolution:null,minResolution:null,maxScale:null,minScale:null,maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:true,panTween:null,eventListeners:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,paddingForPopups:null,minPx:null,maxPx:null,initialize:function(div,options){if(arguments.length===1&&typeof div==="object"){options=div;div=options&&options.div;} +this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,OpenLayers.Map.TILE_HEIGHT);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+'theme/default/style.css';this.options=OpenLayers.Util.extend({},options);OpenLayers.Util.extend(this,options);var projCode=this.projection instanceof OpenLayers.Projection?this.projection.projCode:this.projection;OpenLayers.Util.applyDefaults(this,OpenLayers.Projection.defaults[projCode]);if(this.maxExtent&&!(this.maxExtent instanceof OpenLayers.Bounds)){this.maxExtent=new OpenLayers.Bounds(this.maxExtent);} +if(this.minExtent&&!(this.minExtent instanceof OpenLayers.Bounds)){this.minExtent=new OpenLayers.Bounds(this.minExtent);} +if(this.restrictedExtent&&!(this.restrictedExtent instanceof OpenLayers.Bounds)){this.restrictedExtent=new OpenLayers.Bounds(this.restrictedExtent);} +if(this.center&&!(this.center instanceof OpenLayers.LonLat)){this.center=new OpenLayers.LonLat(this.center);} +this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(div);if(!this.div){this.div=document.createElement("div");this.div.style.height="1px";this.div.style.width="1px";} +OpenLayers.Element.addClass(this.div,'olMap');var id=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(id,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);this.events=new OpenLayers.Events(this,this.viewPortDiv,null,this.fallThrough,{includeXY:true});id=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(id);this.layerContainerDiv.style.width='100px';this.layerContainerDiv.style.height='100px';this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;this.viewPortDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} +if(parseFloat(navigator.appVersion.split("MSIE")[1])<9){this.events.register("resize",this,this.updateSize);}else{this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this);OpenLayers.Event.observe(window,'resize',this.updateSizeDestroy);} +if(this.theme){var addNode=true;var nodes=document.getElementsByTagName('link');for(var i=0,len=nodes.length;i<len;++i){if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href,this.theme)){addNode=false;break;}} +if(addNode){var cssNode=document.createElement('link');cssNode.setAttribute('rel','stylesheet');cssNode.setAttribute('type','text/css');cssNode.setAttribute('href',this.theme);document.getElementsByTagName('head')[0].appendChild(cssNode);}} +if(this.controls==null){this.controls=[];if(OpenLayers.Control!=null){if(OpenLayers.Control.Navigation){this.controls.push(new OpenLayers.Control.Navigation());}else if(OpenLayers.Control.TouchNavigation){this.controls.push(new OpenLayers.Control.TouchNavigation());} +if(OpenLayers.Control.Zoom){this.controls.push(new OpenLayers.Control.Zoom());}else if(OpenLayers.Control.PanZoom){this.controls.push(new OpenLayers.Control.PanZoom());} +if(OpenLayers.Control.ArgParser){this.controls.push(new OpenLayers.Control.ArgParser());} +if(OpenLayers.Control.Attribution){this.controls.push(new OpenLayers.Control.Attribution());}}} +for(var i=0,len=this.controls.length;i<len;i++){this.addControlToMap(this.controls[i]);} +this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,'unload',this.unloadDestroy);if(options&&options.layers){delete this.center;this.addLayers(options.layers);if(options.center&&!this.getCenter()){this.setCenter(options.center,options.zoom);}}},getViewport:function(){return this.viewPortDiv;},render:function(div){this.div=OpenLayers.Util.getElement(div);OpenLayers.Element.addClass(this.div,'olMap');this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);this.div.appendChild(this.viewPortDiv);this.updateSize();},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy){return false;} +if(this.panTween){this.panTween.stop();this.panTween=null;} +OpenLayers.Event.stopObserving(window,'unload',this.unloadDestroy);this.unloadDestroy=null;if(this.updateSizeDestroy){OpenLayers.Event.stopObserving(window,'resize',this.updateSizeDestroy);}else{this.events.unregister("resize",this,this.updateSize);} +this.paddingForPopups=null;if(this.controls!=null){for(var i=this.controls.length-1;i>=0;--i){this.controls[i].destroy();} +this.controls=null;} +if(this.layers!=null){for(var i=this.layers.length-1;i>=0;--i){this.layers[i].destroy(false);} +this.layers=null;} +if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv);} +this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null;} +this.events.destroy();this.events=null;this.options=null;},setOptions:function(options){var updatePxExtent=this.minPx&&options.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,options);updatePxExtent&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:true});},getTileSize:function(){return this.tileSize;},getBy:function(array,property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this[array],function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getLayersBy:function(property,match){return this.getBy("layers",property,match);},getLayersByName:function(match){return this.getLayersBy("name",match);},getLayersByClass:function(match){return this.getLayersBy("CLASS_NAME",match);},getControlsBy:function(property,match){return this.getBy("controls",property,match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},getLayer:function(id){var foundLayer=null;for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];if(layer.id==id){foundLayer=layer;break;}} +return foundLayer;},setLayerZIndex:function(layer,zIdx){layer.setZIndex(this.Z_INDEX_BASE[layer.isBaseLayer?'BaseLayer':'Overlay'] ++zIdx*5);},resetLayersZIndex:function(){for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];this.setLayerZIndex(layer,i);}},addLayer:function(layer){for(var i=0,len=this.layers.length;i<len;i++){if(this.layers[i]==layer){return false;}} +if(this.events.triggerEvent("preaddlayer",{layer:layer})===false){return false;} +if(this.allOverlays){layer.isBaseLayer=false;} +layer.div.className="olLayerDiv";layer.div.style.overflow="";this.setLayerZIndex(layer,this.layers.length);if(layer.isFixed){this.viewPortDiv.appendChild(layer.div);}else{this.layerContainerDiv.appendChild(layer.div);} +this.layers.push(layer);layer.setMap(this);if(layer.isBaseLayer||(this.allOverlays&&!this.baseLayer)){if(this.baseLayer==null){this.setBaseLayer(layer);}else{layer.setVisibility(false);}}else{layer.redraw();} +this.events.triggerEvent("addlayer",{layer:layer});layer.events.triggerEvent("added",{map:this,layer:layer});layer.afterAdd();return true;},addLayers:function(layers){for(var i=0,len=layers.length;i<len;i++){this.addLayer(layers[i]);}},removeLayer:function(layer,setNewBaseLayer){if(this.events.triggerEvent("preremovelayer",{layer:layer})===false){return;} +if(setNewBaseLayer==null){setNewBaseLayer=true;} +if(layer.isFixed){this.viewPortDiv.removeChild(layer.div);}else{this.layerContainerDiv.removeChild(layer.div);} +OpenLayers.Util.removeItem(this.layers,layer);layer.removeMap(this);layer.map=null;if(this.baseLayer==layer){this.baseLayer=null;if(setNewBaseLayer){for(var i=0,len=this.layers.length;i<len;i++){var iLayer=this.layers[i];if(iLayer.isBaseLayer||this.allOverlays){this.setBaseLayer(iLayer);break;}}}} +this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:layer});layer.events.triggerEvent("removed",{map:this,layer:layer});},getNumLayers:function(){return this.layers.length;},getLayerIndex:function(layer){return OpenLayers.Util.indexOf(this.layers,layer);},setLayerIndex:function(layer,idx){var base=this.getLayerIndex(layer);if(idx<0){idx=0;}else if(idx>this.layers.length){idx=this.layers.length;} +if(base!=idx){this.layers.splice(base,1);this.layers.splice(idx,0,layer);for(var i=0,len=this.layers.length;i<len;i++){this.setLayerZIndex(this.layers[i],i);} +this.events.triggerEvent("changelayer",{layer:layer,property:"order"});if(this.allOverlays){if(idx===0){this.setBaseLayer(layer);}else if(this.baseLayer!==this.layers[0]){this.setBaseLayer(this.layers[0]);}}}},raiseLayer:function(layer,delta){var idx=this.getLayerIndex(layer)+delta;this.setLayerIndex(layer,idx);},setBaseLayer:function(newBaseLayer){if(newBaseLayer!=this.baseLayer){if(OpenLayers.Util.indexOf(this.layers,newBaseLayer)!=-1){var center=this.getCachedCenter();var newResolution=OpenLayers.Util.getResolutionFromScale(this.getScale(),newBaseLayer.units);if(this.baseLayer!=null&&!this.allOverlays){this.baseLayer.setVisibility(false);} +this.baseLayer=newBaseLayer;if(!this.allOverlays||this.baseLayer.visibility){this.baseLayer.setVisibility(true);if(this.baseLayer.inRange===false){this.baseLayer.redraw();}} +if(center!=null){var newZoom=this.getZoomForResolution(newResolution||this.resolution,true);this.setCenter(center,newZoom,false,true);} +this.events.triggerEvent("changebaselayer",{layer:this.baseLayer});}}},addControl:function(control,px){this.controls.push(control);this.addControlToMap(control,px);},addControls:function(controls,pixels){var pxs=(arguments.length===1)?[]:pixels;for(var i=0,len=controls.length;i<len;i++){var ctrl=controls[i];var px=(pxs[i])?pxs[i]:null;this.addControl(ctrl,px);}},addControlToMap:function(control,px){control.outsideViewport=(control.div!=null);if(this.displayProjection&&!control.displayProjection){control.displayProjection=this.displayProjection;} +control.setMap(this);var div=control.draw(px);if(div){if(!control.outsideViewport){div.style.zIndex=this.Z_INDEX_BASE['Control']+ +this.controls.length;this.viewPortDiv.appendChild(div);}} +if(control.autoActivate){control.activate();}},getControl:function(id){var returnControl=null;for(var i=0,len=this.controls.length;i<len;i++){var control=this.controls[i];if(control.id==id){returnControl=control;break;}} +return returnControl;},removeControl:function(control){if((control)&&(control==this.getControl(control.id))){if(control.div&&(control.div.parentNode==this.viewPortDiv)){this.viewPortDiv.removeChild(control.div);} +OpenLayers.Util.removeItem(this.controls,control);}},addPopup:function(popup,exclusive){if(exclusive){for(var i=this.popups.length-1;i>=0;--i){this.removePopup(this.popups[i]);}} +popup.map=this;this.popups.push(popup);var popupDiv=popup.draw();if(popupDiv){popupDiv.style.zIndex=this.Z_INDEX_BASE['Popup']+ +this.popups.length;this.layerContainerDiv.appendChild(popupDiv);}},removePopup:function(popup){OpenLayers.Util.removeItem(this.popups,popup);if(popup.div){try{this.layerContainerDiv.removeChild(popup.div);} +catch(e){}} +popup.map=null;},getSize:function(){var size=null;if(this.size!=null){size=this.size.clone();} +return size;},updateSize:function(){var newSize=this.getCurrentSize();if(newSize&&!isNaN(newSize.h)&&!isNaN(newSize.w)){this.events.clearMouseCache();var oldSize=this.getSize();if(oldSize==null){this.size=oldSize=newSize;} +if(!newSize.equals(oldSize)){this.size=newSize;for(var i=0,len=this.layers.length;i<len;i++){this.layers[i].onMapResize();} +var center=this.getCachedCenter();if(this.baseLayer!=null&¢er!=null){var zoom=this.getZoom();this.zoom=null;this.setCenter(center,zoom);}}}},getCurrentSize:function(){var size=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=this.div.offsetWidth;size.h=this.div.offsetHeight;} +if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=parseInt(this.div.style.width);size.h=parseInt(this.div.style.height);} +return size;},calculateBounds:function(center,resolution){var extent=null;if(center==null){center=this.getCachedCenter();} +if(resolution==null){resolution=this.getResolution();} +if((center!=null)&&(resolution!=null)){var halfWDeg=(this.size.w*resolution)/2;var halfHDeg=(this.size.h*resolution)/2;extent=new OpenLayers.Bounds(center.lon-halfWDeg,center.lat-halfHDeg,center.lon+halfWDeg,center.lat+halfHDeg);} +return extent;},getCenter:function(){var center=null;var cachedCenter=this.getCachedCenter();if(cachedCenter){center=cachedCenter.clone();} +return center;},getCachedCenter:function(){if(!this.center&&this.size){this.center=this.getLonLatFromViewPortPx({x:this.size.w/2,y:this.size.h/2});} +return this.center;},getZoom:function(){return this.zoom;},pan:function(dx,dy,options){options=OpenLayers.Util.applyDefaults(options,{animate:true,dragging:false});if(options.dragging){if(dx!=0||dy!=0){this.moveByPx(dx,dy);}}else{var centerPx=this.getViewPortPxFromLonLat(this.getCachedCenter());var newCenterPx=centerPx.add(dx,dy);if(this.dragging||!newCenterPx.equals(centerPx)){var newCenterLonLat=this.getLonLatFromViewPortPx(newCenterPx);if(options.animate){this.panTo(newCenterLonLat);}else{this.moveTo(newCenterLonLat);if(this.dragging){this.dragging=false;this.events.triggerEvent("moveend");}}}}},panTo:function(lonlat){if(this.panMethod&&this.getExtent().scale(this.panRatio).containsLonLat(lonlat)){if(!this.panTween){this.panTween=new OpenLayers.Tween(this.panMethod);} +var center=this.getCachedCenter();if(lonlat.equals(center)){return;} +var from=this.getPixelFromLonLat(center);var to=this.getPixelFromLonLat(lonlat);var vector={x:to.x-from.x,y:to.y-from.y};var last={x:0,y:0};this.panTween.start({x:0,y:0},vector,this.panDuration,{callbacks:{eachStep:OpenLayers.Function.bind(function(px){var x=px.x-last.x,y=px.y-last.y;this.moveByPx(x,y);last.x=Math.round(px.x);last.y=Math.round(px.y);},this),done:OpenLayers.Function.bind(function(px){this.moveTo(lonlat);this.dragging=false;this.events.triggerEvent("moveend");},this)}});}else{this.setCenter(lonlat);}},setCenter:function(lonlat,zoom,dragging,forceZoomChange){this.panTween&&this.panTween.stop();this.moveTo(lonlat,zoom,{'dragging':dragging,'forceZoomChange':forceZoomChange});},moveByPx:function(dx,dy){var hw=this.size.w/2;var hh=this.size.h/2;var x=hw+dx;var y=hh+dy;var wrapDateLine=this.baseLayer.wrapDateLine;var xRestriction=0;var yRestriction=0;if(this.restrictedExtent){xRestriction=hw;yRestriction=hh;wrapDateLine=false;} +dx=wrapDateLine||x<=this.maxPx.x-xRestriction&&x>=this.minPx.x+xRestriction?Math.round(dx):0;dy=y<=this.maxPx.y-yRestriction&&y>=this.minPx.y+yRestriction?Math.round(dy):0;if(dx||dy){if(!this.dragging){this.dragging=true;this.events.triggerEvent("movestart");} +this.center=null;if(dx){this.layerContainerDiv.style.left=parseInt(this.layerContainerDiv.style.left)-dx+"px";this.minPx.x-=dx;this.maxPx.x-=dx;} +if(dy){this.layerContainerDiv.style.top=parseInt(this.layerContainerDiv.style.top)-dy+"px";this.minPx.y-=dy;this.maxPx.y-=dy;} +var layer,i,len;for(i=0,len=this.layers.length;i<len;++i){layer=this.layers[i];if(layer.visibility&&(layer===this.baseLayer||layer.inRange)){layer.moveByPx(dx,dy);layer.events.triggerEvent("move");}} +this.events.triggerEvent("move");}},adjustZoom:function(zoom){var resolution,resolutions=this.baseLayer.resolutions,maxResolution=this.getMaxExtent().getWidth()/this.size.w;if(this.getResolutionForZoom(zoom)>maxResolution){for(var i=zoom|0,ii=resolutions.length;i<ii;++i){if(resolutions[i]<=maxResolution){zoom=i;break;}}} +return zoom;},moveTo:function(lonlat,zoom,options){if(lonlat!=null&&!(lonlat instanceof OpenLayers.LonLat)){lonlat=new OpenLayers.LonLat(lonlat);} +if(!options){options={};} +if(zoom!=null){zoom=parseFloat(zoom);if(!this.fractionalZoom){zoom=Math.round(zoom);}} +if(this.baseLayer.wrapDateLine){var requestedZoom=zoom;zoom=this.adjustZoom(zoom);if(zoom!==requestedZoom){lonlat=this.getCenter();}} +var dragging=options.dragging||this.dragging;var forceZoomChange=options.forceZoomChange;if(!this.getCachedCenter()&&!this.isValidLonLat(lonlat)){lonlat=this.maxExtent.getCenterLonLat();this.center=lonlat.clone();} +if(this.restrictedExtent!=null){if(lonlat==null){lonlat=this.center;} +if(zoom==null){zoom=this.getZoom();} +var resolution=this.getResolutionForZoom(zoom);var extent=this.calculateBounds(lonlat,resolution);if(!this.restrictedExtent.containsBounds(extent)){var maxCenter=this.restrictedExtent.getCenterLonLat();if(extent.getWidth()>this.restrictedExtent.getWidth()){lonlat=new OpenLayers.LonLat(maxCenter.lon,lonlat.lat);}else if(extent.left<this.restrictedExtent.left){lonlat=lonlat.add(this.restrictedExtent.left- +extent.left,0);}else if(extent.right>this.restrictedExtent.right){lonlat=lonlat.add(this.restrictedExtent.right- +extent.right,0);} +if(extent.getHeight()>this.restrictedExtent.getHeight()){lonlat=new OpenLayers.LonLat(lonlat.lon,maxCenter.lat);}else if(extent.bottom<this.restrictedExtent.bottom){lonlat=lonlat.add(0,this.restrictedExtent.bottom- +extent.bottom);} +else if(extent.top>this.restrictedExtent.top){lonlat=lonlat.add(0,this.restrictedExtent.top- +extent.top);}}} +var zoomChanged=forceZoomChange||((this.isValidZoomLevel(zoom))&&(zoom!=this.getZoom()));var centerChanged=(this.isValidLonLat(lonlat))&&(!lonlat.equals(this.center));if(zoomChanged||centerChanged||dragging){dragging||this.events.triggerEvent("movestart");if(centerChanged){if(!zoomChanged&&this.center){this.centerLayerContainer(lonlat);} +this.center=lonlat.clone();} +var res=zoomChanged?this.getResolutionForZoom(zoom):this.getResolution();if(zoomChanged||this.layerContainerOrigin==null){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px";var maxExtent=this.getMaxExtent({restricted:true});var maxExtentCenter=maxExtent.getCenterLonLat();var lonDelta=this.center.lon-maxExtentCenter.lon;var latDelta=maxExtentCenter.lat-this.center.lat;var extentWidth=Math.round(maxExtent.getWidth()/res);var extentHeight=Math.round(maxExtent.getHeight()/res);this.minPx={x:(this.size.w-extentWidth)/2-lonDelta/res,y:(this.size.h-extentHeight)/2-latDelta/res};this.maxPx={x:this.minPx.x+Math.round(maxExtent.getWidth()/res),y:this.minPx.y+Math.round(maxExtent.getHeight()/res)};} +if(zoomChanged){this.zoom=zoom;this.resolution=res;} +var bounds=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});} +bounds=this.baseLayer.getExtent();for(var i=this.layers.length-1;i>=0;--i){var layer=this.layers[i];if(layer!==this.baseLayer&&!layer.isBaseLayer){var inRange=layer.calculateInRange();if(layer.inRange!=inRange){layer.inRange=inRange;if(!inRange){layer.display(false);} +this.events.triggerEvent("changelayer",{layer:layer,property:"visibility"});} +if(inRange&&layer.visibility){layer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||layer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});}}} +this.events.triggerEvent("move");dragging||this.events.triggerEvent("moveend");if(zoomChanged){for(var i=0,len=this.popups.length;i<len;i++){this.popups[i].updatePosition();} +this.events.triggerEvent("zoomend");}}},centerLayerContainer:function(lonlat){var originPx=this.getViewPortPxFromLonLat(this.layerContainerOrigin);var newPx=this.getViewPortPxFromLonLat(lonlat);if((originPx!=null)&&(newPx!=null)){var oldLeft=parseInt(this.layerContainerDiv.style.left);var oldTop=parseInt(this.layerContainerDiv.style.top);var newLeft=Math.round(originPx.x-newPx.x);var newTop=Math.round(originPx.y-newPx.y);this.layerContainerDiv.style.left=newLeft+"px";this.layerContainerDiv.style.top=newTop+"px";var dx=oldLeft-newLeft;var dy=oldTop-newTop;this.minPx.x-=dx;this.maxPx.x-=dx;this.minPx.y-=dy;this.maxPx.y-=dy;}},isValidZoomLevel:function(zoomLevel){return((zoomLevel!=null)&&(zoomLevel>=0)&&(zoomLevel<this.getNumZoomLevels()));},isValidLonLat:function(lonlat){var valid=false;if(lonlat!=null){var maxExtent=this.getMaxExtent();var worldBounds=this.baseLayer.wrapDateLine&&maxExtent;valid=maxExtent.containsLonLat(lonlat,{worldBounds:worldBounds});} +return valid;},getProjection:function(){var projection=this.getProjectionObject();return projection?projection.getCode():null;},getProjectionObject:function(){var projection=null;if(this.baseLayer!=null){projection=this.baseLayer.projection;} +return projection;},getMaxResolution:function(){var maxResolution=null;if(this.baseLayer!=null){maxResolution=this.baseLayer.maxResolution;} +return maxResolution;},getMaxExtent:function(options){var maxExtent=null;if(options&&options.restricted&&this.restrictedExtent){maxExtent=this.restrictedExtent;}else if(this.baseLayer!=null){maxExtent=this.baseLayer.maxExtent;} +return maxExtent;},getNumZoomLevels:function(){var numZoomLevels=null;if(this.baseLayer!=null){numZoomLevels=this.baseLayer.numZoomLevels;} +return numZoomLevels;},getExtent:function(){var extent=null;if(this.baseLayer!=null){extent=this.baseLayer.getExtent();} +return extent;},getResolution:function(){var resolution=null;if(this.baseLayer!=null){resolution=this.baseLayer.getResolution();}else if(this.allOverlays===true&&this.layers.length>0){resolution=this.layers[0].getResolution();} +return resolution;},getUnits:function(){var units=null;if(this.baseLayer!=null){units=this.baseLayer.units;} +return units;},getScale:function(){var scale=null;if(this.baseLayer!=null){var res=this.getResolution();var units=this.baseLayer.units;scale=OpenLayers.Util.getScaleFromResolution(res,units);} +return scale;},getZoomForExtent:function(bounds,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForExtent(bounds,closest);} +return zoom;},getResolutionForZoom:function(zoom){var resolution=null;if(this.baseLayer){resolution=this.baseLayer.getResolutionForZoom(zoom);} +return resolution;},getZoomForResolution:function(resolution,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForResolution(resolution,closest);} +return zoom;},zoomTo:function(zoom){if(this.isValidZoomLevel(zoom)){this.setCenter(null,zoom);}},zoomIn:function(){this.zoomTo(this.getZoom()+1);},zoomOut:function(){this.zoomTo(this.getZoom()-1);},zoomToExtent:function(bounds,closest){if(!(bounds instanceof OpenLayers.Bounds)){bounds=new OpenLayers.Bounds(bounds);} +var center=bounds.getCenterLonLat();if(this.baseLayer.wrapDateLine){var maxExtent=this.getMaxExtent();bounds=bounds.clone();while(bounds.right<bounds.left){bounds.right+=maxExtent.getWidth();} +center=bounds.getCenterLonLat().wrapDateLine(maxExtent);} +this.setCenter(center,this.getZoomForExtent(bounds,closest));},zoomToMaxExtent:function(options){var restricted=(options)?options.restricted:true;var maxExtent=this.getMaxExtent({'restricted':restricted});this.zoomToExtent(maxExtent);},zoomToScale:function(scale,closest){var res=OpenLayers.Util.getResolutionFromScale(scale,this.baseLayer.units);var halfWDeg=(this.size.w*res)/2;var halfHDeg=(this.size.h*res)/2;var center=this.getCachedCenter();var extent=new OpenLayers.Bounds(center.lon-halfWDeg,center.lat-halfHDeg,center.lon+halfWDeg,center.lat+halfHDeg);this.zoomToExtent(extent,closest);},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if(this.baseLayer!=null){lonlat=this.baseLayer.getLonLatFromViewPortPx(viewPortPx);} +return lonlat;},getViewPortPxFromLonLat:function(lonlat){var px=null;if(this.baseLayer!=null){px=this.baseLayer.getViewPortPxFromLonLat(lonlat);} +return px;},getLonLatFromPixel:function(px){return this.getLonLatFromViewPortPx(px);},getPixelFromLonLat:function(lonlat){var px=this.getViewPortPxFromLonLat(lonlat);px.x=Math.round(px.x);px.y=Math.round(px.y);return px;},getGeodesicPixelSize:function(px){var lonlat=px?this.getLonLatFromPixel(px):(this.getCachedCenter()||new OpenLayers.LonLat(0,0));var res=this.getResolution();var left=lonlat.add(-res/2,0);var right=lonlat.add(res/2,0);var bottom=lonlat.add(0,-res/2);var top=lonlat.add(0,res/2);var dest=new OpenLayers.Projection("EPSG:4326");var source=this.getProjectionObject()||dest;if(!source.equals(dest)){left.transform(source,dest);right.transform(source,dest);bottom.transform(source,dest);top.transform(source,dest);} +return new OpenLayers.Size(OpenLayers.Util.distVincenty(left,right),OpenLayers.Util.distVincenty(bottom,top));},getViewPortPxFromLayerPx:function(layerPx){var viewPortPx=null;if(layerPx!=null){var dX=parseInt(this.layerContainerDiv.style.left);var dY=parseInt(this.layerContainerDiv.style.top);viewPortPx=layerPx.add(dX,dY);} +return viewPortPx;},getLayerPxFromViewPortPx:function(viewPortPx){var layerPx=null;if(viewPortPx!=null){var dX=-parseInt(this.layerContainerDiv.style.left);var dY=-parseInt(this.layerContainerDiv.style.top);layerPx=viewPortPx.add(dX,dY);if(isNaN(layerPx.x)||isNaN(layerPx.y)){layerPx=null;}} +return layerPx;},getLonLatFromLayerPx:function(px){px=this.getViewPortPxFromLayerPx(px);return this.getLonLatFromViewPortPx(px);},getLayerPxFromLonLat:function(lonlat){var px=this.getPixelFromLonLat(lonlat);return this.getLayerPxFromViewPortPx(px);},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:1,alwaysInRange:null,RESOLUTION_PROPERTIES:['scales','resolutions','maxScale','minScale','maxResolution','minResolution','numZoomLevels','maxZoomLevel'],events:null,map:null,isBaseLayer:false,alpha:false,displayInLayerSwitcher:true,visibility:true,attribution:null,inRange:false,imageSize:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null,numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:false,wrapDateLine:false,metadata:null,initialize:function(name,options){this.metadata={};this.addOptions(options);this.name=name;if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");this.div=OpenLayers.Util.createDiv(this.id);this.div.style.width="100%";this.div.style.height="100%";this.div.dir="ltr";this.events=new OpenLayers.Events(this,this.div);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}}},destroy:function(setNewBaseLayer){if(setNewBaseLayer==null){setNewBaseLayer=true;} +if(this.map!=null){this.map.removeLayer(this,setNewBaseLayer);} +this.projection=null;this.map=null;this.name=null;this.div=null;this.options=null;if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);} +this.events.destroy();} +this.eventListeners=null;this.events=null;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer(this.name,this.getOptions());} +OpenLayers.Util.applyDefaults(obj,this);obj.map=null;return obj;},getOptions:function(){var options={};for(var o in this.options){options[o]=this[o];} +return options;},setName:function(newName){if(newName!=this.name){this.name=newName;if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"name"});}}},addOptions:function(newOptions,reinitialize){if(this.options==null){this.options={};} +if(newOptions){if(typeof newOptions.projection=="string"){newOptions.projection=new OpenLayers.Projection(newOptions.projection);} +if(newOptions.projection){OpenLayers.Util.applyDefaults(newOptions,OpenLayers.Projection.defaults[newOptions.projection.getCode()]);} +if(newOptions.maxExtent&&!(newOptions.maxExtent instanceof OpenLayers.Bounds)){newOptions.maxExtent=new OpenLayers.Bounds(newOptions.maxExtent);} +if(newOptions.minExtent&&!(newOptions.minExtent instanceof OpenLayers.Bounds)){newOptions.minExtent=new OpenLayers.Bounds(newOptions.minExtent);}} +OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);if(this.projection&&this.projection.getUnits()){this.units=this.projection.getUnits();} +if(this.map){var resolution=this.map.getResolution();var properties=this.RESOLUTION_PROPERTIES.concat(["projection","units","minExtent","maxExtent"]);for(var o in newOptions){if(newOptions.hasOwnProperty(o)&&OpenLayers.Util.indexOf(properties,o)>=0){this.initResolutions();if(reinitialize&&this.map.baseLayer===this){this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(resolution),false,true);this.map.events.triggerEvent("changebaselayer",{layer:this});} +break;}}}},onMapResize:function(){},redraw:function(){var redrawn=false;if(this.map){this.inRange=this.calculateInRange();var extent=this.getExtent();if(extent&&this.inRange&&this.visibility){var zoomChanged=true;this.moveTo(extent,zoomChanged,false);this.events.triggerEvent("moveend",{"zoomChanged":zoomChanged});redrawn=true;}} +return redrawn;},moveTo:function(bounds,zoomChanged,dragging){var display=this.visibility;if(!this.isBaseLayer){display=display&&this.inRange;} +this.display(display);},moveByPx:function(dx,dy){},setMap:function(map){if(this.map==null){this.map=map;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);} +this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var show=((this.visibility)&&(this.inRange));this.div.style.display=show?"":"none";} +this.setTileSize();}},afterAdd:function(){},removeMap:function(map){},getImageSize:function(bounds){return(this.imageSize||this.tileSize);},setTileSize:function(size){var tileSize=(size)?size:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=tileSize;if(this.gutter){this.imageSize=new OpenLayers.Size(tileSize.w+(2*this.gutter),tileSize.h+(2*this.gutter));}},getVisibility:function(){return this.visibility;},setVisibility:function(visibility){if(visibility!=this.visibility){this.visibility=visibility;this.display(visibility);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"});} +this.events.triggerEvent("visibilitychanged");}},display:function(display){if(display!=(this.div.style.display!="none")){this.div.style.display=(display&&this.calculateInRange())?"block":"none";}},calculateInRange:function(){var inRange=false;if(this.alwaysInRange){inRange=true;}else{if(this.map){var resolution=this.map.getResolution();inRange=((resolution>=this.minResolution)&&(resolution<=this.maxResolution));}} +return inRange;},setIsBaseLayer:function(isBaseLayer){if(isBaseLayer!=this.isBaseLayer){this.isBaseLayer=isBaseLayer;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this});}}},initResolutions:function(){var i,len,p;var props={},alwaysInRange=true;for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p];if(alwaysInRange&&this.options[p]){alwaysInRange=false;}} +if(this.alwaysInRange==null){this.alwaysInRange=alwaysInRange;} +if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);} +if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);} +if(props.resolutions==null){for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p]!=null?this.options[p]:this.map[p];} +if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);} +if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);}} +var maxResolution;if(this.options.maxResolution&&this.options.maxResolution!=="auto"){maxResolution=this.options.maxResolution;} +if(this.options.minScale){maxResolution=OpenLayers.Util.getResolutionFromScale(this.options.minScale,this.units);} +var minResolution;if(this.options.minResolution&&this.options.minResolution!=="auto"){minResolution=this.options.minResolution;} +if(this.options.maxScale){minResolution=OpenLayers.Util.getResolutionFromScale(this.options.maxScale,this.units);} +if(props.resolutions){props.resolutions.sort(function(a,b){return(b-a);});if(!maxResolution){maxResolution=props.resolutions[0];} +if(!minResolution){var lastIdx=props.resolutions.length-1;minResolution=props.resolutions[lastIdx];}} +this.resolutions=props.resolutions;if(this.resolutions){len=this.resolutions.length;this.scales=new Array(len);for(i=0;i<len;i++){this.scales[i]=OpenLayers.Util.getScaleFromResolution(this.resolutions[i],this.units);} +this.numZoomLevels=len;} +this.minResolution=minResolution;if(minResolution){this.maxScale=OpenLayers.Util.getScaleFromResolution(minResolution,this.units);} +this.maxResolution=maxResolution;if(maxResolution){this.minScale=OpenLayers.Util.getScaleFromResolution(maxResolution,this.units);}},resolutionsFromScales:function(scales){if(scales==null){return;} +var resolutions,i,len;len=scales.length;resolutions=new Array(len);for(i=0;i<len;i++){resolutions[i]=OpenLayers.Util.getResolutionFromScale(scales[i],this.units);} +return resolutions;},calculateResolutions:function(props){var viewSize,wRes,hRes;var maxResolution=props.maxResolution;if(props.minScale!=null){maxResolution=OpenLayers.Util.getResolutionFromScale(props.minScale,this.units);}else if(maxResolution=="auto"&&this.maxExtent!=null){viewSize=this.map.getSize();wRes=this.maxExtent.getWidth()/viewSize.w;hRes=this.maxExtent.getHeight()/viewSize.h;maxResolution=Math.max(wRes,hRes);} +var minResolution=props.minResolution;if(props.maxScale!=null){minResolution=OpenLayers.Util.getResolutionFromScale(props.maxScale,this.units);}else if(props.minResolution=="auto"&&this.minExtent!=null){viewSize=this.map.getSize();wRes=this.minExtent.getWidth()/viewSize.w;hRes=this.minExtent.getHeight()/viewSize.h;minResolution=Math.max(wRes,hRes);} +if(typeof maxResolution!=="number"&&typeof minResolution!=="number"&&this.maxExtent!=null){var tileSize=this.map.getTileSize();maxResolution=Math.max(this.maxExtent.getWidth()/tileSize.w,this.maxExtent.getHeight()/tileSize.h);} +var maxZoomLevel=props.maxZoomLevel;var numZoomLevels=props.numZoomLevels;if(typeof minResolution==="number"&&typeof maxResolution==="number"&&numZoomLevels===undefined){var ratio=maxResolution/minResolution;numZoomLevels=Math.floor(Math.log(ratio)/Math.log(2))+1;}else if(numZoomLevels===undefined&&maxZoomLevel!=null){numZoomLevels=maxZoomLevel+1;} +if(typeof numZoomLevels!=="number"||numZoomLevels<=0||(typeof maxResolution!=="number"&&typeof minResolution!=="number")){return;} +var resolutions=new Array(numZoomLevels);var base=2;if(typeof minResolution=="number"&&typeof maxResolution=="number"){base=Math.pow((maxResolution/minResolution),(1/(numZoomLevels-1)));} +var i;if(typeof maxResolution==="number"){for(i=0;i<numZoomLevels;i++){resolutions[i]=maxResolution/Math.pow(base,i);}}else{for(i=0;i<numZoomLevels;i++){resolutions[numZoomLevels-1-i]=minResolution*Math.pow(base,i);}} +return resolutions;},getResolution:function(){var zoom=this.map.getZoom();return this.getResolutionForZoom(zoom);},getExtent:function(){return this.map.calculateBounds();},getZoomForExtent:function(extent,closest){var viewSize=this.map.getSize();var idealResolution=Math.max(extent.getWidth()/viewSize.w,extent.getHeight()/viewSize.h);return this.getZoomForResolution(idealResolution,closest);},getDataExtent:function(){},getResolutionForZoom:function(zoom){zoom=Math.max(0,Math.min(zoom,this.resolutions.length-1));var resolution;if(this.map.fractionalZoom){var low=Math.floor(zoom);var high=Math.ceil(zoom);resolution=this.resolutions[low]- +((zoom-low)*(this.resolutions[low]-this.resolutions[high]));}else{resolution=this.resolutions[Math.round(zoom)];} +return resolution;},getZoomForResolution:function(resolution,closest){var zoom,i,len;if(this.map.fractionalZoom){var lowZoom=0;var highZoom=this.resolutions.length-1;var highRes=this.resolutions[lowZoom];var lowRes=this.resolutions[highZoom];var res;for(i=0,len=this.resolutions.length;i<len;++i){res=this.resolutions[i];if(res>=resolution){highRes=res;lowZoom=i;} +if(res<=resolution){lowRes=res;highZoom=i;break;}} +var dRes=highRes-lowRes;if(dRes>0){zoom=lowZoom+((highRes-resolution)/dRes);}else{zoom=lowZoom;}}else{var diff;var minDiff=Number.POSITIVE_INFINITY;for(i=0,len=this.resolutions.length;i<len;i++){if(closest){diff=Math.abs(this.resolutions[i]-resolution);if(diff>minDiff){break;} +minDiff=diff;}else{if(this.resolutions[i]<resolution){break;}}} +zoom=Math.max(0,i-1);} +return zoom;},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;var map=this.map;if(viewPortPx!=null&&map.minPx){var res=map.getResolution();var maxExtent=map.getMaxExtent({restricted:true});var lon=(viewPortPx.x-map.minPx.x)*res+maxExtent.left;var lat=(map.minPx.y-viewPortPx.y)*res+maxExtent.top;lonlat=new OpenLayers.LonLat(lon,lat);if(this.wrapDateLine){lonlat=lonlat.wrapDateLine(this.maxExtent);}} +return lonlat;},getViewPortPxFromLonLat:function(lonlat,resolution){var px=null;if(lonlat!=null){resolution=resolution||this.map.getResolution();var extent=this.map.calculateBounds(null,resolution);px=new OpenLayers.Pixel((1/resolution*(lonlat.lon-extent.left)),(1/resolution*(extent.top-lonlat.lat)));} +return px;},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;var childNodes=this.div.childNodes;for(var i=0,len=childNodes.length;i<len;++i){var element=childNodes[i].firstChild||childNodes[i];var lastChild=childNodes[i].lastChild;if(lastChild&&lastChild.nodeName.toLowerCase()==="iframe"){element=lastChild.parentNode;} +OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);} +if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"});}}},getZIndex:function(){return this.div.style.zIndex;},setZIndex:function(zIndex){this.div.style.zIndex=zIndex;},adjustBounds:function(bounds){if(this.gutter){var mapGutter=this.gutter*this.map.getResolution();bounds=new OpenLayers.Bounds(bounds.left-mapGutter,bounds.bottom-mapGutter,bounds.right+mapGutter,bounds.top+mapGutter);} +if(this.wrapDateLine){var wrappingOptions={'rightTolerance':this.getResolution(),'leftTolerance':this.getResolution()};bounds=bounds.wrapDateLine(this.maxExtent,wrappingOptions);} +return bounds;},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:false,initialize:function(name,url,params,options){OpenLayers.Layer.prototype.initialize.apply(this,[name,options]);this.url=url;if(!this.params){this.params=OpenLayers.Util.extend({},params);}},destroy:function(){this.url=null;this.params=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions());} +obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);return obj;},setUrl:function(newUrl){this.url=newUrl;},mergeNewParams:function(newParams){this.params=OpenLayers.Util.extend(this.params,newParams);var ret=this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"params"});} +return ret;},redraw:function(force){if(force){return this.mergeNewParams({"_olSalt":Math.random()});}else{return OpenLayers.Layer.prototype.redraw.apply(this,[]);}},selectUrl:function(paramString,urls){var product=1;for(var i=0,len=paramString.length;i<len;i++){product*=paramString.charCodeAt(i)*this.URL_HASH_FACTOR;product-=Math.floor(product);} +return urls[Math.floor(product*urls.length)];},getFullRequestString:function(newParams,altUrl){var url=altUrl||this.url;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var paramsString=OpenLayers.Util.getParameterString(allParams);if(OpenLayers.Util.isArray(url)){url=this.selectUrl(paramsString,url);} +var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}} +paramsString=OpenLayers.Util.getParameterString(allParams);return OpenLayers.Util.urlAppend(url,paramsString);},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Tile=OpenLayers.Class({events:null,eventListeners:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:false,initialize:function(layer,position,bounds,url,size,options){this.layer=layer;this.position=position.clone();this.setBounds(bounds);this.url=url;if(size){this.size=size.clone();} +this.id=OpenLayers.Util.createUniqueID("Tile_");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}},unload:function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("unload");}},destroy:function(){this.layer=null;this.bounds=null;this.size=null;this.position=null;if(this.eventListeners){this.events.un(this.eventListeners);} +this.events.destroy();this.eventListeners=null;this.events=null;},draw:function(deferred){if(!deferred){this.clear();} +var draw=this.shouldDraw();if(draw&&!deferred){draw=this.events.triggerEvent("beforedraw")!==false;} +return draw;},shouldDraw:function(){var withinMaxExtent=false,maxExtent=this.layer.maxExtent;if(maxExtent){var map=this.layer.map;var worldBounds=map.baseLayer.wrapDateLine&&map.getMaxExtent();if(this.bounds.intersectsBounds(maxExtent,{inclusive:false,worldBounds:worldBounds})){withinMaxExtent=true;}} +return withinMaxExtent||this.layer.displayOutsideMaxExtent;},setBounds:function(bounds){bounds=bounds.clone();if(this.layer.map.baseLayer.wrapDateLine){var worldExtent=this.layer.map.getMaxExtent(),tolerance=this.layer.map.getResolution();bounds=bounds.wrapDateLine(worldExtent,{leftTolerance:tolerance,rightTolerance:tolerance});} +this.bounds=bounds;},moveTo:function(bounds,position,redraw){if(redraw==null){redraw=true;} +this.setBounds(bounds);this.position=position.clone();if(redraw){this.draw();}},clear:function(draw){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,imageReloadAttempts:null,layerAlphaHack:null,asyncRequestId:null,blankImageUrl:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAQAIBRAA7",maxGetUrlLength:null,canvasContext:null,crossOriginKeyword:null,initialize:function(layer,position,bounds,url,size,options){OpenLayers.Tile.prototype.initialize.apply(this,arguments);this.url=url;this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();if(this.maxGetUrlLength!=null||this.layer.gutter||this.layerAlphaHack){this.frame=document.createElement("div");this.frame.style.position="absolute";this.frame.style.overflow="hidden";} +if(this.maxGetUrlLength!=null){OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame);}},destroy:function(){if(this.imgDiv){this.clear();this.imgDiv=null;this.frame=null;} +this.asyncRequestId=null;OpenLayers.Tile.prototype.destroy.apply(this,arguments);},draw:function(){var drawn=OpenLayers.Tile.prototype.draw.apply(this,arguments);if(drawn){if(this.layer!=this.layer.map.baseLayer&&this.layer.reproject){this.bounds=this.getBoundsFromBaseLayer(this.position);} +if(this.isLoading){this._loadEvent="reload";}else{this.isLoading=true;this._loadEvent="loadstart";} +this.positionTile();this.renderTile();}else{this.unload();} +return drawn;},renderTile:function(){this.layer.div.appendChild(this.getTile());if(this.layer.async){var id=this.asyncRequestId=(this.asyncRequestId||0)+1;this.layer.getURLasync(this.bounds,function(url){if(id==this.asyncRequestId){this.url=url;this.initImage();}},this);}else{this.url=this.layer.getURL(this.bounds);this.initImage();}},positionTile:function(){var style=this.getTile().style,size=this.frame?this.size:this.layer.getImageSize(this.bounds);style.left=this.position.x+"%";style.top=this.position.y+"%";style.width=size.w+"%";style.height=size.h+"%";},clear:function(){OpenLayers.Tile.prototype.clear.apply(this,arguments);var img=this.imgDiv;if(img){OpenLayers.Event.stopObservingElement(img);var tile=this.getTile();if(tile.parentNode===this.layer.div){this.layer.div.removeChild(tile);} +this.setImgSrc();if(this.layerAlphaHack===true){img.style.filter="";} +OpenLayers.Element.removeClass(img,"olImageLoadError");} +this.canvasContext=null;},getImage:function(){if(!this.imgDiv){this.imgDiv=document.createElement("img");this.imgDiv.className="olTileImage";this.imgDiv.galleryImg="no";var style=this.imgDiv.style;if(this.frame){var left=0,top=0;if(this.layer.gutter){left=this.layer.gutter/this.layer.tileSize.w*100;top=this.layer.gutter/this.layer.tileSize.h*100;} +style.left=-left+"%";style.top=-top+"%";style.width=(2*left+100)+"%";style.height=(2*top+100)+"%";} +style.visibility="hidden";style.opacity=0;if(this.layer.opacity<1){style.filter='alpha(opacity='+ +(this.layer.opacity*100)+')';} +style.position="absolute";if(this.layerAlphaHack){style.paddingTop=style.height;style.height="0";style.width="100%";} +if(this.frame){this.frame.appendChild(this.imgDiv);}} +return this.imgDiv;},initImage:function(){this.events.triggerEvent(this._loadEvent);var img=this.getImage();if(this.url&&img.getAttribute("src")==this.url){this.onImageLoad();}else{var load=OpenLayers.Function.bind(function(){OpenLayers.Event.stopObservingElement(img);OpenLayers.Event.observe(img,"load",OpenLayers.Function.bind(this.onImageLoad,this));OpenLayers.Event.observe(img,"error",OpenLayers.Function.bind(this.onImageError,this));this.imageReloadAttempts=0;this.setImgSrc(this.url);},this);if(img.getAttribute("src")==this.blankImageUrl){load();}else{OpenLayers.Event.observe(img,"load",load);OpenLayers.Event.observe(img,"error",load);if(this.crossOriginKeyword){img.removeAttribute("crossorigin");} +img.src=this.blankImageUrl;}}},setImgSrc:function(url){var img=this.imgDiv;img.style.visibility='hidden';img.style.opacity=0;if(url){if(this.crossOriginKeyword){if(url.substr(0,5)!=='data:'){img.setAttribute("crossorigin",this.crossOriginKeyword);}else{img.removeAttribute("crossorigin");}} +img.src=url;}},getTile:function(){return this.frame?this.frame:this.getImage();},createBackBuffer:function(){if(!this.imgDiv||this.isLoading){return;} +var backBuffer;if(this.frame){backBuffer=this.frame.cloneNode(false);backBuffer.appendChild(this.imgDiv);}else{backBuffer=this.imgDiv;} +this.imgDiv=null;return backBuffer;},onImageLoad:function(){var img=this.imgDiv;OpenLayers.Event.stopObservingElement(img);img.style.visibility='inherit';img.style.opacity=this.layer.opacity;this.isLoading=false;this.canvasContext=null;this.events.triggerEvent("loadend");if(parseFloat(navigator.appVersion.split("MSIE")[1])<7&&this.layer&&this.layer.div){var span=document.createElement("span");span.style.display="none";var layerDiv=this.layer.div;layerDiv.appendChild(span);window.setTimeout(function(){span.parentNode===layerDiv&&span.parentNode.removeChild(span);},0);} +if(this.layerAlphaHack===true){img.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+ +img.src+"', sizingMethod='scale')";}},onImageError:function(){var img=this.imgDiv;if(img.src!=null){this.imageReloadAttempts++;if(this.imageReloadAttempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS){this.setImgSrc(this.layer.getURL(this.bounds));}else{OpenLayers.Element.addClass(img,"olImageLoadError");this.events.triggerEvent("loaderror");this.onImageLoad();}}},getCanvasContext:function(){if(OpenLayers.CANVAS_SUPPORTED&&this.imgDiv&&!this.isLoading){if(!this.canvasContext){var canvas=document.createElement("canvas");canvas.width=this.size.w;canvas.height=this.size.h;this.canvasContext=canvas.getContext("2d");this.canvasContext.drawImage(this.imgDiv,0,0);} +return this.canvasContext;}},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,tileOriginCorner:"bl",tileOrigin:null,tileOptions:null,tileClass:OpenLayers.Tile.Image,grid:null,singleTile:false,ratio:1.5,buffer:0,transitionEffect:null,numLoadingTiles:0,tileLoadingDelay:85,serverResolutions:null,moveTimerId:null,deferMoveGriddedTiles:null,tileQueueId:null,tileQueue:null,loading:false,backBuffer:null,gridResolution:null,backBufferResolution:null,backBufferLonLat:null,backBufferTimerId:null,removeBackBufferDelay:null,className:null,initialize:function(name,url,params,options){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.grid=[];this.tileQueue=[];if(this.removeBackBufferDelay===null){this.removeBackBufferDelay=this.singleTile?0:2500;} +if(this.className===null){this.className=this.singleTile?'olLayerGridSingleTile':'olLayerGrid';} +if(!OpenLayers.Animation.isNative){this.deferMoveGriddedTiles=OpenLayers.Function.bind(function(){this.moveGriddedTiles(true);this.moveTimerId=null;},this);}},setMap:function(map){OpenLayers.Layer.HTTPRequest.prototype.setMap.call(this,map);OpenLayers.Element.addClass(this.div,this.className);},removeMap:function(map){if(this.moveTimerId!==null){window.clearTimeout(this.moveTimerId);this.moveTimerId=null;} +this.clearTileQueue();if(this.backBufferTimerId!==null){window.clearTimeout(this.backBufferTimerId);this.backBufferTimerId=null;}},destroy:function(){this.removeBackBuffer();this.clearGrid();this.grid=null;this.tileSize=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments);},clearGrid:function(){this.clearTileQueue();if(this.grid){for(var iRow=0,len=this.grid.length;iRow<len;iRow++){var row=this.grid[iRow];for(var iCol=0,clen=row.length;iCol<clen;iCol++){var tile=row[iCol];this.destroyTile(tile);}} +this.grid=[];this.gridResolution=null;}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.getOptions());} +obj=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this,[obj]);if(this.tileSize!=null){obj.tileSize=this.tileSize.clone();} +obj.grid=[];obj.gridResolution=null;obj.backBuffer=null;obj.backBufferTimerId=null;obj.tileQueue=[];obj.tileQueueId=null;obj.loading=false;obj.moveTimerId=null;return obj;},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);bounds=bounds||this.map.getExtent();if(bounds!=null){var forceReTile=!this.grid.length||zoomChanged;var tilesBounds=this.getTilesBounds();var resolution=this.map.getResolution();var serverResolution=this.getServerResolution(resolution);if(this.singleTile){if(forceReTile||(!dragging&&!tilesBounds.containsBounds(bounds))){if(zoomChanged&&this.transitionEffect!=='resize'){this.removeBackBuffer();} +if(!zoomChanged||this.transitionEffect==='resize'){this.applyBackBuffer(serverResolution);} +this.initSingleTile(bounds);}}else{forceReTile=forceReTile||!tilesBounds.intersectsBounds(bounds,{worldBounds:this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent()});if(resolution!==serverResolution){bounds=this.map.calculateBounds(null,serverResolution);if(forceReTile){var scale=serverResolution/resolution;this.transformDiv(scale);}}else{this.div.style.width='100%';this.div.style.height='100%';this.div.style.left='0%';this.div.style.top='0%';} +if(forceReTile){if(zoomChanged&&this.transitionEffect==='resize'){this.applyBackBuffer(serverResolution);} +this.initGriddedTiles(bounds);}else{this.moveGriddedTiles();}}}},getTileData:function(loc){var data=null,x=loc.lon,y=loc.lat,numRows=this.grid.length;if(this.map&&numRows){var res=this.map.getResolution(),tileWidth=this.tileSize.w,tileHeight=this.tileSize.h,bounds=this.grid[0][0].bounds,left=bounds.left,top=bounds.top;if(x<left){if(this.map.baseLayer.wrapDateLine){var worldWidth=this.map.getMaxExtent().getWidth();var worldsAway=Math.ceil((left-x)/worldWidth);x+=worldWidth*worldsAway;}} +var dtx=(x-left)/(res*tileWidth);var dty=(top-y)/(res*tileHeight);var col=Math.floor(dtx);var row=Math.floor(dty);if(row>=0&&row<numRows){var tile=this.grid[row][col];if(tile){data={tile:tile,i:Math.floor((dtx-col)*tileWidth),j:Math.floor((dty-row)*tileHeight)};}}} +return data;},queueTileDraw:function(evt){var tile=evt.object;if(!~OpenLayers.Util.indexOf(this.tileQueue,tile)){this.tileQueue.push(tile);} +if(!this.tileQueueId){this.tileQueueId=OpenLayers.Animation.start(OpenLayers.Function.bind(this.drawTileFromQueue,this),null,this.div);} +return false;},drawTileFromQueue:function(){if(this.tileQueue.length===0){this.clearTileQueue();}else{this.tileQueue.shift().draw(true);}},clearTileQueue:function(){OpenLayers.Animation.stop(this.tileQueueId);this.tileQueueId=null;this.tileQueue=[];},destroyTile:function(tile){this.removeTileMonitoringHooks(tile);tile.destroy();},getServerResolution:function(resolution){resolution=resolution||this.map.getResolution();if(this.serverResolutions&&OpenLayers.Util.indexOf(this.serverResolutions,resolution)===-1){var i,serverResolution;for(i=this.serverResolutions.length-1;i>=0;i--){serverResolution=this.serverResolutions[i];if(serverResolution>resolution){resolution=serverResolution;break;}} +if(i===-1){throw'no appropriate resolution in serverResolutions';}} +return resolution;},getServerZoom:function(){var resolution=this.getServerResolution();return this.serverResolutions?OpenLayers.Util.indexOf(this.serverResolutions,resolution):this.map.getZoomForResolution(resolution)+(this.zoomOffset||0);},transformDiv:function(scale){this.div.style.width=100*scale+'%';this.div.style.height=100*scale+'%';var size=this.map.getSize();var lcX=parseInt(this.map.layerContainerDiv.style.left,10);var lcY=parseInt(this.map.layerContainerDiv.style.top,10);var x=(lcX-(size.w/2.0))*(scale-1);var y=(lcY-(size.h/2.0))*(scale-1);this.div.style.left=x+'%';this.div.style.top=y+'%';},getResolutionScale:function(){return parseInt(this.div.style.width,10)/100;},applyBackBuffer:function(resolution){if(this.backBufferTimerId!==null){this.removeBackBuffer();} +var backBuffer=this.backBuffer;if(!backBuffer){backBuffer=this.createBackBuffer();if(!backBuffer){return;} +this.div.insertBefore(backBuffer,this.div.firstChild);this.backBuffer=backBuffer;var topLeftTileBounds=this.grid[0][0].bounds;this.backBufferLonLat={lon:topLeftTileBounds.left,lat:topLeftTileBounds.top};this.backBufferResolution=this.gridResolution;} +var style=backBuffer.style;var ratio=this.backBufferResolution/resolution;style.width=100*ratio+'%';style.height=100*ratio+'%';var position=this.getViewPortPxFromLonLat(this.backBufferLonLat,resolution);var leftOffset=parseInt(this.map.layerContainerDiv.style.left,10);var topOffset=parseInt(this.map.layerContainerDiv.style.top,10);backBuffer.style.left=Math.round(position.x-leftOffset)+'%';backBuffer.style.top=Math.round(position.y-topOffset)+'%';},createBackBuffer:function(){var backBuffer;if(this.grid.length>0){backBuffer=document.createElement('div');backBuffer.id=this.div.id+'_bb';backBuffer.className='olBackBuffer';backBuffer.style.position='absolute';backBuffer.style.width='100%';backBuffer.style.height='100%';for(var i=0,lenI=this.grid.length;i<lenI;i++){for(var j=0,lenJ=this.grid[i].length;j<lenJ;j++){var tile=this.grid[i][j].createBackBuffer();if(!tile){continue;} +tile.style.top=(i*this.tileSize.h)+'%';tile.style.left=(j*this.tileSize.w)+'%';backBuffer.appendChild(tile);}}} +return backBuffer;},removeBackBuffer:function(){if(this.backBuffer){this.div.removeChild(this.backBuffer);this.backBuffer=null;this.backBufferResolution=null;if(this.backBufferTimerId!==null){window.clearTimeout(this.backBufferTimerId);this.backBufferTimerId=null;}}},moveByPx:function(dx,dy){if(!this.singleTile){this.moveGriddedTiles();}},setTileSize:function(size){if(this.singleTile){size=this.map.getSize();size.h=parseInt(size.h*this.ratio);size.w=parseInt(size.w*this.ratio);} +OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[size]);},getTilesBounds:function(){var bounds=null;var length=this.grid.length;if(length){var bottomLeftTileBounds=this.grid[length-1][0].bounds,width=this.grid[0].length*bottomLeftTileBounds.getWidth(),height=this.grid.length*bottomLeftTileBounds.getHeight();bounds=new OpenLayers.Bounds(bottomLeftTileBounds.left,bottomLeftTileBounds.bottom,bottomLeftTileBounds.left+width,bottomLeftTileBounds.bottom+height);} +return bounds;},initSingleTile:function(bounds){this.clearTileQueue();var center=bounds.getCenterLonLat();var tileWidth=bounds.getWidth()*this.ratio;var tileHeight=bounds.getHeight()*this.ratio;var tileBounds=new OpenLayers.Bounds(center.lon-(tileWidth/2),center.lat-(tileHeight/2),center.lon+(tileWidth/2),center.lat+(tileHeight/2));var px=this.map.getLayerPxFromLonLat({lon:tileBounds.left,lat:tileBounds.top});if(!this.grid.length){this.grid[0]=[];} +var tile=this.grid[0][0];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);tile.draw();this.grid[0][0]=tile;}else{tile.moveTo(tileBounds,px);} +this.removeExcessTiles(1,1);this.gridResolution=this.getServerResolution();},calculateGridLayout:function(bounds,origin,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-origin.lon;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=origin.lon+tilecol*tilelon;var offsetlat=bounds.top-(origin.lat+tilelat);var tilerow=Math.ceil(offsetlat/tilelat)+this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=-tilerowremain*this.tileSize.h;var tileoffsetlat=origin.lat+tilerow*tilelat;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},getTileOrigin:function(){var origin=this.tileOrigin;if(!origin){var extent=this.getMaxExtent();var edges=({"tl":["left","top"],"tr":["right","top"],"bl":["left","bottom"],"br":["right","bottom"]})[this.tileOriginCorner];origin=new OpenLayers.LonLat(extent[edges[0]],extent[edges[1]]);} +return origin;},initGriddedTiles:function(bounds){this.clearTileQueue();var viewSize=this.map.getSize();var minRows=Math.ceil(viewSize.h/this.tileSize.h)+ +Math.max(1,2*this.buffer);var minCols=Math.ceil(viewSize.w/this.tileSize.w)+ +Math.max(1,2*this.buffer);var origin=this.getTileOrigin();var resolution=this.getServerResolution();var tileLayout=this.calculateGridLayout(bounds,origin,resolution);var tileoffsetx=Math.round(tileLayout.tileoffsetx);var tileoffsety=Math.round(tileLayout.tileoffsety);var tileoffsetlon=tileLayout.tileoffsetlon;var tileoffsetlat=tileLayout.tileoffsetlat;var tilelon=tileLayout.tilelon;var tilelat=tileLayout.tilelat;var startX=tileoffsetx;var startLon=tileoffsetlon;var rowidx=0;var layerContainerDivLeft=parseInt(this.map.layerContainerDiv.style.left);var layerContainerDivTop=parseInt(this.map.layerContainerDiv.style.top);var tileData=[],center=this.map.getCenter();do{var row=this.grid[rowidx++];if(!row){row=[];this.grid.push(row);} +tileoffsetlon=startLon;tileoffsetx=startX;var colidx=0;do{var tileBounds=new OpenLayers.Bounds(tileoffsetlon,tileoffsetlat,tileoffsetlon+tilelon,tileoffsetlat+tilelat);var x=tileoffsetx;x-=layerContainerDivLeft;var y=tileoffsety;y-=layerContainerDivTop;var px=new OpenLayers.Pixel(x,y);var tile=row[colidx++];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);row.push(tile);}else{tile.moveTo(tileBounds,px,false);} +var tileCenter=tileBounds.getCenterLonLat();tileData.push({tile:tile,distance:Math.pow(tileCenter.lon-center.lon,2)+ +Math.pow(tileCenter.lat-center.lat,2)});tileoffsetlon+=tilelon;tileoffsetx+=this.tileSize.w;}while((tileoffsetlon<=bounds.right+tilelon*this.buffer)||colidx<minCols);tileoffsetlat-=tilelat;tileoffsety+=this.tileSize.h;}while((tileoffsetlat>=bounds.bottom-tilelat*this.buffer)||rowidx<minRows);this.removeExcessTiles(rowidx,colidx);this.gridResolution=this.getServerResolution();tileData.sort(function(a,b){return a.distance-b.distance;});for(var i=0,ii=tileData.length;i<ii;++i){tileData[i].tile.draw();}},getMaxExtent:function(){return this.maxExtent;},addTile:function(bounds,position){var tile=new this.tileClass(this,position,bounds,null,this.tileSize,this.tileOptions);tile.events.register("beforedraw",this,this.queueTileDraw);return tile;},addTileMonitoringHooks:function(tile){tile.onLoadStart=function(){if(this.loading===false){this.loading=true;this.events.triggerEvent("loadstart");} +this.events.triggerEvent("tileloadstart",{tile:tile});this.numLoadingTiles++;};tile.onLoadEnd=function(){this.numLoadingTiles--;this.events.triggerEvent("tileloaded",{tile:tile});if(this.tileQueue.length===0&&this.numLoadingTiles===0){this.loading=false;this.events.triggerEvent("loadend");if(this.backBuffer){this.backBufferTimerId=window.setTimeout(OpenLayers.Function.bind(this.removeBackBuffer,this),this.removeBackBufferDelay);}}};tile.onLoadError=function(){this.events.triggerEvent("tileerror",{tile:tile});};tile.events.on({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,"loaderror":tile.onLoadError,scope:this});},removeTileMonitoringHooks:function(tile){tile.unload();tile.events.un({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,"loaderror":tile.onLoadError,scope:this});},moveGriddedTiles:function(deferred){if(!deferred&&!OpenLayers.Animation.isNative){if(this.moveTimerId!=null){window.clearTimeout(this.moveTimerId);} +this.moveTimerId=window.setTimeout(this.deferMoveGriddedTiles,this.tileLoadingDelay);return;} +var buffer=this.buffer||1;var scale=this.getResolutionScale();while(true){var tlViewPort={x:(this.grid[0][0].position.x*scale)+ +parseInt(this.div.style.left,10)+ +parseInt(this.map.layerContainerDiv.style.left),y:(this.grid[0][0].position.y*scale)+ +parseInt(this.div.style.top,10)+ +parseInt(this.map.layerContainerDiv.style.top)};var tileSize={w:this.tileSize.w*scale,h:this.tileSize.h*scale};if(tlViewPort.x>-tileSize.w*(buffer-1)){this.shiftColumn(true);}else if(tlViewPort.x<-tileSize.w*buffer){this.shiftColumn(false);}else if(tlViewPort.y>-tileSize.h*(buffer-1)){this.shiftRow(true);}else if(tlViewPort.y<-tileSize.h*buffer){this.shiftRow(false);}else{break;}}},shiftRow:function(prepend){var modelRowIndex=(prepend)?0:(this.grid.length-1);var grid=this.grid;var modelRow=grid[modelRowIndex];var resolution=this.getServerResolution();var deltaY=(prepend)?-this.tileSize.h:this.tileSize.h;var deltaLat=resolution*-deltaY;var row=(prepend)?grid.pop():grid.shift();for(var i=0,len=modelRow.length;i<len;i++){var modelTile=modelRow[i];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.bottom=bounds.bottom+deltaLat;bounds.top=bounds.top+deltaLat;position.y=position.y+deltaY;row[i].moveTo(bounds,position);} +if(prepend){grid.unshift(row);}else{grid.push(row);}},shiftColumn:function(prepend){var deltaX=(prepend)?-this.tileSize.w:this.tileSize.w;var resolution=this.getServerResolution();var deltaLon=resolution*deltaX;for(var i=0,len=this.grid.length;i<len;i++){var row=this.grid[i];var modelTileIndex=(prepend)?0:(row.length-1);var modelTile=row[modelTileIndex];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.left=bounds.left+deltaLon;bounds.right=bounds.right+deltaLon;position.x=position.x+deltaX;var tile=prepend?this.grid[i].pop():this.grid[i].shift();tile.moveTo(bounds,position);if(prepend){row.unshift(tile);}else{row.push(tile);}}},removeExcessTiles:function(rows,columns){var i,l;while(this.grid.length>rows){var row=this.grid.pop();for(i=0,l=row.length;i<l;i++){var tile=row[i];this.destroyTile(tile);}} +for(i=0,l=this.grid.length;i<l;i++){while(this.grid[i].length>columns){var row=this.grid[i];var tile=row.pop();this.destroyTile(tile);}}},onMapResize:function(){if(this.singleTile){this.clearGrid();this.setTileSize();}},getTileBounds:function(viewPortPx){var maxExtent=this.maxExtent;var resolution=this.getResolution();var tileMapWidth=resolution*this.tileSize.w;var tileMapHeight=resolution*this.tileSize.h;var mapPoint=this.getLonLatFromViewPortPx(viewPortPx);var tileLeft=maxExtent.left+(tileMapWidth*Math.floor((mapPoint.lon- +maxExtent.left)/tileMapWidth));var tileBottom=maxExtent.bottom+(tileMapHeight*Math.floor((mapPoint.lat- +maxExtent.bottom)/tileMapHeight));return new OpenLayers.Bounds(tileLeft,tileBottom,tileLeft+tileMapWidth,tileBottom+tileMapHeight);},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,sphericalMercator:false,zoomOffset:0,serverResolutions:null,initialize:function(name,url,options){if(options&&options.sphericalMercator||this.sphericalMercator){options=OpenLayers.Util.extend({projection:"EPSG:900913",numZoomLevels:19},options);} +OpenLayers.Layer.Grid.prototype.initialize.apply(this,[name||this.name,url||this.url,{},options]);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions());} +obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var xyz=this.getXYZ(bounds);var url=this.url;if(OpenLayers.Util.isArray(url)){var s=''+xyz.x+xyz.y+xyz.z;url=this.selectUrl(s,url);} +return OpenLayers.String.format(url,xyz);},getXYZ:function(bounds){var res=this.getServerResolution();var x=Math.round((bounds.left-this.maxExtent.left)/(res*this.tileSize.w));var y=Math.round((this.maxExtent.top-bounds.top)/(res*this.tileSize.h));var z=this.getServerZoom();if(this.wrapDateLine){var limit=Math.pow(2,z);x=((x%limit)+limit)%limit;} +return{'x':x,'y':y,'z':z};},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",url:['http://a.tile.openstreetmap.org/${z}/${x}/${y}.png','http://b.tile.openstreetmap.org/${z}/${x}/${y}.png','http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'],attribution:"Data CC-By-SA by <a href='http://openstreetmap.org/'>OpenStreetMap</a>",sphericalMercator:true,wrapDateLine:true,tileOptions:null,initialize:function(name,url,options){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);this.tileOptions=OpenLayers.Util.extend({crossOriginKeyword:'anonymous'},this.options&&this.options.tileOptions);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions());} +obj=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);return obj;},CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:false,size:null,resolution:null,map:null,featureDx:0,initialize:function(containerID,options){this.container=OpenLayers.Util.getElement(containerID);OpenLayers.Util.extend(this,options);},destroy:function(){this.container=null;this.extent=null;this.size=null;this.resolution=null;this.map=null;},supported:function(){return false;},setExtent:function(extent,resolutionChanged){this.extent=extent.clone();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var ratio=extent.getWidth()/this.map.getExtent().getWidth(),extent=extent.scale(1/ratio);this.extent=extent.wrapDateLine(this.map.getMaxExtent()).scale(ratio);} +if(resolutionChanged){this.resolution=null;} +return true;},setSize:function(size){this.size=size.clone();this.resolution=null;},getResolution:function(){this.resolution=this.resolution||this.map.getResolution();return this.resolution;},drawFeature:function(feature,style){if(style==null){style=feature.style;} +if(feature.geometry){var bounds=feature.geometry.getBounds();if(bounds){var worldBounds;if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){worldBounds=this.map.getMaxExtent();} +if(!bounds.intersectsBounds(this.extent,{worldBounds:worldBounds})){style={display:"none"};}else{this.calculateFeatureDx(bounds,worldBounds);} var rendered=this.drawGeometry(feature.geometry,style,feature.id);if(style.display!="none"&&style.label&&rendered!==false){var location=feature.geometry.getCentroid();if(style.labelXOffset||style.labelYOffset){var xOffset=isNaN(style.labelXOffset)?0:style.labelXOffset;var yOffset=isNaN(style.labelYOffset)?0:style.labelYOffset;var res=this.getResolution();location.move(xOffset*res,yOffset*res);} this.drawText(feature.id,style,location);}else{this.removeText(feature.id);} -return rendered;}}},drawGeometry:function(geometry,style,featureId){},drawText:function(featureId,style,location){},removeText:function(featureId){},clear:function(){},getFeatureIdFromEvent:function(evt){},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} +return rendered;}}},calculateFeatureDx:function(bounds,worldBounds){this.featureDx=0;if(worldBounds){var worldWidth=worldBounds.getWidth(),rendererCenterX=(this.extent.left+this.extent.right)/2,featureCenterX=(bounds.left+bounds.right)/2,worldsAway=Math.round((featureCenterX-rendererCenterX)/worldWidth);this.featureDx=worldsAway*worldWidth;}},drawGeometry:function(geometry,style,featureId){},drawText:function(featureId,style,location){},removeText:function(featureId){},clear:function(){},getFeatureIdFromEvent:function(evt){},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} for(var i=0,len=features.length;i<len;++i){var feature=features[i];this.eraseGeometry(feature.geometry,feature.id);this.removeText(feature.id);}},eraseGeometry:function(geometry,featureId){},moveRoot:function(renderer){},getRenderLayerId:function(){return this.container.id;},applyDefaultSymbolizer:function(symbolizer){var result=OpenLayers.Util.extend({},OpenLayers.Renderer.defaultSymbolizer);if(symbolizer.stroke===false){delete result.strokeWidth;delete result.strokeColor;} if(symbolizer.fill===false){delete result.fillColor;} -OpenLayers.Util.extend(result,symbolizer);return result;},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Renderer.defaultSymbolizer={fillColor:"#000000",strokeColor:"#000000",strokeWidth:2,fillOpacity:1,strokeOpacity:1,pointRadius:0};OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:true,hitOverflow:0,canvas:null,features:null,pendingRedraw:false,initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};if(this.hitDetection){this.hitCanvas=document.createElement("canvas");this.hitContext=this.hitCanvas.getContext("2d");}},eraseGeometry:function(geometry,featureId){this.eraseFeatures(this.features[featureId][0]);},supported:function(){var canvas=document.createElement("canvas");return!!canvas.getContext;},setSize:function(size){this.size=size.clone();var root=this.root;root.style.width=size.w+"px";root.style.height=size.h+"px";root.width=size.w;root.height=size.h;this.resolution=null;if(this.hitDetection){var hitCanvas=this.hitCanvas;hitCanvas.style.width=size.w+"px";hitCanvas.style.height=size.h+"px";hitCanvas.width=size.w;hitCanvas.height=size.h;}},drawFeature:function(feature,style){var rendered;if(feature.geometry){style=this.applyDefaultSymbolizer(style||feature.style);var bounds=feature.geometry.getBounds();rendered=(style.display!=="none")&&!!bounds&&bounds.intersectsBounds(this.extent);if(rendered){this.features[feature.id]=[feature,style];} +OpenLayers.Util.extend(result,symbolizer);return result;},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Renderer.defaultSymbolizer={fillColor:"#000000",strokeColor:"#000000",strokeWidth:2,fillOpacity:1,strokeOpacity:1,pointRadius:0,labelAlign:'cm'};OpenLayers.Renderer.symbol={"star":[350,75,379,161,469,161,397,215,423,301,350,250,277,301,303,215,231,161,321,161,350,75],"cross":[4,0,6,0,6,4,10,4,10,6,6,6,6,10,4,10,4,6,0,6,0,4,4,4,4,0],"x":[0,0,25,0,50,35,75,0,100,0,65,50,100,100,75,100,50,65,25,100,0,100,35,50,0,0],"square":[0,0,0,1,1,1,1,0,0,0],"triangle":[0,10,10,10,5,0,0,10]};OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:true,hitOverflow:0,canvas:null,features:null,pendingRedraw:false,cachedSymbolBounds:{},initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};if(this.hitDetection){this.hitCanvas=document.createElement("canvas");this.hitContext=this.hitCanvas.getContext("2d");}},setExtent:function(){OpenLayers.Renderer.prototype.setExtent.apply(this,arguments);return false;},eraseGeometry:function(geometry,featureId){this.eraseFeatures(this.features[featureId][0]);},supported:function(){return OpenLayers.CANVAS_SUPPORTED;},setSize:function(size){this.size=size.clone();var root=this.root;root.style.width=size.w+"px";root.style.height=size.h+"px";root.width=size.w;root.height=size.h;this.resolution=null;if(this.hitDetection){var hitCanvas=this.hitCanvas;hitCanvas.style.width=size.w+"px";hitCanvas.style.height=size.h+"px";hitCanvas.width=size.w;hitCanvas.height=size.h;}},drawFeature:function(feature,style){var rendered;if(feature.geometry){style=this.applyDefaultSymbolizer(style||feature.style);var bounds=feature.geometry.getBounds();var worldBounds;if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){worldBounds=this.map.getMaxExtent();} +var intersects=bounds&&bounds.intersectsBounds(this.extent,{worldBounds:worldBounds});rendered=(style.display!=="none")&&!!bounds&&intersects;if(rendered){this.features[feature.id]=[feature,style];} else{delete(this.features[feature.id]);} this.pendingRedraw=true;} if(this.pendingRedraw&&!this.locked){this.redraw();this.pendingRedraw=false;} @@ -491,24 +691,41 @@ return rendered;},drawGeometry:function(geometry,style,featureId){var className= return;} switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":this.drawPoint(geometry,style,featureId);break;case"OpenLayers.Geometry.LineString":this.drawLineString(geometry,style,featureId);break;case"OpenLayers.Geometry.LinearRing":this.drawLinearRing(geometry,style,featureId);break;case"OpenLayers.Geometry.Polygon":this.drawPolygon(geometry,style,featureId);break;default:break;}},drawExternalGraphic:function(geometry,style,featureId){var img=new Image();if(style.graphicTitle){img.title=style.graphicTitle;} var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;var onLoad=function(){if(!this.features[featureId]){return;} -var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var x=(p0+xOffset)|0;var y=(p1+yOffset)|0;var canvas=this.canvas;canvas.globalAlpha=opacity;var factor=OpenLayers.Renderer.Canvas.drawImageScaleFactor||(OpenLayers.Renderer.Canvas.drawImageScaleFactor=/android 2.1/.test(navigator.userAgent.toLowerCase())?320/window.screen.width:1);canvas.drawImage(img,x*factor,y*factor,width*factor,height*factor);if(this.hitDetection){this.setHitContextStyle("fill",featureId);this.hitContext.fillRect(x,y,width,height);}}};img.onload=OpenLayers.Function.bind(onLoad,this);img.src=style.externalGraphic;},setCanvasStyle:function(type,style){if(type==="fill"){this.canvas.globalAlpha=style['fillOpacity'];this.canvas.fillStyle=style['fillColor'];}else if(type==="stroke"){this.canvas.globalAlpha=style['strokeOpacity'];this.canvas.strokeStyle=style['strokeColor'];this.canvas.lineWidth=style['strokeWidth'];}else{this.canvas.globalAlpha=0;this.canvas.lineWidth=1;}},featureIdToHex:function(featureId){var id=Number(featureId.split("_").pop())+1;if(id>=16777216){this.hitOverflow=id-16777215;id=id%16777216+1;} -var hex="000000"+id.toString(16);var len=hex.length;hex="#"+hex.substring(len-6,len);return hex;},setHitContextStyle:function(type,featureId,symbolizer){var hex=this.featureIdToHex(featureId);if(type=="fill"){this.hitContext.globalAlpha=1.0;this.hitContext.fillStyle=hex;}else if(type=="stroke"){this.hitContext.globalAlpha=1.0;this.hitContext.strokeStyle=hex;this.hitContext.lineWidth=symbolizer.strokeWidth+2;}else{this.hitContext.globalAlpha=0;this.hitContext.lineWidth=1;}},drawPoint:function(geometry,style,featureId){if(style.graphic!==false){if(style.externalGraphic){this.drawExternalGraphic(geometry,style,featureId);}else{var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var twoPi=Math.PI*2;var radius=style.pointRadius;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.fill();}} +var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var x=(p0+xOffset)|0;var y=(p1+yOffset)|0;var canvas=this.canvas;canvas.globalAlpha=opacity;var factor=OpenLayers.Renderer.Canvas.drawImageScaleFactor||(OpenLayers.Renderer.Canvas.drawImageScaleFactor=/android 2.1/.test(navigator.userAgent.toLowerCase())?320/window.screen.width:1);canvas.drawImage(img,x*factor,y*factor,width*factor,height*factor);if(this.hitDetection){this.setHitContextStyle("fill",featureId);this.hitContext.fillRect(x,y,width,height);}}};img.onload=OpenLayers.Function.bind(onLoad,this);img.src=style.externalGraphic;},drawNamedSymbol:function(geometry,style,featureId){var x,y,cx,cy,i,symbolBounds,scaling,angle;var unscaledStrokeWidth;var deg2rad=Math.PI/180.0;var symbol=OpenLayers.Renderer.symbol[style.graphicName];if(!symbol){throw new Error(style.graphicName+' is not a valid symbol name');} +if(!symbol.length||symbol.length<2)return;var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(isNaN(p0)||isNaN(p1))return;this.canvas.lineCap="round";this.canvas.lineJoin="round";if(this.hitDetection){this.hitContext.lineCap="round";this.hitContext.lineJoin="round";} +if(style.graphicName in this.cachedSymbolBounds){symbolBounds=this.cachedSymbolBounds[style.graphicName];}else{symbolBounds=new OpenLayers.Bounds();for(i=0;i<symbol.length;i+=2){symbolBounds.extend(new OpenLayers.LonLat(symbol[i],symbol[i+1]));} +this.cachedSymbolBounds[style.graphicName]=symbolBounds;} +this.canvas.save();if(this.hitDetection){this.hitContext.save();} +this.canvas.translate(p0,p1);if(this.hitDetection){this.hitContext.translate(p0,p1);} +angle=deg2rad*style.rotation;if(!isNaN(angle)){this.canvas.rotate(angle);if(this.hitDetection){this.hitContext.rotate(angle);}} +scaling=2.0*style.pointRadius/Math.max(symbolBounds.getWidth(),symbolBounds.getHeight());this.canvas.scale(scaling,scaling);if(this.hitDetection){this.hitContext.scale(scaling,scaling);} +cx=symbolBounds.getCenterLonLat().lon;cy=symbolBounds.getCenterLonLat().lat;this.canvas.translate(-cx,-cy);if(this.hitDetection){this.hitContext.translate(-cx,-cy);} +unscaledStrokeWidth=style.strokeWidth;style.strokeWidth=unscaledStrokeWidth/scaling;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.canvas.moveTo(x,y);this.canvas.lineTo(x,y);} +this.canvas.closePath();this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.canvas.moveTo(x,y);this.hitContext.lineTo(x,y);} +this.hitContext.closePath();this.hitContext.fill();}} +if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.canvas.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.canvas.moveTo(x,y);this.canvas.lineTo(x,y);} +this.canvas.closePath();this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style,scaling);this.hitContext.beginPath();for(i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];if(i==0)this.hitContext.moveTo(x,y);this.hitContext.lineTo(x,y);} +this.hitContext.closePath();this.hitContext.stroke();}} +style.strokeWidth=unscaledStrokeWidth;this.canvas.restore();if(this.hitDetection){this.hitContext.restore();} +this.setCanvasStyle("reset");},setCanvasStyle:function(type,style){if(type==="fill"){this.canvas.globalAlpha=style['fillOpacity'];this.canvas.fillStyle=style['fillColor'];}else if(type==="stroke"){this.canvas.globalAlpha=style['strokeOpacity'];this.canvas.strokeStyle=style['strokeColor'];this.canvas.lineWidth=style['strokeWidth'];}else{this.canvas.globalAlpha=0;this.canvas.lineWidth=1;}},featureIdToHex:function(featureId){var id=Number(featureId.split("_").pop())+1;if(id>=16777216){this.hitOverflow=id-16777215;id=id%16777216+1;} +var hex="000000"+id.toString(16);var len=hex.length;hex="#"+hex.substring(len-6,len);return hex;},setHitContextStyle:function(type,featureId,symbolizer,strokeScaling){var hex=this.featureIdToHex(featureId);if(type=="fill"){this.hitContext.globalAlpha=1.0;this.hitContext.fillStyle=hex;}else if(type=="stroke"){this.hitContext.globalAlpha=1.0;this.hitContext.strokeStyle=hex;if(typeof strokeScaling==="undefined"){this.hitContext.lineWidth=symbolizer.strokeWidth+2;}else{if(!isNaN(strokeScaling)){this.hitContext.lineWidth=symbolizer.strokeWidth+2.0/strokeScaling;}}}else{this.hitContext.globalAlpha=0;this.hitContext.lineWidth=1;}},drawPoint:function(geometry,style,featureId){if(style.graphic!==false){if(style.externalGraphic){this.drawExternalGraphic(geometry,style,featureId);}else if(style.graphicName&&(style.graphicName!="circle")){this.drawNamedSymbol(geometry,style,featureId);}else{var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var twoPi=Math.PI*2;var radius=style.pointRadius;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.fill();}} if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.stroke();} this.setCanvasStyle("reset");}}}}},drawLineString:function(geometry,style,featureId){style=OpenLayers.Util.applyDefaults({fill:false},style);this.drawLinearRing(geometry,style,featureId);},drawLinearRing:function(geometry,style,featureId){if(style.fill!==false){this.setCanvasStyle("fill",style);this.renderPath(this.canvas,geometry,style,featureId,"fill");if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"fill");}} if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.renderPath(this.canvas,geometry,style,featureId,"stroke");if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"stroke");}} this.setCanvasStyle("reset");},renderPath:function(context,geometry,style,featureId,type){var components=geometry.components;var len=components.length;context.beginPath();var start=this.getLocalXY(components[0]);var x=start[0];var y=start[1];if(!isNaN(x)&&!isNaN(y)){context.moveTo(start[0],start[1]);for(var i=1;i<len;++i){var pt=this.getLocalXY(components[i]);context.lineTo(pt[0],pt[1]);} if(type==="fill"){context.fill();}else{context.stroke();}}},drawPolygon:function(geometry,style,featureId){var components=geometry.components;var len=components.length;this.drawLinearRing(components[0],style,featureId);for(var i=1;i<len;++i){this.canvas.globalCompositeOperation="destination-out";if(this.hitDetection){this.hitContext.globalCompositeOperation="destination-out";} this.drawLinearRing(components[i],OpenLayers.Util.applyDefaults({stroke:false,fillOpacity:1.0},style),featureId);this.canvas.globalCompositeOperation="source-over";if(this.hitDetection){this.hitContext.globalCompositeOperation="source-over";} -this.drawLinearRing(components[i],OpenLayers.Util.applyDefaults({fill:false},style),featureId);}},drawText:function(location,style){style=OpenLayers.Util.extend({fontColor:"#000000",labelAlign:"cm"},style);var pt=this.getLocalXY(location);this.setCanvasStyle("reset");this.canvas.fillStyle=style.fontColor;this.canvas.globalAlpha=style.fontOpacity||1.0;var fontStyle=[style.fontStyle?style.fontStyle:"normal","normal",style.fontWeight?style.fontWeight:"normal",style.fontSize?style.fontSize:"1em",style.fontFamily?style.fontFamily:"sans-serif"].join(" ");var labelRows=style.label.split('\n');var numRows=labelRows.length;if(this.canvas.fillText){this.canvas.font=fontStyle;this.canvas.textAlign=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[0]]||"center";this.canvas.textBaseline=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[1]]||"middle";var vfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];if(vfactor==null){vfactor=-.5;} -var lineHeight=this.canvas.measureText('Mg').height||this.canvas.measureText('xx').width;pt[1]+=lineHeight*vfactor*(numRows-1);for(var i=0;i<numRows;i++){this.canvas.fillText(labelRows[i],pt[0],pt[1]+(lineHeight*i));}}else if(this.canvas.mozDrawText){this.canvas.mozTextStyle=fontStyle;var hfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[0]];if(hfactor==null){hfactor=-.5;} +this.drawLinearRing(components[i],OpenLayers.Util.applyDefaults({fill:false},style),featureId);}},drawText:function(location,style){var pt=this.getLocalXY(location);this.setCanvasStyle("reset");this.canvas.fillStyle=style.fontColor;this.canvas.globalAlpha=style.fontOpacity||1.0;var fontStyle=[style.fontStyle?style.fontStyle:"normal","normal",style.fontWeight?style.fontWeight:"normal",style.fontSize?style.fontSize:"1em",style.fontFamily?style.fontFamily:"sans-serif"].join(" ");var labelRows=style.label.split('\n');var numRows=labelRows.length;if(this.canvas.fillText){this.canvas.font=fontStyle;this.canvas.textAlign=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[0]]||"center";this.canvas.textBaseline=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[1]]||"middle";var vfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];if(vfactor==null){vfactor=-.5;} +var lineHeight=this.canvas.measureText('Mg').height||this.canvas.measureText('xx').width;pt[1]+=lineHeight*vfactor*(numRows-1);for(var i=0;i<numRows;i++){if(style.labelOutlineWidth){this.canvas.save();this.canvas.strokeStyle=style.labelOutlineColor;this.canvas.lineWidth=style.labelOutlineWidth;this.canvas.strokeText(labelRows[i],pt[0],pt[1]+(lineHeight*i)+1);this.canvas.restore();} +this.canvas.fillText(labelRows[i],pt[0],pt[1]+(lineHeight*i));}}else if(this.canvas.mozDrawText){this.canvas.mozTextStyle=fontStyle;var hfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[0]];if(hfactor==null){hfactor=-.5;} var vfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];if(vfactor==null){vfactor=-.5;} var lineHeight=this.canvas.mozMeasureText('xx');pt[1]+=lineHeight*(1+(vfactor*numRows));for(var i=0;i<numRows;i++){var x=pt[0]+(hfactor*this.canvas.mozMeasureText(labelRows[i]));var y=pt[1]+(i*lineHeight);this.canvas.translate(x,y);this.canvas.mozDrawText(labelRows[i]);this.canvas.translate(-x,-y);}} -this.setCanvasStyle("reset");},getLocalXY:function(point){var resolution=this.getResolution();var extent=this.extent;var x=(point.x/resolution+(-extent.left/resolution));var y=((extent.top/resolution)-point.y/resolution);return[x,y];},clear:function(){var height=this.root.height;var width=this.root.width;this.canvas.clearRect(0,0,width,height);this.features={};if(this.hitDetection){this.hitContext.clearRect(0,0,width,height);}},getFeatureIdFromEvent:function(evt){var feature=null;if(this.hitDetection){if(!this.map.dragging){var xy=evt.xy;var x=xy.x|0;var y=xy.y|0;var data=this.hitContext.getImageData(x,y,1,1).data;if(data[3]===255){var id=data[2]+(256*(data[1]+(256*data[0])));if(id){feature=this.features["OpenLayers.Feature.Vector_"+(id-1+this.hitOverflow)][0];}}}} +this.setCanvasStyle("reset");},getLocalXY:function(point){var resolution=this.getResolution();var extent=this.extent;var x=((point.x-this.featureDx)/resolution+(-extent.left/resolution));var y=((extent.top/resolution)-point.y/resolution);return[x,y];},clear:function(){var height=this.root.height;var width=this.root.width;this.canvas.clearRect(0,0,width,height);this.features={};if(this.hitDetection){this.hitContext.clearRect(0,0,width,height);}},getFeatureIdFromEvent:function(evt){var featureId,feature;if(this.hitDetection&&this.root.style.display!=="none"){if(!this.map.dragging){var xy=evt.xy;var x=xy.x|0;var y=xy.y|0;var data=this.hitContext.getImageData(x,y,1,1).data;if(data[3]===255){var id=data[2]+(256*(data[1]+(256*data[0])));if(id){featureId="OpenLayers.Feature.Vector_"+(id-1+this.hitOverflow);try{feature=this.features[featureId][0];}catch(err){}}}}} return feature;},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} for(var i=0;i<features.length;++i){delete this.features[features[i].id];} this.redraw();},redraw:function(){if(!this.locked){var height=this.root.height;var width=this.root.width;this.canvas.clearRect(0,0,width,height);if(this.hitDetection){this.hitContext.clearRect(0,0,width,height);} -var labelMap=[];var feature,style;for(var id in this.features){if(!this.features.hasOwnProperty(id)){continue;} -feature=this.features[id][0];style=this.features[id][1];this.drawGeometry(feature.geometry,style,feature.id);if(style.label){labelMap.push([feature,style]);}} +var labelMap=[];var feature,geometry,style;var worldBounds=(this.map.baseLayer&&this.map.baseLayer.wrapDateLine)&&this.map.getMaxExtent();for(var id in this.features){if(!this.features.hasOwnProperty(id)){continue;} +feature=this.features[id][0];geometry=feature.geometry;this.calculateFeatureDx(geometry.getBounds(),worldBounds);style=this.features[id][1];this.drawGeometry(geometry,style,feature.id);if(style.label){labelMap.push([feature,style]);}} var item;for(var i=0,len=labelMap.length;i<len;++i){item=labelMap[i];this.drawText(item[0].geometry.getCentroid(),item[1]);}}},CLASS_NAME:"OpenLayers.Renderer.Canvas"});OpenLayers.Renderer.Canvas.LABEL_ALIGN={"l":"left","r":"right","t":"top","b":"bottom"};OpenLayers.Renderer.Canvas.LABEL_FACTOR={"l":0,"r":-1,"t":0,"b":-1};OpenLayers.Renderer.Canvas.drawImageScaleFactor=null;OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(options){if(window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");} OpenLayers.Format.prototype.initialize.apply(this,[options]);this.namespaces=OpenLayers.Util.extend({},this.namespaces);this.namespaceAlias={};for(var alias in this.namespaces){this.namespaceAlias[this.namespaces[alias]]=alias;}},destroy:function(){this.xmldom=null;OpenLayers.Format.prototype.destroy.apply(this,arguments);},setNamespace:function(alias,uri){this.namespaces[alias]=uri;this.namespaceAlias[uri]=alias;},read:function(text){var index=text.indexOf('<');if(index>0){text=text.substring(index);} var node=OpenLayers.Util.Try(OpenLayers.Function.bind((function(){var xmldom;if(window.ActiveXObject&&!this.xmldom){xmldom=new ActiveXObject("Microsoft.XMLDOM");}else{xmldom=this.xmldom;} @@ -523,9 +740,6 @@ return node;},getElementsByTagNameNS:function(node,uri,name){var elements=[];if( return elements;},getAttributeNodeNS:function(node,uri,name){var attributeNode=null;if(node.getAttributeNodeNS){attributeNode=node.getAttributeNodeNS(uri,name);}else{var attributes=node.attributes;var potentialNode,fullName;for(var i=0,len=attributes.length;i<len;++i){potentialNode=attributes[i];if(potentialNode.namespaceURI==uri){fullName=(potentialNode.prefix)?(potentialNode.prefix+":"+name):name;if(fullName==potentialNode.nodeName){attributeNode=potentialNode;break;}}}} return attributeNode;},getAttributeNS:function(node,uri,name){var attributeValue="";if(node.getAttributeNS){attributeValue=node.getAttributeNS(uri,name)||"";}else{var attributeNode=this.getAttributeNodeNS(node,uri,name);if(attributeNode){attributeValue=attributeNode.nodeValue;}} return attributeValue;},getChildValue:function(node,def){var value=def||"";if(node){for(var child=node.firstChild;child;child=child.nextSibling){switch(child.nodeType){case 3:case 4:value+=child.nodeValue;}}} -return value;},concatChildValues:function(node,def){var value="";var child=node.firstChild;var childValue;while(child){childValue=child.nodeValue;if(childValue){value+=childValue;} -child=child.nextSibling;} -if(value==""&&def!=undefined){value=def;} return value;},isSimpleContent:function(node){var simple=true;for(var child=node.firstChild;child;child=child.nextSibling){if(child.nodeType===1){simple=false;break;}} return simple;},contentType:function(node){var simple=false,complex=false;var type=OpenLayers.Format.XML.CONTENT_TYPE.EMPTY;for(var child=node.firstChild;child;child=child.nextSibling){switch(child.nodeType){case 1:complex=true;break;case 8:break;default:simple=true;} if(complex&&simple){break;}} @@ -549,7 +763,21 @@ return sibling||null;},lookupNamespaceURI:function(node,prefix){var uri=null;if( var len=node.attributes.length;if(len){var attr;for(var i=0;i<len;++i){attr=node.attributes[i];if(attr.prefix==="xmlns"&&attr.name==="xmlns:"+prefix){uri=attr.value||null;break outer;}else if(attr.name==="xmlns"&&prefix===null){uri=attr.value||null;break outer;}}} uri=this.lookupNamespaceURI(node.parentNode,prefix);break outer;case 2:uri=this.lookupNamespaceURI(node.ownerElement,prefix);break outer;case 9:uri=this.lookupNamespaceURI(node.documentElement,prefix);break outer;case 6:case 12:case 10:case 11:break outer;default:uri=this.lookupNamespaceURI(node.parentNode,prefix);break outer;}}} return uri;},getXMLDoc:function(){if(!OpenLayers.Format.XML.document&&!this.xmldom){if(document.implementation&&document.implementation.createDocument){OpenLayers.Format.XML.document=document.implementation.createDocument("","",null);}else if(!this.xmldom&&window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");}} -return OpenLayers.Format.XML.document||this.xmldom;},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Format.XML.CONTENT_TYPE={EMPTY:0,SIMPLE:1,COMPLEX:2,MIXED:3};OpenLayers.Format.XML.lookupNamespaceURI=OpenLayers.Function.bind(OpenLayers.Format.XML.prototype.lookupNamespaceURI,OpenLayers.Format.XML.prototype);OpenLayers.Format.XML.document=null;OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},getArea:function(){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getArea());for(var i=1,len=this.components.length;i<len;i++){area-=Math.abs(this.components[i].getArea());}} +return OpenLayers.Format.XML.document||this.xmldom;},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Format.XML.CONTENT_TYPE={EMPTY:0,SIMPLE:1,COMPLEX:2,MIXED:3};OpenLayers.Format.XML.lookupNamespaceURI=OpenLayers.Function.bind(OpenLayers.Format.XML.prototype.lookupNamespaceURI,OpenLayers.Format.XML.prototype);OpenLayers.Format.XML.document=null;OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(layer,lonlat,data){this.layer=layer;this.lonlat=lonlat;this.data=(data!=null)?data:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup);}} +if(this.layer!=null&&this.marker!=null){this.layer.removeMarker(this.marker);} +this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null;} +if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null;}},onScreen:function(){var onScreen=false;if((this.layer!=null)&&(this.layer.map!=null)){var screenBounds=this.layer.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);} +return onScreen;},createMarker:function(){if(this.lonlat!=null){this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon);} +return this.marker;},destroyMarker:function(){this.marker.destroy();},createPopup:function(closeBox){if(this.lonlat!=null){if(!this.popup){var anchor=(this.marker)?this.marker.icon:null;var popupClass=this.popupClass?this.popupClass:OpenLayers.Popup.Anchored;this.popup=new popupClass(this.id+"_popup",this.lonlat,this.data.popupSize,this.data.popupContentHTML,anchor,closeBox);} +if(this.data.overflow!=null){this.popup.contentDiv.style.overflow=this.data.overflow;} +this.popup.feature=this;} +return this.popup;},destroyPopup:function(){if(this.popup){this.popup.feature=null;this.popup.destroy();this.popup=null;}},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.State={UNKNOWN:'Unknown',INSERT:'Insert',UPDATE:'Update',DELETE:'Delete'};OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,bounds:null,state:null,style:null,url:null,renderIntent:"default",modified:null,initialize:function(geometry,attributes,style){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,attributes]);this.lonlat=null;this.geometry=geometry?geometry:null;this.state=null;this.attributes={};if(attributes){this.attributes=OpenLayers.Util.extend(this.attributes,attributes);} +this.style=style?style:null;},destroy:function(){if(this.layer){this.layer.removeFeatures(this);this.layer=null;} +this.geometry=null;this.modified=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments);},clone:function(){return new OpenLayers.Feature.Vector(this.geometry?this.geometry.clone():null,this.attributes,this.style);},onScreen:function(boundsOnly){var onScreen=false;if(this.layer&&this.layer.map){var screenBounds=this.layer.map.getExtent();if(boundsOnly){var featureBounds=this.geometry.getBounds();onScreen=screenBounds.intersectsBounds(featureBounds);}else{var screenPoly=screenBounds.toGeometry();onScreen=screenPoly.intersects(this.geometry);}} +return onScreen;},getVisibility:function(){return!(this.style&&this.style.display=='none'||!this.layer||this.layer&&this.layer.styleMap&&this.layer.styleMap.createSymbolizer(this,this.renderIntent).display=='none'||this.layer&&!this.layer.getVisibility());},createMarker:function(){return null;},destroyMarker:function(){},createPopup:function(){return null;},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;if(this.geometry){atPoint=this.geometry.atPoint(lonlat,toleranceLon,toleranceLat);} +return atPoint;},destroyPopup:function(){},move:function(location){if(!this.layer||!this.geometry.move){return undefined;} +var pixel;if(location.CLASS_NAME=="OpenLayers.LonLat"){pixel=this.layer.getViewPortPxFromLonLat(location);}else{pixel=location;} +var lastPixel=this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat());var res=this.layer.map.getResolution();this.geometry.move(res*(pixel.x-lastPixel.x),res*(lastPixel.y-pixel.y));this.layer.drawFeature(this);return lastPixel;},toState:function(state){if(state==OpenLayers.State.UPDATE){switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=state;break;case OpenLayers.State.UPDATE:case OpenLayers.State.INSERT:break;}}else if(state==OpenLayers.State.INSERT){switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=state;break;}}else if(state==OpenLayers.State.DELETE){switch(this.state){case OpenLayers.State.INSERT:break;case OpenLayers.State.DELETE:break;case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=state;break;}}else if(state==OpenLayers.State.UNKNOWN){this.state=state;}},CLASS_NAME:"OpenLayers.Feature.Vector"});OpenLayers.Feature.Vector.style={'default':{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},'select':{fillColor:"blue",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},'temporary':{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},'delete':{display:"none"}};OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],getArea:function(){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getArea());for(var i=1,len=this.components.length;i<len;i++){area-=Math.abs(this.components[i].getArea());}} return area;},getGeodesicArea:function(projection){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getGeodesicArea(projection));for(var i=1,len=this.components.length;i<len;i++){area-=Math.abs(this.components[i].getGeodesicArea(projection));}} return area;},containsPoint:function(point){var numRings=this.components.length;var contained=false;if(numRings>0){contained=this.components[0].containsPoint(point);if(contained!==1){if(contained&&numRings>1){var hole;for(var i=1;i<numRings;++i){hole=this.components[i].containsPoint(point);if(hole){if(hole===1){contained=1;}else{contained=false;} break;}}}}} @@ -559,10 +787,7 @@ if(!intersect&&geometry.CLASS_NAME=="OpenLayers.Geometry.Polygon"){var ring=this return intersect;},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var result;if(!edge&&this.intersects(geometry)){result=0;}else{result=OpenLayers.Geometry.Collection.prototype.distanceTo.apply(this,[geometry,options]);} return result;},CLASS_NAME:"OpenLayers.Geometry.Polygon"});OpenLayers.Geometry.Polygon.createRegularPolygon=function(origin,radius,sides,rotation){var angle=Math.PI*((1/sides)-(1/2));if(rotation){angle+=(rotation/180)*Math.PI;} var rotatedAngle,x,y;var points=[];for(var i=0;i<sides;++i){rotatedAngle=angle+(i*2*Math.PI/sides);x=origin.x+(radius*Math.cos(rotatedAngle));y=origin.y+(radius*Math.sin(rotatedAngle));points.push(new OpenLayers.Geometry.Point(x,y));} -var ring=new OpenLayers.Geometry.LinearRing(points);return new OpenLayers.Geometry.Polygon([ring]);};OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,titleRegEx:/\+title=[^\+]*/,initialize:function(projCode,options){OpenLayers.Util.extend(this,options);this.projCode=projCode;if(window.Proj4js){this.proj=new Proj4js.Proj(projCode);}},getCode:function(){return this.proj?this.proj.srsCode:this.projCode;},getUnits:function(){return this.proj?this.proj.units:null;},toString:function(){return this.getCode();},equals:function(projection){var p=projection,equals=false;if(p){if(window.Proj4js&&this.proj.defData&&p.proj.defData){equals=this.proj.defData.replace(this.titleRegEx,"")==p.proj.defData.replace(this.titleRegEx,"");}else if(p.getCode){var source=this.getCode(),target=p.getCode();equals=source==target||!!OpenLayers.Projection.transforms[source]&&OpenLayers.Projection.transforms[source][target]===OpenLayers.Projection.nullTransform;}} -return equals;},destroy:function(){delete this.proj;delete this.projCode;},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};OpenLayers.Projection.addTransform=function(from,to,method){if(!OpenLayers.Projection.transforms[from]){OpenLayers.Projection.transforms[from]={};} -OpenLayers.Projection.transforms[from][to]=method;};OpenLayers.Projection.transform=function(point,source,dest){if(source.proj&&dest.proj){point=Proj4js.transform(source.proj,dest.proj,point);}else if(source&&dest&&OpenLayers.Projection.transforms[source.getCode()]&&OpenLayers.Projection.transforms[source.getCode()][dest.getCode()]){OpenLayers.Projection.transforms[source.getCode()][dest.getCode()](point);} -return point;};OpenLayers.Projection.nullTransform=function(point){return point;};OpenLayers.Format.OSM=OpenLayers.Class(OpenLayers.Format.XML,{checkTags:false,interestingTagsExclude:null,areaTags:null,initialize:function(options){var layer_defaults={'interestingTagsExclude':['source','source_ref','source:ref','history','attribution','created_by'],'areaTags':['area','building','leisure','tourism','ruins','historic','landuse','military','natural','sport']};layer_defaults=OpenLayers.Util.extend(layer_defaults,options);var interesting={};for(var i=0;i<layer_defaults.interestingTagsExclude.length;i++){interesting[layer_defaults.interestingTagsExclude[i]]=true;} +var ring=new OpenLayers.Geometry.LinearRing(points);return new OpenLayers.Geometry.Polygon([ring]);};OpenLayers.Format.OSM=OpenLayers.Class(OpenLayers.Format.XML,{checkTags:false,interestingTagsExclude:null,areaTags:null,initialize:function(options){var layer_defaults={'interestingTagsExclude':['source','source_ref','source:ref','history','attribution','created_by'],'areaTags':['area','building','leisure','tourism','ruins','historic','landuse','military','natural','sport']};layer_defaults=OpenLayers.Util.extend(layer_defaults,options);var interesting={};for(var i=0;i<layer_defaults.interestingTagsExclude.length;i++){interesting[layer_defaults.interestingTagsExclude[i]]=true;} layer_defaults.interestingTagsExclude=interesting;var area={};for(var i=0;i<layer_defaults.areaTags.length;i++){area[layer_defaults.areaTags[i]]=true;} layer_defaults.areaTags=area;this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[layer_defaults]);},read:function(doc){if(typeof doc=="string"){doc=OpenLayers.Format.XML.prototype.read.apply(this,[doc]);} var nodes=this.getNodes(doc);var ways=this.getWays(doc);var feat_list=new Array(ways.length);for(var i=0;i<ways.length;i++){var point_list=new Array(ways[i].nodes.length);var poly=this.isWayArea(ways[i])?1:0;for(var j=0;j<ways[i].nodes.length;j++){var node=nodes[ways[i].nodes[j]];var point=new OpenLayers.Geometry.Point(node.lon,node.lat);point.osm_id=parseInt(ways[i].nodes[j]);point_list[j]=point;node.used=true;} @@ -578,56 +803,20 @@ return feat_list;},getNodes:function(doc){var node_list=doc.getElementsByTagName return nodes;},getWays:function(doc){var way_list=doc.getElementsByTagName("way");var return_ways=[];for(var i=0;i<way_list.length;i++){var way=way_list[i];var way_object={id:way.getAttribute("id")};way_object.tags=this.getTags(way);var node_list=way.getElementsByTagName("nd");way_object.nodes=new Array(node_list.length);for(var j=0;j<node_list.length;j++){way_object.nodes[j]=node_list[j].getAttribute("ref");} return_ways.push(way_object);} return return_ways;},getTags:function(dom_node,interesting_tags){var tag_list=dom_node.getElementsByTagName("tag");var tags={};var interesting=false;for(var j=0;j<tag_list.length;j++){var key=tag_list[j].getAttribute("k");tags[key]=tag_list[j].getAttribute("v");if(interesting_tags){if(!this.interestingTagsExclude[key]){interesting=true;}}} -return interesting_tags?[tags,interesting]:tags;},isWayArea:function(way){var poly_shaped=false;var poly_tags=false;if(way.nodes[0]==way.nodes[way.nodes.length-1]){poly_shaped=true;} -if(this.checkTags){for(var key in way.tags){if(this.areaTags[key]){poly_tags=true;break;}}} -return poly_shaped&&(this.checkTags?poly_tags:true);},write:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} -this.osm_id=1;this.created_nodes={};var root_node=this.createElementNS(null,"osm");root_node.setAttribute("version","0.5");root_node.setAttribute("generator","OpenLayers "+OpenLayers.VERSION_NUMBER);for(var i=features.length-1;i>=0;i--){var nodes=this.createFeatureNodes(features[i]);for(var j=0;j<nodes.length;j++){root_node.appendChild(nodes[j]);}} -return OpenLayers.Format.XML.prototype.write.apply(this,[root_node]);},createFeatureNodes:function(feature){var nodes=[];var className=feature.geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);type=type.toLowerCase();var builder=this.createXML[type];if(builder){nodes=builder.apply(this,[feature]);} -return nodes;},createXML:{'point':function(point){var id=null;var geometry=point.geometry?point.geometry:point;if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);} -var already_exists=false;if(point.osm_id){id=point.osm_id;if(this.created_nodes[id]){already_exists=true;}}else{id=-this.osm_id;this.osm_id++;} -if(already_exists){node=this.created_nodes[id];}else{var node=this.createElementNS(null,"node");} -this.created_nodes[id]=node;node.setAttribute("id",id);node.setAttribute("lon",geometry.x);node.setAttribute("lat",geometry.y);if(point.attributes){this.serializeTags(point,node);} -this.setState(point,node);return already_exists?[]:[node];},linestring:function(feature){var id;var nodes=[];var geometry=feature.geometry;if(feature.osm_id){id=feature.osm_id;}else{id=-this.osm_id;this.osm_id++;} -var way=this.createElementNS(null,"way");way.setAttribute("id",id);for(var i=0;i<geometry.components.length;i++){var node=this.createXML['point'].apply(this,[geometry.components[i]]);if(node.length){node=node[0];var node_ref=node.getAttribute("id");nodes.push(node);}else{node_ref=geometry.components[i].osm_id;node=this.created_nodes[node_ref];} -this.setState(feature,node);var nd_dom=this.createElementNS(null,"nd");nd_dom.setAttribute("ref",node_ref);way.appendChild(nd_dom);} -this.serializeTags(feature,way);nodes.push(way);return nodes;},polygon:function(feature){var attrs=OpenLayers.Util.extend({'area':'yes'},feature.attributes);var feat=new OpenLayers.Feature.Vector(feature.geometry.components[0],attrs);feat.osm_id=feature.osm_id;return this.createXML['linestring'].apply(this,[feat]);}},serializeTags:function(feature,node){for(var key in feature.attributes){var tag=this.createElementNS(null,"tag");tag.setAttribute("k",key);tag.setAttribute("v",feature.attributes[key]);node.appendChild(tag);}},setState:function(feature,node){if(feature.state){var state=null;switch(feature.state){case OpenLayers.State.UPDATE:state="modify";case OpenLayers.State.DELETE:state="delete";} -if(state){node.setAttribute("action",state);}}},CLASS_NAME:"OpenLayers.Format.OSM"});OpenLayers.Event={observers:false,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(event){return event.target||event.srcElement;},isSingleTouch:function(event){return event.touches&&event.touches.length==1;},isMultiTouch:function(event){return event.touches&&event.touches.length>1;},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)));},isRightClick:function(event){return(((event.which)&&(event.which==3))||((event.button)&&(event.button==2)));},stop:function(event,allowDefault){if(!allowDefault){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}} -if(event.stopPropagation){event.stopPropagation();}else{event.cancelBubble=true;}},findElement:function(event,tagName){var element=OpenLayers.Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase()))){element=element.parentNode;} -return element;},observe:function(elementParam,name,observer,useCapture){var element=OpenLayers.Util.getElement(elementParam);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent)){name='keydown';} -if(!this.observers){this.observers={};} -if(!element._eventCacheID){var idPrefix="eventCacheID_";if(element.id){idPrefix=element.id+"_"+idPrefix;} -element._eventCacheID=OpenLayers.Util.createUniqueID(idPrefix);} -var cacheID=element._eventCacheID;if(!this.observers[cacheID]){this.observers[cacheID]=[];} -this.observers[cacheID].push({'element':element,'name':name,'observer':observer,'useCapture':useCapture});if(element.addEventListener){element.addEventListener(name,observer,useCapture);}else if(element.attachEvent){element.attachEvent('on'+name,observer);}},stopObservingElement:function(elementParam){var element=OpenLayers.Util.getElement(elementParam);var cacheID=element._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[cacheID]);},_removeElementObservers:function(elementObservers){if(elementObservers){for(var i=elementObservers.length-1;i>=0;i--){var entry=elementObservers[i];var args=new Array(entry.element,entry.name,entry.observer,entry.useCapture);var removed=OpenLayers.Event.stopObserving.apply(this,args);}}},stopObserving:function(elementParam,name,observer,useCapture){useCapture=useCapture||false;var element=OpenLayers.Util.getElement(elementParam);var cacheID=element._eventCacheID;if(name=='keypress'){if(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.detachEvent){name='keydown';}} -var foundEntry=false;var elementObservers=OpenLayers.Event.observers[cacheID];if(elementObservers){var i=0;while(!foundEntry&&i<elementObservers.length){var cacheEntry=elementObservers[i];if((cacheEntry.name==name)&&(cacheEntry.observer==observer)&&(cacheEntry.useCapture==useCapture)){elementObservers.splice(i,1);if(elementObservers.length==0){delete OpenLayers.Event.observers[cacheID];} -foundEntry=true;break;} -i++;}} -if(foundEntry){if(element.removeEventListener){element.removeEventListener(name,observer,useCapture);}else if(element&&element.detachEvent){element.detachEvent('on'+name,observer);}} -return foundEntry;},unloadCache:function(){if(OpenLayers.Event&&OpenLayers.Event.observers){for(var cacheID in OpenLayers.Event.observers){var elementObservers=OpenLayers.Event.observers[cacheID];OpenLayers.Event._removeElementObservers.apply(this,[elementObservers]);} -OpenLayers.Event.observers=false;}},CLASS_NAME:"OpenLayers.Event"};OpenLayers.Event.observe(window,'unload',OpenLayers.Event.unloadCache,false);if(window.Event){OpenLayers.Util.applyDefaults(window.Event,OpenLayers.Event);}else{var Event=OpenLayers.Event;} -OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:["mouseover","mouseout","mousedown","mouseup","mousemove","click","dblclick","rightclick","dblrightclick","resize","focus","blur","touchstart","touchmove","touchend"],listeners:null,object:null,element:null,eventTypes:null,eventHandler:null,fallThrough:null,includeXY:false,clearMouseListener:null,initialize:function(object,element,eventTypes,fallThrough,options){OpenLayers.Util.extend(this,options);this.object=object;this.fallThrough=fallThrough;this.listeners={};this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this);this.clearMouseListener=OpenLayers.Function.bind(this.clearMouseCache,this);this.eventTypes=[];if(eventTypes!=null){for(var i=0,len=eventTypes.length;i<len;i++){this.addEventType(eventTypes[i]);}} -if(element!=null){this.attachToElement(element);}},destroy:function(){if(this.element){OpenLayers.Event.stopObservingElement(this.element);if(this.element.hasScrollEvent){OpenLayers.Event.stopObserving(window,"scroll",this.clearMouseListener);}} -this.element=null;this.listeners=null;this.object=null;this.eventTypes=null;this.fallThrough=null;this.eventHandler=null;},addEventType:function(eventName){if(!this.listeners[eventName]){this.eventTypes.push(eventName);this.listeners[eventName]=[];}},attachToElement:function(element){if(this.element){OpenLayers.Event.stopObservingElement(this.element);} -this.element=element;for(var i=0,len=this.BROWSER_EVENTS.length;i<len;i++){var eventType=this.BROWSER_EVENTS[i];this.addEventType(eventType);OpenLayers.Event.observe(element,eventType,this.eventHandler);} -OpenLayers.Event.observe(element,"dragstart",OpenLayers.Event.stop);},on:function(object){for(var type in object){if(type!="scope"){this.register(type,object.scope,object[type]);}}},register:function(type,obj,func){if((func!=null)&&(OpenLayers.Util.indexOf(this.eventTypes,type)!=-1)){if(obj==null){obj=this.object;} -var listeners=this.listeners[type];listeners.push({obj:obj,func:func});}},registerPriority:function(type,obj,func){if(func!=null){if(obj==null){obj=this.object;} -var listeners=this.listeners[type];if(listeners!=null){listeners.unshift({obj:obj,func:func});}}},un:function(object){for(var type in object){if(type!="scope"){this.unregister(type,object.scope,object[type]);}}},unregister:function(type,obj,func){if(obj==null){obj=this.object;} -var listeners=this.listeners[type];if(listeners!=null){for(var i=0,len=listeners.length;i<len;i++){if(listeners[i].obj==obj&&listeners[i].func==func){listeners.splice(i,1);break;}}}},remove:function(type){if(this.listeners[type]!=null){this.listeners[type]=[];}},triggerEvent:function(type,evt){var listeners=this.listeners[type];if(!listeners||listeners.length==0){return undefined;} -if(evt==null){evt={};} -evt.object=this.object;evt.element=this.element;if(!evt.type){evt.type=type;} -listeners=listeners.slice();var continueChain;for(var i=0,len=listeners.length;i<len;i++){var callback=listeners[i];continueChain=callback.func.apply(callback.obj,[evt]);if((continueChain!=undefined)&&(continueChain==false)){break;}} -if(!this.fallThrough){OpenLayers.Event.stop(evt,true);} -return continueChain;},handleBrowserEvent:function(evt){var type=evt.type,listeners=this.listeners[type];if(!listeners||listeners.length==0){return;} -var touches=evt.touches;if(touches&&touches[0]){var x=0;var y=0;var num=touches.length;var touch;for(var i=0;i<num;++i){touch=touches[i];x+=touch.clientX;y+=touch.clientY;} -evt.clientX=x/num;evt.clientY=y/num;} -if(this.includeXY){evt.xy=this.getMousePosition(evt);} -this.triggerEvent(type,evt);},clearMouseCache:function(){this.element.scrolls=null;this.element.lefttop=null;var body=document.body;if(body&&!((body.scrollTop!=0||body.scrollLeft!=0)&&navigator.userAgent.match(/iPhone/i))){this.element.offsets=null;}},getMousePosition:function(evt){if(!this.includeXY){this.clearMouseCache();}else if(!this.element.hasScrollEvent){OpenLayers.Event.observe(window,"scroll",this.clearMouseListener);this.element.hasScrollEvent=true;} -if(!this.element.scrolls){var viewportElement=OpenLayers.Util.getViewportElement();this.element.scrolls=[viewportElement.scrollLeft,viewportElement.scrollTop];} -if(!this.element.lefttop){this.element.lefttop=[(document.documentElement.clientLeft||0),(document.documentElement.clientTop||0)];} -if(!this.element.offsets){this.element.offsets=OpenLayers.Util.pagePosition(this.element);} -return new OpenLayers.Pixel((evt.clientX+this.element.scrolls[0])-this.element.offsets[0] --this.element.lefttop[0],(evt.clientY+this.element.scrolls[1])-this.element.offsets[1] --this.element.lefttop[1]);},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(control,callbacks,options){OpenLayers.Util.extend(this,options);this.control=control;this.callbacks=callbacks;var map=this.map||control.map;if(map){this.setMap(map);} +return interesting_tags?[tags,interesting]:tags;},isWayArea:function(way){var poly_shaped=false;var poly_tags=false;if(way.nodes[0]==way.nodes[way.nodes.length-1]){poly_shaped=true;} +if(this.checkTags){for(var key in way.tags){if(this.areaTags[key]){poly_tags=true;break;}}} +return poly_shaped&&(this.checkTags?poly_tags:true);},write:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} +this.osm_id=1;this.created_nodes={};var root_node=this.createElementNS(null,"osm");root_node.setAttribute("version","0.5");root_node.setAttribute("generator","OpenLayers "+OpenLayers.VERSION_NUMBER);for(var i=features.length-1;i>=0;i--){var nodes=this.createFeatureNodes(features[i]);for(var j=0;j<nodes.length;j++){root_node.appendChild(nodes[j]);}} +return OpenLayers.Format.XML.prototype.write.apply(this,[root_node]);},createFeatureNodes:function(feature){var nodes=[];var className=feature.geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);type=type.toLowerCase();var builder=this.createXML[type];if(builder){nodes=builder.apply(this,[feature]);} +return nodes;},createXML:{'point':function(point){var id=null;var geometry=point.geometry?point.geometry:point;if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);} +var already_exists=false;if(point.osm_id){id=point.osm_id;if(this.created_nodes[id]){already_exists=true;}}else{id=-this.osm_id;this.osm_id++;} +if(already_exists){node=this.created_nodes[id];}else{var node=this.createElementNS(null,"node");} +this.created_nodes[id]=node;node.setAttribute("id",id);node.setAttribute("lon",geometry.x);node.setAttribute("lat",geometry.y);if(point.attributes){this.serializeTags(point,node);} +this.setState(point,node);return already_exists?[]:[node];},linestring:function(feature){var id;var nodes=[];var geometry=feature.geometry;if(feature.osm_id){id=feature.osm_id;}else{id=-this.osm_id;this.osm_id++;} +var way=this.createElementNS(null,"way");way.setAttribute("id",id);for(var i=0;i<geometry.components.length;i++){var node=this.createXML['point'].apply(this,[geometry.components[i]]);if(node.length){node=node[0];var node_ref=node.getAttribute("id");nodes.push(node);}else{node_ref=geometry.components[i].osm_id;node=this.created_nodes[node_ref];} +this.setState(feature,node);var nd_dom=this.createElementNS(null,"nd");nd_dom.setAttribute("ref",node_ref);way.appendChild(nd_dom);} +this.serializeTags(feature,way);nodes.push(way);return nodes;},polygon:function(feature){var attrs=OpenLayers.Util.extend({'area':'yes'},feature.attributes);var feat=new OpenLayers.Feature.Vector(feature.geometry.components[0],attrs);feat.osm_id=feature.osm_id;return this.createXML['linestring'].apply(this,[feat]);}},serializeTags:function(feature,node){for(var key in feature.attributes){var tag=this.createElementNS(null,"tag");tag.setAttribute("k",key);tag.setAttribute("v",feature.attributes[key]);node.appendChild(tag);}},setState:function(feature,node){if(feature.state){var state=null;switch(feature.state){case OpenLayers.State.UPDATE:state="modify";case OpenLayers.State.DELETE:state="delete";} +if(state){node.setAttribute("action",state);}}},CLASS_NAME:"OpenLayers.Format.OSM"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(control,callbacks,options){OpenLayers.Util.extend(this,options);this.control=control;this.callbacks=callbacks;var map=this.map||control.map;if(map){this.setMap(map);} this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},setMap:function(map){this.map=map;},checkModifiers:function(evt){if(this.keyMask==null){return true;} var keyModifiers=(evt.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(evt.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(evt.altKey?OpenLayers.Handler.MOD_ALT:0);return(keyModifiers==this.keyMask);},activate:function(){if(this.active){return false;} var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0,len=events.length;i<len;i++){if(this[events[i]]){this.register(events[i],this[events[i]]);}} @@ -643,33 +832,7 @@ if(e.wheelDelta){delta=e.wheelDelta/120;if(window.opera&&window.opera.version()< this.delta=this.delta+delta;if(this.interval){window.clearTimeout(this._timeoutId);this._timeoutId=window.setTimeout(OpenLayers.Function.bind(function(){this.wheelZoom(e);},this),this.interval);}else{this.wheelZoom(e);}} OpenLayers.Event.stop(e);}},wheelZoom:function(e){var delta=this.delta;this.delta=0;if(delta){if(this.mousePosition){e.xy=this.mousePosition;} if(!e.xy){e.xy=this.map.getPixelFromLonLat(this.map.getCenter());} -if(delta<0){this.callback("down",[e,this.cumulative?delta:-1]);}else{this.callback("up",[e,this.cumulative?delta:1]);}}},mousemove:function(evt){this.mousePosition=evt.xy;},activate:function(evt){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.observe(window,"mousewheel",wheelListener);OpenLayers.Event.observe(document,"mousewheel",wheelListener);return true;}else{return false;}},deactivate:function(evt){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.stopObserving(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.stopObserving(window,"mousewheel",wheelListener);OpenLayers.Event.stopObserving(document,"mousewheel",wheelListener);return true;}else{return false;}},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Lang.en={'unhandledRequest':"Unhandled request return ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Base Layer",'readNotImplemented':"Read not implemented.",'writeNotImplemented':"Write not implemented.",'noFID':"Can't update a feature for which there is no FID.",'errorLoadingGML':"Error in loading GML file ${url}",'browserNotSupported':"Your browser does not support vector rendering. Currently supported renderers are:\n${renderers}",'componentShouldBe':"addFeatures : component should be an ${geomType}",'getFeatureError':"getFeatureFromEvent called on layer with no renderer. This usually means you "+"destroyed a layer, but not some handler which is associated with it.",'minZoomLevelError':"The minZoomLevel property is only intended for use "+"with the FixedZoomLevels-descendent layers. That this "+"wfs layer checks for minZoomLevel is a relic of the"+"past. We cannot, however, remove it without possibly "+"breaking OL based applications that may depend on it."+" Therefore we are deprecating it -- the minZoomLevel "+"check below will be removed at 3.0. Please instead "+"use min/max resolution setting as described here: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: SUCCESS ${response}",'commitFailed':"WFS Transaction: FAILED ${response}",'googleWarning':"The Google Layer was unable to load correctly.<br><br>"+"To get rid of this message, select a new BaseLayer "+"in the layer switcher in the upper-right corner.<br><br>"+"Most likely, this is because the Google Maps library "+"script was either not included, or does not contain the "+"correct API key for your site.<br><br>"+"Developers: For help getting this working correctly, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>click here</a>",'getLayerWarning':"The ${layerType} Layer was unable to load correctly.<br><br>"+"To get rid of this message, select a new BaseLayer "+"in the layer switcher in the upper-right corner.<br><br>"+"Most likely, this is because the ${layerLib} library "+"script was not correctly included.<br><br>"+"Developers: For help getting this working correctly, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>click here</a>",'Scale = 1 : ${scaleDenom}':"Scale = 1 : ${scaleDenom}",'W':'W','E':'E','N':'N','S':'S','Graticule':'Graticule','layerAlreadyAdded':"You tried to add the layer: ${layerName} to the map, but it has already been added",'reprojectDeprecated':"You are using the 'reproject' option "+"on the ${layerName} layer. This option is deprecated: "+"its use was designed to support displaying data over commercial "+"basemaps, but that functionality should now be achieved by using "+"Spherical Mercator support. More information is available from "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"This method has been deprecated and will be removed in 3.0. "+"Please use ${newMethod} instead.",'boundsAddError':"You must pass both x and y values to the add function.",'lonlatAddError':"You must pass both lon and lat values to the add function.",'pixelAddError':"You must pass both x and y values to the add function.",'unsupportedGeometryType':"Unsupported geometry type: ${geomType}",'filterEvaluateNotImplemented':"evaluate is not implemented for this filter type.",'proxyNeeded':"You probably need to set OpenLayers.ProxyHost to access ${url}."+"See http://trac.osgeo.org/openlayers/wiki/FrequentlyAskedQuestions#ProxyHost",'end':''};OpenLayers.Lang['en-CA']=OpenLayers.Util.applyDefaults({},OpenLayers.Lang["en"]);OpenLayers.Tile=OpenLayers.Class({EVENT_TYPES:["loadstart","loadend","reload","unload"],events:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:false,initialize:function(layer,position,bounds,url,size,options){this.layer=layer;this.position=position.clone();this.bounds=bounds.clone();this.url=url;if(size){this.size=size.clone();} -this.id=OpenLayers.Util.createUniqueID("Tile_");this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);OpenLayers.Util.extend(this,options);},unload:function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("unload");}},destroy:function(){this.layer=null;this.bounds=null;this.size=null;this.position=null;this.events.destroy();this.events=null;},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile(this.layer,this.position,this.bounds,this.url,this.size);} -OpenLayers.Util.applyDefaults(obj,this);return obj;},draw:function(){var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));this.shouldDraw=(withinMaxExtent||this.layer.displayOutsideMaxExtent);this.clear();return this.shouldDraw;},moveTo:function(bounds,position,redraw){if(redraw==null){redraw=true;} -this.bounds=bounds.clone();this.position=position.clone();if(redraw){this.draw();}},clear:function(){},getBoundsFromBaseLayer:function(position){var msg=OpenLayers.i18n('reprojectDeprecated',{'layerName':this.layer.name});OpenLayers.Console.warn(msg);var topLeft=this.layer.map.getLonLatFromLayerPx(position);var bottomRightPx=position.clone();bottomRightPx.x+=this.size.w;bottomRightPx.y+=this.size.h;var bottomRight=this.layer.map.getLonLatFromLayerPx(bottomRightPx);if(topLeft.lon>bottomRight.lon){if(topLeft.lon<0){topLeft.lon=-180-(topLeft.lon+180);}else{bottomRight.lon=180+bottomRight.lon+180;}} -var bounds=new OpenLayers.Bounds(topLeft.lon,bottomRight.lat,bottomRight.lon,topLeft.lat);return bounds;},showTile:function(){if(this.shouldDraw){this.show();}},show:function(){},hide:function(){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,layerAlphaHack:null,isBackBuffer:false,isFirstDraw:true,backBufferTile:null,maxGetUrlLength:null,initialize:function(layer,position,bounds,url,size,options){OpenLayers.Tile.prototype.initialize.apply(this,arguments);if(this.maxGetUrlLength!=null){OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame);} -this.url=url;this.frame=document.createElement('div');this.frame.style.overflow='hidden';this.frame.style.position='absolute';this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();},destroy:function(){if(this.imgDiv!=null){this.removeImgDiv();} -this.imgDiv=null;if((this.frame!=null)&&(this.frame.parentNode==this.layer.div)){this.layer.div.removeChild(this.frame);} -this.frame=null;if(this.backBufferTile){this.backBufferTile.destroy();this.backBufferTile=null;} -this.layer.events.unregister("loadend",this,this.resetBackBuffer);OpenLayers.Tile.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile.Image(this.layer,this.position,this.bounds,this.url,this.size);} -obj=OpenLayers.Tile.prototype.clone.apply(this,[obj]);obj.imgDiv=null;return obj;},draw:function(){if(this.layer!=this.layer.map.baseLayer&&this.layer.reproject){this.bounds=this.getBoundsFromBaseLayer(this.position);} -var drawTile=OpenLayers.Tile.prototype.draw.apply(this,arguments);if((OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1)||this.layer.singleTile){if(drawTile){if(!this.backBufferTile){this.backBufferTile=this.clone();this.backBufferTile.hide();this.backBufferTile.isBackBuffer=true;this.events.register('loadend',this,this.resetBackBuffer);this.layer.events.register("loadend",this,this.resetBackBuffer);} -this.startTransition();}else{if(this.backBufferTile){this.backBufferTile.clear();}}}else{if(drawTile&&this.isFirstDraw){this.events.register('loadend',this,this.showTile);this.isFirstDraw=false;}} -if(!drawTile){return false;} -if(this.isLoading){this.events.triggerEvent("reload");}else{this.isLoading=true;this.events.triggerEvent("loadstart");} -return this.renderTile();},resetBackBuffer:function(){this.showTile();if(this.backBufferTile&&(this.isFirstDraw||!this.layer.numLoadingTiles)){this.isFirstDraw=false;var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));if(withinMaxExtent){this.backBufferTile.position=this.position;this.backBufferTile.bounds=this.bounds;this.backBufferTile.size=this.size;this.backBufferTile.imageSize=this.layer.getImageSize(this.bounds)||this.size;this.backBufferTile.imageOffset=this.layer.imageOffset;this.backBufferTile.resolution=this.layer.getResolution();this.backBufferTile.renderTile();} -this.backBufferTile.hide();}},renderTile:function(){if(this.layer.async){this.initImgDiv();this.layer.getURLasync(this.bounds,this,"url",this.positionImage);}else{this.url=this.layer.getURL(this.bounds);this.initImgDiv();this.positionImage();} -return true;},positionImage:function(){if(this.layer===null){return;} -OpenLayers.Util.modifyDOMElement(this.frame,null,this.position,this.size);var imageSize=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){OpenLayers.Util.modifyAlphaImageDiv(this.imgDiv,null,null,imageSize,this.url);}else{OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,imageSize);this.imgDiv.src=this.url;}},clear:function(){if(this.imgDiv){this.hide();if(OpenLayers.Tile.Image.useBlankTile){this.imgDiv.src=OpenLayers.Util.getImageLocation("blank.gif");}}},initImgDiv:function(){if(this.imgDiv==null){var offset=this.layer.imageOffset;var size=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){this.imgDiv=OpenLayers.Util.createAlphaImageDiv(null,offset,size,null,"relative",null,null,null,true);}else{this.imgDiv=OpenLayers.Util.createImage(null,offset,size,null,"relative",null,null,true);} -if(OpenLayers.Util.isArray(this.layer.url)){this.imgDiv.urls=this.layer.url.slice();} -this.imgDiv.className='olTileImage';this.frame.style.zIndex=this.isBackBuffer?0:1;this.frame.appendChild(this.imgDiv);this.layer.div.appendChild(this.frame);if(this.layer.opacity!=null){OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,null,null,null,null,this.layer.opacity);} -this.imgDiv.map=this.layer.map;var onload=function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("loadend");}};if(this.layerAlphaHack){OpenLayers.Event.observe(this.imgDiv.childNodes[0],'load',OpenLayers.Function.bind(onload,this));}else{OpenLayers.Event.observe(this.imgDiv,'load',OpenLayers.Function.bind(onload,this));} -var onerror=function(){if(this.imgDiv._attempts>OpenLayers.IMAGE_RELOAD_ATTEMPTS){onload.call(this);}};OpenLayers.Event.observe(this.imgDiv,"error",OpenLayers.Function.bind(onerror,this));} -this.imgDiv.viewRequestID=this.layer.map.viewRequestID;},removeImgDiv:function(){OpenLayers.Event.stopObservingElement(this.imgDiv);if(this.imgDiv.parentNode==this.frame){this.frame.removeChild(this.imgDiv);this.imgDiv.map=null;} -this.imgDiv.urls=null;var child=this.imgDiv.firstChild;if(child){OpenLayers.Event.stopObservingElement(child);this.imgDiv.removeChild(child);delete child;}else{this.imgDiv.src=OpenLayers.Util.getImageLocation("blank.gif");}},checkImgURL:function(){if(this.layer){var loaded=this.layerAlphaHack?this.imgDiv.firstChild.src:this.imgDiv.src;if(!OpenLayers.Util.isEquivalentUrl(loaded,this.url)){this.hide();}}},startTransition:function(){if(!this.backBufferTile||!this.backBufferTile.imgDiv){return;} -var ratio=1;if(this.backBufferTile.resolution){ratio=this.backBufferTile.resolution/this.layer.getResolution();} -if(ratio!=1){if(this.layer.transitionEffect=='resize'){var upperLeft=new OpenLayers.LonLat(this.backBufferTile.bounds.left,this.backBufferTile.bounds.top);var size=new OpenLayers.Size(this.backBufferTile.size.w*ratio,this.backBufferTile.size.h*ratio);var px=this.layer.map.getLayerPxFromLonLat(upperLeft);OpenLayers.Util.modifyDOMElement(this.backBufferTile.frame,null,px,size);var imageSize=this.backBufferTile.imageSize;imageSize=new OpenLayers.Size(imageSize.w*ratio,imageSize.h*ratio);var imageOffset=this.backBufferTile.imageOffset;if(imageOffset){imageOffset=new OpenLayers.Pixel(imageOffset.x*ratio,imageOffset.y*ratio);} -OpenLayers.Util.modifyDOMElement(this.backBufferTile.imgDiv,null,imageOffset,imageSize);this.backBufferTile.show();}}else{if(this.layer.singleTile){this.backBufferTile.show();}else{this.backBufferTile.hide();}}},show:function(){this.frame.style.display='';if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(OpenLayers.IS_GECKO===true){this.frame.scrollLeft=this.frame.scrollLeft;}}},hide:function(){this.frame.style.display='none';},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Tile.Image.useBlankTile=(OpenLayers.BROWSER_NAME=="safari"||OpenLayers.BROWSER_NAME=="opera");OpenLayers.Geometry.MultiLineString=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LineString"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},split:function(geometry,options){var results=null;var mutual=options&&options.mutual;var splits,sourceLine,sourceLines,sourceSplit,targetSplit;var sourceParts=[];var targetParts=[geometry];for(var i=0,len=this.components.length;i<len;++i){sourceLine=this.components[i];sourceSplit=false;for(var j=0;j<targetParts.length;++j){splits=sourceLine.split(targetParts[j],options);if(splits){if(mutual){sourceLines=splits[0];for(var k=0,klen=sourceLines.length;k<klen;++k){if(k===0&&sourceParts.length){sourceParts[sourceParts.length-1].addComponent(sourceLines[k]);}else{sourceParts.push(new OpenLayers.Geometry.MultiLineString([sourceLines[k]]));}} +if(delta<0){this.callback("down",[e,this.cumulative?delta:-1]);}else{this.callback("up",[e,this.cumulative?delta:1]);}}},mousemove:function(evt){this.mousePosition=evt.xy;},activate:function(evt){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.observe(window,"mousewheel",wheelListener);OpenLayers.Event.observe(document,"mousewheel",wheelListener);return true;}else{return false;}},deactivate:function(evt){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.stopObserving(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.stopObserving(window,"mousewheel",wheelListener);OpenLayers.Event.stopObserving(document,"mousewheel",wheelListener);return true;}else{return false;}},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Lang.en={'unhandledRequest':"Unhandled request return ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Base Layer",'noFID':"Can't update a feature for which there is no FID.",'browserNotSupported':"Your browser does not support vector rendering. Currently supported renderers are:\n${renderers}",'minZoomLevelError':"The minZoomLevel property is only intended for use "+"with the FixedZoomLevels-descendent layers. That this "+"wfs layer checks for minZoomLevel is a relic of the"+"past. We cannot, however, remove it without possibly "+"breaking OL based applications that may depend on it."+" Therefore we are deprecating it -- the minZoomLevel "+"check below will be removed at 3.0. Please instead "+"use min/max resolution setting as described here: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: SUCCESS ${response}",'commitFailed':"WFS Transaction: FAILED ${response}",'googleWarning':"The Google Layer was unable to load correctly.<br><br>"+"To get rid of this message, select a new BaseLayer "+"in the layer switcher in the upper-right corner.<br><br>"+"Most likely, this is because the Google Maps library "+"script was either not included, or does not contain the "+"correct API key for your site.<br><br>"+"Developers: For help getting this working correctly, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>click here</a>",'getLayerWarning':"The ${layerType} Layer was unable to load correctly.<br><br>"+"To get rid of this message, select a new BaseLayer "+"in the layer switcher in the upper-right corner.<br><br>"+"Most likely, this is because the ${layerLib} library "+"script was not correctly included.<br><br>"+"Developers: For help getting this working correctly, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>click here</a>",'Scale = 1 : ${scaleDenom}':"Scale = 1 : ${scaleDenom}",'W':'W','E':'E','N':'N','S':'S','Graticule':'Graticule','reprojectDeprecated':"You are using the 'reproject' option "+"on the ${layerName} layer. This option is deprecated: "+"its use was designed to support displaying data over commercial "+"basemaps, but that functionality should now be achieved by using "+"Spherical Mercator support. More information is available from "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"This method has been deprecated and will be removed in 3.0. "+"Please use ${newMethod} instead.",'proxyNeeded':"You probably need to set OpenLayers.ProxyHost to access ${url}."+"See http://trac.osgeo.org/openlayers/wiki/FrequentlyAskedQuestions#ProxyHost",'end':''};OpenLayers.Lang['en-CA']=OpenLayers.Util.applyDefaults({},OpenLayers.Lang["en"]);OpenLayers.Geometry.MultiLineString=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LineString"],split:function(geometry,options){var results=null;var mutual=options&&options.mutual;var splits,sourceLine,sourceLines,sourceSplit,targetSplit;var sourceParts=[];var targetParts=[geometry];for(var i=0,len=this.components.length;i<len;++i){sourceLine=this.components[i];sourceSplit=false;for(var j=0;j<targetParts.length;++j){splits=sourceLine.split(targetParts[j],options);if(splits){if(mutual){sourceLines=splits[0];for(var k=0,klen=sourceLines.length;k<klen;++k){if(k===0&&sourceParts.length){sourceParts[sourceParts.length-1].addComponent(sourceLines[k]);}else{sourceParts.push(new OpenLayers.Geometry.MultiLineString([sourceLines[k]]));}} sourceSplit=true;splits=splits[1];} if(splits.length){splits.unshift(j,1);Array.prototype.splice.apply(targetParts,splits);break;}}} if(!sourceSplit){if(sourceParts.length){sourceParts[sourceParts.length-1].addComponent(sourceLine.clone());}else{sourceParts=[new OpenLayers.Geometry.MultiLineString(sourceLine.clone())];}}} @@ -699,13 +862,14 @@ return this.div;},updatePosition:function(){if((this.lonlat)&&(this.map)){var px this.size.w+=wPadding;this.size.h+=hPadding;if(OpenLayers.BROWSER_NAME=="msie"){this.contentSize.w+=contentDivPadding.left+contentDivPadding.right;this.contentSize.h+=contentDivPadding.bottom+contentDivPadding.top;} if(this.div!=null){this.div.style.width=this.size.w+"px";this.div.style.height=this.size.h+"px";} if(this.contentDiv!=null){this.contentDiv.style.width=contentSize.w+"px";this.contentDiv.style.height=contentSize.h+"px";}},updateSize:function(){var preparedHTML="<div class='"+this.contentDisplayClass+"'>"+ -this.contentDiv.innerHTML+"</div>";var containerElement=(this.map)?this.map.layerContainerDiv:document.body;var realSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,null,{displayClass:this.displayClass,containerElement:containerElement});var safeSize=this.getSafeContentSize(realSize);var newSize=null;if(safeSize.equals(realSize)){newSize=realSize;}else{var fixedSize=new OpenLayers.Size();fixedSize.w=(safeSize.w<realSize.w)?safeSize.w:null;fixedSize.h=(safeSize.h<realSize.h)?safeSize.h:null;if(fixedSize.w&&fixedSize.h){newSize=safeSize;}else{var clippedSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,fixedSize,{displayClass:this.contentDisplayClass,containerElement:containerElement});var currentOverflow=OpenLayers.Element.getStyle(this.contentDiv,"overflow");if((currentOverflow!="hidden")&&(clippedSize.equals(safeSize))){var scrollBar=OpenLayers.Util.getScrollbarWidth();if(fixedSize.w){clippedSize.h+=scrollBar;}else{clippedSize.w+=scrollBar;}} +this.contentDiv.innerHTML+"</div>";var containerElement=(this.map)?this.map.div:document.body;var realSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,null,{displayClass:this.displayClass,containerElement:containerElement});var safeSize=this.getSafeContentSize(realSize);var newSize=null;if(safeSize.equals(realSize)){newSize=realSize;}else{var fixedSize={w:(safeSize.w<realSize.w)?safeSize.w:null,h:(safeSize.h<realSize.h)?safeSize.h:null};if(fixedSize.w&&fixedSize.h){newSize=safeSize;}else{var clippedSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,fixedSize,{displayClass:this.contentDisplayClass,containerElement:containerElement});var currentOverflow=OpenLayers.Element.getStyle(this.contentDiv,"overflow");if((currentOverflow!="hidden")&&(clippedSize.equals(safeSize))){var scrollBar=OpenLayers.Util.getScrollbarWidth();if(fixedSize.w){clippedSize.h+=scrollBar;}else{clippedSize.w+=scrollBar;}} newSize=this.getSafeContentSize(clippedSize);}} this.setSize(newSize);},setBackgroundColor:function(color){if(color!=undefined){this.backgroundColor=color;} if(this.div!=null){this.div.style.backgroundColor=this.backgroundColor;}},setOpacity:function(opacity){if(opacity!=undefined){this.opacity=opacity;} if(this.div!=null){this.div.style.opacity=this.opacity;this.div.style.filter='alpha(opacity='+this.opacity*100+')';}},setBorder:function(border){if(border!=undefined){this.border=border;} if(this.div!=null){this.div.style.border=this.border;}},setContentHTML:function(contentHTML){if(contentHTML!=null){this.contentHTML=contentHTML;} -if((this.contentDiv!=null)&&(this.contentHTML!=null)&&(this.contentHTML!=this.contentDiv.innerHTML)){this.contentDiv.innerHTML=this.contentHTML;if(this.autoSize){this.registerImageListeners();this.updateSize();}}},registerImageListeners:function(){var onImgLoad=function(){this.popup.updateSize();if(this.popup.visible()&&this.popup.panMapIfOutOfView){this.popup.panIntoView();} +if((this.contentDiv!=null)&&(this.contentHTML!=null)&&(this.contentHTML!=this.contentDiv.innerHTML)){this.contentDiv.innerHTML=this.contentHTML;if(this.autoSize){this.registerImageListeners();this.updateSize();}}},registerImageListeners:function(){var onImgLoad=function(){if(this.popup.id===null){return;} +this.popup.updateSize();if(this.popup.visible()&&this.popup.panMapIfOutOfView){this.popup.panIntoView();} OpenLayers.Event.stopObserving(this.img,"load",this.img._onImageLoad);};var images=this.contentDiv.getElementsByTagName("img");for(var i=0,len=images.length;i<len;i++){var img=images[i];if(img.width==0||img.height==0){var context={'popup':this,'img':img};img._onImgLoad=OpenLayers.Function.bind(onImgLoad,context);OpenLayers.Event.observe(img,'load',img._onImgLoad);}}},getSafeContentSize:function(size){var safeContentSize=size.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;} if(this.minSize){safeContentSize.w=Math.max(safeContentSize.w,(this.minSize.w-wPadding));safeContentSize.h=Math.max(safeContentSize.h,(this.minSize.h-hPadding));} if(this.maxSize){safeContentSize.w=Math.min(safeContentSize.w,(this.maxSize.w-wPadding));safeContentSize.h=Math.min(safeContentSize.h,(this.maxSize.h-hPadding));} @@ -719,7 +883,7 @@ this.map.paddingForPopups.right- wPadding-extraX;safeContentSize.w=Math.min(safeContentSize.w,maxX);safeContentSize.h=Math.min(safeContentSize.h,maxY);} return safeContentSize;},getContentDivPadding:function(){var contentDivPadding=this._contentDivPadding;if(!contentDivPadding){if(this.div.parentNode==null){this.div.style.display="none";document.body.appendChild(this.div);} contentDivPadding=new OpenLayers.Bounds(OpenLayers.Element.getStyle(this.contentDiv,"padding-left"),OpenLayers.Element.getStyle(this.contentDiv,"padding-bottom"),OpenLayers.Element.getStyle(this.contentDiv,"padding-right"),OpenLayers.Element.getStyle(this.contentDiv,"padding-top"));this._contentDivPadding=contentDivPadding;if(this.div.parentNode==document.body){document.body.removeChild(this.div);this.div.style.display="";}} -return contentDivPadding;},addCloseBox:function(callback){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,new OpenLayers.Size(17,17));this.closeDiv.className="olPopupCloseBox";var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+"px";this.closeDiv.style.top=contentDivPadding.top+"px";this.groupDiv.appendChild(this.closeDiv);var closePopup=callback||function(e){this.hide();OpenLayers.Event.stop(e);};OpenLayers.Event.observe(this.closeDiv,"touchend",OpenLayers.Function.bindAsEventListener(closePopup,this));OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(closePopup,this));},panIntoView:function(){var mapSize=this.map.getSize();var origTL=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top)));var newTL=origTL.clone();if(origTL.x<this.map.paddingForPopups.left){newTL.x=this.map.paddingForPopups.left;}else +return contentDivPadding;},addCloseBox:function(callback){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,{w:17,h:17});this.closeDiv.className="olPopupCloseBox";var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+"px";this.closeDiv.style.top=contentDivPadding.top+"px";this.groupDiv.appendChild(this.closeDiv);var closePopup=callback||function(e){this.hide();OpenLayers.Event.stop(e);};OpenLayers.Event.observe(this.closeDiv,"touchend",OpenLayers.Function.bindAsEventListener(closePopup,this));OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(closePopup,this));},panIntoView:function(){var mapSize=this.map.getSize();var origTL=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top)));var newTL=origTL.clone();if(origTL.x<this.map.paddingForPopups.left){newTL.x=this.map.paddingForPopups.left;}else if((origTL.x+this.size.w)>(mapSize.w-this.map.paddingForPopups.right)){newTL.x=mapSize.w-this.map.paddingForPopups.right-this.size.w;} if(origTL.y<this.map.paddingForPopups.top){newTL.y=this.map.paddingForPopups.top;}else if((origTL.y+this.size.h)>(mapSize.h-this.map.paddingForPopups.bottom)){newTL.y=mapSize.h-this.map.paddingForPopups.bottom-this.size.h;} @@ -735,16 +899,20 @@ this.padding.top+"px";} this.updateBlocks();},calculateNewPx:function(px){var newPx=OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(this,arguments);newPx=newPx.offset(this.positionBlocks[this.relativePosition].offset);return newPx;},createBlocks:function(){this.blocks=[];var firstPosition=null;for(var key in this.positionBlocks){firstPosition=key;break;} var position=this.positionBlocks[firstPosition];for(var i=0;i<position.blocks.length;i++){var block={};this.blocks.push(block);var divId=this.id+'_FrameDecorationDiv_'+i;block.div=OpenLayers.Util.createDiv(divId,null,null,null,"absolute",null,"hidden",null);var imgId=this.id+'_FrameDecorationImg_'+i;var imageCreator=(this.isAlphaImage)?OpenLayers.Util.createAlphaImageDiv:OpenLayers.Util.createImage;block.image=imageCreator(imgId,null,this.imageSize,this.imageSrc,"absolute",null,null,null);block.div.appendChild(block.image);this.groupDiv.appendChild(block.div);}},updateBlocks:function(){if(!this.blocks){this.createBlocks();} if(this.size&&this.relativePosition){var position=this.positionBlocks[this.relativePosition];for(var i=0;i<position.blocks.length;i++){var positionBlock=position.blocks[i];var block=this.blocks[i];var l=positionBlock.anchor.left;var b=positionBlock.anchor.bottom;var r=positionBlock.anchor.right;var t=positionBlock.anchor.top;var w=(isNaN(positionBlock.size.w))?this.size.w-(r+l):positionBlock.size.w;var h=(isNaN(positionBlock.size.h))?this.size.h-(b+t):positionBlock.size.h;block.div.style.width=(w<0?0:w)+'px';block.div.style.height=(h<0?0:h)+'px';block.div.style.left=(l!=null)?l+'px':'';block.div.style.bottom=(b!=null)?b+'px':'';block.div.style.right=(r!=null)?r+'px':'';block.div.style.top=(t!=null)?t+'px':'';block.image.style.left=positionBlock.position.x+'px';block.image.style.top=positionBlock.position.y+'px';} -this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px";}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:true,panMapIfOutOfView:true,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:false,fixedRelativePosition:false,positionBlocks:{"tl":{'offset':new OpenLayers.Pixel(44,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,18),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-632)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-688)}]},"tr":{'offset':new OpenLayers.Pixel(-45,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,19),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-631)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(0,0,null,null),position:new OpenLayers.Pixel(-215,-687)}]},"bl":{'offset':new OpenLayers.Pixel(45,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},"br":{'offset':new OpenLayers.Pixel(-44,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(1200,660),initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){this.imageSrc=OpenLayers.Util.getImageLocation('cloud-popup-relative.png');OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass;},destroy:function(){OpenLayers.Popup.Framed.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Lang["nb"]={'unhandledRequest':"Ubehandlet forespørsel returnerte ${statusText}",'Permalink':"Kobling til denne siden",'Overlays':"Kartlag",'Base Layer':"Bakgrunnskart",'readNotImplemented':"Lesing er ikke implementert.",'writeNotImplemented':"Skriving er ikke implementert.",'noFID':"Kan ikke oppdatere et feature (et objekt) som ikke har FID.",'errorLoadingGML':"Feil under lasting av GML-fil ${url}",'browserNotSupported':"Din nettleser støtter ikke vektortegning. Tegnemetodene som støttes er:\n${renderers}",'componentShouldBe':"addFeatures : komponenten mÃ¥ være en ${geomType}",'getFeatureError':"getFeatureFromEvent har blitt kjørt mot et lag uten noen tegnemetode. Dette betyr som regel at du "+"fjernet et lag uten Ã¥ fjerne alle hÃ¥ndterere tilknyttet laget.",'minZoomLevelError':"Egenskapen minZoomLevel er kun ment til bruk pÃ¥ lag "+"basert pÃ¥ FixedZoomLevels. At dette wfs-laget sjekker "+"minZoomLevel er en etterlevning fra tidligere versjoner. Det kan dog ikke "+"tas bort uten Ã¥ risikere at OL-baserte applikasjoner "+"slutter Ã¥ virke, sÃ¥ det er merket som foreldet: "+"minZoomLevel i sjekken nedenfor vil fjernes i 3.0. "+"Vennligst bruk innstillingene for min/maks oppløsning "+"som er beskrevet her: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-transaksjon: LYKTES ${response}",'commitFailed':"WFS-transaksjon: MISLYKTES ${response}",'googleWarning':"Google-laget kunne ikke lastes.<br><br>"+"Bytt til et annet bakgrunnslag i lagvelgeren i "+"øvre høyre hjørne for Ã¥ slippe denne meldingen.<br><br>"+"Sannsynligvis forÃ¥rsakes feilen av at Google Maps-biblioteket "+"ikke er riktig inkludert pÃ¥ nettsiden, eller at det ikke er "+"angitt riktig API-nøkkel for nettstedet.<br><br>"+"Utviklere: For hjelp til Ã¥ fÃ¥ dette til Ã¥ virke se "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>her</a>.",'getLayerWarning':"${layerType}-laget kunne ikke lastes.<br><br>"+"Bytt til et annet bakgrunnslag i lagvelgeren i "+"øvre høyre hjørne for Ã¥ slippe denne meldingen.<br><br>"+"Sannsynligvis forÃ¥rsakes feilen av at "+"${layerLib}-biblioteket ikke var riktig inkludert "+"pÃ¥ nettsiden.<br><br>"+"Utviklere: For hjelp til Ã¥ fÃ¥ dette til Ã¥ virke se "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>her</a>.",'Scale = 1 : ${scaleDenom}':"<strong>Skala</strong> 1 : ${scaleDenom}",'layerAlreadyAdded':"Du forsøkte Ã¥ legge til laget ${layerName} pÃ¥ kartet, men det er allerede lagt til",'reprojectDeprecated':"Du bruker innstillingen 'reproject' pÃ¥ laget ${layerName}. "+"Denne innstillingen er foreldet, den var ment for Ã¥ støtte "+"visning av kartdata over kommersielle bakgrunnskart, men det "+"bør nÃ¥ gjøres med støtten for Spherical Mercator. Mer informasjon "+"finnes pÃ¥ http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Denne metoden er markert som foreldet og vil bli fjernet i 3.0. "+"Vennligst bruk ${newMethod} i stedet.",'boundsAddError':"Du mÃ¥ gi bÃ¥de x- og y-verdier til funksjonen add.",'lonlatAddError':"Du mÃ¥ gi bÃ¥de lon- og lat-verdier til funksjonen add.",'pixelAddError':"Du mÃ¥ gi bÃ¥de x- og y-verdier til funksjonen add.",'unsupportedGeometryType':"Geometritypen ${geomType} er ikke støttet",'end':''};OpenLayers.Lang["no"]=OpenLayers.Lang["nb"];OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(yOrdering){this.compare=yOrdering?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear();},insert:function(newNode){if(this.exists(newNode)){this.remove(newNode);} +this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px";}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:true,panMapIfOutOfView:true,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:false,fixedRelativePosition:false,positionBlocks:{"tl":{'offset':new OpenLayers.Pixel(44,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,18),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-632)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-688)}]},"tr":{'offset':new OpenLayers.Pixel(-45,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,19),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-631)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(0,0,null,null),position:new OpenLayers.Pixel(-215,-687)}]},"bl":{'offset':new OpenLayers.Pixel(45,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},"br":{'offset':new OpenLayers.Pixel(-44,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(1200,660),initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){this.imageSrc=OpenLayers.Util.getImageLocation('cloud-popup-relative.png');OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass;},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Lang["nb"]={'unhandledRequest':"Ubehandlet forespørsel returnerte ${statusText}",'Permalink':"Kobling til denne siden",'Overlays':"Kartlag",'Base Layer':"Bakgrunnskart",'noFID':"Kan ikke oppdatere et feature (et objekt) som ikke har FID.",'browserNotSupported':"Din nettleser støtter ikke vektortegning. Tegnemetodene som støttes er:\n${renderers}",'minZoomLevelError':"Egenskapen minZoomLevel er kun ment til bruk pÃ¥ lag "+"basert pÃ¥ FixedZoomLevels. At dette wfs-laget sjekker "+"minZoomLevel er en etterlevning fra tidligere versjoner. Det kan dog ikke "+"tas bort uten Ã¥ risikere at OL-baserte applikasjoner "+"slutter Ã¥ virke, sÃ¥ det er merket som foreldet: "+"minZoomLevel i sjekken nedenfor vil fjernes i 3.0. "+"Vennligst bruk innstillingene for min/maks oppløsning "+"som er beskrevet her: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-transaksjon: LYKTES ${response}",'commitFailed':"WFS-transaksjon: MISLYKTES ${response}",'googleWarning':"Google-laget kunne ikke lastes.<br><br>"+"Bytt til et annet bakgrunnslag i lagvelgeren i "+"øvre høyre hjørne for Ã¥ slippe denne meldingen.<br><br>"+"Sannsynligvis forÃ¥rsakes feilen av at Google Maps-biblioteket "+"ikke er riktig inkludert pÃ¥ nettsiden, eller at det ikke er "+"angitt riktig API-nøkkel for nettstedet.<br><br>"+"Utviklere: For hjelp til Ã¥ fÃ¥ dette til Ã¥ virke se "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>her</a>.",'getLayerWarning':"${layerType}-laget kunne ikke lastes.<br><br>"+"Bytt til et annet bakgrunnslag i lagvelgeren i "+"øvre høyre hjørne for Ã¥ slippe denne meldingen.<br><br>"+"Sannsynligvis forÃ¥rsakes feilen av at "+"${layerLib}-biblioteket ikke var riktig inkludert "+"pÃ¥ nettsiden.<br><br>"+"Utviklere: For hjelp til Ã¥ fÃ¥ dette til Ã¥ virke se "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>her</a>.",'Scale = 1 : ${scaleDenom}':"<strong>Skala</strong> 1 : ${scaleDenom}",'reprojectDeprecated':"Du bruker innstillingen 'reproject' pÃ¥ laget ${layerName}. "+"Denne innstillingen er foreldet, den var ment for Ã¥ støtte "+"visning av kartdata over kommersielle bakgrunnskart, men det "+"bør nÃ¥ gjøres med støtten for Spherical Mercator. Mer informasjon "+"finnes pÃ¥ http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Denne metoden er markert som foreldet og vil bli fjernet i 3.0. "+"Vennligst bruk ${newMethod} i stedet.",'end':''};OpenLayers.Lang["no"]=OpenLayers.Lang["nb"];OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(yOrdering){this.compare=yOrdering?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear();},insert:function(newNode){if(this.exists(newNode)){this.remove(newNode);} var nodeId=newNode.id;this.determineZIndex(newNode);var leftIndex=-1;var rightIndex=this.order.length;var middle;while(rightIndex-leftIndex>1){middle=parseInt((leftIndex+rightIndex)/2);var placement=this.compare(this,newNode,OpenLayers.Util.getElement(this.order[middle]));if(placement>0){leftIndex=middle;}else{rightIndex=middle;}} this.order.splice(rightIndex,0,nodeId);this.indices[nodeId]=this.getZIndex(newNode);return this.getNextElement(rightIndex);},remove:function(node){var nodeId=node.id;var arrayIndex=OpenLayers.Util.indexOf(this.order,nodeId);if(arrayIndex>=0){this.order.splice(arrayIndex,1);delete this.indices[nodeId];if(this.order.length>0){var lastId=this.order[this.order.length-1];this.maxZIndex=this.indices[lastId];}else{this.maxZIndex=0;}}},clear:function(){this.order=[];this.indices={};this.maxZIndex=0;},exists:function(node){return(this.indices[node.id]!=null);},getZIndex:function(node){return node._style.graphicZIndex;},determineZIndex:function(node){var zIndex=node._style.graphicZIndex;if(zIndex==null){zIndex=this.maxZIndex;node._style.graphicZIndex=zIndex;}else if(zIndex>this.maxZIndex){this.maxZIndex=zIndex;}},getNextElement:function(index){var nextIndex=index+1;if(nextIndex<this.order.length){var nextElement=OpenLayers.Util.getElement(this.order[nextIndex]);if(nextElement==undefined){nextElement=this.getNextElement(nextIndex);} return nextElement;}else{return null;}},CLASS_NAME:"OpenLayers.ElementsIndexer"});OpenLayers.ElementsIndexer.IndexingMethods={Z_ORDER:function(indexer,newNode,nextNode){var newZIndex=indexer.getZIndex(newNode);var returnVal=0;if(nextNode){var nextZIndex=indexer.getZIndex(nextNode);returnVal=newZIndex-nextZIndex;} return returnVal;},Z_ORDER_DRAWING_ORDER:function(indexer,newNode,nextNode){var returnVal=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(indexer,newNode,nextNode);if(nextNode&&returnVal==0){returnVal=1;} return returnVal;},Z_ORDER_Y_ORDER:function(indexer,newNode,nextNode){var returnVal=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(indexer,newNode,nextNode);if(nextNode&&returnVal===0){var result=nextNode._boundsBottom-newNode._boundsBottom;returnVal=(result===0)?1:result;} -return returnVal;}};OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,vectorRoot:null,textRoot:null,xmlns:null,indexer:null,BACKGROUND_ID_SUFFIX:"_background",LABEL_ID_SUFFIX:"_label",initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot("_root");this.vectorRoot=this.createRoot("_vroot");this.textRoot=this.createRoot("_troot");this.root.appendChild(this.vectorRoot);this.root.appendChild(this.textRoot);this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);if(options&&(options.zIndexing||options.yOrdering)){this.indexer=new OpenLayers.ElementsIndexer(options.yOrdering);}},destroy:function(){this.clear();this.rendererRoot=null;this.root=null;this.xmlns=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments);},clear:function(){var child;var root=this.vectorRoot;if(root){while(child=root.firstChild){root.removeChild(child);}} +return returnVal;}};OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,vectorRoot:null,textRoot:null,xmlns:null,xOffset:0,indexer:null,BACKGROUND_ID_SUFFIX:"_background",LABEL_ID_SUFFIX:"_label",LABEL_OUTLINE_SUFFIX:"_outline",initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot("_root");this.vectorRoot=this.createRoot("_vroot");this.textRoot=this.createRoot("_troot");this.root.appendChild(this.vectorRoot);this.root.appendChild(this.textRoot);this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);if(options&&(options.zIndexing||options.yOrdering)){this.indexer=new OpenLayers.ElementsIndexer(options.yOrdering);}},destroy:function(){this.clear();this.rendererRoot=null;this.root=null;this.xmlns=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments);},clear:function(){var child;var root=this.vectorRoot;if(root){while(child=root.firstChild){root.removeChild(child);}} root=this.textRoot;if(root){while(child=root.firstChild){root.removeChild(child);}} -if(this.indexer){this.indexer.clear();}},getNodeType:function(geometry,style){},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;var rendered=true;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0,len=geometry.components.length;i<len;i++){rendered=this.drawGeometry(geometry.components[i],style,featureId)&&rendered;} -return rendered;};rendered=false;var removeBackground=false;if(style.display!="none"){if(style.backgroundGraphic){this.redrawBackgroundNode(geometry.id,geometry,style,featureId);}else{removeBackground=true;} +if(this.indexer){this.indexer.clear();}},setExtent:function(extent,resolutionChanged){var coordSysUnchanged=OpenLayers.Renderer.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var rightOfDateLine,ratio=extent.getWidth()/this.map.getExtent().getWidth(),extent=extent.scale(1/ratio),world=this.map.getMaxExtent();if(world.right>extent.left&&world.right<extent.right){rightOfDateLine=true;}else if(world.left>extent.left&&world.left<extent.right){rightOfDateLine=false;} +if(rightOfDateLine!==this.rightOfDateLine||resolutionChanged){coordSysUnchanged=false;this.xOffset=rightOfDateLine===true?world.getWidth()/resolution:0;} +this.rightOfDateLine=rightOfDateLine;} +return coordSysUnchanged;},getNodeType:function(geometry,style){},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;var rendered=true;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0,len=geometry.components.length;i<len;i++){rendered=this.drawGeometry(geometry.components[i],style,featureId)&&rendered;} +return rendered;} +rendered=false;var removeBackground=false;if(style.display!="none"){if(style.backgroundGraphic){this.redrawBackgroundNode(geometry.id,geometry,style,featureId);}else{removeBackground=true;} rendered=this.redrawNode(geometry.id,geometry,style,featureId);} if(rendered==false){var node=document.getElementById(geometry.id);if(node){if(node._style.backgroundGraphic){removeBackground=true;} node.parentNode.removeChild(node);}} @@ -752,182 +920,32 @@ if(removeBackground){var node=document.getElementById(geometry.id+this.BACKGROUN return rendered;},redrawNode:function(id,geometry,style,featureId){style=this.applyDefaultSymbolizer(style);var node=this.nodeFactory(id,this.getNodeType(geometry,style));node._featureId=featureId;node._boundsBottom=geometry.getBounds().bottom;node._geometryClass=geometry.CLASS_NAME;node._style=style;var drawResult=this.drawGeometryNode(node,geometry,style);if(drawResult===false){return false;} node=drawResult.node;if(this.indexer){var insert=this.indexer.insert(node);if(insert){this.vectorRoot.insertBefore(node,insert);}else{this.vectorRoot.appendChild(node);}}else{if(node.parentNode!==this.vectorRoot){this.vectorRoot.appendChild(node);}} this.postDraw(node);return drawResult.complete;},redrawBackgroundNode:function(id,geometry,style,featureId){var backgroundStyle=OpenLayers.Util.extend({},style);backgroundStyle.externalGraphic=backgroundStyle.backgroundGraphic;backgroundStyle.graphicXOffset=backgroundStyle.backgroundXOffset;backgroundStyle.graphicYOffset=backgroundStyle.backgroundYOffset;backgroundStyle.graphicZIndex=backgroundStyle.backgroundGraphicZIndex;backgroundStyle.graphicWidth=backgroundStyle.backgroundWidth||backgroundStyle.graphicWidth;backgroundStyle.graphicHeight=backgroundStyle.backgroundHeight||backgroundStyle.graphicHeight;backgroundStyle.backgroundGraphic=null;backgroundStyle.backgroundXOffset=null;backgroundStyle.backgroundYOffset=null;backgroundStyle.backgroundGraphicZIndex=null;return this.redrawNode(id+this.BACKGROUND_ID_SUFFIX,geometry,backgroundStyle,null);},drawGeometryNode:function(node,geometry,style){style=style||node._style;var options={'isFilled':style.fill===undefined?true:style.fill,'isStroked':style.stroke===undefined?!!style.strokeWidth:style.stroke};var drawn;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.graphic===false){options.isFilled=false;options.isStroked=false;} -drawn=this.drawPoint(node,geometry);break;case"OpenLayers.Geometry.LineString":options.isFilled=false;drawn=this.drawLineString(node,geometry);break;case"OpenLayers.Geometry.LinearRing":drawn=this.drawLinearRing(node,geometry);break;case"OpenLayers.Geometry.Polygon":drawn=this.drawPolygon(node,geometry);break;case"OpenLayers.Geometry.Surface":drawn=this.drawSurface(node,geometry);break;case"OpenLayers.Geometry.Rectangle":drawn=this.drawRectangle(node,geometry);break;default:break;} -node._options=options;if(drawn!=false){return{node:this.setStyle(node,style,options,geometry),complete:drawn};}else{return false;}},postDraw:function(node){},drawPoint:function(node,geometry){},drawLineString:function(node,geometry){},drawLinearRing:function(node,geometry){},drawPolygon:function(node,geometry){},drawRectangle:function(node,geometry){},drawCircle:function(node,geometry){},drawSurface:function(node,geometry){},removeText:function(featureId){var label=document.getElementById(featureId+this.LABEL_ID_SUFFIX);if(label){this.textRoot.removeChild(label);}},getFeatureIdFromEvent:function(evt){var target=evt.target;var useElement=target&&target.correspondingUseElement;var node=useElement?useElement:(target||evt.srcElement);var featureId=node._featureId;return featureId;},eraseGeometry:function(geometry,featureId){if((geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPoint")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiLineString")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPolygon")||(geometry.CLASS_NAME=="OpenLayers.Geometry.Collection")){for(var i=0,len=geometry.components.length;i<len;i++){this.eraseGeometry(geometry.components[i],featureId);}}else{var element=OpenLayers.Util.getElement(geometry.id);if(element&&element.parentNode){if(element.geometry){element.geometry.destroy();element.geometry=null;} +drawn=this.drawPoint(node,geometry);break;case"OpenLayers.Geometry.LineString":options.isFilled=false;drawn=this.drawLineString(node,geometry);break;case"OpenLayers.Geometry.LinearRing":drawn=this.drawLinearRing(node,geometry);break;case"OpenLayers.Geometry.Polygon":drawn=this.drawPolygon(node,geometry);break;case"OpenLayers.Geometry.Rectangle":drawn=this.drawRectangle(node,geometry);break;default:break;} +node._options=options;if(drawn!=false){return{node:this.setStyle(node,style,options,geometry),complete:drawn};}else{return false;}},postDraw:function(node){},drawPoint:function(node,geometry){},drawLineString:function(node,geometry){},drawLinearRing:function(node,geometry){},drawPolygon:function(node,geometry){},drawRectangle:function(node,geometry){},drawCircle:function(node,geometry){},removeText:function(featureId){var label=document.getElementById(featureId+this.LABEL_ID_SUFFIX);if(label){this.textRoot.removeChild(label);} +var outline=document.getElementById(featureId+this.LABEL_OUTLINE_SUFFIX);if(outline){this.textRoot.removeChild(outline);}},getFeatureIdFromEvent:function(evt){var target=evt.target;var useElement=target&&target.correspondingUseElement;var node=useElement?useElement:(target||evt.srcElement);return node._featureId;},eraseGeometry:function(geometry,featureId){if((geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPoint")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiLineString")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPolygon")||(geometry.CLASS_NAME=="OpenLayers.Geometry.Collection")){for(var i=0,len=geometry.components.length;i<len;i++){this.eraseGeometry(geometry.components[i],featureId);}}else{var element=OpenLayers.Util.getElement(geometry.id);if(element&&element.parentNode){if(element.geometry){element.geometry.destroy();element.geometry=null;} element.parentNode.removeChild(element);if(this.indexer){this.indexer.remove(element);} if(element._style.backgroundGraphic){var backgroundId=geometry.id+this.BACKGROUND_ID_SUFFIX;var bElem=OpenLayers.Util.getElement(backgroundId);if(bElem&&bElem.parentNode){bElem.parentNode.removeChild(bElem);}}}}},nodeFactory:function(id,type){var node=OpenLayers.Util.getElement(id);if(node){if(!this.nodeTypeCompare(node,type)){node.parentNode.removeChild(node);node=this.nodeFactory(id,type);}}else{node=this.createNode(type,id);} return node;},nodeTypeCompare:function(node,type){},createNode:function(type,id){},moveRoot:function(renderer){var root=this.root;if(renderer.root.parentNode==this.rendererRoot){root=renderer.root;} -root.parentNode.removeChild(root);renderer.rendererRoot.appendChild(root);},getRenderLayerId:function(){return this.root.parentNode.parentNode.id;},isComplexSymbol:function(graphicName){return(graphicName!="circle")&&!!graphicName;},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Renderer.symbol={"star":[350,75,379,161,469,161,397,215,423,301,350,250,277,301,303,215,231,161,321,161,350,75],"cross":[4,0,6,0,6,4,10,4,10,6,6,6,6,10,4,10,4,6,0,6,0,4,4,4,4,0],"x":[0,0,25,0,50,35,75,0,100,0,65,50,100,100,75,100,50,65,25,100,0,100,35,50,0,0],"square":[0,0,0,1,1,1,1,0,0,0],"triangle":[0,10,10,10,5,0,0,10]};OpenLayers.Lang["sv"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Ej hanterad frÃ¥ga retur ${statusText}",'Permalink':"Permalänk",'Overlays':"Kartlager",'Base Layer':"Bakgrundskarta",'readNotImplemented':"Läsning ej implementerad.",'writeNotImplemented':"Skrivning ej implementerad.",'noFID':"Kan ej uppdatera feature (objekt) för vilket FID saknas.",'errorLoadingGML':"Fel i laddning av GML-fil ${url}",'browserNotSupported':"Din webbläsare stöder inte vektorvisning. För närvarande stöds följande visning:\n${renderers}",'componentShouldBe':"addFeatures : komponenten skall vara en ${geomType}",'getFeatureError':"getFeatureFromEvent anropad för lager utan utritning. Detta betyder oftast att man raderat ett lager, men inte en hanterare som är knuten till lagret.",'minZoomLevelError':"Egenskapen minZoomLevel är endast avsedd att användas med lager med FixedZoomLevels. Att detta WFS-lager kontrollerar minZoomLevel är en relik frÃ¥n äldre versioner. Vi kan dock inte ta bort det utan att riskera att OL-baserade tillämpningar som använder detta slutar fungera. Därför är det satt som deprecated, minZoomLevel kommer att tas bort i version 3.0. Använd i stället inställning av min/max resolution som beskrivs här: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-transaktion: LYCKADES ${response}",'commitFailed':"WFS-transaktion: MISSLYCKADES ${response}",'googleWarning':"Google-lagret kunde inte laddas korrekt.\x3cbr\x3e\x3cbr\x3eFör att slippa detta meddelande, välj en annan bakgrundskarta i lagerväljaren i övre högra hörnet.\x3cbr\x3e\x3cbr\x3eSannolikt beror felet pÃ¥ att Google Maps-biblioteket inte är inkluderat pÃ¥ webbsidan eller pÃ¥ att sidan inte anger korrekt API-nyckel för webbplatsen.\x3cbr\x3e\x3cbr\x3eUtvecklare: hjälp för att Ã¥tgärda detta, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklicka här\x3c/a\x3e.",'getLayerWarning':"${layerType}-lagret kunde inte laddas korrekt.\x3cbr\x3e\x3cbr\x3eFör att slippa detta meddelande, välj en annan bakgrundskarta i lagerväljaren i övre högra hörnet.\x3cbr\x3e\x3cbr\x3eSannolikt beror felet pÃ¥ att ${layerLib}-biblioteket inte är inkluderat pÃ¥ webbsidan.\x3cbr\x3e\x3cbr\x3eUtvecklare: hjälp för att Ã¥tgärda detta, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklicka här\x3c/a\x3e.",'Scale = 1 : ${scaleDenom}':"\x3cstrong\x3eSkala\x3c/strong\x3e 1 : ${scaleDenom}",'layerAlreadyAdded':"Du försökte lägga till lagret: ${layerName} pÃ¥ kartan, men det har lagts till tidigare",'reprojectDeprecated':"Du använder inställningen \'reproject\' pÃ¥ lagret ${layerName}. Denna inställning markerad som deprecated: den var avsedd att användas för att stödja visning av kartdata pÃ¥ kommersiella bakgrundskartor, men nu bör man i stället använda Spherical Mercator-stöd för den funktionaliteten. Mer information finns pÃ¥ http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Denna metod är markerad som deprecated och kommer att tas bort i 3.0. Använd ${newMethod} i stället.",'boundsAddError':"Du mÃ¥ste skicka bÃ¥de x- och y-värde till funktionen add.",'lonlatAddError':"Du mÃ¥ste skicka bÃ¥de lon- och lat-värde till funktionen add.",'pixelAddError':"Du mÃ¥ste skicka bÃ¥de x- och y-värde till funktionen add.",'unsupportedGeometryType':"Stöd saknas för geometritypen: ${geomType}",'filterEvaluateNotImplemented':"evaluering har ej implementerats för denna typ av filter."});OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null;} -if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);} -this.interval=window.setInterval(OpenLayers.Function.bind(this.play,this),this.INTERVAL);},stop:function(){if(!this.playing){return;} -if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);} -window.clearInterval(this.interval);this.interval=null;this.playing=false;},play:function(){var value={};for(var i in this.begin){var b=this.begin[i];var f=this.finish[i];if(b==null||f==null||isNaN(b)||isNaN(f)){OpenLayers.Console.error('invalid value for Tween');} -var c=f-b;value[i]=this.easing.apply(this,[this.time,b,c,this.duration]);} -this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,value);} -if(this.time>this.duration){this.stop();}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(t,b,c,d){return c*t/d+b;},easeOut:function(t,b,c,d){return c*t/d+b;},easeInOut:function(t,b,c,d){return c*t/d+b;},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(t,b,c,d){return(t==0)?b:c*Math.pow(2,10*(t/d-1))+b;},easeOut:function(t,b,c,d){return(t==d)?b+c:c*(-Math.pow(2,-10*t/d)+1)+b;},easeInOut:function(t,b,c,d){if(t==0)return b;if(t==d)return b+c;if((t/=d/2)<1)return c/2*Math.pow(2,10*(t-1))+b;return c/2*(-Math.pow(2,-10*--t)+2)+b;},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(t,b,c,d){return c*(t/=d)*t+b;},easeOut:function(t,b,c,d){return-c*(t/=d)*(t-2)+b;},easeInOut:function(t,b,c,d){if((t/=d/2)<1)return c/2*t*t+b;return-c/2*((--t)*(t-2)-1)+b;},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1000},EVENT_TYPES:["preaddlayer","addlayer","preremovelayer","removelayer","changelayer","movestart","move","moveend","zoomend","popupopen","popupclose","addmarker","removemarker","clearmarkers","mouseover","mouseout","mousemove","dragstart","drag","dragend","changebaselayer"],id:null,fractionalZoom:false,events:null,allOverlays:false,div:null,dragging:false,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,viewRequestID:0,tileSize:null,projection:"EPSG:4326",units:'degrees',resolutions:null,maxResolution:1.40625,minResolution:null,maxScale:null,minScale:null,maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:true,panTween:null,eventListeners:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,paddingForPopups:null,minPx:null,maxPx:null,initialize:function(div,options){if(arguments.length===1&&typeof div==="object"){options=div;div=options&&options.div;} -this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,OpenLayers.Map.TILE_HEIGHT);this.maxExtent=new OpenLayers.Bounds(-180,-90,180,90);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+'theme/default/style.css';OpenLayers.Util.extend(this,options);this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(div);if(!this.div){this.div=document.createElement("div");this.div.style.height="1px";this.div.style.width="1px";} -OpenLayers.Element.addClass(this.div,'olMap');var id=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(id,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);var eventsDiv=document.createElement("div");eventsDiv.id=this.id+"_events";eventsDiv.style.position="absolute";eventsDiv.style.width="100%";eventsDiv.style.height="100%";eventsDiv.style.zIndex=this.Z_INDEX_BASE.Control-1;this.viewPortDiv.appendChild(eventsDiv);this.eventsDiv=eventsDiv;this.events=new OpenLayers.Events(this,this.eventsDiv,this.EVENT_TYPES,this.fallThrough,{includeXY:true});id=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(id);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;this.eventsDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} -this.events.register("movestart",this,this.updateSize);if(OpenLayers.String.contains(navigator.appName,"Microsoft")){this.events.register("resize",this,this.updateSize);}else{this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this);OpenLayers.Event.observe(window,'resize',this.updateSizeDestroy);} -if(this.theme){var addNode=true;var nodes=document.getElementsByTagName('link');for(var i=0,len=nodes.length;i<len;++i){if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href,this.theme)){addNode=false;break;}} -if(addNode){var cssNode=document.createElement('link');cssNode.setAttribute('rel','stylesheet');cssNode.setAttribute('type','text/css');cssNode.setAttribute('href',this.theme);document.getElementsByTagName('head')[0].appendChild(cssNode);}} -if(this.controls==null){if(OpenLayers.Control!=null){this.controls=[new OpenLayers.Control.Navigation(),new OpenLayers.Control.PanZoom(),new OpenLayers.Control.ArgParser(),new OpenLayers.Control.Attribution()];}else{this.controls=[];}} -for(var i=0,len=this.controls.length;i<len;i++){this.addControlToMap(this.controls[i]);} -this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,'unload',this.unloadDestroy);if(options&&options.layers){delete this.center;this.addLayers(options.layers);if(options.center){this.setCenter(options.center,options.zoom);}}},render:function(div){this.div=OpenLayers.Util.getElement(div);OpenLayers.Element.addClass(this.div,'olMap');this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);this.div.appendChild(this.viewPortDiv);this.updateSize();},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy){return false;} -if(this.panTween){this.panTween.stop();this.panTween=null;} -OpenLayers.Event.stopObserving(window,'unload',this.unloadDestroy);this.unloadDestroy=null;if(this.updateSizeDestroy){OpenLayers.Event.stopObserving(window,'resize',this.updateSizeDestroy);}else{this.events.unregister("resize",this,this.updateSize);} -this.paddingForPopups=null;if(this.controls!=null){for(var i=this.controls.length-1;i>=0;--i){this.controls[i].destroy();} -this.controls=null;} -if(this.layers!=null){for(var i=this.layers.length-1;i>=0;--i){this.layers[i].destroy(false);} -this.layers=null;} -if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv);} -this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null;} -this.events.destroy();this.events=null;},setOptions:function(options){var updatePxExtent=this.minPx&&options.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,options);updatePxExtent&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:true});},getTileSize:function(){return this.tileSize;},getBy:function(array,property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this[array],function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getLayersBy:function(property,match){return this.getBy("layers",property,match);},getLayersByName:function(match){return this.getLayersBy("name",match);},getLayersByClass:function(match){return this.getLayersBy("CLASS_NAME",match);},getControlsBy:function(property,match){return this.getBy("controls",property,match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},getLayer:function(id){var foundLayer=null;for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];if(layer.id==id){foundLayer=layer;break;}} -return foundLayer;},setLayerZIndex:function(layer,zIdx){layer.setZIndex(this.Z_INDEX_BASE[layer.isBaseLayer?'BaseLayer':'Overlay'] -+zIdx*5);},resetLayersZIndex:function(){for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];this.setLayerZIndex(layer,i);}},addLayer:function(layer){for(var i=0,len=this.layers.length;i<len;i++){if(this.layers[i]==layer){var msg=OpenLayers.i18n('layerAlreadyAdded',{'layerName':layer.name});OpenLayers.Console.warn(msg);return false;}} -if(this.events.triggerEvent("preaddlayer",{layer:layer})===false){return;} -if(this.allOverlays){layer.isBaseLayer=false;} -layer.div.className="olLayerDiv";layer.div.style.overflow="";this.setLayerZIndex(layer,this.layers.length);if(layer.isFixed){this.viewPortDiv.appendChild(layer.div);}else{this.layerContainerDiv.appendChild(layer.div);} -this.layers.push(layer);layer.setMap(this);if(layer.isBaseLayer||(this.allOverlays&&!this.baseLayer)){if(this.baseLayer==null){this.setBaseLayer(layer);}else{layer.setVisibility(false);}}else{layer.redraw();} -this.events.triggerEvent("addlayer",{layer:layer});layer.events.triggerEvent("added",{map:this,layer:layer});layer.afterAdd();},addLayers:function(layers){for(var i=0,len=layers.length;i<len;i++){this.addLayer(layers[i]);}},removeLayer:function(layer,setNewBaseLayer){if(this.events.triggerEvent("preremovelayer",{layer:layer})===false){return;} -if(setNewBaseLayer==null){setNewBaseLayer=true;} -if(layer.isFixed){this.viewPortDiv.removeChild(layer.div);}else{this.layerContainerDiv.removeChild(layer.div);} -OpenLayers.Util.removeItem(this.layers,layer);layer.removeMap(this);layer.map=null;if(this.baseLayer==layer){this.baseLayer=null;if(setNewBaseLayer){for(var i=0,len=this.layers.length;i<len;i++){var iLayer=this.layers[i];if(iLayer.isBaseLayer||this.allOverlays){this.setBaseLayer(iLayer);break;}}}} -this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:layer});layer.events.triggerEvent("removed",{map:this,layer:layer});},getNumLayers:function(){return this.layers.length;},getLayerIndex:function(layer){return OpenLayers.Util.indexOf(this.layers,layer);},setLayerIndex:function(layer,idx){var base=this.getLayerIndex(layer);if(idx<0){idx=0;}else if(idx>this.layers.length){idx=this.layers.length;} -if(base!=idx){this.layers.splice(base,1);this.layers.splice(idx,0,layer);for(var i=0,len=this.layers.length;i<len;i++){this.setLayerZIndex(this.layers[i],i);} -this.events.triggerEvent("changelayer",{layer:layer,property:"order"});if(this.allOverlays){if(idx===0){this.setBaseLayer(layer);}else if(this.baseLayer!==this.layers[0]){this.setBaseLayer(this.layers[0]);}}}},raiseLayer:function(layer,delta){var idx=this.getLayerIndex(layer)+delta;this.setLayerIndex(layer,idx);},setBaseLayer:function(newBaseLayer){if(newBaseLayer!=this.baseLayer){if(OpenLayers.Util.indexOf(this.layers,newBaseLayer)!=-1){var center=this.getCachedCenter();var newResolution=OpenLayers.Util.getResolutionFromScale(this.getScale(),newBaseLayer.units);if(this.baseLayer!=null&&!this.allOverlays){this.baseLayer.setVisibility(false);} -this.baseLayer=newBaseLayer;this.viewRequestID++;if(!this.allOverlays||this.baseLayer.visibility){this.baseLayer.setVisibility(true);} -if(center!=null){var newZoom=this.getZoomForResolution(newResolution||this.resolution,true);this.setCenter(center,newZoom,false,true);} -this.events.triggerEvent("changebaselayer",{layer:this.baseLayer});}}},addControl:function(control,px){this.controls.push(control);this.addControlToMap(control,px);},addControls:function(controls,pixels){var pxs=(arguments.length===1)?[]:pixels;for(var i=0,len=controls.length;i<len;i++){var ctrl=controls[i];var px=(pxs[i])?pxs[i]:null;this.addControl(ctrl,px);}},addControlToMap:function(control,px){control.outsideViewport=(control.div!=null);if(this.displayProjection&&!control.displayProjection){control.displayProjection=this.displayProjection;} -control.setMap(this);var div=control.draw(px);if(div){if(!control.outsideViewport){div.style.zIndex=this.Z_INDEX_BASE['Control']+ -this.controls.length;this.viewPortDiv.appendChild(div);}} -if(control.autoActivate){control.activate();}},getControl:function(id){var returnControl=null;for(var i=0,len=this.controls.length;i<len;i++){var control=this.controls[i];if(control.id==id){returnControl=control;break;}} -return returnControl;},removeControl:function(control){if((control)&&(control==this.getControl(control.id))){if(control.div&&(control.div.parentNode==this.viewPortDiv)){this.viewPortDiv.removeChild(control.div);} -OpenLayers.Util.removeItem(this.controls,control);}},addPopup:function(popup,exclusive){if(exclusive){for(var i=this.popups.length-1;i>=0;--i){this.removePopup(this.popups[i]);}} -popup.map=this;this.popups.push(popup);var popupDiv=popup.draw();if(popupDiv){popupDiv.style.zIndex=this.Z_INDEX_BASE['Popup']+ -this.popups.length;this.layerContainerDiv.appendChild(popupDiv);}},removePopup:function(popup){OpenLayers.Util.removeItem(this.popups,popup);if(popup.div){try{this.layerContainerDiv.removeChild(popup.div);} -catch(e){}} -popup.map=null;},getSize:function(){var size=null;if(this.size!=null){size=this.size.clone();} -return size;},updateSize:function(){var newSize=this.getCurrentSize();if(newSize&&!isNaN(newSize.h)&&!isNaN(newSize.w)){this.events.clearMouseCache();var oldSize=this.getSize();if(oldSize==null){this.size=oldSize=newSize;} -if(!newSize.equals(oldSize)){this.size=newSize;for(var i=0,len=this.layers.length;i<len;i++){this.layers[i].onMapResize();} -var center=this.getCachedCenter();if(this.baseLayer!=null&¢er!=null){var zoom=this.getZoom();this.zoom=null;this.setCenter(center,zoom);}}}},getCurrentSize:function(){var size=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=this.div.offsetWidth;size.h=this.div.offsetHeight;} -if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=parseInt(this.div.style.width);size.h=parseInt(this.div.style.height);} -return size;},calculateBounds:function(center,resolution){var extent=null;if(center==null){center=this.getCachedCenter();} -if(resolution==null){resolution=this.getResolution();} -if((center!=null)&&(resolution!=null)){var size=this.getSize();var w_deg=size.w*resolution;var h_deg=size.h*resolution;extent=new OpenLayers.Bounds(center.lon-w_deg/2,center.lat-h_deg/2,center.lon+w_deg/2,center.lat+h_deg/2);} -return extent;},getCenter:function(){var center=null;var cachedCenter=this.getCachedCenter();if(cachedCenter){center=cachedCenter.clone();} -return center;},getCachedCenter:function(){if(!this.center&&this.size){this.center=this.getLonLatFromViewPortPx(new OpenLayers.Pixel(this.size.w/2,this.size.h/2));} -return this.center;},getZoom:function(){return this.zoom;},pan:function(dx,dy,options){options=OpenLayers.Util.applyDefaults(options,{animate:true,dragging:false});if(options.dragging){if(dx!=0||dy!=0){this.moveByPx(dx,dy);}}else{var centerPx=this.getViewPortPxFromLonLat(this.getCachedCenter());var newCenterPx=centerPx.add(dx,dy);if(this.dragging||!newCenterPx.equals(centerPx)){var newCenterLonLat=this.getLonLatFromViewPortPx(newCenterPx);if(options.animate){this.panTo(newCenterLonLat);}else{this.moveTo(newCenterLonLat);this.dragging=false;this.events.triggerEvent("moveend");}}}},panTo:function(lonlat){if(this.panMethod&&this.getExtent().scale(this.panRatio).containsLonLat(lonlat)){if(!this.panTween){this.panTween=new OpenLayers.Tween(this.panMethod);} -var center=this.getCachedCenter();if(lonlat.equals(center)){return;} -var from=this.getPixelFromLonLat(center);var to=this.getPixelFromLonLat(lonlat);var vector={x:to.x-from.x,y:to.y-from.y};var last={x:0,y:0};this.panTween.start({x:0,y:0},vector,this.panDuration,{callbacks:{eachStep:OpenLayers.Function.bind(function(px){var x=px.x-last.x,y=px.y-last.y;this.moveByPx(x,y);last.x=Math.round(px.x);last.y=Math.round(px.y);},this),done:OpenLayers.Function.bind(function(px){this.moveTo(lonlat);this.dragging=false;this.events.triggerEvent("moveend");},this)}});}else{this.setCenter(lonlat);}},setCenter:function(lonlat,zoom,dragging,forceZoomChange){this.panTween&&this.panTween.stop();this.moveTo(lonlat,zoom,{'dragging':dragging,'forceZoomChange':forceZoomChange});},moveByPx:function(dx,dy){var hw=this.size.w/2;var hh=this.size.h/2;var x=hw+dx;var y=hh+dy;var wrapDateLine=this.baseLayer.wrapDateLine;var xRestriction=0;var yRestriction=0;if(this.restrictedExtent){xRestriction=hw;yRestriction=hh;wrapDateLine=false;} -dx=wrapDateLine||x<=this.maxPx.x-xRestriction&&x>=this.minPx.x+xRestriction?Math.round(dx):0;dy=y<=this.maxPx.y-yRestriction&&y>=this.minPx.y+yRestriction?Math.round(dy):0;var minX=this.minPx.x,maxX=this.maxPx.x;if(dx||dy){if(!this.dragging){this.dragging=true;this.events.triggerEvent("movestart");} -this.center=null;if(dx){this.layerContainerDiv.style.left=parseInt(this.layerContainerDiv.style.left)-dx+"px";this.minPx.x-=dx;this.maxPx.x-=dx;if(wrapDateLine){if(this.maxPx.x>maxX){this.maxPx.x-=(maxX-minX);} -if(this.minPx.x<minX){this.minPx.x+=(maxX-minX);}}} -if(dy){this.layerContainerDiv.style.top=parseInt(this.layerContainerDiv.style.top)-dy+"px";this.minPx.y-=dy;this.maxPx.y-=dy;} -var layer,i,len;for(i=0,len=this.layers.length;i<len;++i){layer=this.layers[i];if(layer.visibility&&(layer===this.baseLayer||layer.inRange)){layer.moveByPx(dx,dy);layer.events.triggerEvent("move");}} -this.events.triggerEvent("move");}},moveTo:function(lonlat,zoom,options){if(!options){options={};} -if(zoom!=null){zoom=parseFloat(zoom);if(!this.fractionalZoom){zoom=Math.round(zoom);}} -var dragging=options.dragging||this.dragging;var forceZoomChange=options.forceZoomChange;if(!this.getCachedCenter()&&!this.isValidLonLat(lonlat)){lonlat=this.maxExtent.getCenterLonLat();this.center=lonlat.clone();} -if(this.restrictedExtent!=null){if(lonlat==null){lonlat=this.center;} -if(zoom==null){zoom=this.getZoom();} -var resolution=this.getResolutionForZoom(zoom);var extent=this.calculateBounds(lonlat,resolution);if(!this.restrictedExtent.containsBounds(extent)){var maxCenter=this.restrictedExtent.getCenterLonLat();if(extent.getWidth()>this.restrictedExtent.getWidth()){lonlat=new OpenLayers.LonLat(maxCenter.lon,lonlat.lat);}else if(extent.left<this.restrictedExtent.left){lonlat=lonlat.add(this.restrictedExtent.left- -extent.left,0);}else if(extent.right>this.restrictedExtent.right){lonlat=lonlat.add(this.restrictedExtent.right- -extent.right,0);} -if(extent.getHeight()>this.restrictedExtent.getHeight()){lonlat=new OpenLayers.LonLat(lonlat.lon,maxCenter.lat);}else if(extent.bottom<this.restrictedExtent.bottom){lonlat=lonlat.add(0,this.restrictedExtent.bottom- -extent.bottom);} -else if(extent.top>this.restrictedExtent.top){lonlat=lonlat.add(0,this.restrictedExtent.top- -extent.top);}}} -var zoomChanged=forceZoomChange||((this.isValidZoomLevel(zoom))&&(zoom!=this.getZoom()));var centerChanged=(this.isValidLonLat(lonlat))&&(!lonlat.equals(this.center));if(zoomChanged||centerChanged||dragging){dragging||this.events.triggerEvent("movestart");if(centerChanged){if(!zoomChanged&&this.center){this.centerLayerContainer(lonlat);} -this.center=lonlat.clone();} -var res=zoomChanged?this.getResolutionForZoom(zoom):this.getResolution();if(zoomChanged||this.layerContainerOrigin==null){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px";var maxExtent=this.getMaxExtent({restricted:true});var maxExtentCenter=maxExtent.getCenterLonLat();var lonDelta=this.center.lon-maxExtentCenter.lon;var latDelta=maxExtentCenter.lat-this.center.lat;var extentWidth=Math.round(maxExtent.getWidth()/res);var extentHeight=Math.round(maxExtent.getHeight()/res);var left=(this.size.w-extentWidth)/2-lonDelta/res;var top=(this.size.h-extentHeight)/2-latDelta/res;this.minPx=new OpenLayers.Pixel(left,top);this.maxPx=new OpenLayers.Pixel(left+extentWidth,top+extentHeight);} -if(zoomChanged){this.zoom=zoom;this.resolution=res;this.viewRequestID++;} -var bounds=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});} -bounds=this.baseLayer.getExtent();for(var i=this.layers.length-1;i>=0;--i){var layer=this.layers[i];if(layer!==this.baseLayer&&!layer.isBaseLayer){var inRange=layer.calculateInRange();if(layer.inRange!=inRange){layer.inRange=inRange;if(!inRange){layer.display(false);} -this.events.triggerEvent("changelayer",{layer:layer,property:"visibility"});} -if(inRange&&layer.visibility){layer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||layer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});}}} -this.events.triggerEvent("move");dragging||this.events.triggerEvent("moveend");if(zoomChanged){for(var i=0,len=this.popups.length;i<len;i++){this.popups[i].updatePosition();} -this.events.triggerEvent("zoomend");}}},centerLayerContainer:function(lonlat){var originPx=this.getViewPortPxFromLonLat(this.layerContainerOrigin);var newPx=this.getViewPortPxFromLonLat(lonlat);if((originPx!=null)&&(newPx!=null)){var oldLeft=parseInt(this.layerContainerDiv.style.left);var oldTop=parseInt(this.layerContainerDiv.style.top);var newLeft=Math.round(originPx.x-newPx.x);var newTop=Math.round(originPx.y-newPx.y);this.layerContainerDiv.style.left=newLeft+"px";this.layerContainerDiv.style.top=newTop+"px";var dx=oldLeft-newLeft;var dy=oldTop-newTop;this.minPx.x-=dx;this.maxPx.x-=dx;this.minPx.y-=dy;this.maxPx.y-=dy;}},isValidZoomLevel:function(zoomLevel){return((zoomLevel!=null)&&(zoomLevel>=0)&&(zoomLevel<this.getNumZoomLevels()));},isValidLonLat:function(lonlat){var valid=false;if(lonlat!=null){var maxExtent=this.getMaxExtent();valid=maxExtent.containsLonLat(lonlat);} -return valid;},getProjection:function(){var projection=this.getProjectionObject();return projection?projection.getCode():null;},getProjectionObject:function(){var projection=null;if(this.baseLayer!=null){projection=this.baseLayer.projection;} -return projection;},getMaxResolution:function(){var maxResolution=null;if(this.baseLayer!=null){maxResolution=this.baseLayer.maxResolution;} -return maxResolution;},getMaxExtent:function(options){var maxExtent=null;if(options&&options.restricted&&this.restrictedExtent){maxExtent=this.restrictedExtent;}else if(this.baseLayer!=null){maxExtent=this.baseLayer.maxExtent;} -return maxExtent;},getNumZoomLevels:function(){var numZoomLevels=null;if(this.baseLayer!=null){numZoomLevels=this.baseLayer.numZoomLevels;} -return numZoomLevels;},getExtent:function(){var extent=null;if(this.baseLayer!=null){extent=this.baseLayer.getExtent();} -return extent;},getResolution:function(){var resolution=null;if(this.baseLayer!=null){resolution=this.baseLayer.getResolution();}else if(this.allOverlays===true&&this.layers.length>0){resolution=this.layers[0].getResolution();} -return resolution;},getUnits:function(){var units=null;if(this.baseLayer!=null){units=this.baseLayer.units;} -return units;},getScale:function(){var scale=null;if(this.baseLayer!=null){var res=this.getResolution();var units=this.baseLayer.units;scale=OpenLayers.Util.getScaleFromResolution(res,units);} -return scale;},getZoomForExtent:function(bounds,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForExtent(bounds,closest);} -return zoom;},getResolutionForZoom:function(zoom){var resolution=null;if(this.baseLayer){resolution=this.baseLayer.getResolutionForZoom(zoom);} -return resolution;},getZoomForResolution:function(resolution,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForResolution(resolution,closest);} -return zoom;},zoomTo:function(zoom){if(this.isValidZoomLevel(zoom)){this.setCenter(null,zoom);}},zoomIn:function(){this.zoomTo(this.getZoom()+1);},zoomOut:function(){this.zoomTo(this.getZoom()-1);},zoomToExtent:function(bounds,closest){var center=bounds.getCenterLonLat();if(this.baseLayer.wrapDateLine){var maxExtent=this.getMaxExtent();bounds=bounds.clone();while(bounds.right<bounds.left){bounds.right+=maxExtent.getWidth();} -center=bounds.getCenterLonLat().wrapDateLine(maxExtent);} -this.setCenter(center,this.getZoomForExtent(bounds,closest));},zoomToMaxExtent:function(options){var restricted=(options)?options.restricted:true;var maxExtent=this.getMaxExtent({'restricted':restricted});this.zoomToExtent(maxExtent);},zoomToScale:function(scale,closest){var res=OpenLayers.Util.getResolutionFromScale(scale,this.baseLayer.units);var size=this.getSize();var w_deg=size.w*res;var h_deg=size.h*res;var center=this.getCachedCenter();var extent=new OpenLayers.Bounds(center.lon-w_deg/2,center.lat-h_deg/2,center.lon+w_deg/2,center.lat+h_deg/2);this.zoomToExtent(extent,closest);},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if(this.baseLayer!=null){lonlat=this.baseLayer.getLonLatFromViewPortPx(viewPortPx);} -return lonlat;},getViewPortPxFromLonLat:function(lonlat){var px=null;if(this.baseLayer!=null){px=this.baseLayer.getViewPortPxFromLonLat(lonlat);} -return px;},getLonLatFromPixel:function(px){return this.getLonLatFromViewPortPx(px);},getPixelFromLonLat:function(lonlat){var px=this.getViewPortPxFromLonLat(lonlat);px.x=Math.round(px.x);px.y=Math.round(px.y);return px;},getGeodesicPixelSize:function(px){var lonlat=px?this.getLonLatFromPixel(px):(this.getCachedCenter()||new OpenLayers.LonLat(0,0));var res=this.getResolution();var left=lonlat.add(-res/2,0);var right=lonlat.add(res/2,0);var bottom=lonlat.add(0,-res/2);var top=lonlat.add(0,res/2);var dest=new OpenLayers.Projection("EPSG:4326");var source=this.getProjectionObject()||dest;if(!source.equals(dest)){left.transform(source,dest);right.transform(source,dest);bottom.transform(source,dest);top.transform(source,dest);} -return new OpenLayers.Size(OpenLayers.Util.distVincenty(left,right),OpenLayers.Util.distVincenty(bottom,top));},getViewPortPxFromLayerPx:function(layerPx){var viewPortPx=null;if(layerPx!=null){var dX=parseInt(this.layerContainerDiv.style.left);var dY=parseInt(this.layerContainerDiv.style.top);viewPortPx=layerPx.add(dX,dY);} -return viewPortPx;},getLayerPxFromViewPortPx:function(viewPortPx){var layerPx=null;if(viewPortPx!=null){var dX=-parseInt(this.layerContainerDiv.style.left);var dY=-parseInt(this.layerContainerDiv.style.top);layerPx=viewPortPx.add(dX,dY);if(isNaN(layerPx.x)||isNaN(layerPx.y)){layerPx=null;}} -return layerPx;},getLonLatFromLayerPx:function(px){px=this.getViewPortPxFromLayerPx(px);return this.getLonLatFromViewPortPx(px);},getLayerPxFromLonLat:function(lonlat){var px=this.getPixelFromLonLat(lonlat);return this.getLayerPxFromViewPortPx(px);},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:null,alwaysInRange:null,EVENT_TYPES:["loadstart","loadend","loadcancel","visibilitychanged","move","moveend","added","removed"],RESOLUTION_PROPERTIES:['scales','resolutions','maxScale','minScale','maxResolution','minResolution','numZoomLevels','maxZoomLevel'],events:null,map:null,isBaseLayer:false,alpha:false,displayInLayerSwitcher:true,visibility:true,attribution:null,inRange:false,imageSize:null,imageOffset:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null,numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:false,wrapDateLine:false,transitionEffect:null,SUPPORTED_TRANSITIONS:['resize'],metadata:{},initialize:function(name,options){this.addOptions(options);this.name=name;if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");this.div=OpenLayers.Util.createDiv(this.id);this.div.style.width="100%";this.div.style.height="100%";this.div.dir="ltr";this.events=new OpenLayers.Events(this,this.div,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}} -if(this.wrapDateLine){this.displayOutsideMaxExtent=true;}},destroy:function(setNewBaseLayer){if(setNewBaseLayer==null){setNewBaseLayer=true;} -if(this.map!=null){this.map.removeLayer(this,setNewBaseLayer);} -this.projection=null;this.map=null;this.name=null;this.div=null;this.options=null;if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);} -this.events.destroy();} -this.eventListeners=null;this.events=null;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer(this.name,this.getOptions());} -OpenLayers.Util.applyDefaults(obj,this);obj.map=null;return obj;},getOptions:function(){var options={};for(var o in this.options){options[o]=this[o];} -return options;},setName:function(newName){if(newName!=this.name){this.name=newName;if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"name"});}}},addOptions:function(newOptions,reinitialize){if(this.options==null){this.options={};} -OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);} -if(this.projection&&this.projection.getUnits()){this.units=this.projection.getUnits();} -if(this.map){var resolution=this.map.getResolution();var properties=this.RESOLUTION_PROPERTIES.concat(["projection","units","minExtent","maxExtent"]);for(var o in newOptions){if(newOptions.hasOwnProperty(o)&&OpenLayers.Util.indexOf(properties,o)>=0){this.initResolutions();if(reinitialize&&this.map.baseLayer===this){this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(resolution),false,true);this.map.events.triggerEvent("changebaselayer",{layer:this});} -break;}}}},onMapResize:function(){},redraw:function(){var redrawn=false;if(this.map){this.inRange=this.calculateInRange();var extent=this.getExtent();if(extent&&this.inRange&&this.visibility){var zoomChanged=true;this.moveTo(extent,zoomChanged,false);this.events.triggerEvent("moveend",{"zoomChanged":zoomChanged});redrawn=true;}} -return redrawn;},moveTo:function(bounds,zoomChanged,dragging){var display=this.visibility;if(!this.isBaseLayer){display=display&&this.inRange;} -this.display(display);},moveByPx:function(dx,dy){},setMap:function(map){if(this.map==null){this.map=map;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);} -this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var show=((this.visibility)&&(this.inRange));this.div.style.display=show?"":"none";} -this.setTileSize();}},afterAdd:function(){},removeMap:function(map){},getImageSize:function(bounds){return(this.imageSize||this.tileSize);},setTileSize:function(size){var tileSize=(size)?size:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=tileSize;if(this.gutter){this.imageOffset=new OpenLayers.Pixel(-this.gutter,-this.gutter);this.imageSize=new OpenLayers.Size(tileSize.w+(2*this.gutter),tileSize.h+(2*this.gutter));}},getVisibility:function(){return this.visibility;},setVisibility:function(visibility){if(visibility!=this.visibility){this.visibility=visibility;this.display(visibility);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"});} -this.events.triggerEvent("visibilitychanged");}},display:function(display){if(display!=(this.div.style.display!="none")){this.div.style.display=(display&&this.calculateInRange())?"block":"none";}},calculateInRange:function(){var inRange=false;if(this.alwaysInRange){inRange=true;}else{if(this.map){var resolution=this.map.getResolution();inRange=((resolution>=this.minResolution)&&(resolution<=this.maxResolution));}} -return inRange;},setIsBaseLayer:function(isBaseLayer){if(isBaseLayer!=this.isBaseLayer){this.isBaseLayer=isBaseLayer;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this});}}},initResolutions:function(){var i,len,p;var props={},alwaysInRange=true;for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p];if(alwaysInRange&&this.options[p]){alwaysInRange=false;}} -if(this.alwaysInRange==null){this.alwaysInRange=alwaysInRange;} -if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);} -if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);} -if(props.resolutions==null){for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p]!=null?this.options[p]:this.map[p];} -if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);} -if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);}} -var maxResolution;if(this.options.maxResolution&&this.options.maxResolution!=="auto"){maxResolution=this.options.maxResolution;} -if(this.options.minScale){maxResolution=OpenLayers.Util.getResolutionFromScale(this.options.minScale,this.units);} -var minResolution;if(this.options.minResolution&&this.options.minResolution!=="auto"){minResolution=this.options.minResolution;} -if(this.options.maxScale){minResolution=OpenLayers.Util.getResolutionFromScale(this.options.maxScale,this.units);} -if(props.resolutions){props.resolutions.sort(function(a,b){return(b-a);});if(!maxResolution){maxResolution=props.resolutions[0];} -if(!minResolution){var lastIdx=props.resolutions.length-1;minResolution=props.resolutions[lastIdx];}} -this.resolutions=props.resolutions;if(this.resolutions){len=this.resolutions.length;this.scales=new Array(len);for(i=0;i<len;i++){this.scales[i]=OpenLayers.Util.getScaleFromResolution(this.resolutions[i],this.units);} -this.numZoomLevels=len;} -this.minResolution=minResolution;if(minResolution){this.maxScale=OpenLayers.Util.getScaleFromResolution(minResolution,this.units);} -this.maxResolution=maxResolution;if(maxResolution){this.minScale=OpenLayers.Util.getScaleFromResolution(maxResolution,this.units);}},resolutionsFromScales:function(scales){if(scales==null){return;} -var resolutions,i,len;len=scales.length;resolutions=new Array(len);for(i=0;i<len;i++){resolutions[i]=OpenLayers.Util.getResolutionFromScale(scales[i],this.units);} -return resolutions;},calculateResolutions:function(props){var viewSize,wRes,hRes;var maxResolution=props.maxResolution;if(props.minScale!=null){maxResolution=OpenLayers.Util.getResolutionFromScale(props.minScale,this.units);}else if(maxResolution=="auto"&&this.maxExtent!=null){viewSize=this.map.getSize();wRes=this.maxExtent.getWidth()/viewSize.w;hRes=this.maxExtent.getHeight()/viewSize.h;maxResolution=Math.max(wRes,hRes);} -var minResolution=props.minResolution;if(props.maxScale!=null){minResolution=OpenLayers.Util.getResolutionFromScale(props.maxScale,this.units);}else if(props.minResolution=="auto"&&this.minExtent!=null){viewSize=this.map.getSize();wRes=this.minExtent.getWidth()/viewSize.w;hRes=this.minExtent.getHeight()/viewSize.h;minResolution=Math.max(wRes,hRes);} -var maxZoomLevel=props.maxZoomLevel;var numZoomLevels=props.numZoomLevels;if(typeof minResolution==="number"&&typeof maxResolution==="number"&&numZoomLevels===undefined){var ratio=maxResolution/minResolution;numZoomLevels=Math.floor(Math.log(ratio)/Math.log(2))+1;}else if(numZoomLevels===undefined&&maxZoomLevel!=null){numZoomLevels=maxZoomLevel+1;} -if(typeof numZoomLevels!=="number"||numZoomLevels<=0||(typeof maxResolution!=="number"&&typeof minResolution!=="number")){return;} -var resolutions=new Array(numZoomLevels);var base=2;if(typeof minResolution=="number"&&typeof maxResolution=="number"){base=Math.pow((maxResolution/minResolution),(1/(numZoomLevels-1)));} -var i;if(typeof maxResolution==="number"){for(i=0;i<numZoomLevels;i++){resolutions[i]=maxResolution/Math.pow(base,i);}}else{for(i=0;i<numZoomLevels;i++){resolutions[numZoomLevels-1-i]=minResolution*Math.pow(base,i);}} -return resolutions;},getResolution:function(){var zoom=this.map.getZoom();return this.getResolutionForZoom(zoom);},getExtent:function(){return this.map.calculateBounds();},getZoomForExtent:function(extent,closest){var viewSize=this.map.getSize();var idealResolution=Math.max(extent.getWidth()/viewSize.w,extent.getHeight()/viewSize.h);return this.getZoomForResolution(idealResolution,closest);},getDataExtent:function(){},getResolutionForZoom:function(zoom){zoom=Math.max(0,Math.min(zoom,this.resolutions.length-1));var resolution;if(this.map.fractionalZoom){var low=Math.floor(zoom);var high=Math.ceil(zoom);resolution=this.resolutions[low]- -((zoom-low)*(this.resolutions[low]-this.resolutions[high]));}else{resolution=this.resolutions[Math.round(zoom)];} -return resolution;},getZoomForResolution:function(resolution,closest){var zoom,i,len;if(this.map.fractionalZoom){var lowZoom=0;var highZoom=this.resolutions.length-1;var highRes=this.resolutions[lowZoom];var lowRes=this.resolutions[highZoom];var res;for(i=0,len=this.resolutions.length;i<len;++i){res=this.resolutions[i];if(res>=resolution){highRes=res;lowZoom=i;} -if(res<=resolution){lowRes=res;highZoom=i;break;}} -var dRes=highRes-lowRes;if(dRes>0){zoom=lowZoom+((highRes-resolution)/dRes);}else{zoom=lowZoom;}}else{var diff;var minDiff=Number.POSITIVE_INFINITY;for(i=0,len=this.resolutions.length;i<len;i++){if(closest){diff=Math.abs(this.resolutions[i]-resolution);if(diff>minDiff){break;} -minDiff=diff;}else{if(this.resolutions[i]<resolution){break;}}} -zoom=Math.max(0,i-1);} -return zoom;},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;var map=this.map;if(viewPortPx!=null&&map.minPx){var res=map.getResolution();var maxExtent=map.getMaxExtent({restricted:true});var lon=(viewPortPx.x-map.minPx.x)*res+maxExtent.left;var lat=(map.minPx.y-viewPortPx.y)*res+maxExtent.top;lonlat=new OpenLayers.LonLat(lon,lat);if(this.wrapDateLine){lonlat=lonlat.wrapDateLine(this.maxExtent);}} -return lonlat;},getViewPortPxFromLonLat:function(lonlat){var px=null;if(lonlat!=null){var resolution=this.map.getResolution();var extent=this.map.getExtent();px=new OpenLayers.Pixel((1/resolution*(lonlat.lon-extent.left)),(1/resolution*(extent.top-lonlat.lat)));} -return px;},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;for(var i=0,len=this.div.childNodes.length;i<len;++i){var element=this.div.childNodes[i].firstChild;OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);} -if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"});}}},getZIndex:function(){return this.div.style.zIndex;},setZIndex:function(zIndex){this.div.style.zIndex=zIndex;},adjustBounds:function(bounds){if(this.gutter){var mapGutter=this.gutter*this.map.getResolution();bounds=new OpenLayers.Bounds(bounds.left-mapGutter,bounds.bottom-mapGutter,bounds.right+mapGutter,bounds.top+mapGutter);} -if(this.wrapDateLine){var wrappingOptions={'rightTolerance':this.getResolution(),'leftTolerance':this.getResolution()};bounds=bounds.wrapDateLine(this.maxExtent,wrappingOptions);} -return bounds;},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.Layer.Markers=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:false,markers:null,drawn:false,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.markers=[];},destroy:function(){this.clearMarkers();this.markers=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;for(var i=0,len=this.markers.length;i<len;i++){this.markers[i].setOpacity(this.opacity);}}},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);if(zoomChanged||!this.drawn){for(var i=0,len=this.markers.length;i<len;i++){this.drawMarker(this.markers[i]);} -this.drawn=true;}},addMarker:function(marker){this.markers.push(marker);if(this.opacity!=null){marker.setOpacity(this.opacity);} -if(this.map&&this.map.getExtent()){marker.map=this.map;this.drawMarker(marker);}},removeMarker:function(marker){if(this.markers&&this.markers.length){OpenLayers.Util.removeItem(this.markers,marker);marker.erase();}},clearMarkers:function(){if(this.markers!=null){while(this.markers.length>0){this.removeMarker(this.markers[0]);}}},drawMarker:function(marker){var px=this.map.getLayerPxFromLonLat(marker.lonlat);if(px==null){marker.display(false);}else{if(!marker.isDrawn()){var markerImg=marker.draw(px);this.div.appendChild(markerImg);}else if(marker.icon){marker.icon.moveTo(px);}}},getDataExtent:function(){var maxExtent=null;if(this.markers&&(this.markers.length>0)){var maxExtent=new OpenLayers.Bounds();for(var i=0,len=this.markers.length;i<len;i++){var marker=this.markers[i];maxExtent.extend(marker.lonlat);}} -return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Markers"});OpenLayers.Lang.it={'unhandledRequest':"Codice di ritorno della richiesta ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Livello base",'readNotImplemented':"Lettura non implementata.",'writeNotImplemented':"Scrittura non implementata.",'noFID':"Impossibile aggiornare un elemento grafico che non abbia il FID.",'errorLoadingGML':"Errore nel caricamento del file GML ${url}",'browserNotSupported':"Il tuo browser non supporta il rendering vettoriale. I renderizzatore attualemnte supportati sono:\n${renderers}",'componentShouldBe':"addFeatures : il componente dovrebbe essere di tipo ${geomType}",'getFeatureError':"getFeatureFromEvent chiamata su di un livello senza renderizzatore. Ciò significa che "+"il livello è stato cancellato, ma non i gestori associati ad esso.",'minZoomLevelError':"La proprietà minZoomLevel è da utilizzare solamente "+"con livelli che abbiano FixedZoomLevels. Il fatto che "+"questo livello wfs controlli la proprietà minZoomLevel è "+"un retaggio del passato. Non possiamo comunque rimuoverla "+"senza rompere le vecchie applicazioni che dipendono su di essa."+"Quindi siamo costretti a deprecarla -- minZoomLevel "+"e sarà rimossa dalla vesione 3.0. Si prega di utilizzare i "+"settaggi di risoluzione min/max come descritto qui: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transazione WFS: SUCCESS ${response}",'commitFailed':"Transazione WFS: FAILED ${response}",'googleWarning':"Il livello Google non è riuscito a caricare correttamente.<br><br>"+"Per evitare questo messaggio, seleziona un nuovo BaseLayer "+"nel selettore di livelli nell'angolo in alto a destra.<br><br>"+"Più precisamente, ciò accade perchè la libreria Google Maps "+"non è stata inclusa nella pagina, oppure non contiene la "+"corretta API key per il tuo sito.<br><br>"+"Sviluppatori: Per aiuto su come farlo funzionare correttamente, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>clicca qui</a>",'getLayerWarning':"Il livello ${layerType} non è riuscito a caricare correttamente.<br><br>"+"Per evitare questo messaggio, seleziona un nuovo BaseLayer "+"nel selettore di livelli nell'angolo in alto a destra.<br><br>"+"Più precisamente, ciò accade perchè la libreria ${layerLib} "+"non è stata inclusa nella pagina.<br><br>"+"Sviluppatori: Per aiuto su come farlo funzionare correttamente, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>clicca qui</a>",'Scale = 1 : ${scaleDenom}':"Scala = 1 : ${scaleDenom}",'layerAlreadyAdded':"Stai cercando di aggiungere il livello: ${layerName} alla mappa, ma tale livello è già stato aggiunto.",'reprojectDeprecated':"Stai utilizzando l'opzione 'reproject' sul livello ${layerName}. "+"Questa opzione è deprecata: il suo utilizzo è stato introdotto per"+"supportare il disegno dei dati sopra mappe commerciali, ma tale "+"funzionalità dovrebbe essere ottenuta tramite l'utilizzo della proiezione "+"Spherical Mercator. Per maggiori informazioni consultare qui "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Questo metodo è stato deprecato e sarà rimosso dalla versione 3.0. "+"Si prega di utilizzare il metodo ${newMethod} in alternativa.",'boundsAddError':"Devi specificare i valori di x e y alla funzione add.",'lonlatAddError':"Devi specificare i valori di lon e lat alla funzione add.",'pixelAddError':"Devi specificare i valori di x e y alla funzione add.",'unsupportedGeometryType':"Tipo di geometria non supportata: ${geomType}",'end':''};OpenLayers.Lang["oc"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Requèsta pas gerida, retorna ${statusText}",'Permalink':"Permaligam",'Overlays':"Calques",'Base Layer':"Calc de basa",'readNotImplemented':"Lectura pas implementada.",'writeNotImplemented':"Escritura pas implementada.",'noFID':"Impossible de metre a jorn un objècte sens identificant (fid).",'errorLoadingGML':"Error al cargament del fichièr GML ${url}",'browserNotSupported':"Vòstre navegidor supòrta pas lo rendut vectorial. Los renderers actualament suportats son : \n${renderers}",'componentShouldBe':"addFeatures : lo compausant deuriá èsser de tipe ${geomType}",'getFeatureError':"getFeatureFromEvent es estat apelat sus un calc sens renderer. Aquò significa generalament qu\'avètz destruch aqueste jaç, mas qu\'avètz conservat un handler que li èra associat.",'minZoomLevelError':"La proprietat minZoomLevel deu èsser utilizada solament per de jaces FixedZoomLevels-descendent. Lo fach qu\'aqueste jaç WFS verifique la preséncia de minZoomLevel es una relica del passat. Çaquelà, la podèm suprimir sens copar d\'aplicacions que ne poirián dependre. Es per aquò que la depreciam -- la verificacion del minZoomLevel serà suprimida en version 3.0. A la plaça, mercés d\'utilizar los paramètres de resolucions min/max tal coma descrich sus : http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transaccion WFS : SUCCES ${response}",'commitFailed':"Transaccion WFS : FRACAS ${response}",'googleWarning':"Lo jaç Google es pas estat en mesura de se cargar corrèctament.\x3cbr\x3e\x3cbr\x3ePer suprimir aqueste messatge, causissètz una BaseLayer novèla dins lo selector de jaç en naut a drecha.\x3cbr\x3e\x3cbr\x3eAquò es possiblament causat par la non-inclusion de la librariá Google Maps, o alara perque que la clau de l\'API correspond pas a vòstre site.\x3cbr\x3e\x3cbr\x3eDesvolopaires : per saber cossí corregir aquò, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclicatz aicí\x3c/a\x3e",'getLayerWarning':"Lo jaç ${layerType} es pas en mesura de se cargar corrèctament.\x3cbr\x3e\x3cbr\x3ePer suprimir aqueste messatge, causissètz una BaseLayer novèla dins lo selector de jaç en naut a drecha.\x3cbr\x3e\x3cbr\x3eAquò es possiblament causat per la non-inclusion de la librariá ${layerLib}.\x3cbr\x3e\x3cbr\x3eDesvolopaires : per saber cossí corregir aquí, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclicatz aicí\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Escala ~ 1 : ${scaleDenom}",'W':"O",'E':"È",'N':"N",'S':"S",'layerAlreadyAdded':"Avètz ensajat d\'apondre a la carta lo calc : ${layerName}, mas ja es present",'reprojectDeprecated':"Utilizatz l\'opcion \'reproject\' sul jaç ${layerName}. Aquesta opcion es despreciada : Son usatge permetiá d\'afichar de donadas al dessús de jaces raster comercials. Aquesta foncionalitat ara es suportada en utilizant lo supòrt de la projeccion Mercator Esferica. Mai d\'informacion es disponibla sus http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Aqueste metòde es despreciada, e serà suprimida a la version 3.0. Mercés d\'utilizar ${newMethod} a la plaça.",'boundsAddError':"Vos cal passar las doas valors x e y a la foncion add.",'lonlatAddError':"Vos cal passar las doas valors lon e lat a la foncion add.",'pixelAddError':"Vos cal passar las doas valors x e y a la foncion add.",'unsupportedGeometryType':"Tipe de geometria pas suportat : ${geomType}",'filterEvaluateNotImplemented':"evaluar es pas encara estat implementat per aqueste tipe de filtre."});OpenLayers.Lang["gsw"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nit behandleti Aafrogsruckmäldig ${statusText}",'Permalink':"Permalink",'Overlays':"Iberlagerige",'Base Layer':"Grundcharte",'readNotImplemented':"Läse nit implementiert.",'writeNotImplemented':"Schrybe nit implementiert.",'noFID':"E Feature, wu s kei FID derfir git, cha nit aktualisiert wäre.",'errorLoadingGML':"Fähler bim Lade vu dr GML-Datei ${url}",'browserNotSupported':"Dyy Browser unterstitzt kei Vektordarstellig. Aktuäll unterstitzti Renderer:\n${renderers}",'componentShouldBe':"addFeatures : Komponänt sott dr Typ ${geomType} syy",'getFeatureError':"getFeatureFromEvent isch uf eme Layer ohni Renderer ufgruefe wore. Des heisst normalerwys, ass Du e Layer kaputt gmacht hesch, aber nit dr Handler, wu derzue ghert.",'minZoomLevelError':"D minZoomLevel-Eigeschaft isch nume dänk fir d Layer, wu vu dr FixedZoomLevels abstamme. Ass dää wfs-Layer minZoomLevel prieft, scih e Relikt us dr Vergangeheit. Mir chenne s aber nit ändere ohni OL_basierti Aawändige villicht kaputt gehn, wu dervu abhänge. Us däm Grund het die Funktion d Eigeschaft \'deprecated\' iberchuu. D minZoomLevel-Priefig unte wird in dr Version 3.0 usegnuu. Bitte verwänd statt däm e min/max-Uflesig wie s do bschriben isch: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-Transaktion: ERFOLGRYCH ${response}",'commitFailed':"WFS-Transaktion: FÄHLGSCHLAA ${response}",'googleWarning':"Dr Google-Layer het nit korräkt chenne glade wäre.\x3cbr\x3e\x3cbr\x3eGo die Mäldig nimi z kriege, wehl e andere Hintergrundlayer us em LayerSwitcher im rächte obere Ecke.\x3cbr\x3e\x3cbr\x3eDää Fähler git s seli hyfig, wel s Skript vu dr Google-Maps-Bibliothek nit yybunde woren isch oder wel s kei giltige API-Schlissel fir Dyy URL din het.\x3cbr\x3e\x3cbr\x3eEntwickler: Fir Hilf zum korräkte Yybinde vum Google-Layer \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3edoo drucke\x3c/a\x3e",'getLayerWarning':"Dr ${layerType}-Layer het nit korräkt chenne glade wäre.\x3cbr\x3e\x3cbr\x3eGo die Mäldig nimi z kriege, wehl e andere Hintergrundlayer us em LayerSwitcher im rächte obere Ecke.\x3cbr\x3e\x3cbr\x3eDää Fähler git s seli hyfig, wel s Skript vu dr \'${layerLib}\'-Bibliothek nit yybunde woren isch oder wel s kei giltige API-Schlissel fir Dyy URL din het.\x3cbr\x3e\x3cbr\x3eEntwickler: Fir Hilf zum korräkte Yybinde vu Layer \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3edoo drucke\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Maßstab = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"S",'layerAlreadyAdded':"Du hesch versuecht dää Layer in d Charte yyzfiege: ${layerName}, aber är isch schoi yygfiegt",'reprojectDeprecated':"Du bruchsch d \'reproject\'-Option bim ${layerName}-Layer. Die Option isch nimi giltig: si isch aagleit wore go Date iber kommerziälli Grundcharte lege, aber des sott mer jetz mache mit dr Unterstitzig vu Spherical Mercator. Meh Informatione git s uf http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Die Methode isch veraltet un wird us dr Version 3.0 usegnuu. Bitte verwäbnd statt däm ${newMethod}.",'boundsAddError':"Du muesch e x-Wärt un e y-Wärt yygee bi dr Zuefieg-Funktion",'lonlatAddError':"Du meusch e Lengi- un e Breiti-Grad yygee bi dr Zuefieg-Funktion.",'pixelAddError':"Du muesch x- un y-Wärt aagee bi dr Zuefieg-Funktion.",'unsupportedGeometryType':"Nit unterstitze Geometrii-Typ: ${geomType}",'filterEvaluateNotImplemented':"evaluiere isch nit implemäntiert in däm Filtertyp."});OpenLayers.Geometry.MultiPolygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Polygon"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Geometry.MultiPolygon"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:true,autoDestroy:true,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;this.active=false;},destroy:function(){this.deactivate();this.layer=null;this.options=null;},setLayer:function(layer){this.layer=layer;},activate:function(){if(!this.active){this.active=true;return true;} +root.parentNode.removeChild(root);renderer.rendererRoot.appendChild(root);},getRenderLayerId:function(){return this.root.parentNode.parentNode.id;},isComplexSymbol:function(graphicName){return(graphicName!="circle")&&!!graphicName;},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Lang["sv"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Ej hanterad frÃ¥ga retur ${statusText}",'Permalink':"Permalänk",'Overlays':"Kartlager",'Base Layer':"Bakgrundskarta",'noFID':"Kan ej uppdatera feature (objekt) för vilket FID saknas.",'browserNotSupported':"Din webbläsare stöder inte vektorvisning. För närvarande stöds följande visning:\n${renderers}",'minZoomLevelError':"Egenskapen minZoomLevel är endast avsedd att användas med lager med FixedZoomLevels. Att detta WFS-lager kontrollerar minZoomLevel är en relik frÃ¥n äldre versioner. Vi kan dock inte ta bort det utan att riskera att OL-baserade tillämpningar som använder detta slutar fungera. Därför är det satt som deprecated, minZoomLevel kommer att tas bort i version 3.0. Använd i stället inställning av min/max resolution som beskrivs här: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-transaktion: LYCKADES ${response}",'commitFailed':"WFS-transaktion: MISSLYCKADES ${response}",'googleWarning':"Google-lagret kunde inte laddas korrekt.\x3cbr\x3e\x3cbr\x3eFör att slippa detta meddelande, välj en annan bakgrundskarta i lagerväljaren i övre högra hörnet.\x3cbr\x3e\x3cbr\x3eSannolikt beror felet pÃ¥ att Google Maps-biblioteket inte är inkluderat pÃ¥ webbsidan eller pÃ¥ att sidan inte anger korrekt API-nyckel för webbplatsen.\x3cbr\x3e\x3cbr\x3eUtvecklare: hjälp för att Ã¥tgärda detta, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklicka här\x3c/a\x3e.",'getLayerWarning':"${layerType}-lagret kunde inte laddas korrekt.\x3cbr\x3e\x3cbr\x3eFör att slippa detta meddelande, välj en annan bakgrundskarta i lagerväljaren i övre högra hörnet.\x3cbr\x3e\x3cbr\x3eSannolikt beror felet pÃ¥ att ${layerLib}-biblioteket inte är inkluderat pÃ¥ webbsidan.\x3cbr\x3e\x3cbr\x3eUtvecklare: hjälp för att Ã¥tgärda detta, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklicka här\x3c/a\x3e.",'Scale = 1 : ${scaleDenom}':"\x3cstrong\x3eSkala\x3c/strong\x3e 1 : ${scaleDenom}",'reprojectDeprecated':"Du använder inställningen \'reproject\' pÃ¥ lagret ${layerName}. Denna inställning markerad som deprecated: den var avsedd att användas för att stödja visning av kartdata pÃ¥ kommersiella bakgrundskartor, men nu bör man i stället använda Spherical Mercator-stöd för den funktionaliteten. Mer information finns pÃ¥ http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Denna metod är markerad som deprecated och kommer att tas bort i 3.0. Använd ${newMethod} i stället."});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:true,autoDestroy:true,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;this.active=false;},destroy:function(){this.deactivate();this.layer=null;this.options=null;},setLayer:function(layer){this.layer=layer;},activate:function(){if(!this.active){this.active=true;return true;} return false;},deactivate:function(){if(this.active){this.active=false;return true;} -return false;},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:false,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:false,propertyStyles:null,initialize:function(style,options){OpenLayers.Util.extend(this,options);this.rules=[];if(options&&options.rules){this.addRules(options.rules);} +return false;},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:false,activate:function(){if(OpenLayers.Strategy.prototype.activate.apply(this,arguments)){this.layer.events.on({"refresh":this.load,scope:this});if(this.layer.visibility==true||this.preload){this.load();}else{this.layer.events.on({"visibilitychanged":this.load,scope:this});} +return true;} +return false;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"refresh":this.load,"visibilitychanged":this.load,scope:this});} +return deactivated;},load:function(options){var layer=this.layer;layer.events.triggerEvent("loadstart");layer.protocol.read(OpenLayers.Util.applyDefaults({callback:OpenLayers.Function.bind(this.merge,this,layer.map.getProjectionObject()),filter:layer.filter},options));layer.events.un({"visibilitychanged":this.load,scope:this});},merge:function(mapProjection,resp){var layer=this.layer;layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){if(!mapProjection.equals(layer.projection)){var geom;for(var i=0,len=features.length;i<len;++i){geom=features[i].geometry;if(geom){geom.transform(layer.projection,mapProjection);}}} +layer.addFeatures(features);} +layer.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Strategy.Fixed"});OpenLayers.Layer.Markers=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:false,markers:null,drawn:false,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.markers=[];},destroy:function(){this.clearMarkers();this.markers=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;for(var i=0,len=this.markers.length;i<len;i++){this.markers[i].setOpacity(this.opacity);}}},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);if(zoomChanged||!this.drawn){for(var i=0,len=this.markers.length;i<len;i++){this.drawMarker(this.markers[i]);} +this.drawn=true;}},addMarker:function(marker){this.markers.push(marker);if(this.opacity<1){marker.setOpacity(this.opacity);} +if(this.map&&this.map.getExtent()){marker.map=this.map;this.drawMarker(marker);}},removeMarker:function(marker){if(this.markers&&this.markers.length){OpenLayers.Util.removeItem(this.markers,marker);marker.erase();}},clearMarkers:function(){if(this.markers!=null){while(this.markers.length>0){this.removeMarker(this.markers[0]);}}},drawMarker:function(marker){var px=this.map.getLayerPxFromLonLat(marker.lonlat);if(px==null){marker.display(false);}else{if(!marker.isDrawn()){var markerImg=marker.draw(px);this.div.appendChild(markerImg);}else if(marker.icon){marker.icon.moveTo(px);}}},getDataExtent:function(){var maxExtent=null;if(this.markers&&(this.markers.length>0)){var maxExtent=new OpenLayers.Bounds();for(var i=0,len=this.markers.length;i<len;i++){var marker=this.markers[i];maxExtent.extend(marker.lonlat);}} +return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Markers"});OpenLayers.Control.Zoom=OpenLayers.Class(OpenLayers.Control,{zoomInText:"+",zoomInId:"olZoomInLink",zoomOutText:"-",zoomOutId:"olZoomOutLink",draw:function(){var div=OpenLayers.Control.prototype.draw.apply(this),links=this.getOrCreateLinks(div),zoomIn=links.zoomIn,zoomOut=links.zoomOut,eventsInstance=this.map.events;if(zoomOut.parentNode!==div){eventsInstance=this.events;eventsInstance.attachToElement(zoomOut.parentNode);} +eventsInstance.register("buttonclick",this,this.onZoomClick);this.zoomInLink=zoomIn;this.zoomOutLink=zoomOut;return div;},getOrCreateLinks:function(el){var zoomIn=document.getElementById(this.zoomInId),zoomOut=document.getElementById(this.zoomOutId);if(!zoomIn){zoomIn=document.createElement("a");zoomIn.href="#zoomIn";zoomIn.appendChild(document.createTextNode(this.zoomInText));zoomIn.className="olControlZoomIn";el.appendChild(zoomIn);} +OpenLayers.Element.addClass(zoomIn,"olButton");if(!zoomOut){zoomOut=document.createElement("a");zoomOut.href="#zoomOut";zoomOut.appendChild(document.createTextNode(this.zoomOutText));zoomOut.className="olControlZoomOut";el.appendChild(zoomOut);} +OpenLayers.Element.addClass(zoomOut,"olButton");return{zoomIn:zoomIn,zoomOut:zoomOut};},onZoomClick:function(evt){var button=evt.buttonElement;if(button===this.zoomInLink){this.map.zoomIn();}else if(button===this.zoomOutLink){this.map.zoomOut();}},destroy:function(){if(this.map){this.map.events.unregister("buttonclick",this,this.onZoomClick);} +delete this.zoomInLink;delete this.zoomOutLink;OpenLayers.Control.prototype.destroy.apply(this);},CLASS_NAME:"OpenLayers.Control.Zoom"});OpenLayers.Lang.it={'unhandledRequest':"Codice di ritorno della richiesta ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Livello base",'noFID':"Impossibile aggiornare un elemento grafico che non abbia il FID.",'browserNotSupported':"Il tuo browser non supporta il rendering vettoriale. I renderizzatore attualemnte supportati sono:\n${renderers}",'minZoomLevelError':"La proprietà minZoomLevel è da utilizzare solamente "+"con livelli che abbiano FixedZoomLevels. Il fatto che "+"questo livello wfs controlli la proprietà minZoomLevel è "+"un retaggio del passato. Non possiamo comunque rimuoverla "+"senza rompere le vecchie applicazioni che dipendono su di essa."+"Quindi siamo costretti a deprecarla -- minZoomLevel "+"e sarà rimossa dalla vesione 3.0. Si prega di utilizzare i "+"settaggi di risoluzione min/max come descritto qui: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transazione WFS: SUCCESS ${response}",'commitFailed':"Transazione WFS: FAILED ${response}",'googleWarning':"Il livello Google non è riuscito a caricare correttamente.<br><br>"+"Per evitare questo messaggio, seleziona un nuovo BaseLayer "+"nel selettore di livelli nell'angolo in alto a destra.<br><br>"+"Più precisamente, ciò accade perchè la libreria Google Maps "+"non è stata inclusa nella pagina, oppure non contiene la "+"corretta API key per il tuo sito.<br><br>"+"Sviluppatori: Per aiuto su come farlo funzionare correttamente, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>clicca qui</a>",'getLayerWarning':"Il livello ${layerType} non è riuscito a caricare correttamente.<br><br>"+"Per evitare questo messaggio, seleziona un nuovo BaseLayer "+"nel selettore di livelli nell'angolo in alto a destra.<br><br>"+"Più precisamente, ciò accade perchè la libreria ${layerLib} "+"non è stata inclusa nella pagina.<br><br>"+"Sviluppatori: Per aiuto su come farlo funzionare correttamente, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>clicca qui</a>",'Scale = 1 : ${scaleDenom}':"Scala = 1 : ${scaleDenom}",'reprojectDeprecated':"Stai utilizzando l'opzione 'reproject' sul livello ${layerName}. "+"Questa opzione è deprecata: il suo utilizzo è stato introdotto per"+"supportare il disegno dei dati sopra mappe commerciali, ma tale "+"funzionalità dovrebbe essere ottenuta tramite l'utilizzo della proiezione "+"Spherical Mercator. Per maggiori informazioni consultare qui "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Questo metodo è stato deprecato e sarà rimosso dalla versione 3.0. "+"Si prega di utilizzare il metodo ${newMethod} in alternativa.",'end':''};OpenLayers.Lang["oc"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Requèsta pas gerida, retorna ${statusText}",'Permalink':"Permaligam",'Overlays':"Calques",'Base Layer':"Calc de basa",'noFID':"Impossible de metre a jorn un objècte sens identificant (fid).",'browserNotSupported':"Vòstre navegidor supòrta pas lo rendut vectorial. Los renderers actualament suportats son : \n${renderers}",'minZoomLevelError':"La proprietat minZoomLevel deu èsser utilizada solament per de jaces FixedZoomLevels-descendent. Lo fach qu\'aqueste jaç WFS verifique la preséncia de minZoomLevel es una relica del passat. Çaquelà, la podèm suprimir sens copar d\'aplicacions que ne poirián dependre. Es per aquò que la depreciam -- la verificacion del minZoomLevel serà suprimida en version 3.0. A la plaça, mercés d\'utilizar los paramètres de resolucions min/max tal coma descrich sus : http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transaccion WFS : SUCCES ${response}",'commitFailed':"Transaccion WFS : FRACAS ${response}",'googleWarning':"Lo jaç Google es pas estat en mesura de se cargar corrèctament.\x3cbr\x3e\x3cbr\x3ePer suprimir aqueste messatge, causissètz una BaseLayer novèla dins lo selector de jaç en naut a drecha.\x3cbr\x3e\x3cbr\x3eAquò es possiblament causat par la non-inclusion de la librariá Google Maps, o alara perque que la clau de l\'API correspond pas a vòstre site.\x3cbr\x3e\x3cbr\x3eDesvolopaires : per saber cossí corregir aquò, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclicatz aicí\x3c/a\x3e",'getLayerWarning':"Lo jaç ${layerType} es pas en mesura de se cargar corrèctament.\x3cbr\x3e\x3cbr\x3ePer suprimir aqueste messatge, causissètz una BaseLayer novèla dins lo selector de jaç en naut a drecha.\x3cbr\x3e\x3cbr\x3eAquò es possiblament causat per la non-inclusion de la librariá ${layerLib}.\x3cbr\x3e\x3cbr\x3eDesvolopaires : per saber cossí corregir aquí, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclicatz aicí\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Escala ~ 1 : ${scaleDenom}",'W':"O",'E':"È",'N':"N",'S':"S",'reprojectDeprecated':"Utilizatz l\'opcion \'reproject\' sul jaç ${layerName}. Aquesta opcion es despreciada : Son usatge permetiá d\'afichar de donadas al dessús de jaces raster comercials. Aquesta foncionalitat ara es suportada en utilizant lo supòrt de la projeccion Mercator Esferica. Mai d\'informacion es disponibla sus http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Aqueste metòde es despreciada, e serà suprimida a la version 3.0. Mercés d\'utilizar ${newMethod} a la plaça."});OpenLayers.Lang["gsw"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nit behandleti Aafrogsruckmäldig ${statusText}",'Permalink':"Permalink",'Overlays':"Iberlagerige",'Base Layer':"Grundcharte",'noFID':"E Feature, wu s kei FID derfir git, cha nit aktualisiert wäre.",'browserNotSupported':"Dyy Browser unterstitzt kei Vektordarstellig. Aktuäll unterstitzti Renderer:\n${renderers}",'minZoomLevelError':"D minZoomLevel-Eigeschaft isch nume dänk fir d Layer, wu vu dr FixedZoomLevels abstamme. Ass dää wfs-Layer minZoomLevel prieft, scih e Relikt us dr Vergangeheit. Mir chenne s aber nit ändere ohni OL_basierti Aawändige villicht kaputt gehn, wu dervu abhänge. Us däm Grund het die Funktion d Eigeschaft \'deprecated\' iberchuu. D minZoomLevel-Priefig unte wird in dr Version 3.0 usegnuu. Bitte verwänd statt däm e min/max-Uflesig wie s do bschriben isch: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-Transaktion: ERFOLGRYCH ${response}",'commitFailed':"WFS-Transaktion: FÄHLGSCHLAA ${response}",'googleWarning':"Dr Google-Layer het nit korräkt chenne glade wäre.\x3cbr\x3e\x3cbr\x3eGo die Mäldig nimi z kriege, wehl e andere Hintergrundlayer us em LayerSwitcher im rächte obere Ecke.\x3cbr\x3e\x3cbr\x3eDää Fähler git s seli hyfig, wel s Skript vu dr Google-Maps-Bibliothek nit yybunde woren isch oder wel s kei giltige API-Schlissel fir Dyy URL din het.\x3cbr\x3e\x3cbr\x3eEntwickler: Fir Hilf zum korräkte Yybinde vum Google-Layer \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3edoo drucke\x3c/a\x3e",'getLayerWarning':"Dr ${layerType}-Layer het nit korräkt chenne glade wäre.\x3cbr\x3e\x3cbr\x3eGo die Mäldig nimi z kriege, wehl e andere Hintergrundlayer us em LayerSwitcher im rächte obere Ecke.\x3cbr\x3e\x3cbr\x3eDää Fähler git s seli hyfig, wel s Skript vu dr \'${layerLib}\'-Bibliothek nit yybunde woren isch oder wel s kei giltige API-Schlissel fir Dyy URL din het.\x3cbr\x3e\x3cbr\x3eEntwickler: Fir Hilf zum korräkte Yybinde vu Layer \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3edoo drucke\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Maßstab = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"S",'reprojectDeprecated':"Du bruchsch d \'reproject\'-Option bim ${layerName}-Layer. Die Option isch nimi giltig: si isch aagleit wore go Date iber kommerziälli Grundcharte lege, aber des sott mer jetz mache mit dr Unterstitzig vu Spherical Mercator. Meh Informatione git s uf http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Die Methode isch veraltet un wird us dr Version 3.0 usegnuu. Bitte verwäbnd statt däm ${newMethod}."});OpenLayers.Geometry.MultiPolygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Polygon"],CLASS_NAME:"OpenLayers.Geometry.MultiPolygon"});OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:false,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:false,propertyStyles:null,initialize:function(style,options){OpenLayers.Util.extend(this,options);this.rules=[];if(options&&options.rules){this.addRules(options.rules);} this.setDefaultStyle(style||OpenLayers.Feature.Vector.style["default"]);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i=0,len=this.rules.length;i<len;i++){this.rules[i].destroy();this.rules[i]=null;} this.rules=null;this.defaultStyle=null;},createSymbolizer:function(feature){var style=this.defaultsPerSymbolizer?{}:this.createLiterals(OpenLayers.Util.extend({},this.defaultStyle),feature);var rules=this.rules;var rule,context;var elseRules=[];var appliedRules=false;for(var i=0,len=rules.length;i<len;i++){rule=rules[i];var applies=rule.evaluate(feature);if(applies){if(rule instanceof OpenLayers.Rule&&rule.elseFilter){elseRules.push(rule);}else{appliedRules=true;this.applySymbolizer(rule,style,feature);}}} if(appliedRules==false&&elseRules.length>0){appliedRules=true;for(var i=0,len=elseRules.length;i<len;i++){this.applySymbolizer(elseRules[i],style,feature);}} if(rules.length>0&&appliedRules==false){style.display="none";} -if(style.label&&typeof style.label!=="string"){style.label=String(style.label);} +if(style.label!=null&&typeof style.label!=="string"){style.label=String(style.label);} return style;},applySymbolizer:function(rule,style,feature){var symbolizerPrefix=feature.geometry?this.getSymbolizerPrefix(feature.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];var symbolizer=rule.symbolizer[symbolizerPrefix]||rule.symbolizer;if(this.defaultsPerSymbolizer===true){var defaults=this.defaultStyle;OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:defaults.pointRadius});if(symbolizer.stroke===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{strokeWidth:defaults.strokeWidth,strokeColor:defaults.strokeColor,strokeOpacity:defaults.strokeOpacity,strokeDashstyle:defaults.strokeDashstyle,strokeLinecap:defaults.strokeLinecap});} if(symbolizer.fill===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{fillColor:defaults.fillColor,fillOpacity:defaults.fillOpacity});} if(symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset});}} @@ -936,22 +954,24 @@ return style;},findPropertyStyles:function(){var propertyStyles={};var style=thi return propertyStyles;},addPropertyStyles:function(propertyStyles,symbolizer){var property;for(var key in symbolizer){property=symbolizer[key];if(typeof property=="string"&&property.match(/\$\{\w+\}/)){propertyStyles[key]=true;}} return propertyStyles;},addRules:function(rules){Array.prototype.push.apply(this.rules,rules);this.propertyStyles=this.findPropertyStyles();},setDefaultStyle:function(style){this.defaultStyle=style;this.propertyStyles=this.findPropertyStyles();},getSymbolizerPrefix:function(geometry){var prefixes=OpenLayers.Style.SYMBOLIZER_PREFIXES;for(var i=0,len=prefixes.length;i<len;i++){if(geometry.CLASS_NAME.indexOf(prefixes[i])!=-1){return prefixes[i];}}},clone:function(){var options=OpenLayers.Util.extend({},this);if(this.rules){options.rules=[];for(var i=0,len=this.rules.length;i<len;++i){options.rules.push(this.rules[i].clone());}} options.context=this.context&&OpenLayers.Util.extend({},this.context);var defaultStyle=OpenLayers.Util.extend({},this.defaultStyle);return new OpenLayers.Style(defaultStyle,options);},CLASS_NAME:"OpenLayers.Style"});OpenLayers.Style.createLiteral=function(value,context,feature,property){if(typeof value=="string"&&value.indexOf("${")!=-1){value=OpenLayers.String.format(value,context,[feature,property]);value=(isNaN(value)||!value)?value:parseFloat(value);} -return value;};OpenLayers.Style.SYMBOLIZER_PREFIXES=['Point','Line','Polygon','Text','Raster'];OpenLayers.Filter=OpenLayers.Class({initialize:function(options){OpenLayers.Util.extend(this,options);},destroy:function(){},evaluate:function(context){return true;},clone:function(){return null;},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);},evaluate:function(feature){var intersect=false;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(feature.geometry){var geom=this.value;if(this.value.CLASS_NAME=="OpenLayers.Bounds"){geom=this.value.toGeometry();} +return value;};OpenLayers.Style.SYMBOLIZER_PREFIXES=['Point','Line','Polygon','Text','Raster'];OpenLayers.Filter=OpenLayers.Class({initialize:function(options){OpenLayers.Util.extend(this,options);},destroy:function(){},evaluate:function(context){return true;},clone:function(){return null;},toString:function(){var string;if(OpenLayers.Format&&OpenLayers.Format.CQL){string=OpenLayers.Format.CQL.prototype.write(this);}else{string=Object.prototype.toString.call(this);} +return string;},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,evaluate:function(feature){var intersect=false;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(feature.geometry){var geom=this.value;if(this.value.CLASS_NAME=="OpenLayers.Bounds"){geom=this.value.toGeometry();} if(feature.geometry.intersects(geom)){intersect=true;}} -break;default:OpenLayers.Console.error(OpenLayers.i18n("filterEvaluateNotImplemented"));break;} -return intersect;},clone:function(){var options=OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(options);},CLASS_NAME:"OpenLayers.Filter.Spatial"});OpenLayers.Filter.Spatial.BBOX="BBOX";OpenLayers.Filter.Spatial.INTERSECTS="INTERSECTS";OpenLayers.Filter.Spatial.DWITHIN="DWITHIN";OpenLayers.Filter.Spatial.WITHIN="WITHIN";OpenLayers.Filter.Spatial.CONTAINS="CONTAINS";OpenLayers.Strategy.BBOX=OpenLayers.Class(OpenLayers.Strategy,{bounds:null,resolution:null,ratio:2,resFactor:null,response:null,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){this.layer.events.on({"moveend":this.update,scope:this});this.layer.events.on({"refresh":this.update,scope:this});if(this.layer.visibility===true&&this.layer.inRange===true){this.update();}else{this.layer.events.on({"visibilitychanged":this.update,scope:this});}} +break;default:throw new Error('evaluate is not implemented for this filter type.');} +return intersect;},clone:function(){var options=OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(options);},CLASS_NAME:"OpenLayers.Filter.Spatial"});OpenLayers.Filter.Spatial.BBOX="BBOX";OpenLayers.Filter.Spatial.INTERSECTS="INTERSECTS";OpenLayers.Filter.Spatial.DWITHIN="DWITHIN";OpenLayers.Filter.Spatial.WITHIN="WITHIN";OpenLayers.Filter.Spatial.CONTAINS="CONTAINS";OpenLayers.Strategy.BBOX=OpenLayers.Class(OpenLayers.Strategy,{bounds:null,resolution:null,ratio:2,resFactor:null,response:null,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){this.layer.events.on({"moveend":this.update,"refresh":this.update,"visibilitychanged":this.update,scope:this});this.update();} return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"moveend":this.update,"refresh":this.update,"visibilitychanged":this.update,scope:this});} -return deactivated;},update:function(options){var mapBounds=this.getMapBounds();if(mapBounds!==null&&((options&&options.force)||this.invalidBounds(mapBounds))){this.calculateBounds(mapBounds);this.resolution=this.layer.map.getResolution();this.triggerRead(options);}},getMapBounds:function(){if(this.layer.map===null){return null;} +return deactivated;},update:function(options){var mapBounds=this.getMapBounds();if(mapBounds!==null&&((options&&options.force)||(this.layer.visibility&&this.layer.calculateInRange()&&this.invalidBounds(mapBounds)))){this.calculateBounds(mapBounds);this.resolution=this.layer.map.getResolution();this.triggerRead(options);}},getMapBounds:function(){if(this.layer.map===null){return null;} var bounds=this.layer.map.getExtent();if(bounds&&!this.layer.projection.equals(this.layer.map.getProjectionObject())){bounds=bounds.clone().transform(this.layer.map.getProjectionObject(),this.layer.projection);} return bounds;},invalidBounds:function(mapBounds){if(!mapBounds){mapBounds=this.getMapBounds();} var invalid=!this.bounds||!this.bounds.containsBounds(mapBounds);if(!invalid&&this.resFactor){var ratio=this.resolution/this.layer.map.getResolution();invalid=(ratio>=this.resFactor||ratio<=(1/this.resFactor));} return invalid;},calculateBounds:function(mapBounds){if(!mapBounds){mapBounds=this.getMapBounds();} -var center=mapBounds.getCenterLonLat();var dataWidth=mapBounds.getWidth()*this.ratio;var dataHeight=mapBounds.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(center.lon-(dataWidth/2),center.lat-(dataHeight/2),center.lon+(dataWidth/2),center.lat+(dataHeight/2));},triggerRead:function(options){if(this.response){this.layer.protocol.abort(this.response);this.layer.events.triggerEvent("loadend");} +var center=mapBounds.getCenterLonLat();var dataWidth=mapBounds.getWidth()*this.ratio;var dataHeight=mapBounds.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(center.lon-(dataWidth/2),center.lat-(dataHeight/2),center.lon+(dataWidth/2),center.lat+(dataHeight/2));},triggerRead:function(options){if(this.response&&!(options&&options.noAbort===true)){this.layer.protocol.abort(this.response);this.layer.events.triggerEvent("loadend");} this.layer.events.triggerEvent("loadstart");this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:this.createFilter(),callback:this.merge,scope:this},options));},createFilter:function(){var filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});if(this.layer.filter){filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.layer.filter,filter]});} return filter;},merge:function(resp){this.layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){var remote=this.layer.projection;var local=this.layer.map.getProjectionObject();if(!local.equals(remote)){var geom;for(var i=0,len=features.length;i<len;++i){geom=features[i].geometry;if(geom){geom.transform(remote,local);}}} this.layer.addFeatures(features);} this.response=null;this.layer.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Strategy.BBOX"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{'click':{'in':'click','out':'clickout'},'mousemove':{'in':'over','out':'out'},'dblclick':{'in':'dblclick','out':null},'mousedown':{'in':null,'out':null},'mouseup':{'in':null,'out':null},'touchstart':{'in':'click','out':'clickout'}},feature:null,lastFeature:null,down:null,up:null,touch:false,clickTolerance:4,geometryTypes:null,stopClick:true,stopDown:true,stopUp:false,initialize:function(control,layer,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,[control,callbacks,options]);this.layer=layer;},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,dblclick:this.dblclick,scope:this});} -return OpenLayers.Event.isMultiTouch(evt)?true:this.mousedown(evt);},touchmove:function(evt){OpenLayers.Event.stop(evt);},mousedown:function(evt){this.down=evt.xy;return this.handle(evt)?!this.stopDown:true;},mouseup:function(evt){this.up=evt.xy;return this.handle(evt)?!this.stopUp:true;},click:function(evt){return this.handle(evt)?!this.stopClick:true;},mousemove:function(evt){if(!this.callbacks['over']&&!this.callbacks['out']){return true;} +return OpenLayers.Event.isMultiTouch(evt)?true:this.mousedown(evt);},touchmove:function(evt){OpenLayers.Event.stop(evt);},mousedown:function(evt){if(OpenLayers.Event.isLeftClick(evt)||OpenLayers.Event.isSingleTouch(evt)){this.down=evt.xy;} +return this.handle(evt)?!this.stopDown:true;},mouseup:function(evt){this.up=evt.xy;return this.handle(evt)?!this.stopUp:true;},click:function(evt){return this.handle(evt)?!this.stopClick:true;},mousemove:function(evt){if(!this.callbacks['over']&&!this.callbacks['out']){return true;} this.handle(evt);return true;},dblclick:function(evt){return!this.handle(evt);},geometryTypeMatches:function(feature){return this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1;},handle:function(evt){if(this.feature&&!this.feature.layer){this.feature=null;} var type=evt.type;var handled=false;var previouslyIn=!!(this.feature);var click=(type=="click"||type=="dblclick"||type=="touchstart");this.feature=this.layer.getFeatureFromEvent(evt);if(this.feature&&!this.feature.layer){this.feature=null;} if(this.lastFeature&&!this.lastFeature.layer){this.lastFeature=null;} @@ -969,7 +989,7 @@ this.styles=null;},createSymbolizer:function(feature,intent){if(!feature){featur if(!this.styles[intent]){intent="default";} feature.renderIntent=intent;var defaultSymbolizer={};if(this.extendDefault&&intent!="default"){defaultSymbolizer=this.styles["default"].createSymbolizer(feature);} return OpenLayers.Util.extend(defaultSymbolizer,this.styles[intent].createSymbolizer(feature));},addUniqueValueRules:function(renderIntent,property,symbolizers,context){var rules=[];for(var value in symbolizers){rules.push(new OpenLayers.Rule({symbolizer:symbolizers[value],context:context,filter:new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,property:property,value:value})}));} -this.styles[renderIntent].addRules(rules);},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{EVENT_TYPES:["beforefeatureadded","beforefeaturesadded","featureadded","featuresadded","beforefeatureremoved","beforefeaturesremoved","featureremoved","featuresremoved","beforefeatureselected","featureselected","featureunselected","beforefeaturemodified","featuremodified","afterfeaturemodified","vertexmodified","vertexremoved","sketchstarted","sketchmodified","sketchcomplete","refresh"],isBaseLayer:false,isFixed:false,features:null,filter:null,selectedFeatures:null,unrenderedFeatures:null,reportError:true,style:null,styleMap:null,strategies:null,protocol:null,renderers:['SVG','VML','Canvas'],renderer:null,rendererOptions:null,geometryType:null,drawn:false,initialize:function(name,options){this.EVENT_TYPES=OpenLayers.Layer.Vector.prototype.EVENT_TYPES.concat(OpenLayers.Layer.prototype.EVENT_TYPES);OpenLayers.Layer.prototype.initialize.apply(this,arguments);if(!this.renderer||!this.renderer.supported()){this.assignRenderer();} +this.styles[renderIntent].addRules(rules);},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:false,isFixed:false,features:null,filter:null,selectedFeatures:null,unrenderedFeatures:null,reportError:true,style:null,styleMap:null,strategies:null,protocol:null,renderers:['SVG','VML','Canvas'],renderer:null,rendererOptions:null,geometryType:null,drawn:false,ratio:1,initialize:function(name,options){OpenLayers.Layer.prototype.initialize.apply(this,arguments);if(!this.renderer||!this.renderer.supported()){this.assignRenderer();} if(!this.renderer||!this.renderer.supported()){this.renderer=null;this.displayError();} if(!this.styleMap){this.styleMap=new OpenLayers.StyleMap();} this.features=[];this.selectedFeatures=[];this.unrenderedFeatures={};if(this.strategies){for(var i=0,len=this.strategies.length;i<len;i++){this.strategies[i].setLayer(this);}}},destroy:function(){if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoDestroy){strategy.destroy();}} @@ -979,14 +999,14 @@ this.protocol=null;} this.destroyFeatures();this.features=null;this.selectedFeatures=null;this.unrenderedFeatures=null;if(this.renderer){this.renderer.destroy();} this.renderer=null;this.geometryType=null;this.drawn=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Vector(this.name,this.getOptions());} obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);var features=this.features;var len=features.length;var clonedFeatures=new Array(len);for(var i=0;i<len;++i){clonedFeatures[i]=features[i].clone();} -obj.features=clonedFeatures;return obj;},refresh:function(obj){if(this.calculateInRange()&&this.visibility){this.events.triggerEvent("refresh",obj);}},assignRenderer:function(){for(var i=0,len=this.renderers.length;i<len;i++){var rendererClass=this.renderers[i];var renderer=(typeof rendererClass=="function")?rendererClass:OpenLayers.Renderer[rendererClass];if(renderer&&renderer.prototype.supported()){this.renderer=new renderer(this.div,this.rendererOptions);break;}}},displayError:function(){if(this.reportError){OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported",{'renderers':this.renderers.join("\n")}));}},setMap:function(map){OpenLayers.Layer.prototype.setMap.apply(this,arguments);if(!this.renderer){this.map.removeLayer(this);}else{this.renderer.map=this.map;this.renderer.setSize(this.map.getSize());}},afterAdd:function(){if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.activate();}}}},removeMap:function(map){this.drawn=false;if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.deactivate();}}}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this,arguments);this.renderer.setSize(this.map.getSize());},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var ng=(OpenLayers.Renderer.NG&&this.renderer instanceof OpenLayers.Renderer.NG);if(ng){dragging||this.renderer.updateDimensions(zoomChanged);}else{var coordSysUnchanged=true;if(!dragging){this.renderer.root.style.visibility="hidden";this.div.style.left=-parseInt(this.map.layerContainerDiv.style.left)+"px";this.div.style.top=-parseInt(this.map.layerContainerDiv.style.top)+"px";var extent=this.map.getExtent();coordSysUnchanged=this.renderer.setExtent(extent,zoomChanged);this.renderer.root.style.visibility="visible";if(OpenLayers.IS_GECKO===true){this.div.scrollLeft=this.div.scrollLeft;} -if(!zoomChanged&&coordSysUnchanged){for(var i in this.unrenderedFeatures){var feature=this.unrenderedFeatures[i];this.drawFeature(feature);}}}} -if(!this.drawn||(!ng&&(zoomChanged||!coordSysUnchanged))){this.drawn=true;var feature;for(var i=0,len=this.features.length;i<len;i++){this.renderer.locked=(i!==(len-1));feature=this.features[i];this.drawFeature(feature);}}},redraw:function(){if(OpenLayers.Renderer.NG&&this.renderer instanceof OpenLayers.Renderer.NG){this.drawn=false;} -return OpenLayers.Layer.prototype.redraw.apply(this,arguments);},display:function(display){OpenLayers.Layer.prototype.display.apply(this,arguments);var currentDisplay=this.div.style.display;if(currentDisplay!=this.renderer.root.style.display){this.renderer.root.style.display=currentDisplay;}},addFeatures:function(features,options){if(!(OpenLayers.Util.isArray(features))){features=[features];} +obj.features=clonedFeatures;return obj;},refresh:function(obj){if(this.calculateInRange()&&this.visibility){this.events.triggerEvent("refresh",obj);}},assignRenderer:function(){for(var i=0,len=this.renderers.length;i<len;i++){var rendererClass=this.renderers[i];var renderer=(typeof rendererClass=="function")?rendererClass:OpenLayers.Renderer[rendererClass];if(renderer&&renderer.prototype.supported()){this.renderer=new renderer(this.div,this.rendererOptions);break;}}},displayError:function(){if(this.reportError){OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported",{renderers:this.renderers.join('\n')}));}},setMap:function(map){OpenLayers.Layer.prototype.setMap.apply(this,arguments);if(!this.renderer){this.map.removeLayer(this);}else{this.renderer.map=this.map;var newSize=this.map.getSize();newSize.w=newSize.w*this.ratio;newSize.h=newSize.h*this.ratio;this.renderer.setSize(newSize);}},afterAdd:function(){if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.activate();}}}},removeMap:function(map){this.drawn=false;if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.deactivate();}}}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this,arguments);var newSize=this.map.getSize();newSize.w=newSize.w*this.ratio;newSize.h=newSize.h*this.ratio;this.renderer.setSize(newSize);},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var coordSysUnchanged=true;if(!dragging){this.renderer.root.style.visibility='hidden';var viewSize=this.map.getSize(),viewWidth=viewSize.w,viewHeight=viewSize.h,offsetLeft=(viewWidth/2*this.ratio)-viewWidth/2,offsetTop=(viewHeight/2*this.ratio)-viewHeight/2;offsetLeft+=parseInt(this.map.layerContainerDiv.style.left,10);offsetLeft=-Math.round(offsetLeft);offsetTop+=parseInt(this.map.layerContainerDiv.style.top,10);offsetTop=-Math.round(offsetTop);this.div.style.left=offsetLeft+'px';this.div.style.top=offsetTop+'px';var extent=this.map.getExtent().scale(this.ratio);coordSysUnchanged=this.renderer.setExtent(extent,zoomChanged);this.renderer.root.style.visibility='visible';if(OpenLayers.IS_GECKO===true){this.div.scrollLeft=this.div.scrollLeft;} +if(!zoomChanged&&coordSysUnchanged){for(var i in this.unrenderedFeatures){var feature=this.unrenderedFeatures[i];this.drawFeature(feature);}}} +if(!this.drawn||zoomChanged||!coordSysUnchanged){this.drawn=true;var feature;for(var i=0,len=this.features.length;i<len;i++){this.renderer.locked=(i!==(len-1));feature=this.features[i];this.drawFeature(feature);}}},display:function(display){OpenLayers.Layer.prototype.display.apply(this,arguments);var currentDisplay=this.div.style.display;if(currentDisplay!=this.renderer.root.style.display){this.renderer.root.style.display=currentDisplay;}},addFeatures:function(features,options){if(!(OpenLayers.Util.isArray(features))){features=[features];} var notify=!options||!options.silent;if(notify){var event={features:features};var ret=this.events.triggerEvent("beforefeaturesadded",event);if(ret===false){return;} features=event.features;} var featuresAdded=[];for(var i=0,len=features.length;i<len;i++){if(i!=(features.length-1)){this.renderer.locked=true;}else{this.renderer.locked=false;} -var feature=features[i];if(this.geometryType&&!(feature.geometry instanceof this.geometryType)){var throwStr=OpenLayers.i18n('componentShouldBe',{'geomType':this.geometryType.prototype.CLASS_NAME});throw throwStr;} +var feature=features[i];if(this.geometryType&&!(feature.geometry instanceof this.geometryType)){throw new TypeError('addFeatures: component should be an '+ +this.geometryType.prototype.CLASS_NAME);} feature.layer=this;if(!feature.style&&this.style){feature.style=OpenLayers.Util.extend({},this.style);} if(notify){if(this.events.triggerEvent("beforefeatureadded",{feature:feature})===false){continue;} this.preFeatureInsert(feature);} @@ -1008,13 +1028,13 @@ this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedF if(features){this.removeFeatures(features,options);for(var i=features.length-1;i>=0;i--){features[i].destroy();}}},drawFeature:function(feature,style){if(!this.drawn){return;} if(typeof style!="object"){if(!style&&feature.state===OpenLayers.State.DELETE){style="delete";} var renderIntent=style||feature.renderIntent;style=feature.style||this.style;if(!style){style=this.styleMap.createSymbolizer(feature,renderIntent);}} -var drawn=this.renderer.drawFeature(feature,style);if(drawn===false||drawn===null){this.unrenderedFeatures[feature.id]=feature;}else{delete this.unrenderedFeatures[feature.id];}},eraseFeatures:function(features){this.renderer.eraseFeatures(features);},getFeatureFromEvent:function(evt){if(!this.renderer){OpenLayers.Console.error(OpenLayers.i18n("getFeatureError"));return null;} +var drawn=this.renderer.drawFeature(feature,style);if(drawn===false||drawn===null){this.unrenderedFeatures[feature.id]=feature;}else{delete this.unrenderedFeatures[feature.id];}},eraseFeatures:function(features){this.renderer.eraseFeatures(features);},getFeatureFromEvent:function(evt){if(!this.renderer){throw new Error('getFeatureFromEvent called on layer with no '+'renderer. This usually means you destroyed a '+'layer, but not some handler which is associated '+'with it.');} var feature=null;var featureId=this.renderer.getFeatureIdFromEvent(evt);if(featureId){if(typeof featureId==="string"){feature=this.getFeatureById(featureId);}else{feature=featureId;}} return feature;},getFeatureBy:function(property,value){var feature=null;for(var i=0,len=this.features.length;i<len;++i){if(this.features[i][property]==value){feature=this.features[i];break;}} return feature;},getFeatureById:function(featureId){return this.getFeatureBy('id',featureId);},getFeatureByFid:function(featureFid){return this.getFeatureBy('fid',featureFid);},getFeaturesByAttribute:function(attrName,attrValue){var i,feature,len=this.features.length,foundFeatures=[];for(i=0;i<len;i++){feature=this.features[i];if(feature&&feature.attributes){if(feature.attributes[attrName]===attrValue){foundFeatures.push(feature);}}} return foundFeatures;},onFeatureInsert:function(feature){},preFeatureInsert:function(feature){},getDataExtent:function(){var maxExtent=null;var features=this.features;if(features&&(features.length>0)){var geometry=null;for(var i=0,len=features.length;i<len;i++){geometry=features[i].geometry;if(geometry){if(maxExtent===null){maxExtent=new OpenLayers.Bounds();} maxExtent.extend(geometry.getBounds());}}} -return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.Vector.RootContainer=OpenLayers.Class(OpenLayers.Layer.Vector,{displayInLayerSwitcher:false,layers:null,initialize:function(name,options){OpenLayers.Layer.Vector.prototype.initialize.apply(this,arguments);},display:function(){},getFeatureFromEvent:function(evt){var layers=this.layers;var feature;for(var i=0;i<layers.length;i++){feature=layers[i].getFeatureFromEvent(evt);if(feature){return feature;}}},setMap:function(map){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);this.collectRoots();map.events.register("changelayer",this,this.handleChangeLayer);},removeMap:function(map){map.events.unregister("changelayer",this,this.handleChangeLayer);this.resetRoots();OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments);},collectRoots:function(){var layer;for(var i=0;i<this.map.layers.length;++i){layer=this.map.layers[i];if(OpenLayers.Util.indexOf(this.layers,layer)!=-1){layer.renderer.moveRoot(this.renderer);}}},resetRoots:function(){var layer;for(var i=0;i<this.layers.length;++i){layer=this.layers[i];if(this.renderer&&layer.renderer.getRenderLayerId()==this.id){this.renderer.moveRoot(layer.renderer);}}},handleChangeLayer:function(evt){var layer=evt.layer;if(evt.property=="order"&&OpenLayers.Util.indexOf(this.layers,layer)!=-1){this.resetRoots();this.collectRoots();}},CLASS_NAME:"OpenLayers.Layer.Vector.RootContainer"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{EVENT_TYPES:["beforefeaturehighlighted","featurehighlighted","featureunhighlighted"],multipleKey:null,toggleKey:null,multiple:false,clickout:true,toggle:false,hover:false,highlightOnly:false,box:false,onBeforeSelect:function(){},onSelect:function(){},onUnselect:function(){},scope:null,geometryTypes:null,layer:null,layers:null,callbacks:null,selectStyle:null,renderIntent:"select",handlers:null,initialize:function(layers,options){this.EVENT_TYPES=OpenLayers.Control.SelectFeature.prototype.EVENT_TYPES.concat(OpenLayers.Control.prototype.EVENT_TYPES);OpenLayers.Control.prototype.initialize.apply(this,[options]);if(this.scope===null){this.scope=this;} +return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.Vector.RootContainer=OpenLayers.Class(OpenLayers.Layer.Vector,{displayInLayerSwitcher:false,layers:null,display:function(){},getFeatureFromEvent:function(evt){var layers=this.layers;var feature;for(var i=0;i<layers.length;i++){feature=layers[i].getFeatureFromEvent(evt);if(feature){return feature;}}},setMap:function(map){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);this.collectRoots();map.events.register("changelayer",this,this.handleChangeLayer);},removeMap:function(map){map.events.unregister("changelayer",this,this.handleChangeLayer);this.resetRoots();OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments);},collectRoots:function(){var layer;for(var i=0;i<this.map.layers.length;++i){layer=this.map.layers[i];if(OpenLayers.Util.indexOf(this.layers,layer)!=-1){layer.renderer.moveRoot(this.renderer);}}},resetRoots:function(){var layer;for(var i=0;i<this.layers.length;++i){layer=this.layers[i];if(this.renderer&&layer.renderer.getRenderLayerId()==this.id){this.renderer.moveRoot(layer.renderer);}}},handleChangeLayer:function(evt){var layer=evt.layer;if(evt.property=="order"&&OpenLayers.Util.indexOf(this.layers,layer)!=-1){this.resetRoots();this.collectRoots();}},CLASS_NAME:"OpenLayers.Layer.Vector.RootContainer"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{multipleKey:null,toggleKey:null,multiple:false,clickout:true,toggle:false,hover:false,highlightOnly:false,box:false,onBeforeSelect:function(){},onSelect:function(){},onUnselect:function(){},scope:null,geometryTypes:null,layer:null,layers:null,callbacks:null,selectStyle:null,renderIntent:"select",handlers:null,initialize:function(layers,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);if(this.scope===null){this.scope=this;} this.initLayer(layers);var callbacks={click:this.clickFeature,clickout:this.clickoutFeature};if(this.hover){callbacks.over=this.overFeature;callbacks.out=this.outFeature;} this.callbacks=OpenLayers.Util.extend(callbacks,this.callbacks);this.handlers={feature:new OpenLayers.Handler.Feature(this,this.layer,this.callbacks,{geometryTypes:this.geometryTypes})};if(this.box){this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},{boxDivClassName:"olHandlerBoxSelectFeature"});}},initLayer:function(layers){if(OpenLayers.Util.isArray(layers)){this.layers=layers;this.layer=new OpenLayers.Layer.Vector.RootContainer(this.id+"_container",{layers:layers});}else{this.layer=layers;}},destroy:function(){if(this.active&&this.layers){this.map.removeLayer(this.layer);} OpenLayers.Control.prototype.destroy.apply(this,arguments);if(this.layers){this.layer.destroy();}},activate:function(){if(!this.active){if(this.layers){this.map.addLayer(this.layer);} @@ -1024,68 +1044,19 @@ if(this.layers){this.map.removeLayer(this.layer);}} return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},unselectAll:function(options){var layers=this.layers||[this.layer];var layer,feature;for(var l=0;l<layers.length;++l){layer=layers[l];for(var i=layer.selectedFeatures.length-1;i>=0;--i){feature=layer.selectedFeatures[i];if(!options||options.except!=feature){this.unselect(feature);}}}},clickFeature:function(feature){if(!this.hover){var selected=(OpenLayers.Util.indexOf(feature.layer.selectedFeatures,feature)>-1);if(selected){if(this.toggleSelect()){this.unselect(feature);}else if(!this.multipleSelect()){this.unselectAll({except:feature});}}else{if(!this.multipleSelect()){this.unselectAll({except:feature});} this.select(feature);}}},multipleSelect:function(){return this.multiple||(this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]);},toggleSelect:function(){return this.toggle||(this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]);},clickoutFeature:function(feature){if(!this.hover&&this.clickout){this.unselectAll();}},overFeature:function(feature){var layer=feature.layer;if(this.hover){if(this.highlightOnly){this.highlight(feature);}else if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}},outFeature:function(feature){if(this.hover){if(this.highlightOnly){if(feature._lastHighlighter==this.id){if(feature._prevHighlighter&&feature._prevHighlighter!=this.id){delete feature._lastHighlighter;var control=this.map.getControl(feature._prevHighlighter);if(control){control.highlight(feature);}}else{this.unhighlight(feature);}}}else{this.unselect(feature);}}},highlight:function(feature){var layer=feature.layer;var cont=this.events.triggerEvent("beforefeaturehighlighted",{feature:feature});if(cont!==false){feature._prevHighlighter=feature._lastHighlighter;feature._lastHighlighter=this.id;var style=this.selectStyle||this.renderIntent;layer.drawFeature(feature,style);this.events.triggerEvent("featurehighlighted",{feature:feature});}},unhighlight:function(feature){var layer=feature.layer;if(feature._prevHighlighter==undefined){delete feature._lastHighlighter;}else if(feature._prevHighlighter==this.id){delete feature._prevHighlighter;}else{feature._lastHighlighter=feature._prevHighlighter;delete feature._prevHighlighter;} layer.drawFeature(feature,feature.style||feature.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:feature});},select:function(feature){var cont=this.onBeforeSelect.call(this.scope,feature);var layer=feature.layer;if(cont!==false){cont=layer.events.triggerEvent("beforefeatureselected",{feature:feature});if(cont!==false){layer.selectedFeatures.push(feature);this.highlight(feature);if(!this.handlers.feature.lastFeature){this.handlers.feature.lastFeature=layer.selectedFeatures[0];} -layer.events.triggerEvent("featureselected",{feature:feature});this.onSelect.call(this.scope,feature);}}},unselect:function(feature){var layer=feature.layer;this.unhighlight(feature);OpenLayers.Util.removeItem(layer.selectedFeatures,feature);layer.events.triggerEvent("featureunselected",{feature:feature});this.onUnselect.call(this.scope,feature);},selectBox:function(position){if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);if(!this.multipleSelect()){this.unselectAll();} -var prevMultiple=this.multiple;this.multiple=true;var layers=this.layers||[this.layer];var layer;for(var l=0;l<layers.length;++l){layer=layers[l];for(var i=0,len=layer.features.length;i<len;++i){var feature=layer.features[i];if(!feature.getVisibility()){continue;} +layer.events.triggerEvent("featureselected",{feature:feature});this.onSelect.call(this.scope,feature);}}},unselect:function(feature){var layer=feature.layer;this.unhighlight(feature);OpenLayers.Util.removeItem(layer.selectedFeatures,feature);layer.events.triggerEvent("featureunselected",{feature:feature});this.onUnselect.call(this.scope,feature);},selectBox:function(position){if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel({x:position.left,y:position.bottom});var maxXY=this.map.getLonLatFromPixel({x:position.right,y:position.top});var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);if(!this.multipleSelect()){this.unselectAll();} +var prevMultiple=this.multiple;this.multiple=true;var layers=this.layers||[this.layer];this.events.triggerEvent("boxselectionstart",{layers:layers});var layer;for(var l=0;l<layers.length;++l){layer=layers[l];for(var i=0,len=layer.features.length;i<len;++i){var feature=layer.features[i];if(!feature.getVisibility()){continue;} if(this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1){if(bounds.toGeometry().intersects(feature.geometry)){if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}}}} -this.multiple=prevMultiple;}},setMap:function(map){this.handlers.feature.setMap(map);if(this.box){this.handlers.box.setMap(map);} +this.multiple=prevMultiple;this.events.triggerEvent("boxselectionend",{layers:layers});}},setMap:function(map){this.handlers.feature.setMap(map);if(this.box){this.handlers.box.setMap(map);} OpenLayers.Control.prototype.setMap.apply(this,arguments);},setLayer:function(layers){var isActive=this.active;this.unselectAll();this.deactivate();if(this.layers){this.layer.destroy();this.layers=null;} -this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Request={DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:true,user:undefined,password:undefined,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this,null,["complete","success","failure"]),issue:function(config){var defaultConfig=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});config=OpenLayers.Util.applyDefaults(config,defaultConfig);var request=new OpenLayers.Request.XMLHttpRequest();var url=OpenLayers.Util.urlAppend(config.url,OpenLayers.Util.getParameterString(config.params||{}));var sameOrigin=!(url.indexOf("http")==0);var urlParts=!sameOrigin&&url.match(this.URL_SPLIT_REGEX);if(urlParts){var location=window.location;sameOrigin=urlParts[1]==location.protocol&&urlParts[3]==location.hostname;var uPort=urlParts[4],lPort=location.port;if(uPort!=80&&uPort!=""||lPort!="80"&&lPort!=""){sameOrigin=sameOrigin&&uPort==lPort;}} -if(!sameOrigin){if(config.proxy){if(typeof config.proxy=="function"){url=config.proxy(url);}else{url=config.proxy+encodeURIComponent(url);}}else{OpenLayers.Console.warn(OpenLayers.i18n("proxyNeeded"),{url:url});}} -request.open(config.method,url,config.async,config.user,config.password);for(var header in config.headers){request.setRequestHeader(header,config.headers[header]);} -var events=this.events;var self=this;request.onreadystatechange=function(){if(request.readyState==OpenLayers.Request.XMLHttpRequest.DONE){var proceed=events.triggerEvent("complete",{request:request,config:config,requestUrl:url});if(proceed!==false){self.runCallbacks({request:request,config:config,requestUrl:url});}}};if(config.async===false){request.send(config.data);}else{window.setTimeout(function(){if(request.readyState!==0){request.send(config.data);}},0);} -return request;},runCallbacks:function(options){var request=options.request;var config=options.config;var complete=(config.scope)?OpenLayers.Function.bind(config.callback,config.scope):config.callback;var success;if(config.success){success=(config.scope)?OpenLayers.Function.bind(config.success,config.scope):config.success;} -var failure;if(config.failure){failure=(config.scope)?OpenLayers.Function.bind(config.failure,config.scope):config.failure;} -if(OpenLayers.Util.createUrlObject(config.url).protocol=="file:"&&request.responseText){request.status=200;} -complete(request);if(!request.status||(request.status>=200&&request.status<300)){this.events.triggerEvent("success",options);if(success){success(request);}} -if(request.status&&(request.status<200||request.status>=300)){this.events.triggerEvent("failure",options);if(failure){failure(request);}}},GET:function(config){config=OpenLayers.Util.extend(config,{method:"GET"});return OpenLayers.Request.issue(config);},POST:function(config){config=OpenLayers.Util.extend(config,{method:"POST"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";} -return OpenLayers.Request.issue(config);},PUT:function(config){config=OpenLayers.Util.extend(config,{method:"PUT"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";} -return OpenLayers.Request.issue(config);},DELETE:function(config){config=OpenLayers.Util.extend(config,{method:"DELETE"});return OpenLayers.Request.issue(config);},HEAD:function(config){config=OpenLayers.Util.extend(config,{method:"HEAD"});return OpenLayers.Request.issue(config);},OPTIONS:function(config){config=OpenLayers.Util.extend(config,{method:"OPTIONS"});return OpenLayers.Request.issue(config);}};(function(){var oXMLHttpRequest=window.XMLHttpRequest;var bGecko=!!window.controllers,bIE=window.document.all&&!window.opera,bIE7=bIE&&window.navigator.userAgent.match(/MSIE 7.0/);function fXMLHttpRequest(){this._object=oXMLHttpRequest&&!bIE7?new oXMLHttpRequest:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[];};function cXMLHttpRequest(){return new fXMLHttpRequest;};cXMLHttpRequest.prototype=fXMLHttpRequest.prototype;if(bGecko&&oXMLHttpRequest.wrapped) -cXMLHttpRequest.wrapped=oXMLHttpRequest.wrapped;cXMLHttpRequest.UNSENT=0;cXMLHttpRequest.OPENED=1;cXMLHttpRequest.HEADERS_RECEIVED=2;cXMLHttpRequest.LOADING=3;cXMLHttpRequest.DONE=4;cXMLHttpRequest.prototype.readyState=cXMLHttpRequest.UNSENT;cXMLHttpRequest.prototype.responseText='';cXMLHttpRequest.prototype.responseXML=null;cXMLHttpRequest.prototype.status=0;cXMLHttpRequest.prototype.statusText='';cXMLHttpRequest.prototype.priority="NORMAL";cXMLHttpRequest.prototype.onreadystatechange=null;cXMLHttpRequest.onreadystatechange=null;cXMLHttpRequest.onopen=null;cXMLHttpRequest.onsend=null;cXMLHttpRequest.onabort=null;cXMLHttpRequest.prototype.open=function(sMethod,sUrl,bAsync,sUser,sPassword){delete this._headers;if(arguments.length<3) -bAsync=true;this._async=bAsync;var oRequest=this,nState=this.readyState,fOnUnload;if(bIE&&bAsync){fOnUnload=function(){if(nState!=cXMLHttpRequest.DONE){fCleanTransport(oRequest);oRequest.abort();}};window.attachEvent("onunload",fOnUnload);} -if(cXMLHttpRequest.onopen) -cXMLHttpRequest.onopen.apply(this,arguments);if(arguments.length>4) -this._object.open(sMethod,sUrl,bAsync,sUser,sPassword);else -if(arguments.length>3) -this._object.open(sMethod,sUrl,bAsync,sUser);else -this._object.open(sMethod,sUrl,bAsync);this.readyState=cXMLHttpRequest.OPENED;fReadyStateChange(this);this._object.onreadystatechange=function(){if(bGecko&&!bAsync) -return;oRequest.readyState=oRequest._object.readyState;fSynchronizeValues(oRequest);if(oRequest._aborted){oRequest.readyState=cXMLHttpRequest.UNSENT;return;} -if(oRequest.readyState==cXMLHttpRequest.DONE){delete oRequest._data;fCleanTransport(oRequest);if(bIE&&bAsync) -window.detachEvent("onunload",fOnUnload);} -if(nState!=oRequest.readyState) -fReadyStateChange(oRequest);nState=oRequest.readyState;}};function fXMLHttpRequest_send(oRequest){oRequest._object.send(oRequest._data);if(bGecko&&!oRequest._async){oRequest.readyState=cXMLHttpRequest.OPENED;fSynchronizeValues(oRequest);while(oRequest.readyState<cXMLHttpRequest.DONE){oRequest.readyState++;fReadyStateChange(oRequest);if(oRequest._aborted) -return;}}};cXMLHttpRequest.prototype.send=function(vData){if(cXMLHttpRequest.onsend) -cXMLHttpRequest.onsend.apply(this,arguments);if(!arguments.length) -vData=null;if(vData&&vData.nodeType){vData=window.XMLSerializer?new window.XMLSerializer().serializeToString(vData):vData.xml;if(!oRequest._headers["Content-Type"]) -oRequest._object.setRequestHeader("Content-Type","application/xml");} -this._data=vData;fXMLHttpRequest_send(this);};cXMLHttpRequest.prototype.abort=function(){if(cXMLHttpRequest.onabort) -cXMLHttpRequest.onabort.apply(this,arguments);if(this.readyState>cXMLHttpRequest.UNSENT) -this._aborted=true;this._object.abort();fCleanTransport(this);this.readyState=cXMLHttpRequest.UNSENT;delete this._data;};cXMLHttpRequest.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders();};cXMLHttpRequest.prototype.getResponseHeader=function(sName){return this._object.getResponseHeader(sName);};cXMLHttpRequest.prototype.setRequestHeader=function(sName,sValue){if(!this._headers) -this._headers={};this._headers[sName]=sValue;return this._object.setRequestHeader(sName,sValue);};cXMLHttpRequest.prototype.addEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) -if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture) -return;this._listeners.push([sName,fHandler,bUseCapture]);};cXMLHttpRequest.prototype.removeEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) -if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture) -break;if(oListener) -this._listeners.splice(nIndex,1);};cXMLHttpRequest.prototype.dispatchEvent=function(oEvent){var oEventPseudo={'type':oEvent.type,'target':this,'currentTarget':this,'eventPhase':2,'bubbles':oEvent.bubbles,'cancelable':oEvent.cancelable,'timeStamp':oEvent.timeStamp,'stopPropagation':function(){},'preventDefault':function(){},'initEvent':function(){}};if(oEventPseudo.type=="readystatechange"&&this.onreadystatechange) -(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[oEventPseudo]);for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) -if(oListener[0]==oEventPseudo.type&&!oListener[2]) -(oListener[1].handleEvent||oListener[1]).apply(this,[oEventPseudo]);};cXMLHttpRequest.prototype.toString=function(){return'['+"object"+' '+"XMLHttpRequest"+']';};cXMLHttpRequest.toString=function(){return'['+"XMLHttpRequest"+']';};function fReadyStateChange(oRequest){if(cXMLHttpRequest.onreadystatechange) -cXMLHttpRequest.onreadystatechange.apply(oRequest);oRequest.dispatchEvent({'type':"readystatechange",'bubbles':false,'cancelable':false,'timeStamp':new Date+0});};function fGetDocument(oRequest){var oDocument=oRequest.responseXML,sResponse=oRequest.responseText;if(bIE&&sResponse&&oDocument&&!oDocument.documentElement&&oRequest.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)){oDocument=new window.ActiveXObject("Microsoft.XMLDOM");oDocument.async=false;oDocument.validateOnParse=false;oDocument.loadXML(sResponse);} -if(oDocument) -if((bIE&&oDocument.parseError!=0)||!oDocument.documentElement||(oDocument.documentElement&&oDocument.documentElement.tagName=="parsererror")) -return null;return oDocument;};function fSynchronizeValues(oRequest){try{oRequest.responseText=oRequest._object.responseText;}catch(e){} -try{oRequest.responseXML=fGetDocument(oRequest._object);}catch(e){} -try{oRequest.status=oRequest._object.status;}catch(e){} -try{oRequest.statusText=oRequest._object.statusText;}catch(e){}};function fCleanTransport(oRequest){oRequest._object.onreadystatechange=new window.Function;};if(!window.Function.prototype.apply){window.Function.prototype.apply=function(oRequest,oArguments){if(!oArguments) -oArguments=[];oRequest.__func=this;oRequest.__func(oArguments[0],oArguments[1],oArguments[2],oArguments[3],oArguments[4]);delete oRequest.__func;};};OpenLayers.Request.XMLHttpRequest=cXMLHttpRequest;})();OpenLayers.Layer.GML=OpenLayers.Class(OpenLayers.Layer.Vector,{loaded:false,format:null,formatOptions:null,initialize:function(name,url,options){var newArguments=[];newArguments.push(name,options);OpenLayers.Layer.Vector.prototype.initialize.apply(this,newArguments);this.url=url;},setVisibility:function(visibility,noEvent){OpenLayers.Layer.Vector.prototype.setVisibility.apply(this,arguments);if(this.visibility&&!this.loaded){this.loadGML();}},moveTo:function(bounds,zoomChanged,minor){OpenLayers.Layer.Vector.prototype.moveTo.apply(this,arguments);if(this.visibility&&!this.loaded){this.loadGML();}},loadGML:function(){if(!this.loaded){this.events.triggerEvent("loadstart");OpenLayers.Request.GET({url:this.url,success:this.requestSuccess,failure:this.requestFailure,scope:this});this.loaded=true;}},setUrl:function(url){this.url=url;this.destroyFeatures();this.loaded=false;this.loadGML();},requestSuccess:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;} -var options={};OpenLayers.Util.extend(options,this.formatOptions);if(this.map&&!this.projection.equals(this.map.getProjectionObject())){options.externalProjection=this.projection;options.internalProjection=this.map.getProjectionObject();} -var gml=this.format?new this.format(options):new OpenLayers.Format.GML(options);this.addFeatures(gml.read(doc));this.events.triggerEvent("loadend");},requestFailure:function(request){OpenLayers.Console.userError(OpenLayers.i18n("errorLoadingGML",{'url':this.url}));this.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Layer.GML"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",destroy:function(){this.map.events.un({"removelayer":this.updateAttribution,"addlayer":this.updateAttribution,"changelayer":this.updateAttribution,"changebaselayer":this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({'changebaselayer':this.updateAttribution,'changelayer':this.updateAttribution,'addlayer':this.updateAttribution,'removelayer':this.updateAttribution,scope:this});this.updateAttribution();return this.div;},updateAttribution:function(){var attributions=[];if(this.map&&this.map.layers){for(var i=0,len=this.map.layers.length;i<len;i++){var layer=this.map.layers[i];if(layer.attribution&&layer.getVisibility()){if(OpenLayers.Util.indexOf(attributions,layer.attribution)===-1){attributions.push(layer.attribution);}}} -this.div.innerHTML=attributions.join(this.separator);}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Handler.Point=OpenLayers.Class(OpenLayers.Handler,{point:null,layer:null,multi:false,mouseDown:false,stoppedDown:null,lastDown:null,lastUp:null,persist:false,stopDown:false,stopUp:false,layerOptions:null,pixelTolerance:5,touch:false,lastTouchPx:null,initialize:function(control,callbacks,options){if(!(options&&options.layerOptions&&options.layerOptions.styleMap)){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});} +this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",template:"${layers}",destroy:function(){this.map.events.un({"removelayer":this.updateAttribution,"addlayer":this.updateAttribution,"changelayer":this.updateAttribution,"changebaselayer":this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({'changebaselayer':this.updateAttribution,'changelayer':this.updateAttribution,'addlayer':this.updateAttribution,'removelayer':this.updateAttribution,scope:this});this.updateAttribution();return this.div;},updateAttribution:function(){var attributions=[];if(this.map&&this.map.layers){for(var i=0,len=this.map.layers.length;i<len;i++){var layer=this.map.layers[i];if(layer.attribution&&layer.getVisibility()){if(OpenLayers.Util.indexOf(attributions,layer.attribution)===-1){attributions.push(layer.attribution);}}} +this.div.innerHTML=OpenLayers.String.format(this.template,{layers:attributions.join(this.separator)});}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Handler.Point=OpenLayers.Class(OpenLayers.Handler,{point:null,layer:null,multi:false,citeCompliant:false,mouseDown:false,stoppedDown:null,lastDown:null,lastUp:null,persist:false,stopDown:false,stopUp:false,layerOptions:null,pixelTolerance:5,touch:false,lastTouchPx:null,initialize:function(control,callbacks,options){if(!(options&&options.layerOptions&&options.layerOptions.styleMap)){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});} OpenLayers.Handler.prototype.initialize.apply(this,arguments);},activate:function(){if(!OpenLayers.Handler.prototype.activate.apply(this,arguments)){return false;} -var options=OpenLayers.Util.extend({displayInLayerSwitcher:false,calculateInRange:OpenLayers.Function.True},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);return true;},createFeature:function(pixel){var lonlat=this.map.getLonLatFromPixel(pixel);var geometry=new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);this.point=new OpenLayers.Feature.Vector(geometry);this.callback("create",[this.point.geometry,this.point]);this.point.geometry.clearBounds();this.layer.addFeatures([this.point],{silent:true});},deactivate:function(){if(!OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){return false;} +var options=OpenLayers.Util.extend({displayInLayerSwitcher:false,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);return true;},createFeature:function(pixel){var lonlat=this.layer.getLonLatFromViewPortPx(pixel);var geometry=new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);this.point=new OpenLayers.Feature.Vector(geometry);this.callback("create",[this.point.geometry,this.point]);this.point.geometry.clearBounds();this.layer.addFeatures([this.point],{silent:true});},deactivate:function(){if(!OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){return false;} this.cancel();if(this.layer.map!=null){this.destroyFeature(true);this.layer.destroy(false);} this.layer=null;this.touch=false;return true;},destroyFeature:function(force){if(this.layer&&(force||!this.persist)){this.layer.destroyFeatures();} this.point=null;},destroyPersistedFeature:function(){var layer=this.layer;if(layer&&layer.features.length>1){this.layer.features[0].destroy();}},finalize:function(cancel){var key=cancel?"cancel":"done";this.mouseDown=false;this.lastDown=null;this.lastUp=null;this.lastTouchPx=null;this.callback(key,[this.geometryClone()]);this.destroyFeature(cancel);},cancel:function(){this.finalize(true);},click:function(evt){OpenLayers.Event.stop(evt);return false;},dblclick:function(evt){OpenLayers.Event.stop(evt);return false;},modifyFeature:function(pixel){if(!this.point){this.createFeature(pixel);} -var lonlat=this.map.getLonLatFromPixel(pixel);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;this.callback("modify",[this.point.geometry,this.point,false]);this.point.geometry.clearBounds();this.drawFeature();},drawFeature:function(){this.layer.drawFeature(this.point,this.style);},getGeometry:function(){var geometry=this.point&&this.point.geometry;if(geometry&&this.multi){geometry=new OpenLayers.Geometry.MultiPoint([geometry]);} +var lonlat=this.layer.getLonLatFromViewPortPx(pixel);this.point.geometry.x=lonlat.lon;this.point.geometry.y=lonlat.lat;this.callback("modify",[this.point.geometry,this.point,false]);this.point.geometry.clearBounds();this.drawFeature();},drawFeature:function(){this.layer.drawFeature(this.point,this.style);},getGeometry:function(){var geometry=this.point&&this.point.geometry;if(geometry&&this.multi){geometry=new OpenLayers.Geometry.MultiPoint([geometry]);} return geometry;},geometryClone:function(){var geom=this.getGeometry();return geom&&geom.clone();},mousedown:function(evt){return this.down(evt);},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,dblclick:this.dblclick,scope:this});} this.lastTouchPx=evt.xy;return this.down(evt);},mousemove:function(evt){return this.move(evt);},touchmove:function(evt){this.lastTouchPx=evt.xy;return this.move(evt);},mouseup:function(evt){return this.up(evt);},touchend:function(evt){evt.xy=this.lastTouchPx;return this.up(evt);},down:function(evt){this.mouseDown=true;this.lastDown=evt.xy;if(!this.touch){this.modifyFeature(evt.xy);} this.stoppedDown=this.stopDown;return!this.stopDown;},move:function(evt){if(!this.touch&&(!this.mouseDown||this.stoppedDown)){this.modifyFeature(evt.xy);} @@ -1093,7 +1064,7 @@ return true;},up:function(evt){this.mouseDown=false;this.stoppedDown=this.stopDo if(this.lastUp&&this.lastUp.equals(evt.xy)){return true;} if(this.lastDown&&this.passesTolerance(this.lastDown,evt.xy,this.pixelTolerance)){if(this.touch){this.modifyFeature(evt.xy);} if(this.persist){this.destroyPersistedFeature();} -this.lastUp=evt.xy;this.finalize();return!this.stopUp;}else{return true;}},mouseout:function(evt){if(OpenLayers.Util.mouseLeft(evt,this.map.eventsDiv)){this.stoppedDown=this.stopDown;this.mouseDown=false;}},passesTolerance:function(pixel1,pixel2,tolerance){var passes=true;if(tolerance!=null&&pixel1&&pixel2){var dist=pixel1.distanceTo(pixel2);if(dist>tolerance){passes=false;}} +this.lastUp=evt.xy;this.finalize();return!this.stopUp;}else{return true;}},mouseout:function(evt){if(OpenLayers.Util.mouseLeft(evt,this.map.viewPortDiv)){this.stoppedDown=this.stopDown;this.mouseDown=false;}},passesTolerance:function(pixel1,pixel2,tolerance){var passes=true;if(tolerance!=null&&pixel1&&pixel2){var dist=pixel1.distanceTo(pixel2);if(dist>tolerance){passes=false;}} return passes;},CLASS_NAME:"OpenLayers.Handler.Point"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:true,dragging:false,touch:false,last:null,start:null,lastMoveEvt:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:false,documentEvents:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(this.documentDrag===true){var me=this;this._docMove=function(evt){me.mousemove({xy:{x:evt.clientX,y:evt.clientY},element:document});};this._docUp=function(evt){me.mouseup({xy:{x:evt.clientX,y:evt.clientY}});};}},dragstart:function(evt){var propagate=true;this.dragging=false;if(this.checkModifiers(evt)&&(OpenLayers.Event.isLeftClick(evt)||OpenLayers.Event.isSingleTouch(evt))){this.started=true;this.start=evt.xy;this.last=evt.xy;OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown");this.down(evt);this.callback("down",[evt.xy]);OpenLayers.Event.stop(evt);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart?document.onselectstart:OpenLayers.Function.True;} document.onselectstart=OpenLayers.Function.False;propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;} return propagate;},dragmove:function(evt){this.lastMoveEvt=evt;if(this.started&&!this.timeoutId&&(evt.xy.x!=this.last.x||evt.xy.y!=this.last.y)){if(this.documentDrag===true&&this.documentEvents){if(evt.element===document){this.adjustXY(evt);this.setEvent(evt);}else{this.removeDocumentEvents();}} @@ -1104,48 +1075,44 @@ return true;},dragend:function(evt){if(this.started){if(this.documentDrag===true var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(evt);this.callback("up",[evt.xy]);if(dragged){this.callback("done",[evt.xy]);} document.onselectstart=this.oldOnselectstart;} return true;},down:function(evt){},move:function(evt){},up:function(evt){},out:function(evt){},mousedown:function(evt){return this.dragstart(evt);},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,scope:this});} -return this.dragstart(evt);},mousemove:function(evt){return this.dragmove(evt);},touchmove:function(evt){return this.dragmove(evt);},removeTimeout:function(){this.timeoutId=null;if(this.dragging){this.mousemove(this.lastMoveEvt);}},mouseup:function(evt){return this.dragend(evt);},touchend:function(evt){evt.xy=this.last;return this.dragend(evt);},mouseout:function(evt){if(this.started&&OpenLayers.Util.mouseLeft(evt,this.map.eventsDiv)){if(this.documentDrag===true){this.addDocumentEvents();}else{var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(evt);this.callback("out",[]);if(dragged){this.callback("done",[evt.xy]);} +return this.dragstart(evt);},mousemove:function(evt){return this.dragmove(evt);},touchmove:function(evt){return this.dragmove(evt);},removeTimeout:function(){this.timeoutId=null;if(this.dragging){this.mousemove(this.lastMoveEvt);}},mouseup:function(evt){return this.dragend(evt);},touchend:function(evt){evt.xy=this.last;return this.dragend(evt);},mouseout:function(evt){if(this.started&&OpenLayers.Util.mouseLeft(evt,this.map.viewPortDiv)){if(this.documentDrag===true){this.addDocumentEvents();}else{var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(evt);this.callback("out",[]);if(dragged){this.callback("done",[evt.xy]);} if(document.onselectstart){document.onselectstart=this.oldOnselectstart;}}} return true;},click:function(evt){return(this.start==this.last);},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;activated=true;} return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.touch=false;this.started=false;this.dragging=false;this.start=null;this.last=null;deactivated=true;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");} return deactivated;},adjustXY:function(evt){var pos=OpenLayers.Util.pagePosition(this.map.viewPortDiv);evt.xy.x-=pos[0];evt.xy.y-=pos[1];},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=true;OpenLayers.Event.observe(document,"mousemove",this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp);},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=false;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp);},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(feature,pixel){},onDrag:function(feature,pixel){},onComplete:function(feature,pixel){},onEnter:function(feature){},onLeave:function(feature){},documentDrag:false,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})};},clickFeature:function(feature){if(this.handlers.feature.touch&&!this.over&&this.overFeature(feature)){this.handlers.drag.dragstart(this.handlers.feature.evt);this.handlers.drag.stopDown=false;}},clickoutFeature:function(feature){if(this.handlers.feature.touch&&this.over){this.outFeature(feature);this.handlers.drag.stopDown=true;}},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return(this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=false;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},overFeature:function(feature){var activated=false;if(!this.handlers.drag.dragging){this.feature=feature;this.handlers.drag.activate();activated=true;this.over=true;OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over");this.onEnter(feature);}else{if(this.feature.id==feature.id){this.over=true;}else{this.over=false;}} -return activated;},downFeature:function(pixel){this.lastPixel=pixel;this.onStart(this.feature,pixel);},moveFeature:function(pixel){var res=this.map.getResolution();this.feature.geometry.move(res*(pixel.x-this.lastPixel.x),res*(this.lastPixel.y-pixel.y));this.layer.drawFeature(this.feature);this.lastPixel=pixel;this.onDrag(this.feature,pixel);},upFeature:function(pixel){if(!this.over){this.handlers.drag.deactivate();}},doneDragging:function(pixel){this.onComplete(this.feature,pixel);},outFeature:function(feature){if(!this.handlers.drag.dragging){this.over=false;this.handlers.drag.deactivate();OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");this.onLeave(feature);this.feature=null;}else{if(this.feature.id==feature.id){this.over=false;}}},cancel:function(){this.handlers.drag.deactivate();this.over=false;},setMap:function(map){this.handlers.drag.setMap(map);this.handlers.feature.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Control.TransformFeature=OpenLayers.Class(OpenLayers.Control,{EVENT_TYPES:["beforesetfeature","setfeature","beforetransform","transform","transformcomplete"],geometryTypes:null,layer:null,preserveAspectRatio:false,rotate:true,feature:null,renderIntent:"temporary",rotationHandleSymbolizer:null,box:null,center:null,scale:1,ratio:1,rotation:0,handles:null,rotationHandles:null,dragControl:null,irregular:false,initialize:function(layer,options){this.EVENT_TYPES=OpenLayers.Control.TransformFeature.prototype.EVENT_TYPES.concat(OpenLayers.Control.prototype.EVENT_TYPES);OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;if(!this.rotationHandleSymbolizer){this.rotationHandleSymbolizer={stroke:false,pointRadius:10,fillOpacity:0,cursor:"pointer"};} +return activated;},downFeature:function(pixel){this.lastPixel=pixel;this.onStart(this.feature,pixel);},moveFeature:function(pixel){var res=this.map.getResolution();this.feature.geometry.move(res*(pixel.x-this.lastPixel.x),res*(this.lastPixel.y-pixel.y));this.layer.drawFeature(this.feature);this.lastPixel=pixel;this.onDrag(this.feature,pixel);},upFeature:function(pixel){if(!this.over){this.handlers.drag.deactivate();}},doneDragging:function(pixel){this.onComplete(this.feature,pixel);},outFeature:function(feature){if(!this.handlers.drag.dragging){this.over=false;this.handlers.drag.deactivate();OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");this.onLeave(feature);this.feature=null;}else{if(this.feature.id==feature.id){this.over=false;}}},cancel:function(){this.handlers.drag.deactivate();this.over=false;},setMap:function(map){this.handlers.drag.setMap(map);this.handlers.feature.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Control.TransformFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,layer:null,preserveAspectRatio:false,rotate:true,feature:null,renderIntent:"temporary",rotationHandleSymbolizer:null,box:null,center:null,scale:1,ratio:1,rotation:0,handles:null,rotationHandles:null,dragControl:null,irregular:false,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;if(!this.rotationHandleSymbolizer){this.rotationHandleSymbolizer={stroke:false,pointRadius:10,fillOpacity:0,cursor:"pointer"};} this.createBox();this.createControl();},activate:function(){var activated=false;if(OpenLayers.Control.prototype.activate.apply(this,arguments)){this.dragControl.activate();this.layer.addFeatures([this.box]);this.rotate&&this.layer.addFeatures(this.rotationHandles);this.layer.addFeatures(this.handles);activated=true;} return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){this.layer.removeFeatures(this.handles);this.rotate&&this.layer.removeFeatures(this.rotationHandles);this.layer.removeFeatures([this.box]);this.dragControl.deactivate();deactivated=true;} -if(deactivated){this.unsetFeature();} return deactivated;},setMap:function(map){this.dragControl.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},setFeature:function(feature,initialParams){initialParams=OpenLayers.Util.applyDefaults(initialParams,{rotation:0,scale:1,ratio:1});var oldRotation=this.rotation;var oldCenter=this.center;OpenLayers.Util.extend(this,initialParams);var cont=this.events.triggerEvent("beforesetfeature",{feature:feature});if(cont===false){return;} this.feature=feature;this.activate();this._setfeature=true;var featureBounds=this.feature.geometry.getBounds();this.box.move(featureBounds.getCenterLonLat());this.box.geometry.rotate(-oldRotation,oldCenter);this._angle=0;var ll;if(this.rotation){var geom=feature.geometry.clone();geom.rotate(-this.rotation,this.center);var box=new OpenLayers.Feature.Vector(geom.getBounds().toGeometry());box.geometry.rotate(this.rotation,this.center);this.box.geometry.rotate(this.rotation,this.center);this.box.move(box.geometry.getBounds().getCenterLonLat());var llGeom=box.geometry.components[0].components[0];ll=llGeom.getBounds().getCenterLonLat();}else{ll=new OpenLayers.LonLat(featureBounds.left,featureBounds.bottom);} -this.handles[0].move(ll);delete this._setfeature;this.events.triggerEvent("setfeature",{feature:feature});},unsetFeature:function(){if(this.active){this.deactivate();}else{this.feature=null;this.rotation=0;this.scale=1;this.ratio=1;}},createBox:function(){var control=this;this.center=new OpenLayers.Geometry.Point(0,0);var box=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([new OpenLayers.Geometry.Point(-1,-1),new OpenLayers.Geometry.Point(0,-1),new OpenLayers.Geometry.Point(1,-1),new OpenLayers.Geometry.Point(1,0),new OpenLayers.Geometry.Point(1,1),new OpenLayers.Geometry.Point(0,1),new OpenLayers.Geometry.Point(-1,1),new OpenLayers.Geometry.Point(-1,0),new OpenLayers.Geometry.Point(-1,-1)]),null,typeof this.renderIntent=="string"?null:this.renderIntent);box.geometry.move=function(x,y){control._moving=true;OpenLayers.Geometry.LineString.prototype.move.apply(this,arguments);control.center.move(x,y);delete control._moving;};var vertexMoveFn=function(x,y){OpenLayers.Geometry.Point.prototype.move.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.move(x,y);this._handle.geometry.move(x,y);};var vertexResizeFn=function(scale,center,ratio){OpenLayers.Geometry.Point.prototype.resize.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.resize(scale,center,ratio);this._handle.geometry.resize(scale,center,ratio);};var vertexRotateFn=function(angle,center){OpenLayers.Geometry.Point.prototype.rotate.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.rotate(angle,center);this._handle.geometry.rotate(angle,center);};var handleMoveFn=function(x,y){var oldX=this.x,oldY=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,x,y);if(control._moving){return;} +this.handles[0].move(ll);delete this._setfeature;this.events.triggerEvent("setfeature",{feature:feature});},unsetFeature:function(){if(this.active){this.deactivate();}else{this.feature=null;this.rotation=0;this.scale=1;this.ratio=1;}},createBox:function(){var control=this;this.center=new OpenLayers.Geometry.Point(0,0);this.box=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([new OpenLayers.Geometry.Point(-1,-1),new OpenLayers.Geometry.Point(0,-1),new OpenLayers.Geometry.Point(1,-1),new OpenLayers.Geometry.Point(1,0),new OpenLayers.Geometry.Point(1,1),new OpenLayers.Geometry.Point(0,1),new OpenLayers.Geometry.Point(-1,1),new OpenLayers.Geometry.Point(-1,0),new OpenLayers.Geometry.Point(-1,-1)]),null,typeof this.renderIntent=="string"?null:this.renderIntent);this.box.geometry.move=function(x,y){control._moving=true;OpenLayers.Geometry.LineString.prototype.move.apply(this,arguments);control.center.move(x,y);delete control._moving;};var vertexMoveFn=function(x,y){OpenLayers.Geometry.Point.prototype.move.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.move(x,y);this._handle.geometry.move(x,y);};var vertexResizeFn=function(scale,center,ratio){OpenLayers.Geometry.Point.prototype.resize.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.resize(scale,center,ratio);this._handle.geometry.resize(scale,center,ratio);};var vertexRotateFn=function(angle,center){OpenLayers.Geometry.Point.prototype.rotate.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.rotate(angle,center);this._handle.geometry.rotate(angle,center);};var handleMoveFn=function(x,y){var oldX=this.x,oldY=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,x,y);if(control._moving){return;} var evt=control.dragControl.handlers.drag.evt;var preserveAspectRatio=!control._setfeature&&control.preserveAspectRatio;var reshape=!preserveAspectRatio&&!(evt&&evt.shiftKey);var oldGeom=new OpenLayers.Geometry.Point(oldX,oldY);var centerGeometry=control.center;this.rotate(-control.rotation,centerGeometry);oldGeom.rotate(-control.rotation,centerGeometry);var dx1=this.x-centerGeometry.x;var dy1=this.y-centerGeometry.y;var dx0=dx1-(this.x-oldGeom.x);var dy0=dy1-(this.y-oldGeom.y);if(control.irregular&&!control._setfeature){dx1-=(this.x-oldGeom.x)/2;dy1-=(this.y-oldGeom.y)/2;} this.x=oldX;this.y=oldY;var scale,ratio=1;if(reshape){scale=Math.abs(dy0)<0.00001?1:dy1/dy0;ratio=(Math.abs(dx0)<0.00001?1:(dx1/dx0))/scale;}else{var l0=Math.sqrt((dx0*dx0)+(dy0*dy0));var l1=Math.sqrt((dx1*dx1)+(dy1*dy1));scale=l1/l0;} control._moving=true;control.box.geometry.rotate(-control.rotation,centerGeometry);delete control._moving;control.box.geometry.resize(scale,centerGeometry,ratio);control.box.geometry.rotate(control.rotation,centerGeometry);control.transformFeature({scale:scale,ratio:ratio});if(control.irregular&&!control._setfeature){var newCenter=centerGeometry.clone();newCenter.x+=Math.abs(oldX-centerGeometry.x)<0.00001?0:(this.x-oldX);newCenter.y+=Math.abs(oldY-centerGeometry.y)<0.00001?0:(this.y-oldY);control.box.geometry.move(this.x-oldX,this.y-oldY);control.transformFeature({center:newCenter});}};var rotationHandleMoveFn=function(x,y){var oldX=this.x,oldY=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,x,y);if(control._moving){return;} var evt=control.dragControl.handlers.drag.evt;var constrain=(evt&&evt.shiftKey)?45:1;var centerGeometry=control.center;var dx1=this.x-centerGeometry.x;var dy1=this.y-centerGeometry.y;var dx0=dx1-x;var dy0=dy1-y;this.x=oldX;this.y=oldY;var a0=Math.atan2(dy0,dx0);var a1=Math.atan2(dy1,dx1);var angle=a1-a0;angle*=180/Math.PI;control._angle=(control._angle+angle)%360;var diff=control.rotation%constrain;if(Math.abs(control._angle)>=constrain||diff!==0){angle=Math.round(control._angle/constrain)*constrain- -diff;control._angle=0;control.box.geometry.rotate(angle,centerGeometry);control.transformFeature({rotation:angle});}};var handles=new Array(8);var rotationHandles=new Array(4);var geom,handle,rotationHandle;for(var i=0;i<8;++i){geom=box.geometry.components[i];handle=new OpenLayers.Feature.Vector(geom.clone(),null,typeof this.renderIntent=="string"?null:this.renderIntent);if(i%2==0){rotationHandle=new OpenLayers.Feature.Vector(geom.clone(),null,typeof this.rotationHandleSymbolizer=="string"?null:this.rotationHandleSymbolizer);rotationHandle.geometry.move=rotationHandleMoveFn;geom._rotationHandle=rotationHandle;rotationHandles[i/2]=rotationHandle;} +diff;control._angle=0;control.box.geometry.rotate(angle,centerGeometry);control.transformFeature({rotation:angle});}};var handles=new Array(8);var rotationHandles=new Array(4);var geom,handle,rotationHandle;var positions=["sw","s","se","e","ne","n","nw","w"];for(var i=0;i<8;++i){geom=this.box.geometry.components[i];handle=new OpenLayers.Feature.Vector(geom.clone(),{role:positions[i]+"-resize"},typeof this.renderIntent=="string"?null:this.renderIntent);if(i%2==0){rotationHandle=new OpenLayers.Feature.Vector(geom.clone(),{role:positions[i]+"-rotate"},typeof this.rotationHandleSymbolizer=="string"?null:this.rotationHandleSymbolizer);rotationHandle.geometry.move=rotationHandleMoveFn;geom._rotationHandle=rotationHandle;rotationHandles[i/2]=rotationHandle;} geom.move=vertexMoveFn;geom.resize=vertexResizeFn;geom.rotate=vertexRotateFn;handle.geometry.move=handleMoveFn;geom._handle=handle;handles[i]=handle;} -this.box=box;this.rotationHandles=rotationHandles;this.handles=handles;},createControl:function(){var control=this;this.dragControl=new OpenLayers.Control.DragFeature(this.layer,{documentDrag:true,moveFeature:function(pixel){if(this.feature===control.feature){this.feature=control.box;} -OpenLayers.Control.DragFeature.prototype.moveFeature.apply(this,arguments);},onDrag:function(feature,pixel){if(feature===control.box){control.transformFeature({center:control.center});control.drawHandles();}},onStart:function(feature,pixel){var eligible=!control.geometryTypes||OpenLayers.Util.indexOf(control.geometryTypes,feature.geometry.CLASS_NAME)!==-1;var i=OpenLayers.Util.indexOf(control.handles,feature);i+=OpenLayers.Util.indexOf(control.rotationHandles,feature);if(feature!==control.feature&&feature!==control.box&&i==-2&&eligible){control.setFeature(feature);}},onComplete:function(feature,pixel){control.events.triggerEvent("transformcomplete",{feature:control.feature});}});},drawHandles:function(){var layer=this.layer;for(var i=0;i<8;++i){if(this.rotate&&i%2===0){layer.drawFeature(this.rotationHandles[i/2],this.rotationHandleSymbolizer);} +this.rotationHandles=rotationHandles;this.handles=handles;},createControl:function(){var control=this;this.dragControl=new OpenLayers.Control.DragFeature(this.layer,{documentDrag:true,moveFeature:function(pixel){if(this.feature===control.feature){this.feature=control.box;} +OpenLayers.Control.DragFeature.prototype.moveFeature.apply(this,arguments);},onDrag:function(feature,pixel){if(feature===control.box){control.transformFeature({center:control.center});}},onStart:function(feature,pixel){var eligible=!control.geometryTypes||OpenLayers.Util.indexOf(control.geometryTypes,feature.geometry.CLASS_NAME)!==-1;var i=OpenLayers.Util.indexOf(control.handles,feature);i+=OpenLayers.Util.indexOf(control.rotationHandles,feature);if(feature!==control.feature&&feature!==control.box&&i==-2&&eligible){control.setFeature(feature);}},onComplete:function(feature,pixel){control.events.triggerEvent("transformcomplete",{feature:control.feature});}});},drawHandles:function(){var layer=this.layer;for(var i=0;i<8;++i){if(this.rotate&&i%2===0){layer.drawFeature(this.rotationHandles[i/2],this.rotationHandleSymbolizer);} layer.drawFeature(this.handles[i],this.renderIntent);}},transformFeature:function(mods){if(!this._setfeature){this.scale*=(mods.scale||1);this.ratio*=(mods.ratio||1);var oldRotation=this.rotation;this.rotation=(this.rotation+(mods.rotation||0))%360;if(this.events.triggerEvent("beforetransform",mods)!==false){var feature=this.feature;var geom=feature.geometry;var center=this.center;geom.rotate(-oldRotation,center);if(mods.scale||mods.ratio){geom.resize(mods.scale,center,mods.ratio);}else if(mods.center){feature.move(mods.center.getBounds().getCenterLonLat());} geom.rotate(this.rotation,center);this.layer.drawFeature(feature);feature.toState(OpenLayers.State.UPDATE);this.events.triggerEvent("transform",mods);}} this.layer.drawFeature(this.box,this.renderIntent);this.drawHandles();},destroy:function(){var geom;for(var i=0;i<8;++i){geom=this.box.geometry.components[i];geom._handle.destroy();geom._handle=null;geom._rotationHandle&&geom._rotationHandle.destroy();geom._rotationHandle=null;} -this.box.destroy();this.box=null;this.layer=null;this.dragControl.destroy();OpenLayers.Control.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.TransformFeature"});OpenLayers.Filter.Logical=OpenLayers.Class(OpenLayers.Filter,{filters:null,type:null,initialize:function(options){this.filters=[];OpenLayers.Filter.prototype.initialize.apply(this,[options]);},destroy:function(){this.filters=null;OpenLayers.Filter.prototype.destroy.apply(this);},evaluate:function(context){var i,len;switch(this.type){case OpenLayers.Filter.Logical.AND:for(i=0,len=this.filters.length;i<len;i++){if(this.filters[i].evaluate(context)==false){return false;}} -return true;case OpenLayers.Filter.Logical.OR:for(i=0,len=this.filters.length;i<len;i++){if(this.filters[i].evaluate(context)==true){return true;}} -return false;case OpenLayers.Filter.Logical.NOT:return(!this.filters[0].evaluate(context));} -return undefined;},clone:function(){var filters=[];for(var i=0,len=this.filters.length;i<len;++i){filters.push(this.filters[i].clone());} -return new OpenLayers.Filter.Logical({type:this.type,filters:filters});},CLASS_NAME:"OpenLayers.Filter.Logical"});OpenLayers.Filter.Logical.AND="&&";OpenLayers.Filter.Logical.OR="||";OpenLayers.Filter.Logical.NOT="!";OpenLayers.Lang["ia"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Le responsa a un requesta non esseva maneate: ${statusText}",'Permalink':"Permaligamine",'Overlays':"Superpositiones",'Base Layer':"Strato de base",'readNotImplemented':"Lectura non implementate.",'writeNotImplemented':"Scriptura non implementate.",'noFID':"Non pote actualisar un elemento sin FID.",'errorLoadingGML':"Error al cargamento del file GML ${url}",'browserNotSupported':"Tu navigator non supporta le rendition de vectores. Le renditores actualmente supportate es:\n${renderers}",'componentShouldBe':"addFeatures: le componente debe esser del typo ${geomType}",'getFeatureError':"getFeatureFromEvent ha essite appellate in un strato sin renditor. Isto significa generalmente que tu ha destruite un strato, ma lassava un gestor associate con illo.",'minZoomLevelError':"Le proprietate minZoomLevel es solmente pro uso con le stratos descendente de FixedZoomLevels. Le facto que iste strato WFS verifica minZoomLevel es un reliquia del passato. Nonobstante, si nos lo remove immediatemente, nos pote rumper applicationes a base de OL que depende de illo. Ergo nos lo declara obsolete; le verification de minZoomLevel in basso essera removite in version 3.0. Per favor usa in su loco le configuration de resolutiones min/max como describite a: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transaction WFS: SUCCESSO ${response}",'commitFailed':"Transaction WFS: FALLEVA ${response}",'googleWarning':"Le strato Google non poteva esser cargate correctemente.\x3cbr\x3e\x3cbr\x3ePro disfacer te de iste message, selige un nove BaseLayer in le selector de strato in alto a dextra.\x3cbr\x3e\x3cbr\x3eMulto probabilemente, isto es proque le script del libreria de Google Maps non esseva includite o non contine le clave API correcte pro tu sito.\x3cbr\x3e\x3cbr\x3eDisveloppatores: Pro adjuta de corriger isto, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclicca hic\x3c/a",'getLayerWarning':"Le strato ${layerType} non poteva esser cargate correctemente.\x3cbr\x3e\x3cbr\x3ePro disfacer te de iste message, selige un nove BaseLayer in le selector de strato in alto a dextra.\x3cbr\x3e\x3cbr\x3eMulto probabilemente, isto es proque le script del libreria de ${layerLib} non esseva correctemente includite.\x3cbr\x3e\x3cbr\x3eDisveloppatores: Pro adjuta de corriger isto, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclicca hic\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Scala = 1 : ${scaleDenom}",'W':"W",'E':"E",'N':"N",'S':"S",'layerAlreadyAdded':"Tu tentava adder le strato: ${layerName} al carta, ma illo es ja presente",'reprojectDeprecated':"Tu usa le option \'reproject\' in le strato ${layerName} layer. Iste option es obsolescente: illo esseva pro poter monstrar datos super cartas de base commercial, ma iste functionalitate pote ora esser attingite con le uso de Spherical Mercator. Ulterior information es disponibile a http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Iste methodo ha essite declarate obsolescente e essera removite in version 3.0. Per favor usa ${newMethod} in su loco.",'boundsAddError':"Tu debe passar le duo valores x e y al function add.",'lonlatAddError':"Tu debe passar le duo valores lon e lat al function add.",'pixelAddError':"Tu debe passar le duo valores x e y al function add.",'unsupportedGeometryType':"Typo de geometria non supportate: ${geomType}",'filterEvaluateNotImplemented':"\"evaluate\" non es implementate pro iste typo de filtro."});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:'olHandlerBoxZoomBox',boxOffsets:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask});},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);if(this.dragHandler){this.dragHandler.destroy();this.dragHandler=null;}},setMap:function(map){OpenLayers.Handler.prototype.setMap.apply(this,arguments);if(this.dragHandler){this.dragHandler.setMap(map);}},startBox:function(xy){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv('zoomBox',new OpenLayers.Pixel(-9999,-9999));this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.eventsDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.eventsDiv,"olDrawBox");},moveBox:function(xy){var startX=this.dragHandler.start.x;var startY=this.dragHandler.start.y;var deltaX=Math.abs(startX-xy.x);var deltaY=Math.abs(startY-xy.y);var offset=this.getBoxOffsets();this.zoomBox.style.width=(deltaX+offset.width+1)+"px";this.zoomBox.style.height=(deltaY+offset.height+1)+"px";this.zoomBox.style.left=(xy.x<startX?startX-deltaX-offset.left:startX-offset.left)+"px";this.zoomBox.style.top=(xy.y<startY?startY-deltaY-offset.top:startY-offset.top)+"px";},endBox:function(end){var result;if(Math.abs(this.dragHandler.start.x-end.x)>5||Math.abs(this.dragHandler.start.y-end.y)>5){var start=this.dragHandler.start;var top=Math.min(start.y,end.y);var bottom=Math.max(start.y,end.y);var left=Math.min(start.x,end.x);var right=Math.max(start.x,end.x);result=new OpenLayers.Bounds(left,bottom,right,top);}else{result=this.dragHandler.start.clone();} -this.removeBox();this.callback("done",[result]);},removeBox:function(){this.map.eventsDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxOffsets=null;OpenLayers.Element.removeClass(this.map.eventsDiv,"olDrawBox");},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){if(this.dragHandler.deactivate()){if(this.zoomBox){this.removeBox();}} +this.center=null;this.feature=null;this.handles=null;this.rotationHandleSymbolizer=null;this.rotationHandles=null;this.box.destroy();this.box=null;this.layer=null;this.dragControl.destroy();this.dragControl=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.TransformFeature"});OpenLayers.Lang["ia"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Le responsa a un requesta non esseva maneate: ${statusText}",'Permalink':"Permaligamine",'Overlays':"Superpositiones",'Base Layer':"Strato de base",'noFID':"Non pote actualisar un elemento sin FID.",'browserNotSupported':"Tu navigator non supporta le rendition de vectores. Le renditores actualmente supportate es:\n${renderers}",'minZoomLevelError':"Le proprietate minZoomLevel es solmente pro uso con le stratos descendente de FixedZoomLevels. Le facto que iste strato WFS verifica minZoomLevel es un reliquia del passato. Nonobstante, si nos lo remove immediatemente, nos pote rumper applicationes a base de OL que depende de illo. Ergo nos lo declara obsolete; le verification de minZoomLevel in basso essera removite in version 3.0. Per favor usa in su loco le configuration de resolutiones min/max como describite a: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transaction WFS: SUCCESSO ${response}",'commitFailed':"Transaction WFS: FALLEVA ${response}",'googleWarning':"Le strato Google non poteva esser cargate correctemente.\x3cbr\x3e\x3cbr\x3ePro disfacer te de iste message, selige un nove BaseLayer in le selector de strato in alto a dextra.\x3cbr\x3e\x3cbr\x3eMulto probabilemente, isto es proque le script del libreria de Google Maps non esseva includite o non contine le clave API correcte pro tu sito.\x3cbr\x3e\x3cbr\x3eDisveloppatores: Pro adjuta de corriger isto, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclicca hic\x3c/a",'getLayerWarning':"Le strato ${layerType} non poteva esser cargate correctemente.\x3cbr\x3e\x3cbr\x3ePro disfacer te de iste message, selige un nove BaseLayer in le selector de strato in alto a dextra.\x3cbr\x3e\x3cbr\x3eMulto probabilemente, isto es proque le script del libreria de ${layerLib} non esseva correctemente includite.\x3cbr\x3e\x3cbr\x3eDisveloppatores: Pro adjuta de corriger isto, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclicca hic\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Scala = 1 : ${scaleDenom}",'W':"W",'E':"E",'N':"N",'S':"S",'reprojectDeprecated':"Tu usa le option \'reproject\' in le strato ${layerName} layer. Iste option es obsolescente: illo esseva pro poter monstrar datos super cartas de base commercial, ma iste functionalitate pote ora esser attingite con le uso de Spherical Mercator. Ulterior information es disponibile a http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Iste methodo ha essite declarate obsolescente e essera removite in version 3.0. Per favor usa ${newMethod} in su loco."});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:'olHandlerBoxZoomBox',boxOffsets:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask});},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);if(this.dragHandler){this.dragHandler.destroy();this.dragHandler=null;}},setMap:function(map){OpenLayers.Handler.prototype.setMap.apply(this,arguments);if(this.dragHandler){this.dragHandler.setMap(map);}},startBox:function(xy){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv('zoomBox',{x:-9999,y:-9999});this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.viewPortDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.viewPortDiv,"olDrawBox");},moveBox:function(xy){var startX=this.dragHandler.start.x;var startY=this.dragHandler.start.y;var deltaX=Math.abs(startX-xy.x);var deltaY=Math.abs(startY-xy.y);var offset=this.getBoxOffsets();this.zoomBox.style.width=(deltaX+offset.width+1)+"px";this.zoomBox.style.height=(deltaY+offset.height+1)+"px";this.zoomBox.style.left=(xy.x<startX?startX-deltaX-offset.left:startX-offset.left)+"px";this.zoomBox.style.top=(xy.y<startY?startY-deltaY-offset.top:startY-offset.top)+"px";},endBox:function(end){var result;if(Math.abs(this.dragHandler.start.x-end.x)>5||Math.abs(this.dragHandler.start.y-end.y)>5){var start=this.dragHandler.start;var top=Math.min(start.y,end.y);var bottom=Math.max(start.y,end.y);var left=Math.min(start.x,end.x);var right=Math.max(start.x,end.x);result=new OpenLayers.Bounds(left,bottom,right,top);}else{result=this.dragHandler.start.clone();} +this.removeBox();this.callback("done",[result]);},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxOffsets=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDrawBox");},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){if(this.dragHandler.deactivate()){if(this.zoomBox){this.removeBox();}} return true;}else{return false;}},getBoxOffsets:function(){if(!this.boxOffsets){var testDiv=document.createElement("div");testDiv.style.position="absolute";testDiv.style.border="1px solid black";testDiv.style.width="3px";document.body.appendChild(testDiv);var w3cBoxModel=testDiv.clientWidth==3;document.body.removeChild(testDiv);var left=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width"));var right=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width"));var top=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width"));var bottom=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:left,right:right,top:top,bottom:bottom,width:w3cBoxModel===false?left+right:0,height:w3cBoxModel===false?top+bottom:0};} -return this.boxOffsets;},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:false,alwaysZoom:false,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask});},zoomBox:function(position){if(position instanceof OpenLayers.Bounds){var bounds;if(!this.out){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{var pixWidth=Math.abs(position.right-position.left);var pixHeight=Math.abs(position.top-position.bottom);var zoomFactor=Math.min((this.map.size.h/pixHeight),(this.map.size.w/pixWidth));var extent=this.map.getExtent();var center=this.map.getLonLatFromPixel(position.getCenterPixel());var xmin=center.lon-(extent.getWidth()/2)*zoomFactor;var xmax=center.lon+(extent.getWidth()/2)*zoomFactor;var ymin=center.lat-(extent.getHeight()/2)*zoomFactor;var ymax=center.lat+(extent.getHeight()/2)*zoomFactor;bounds=new OpenLayers.Bounds(xmin,ymin,xmax,ymax);} +return this.boxOffsets;},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:false,keyMask:null,alwaysZoom:false,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask});},zoomBox:function(position){if(position instanceof OpenLayers.Bounds){var bounds;if(!this.out){var minXY=this.map.getLonLatFromPixel({x:position.left,y:position.bottom});var maxXY=this.map.getLonLatFromPixel({x:position.right,y:position.top});bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{var pixWidth=Math.abs(position.right-position.left);var pixHeight=Math.abs(position.top-position.bottom);var zoomFactor=Math.min((this.map.size.h/pixHeight),(this.map.size.w/pixWidth));var extent=this.map.getExtent();var center=this.map.getLonLatFromPixel(position.getCenterPixel());var xmin=center.lon-(extent.getWidth()/2)*zoomFactor;var xmax=center.lon+(extent.getWidth()/2)*zoomFactor;var ymin=center.lat-(extent.getHeight()/2)*zoomFactor;var ymax=center.lat+(extent.getHeight()/2)*zoomFactor;bounds=new OpenLayers.Bounds(xmin,ymin,xmax,ymax);} var lastZoom=this.map.getZoom();this.map.zoomToExtent(bounds);if(lastZoom==this.map.getZoom()&&this.alwaysZoom==true){this.map.zoomTo(lastZoom+(this.out?-1:1));}}else{if(!this.out){this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()+1);}else{this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()-1);}}},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:false,interval:1,documentDrag:false,kinetic:null,enableKinetic:false,kineticInterval:10,draw:function(){if(this.enableKinetic){var config={interval:this.kineticInterval};if(typeof this.enableKinetic==="object"){config=OpenLayers.Util.extend(config,this.enableKinetic);} this.kinetic=new OpenLayers.Kinetic(config);} this.handler=new OpenLayers.Handler.Drag(this,{"move":this.panMap,"done":this.panMapDone,"down":this.panMapStart},{interval:this.interval,documentDrag:this.documentDrag});},panMapStart:function(){if(this.kinetic){this.kinetic.begin();}},panMap:function(xy){if(this.kinetic){this.kinetic.update(xy);} this.panned=true;this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:true,animate:false});},panMapDone:function(xy){if(this.panned){var res=null;if(this.kinetic){res=this.kinetic.end(xy);} this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:!!res,animate:false});if(res){var self=this;this.kinetic.move(res,function(x,y,end){self.map.pan(x,y,{dragging:!end,animate:false});});} -this.panned=false;}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,'double':false,pixelTolerance:0,dblclickTolerance:13,stopSingle:false,stopDouble:false,timerId:null,touch:false,down:null,last:null,first:null,rightclickTimerId:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);},touchstart:function(evt){if(!this.touch){this.unregisterMouseListeners();this.touch=true;} +this.panned=false;}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,'double':false,pixelTolerance:0,dblclickTolerance:13,stopSingle:false,stopDouble:false,timerId:null,touch:false,down:null,last:null,first:null,rightclickTimerId:null,touchstart:function(evt){if(!this.touch){this.unregisterMouseListeners();this.touch=true;} this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},touchmove:function(evt){this.last=this.getEventInfo(evt);return true;},touchend:function(evt){if(this.down){evt.xy=this.last.xy;evt.lastTouches=this.last.touches;this.handleSingle(evt);this.down=null;} return true;},unregisterMouseListeners:function(){this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,click:this.click,dblclick:this.dblclick,scope:this});},mousedown:function(evt){this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},mouseup:function(evt){var propagate=true;if(this.checkModifiers(evt)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(evt)){propagate=this.rightclick(evt);} return propagate;},rightclick:function(evt){if(this.passesTolerance(evt)){if(this.rightclickTimerId!=null){this.clearTimer();this.callback('dblrightclick',[evt]);return!this.stopDouble;}else{var clickEvent=this['double']?OpenLayers.Util.extend({},evt):this.callback('rightclick',[evt]);var delayedRightCall=OpenLayers.Function.bind(this.delayedRightCall,this,clickEvent);this.rightclickTimerId=window.setTimeout(delayedRightCall,this.delay);}} return!this.stopSingle;},delayedRightCall:function(evt){this.rightclickTimerId=null;if(evt){this.callback('rightclick',[evt]);}},click:function(evt){if(!this.last){this.last=this.getEventInfo(evt);} -this.handleSingle(evt);return!this.stopSingle;},dblclick:function(evt){this.handleDouble(evt);return!this.stopDouble;},handleDouble:function(evt){if(this["double"]&&this.passesDblclickTolerance(evt)){this.callback("dblclick",[evt]);}},handleSingle:function(evt){if(this.passesTolerance(evt)){if(this.timerId!=null){if(this.last.touches&&this.last.touches.length===1){if(this["double"]){OpenLayers.Event.stop(evt);} +this.handleSingle(evt);return!this.stopSingle;},dblclick:function(evt){this.handleDouble(evt);return!this.stopDouble;},handleDouble:function(evt){if(this.passesDblclickTolerance(evt)){if(this["double"]){this.callback("dblclick",[evt]);} +this.clearTimer();}},handleSingle:function(evt){if(this.passesTolerance(evt)){if(this.timerId!=null){if(this.last.touches&&this.last.touches.length===1){if(this["double"]){OpenLayers.Event.stop(evt);} this.handleDouble(evt);} if(!this.last.touches||this.last.touches.length!==2){this.clearTimer();}}else{this.first=this.getEventInfo(evt);var clickEvent=this.single?OpenLayers.Util.extend({},evt):null;this.queuePotentialClick(clickEvent);}}},queuePotentialClick:function(evt){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,evt),this.delay);},passesTolerance:function(evt){var passes=true;if(this.pixelTolerance!=null&&this.down&&this.down.xy){passes=this.pixelTolerance>=this.down.xy.distanceTo(evt.xy);if(passes&&this.touch&&this.down.touches.length===this.last.touches.length){for(var i=0,ii=this.down.touches.length;i<ii;++i){if(this.getTouchDistance(this.down.touches[i],this.last.touches[i])>this.pixelTolerance){passes=false;break;}}}} return passes;},getTouchDistance:function(from,to){return Math.sqrt(Math.pow(from.clientX-to.clientX,2)+ @@ -1162,45 +1129,12 @@ if(this.pinchZoom){this.pinchZoom.activate();} return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){if(this.pinchZoom){this.pinchZoom.deactivate();} this.zoomBox.deactivate();this.dragPan.deactivate();this.handlers.click.deactivate();this.handlers.wheel.deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},draw:function(){if(this.handleRightClicks){this.map.viewPortDiv.oncontextmenu=OpenLayers.Function.False;} var clickCallbacks={'click':this.defaultClick,'dblclick':this.defaultDblClick,'dblrightclick':this.defaultDblRightClick};var clickOptions={'double':true,'stopDouble':true};this.handlers.click=new OpenLayers.Handler.Click(this,clickCallbacks,clickOptions);this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,documentDrag:this.documentDrag},this.dragPanOptions));this.zoomBox=new OpenLayers.Control.ZoomBox({map:this.map,keyMask:this.zoomBoxKeyMask});this.dragPan.draw();this.zoomBox.draw();this.handlers.wheel=new OpenLayers.Handler.MouseWheel(this,{"up":this.wheelUp,"down":this.wheelDown},this.mouseWheelOptions);if(OpenLayers.Control.PinchZoom){this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},this.pinchZoomOptions));}},defaultClick:function(evt){if(evt.lastTouches&&evt.lastTouches.length==2){this.map.zoomOut();}},defaultDblClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom+1);},defaultDblRightClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom-1);},wheelChange:function(evt,deltaZ){var currentZoom=this.map.getZoom();var newZoom=this.map.getZoom()+Math.round(deltaZ);newZoom=Math.max(newZoom,0);newZoom=Math.min(newZoom,this.map.getNumZoomLevels());if(newZoom===currentZoom){return;} -var size=this.map.getSize();var deltaX=size.w/2-evt.xy.x;var deltaY=evt.xy.y-size.h/2;var newRes=this.map.baseLayer.getResolutionForZoom(newZoom);var zoomPoint=this.map.getLonLatFromPixel(evt.xy);var newCenter=new OpenLayers.LonLat(zoomPoint.lon+deltaX*newRes,zoomPoint.lat+deltaY*newRes);this.map.setCenter(newCenter,newZoom);},wheelUp:function(evt,delta){this.wheelChange(evt,delta||1);},wheelDown:function(evt,delta){this.wheelChange(evt,delta||-1);},disableZoomBox:function(){this.zoomBoxEnabled=false;this.zoomBox.deactivate();},enableZoomBox:function(){this.zoomBoxEnabled=true;if(this.active){this.zoomBox.activate();}},disableZoomWheel:function(){this.zoomWheelEnabled=false;this.handlers.wheel.deactivate();},enableZoomWheel:function(){this.zoomWheelEnabled=true;if(this.active){this.handlers.wheel.activate();}},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:false,initialize:function(name,url,params,options){OpenLayers.Layer.prototype.initialize.apply(this,[name,options]);this.url=url;this.params=OpenLayers.Util.extend({},params);},destroy:function(){this.url=null;this.params=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions());} -obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);return obj;},setUrl:function(newUrl){this.url=newUrl;},mergeNewParams:function(newParams){this.params=OpenLayers.Util.extend(this.params,newParams);var ret=this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"params"});} -return ret;},redraw:function(force){if(force){return this.mergeNewParams({"_olSalt":Math.random()});}else{return OpenLayers.Layer.prototype.redraw.apply(this,[]);}},selectUrl:function(paramString,urls){var product=1;for(var i=0,len=paramString.length;i<len;i++){product*=paramString.charCodeAt(i)*this.URL_HASH_FACTOR;product-=Math.floor(product);} -return urls[Math.floor(product*urls.length)];},getFullRequestString:function(newParams,altUrl){var url=altUrl||this.url;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var paramsString=OpenLayers.Util.getParameterString(allParams);if(OpenLayers.Util.isArray(url)){url=this.selectUrl(paramsString,url);} -var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}} -paramsString=OpenLayers.Util.getParameterString(allParams);return OpenLayers.Util.urlAppend(url,paramsString);},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,tileOriginCorner:"bl",tileOrigin:null,tileOptions:null,grid:null,singleTile:false,ratio:1.5,buffer:0,numLoadingTiles:0,tileLoadingDelay:100,timerId:null,initialize:function(name,url,params,options){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.events.addEventType("tileloaded");this.grid=[];this._moveGriddedTiles=OpenLayers.Function.bind(this.moveGriddedTiles,this);},removeMap:function(map){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;}},destroy:function(){this.clearGrid();this.grid=null;this.tileSize=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments);},clearGrid:function(){if(this.grid){for(var iRow=0,len=this.grid.length;iRow<len;iRow++){var row=this.grid[iRow];for(var iCol=0,clen=row.length;iCol<clen;iCol++){var tile=row[iCol];this.removeTileMonitoringHooks(tile);tile.destroy();}} -this.grid=[];}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.getOptions());} -obj=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this,[obj]);if(this.tileSize!=null){obj.tileSize=this.tileSize.clone();} -obj.grid=[];return obj;},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);bounds=bounds||this.map.getExtent();if(bounds!=null){var forceReTile=!this.grid.length||zoomChanged;var tilesBounds=this.getTilesBounds();if(this.singleTile){if(forceReTile||(!dragging&&!tilesBounds.containsBounds(bounds))){this.initSingleTile(bounds);}}else{if(forceReTile||!tilesBounds.containsBounds(bounds,true)){this.initGriddedTiles(bounds);}else{this.scheduleMoveGriddedTiles();}}}},moveByPx:function(dx,dy){if(!this.singleTile){this.scheduleMoveGriddedTiles();}},scheduleMoveGriddedTiles:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);} -this.timerId=window.setTimeout(this._moveGriddedTiles,this.tileLoadingDelay);},setTileSize:function(size){if(this.singleTile){size=this.map.getSize();size.h=parseInt(size.h*this.ratio);size.w=parseInt(size.w*this.ratio);} -OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[size]);},getGridBounds:function(){var msg="The getGridBounds() function is deprecated. It will be "+"removed in 3.0. Please use getTilesBounds() instead.";OpenLayers.Console.warn(msg);return this.getTilesBounds();},getTilesBounds:function(){var bounds=null;if(this.grid.length){var bottom=this.grid.length-1;var bottomLeftTile=this.grid[bottom][0];var right=this.grid[0].length-1;var topRightTile=this.grid[0][right];bounds=new OpenLayers.Bounds(bottomLeftTile.bounds.left,bottomLeftTile.bounds.bottom,topRightTile.bounds.right,topRightTile.bounds.top);} -return bounds;},initSingleTile:function(bounds){var center=bounds.getCenterLonLat();var tileWidth=bounds.getWidth()*this.ratio;var tileHeight=bounds.getHeight()*this.ratio;var tileBounds=new OpenLayers.Bounds(center.lon-(tileWidth/2),center.lat-(tileHeight/2),center.lon+(tileWidth/2),center.lat+(tileHeight/2));var ul=new OpenLayers.LonLat(tileBounds.left,tileBounds.top);var px=this.map.getLayerPxFromLonLat(ul);if(!this.grid.length){this.grid[0]=[];} -var tile=this.grid[0][0];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);tile.draw();this.grid[0][0]=tile;}else{tile.moveTo(tileBounds,px);} -this.removeExcessTiles(1,1);},calculateGridLayout:function(bounds,origin,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-origin.lon;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=origin.lon+tilecol*tilelon;var offsetlat=bounds.top-(origin.lat+tilelat);var tilerow=Math.ceil(offsetlat/tilelat)+this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=-tilerowremain*this.tileSize.h;var tileoffsetlat=origin.lat+tilerow*tilelat;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},getTileOrigin:function(){var origin=this.tileOrigin;if(!origin){var extent=this.getMaxExtent();var edges=({"tl":["left","top"],"tr":["right","top"],"bl":["left","bottom"],"br":["right","bottom"]})[this.tileOriginCorner];origin=new OpenLayers.LonLat(extent[edges[0]],extent[edges[1]]);} -return origin;},initGriddedTiles:function(bounds){var viewSize=this.map.getSize();var minRows=Math.ceil(viewSize.h/this.tileSize.h)+ -Math.max(1,2*this.buffer);var minCols=Math.ceil(viewSize.w/this.tileSize.w)+ -Math.max(1,2*this.buffer);var origin=this.getTileOrigin();var resolution=this.map.getResolution();var tileLayout=this.calculateGridLayout(bounds,origin,resolution);var tileoffsetx=Math.round(tileLayout.tileoffsetx);var tileoffsety=Math.round(tileLayout.tileoffsety);var tileoffsetlon=tileLayout.tileoffsetlon;var tileoffsetlat=tileLayout.tileoffsetlat;var tilelon=tileLayout.tilelon;var tilelat=tileLayout.tilelat;this.origin=new OpenLayers.Pixel(tileoffsetx,tileoffsety);var startX=tileoffsetx;var startLon=tileoffsetlon;var rowidx=0;var layerContainerDivLeft=parseInt(this.map.layerContainerDiv.style.left);var layerContainerDivTop=parseInt(this.map.layerContainerDiv.style.top);do{var row=this.grid[rowidx++];if(!row){row=[];this.grid.push(row);} -tileoffsetlon=startLon;tileoffsetx=startX;var colidx=0;do{var tileBounds=new OpenLayers.Bounds(tileoffsetlon,tileoffsetlat,tileoffsetlon+tilelon,tileoffsetlat+tilelat);var x=tileoffsetx;x-=layerContainerDivLeft;var y=tileoffsety;y-=layerContainerDivTop;var px=new OpenLayers.Pixel(x,y);var tile=row[colidx++];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);row.push(tile);}else{tile.moveTo(tileBounds,px,false);} -tileoffsetlon+=tilelon;tileoffsetx+=this.tileSize.w;}while((tileoffsetlon<=bounds.right+tilelon*this.buffer)||colidx<minCols);tileoffsetlat-=tilelat;tileoffsety+=this.tileSize.h;}while((tileoffsetlat>=bounds.bottom-tilelat*this.buffer)||rowidx<minRows);this.removeExcessTiles(rowidx,colidx);this.spiralTileLoad();},getMaxExtent:function(){return this.maxExtent;},spiralTileLoad:function(){var tileQueue=[];var directions=["right","down","left","up"];var iRow=0;var iCell=-1;var direction=OpenLayers.Util.indexOf(directions,"right");var directionsTried=0;while(directionsTried<directions.length){var testRow=iRow;var testCell=iCell;switch(directions[direction]){case"right":testCell++;break;case"down":testRow++;break;case"left":testCell--;break;case"up":testRow--;break;} -var tile=null;if((testRow<this.grid.length)&&(testRow>=0)&&(testCell<this.grid[0].length)&&(testCell>=0)){tile=this.grid[testRow][testCell];} -if((tile!=null)&&(!tile.queued)){tileQueue.unshift(tile);tile.queued=true;directionsTried=0;iRow=testRow;iCell=testCell;}else{direction=(direction+1)%4;directionsTried++;}} -for(var i=0,len=tileQueue.length;i<len;i++){var tile=tileQueue[i];tile.draw();tile.queued=false;}},addTile:function(bounds,position){return new OpenLayers.Tile.Image(this,position,bounds,null,this.tileSize,this.tileOptions);},addTileMonitoringHooks:function(tile){tile.onLoadStart=function(){if(this.numLoadingTiles==0){this.events.triggerEvent("loadstart");} -this.numLoadingTiles++;};tile.events.register("loadstart",this,tile.onLoadStart);tile.onLoadEnd=function(){this.numLoadingTiles--;this.events.triggerEvent("tileloaded");if(this.numLoadingTiles==0){this.events.triggerEvent("loadend");}};tile.events.register("loadend",this,tile.onLoadEnd);tile.events.register("unload",this,tile.onLoadEnd);},removeTileMonitoringHooks:function(tile){tile.unload();tile.events.un({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,scope:this});},moveGriddedTiles:function(){var shifted=true;var buffer=this.buffer||1;var tlLayer=this.grid[0][0].position;var offsetX=parseInt(this.map.layerContainerDiv.style.left);var offsetY=parseInt(this.map.layerContainerDiv.style.top);var tlViewPort=tlLayer.add(offsetX,offsetY);if(tlViewPort.x>-this.tileSize.w*(buffer-1)){this.shiftColumn(true);}else if(tlViewPort.x<-this.tileSize.w*buffer){this.shiftColumn(false);}else if(tlViewPort.y>-this.tileSize.h*(buffer-1)){this.shiftRow(true);}else if(tlViewPort.y<-this.tileSize.h*buffer){this.shiftRow(false);}else{shifted=false;} -if(shifted){this.timerId=window.setTimeout(this._moveGriddedTiles,0);}},shiftRow:function(prepend){var modelRowIndex=(prepend)?0:(this.grid.length-1);var grid=this.grid;var modelRow=grid[modelRowIndex];var resolution=this.map.getResolution();var deltaY=(prepend)?-this.tileSize.h:this.tileSize.h;var deltaLat=resolution*-deltaY;var row=(prepend)?grid.pop():grid.shift();for(var i=0,len=modelRow.length;i<len;i++){var modelTile=modelRow[i];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.bottom=bounds.bottom+deltaLat;bounds.top=bounds.top+deltaLat;position.y=position.y+deltaY;row[i].moveTo(bounds,position);} -if(prepend){grid.unshift(row);}else{grid.push(row);}},shiftColumn:function(prepend){var deltaX=(prepend)?-this.tileSize.w:this.tileSize.w;var resolution=this.map.getResolution();var deltaLon=resolution*deltaX;for(var i=0,len=this.grid.length;i<len;i++){var row=this.grid[i];var modelTileIndex=(prepend)?0:(row.length-1);var modelTile=row[modelTileIndex];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.left=bounds.left+deltaLon;bounds.right=bounds.right+deltaLon;position.x=position.x+deltaX;var tile=prepend?this.grid[i].pop():this.grid[i].shift();tile.moveTo(bounds,position);if(prepend){row.unshift(tile);}else{row.push(tile);}}},removeExcessTiles:function(rows,columns){while(this.grid.length>rows){var row=this.grid.pop();for(var i=0,l=row.length;i<l;i++){var tile=row[i];this.removeTileMonitoringHooks(tile);tile.destroy();}} -while(this.grid[0].length>columns){for(var i=0,l=this.grid.length;i<l;i++){var row=this.grid[i];var tile=row.pop();this.removeTileMonitoringHooks(tile);tile.destroy();}}},onMapResize:function(){if(this.singleTile){this.clearGrid();this.setTileSize();}},getTileBounds:function(viewPortPx){var maxExtent=this.maxExtent;var resolution=this.getResolution();var tileMapWidth=resolution*this.tileSize.w;var tileMapHeight=resolution*this.tileSize.h;var mapPoint=this.getLonLatFromViewPortPx(viewPortPx);var tileLeft=maxExtent.left+(tileMapWidth*Math.floor((mapPoint.lon- -maxExtent.left)/tileMapWidth));var tileBottom=maxExtent.bottom+(tileMapHeight*Math.floor((mapPoint.lat- -maxExtent.bottom)/tileMapHeight));return new OpenLayers.Bounds(tileLeft,tileBottom,tileLeft+tileMapWidth,tileBottom+tileMapHeight);},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,sphericalMercator:false,zoomOffset:0,serverResolutions:null,initialize:function(name,url,options){if(options&&options.sphericalMercator||this.sphericalMercator){options=OpenLayers.Util.extend({maxExtent:new OpenLayers.Bounds(-128*156543.03390625,-128*156543.03390625,128*156543.03390625,128*156543.03390625),maxResolution:156543.03390625,numZoomLevels:19,units:"m",projection:"EPSG:900913"},options);} -url=url||this.url;name=name||this.name;var newArguments=[name,url,{},options];OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions());} -obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var xyz=this.getXYZ(bounds);var url=this.url;if(OpenLayers.Util.isArray(url)){var s=''+xyz.x+xyz.y+xyz.z;url=this.selectUrl(s,url);} -return OpenLayers.String.format(url,xyz);},getXYZ:function(bounds){var res=this.map.getResolution();var x=Math.round((bounds.left-this.maxExtent.left)/(res*this.tileSize.w));var y=Math.round((this.maxExtent.top-bounds.top)/(res*this.tileSize.h));var z=this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,res):this.map.getZoom()+this.zoomOffset;var limit=Math.pow(2,z);if(this.wrapDateLine) -{x=((x%limit)+limit)%limit;} -return{'x':x,'y':y,'z':z};},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",attribution:"Data CC-By-SA by <a href='http://openstreetmap.org/'>OpenStreetMap</a>",sphericalMercator:true,url:'http://tile.openstreetmap.org/${z}/${x}/${y}.png',clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions());} -obj=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);return obj;},wrapDateLine:true,CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Lang["sk"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Neobslúžené požiadavky vracajú ${statusText}",'Permalink':"Trvalý odkaz",'Overlays':"Prekrytia",'Base Layer':"Základná vrstva",'readNotImplemented':"Čítanie nie je implementované.",'writeNotImplemented':"Zápis nie je implementovaný.",'noFID':"Nie je možné aktualizovať vlastnosť, pre ktorú neexistuje FID.",'errorLoadingGML':"Chyba pri načítaní súboru GML ${url}",'browserNotSupported':"Váš prehliadač nepodporuje vykresľovanie vektorov. Momentálne podporované vykresľovače sú:\n${renderers}",'componentShouldBe':"addFeatures: komponent by mal byť ${geomType}",'getFeatureError':"getFeatureFromEvent bola zavolaná na vrstve bez vykresľovača. To zvyčajne znamená, že ste odstránili vrstvu, ale nie niektorú z obslúh, ktorá je s ňou asociovaná.",'minZoomLevelError':"Vlastnosť minZoomLevel je určený iba na použitie s vrstvami odvodenými od FixedZoomLevels. To, že táto wfs vrstva kontroluje minZoomLevel je pozostatok z minulosti. Nemôžeme ho však odstrániť, aby sme sa vyhli možnému porušeniu aplikácií založených na Open Layers, ktoré na tomto môže závisieť. Preto ho označujeme ako zavrhovaný - dolu uvedená kontrola minZoomLevel bude odstránená vo verzii 3.0. Použite prosím namiesto toho kontrolu min./max. rozlíšenia podľa tu uvedeného popisu: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transakcia WFS: ÚSPEŠNÁ ${response}",'commitFailed':"Transakcia WFS: ZLYHALA ${response}",'googleWarning':"Vrstvu Google nebolo možné správne načítať.\x3cbr\x3e\x3cbr\x3eAby ste sa tejto správy zbavili vyberte novú BaseLayer v prepínači vrstiev v pravom hornom rohu.\x3cbr\x3e\x3cbr\x3eToto sa stalo pravdepodobne preto, že skript knižnice Google Maps buď nebol načítaný alebo neobsahuje správny kľúč API pre vašu lokalitu.\x3cbr\x3e\x3cbr\x3eVývojári: Tu môžete získať \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3epomoc so sfunkčnením\x3c/a\x3e",'getLayerWarning':"Vrstvu ${layerType} nebolo možné správne načítať.\x3cbr\x3e\x3cbr\x3eAby ste sa tejto správy zbavili vyberte novú BaseLayer v prepínači vrstiev v pravom hornom rohu.\x3cbr\x3e\x3cbr\x3eToto sa stalo pravdepodobne preto, že skript knižnice ${layerType} buď nebol načítaný alebo neobsahuje správny kľúč API pre vašu lokalitu.\x3cbr\x3e\x3cbr\x3eVývojári: Tu môžete získať \x3ca href=\'http://trac.openlayers.org/wiki/${layerType}\' target=\'_blank\'\x3epomoc so sfunkčnením\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Mierka = 1 : ${scaleDenom}",'layerAlreadyAdded':"Pokúsili ste sa do mapy pridať vrstvu ${layerName}, ale tá už bola pridaná",'reprojectDeprecated':"Používate voľby „reproject“ vrstvy ${layerType}. Táto voľba je zzavrhovaná: jej použitie bolo navrhnuté na podporu zobrazovania údajov nad komerčnými základovými mapami, ale túto funkcionalitu je teraz možné dosiahnuť pomocou Spherical Mercator. Ďalšie informácie získate na stránke http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Táto metóda je zavrhovaná a bude odstránená vo verzii 3.0. Použite prosím namiesto nej metódu ${newMethod}.",'boundsAddError':"Sčítacej funkcii musíte dať hodnoty x aj y.",'lonlatAddError':"Sčítacej funkcii musíte dať hodnoty lon (zem. dĺžka) aj lat (zem. šírka).",'pixelAddError':"Sčítacej funkcii musíte dať hodnoty x aj y.",'unsupportedGeometryType':"Nepodporovaný typ geometrie: ${geomType}",'filterEvaluateNotImplemented':"evaluate nie je implementovaný pre tento typ filtra"});OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15000,translationParameters:null,symbolMetrics:null,initialize:function(containerID){if(!this.supported()){return;} -OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);this.translationParameters={x:0,y:0};this.symbolMetrics={};},supported:function(){var svgFeature="http://www.w3.org/TR/SVG11/feature#";return(document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature(svgFeature+"SVG","1.1")||document.implementation.hasFeature(svgFeature+"BasicStructure","1.1")));},inValidRange:function(x,y,xyOnly){var left=x+(xyOnly?0:this.translationParameters.x);var top=y+(xyOnly?0:this.translationParameters.y);return(left>=-this.MAX_PIXEL&&left<=this.MAX_PIXEL&&top>=-this.MAX_PIXEL&&top<=this.MAX_PIXEL);},setExtent:function(extent,resolutionChanged){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=-extent.left/resolution;var top=extent.top/resolution;if(resolutionChanged){this.left=left;this.top=top;var extentString="0 0 "+this.size.w+" "+this.size.h;this.rendererRoot.setAttributeNS(null,"viewBox",extentString);this.translate(0,0);return true;}else{var inRange=this.translate(left-this.left,top-this.top);if(!inRange){this.setExtent(extent,true);} -return inRange;}},translate:function(x,y){if(!this.inValidRange(x,y,true)){return false;}else{var transformString="";if(x||y){transformString="translate("+x+","+y+")";} +var size=this.map.getSize();var deltaX=size.w/2-evt.xy.x;var deltaY=evt.xy.y-size.h/2;var newRes=this.map.baseLayer.getResolutionForZoom(newZoom);var zoomPoint=this.map.getLonLatFromPixel(evt.xy);var newCenter=new OpenLayers.LonLat(zoomPoint.lon+deltaX*newRes,zoomPoint.lat+deltaY*newRes);this.map.setCenter(newCenter,newZoom);},wheelUp:function(evt,delta){this.wheelChange(evt,delta||1);},wheelDown:function(evt,delta){this.wheelChange(evt,delta||-1);},disableZoomBox:function(){this.zoomBoxEnabled=false;this.zoomBox.deactivate();},enableZoomBox:function(){this.zoomBoxEnabled=true;if(this.active){this.zoomBox.activate();}},disableZoomWheel:function(){this.zoomWheelEnabled=false;this.handlers.wheel.deactivate();},enableZoomWheel:function(){this.zoomWheelEnabled=true;if(this.active){this.handlers.wheel.activate();}},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Lang["sk"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Neobslúžené požiadavky vracajú ${statusText}",'Permalink':"Trvalý odkaz",'Overlays':"Prekrytia",'Base Layer':"Základná vrstva",'noFID':"Nie je možné aktualizovať vlastnosť, pre ktorú neexistuje FID.",'browserNotSupported':"Váš prehliadač nepodporuje vykresľovanie vektorov. Momentálne podporované vykresľovače sú:\n${renderers}",'minZoomLevelError':"Vlastnosť minZoomLevel je určený iba na použitie s vrstvami odvodenými od FixedZoomLevels. To, že táto wfs vrstva kontroluje minZoomLevel je pozostatok z minulosti. Nemôžeme ho však odstrániť, aby sme sa vyhli možnému porušeniu aplikácií založených na Open Layers, ktoré na tomto môže závisieť. Preto ho označujeme ako zavrhovaný - dolu uvedená kontrola minZoomLevel bude odstránená vo verzii 3.0. Použite prosím namiesto toho kontrolu min./max. rozlíšenia podľa tu uvedeného popisu: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transakcia WFS: ÚSPEŠNÁ ${response}",'commitFailed':"Transakcia WFS: ZLYHALA ${response}",'googleWarning':"Vrstvu Google nebolo možné správne načítať.\x3cbr\x3e\x3cbr\x3eAby ste sa tejto správy zbavili vyberte novú BaseLayer v prepínači vrstiev v pravom hornom rohu.\x3cbr\x3e\x3cbr\x3eToto sa stalo pravdepodobne preto, že skript knižnice Google Maps buď nebol načítaný alebo neobsahuje správny kľúč API pre vašu lokalitu.\x3cbr\x3e\x3cbr\x3eVývojári: Tu môžete získať \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3epomoc so sfunkčnením\x3c/a\x3e",'getLayerWarning':"Vrstvu ${layerType} nebolo možné správne načítať.\x3cbr\x3e\x3cbr\x3eAby ste sa tejto správy zbavili vyberte novú BaseLayer v prepínači vrstiev v pravom hornom rohu.\x3cbr\x3e\x3cbr\x3eToto sa stalo pravdepodobne preto, že skript knižnice ${layerType} buď nebol načítaný alebo neobsahuje správny kľúč API pre vašu lokalitu.\x3cbr\x3e\x3cbr\x3eVývojári: Tu môžete získať \x3ca href=\'http://trac.openlayers.org/wiki/${layerType}\' target=\'_blank\'\x3epomoc so sfunkčnením\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Mierka = 1 : ${scaleDenom}",'reprojectDeprecated':"Používate voľby „reproject“ vrstvy ${layerType}. Táto voľba je zzavrhovaná: jej použitie bolo navrhnuté na podporu zobrazovania údajov nad komerčnými základovými mapami, ale túto funkcionalitu je teraz možné dosiahnuť pomocou Spherical Mercator. Ďalšie informácie získate na stránke http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Táto metóda je zavrhovaná a bude odstránená vo verzii 3.0. Použite prosím namiesto nej metódu ${newMethod}."});OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15000,translationParameters:null,symbolMetrics:null,initialize:function(containerID){if(!this.supported()){return;} +OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);this.translationParameters={x:0,y:0};this.symbolMetrics={};},supported:function(){var svgFeature="http://www.w3.org/TR/SVG11/feature#";return(document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature(svgFeature+"SVG","1.1")||document.implementation.hasFeature(svgFeature+"BasicStructure","1.1")));},inValidRange:function(x,y,xyOnly){var left=x+(xyOnly?0:this.translationParameters.x);var top=y+(xyOnly?0:this.translationParameters.y);return(left>=-this.MAX_PIXEL&&left<=this.MAX_PIXEL&&top>=-this.MAX_PIXEL&&top<=this.MAX_PIXEL);},setExtent:function(extent,resolutionChanged){var coordSysUnchanged=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution(),left=-extent.left/resolution,top=extent.top/resolution;if(resolutionChanged){this.left=left;this.top=top;var extentString="0 0 "+this.size.w+" "+this.size.h;this.rendererRoot.setAttributeNS(null,"viewBox",extentString);this.translate(this.xOffset,0);return true;}else{var inRange=this.translate(left-this.left+this.xOffset,top-this.top);if(!inRange){this.setExtent(extent,true);} +return coordSysUnchanged&&inRange;}},translate:function(x,y){if(!this.inValidRange(x,y,true)){return false;}else{var transformString="";if(x||y){transformString="translate("+x+","+y+")";} this.root.setAttributeNS(null,"transform",transformString);this.translationParameters={x:x,y:y};return true;}},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);this.rendererRoot.setAttributeNS(null,"height",this.size.h);},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="image";}else if(this.isComplexSymbol(style.graphicName)){nodeType="svg";}else{nodeType="circle";} -break;case"OpenLayers.Geometry.Rectangle":nodeType="rect";break;case"OpenLayers.Geometry.LineString":nodeType="polyline";break;case"OpenLayers.Geometry.LinearRing":nodeType="polygon";break;case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="path";break;default:break;} -return nodeType;},setStyle:function(node,style,options){style=style||node._style;options=options||node._options;var r=parseFloat(node.getAttributeNS(null,"r"));var widthFactor=1;var pos;if(node._geometryClass=="OpenLayers.Geometry.Point"&&r){node.style.visibility="";if(style.graphic===false){node.style.visibility="hidden";}else if(style.externalGraphic){pos=this.getPosition(node);if(style.graphicTitle){node.setAttributeNS(null,"title",style.graphicTitle);var label=this.nodeFactory(null,"title");label.textContent=style.graphicTitle;node.appendChild(label);} +break;case"OpenLayers.Geometry.Rectangle":nodeType="rect";break;case"OpenLayers.Geometry.LineString":nodeType="polyline";break;case"OpenLayers.Geometry.LinearRing":nodeType="polygon";break;case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":nodeType="path";break;default:break;} +return nodeType;},setStyle:function(node,style,options){style=style||node._style;options=options||node._options;var r=parseFloat(node.getAttributeNS(null,"r"));var widthFactor=1;var pos;if(node._geometryClass=="OpenLayers.Geometry.Point"&&r){node.style.visibility="";if(style.graphic===false){node.style.visibility="hidden";}else if(style.externalGraphic){pos=this.getPosition(node);if(style.graphicTitle){node.setAttributeNS(null,"title",style.graphicTitle);var titleNode=node.getElementsByTagName("title");if(titleNode.length>0){titleNode[0].firstChild.textContent=style.graphicTitle;}else{var label=this.nodeFactory(null,"title");label.textContent=style.graphicTitle;node.appendChild(label);}} if(style.graphicWidth&&style.graphicHeight){node.setAttributeNS(null,"preserveAspectRatio","none");} var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;node.setAttributeNS(null,"x",(pos.x+xOffset).toFixed());node.setAttributeNS(null,"y",(pos.y+yOffset).toFixed());node.setAttributeNS(null,"width",width);node.setAttributeNS(null,"height",height);node.setAttributeNS(this.xlinkns,"href",style.externalGraphic);node.setAttributeNS(null,"style","opacity: "+opacity);node.onclick=OpenLayers.Renderer.SVG.preventDefault;}else if(this.isComplexSymbol(style.graphicName)){var offset=style.pointRadius*3;var size=offset*2;var src=this.importSymbol(style.graphicName);pos=this.getPosition(node);widthFactor=this.symbolMetrics[src.id][0]*3/size;var parent=node.parentNode;var nextSibling=node.nextSibling;if(parent){parent.removeChild(node);} node.firstChild&&node.removeChild(node.firstChild);node.appendChild(src.firstChild.cloneNode(true));node.setAttributeNS(null,"viewBox",src.getAttributeNS(null,"viewBox"));node.setAttributeNS(null,"width",size);node.setAttributeNS(null,"height",size);node.setAttributeNS(null,"x",pos.x-offset);node.setAttributeNS(null,"y",pos.y-offset);if(nextSibling){parent.insertBefore(node,nextSibling);}else if(parent){parent.appendChild(node);}}else{node.setAttributeNS(null,"r",style.pointRadius);} @@ -1214,21 +1148,20 @@ if(options.isStroked){node.setAttributeNS(null,"stroke",style.strokeColor);node. if(style.pointerEvents){node.setAttributeNS(null,"pointer-events",style.pointerEvents);} if(style.cursor!=null){node.setAttributeNS(null,"cursor",style.cursor);} return node;},dashStyle:function(style,widthFactor){var w=style.strokeWidth*widthFactor;var str=style.strokeDashstyle;switch(str){case'solid':return'none';case'dot':return[1,4*w].join();case'dash':return[4*w,4*w].join();case'dashdot':return[4*w,4*w,1,4*w].join();case'longdash':return[8*w,4*w].join();case'longdashdot':return[8*w,4*w,1,4*w].join();default:return OpenLayers.String.trim(str).replace(/\s+/g,",");}},createNode:function(type,id){var node=document.createElementNS(this.xmlns,type);if(id){node.setAttributeNS(null,"id",id);} -return node;},nodeTypeCompare:function(node,type){return(type==node.nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_svgRoot","svg");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"g");},createDefs:function(){var defs=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(defs);return defs;},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"cx",x);node.setAttributeNS(null,"cy",y);node.setAttributeNS(null,"r",radius);return node;}else{return false;}},drawLineString:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawLinearRing:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawPolygon:function(node,geometry){var d="";var draw=true;var complete=true;var linearRingResult,path;for(var j=0,len=geometry.components.length;j<len;j++){d+=" M";linearRingResult=this.getComponentsString(geometry.components[j].components," ");path=linearRingResult.path;if(path){d+=" "+path;complete=linearRingResult.complete&&complete;}else{draw=false;}} -d+=" z";if(draw){node.setAttributeNS(null,"d",d);node.setAttributeNS(null,"fill-rule","evenodd");return complete?node:null;}else{return false;}},drawRectangle:function(node,geometry){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"x",x);node.setAttributeNS(null,"y",y);node.setAttributeNS(null,"width",geometry.width/resolution);node.setAttributeNS(null,"height",geometry.height/resolution);return node;}else{return false;}},drawSurface:function(node,geometry){var d=null;var draw=true;for(var i=0,len=geometry.components.length;i<len;i++){if((i%3)==0&&(i/3)==0){var component=this.getShortString(geometry.components[i]);if(!component){draw=false;} -d="M "+component;}else if((i%3)==1){var component=this.getShortString(geometry.components[i]);if(!component){draw=false;} -d+=" C "+component;}else{var component=this.getShortString(geometry.components[i]);if(!component){draw=false;} -d+=" "+component;}} -d+=" Z";if(draw){node.setAttributeNS(null,"d",d);return node;}else{return false;}},drawText:function(featureId,style,location){var resolution=this.getResolution();var x=(location.x/resolution+this.left);var y=(location.y/resolution-this.top);var label=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX,"text");label.setAttributeNS(null,"x",x);label.setAttributeNS(null,"y",-y);if(style.fontColor){label.setAttributeNS(null,"fill",style.fontColor);} +return node;},nodeTypeCompare:function(node,type){return(type==node.nodeName);},createRenderRoot:function(){var svg=this.nodeFactory(this.container.id+"_svgRoot","svg");svg.style.display="block";return svg;},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"g");},createDefs:function(){var defs=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(defs);return defs;},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){var resolution=this.getResolution();var x=((geometry.x-this.featureDx)/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"cx",x);node.setAttributeNS(null,"cy",y);node.setAttributeNS(null,"r",radius);return node;}else{return false;}},drawLineString:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawLinearRing:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawPolygon:function(node,geometry){var d="";var draw=true;var complete=true;var linearRingResult,path;for(var j=0,len=geometry.components.length;j<len;j++){d+=" M";linearRingResult=this.getComponentsString(geometry.components[j].components," ");path=linearRingResult.path;if(path){d+=" "+path;complete=linearRingResult.complete&&complete;}else{draw=false;}} +d+=" z";if(draw){node.setAttributeNS(null,"d",d);node.setAttributeNS(null,"fill-rule","evenodd");return complete?node:null;}else{return false;}},drawRectangle:function(node,geometry){var resolution=this.getResolution();var x=((geometry.x-this.featureDx)/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"x",x);node.setAttributeNS(null,"y",y);node.setAttributeNS(null,"width",geometry.width/resolution);node.setAttributeNS(null,"height",geometry.height/resolution);return node;}else{return false;}},drawText:function(featureId,style,location){var drawOutline=(!!style.labelOutlineWidth);if(drawOutline){var outlineStyle=OpenLayers.Util.extend({},style);outlineStyle.fontColor=outlineStyle.labelOutlineColor;outlineStyle.fontStrokeColor=outlineStyle.labelOutlineColor;outlineStyle.fontStrokeWidth=style.labelOutlineWidth;delete outlineStyle.labelOutlineWidth;this.drawText(featureId,outlineStyle,location);} +var resolution=this.getResolution();var x=((location.x-this.featureDx)/resolution+this.left);var y=(location.y/resolution-this.top);var suffix=(drawOutline)?this.LABEL_OUTLINE_SUFFIX:this.LABEL_ID_SUFFIX;var label=this.nodeFactory(featureId+suffix,"text");label.setAttributeNS(null,"x",x);label.setAttributeNS(null,"y",-y);if(style.fontColor){label.setAttributeNS(null,"fill",style.fontColor);} +if(style.fontStrokeColor){label.setAttributeNS(null,"stroke",style.fontStrokeColor);} +if(style.fontStrokeWidth){label.setAttributeNS(null,"stroke-width",style.fontStrokeWidth);} if(style.fontOpacity){label.setAttributeNS(null,"opacity",style.fontOpacity);} if(style.fontFamily){label.setAttributeNS(null,"font-family",style.fontFamily);} if(style.fontSize){label.setAttributeNS(null,"font-size",style.fontSize);} if(style.fontWeight){label.setAttributeNS(null,"font-weight",style.fontWeight);} if(style.fontStyle){label.setAttributeNS(null,"font-style",style.fontStyle);} if(style.labelSelect===true){label.setAttributeNS(null,"pointer-events","visible");label._featureId=featureId;}else{label.setAttributeNS(null,"pointer-events","none");} -var align=style.labelAlign||"cm";label.setAttributeNS(null,"text-anchor",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[0]]||"middle");if(OpenLayers.IS_GECKO===true){label.setAttributeNS(null,"dominant-baseline",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[1]]||"central");} +var align=style.labelAlign||OpenLayers.Renderer.defaultSymbolizer.labelAlign;label.setAttributeNS(null,"text-anchor",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[0]]||"middle");if(OpenLayers.IS_GECKO===true){label.setAttributeNS(null,"dominant-baseline",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[1]]||"central");} var labelRows=style.label.split('\n');var numRows=labelRows.length;while(label.childNodes.length>numRows){label.removeChild(label.lastChild);} -for(var i=0;i<numRows;i++){var tspan=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX+"_tspan_"+i,"tspan");if(style.labelSelect===true){tspan._featureId=featureId;tspan._geometry=location;tspan._geometryClass=location.CLASS_NAME;} +for(var i=0;i<numRows;i++){var tspan=this.nodeFactory(featureId+suffix+"_tspan_"+i,"tspan");if(style.labelSelect===true){tspan._featureId=featureId;tspan._geometry=location;tspan._geometryClass=location.CLASS_NAME;} if(OpenLayers.IS_GECKO===false){tspan.setAttributeNS(null,"baseline-shift",OpenLayers.Renderer.SVG.LABEL_VSHIFT[align[1]]||"-35%");} tspan.setAttribute("x",x);if(i==0){var vfactor=OpenLayers.Renderer.SVG.LABEL_VFACTOR[align[1]];if(vfactor==null){vfactor=-.5;} tspan.setAttribute("dy",(vfactor*(numRows-1))+"em");}else{tspan.setAttribute("dy","1em");} @@ -1237,52 +1170,28 @@ if(!label.parentNode){this.textRoot.appendChild(label);}},getComponentsString:fu if(i<len-1){if(this.getShortString(components[i+1])){strings.push(this.clipLine(components[i],components[i+1]));}} complete=false;}} return{path:strings.join(separator||","),complete:complete};},clipLine:function(badComponent,goodComponent){if(goodComponent.equals(badComponent)){return"";} -var resolution=this.getResolution();var maxX=this.MAX_PIXEL-this.translationParameters.x;var maxY=this.MAX_PIXEL-this.translationParameters.y;var x1=goodComponent.x/resolution+this.left;var y1=this.top-goodComponent.y/resolution;var x2=badComponent.x/resolution+this.left;var y2=this.top-badComponent.y/resolution;var k;if(x2<-maxX||x2>maxX){k=(y2-y1)/(x2-x1);x2=x2<0?-maxX:maxX;y2=y1+(x2-x1)*k;} +var resolution=this.getResolution();var maxX=this.MAX_PIXEL-this.translationParameters.x;var maxY=this.MAX_PIXEL-this.translationParameters.y;var x1=(goodComponent.x-this.featureDx)/resolution+this.left;var y1=this.top-goodComponent.y/resolution;var x2=(badComponent.x-this.featureDx)/resolution+this.left;var y2=this.top-badComponent.y/resolution;var k;if(x2<-maxX||x2>maxX){k=(y2-y1)/(x2-x1);x2=x2<0?-maxX:maxX;y2=y1+(x2-x1)*k;} if(y2<-maxY||y2>maxY){k=(x2-x1)/(y2-y1);y2=y2<0?-maxY:maxY;x2=x1+(y2-y1)*k;} -return x2+","+y2;},getShortString:function(point){var resolution=this.getResolution();var x=(point.x/resolution+this.left);var y=(this.top-point.y/resolution);if(this.inValidRange(x,y)){return x+","+y;}else{return false;}},getPosition:function(node){return({x:parseFloat(node.getAttributeNS(null,"cx")),y:parseFloat(node.getAttributeNS(null,"cy"))});},importSymbol:function(graphicName){if(!this.defs){this.defs=this.createDefs();} -var id=this.container.id+"-"+graphicName;var existing=document.getElementById(id) -if(existing!=null){return existing;} +return x2+","+y2;},getShortString:function(point){var resolution=this.getResolution();var x=((point.x-this.featureDx)/resolution+this.left);var y=(this.top-point.y/resolution);if(this.inValidRange(x,y)){return x+","+y;}else{return false;}},getPosition:function(node){return({x:parseFloat(node.getAttributeNS(null,"cx")),y:parseFloat(node.getAttributeNS(null,"cy"))});},importSymbol:function(graphicName){if(!this.defs){this.defs=this.createDefs();} +var id=this.container.id+"-"+graphicName;var existing=document.getElementById(id);if(existing!=null){return existing;} var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');} var symbolNode=this.nodeFactory(id,"symbol");var node=this.nodeFactory(null,"polygon");symbolNode.appendChild(node);var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var points=[];var x,y;for(var i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];symbolExtent.left=Math.min(symbolExtent.left,x);symbolExtent.bottom=Math.min(symbolExtent.bottom,y);symbolExtent.right=Math.max(symbolExtent.right,x);symbolExtent.top=Math.max(symbolExtent.top,y);points.push(x,",",y);} -node.setAttributeNS(null,"points",points.join(" "));var width=symbolExtent.getWidth();var height=symbolExtent.getHeight();var viewBox=[symbolExtent.left-width,symbolExtent.bottom-height,width*3,height*3];symbolNode.setAttributeNS(null,"viewBox",viewBox.join(" "));this.symbolMetrics[id]=[Math.max(width,height),symbolExtent.getCenterLonLat().lon,symbolExtent.getCenterLonLat().lat];this.defs.appendChild(symbolNode);return symbolNode;},getFeatureIdFromEvent:function(evt){var featureId=OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this,arguments);if(!featureId){var target=evt.target;featureId=target.parentNode&&target!=this.rendererRoot&&target.parentNode._featureId;} -return featureId;},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.SVG.LABEL_ALIGN={"l":"start","r":"end","b":"bottom","t":"hanging"};OpenLayers.Renderer.SVG.LABEL_VSHIFT={"t":"-70%","b":"0"};OpenLayers.Renderer.SVG.LABEL_VFACTOR={"t":0,"b":-1};OpenLayers.Renderer.SVG.preventDefault=function(e){e.preventDefault&&e.preventDefault();};OpenLayers.Symbolizer=OpenLayers.Class({zIndex:0,initialize:function(config){OpenLayers.Util.extend(this,config);},clone:function(){var Type=eval(this.CLASS_NAME);return new Type(OpenLayers.Util.extend({},this));},CLASS_NAME:"OpenLayers.Symbolizer"});OpenLayers.Control.ScaleLine=OpenLayers.Class(OpenLayers.Control,{maxWidth:100,topOutUnits:"km",topInUnits:"m",bottomOutUnits:"mi",bottomInUnits:"ft",eTop:null,eBottom:null,geodesic:false,draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.eTop){this.eTop=document.createElement("div");this.eTop.className=this.displayClass+"Top";var theLen=this.topInUnits.length;this.div.appendChild(this.eTop);if((this.topOutUnits=="")||(this.topInUnits=="")){this.eTop.style.visibility="hidden";}else{this.eTop.style.visibility="visible";} +node.setAttributeNS(null,"points",points.join(" "));var width=symbolExtent.getWidth();var height=symbolExtent.getHeight();var viewBox=[symbolExtent.left-width,symbolExtent.bottom-height,width*3,height*3];symbolNode.setAttributeNS(null,"viewBox",viewBox.join(" "));this.symbolMetrics[id]=[Math.max(width,height),symbolExtent.getCenterLonLat().lon,symbolExtent.getCenterLonLat().lat];this.defs.appendChild(symbolNode);return symbolNode;},getFeatureIdFromEvent:function(evt){var featureId=OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this,arguments);if(!featureId){var target=evt.target;featureId=target.parentNode&&target!=this.rendererRoot?target.parentNode._featureId:undefined;} +return featureId;},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.SVG.LABEL_ALIGN={"l":"start","r":"end","b":"bottom","t":"hanging"};OpenLayers.Renderer.SVG.LABEL_VSHIFT={"t":"-70%","b":"0"};OpenLayers.Renderer.SVG.LABEL_VFACTOR={"t":0,"b":-1};OpenLayers.Renderer.SVG.preventDefault=function(e){e.preventDefault&&e.preventDefault();};OpenLayers.Control.ScaleLine=OpenLayers.Class(OpenLayers.Control,{maxWidth:100,topOutUnits:"km",topInUnits:"m",bottomOutUnits:"mi",bottomInUnits:"ft",eTop:null,eBottom:null,geodesic:false,draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.eTop){this.eTop=document.createElement("div");this.eTop.className=this.displayClass+"Top";var theLen=this.topInUnits.length;this.div.appendChild(this.eTop);if((this.topOutUnits=="")||(this.topInUnits=="")){this.eTop.style.visibility="hidden";}else{this.eTop.style.visibility="visible";} this.eBottom=document.createElement("div");this.eBottom.className=this.displayClass+"Bottom";this.div.appendChild(this.eBottom);if((this.bottomOutUnits=="")||(this.bottomInUnits=="")){this.eBottom.style.visibility="hidden";}else{this.eBottom.style.visibility="visible";}} this.map.events.register('moveend',this,this.update);this.update();return this.div;},getBarLen:function(maxLen){var digits=parseInt(Math.log(maxLen)/Math.log(10));var pow10=Math.pow(10,digits);var firstChar=parseInt(maxLen/pow10);var barLen;if(firstChar>5){barLen=5;}else if(firstChar>2){barLen=2;}else{barLen=1;} return barLen*pow10;},update:function(){var res=this.map.getResolution();if(!res){return;} var curMapUnits=this.map.getUnits();var inches=OpenLayers.INCHES_PER_UNIT;var maxSizeData=this.maxWidth*res*inches[curMapUnits];var geodesicRatio=1;if(this.geodesic===true){var maxSizeGeodesic=(this.map.getGeodesicPixelSize().w||0.000001)*this.maxWidth;var maxSizeKilometers=maxSizeData/inches["km"];geodesicRatio=maxSizeGeodesic/maxSizeKilometers;maxSizeData*=geodesicRatio;} var topUnits;var bottomUnits;if(maxSizeData>100000){topUnits=this.topOutUnits;bottomUnits=this.bottomOutUnits;}else{topUnits=this.topInUnits;bottomUnits=this.bottomInUnits;} var topMax=maxSizeData/inches[topUnits];var bottomMax=maxSizeData/inches[bottomUnits];var topRounded=this.getBarLen(topMax);var bottomRounded=this.getBarLen(bottomMax);topMax=topRounded/inches[curMapUnits]*inches[topUnits];bottomMax=bottomRounded/inches[curMapUnits]*inches[bottomUnits];var topPx=topMax/res/geodesicRatio;var bottomPx=bottomMax/res/geodesicRatio;if(this.eBottom.style.visibility=="visible"){this.eBottom.style.width=Math.round(bottomPx)+"px";this.eBottom.innerHTML=bottomRounded+" "+bottomUnits;} -if(this.eTop.style.visibility=="visible"){this.eTop.style.width=Math.round(topPx)+"px";this.eTop.innerHTML=topRounded+" "+topUnits;}},CLASS_NAME:"OpenLayers.Control.ScaleLine"});OpenLayers.Icon=OpenLayers.Class({url:null,size:null,offset:null,calculateOffset:null,imageDiv:null,px:null,initialize:function(url,size,offset,calculateOffset){this.url=url;this.size=(size)?size:new OpenLayers.Size(20,20);this.offset=offset?offset:new OpenLayers.Pixel(-(this.size.w/2),-(this.size.h/2));this.calculateOffset=calculateOffset;var id=OpenLayers.Util.createUniqueID("OL_Icon_");this.imageDiv=OpenLayers.Util.createAlphaImageDiv(id);},destroy:function(){this.erase();OpenLayers.Event.stopObservingElement(this.imageDiv.firstChild);this.imageDiv.innerHTML="";this.imageDiv=null;},clone:function(){return new OpenLayers.Icon(this.url,this.size,this.offset,this.calculateOffset);},setSize:function(size){if(size!=null){this.size=size;} +if(this.eTop.style.visibility=="visible"){this.eTop.style.width=Math.round(topPx)+"px";this.eTop.innerHTML=topRounded+" "+topUnits;}},CLASS_NAME:"OpenLayers.Control.ScaleLine"});OpenLayers.Icon=OpenLayers.Class({url:null,size:null,offset:null,calculateOffset:null,imageDiv:null,px:null,initialize:function(url,size,offset,calculateOffset){this.url=url;this.size=size||{w:20,h:20};this.offset=offset||{x:-(this.size.w/2),y:-(this.size.h/2)};this.calculateOffset=calculateOffset;var id=OpenLayers.Util.createUniqueID("OL_Icon_");this.imageDiv=OpenLayers.Util.createAlphaImageDiv(id);},destroy:function(){this.erase();OpenLayers.Event.stopObservingElement(this.imageDiv.firstChild);this.imageDiv.innerHTML="";this.imageDiv=null;},clone:function(){return new OpenLayers.Icon(this.url,this.size,this.offset,this.calculateOffset);},setSize:function(size){if(size!=null){this.size=size;} this.draw();},setUrl:function(url){if(url!=null){this.url=url;} this.draw();},draw:function(px){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,this.size,this.url,"absolute");this.moveTo(px);return this.imageDiv;},erase:function(){if(this.imageDiv!=null&&this.imageDiv.parentNode!=null){OpenLayers.Element.remove(this.imageDiv);}},setOpacity:function(opacity){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,null,null,null,null,null,opacity);},moveTo:function(px){if(px!=null){this.px=px;} if(this.imageDiv!=null){if(this.px==null){this.display(false);}else{if(this.calculateOffset){this.offset=this.calculateOffset(this.size);} -var offsetPx=this.px.offset(this.offset);OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,offsetPx);}}},display:function(display){this.imageDiv.style.display=(display)?"":"none";},isDrawn:function(){var isDrawn=(this.imageDiv&&this.imageDiv.parentNode&&(this.imageDiv.parentNode.nodeType!=11));return isDrawn;},CLASS_NAME:"OpenLayers.Icon"});OpenLayers.Marker=OpenLayers.Class({icon:null,lonlat:null,events:null,map:null,initialize:function(lonlat,icon){this.lonlat=lonlat;var newIcon=(icon)?icon:OpenLayers.Marker.defaultIcon();if(this.icon==null){this.icon=newIcon;}else{this.icon.url=newIcon.url;this.icon.size=newIcon.size;this.icon.offset=newIcon.offset;this.icon.calculateOffset=newIcon.calculateOffset;} -this.events=new OpenLayers.Events(this,this.icon.imageDiv,null);},destroy:function(){this.erase();this.map=null;this.events.destroy();this.events=null;if(this.icon!=null){this.icon.destroy();this.icon=null;}},draw:function(px){return this.icon.draw(px);},erase:function(){if(this.icon!=null){this.icon.erase();}},moveTo:function(px){if((px!=null)&&(this.icon!=null)){this.icon.moveTo(px);} +OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,{x:this.px.x+this.offset.x,y:this.px.y+this.offset.y});}}},display:function(display){this.imageDiv.style.display=(display)?"":"none";},isDrawn:function(){var isDrawn=(this.imageDiv&&this.imageDiv.parentNode&&(this.imageDiv.parentNode.nodeType!=11));return isDrawn;},CLASS_NAME:"OpenLayers.Icon"});OpenLayers.Marker=OpenLayers.Class({icon:null,lonlat:null,events:null,map:null,initialize:function(lonlat,icon){this.lonlat=lonlat;var newIcon=(icon)?icon:OpenLayers.Marker.defaultIcon();if(this.icon==null){this.icon=newIcon;}else{this.icon.url=newIcon.url;this.icon.size=newIcon.size;this.icon.offset=newIcon.offset;this.icon.calculateOffset=newIcon.calculateOffset;} +this.events=new OpenLayers.Events(this,this.icon.imageDiv);},destroy:function(){this.erase();this.map=null;this.events.destroy();this.events=null;if(this.icon!=null){this.icon.destroy();this.icon=null;}},draw:function(px){return this.icon.draw(px);},erase:function(){if(this.icon!=null){this.icon.erase();}},moveTo:function(px){if((px!=null)&&(this.icon!=null)){this.icon.moveTo(px);} this.lonlat=this.map.getLonLatFromLayerPx(px);},isDrawn:function(){var isDrawn=(this.icon&&this.icon.isDrawn());return isDrawn;},onScreen:function(){var onScreen=false;if(this.map){var screenBounds=this.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);} -return onScreen;},inflate:function(inflate){if(this.icon){var newSize=new OpenLayers.Size(this.icon.size.w*inflate,this.icon.size.h*inflate);this.icon.setSize(newSize);}},setOpacity:function(opacity){this.icon.setOpacity(opacity);},setUrl:function(url){this.icon.setUrl(url);},display:function(display){this.icon.display(display);},CLASS_NAME:"OpenLayers.Marker"});OpenLayers.Marker.defaultIcon=function(){var url=OpenLayers.Util.getImageLocation("marker.png");var size=new OpenLayers.Size(21,25);var calculateOffset=function(size){return new OpenLayers.Pixel(-(size.w/2),-size.h);};return new OpenLayers.Icon(url,size,null,calculateOffset);};OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:" ",space:" ",newline:"\n",level:0,pretty:false,nativeJSON:(function(){return!!(window.JSON&&typeof JSON.parse=="function"&&typeof JSON.stringify=="function");})(),read:function(json,filter){var object;if(this.nativeJSON){object=JSON.parse(json,filter);}else try{if(/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){object=eval('('+json+')');if(typeof filter==='function'){function walk(k,v){if(v&&typeof v==='object'){for(var i in v){if(v.hasOwnProperty(i)){v[i]=walk(i,v[i]);}}} -return filter(k,v);} -object=walk('',object);}}}catch(e){} -if(this.keepData){this.data=object;} -return object;},write:function(value,pretty){this.pretty=!!pretty;var json=null;var type=typeof value;if(this.serialize[type]){try{json=(!this.pretty&&this.nativeJSON)?JSON.stringify(value):this.serialize[type].apply(this,[value]);}catch(err){OpenLayers.Console.error("Trouble serializing: "+err);}} -return json;},writeIndent:function(){var pieces=[];if(this.pretty){for(var i=0;i<this.level;++i){pieces.push(this.indent);}} -return pieces.join('');},writeNewline:function(){return(this.pretty)?this.newline:'';},writeSpace:function(){return(this.pretty)?this.space:'';},serialize:{'object':function(object){if(object==null){return"null";} -if(object.constructor==Date){return this.serialize.date.apply(this,[object]);} -if(object.constructor==Array){return this.serialize.array.apply(this,[object]);} -var pieces=['{'];this.level+=1;var key,keyJSON,valueJSON;var addComma=false;for(key in object){if(object.hasOwnProperty(key)){keyJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[key,this.pretty]);valueJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[object[key],this.pretty]);if(keyJSON!=null&&valueJSON!=null){if(addComma){pieces.push(',');} -pieces.push(this.writeNewline(),this.writeIndent(),keyJSON,':',this.writeSpace(),valueJSON);addComma=true;}}} -this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),'}');return pieces.join('');},'array':function(array){var json;var pieces=['['];this.level+=1;for(var i=0,len=array.length;i<len;++i){json=OpenLayers.Format.JSON.prototype.write.apply(this,[array[i],this.pretty]);if(json!=null){if(i>0){pieces.push(',');} -pieces.push(this.writeNewline(),this.writeIndent(),json);}} -this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),']');return pieces.join('');},'string':function(string){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};if(/["\\\x00-\x1f]/.test(string)){return'"'+string.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c;} -c=b.charCodeAt();return'\\u00'+ -Math.floor(c/16).toString(16)+ -(c%16).toString(16);})+'"';} -return'"'+string+'"';},'number':function(number){return isFinite(number)?String(number):"null";},'boolean':function(bool){return String(bool);},'date':function(date){function format(number){return(number<10)?'0'+number:number;} -return'"'+date.getFullYear()+'-'+ -format(date.getMonth()+1)+'-'+ -format(date.getDate())+'T'+ -format(date.getHours())+':'+ -format(date.getMinutes())+':'+ -format(date.getSeconds())+'"';}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Format.GeoJSON=OpenLayers.Class(OpenLayers.Format.JSON,{ignoreExtraDims:false,read:function(json,type,filter){type=(type)?type:"FeatureCollection";var results=null;var obj=null;if(typeof json=="string"){obj=OpenLayers.Format.JSON.prototype.read.apply(this,[json,filter]);}else{obj=json;} +return onScreen;},inflate:function(inflate){if(this.icon){this.icon.setSize({w:this.icon.size.w*inflate,h:this.icon.size.h*inflate});}},setOpacity:function(opacity){this.icon.setOpacity(opacity);},setUrl:function(url){this.icon.setUrl(url);},display:function(display){this.icon.display(display);},CLASS_NAME:"OpenLayers.Marker"});OpenLayers.Marker.defaultIcon=function(){return new OpenLayers.Icon(OpenLayers.Util.getImageLocation("marker.png"),{w:21,h:25},{x:-10.5,y:-25});};OpenLayers.Format.GeoJSON=OpenLayers.Class(OpenLayers.Format.JSON,{ignoreExtraDims:false,read:function(json,type,filter){type=(type)?type:"FeatureCollection";var results=null;var obj=null;if(typeof json=="string"){obj=OpenLayers.Format.JSON.prototype.read.apply(this,[json,filter]);}else{obj=json;} if(!obj){OpenLayers.Console.error("Bad JSON: "+json);}else if(typeof(obj.type)!="string"){OpenLayers.Console.error("Bad GeoJSON - no type: "+json);}else if(this.isValidType(obj,type)){switch(type){case"Geometry":try{results=this.parseGeometry(obj);}catch(err){OpenLayers.Console.error(err);} break;case"Feature":try{results=this.parseFeature(obj);results.type="Feature";}catch(err){OpenLayers.Console.error(err);} break;case"FeatureCollection":results=[];switch(obj.type){case"Feature":try{results.push(this.parseFeature(obj));}catch(err){results=null;OpenLayers.Console.error(err);} @@ -1328,11 +1237,23 @@ return array;},'multilinestring':function(multilinestring){var array=[];for(var return array;},'polygon':function(polygon){var array=[];for(var i=0,len=polygon.components.length;i<len;++i){array.push(this.extract.linestring.apply(this,[polygon.components[i]]));} return array;},'multipolygon':function(multipolygon){var array=[];for(var i=0,len=multipolygon.components.length;i<len;++i){array.push(this.extract.polygon.apply(this,[multipolygon.components[i]]));} return array;},'collection':function(collection){var len=collection.components.length;var array=new Array(len);for(var i=0;i<len;++i){array[i]=this.extract.geometry.apply(this,[collection.components[i]]);} -return array;}},CLASS_NAME:"OpenLayers.Format.GeoJSON"});OpenLayers.Lang["nn"]=OpenLayers.Util.applyDefaults({'Scale = 1 : ${scaleDenom}':"Skala = 1 : ${scaleDenom}",'layerAlreadyAdded':"Du freista å leggja til laget «${layerName}» på kartet, men det har alt vorte lagt til.",'boundsAddError':"Du er nøydd til å gje både ein x- og ein y-verdi til «add»-funksjonen.",'lonlatAddError':"Du er nøydd til å gje både lon- og lat-verdiar til «add»-funksjonen.",'pixelAddError':"Du er nøydd til å gje både ein x- og ein y-verdi til «add»-funksjonen."});OpenLayers.Lang["fi"]=OpenLayers.Util.applyDefaults({'Permalink':"Ikilinkki",'Overlays':"Kerrokset",'Base Layer':"Peruskerros",'W':"L",'E':"I",'N':"P",'S':"E"});OpenLayers.Lang.es={'unhandledRequest':"Respuesta a petición no gestionada ${statusText}",'Permalink':"Enlace permanente",'Overlays':"Capas superpuestas",'Base Layer':"Capa Base",'readNotImplemented':"Lectura no implementada.",'writeNotImplemented':"Escritura no implementada.",'noFID':"No se puede actualizar un elemento para el que no existe FID.",'errorLoadingGML':"Error cargando el fichero GML ${url}",'browserNotSupported':"Su navegador no soporta renderización vectorial. Los renderizadores soportados actualmente son:\n${renderers}",'componentShouldBe':"addFeatures : el componente debe ser del tipo ${geomType}",'getFeatureError':"getFeatureFromEvent se ha llamado desde una capa sin renderizador. Esto normalmente quiere decir que "+"se ha destruido una capa, pero no el manejador asociado a ella.",'minZoomLevelError':"La propiedad minZoomLevel debe sólo utilizarse "+"con las capas que tienen FixedZoomLevels. El hecho de que "+"una capa wfs compruebe minZoomLevel es una reliquia del "+"pasado. Sin embargo, no podemos eliminarla sin discontinuar "+"probablemente las aplicaciones OL que puedan depender de ello. "+"Así pues estamos haciéndolo obsoleto --la comprobación "+"minZoomLevel se eliminará en la versión 3.0. Utilice el ajuste "+"de resolution min/max en su lugar, tal como se describe aquí: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacción WFS: ÉXITO ${response}",'commitFailed':"Transacción WFS: FALLÓ ${response}",'googleWarning':"La capa Google no pudo ser cargada correctamente.<br><br>"+"Para evitar este mensaje, seleccione una nueva Capa Base "+"en el selector de capas en la esquina superior derecha.<br><br>"+"Probablemente, esto se debe a que el script de la biblioteca de "+"Google Maps no fue correctamente incluido en su página, o no "+"contiene la clave del API correcta para su sitio.<br><br>"+"Desarrolladores: Para ayudar a hacer funcionar esto correctamente, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>haga clic aquí</a>",'getLayerWarning':"La capa ${layerType} no pudo ser cargada correctamente.<br><br>"+"Para evitar este mensaje, seleccione una nueva Capa Base "+"en el selector de capas en la esquina superior derecha.<br><br>"+"Probablemente, esto se debe a que el script de "+"la biblioteca ${layerLib} "+"no fue correctamente incluido en su página.<br><br>"+"Desarrolladores: Para ayudar a hacer funcionar esto correctamente, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>haga clic aquí</a>",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':'O','E':'E','N':'N','S':'S','Graticule':'Retícula','layerAlreadyAdded':"Intentó añadir la capa: ${layerName} al mapa, pero ya había sido añadida previamente",'reprojectDeprecated':"Está usando la opción 'reproject' en la capa "+"${layerName}. Esta opción es obsoleta: su uso fue diseñado "+"para soportar la visualización de datos sobre mapas base comerciales, "+"pero ahora esa funcionalidad debería conseguirse mediante el soporte "+"de la proyección Spherical Mercator. Más información disponible en "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Este método es obsoleto y se eliminará en la versión 3.0. "+"Por favor utilice el método ${newMethod} en su lugar.",'boundsAddError':"Debe proporcionar los valores x e y a la función add.",'lonlatAddError':"Debe proporcionar los valores lon y lat a la función add.",'pixelAddError':"Debe proporcionar los valores x e y a la función add.",'unsupportedGeometryType':"Tipo de geometría no soportada: ${geomType}",'filterEvaluateNotImplemented':"evaluate no está implementado para este tipo de filtro.",'end':''};OpenLayers.Layer.SphericalMercator={getExtent:function(){var extent=null;if(this.sphericalMercator){extent=this.map.calculateBounds();}else{extent=OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this);} +return array;}},CLASS_NAME:"OpenLayers.Format.GeoJSON"});OpenLayers.Lang["nn"]=OpenLayers.Util.applyDefaults({'Scale = 1 : ${scaleDenom}':"Skala = 1 : ${scaleDenom}"});OpenLayers.Lang["fi"]=OpenLayers.Util.applyDefaults({'Permalink':"Ikilinkki",'Overlays':"Kerrokset",'Base Layer':"Peruskerros",'W':"L",'E':"I",'N':"P",'S':"E"});OpenLayers.Lang.es={'unhandledRequest':"Respuesta a petición no gestionada ${statusText}",'Permalink':"Enlace permanente",'Overlays':"Capas superpuestas",'Base Layer':"Capa Base",'noFID':"No se puede actualizar un elemento para el que no existe FID.",'browserNotSupported':"Su navegador no soporta renderización vectorial. Los renderizadores soportados actualmente son:\n${renderers}",'minZoomLevelError':"La propiedad minZoomLevel debe sólo utilizarse "+"con las capas que tienen FixedZoomLevels. El hecho de que "+"una capa wfs compruebe minZoomLevel es una reliquia del "+"pasado. Sin embargo, no podemos eliminarla sin discontinuar "+"probablemente las aplicaciones OL que puedan depender de ello. "+"Así pues estamos haciéndolo obsoleto --la comprobación "+"minZoomLevel se eliminará en la versión 3.0. Utilice el ajuste "+"de resolution min/max en su lugar, tal como se describe aquí: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacción WFS: ÉXITO ${response}",'commitFailed':"Transacción WFS: FALLÓ ${response}",'googleWarning':"La capa Google no pudo ser cargada correctamente.<br><br>"+"Para evitar este mensaje, seleccione una nueva Capa Base "+"en el selector de capas en la esquina superior derecha.<br><br>"+"Probablemente, esto se debe a que el script de la biblioteca de "+"Google Maps no fue correctamente incluido en su página, o no "+"contiene la clave del API correcta para su sitio.<br><br>"+"Desarrolladores: Para ayudar a hacer funcionar esto correctamente, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>haga clic aquí</a>",'getLayerWarning':"La capa ${layerType} no pudo ser cargada correctamente.<br><br>"+"Para evitar este mensaje, seleccione una nueva Capa Base "+"en el selector de capas en la esquina superior derecha.<br><br>"+"Probablemente, esto se debe a que el script de "+"la biblioteca ${layerLib} "+"no fue correctamente incluido en su página.<br><br>"+"Desarrolladores: Para ayudar a hacer funcionar esto correctamente, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>haga clic aquí</a>",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':'O','E':'E','N':'N','S':'S','Graticule':'Retícula','reprojectDeprecated':"Está usando la opción 'reproject' en la capa "+"${layerName}. Esta opción es obsoleta: su uso fue diseñado "+"para soportar la visualización de datos sobre mapas base comerciales, "+"pero ahora esa funcionalidad debería conseguirse mediante el soporte "+"de la proyección Spherical Mercator. Más información disponible en "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Este método es obsoleto y se eliminará en la versión 3.0. "+"Por favor utilice el método ${newMethod} en su lugar.",'end':''};OpenLayers.Layer.SphericalMercator={getExtent:function(){var extent=null;if(this.sphericalMercator){extent=this.map.calculateBounds();}else{extent=OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this);} return extent;},getLonLatFromViewPortPx:function(viewPortPx){return OpenLayers.Layer.prototype.getLonLatFromViewPortPx.apply(this,arguments);},getViewPortPxFromLonLat:function(lonlat){return OpenLayers.Layer.prototype.getViewPortPxFromLonLat.apply(this,arguments);},initMercatorParameters:function(){this.RESOLUTIONS=[];var maxResolution=156543.03390625;for(var zoom=0;zoom<=this.MAX_ZOOM_LEVEL;++zoom){this.RESOLUTIONS[zoom]=maxResolution/Math.pow(2,zoom);} -this.units="m";this.projection=this.projection||"EPSG:900913";},forwardMercator:function(lon,lat){var x=lon*20037508.34/180;var y=Math.log(Math.tan((90+lat)*Math.PI/360))/(Math.PI/180);y=y*20037508.34/180;return new OpenLayers.LonLat(x,y);},inverseMercator:function(x,y){var lon=(x/20037508.34)*180;var lat=(y/20037508.34)*180;lat=180/Math.PI*(2*Math.atan(Math.exp(lat*Math.PI/180))-Math.PI/2);return new OpenLayers.LonLat(lon,lat);},projectForward:function(point){var lonlat=OpenLayers.Layer.SphericalMercator.forwardMercator(point.x,point.y);point.x=lonlat.lon;point.y=lonlat.lat;return point;},projectInverse:function(point){var lonlat=OpenLayers.Layer.SphericalMercator.inverseMercator(point.x,point.y);point.x=lonlat.lon;point.y=lonlat.lat;return point;}};(function(){var codes=["EPSG:900913","EPSG:3857","EPSG:102113","EPSG:102100"];var add=OpenLayers.Projection.addTransform;var merc=OpenLayers.Layer.SphericalMercator;var same=OpenLayers.Projection.nullTransform;var i,len,code,other,j;for(i=0,len=codes.length;i<len;++i){code=codes[i];add("EPSG:4326",code,merc.projectForward);add(code,"EPSG:4326",merc.projectInverse);for(j=i+1;j<len;++j){other=codes[j];add(code,other,same);add(other,code,same);}}})();OpenLayers.Lang["ru"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Необработанный запрос вернул ${statusText}",'Permalink':"Постоянная ссылка",'Overlays':"Слои",'Base Layer':"Основной слой",'readNotImplemented':"Чтение не реализовано.",'writeNotImplemented':"Запись не реализована.",'noFID':"Невозможно обновить объект, для которого нет FID.",'errorLoadingGML':"Ошибка при загрузке файла GML ${url}",'browserNotSupported':"Ваш браузер не поддерживает векторную графику. На данный момент поддерживаются:\n${renderers}",'componentShouldBe':"addFeatures: компонент должен быть ${geomType}",'getFeatureError':"getFeatureFromEvent вызван для слоя без рендерера. Обычно это говорит о том, что вы уничтожили слой, но оставили связанный с ним обработчик.",'minZoomLevelError':"Свойство minZoomLevel предназначено только для использования со слоями, являющимися потомками FixedZoomLevels. То, что этот WFS-слой проверяется на minZoomLevel — реликт прошлого. Однако мы не можем удалить эту функцию, так как, возможно, от неё зависят некоторые основанные на OpenLayers приложения. Функция объявлена устаревшей — проверка minZoomLevel будет удалена в 3.0. Пожалуйста, используйте вместо неё настройку мин/макс разрешения, описанную здесь: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Транзакция WFS: УСПЕШНО ${response}",'commitFailed':"Транзакция WFS: ОШИБКА ${response}",'googleWarning':"Слой Google не удалось нормально загрузить.\x3cbr\x3e\x3cbr\x3eЧтобы избавиться от этого сообщения, выбите другой основной слой в переключателе в правом верхнем углу.\x3cbr\x3e\x3cbr\x3eСкорее всего, причина в том, что библиотека Google Maps не была включена или не содержит корректного API-ключа для вашего сайта.\x3cbr\x3e\x3cbr\x3eРазработчикам: чтобы узнать, как сделать, чтобы всё заработало, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eщёлкните тут\x3c/a\x3e",'getLayerWarning':"Слой ${layerType} не удалось нормально загрузить. \x3cbr\x3e\x3cbr\x3eЧтобы избавиться от этого сообщения, выбите другой основной слой в переключателе в правом верхнем углу.\x3cbr\x3e\x3cbr\x3eСкорее всего, причина в том, что библиотека ${layerLib} не была включена или была включена некорректно.\x3cbr\x3e\x3cbr\x3eРазработчикам: чтобы узнать, как сделать, чтобы всё заработало, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eщёлкните тут\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Масштаб = 1 : ${scaleDenom}",'W':"З",'E':"В",'N':"С",'S':"Ю",'layerAlreadyAdded':"Вы попытались добавить слой «${layerName}» на карту, но он уже был добавлен",'reprojectDeprecated':"Вы используете опцию \'reproject\' для слоя ${layerName}. Эта опция является устаревшей: ее использование предполагалось для поддержки показа данных поверх коммерческих базовых карт, но теперь этот функционал несёт встроенная поддержка сферической проекции Меркатора. Больше сведений доступно на http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Этот метод считается устаревшим и будет удалён в версии 3.0. Пожалуйста, пользуйтесь ${newMethod}.",'boundsAddError':"Функции add надо передавать оба значения, x и y.",'lonlatAddError':"Функции add надо передавать оба значения, lon и lat.",'pixelAddError':"Функции add надо передавать оба значения, x и y.",'unsupportedGeometryType':"Неподдерживаемый тип геометрии: ${geomType}",'filterEvaluateNotImplemented':"evaluate не реализовано для фильтра данного типа."});OpenLayers.Lang["hsb"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Wotmołwa njewobdźěłaneho naprašowanja ${statusText}",'Permalink':"Trajny wotkaz",'Overlays':"Naworštowanja",'Base Layer':"Zakładna runina",'readNotImplemented':"Čitanje njeimplementowane.",'writeNotImplemented':"Pisanje njeimplementowane.",'noFID':"Funkcija, za kotruž FID njeje, njeda so aktualizować.",'errorLoadingGML':"Zmylk při začitowanju dataje ${url}",'browserNotSupported':"Twój wobhladowak wektorowe rysowanje njepodpěruje. Tuchwilu podpěrowane rysowaki su:\n${renderers}",'componentShouldBe':"addFeatures: komponenta měła ${geomType} być",'getFeatureError':"getFeatureFromEvent bu na woršće bjez rysowak zawołany. To zwjetša woznamjenja, zo sy worštu zničił, ale nic wobdźěłak, kotryž je z njej zwjazany.",'minZoomLevelError':"Kajkosć minZoomLevel je jenož za wužiwanje z worštami myslena, kotrež wot FixedZoomLevels pochadźeja. Zo tuta woršta wfs za minZoomLevel přepruwuje, je relikt zańdźenosće. Njemóžemy wšak ju wotstronić, bjeztoho zo aplikacije, kotrež na OpenLayers bazěruja a snano tutu kajkosć wužiwaja, hižo njefunguja. Tohodla smy ju jako zestarjenu woznamjenili -- přepruwowanje za minZoomLevel budu so we wersiji 3.0 wotstronjeć. Prošu wužij město toho nastajenje min/max, kaž je tu wopisane: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-Transakcija: WUSPĚŠNA ${response}",'commitFailed':"WFS-Transakcija: NJEPORADŹENA ${response}",'googleWarning':"Woršta Google njemóžeše so korektnje začitać.\x3cbr\x3e\x3cbr\x3eZo by tutu zdźělenku wotbył, wubjer nowy BaseLayer z wuběra worštow horjeka naprawo.\x3cbr\x3e\x3cbr\x3eNajskerje so to stawa, dokelž skript biblioteki Google Maps pak njebu zapřijaty pak njewobsahuje korektny kluč API za twoje sydło.\x3cbr\x3e\x3cbr\x3eWuwiwarjo: Za pomoc ke korektnemu fungowanju worštow\n\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3etu kliknyć\x3c/a\x3e",'getLayerWarning':"Woršta ${layerType} njemóžeše so korektnje začitać.\x3cbr\x3e\x3cbr\x3eZo by tutu zdźělenku wotbył, wubjer nowy BaseLayer z wuběra worštow horjeka naprawo.\x3cbr\x3e\x3cbr\x3eNajskerje so to stawa, dokelž skript biblioteki ${layerLib} njebu korektnje zapřijaty.\x3cbr\x3e\x3cbr\x3eWuwiwarjo: Za pomoc ke korektnemu fungowanju worštow\n\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3etu kliknyć\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Měritko = 1 : ${scaleDenom}",'W':"Z",'E':"W",'N':"S",'S':"J",'layerAlreadyAdded':"Sy spytał runinu ${layerName} karće dodać, ale je so hižo dodała",'reprojectDeprecated':"Wužiwaš opciju \"reproject\" wořšty ${layerName}. Tuta opcija je zestarjena: jeje wužiwanje bě myslene, zo by zwobraznjenje datow nad komercielnymi bazowymi kartami podpěrało, ale funkcionalnosć měła so nětko z pomocu Sperical Mercator docpěć. Dalše informacije steja na http://trac.openlayers.org/wiki/SphericalMercator k dispoziciji.",'methodDeprecated':"Tuta metoda je so njeschwaliła a budźe so w 3.0 wotstronjeć. Prošu wužij ${newMethod} město toho.",'boundsAddError':"Dyrbiš hódnotu x kaž tež y funkciji \"add\" přepodać.",'lonlatAddError':"Dyrbiš hódnotu lon kaž tež lat funkciji \"add\" přepodać.",'pixelAddError':"Dyrbiš hódnotu x kaž tež y funkciji \"add\" přepodać.",'unsupportedGeometryType':"Njepodpěrowany geometrijowy typ: ${geomType}",'filterEvaluateNotImplemented':"wuhódnoćenje njeje za tutón filtrowy typ implementowany."});OpenLayers.Lang["de"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Unbehandelte Anfragerückmeldung ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Grundkarte",'readNotImplemented':"Lesen nicht implementiert.",'writeNotImplemented':"Schreiben nicht implementiert.",'noFID':"Ein Feature, für das keine FID existiert, kann nicht aktualisiert werden.",'errorLoadingGML':"Fehler beim Laden der GML-Datei ${url}",'browserNotSupported':"Ihr Browser unterstützt keine Vektordarstellung. Aktuell unterstützte Renderer:\n${renderers}",'componentShouldBe':"addFeatures: Komponente muss vom Typ ${geomType} sein",'getFeatureError':"getFeatureFromEvent wurde vom einem Layer ohne Renderer aufgerufen. Dies bedeutet normalerweise, dass ein Layer entfernt wurde, aber nicht Handler, die auf ihn verweisen.",'minZoomLevelError':"Die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Eigenschaft ist nur für die Verwendung mit \x3ccode\x3eFixedZoomLevels\x3c/code\x3e-untergeordneten Layers vorgesehen. Das dieser \x3ctt\x3ewfs\x3c/tt\x3e-Layer die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Eigenschaft überprüft ist ein Relikt der Vergangenheit. Wir können diese Überprüfung nicht entfernen, ohne das OL basierende Applikationen nicht mehr funktionieren. Daher markieren wir es als veraltet - die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Überprüfung wird in Version 3.0 entfernt werden. Bitte verwenden Sie stattdessen die Min-/Max-Lösung, wie sie unter http://trac.openlayers.org/wiki/SettingZoomLevels beschrieben ist.",'commitSuccess':"WFS-Transaktion: Erfolgreich ${response}",'commitFailed':"WFS-Transaktion: Fehlgeschlagen ${response}",'googleWarning':"Der Google-Layer konnte nicht korrekt geladen werden.\x3cbr\x3e\x3cbr\x3eUm diese Meldung nicht mehr zu erhalten, wählen Sie einen anderen Hintergrundlayer aus dem LayerSwitcher in der rechten oberen Ecke.\x3cbr\x3e\x3cbr\x3eSehr wahrscheinlich tritt dieser Fehler auf, weil das Skript der Google-Maps-Bibliothek nicht eingebunden wurde oder keinen gültigen API-Schlüssel für Ihre URL enthält.\x3cbr\x3e\x3cbr\x3eEntwickler: Besuche \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3edas Wiki\x3c/a\x3e für Hilfe zum korrekten Einbinden des Google-Layers",'getLayerWarning':"Der ${layerType}-Layer konnte nicht korrekt geladen werden.\x3cbr\x3e\x3cbr\x3eUm diese Meldung nicht mehr zu erhalten, wählen Sie einen anderen Hintergrundlayer aus dem LayerSwitcher in der rechten oberen Ecke.\x3cbr\x3e\x3cbr\x3eSehr wahrscheinlich tritt dieser Fehler auf, weil das Skript der \'${layerLib}\'-Bibliothek nicht eingebunden wurde.\x3cbr\x3e\x3cbr\x3eEntwickler: Besuche \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3edas Wiki\x3c/a\x3e für Hilfe zum korrekten Einbinden von Layern",'Scale = 1 : ${scaleDenom}':"Maßstab = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"S",'layerAlreadyAdded':"Sie versuchen den Layer „${layerName}“ zur Karte hinzuzufügen, er wurde aber bereits hinzugefügt",'reprojectDeprecated':"Sie verwenden die „Reproject“-Option des Layers ${layerName}. Diese Option ist veraltet: Sie wurde entwickelt um die Anzeige von Daten auf kommerziellen Basiskarten zu unterstützen, aber diese Funktion sollte jetzt durch Unterstützung der „Spherical Mercator“ erreicht werden. Weitere Informationen sind unter http://trac.openlayers.org/wiki/SphericalMercator verfügbar.",'methodDeprecated':"Die Methode ist veraltet und wird in 3.0 entfernt. Bitte verwende stattdessen ${newMethod}.",'boundsAddError':"Beide Werte (x und y) müssen der add-Funktion übergeben werden.",'lonlatAddError':"Beide Werte (lon und lat) müssen der add-Funktion übergeben werden.",'pixelAddError':"Beide Werte (x und y) müssen der add-Funktion übergeben werden.",'unsupportedGeometryType':"Nicht unterstützter Geometrie-Typ: ${geomType}",'filterEvaluateNotImplemented':"„evaluate“ ist für diesen Filter-Typ nicht implementiert."});OpenLayers.Lang['da-DK']={'unhandledRequest':"En ikke håndteret forespørgsel returnerede ${statusText}",'Permalink':"Permalink",'Overlays':"Kortlag",'Base Layer':"Baggrundslag",'readNotImplemented':"Læsning er ikke implementeret.",'writeNotImplemented':"Skrivning er ikke implementeret.",'noFID':"Kan ikke opdateret en feature (et objekt) der ikke har et FID.",'errorLoadingGML':"Fejlede under indlæsning af GML fil ${url}",'browserNotSupported':"Din browser understøtter ikke vektor visning. Følgende vektor visninger understøttes:\n${renderers}",'componentShouldBe':"addFeatures : komponenten skal være en ${geomType}",'getFeatureError':"getFeatureFromEvent blev kaldt på et lag uden en visning. Dette betyder som regel at du "+"har destrueret et lag, men ikke de håndteringer der var tilknyttet.",'minZoomLevelError':"Egenskaben minZoomLevel er kun beregnet til brug "+"med FixedZoomLevels. At dette WFS lag kontrollerer "+"minZoomLevel egenskaben, er et levn fra en tidligere "+"version. Vi kan desværre ikke fjerne dette uden at risikere "+"at ødelægge eksisterende OL baserede programmer der "+" benytter denne funktionalitet. "+"Egenskaben bør derfor ikke anvendes, og minZoomLevel "+"kontrollen herunder vil blive fjernet i version 3.0. "+"Benyt istedet min/max opløsnings indstillingerne, som "+"er beskrevet her: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS transaktion: LYKKEDES ${response}",'commitFailed':"WFS transaktion: MISLYKKEDES ${response}",'googleWarning':"Google laget kunne ikke indlæses.<br><br>"+"For at fjerne denne besked, vælg et nyt bagrundskort i "+"lagskifteren i øverste højre hjørne.<br><br>"+"Fejlen skyldes formentlig at Google Maps bibliotekts "+"scriptet ikke er inkluderet, eller ikke indeholder den "+"korrkte API nøgle for dit site.<br><br>"+"Udviklere: For hjælp til at få dette til at fungere, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>klik her</a>",'getLayerWarning':"${layerType}-laget kunne ikke indlæses.<br><br>"+"For at fjerne denne besked, vælg et nyt bagrundskort i "+"lagskifteren i øverste højre hjørne.<br><br>"+"Fejlen skyldes formentlig at ${layerLib} bibliotekts "+"scriptet ikke er inkluderet.<br><br>"+"Udviklere: For hjælp til at få dette til at fungere, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>klik her</a>",'Scale = 1 : ${scaleDenom}':"Målforhold = 1 : ${scaleDenom}",'layerAlreadyAdded':"Du har forsøgt at tilføje laget: ${layerName} til kortet, men det er allerede tilføjet",'reprojectDeprecated':"Du anvender indstillingen 'reproject' på laget ${layerName}."+"Denne indstilling bør ikke længere anvendes. Den var beregnet "+"til at vise data ovenpå kommercielle grundkort, men den funktionalitet "+"bør nu opnås ved at anvende Spherical Mercator understøttelsen. "+"Mere information er tilgængelig her: "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Denne funktion bør ikke længere anvendes, og vil blive fjernet i version 3.0. "+"Anvend venligst funktionen ${newMethod} istedet.",'boundsAddError':"Du skal angive både x og y værdier i kaldet til add funktionen.",'lonlatAddError':"Du skal angive både lon og lat værdier i kaldet til add funktionen.",'pixelAddError':"Du skal angive både x og y værdier i kaldet til add funktionen.",'unsupportedGeometryType':"Geometri typen: ${geomType} er ikke understøttet.",'filterEvaluateNotImplemented':"evaluering er ikke implementeret for denne filter type."};OpenLayers.Lang["hu"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nem kezelt kérés visszatérése ${statusText}",'Permalink':"Permalink",'Overlays':"Rávetítések",'Base Layer':"Alapréteg",'readNotImplemented':"Olvasás nincs végrehajtva.",'writeNotImplemented':"Írás nincs végrehajtva.",'noFID':"Nem frissíthető olyan jellemző, amely nem rendelkezik FID-del.",'errorLoadingGML':"Hiba GML-fájl betöltésekor ${url}",'browserNotSupported':"A böngészője nem támogatja a vektoros renderelést. A jelenleg támogatott renderelők:\n${renderers}",'componentShouldBe':"addFeatures : az összetevőnek ilyen típusúnak kell lennie: ${geomType}",'getFeatureError':"getFeatureFromEvent réteget hívott meg renderelő nélkül. Ez rendszerint azt jelenti, hogy megsemmisített egy fóliát, de néhány ahhoz társított kezelőt nem.",'minZoomLevelError':"A minZoomLevel tulajdonságot csak a következővel való használatra szánták: FixedZoomLevels-leszármazott fóliák. Ez azt jelenti, hogy a minZoomLevel wfs fólia jelölőnégyzetei már a múlté. Mi azonban nem távolíthatjuk el annak a veszélye nélkül, hogy az esetlegesen ettől függő OL alapú alkalmazásokat tönkretennénk. Ezért ezt érvénytelenítjük -- a minZoomLevel az alul levő jelölőnégyzet a 3.0-s verzióból el lesz távolítva. Kérjük, helyette használja a min/max felbontás beállítást, amelyről az alábbi helyen talál leírást: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS tranzakció: SIKERES ${response}",'commitFailed':"WFS tranzakció: SIKERTELEN ${response}",'googleWarning':"A Google fólia betöltése sikertelen.\x3cbr\x3e\x3cbr\x3eAhhoz, hogy ez az üzenet eltűnjön, válasszon egy új BaseLayer fóliát a jobb felső sarokban található fóliakapcsoló segítségével.\x3cbr\x3e\x3cbr\x3eNagy valószínűséggel ez azért van, mert a Google Maps könyvtár parancsfájlja nem található, vagy nem tartalmazza az Ön oldalához tartozó megfelelő API-kulcsot.\x3cbr\x3e\x3cbr\x3eFejlesztőknek: A helyes működtetésre vonatkozó segítség az alábbi helyen érhető el, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ekattintson ide\x3c/a\x3e",'getLayerWarning':"A(z) ${layerType} fólia nem töltődött be helyesen.\x3cbr\x3e\x3cbr\x3eAhhoz, hogy ez az üzenet eltűnjön, válasszon egy új BaseLayer fóliát a jobb felső sarokban található fóliakapcsoló segítségével.\x3cbr\x3e\x3cbr\x3eNagy valószínűséggel ez azért van, mert a(z) ${layerLib} könyvtár parancsfájlja helytelen.\x3cbr\x3e\x3cbr\x3eFejlesztőknek: A helyes működtetésre vonatkozó segítség az alábbi helyen érhető el, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ekattintson ide\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Lépték = 1 : ${scaleDenom}",'W':"Ny",'E':"K",'N':"É",'S':"D",'layerAlreadyAdded':"Megpróbálta hozzáadni a(z) ${layerName} fóliát a térképhez, de az már hozzá van adva",'reprojectDeprecated':"Ön a \'reproject\' beállítást használja a(z) ${layerName} fólián. Ez a beállítás érvénytelen: használata az üzleti alaptérképek fölötti adatok megjelenítésének támogatására szolgált, de ezt a funkció ezentúl a Gömbi Mercator használatával érhető el. További információ az alábbi helyen érhető el: http://trac.openlayers.org/wiki/SphericalMercator",'methodDeprecated':"Ez a módszer érvénytelenítve lett és a 3.0-s verzióból el lesz távolítva. Használja a(z) ${newMethod} módszert helyette.",'boundsAddError':"Az x és y értékeknek egyaránt meg kell felelnie, hogy a funkciót hozzáadhassa.",'lonlatAddError':"A hossz. és szél. értékeknek egyaránt meg kell felelnie, hogy a funkciót hozzáadhassa.",'pixelAddError':"Az x és y értékeknek egyaránt meg kell felelnie, hogy a funkciót hozzáadhassa.",'unsupportedGeometryType':"Nem támogatott geometriatípus: ${geomType}",'filterEvaluateNotImplemented':"ennél a szűrőtípusnál kiértékelés nem hajtódik végre."});OpenLayers.Lang["zh-TW"]={'unhandledRequest':"未處理的請求，傳回值為 ${statusText}。",'Permalink':"永久連結",'Overlays':"額外圖層",'Base Layer':"基礎圖層",'readNotImplemented':"沒有實作讀取的功能。",'writeNotImplemented':"沒有實作寫入的功能。",'noFID':"因為沒有 FID 所以無法更新 feature。",'errorLoadingGML':"讀取GML檔案 ${url} 錯誤。",'browserNotSupported':"您的瀏覽器未支援向量渲染. 目前支援的渲染方式是:\n${renderers}",'componentShouldBe':"addFeatures : 元件應該為 ${geomType}",'getFeatureError':"getFeatureFromEvent 在一個沒有被渲染的圖層裡被呼叫。這通常意味著您 "+"摧毀了一個圖層，但並未摧毀相關的handler。",'minZoomLevelError':"minZoomLevel 屬性僅適合用在 "+"FixedZoomLevels-descendent 類型的圖層. 這個"+"wfs layer 的 minZoomLevel 是過去所遺留下來的，"+"然而我們不能移除它而不讓它將"+"過去的程式相容性給破壞掉。"+"因此我們將會迴避使用它 -- minZoomLevel "+"會在3.0被移除，請改"+"用在這邊描述的 min/max resolution 設定: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: 成功 ${response}",'commitFailed':"WFS Transaction: 失敗 ${response}",'googleWarning':"The Google Layer 圖層無法被正確的載入。<br><br>"+"要迴避這個訊息, 請在右上角的圖層改變器裡，"+"選一個新的基礎圖層。<br><br>"+"很有可能是因為 Google Maps 的函式庫"+"腳本沒有被正確的置入，或沒有包含 "+"您網站上正確的 API key <br><br>"+"開發者: 要幫助這個行為正確完成，"+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>請按這裡</a>",'getLayerWarning':"${layerType} 圖層無法被正確的載入。<br><br>"+"要迴避這個訊息, 請在右上角的圖層改變器裡，"+"選一個新的基礎圖層。<br><br>"+"很有可能是因為 ${layerLib} 的函式庫"+"腳本沒有被正確的置入。<br><br>"+"開發者: 要幫助這個行為正確完成，"+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>請按這裡</a>",'Scale = 1 : ${scaleDenom}':"Scale = 1 : ${scaleDenom}",'layerAlreadyAdded':"你試著新增圖層: ${layerName} 到地圖上，但圖層之前就已經被新增了。",'reprojectDeprecated':"你正使用 'reproject' 這個選項 "+"在 ${layerName} 層。這個選項已經不再使用:"+"它的使用原本是設計用來支援在商業地圖上秀出資料，"+"但這個功能已經被"+"Spherical Mercator所取代。更多的資訊可以在 "+"http://trac.openlayers.org/wiki/SphericalMercator 找到。",'methodDeprecated':"這個方法已經不再使用且在3.0將會被移除，"+"請使用 ${newMethod} 來代替。",'boundsAddError':"您必須傳入 x 跟 y 兩者的值進 add 函數。",'lonlatAddError':"您必須傳入 lon 跟 lat 兩者的值進 add 函數。",'pixelAddError':"您必須傳入 x 跟 y 兩者的值進 add 函數。",'unsupportedGeometryType':"未支援的幾何型別: ${geomType}。",'end':''};OpenLayers.Control.DrawFeature=OpenLayers.Class(OpenLayers.Control,{layer:null,callbacks:null,EVENT_TYPES:["featureadded"],multi:false,featureAdded:function(){},handlerOptions:null,initialize:function(layer,handler,options){this.EVENT_TYPES=OpenLayers.Control.DrawFeature.prototype.EVENT_TYPES.concat(OpenLayers.Control.prototype.EVENT_TYPES);OpenLayers.Control.prototype.initialize.apply(this,[options]);this.callbacks=OpenLayers.Util.extend({done:this.drawFeature,modify:function(vertex,feature){this.layer.events.triggerEvent("sketchmodified",{vertex:vertex,feature:feature});},create:function(vertex,feature){this.layer.events.triggerEvent("sketchstarted",{vertex:vertex,feature:feature});}},this.callbacks);this.layer=layer;this.handlerOptions=this.handlerOptions||{};if(!("multi"in this.handlerOptions)){this.handlerOptions.multi=this.multi;} +this.units="m";this.projection=this.projection||"EPSG:900913";},forwardMercator:(function(){var gg=new OpenLayers.Projection("EPSG:4326");var sm=new OpenLayers.Projection("EPSG:900913");return function(lon,lat){var point=OpenLayers.Projection.transform({x:lon,y:lat},gg,sm);return new OpenLayers.LonLat(point.x,point.y);};})(),inverseMercator:(function(){var gg=new OpenLayers.Projection("EPSG:4326");var sm=new OpenLayers.Projection("EPSG:900913");return function(x,y){var point=OpenLayers.Projection.transform({x:x,y:y},sm,gg);return new OpenLayers.LonLat(point.x,point.y);};})()};OpenLayers.Lang["ru"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Необработанный запрос вернул ${statusText}",'Permalink':"Постоянная ссылка",'Overlays':"Слои",'Base Layer':"Основной слой",'noFID':"Невозможно обновить объект, для которого нет FID.",'browserNotSupported':"Ваш браузер не поддерживает векторную графику. На данный момент поддерживаются:\n${renderers}",'minZoomLevelError':"Свойство minZoomLevel предназначено только для использования со слоями, являющимися потомками FixedZoomLevels. То, что этот WFS-слой проверяется на minZoomLevel — реликт прошлого. Однако мы не можем удалить эту функцию, так как, возможно, от неё зависят некоторые основанные на OpenLayers приложения. Функция объявлена устаревшей — проверка minZoomLevel будет удалена в 3.0. Пожалуйста, используйте вместо неё настройку мин/макс разрешения, описанную здесь: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Транзакция WFS: УСПЕШНО ${response}",'commitFailed':"Транзакция WFS: ОШИБКА ${response}",'googleWarning':"Слой Google не удалось нормально загрузить.\x3cbr\x3e\x3cbr\x3eЧтобы избавиться от этого сообщения, выбите другой основной слой в переключателе в правом верхнем углу.\x3cbr\x3e\x3cbr\x3eСкорее всего, причина в том, что библиотека Google Maps не была включена или не содержит корректного API-ключа для вашего сайта.\x3cbr\x3e\x3cbr\x3eРазработчикам: чтобы узнать, как сделать, чтобы всё заработало, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eщёлкните тут\x3c/a\x3e",'getLayerWarning':"Слой ${layerType} не удалось нормально загрузить. \x3cbr\x3e\x3cbr\x3eЧтобы избавиться от этого сообщения, выбите другой основной слой в переключателе в правом верхнем углу.\x3cbr\x3e\x3cbr\x3eСкорее всего, причина в том, что библиотека ${layerLib} не была включена или была включена некорректно.\x3cbr\x3e\x3cbr\x3eРазработчикам: чтобы узнать, как сделать, чтобы всё заработало, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eщёлкните тут\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Масштаб = 1 : ${scaleDenom}",'W':"З",'E':"В",'N':"С",'S':"Ю",'reprojectDeprecated':"Вы используете опцию \'reproject\' для слоя ${layerName}. Эта опция является устаревшей: ее использование предполагалось для поддержки показа данных поверх коммерческих базовых карт, но теперь этот функционал несёт встроенная поддержка сферической проекции Меркатора. Больше сведений доступно на http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Этот метод считается устаревшим и будет удалён в версии 3.0. Пожалуйста, пользуйтесь ${newMethod}."});OpenLayers.Lang["hsb"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Wotmołwa njewobdźěłaneho naprašowanja ${statusText}",'Permalink':"Trajny wotkaz",'Overlays':"Naworštowanja",'Base Layer':"Zakładna runina",'noFID':"Funkcija, za kotruž FID njeje, njeda so aktualizować.",'browserNotSupported':"Twój wobhladowak wektorowe rysowanje njepodpěruje. Tuchwilu podpěrowane rysowaki su:\n${renderers}",'minZoomLevelError':"Kajkosć minZoomLevel je jenož za wužiwanje z worštami myslena, kotrež wot FixedZoomLevels pochadźeja. Zo tuta woršta wfs za minZoomLevel přepruwuje, je relikt zańdźenosće. Njemóžemy wšak ju wotstronić, bjeztoho zo aplikacije, kotrež na OpenLayers bazěruja a snano tutu kajkosć wužiwaja, hižo njefunguja. Tohodla smy ju jako zestarjenu woznamjenili -- přepruwowanje za minZoomLevel budu so we wersiji 3.0 wotstronjeć. Prošu wužij město toho nastajenje min/max, kaž je tu wopisane: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-Transakcija: WUSPĚŠNA ${response}",'commitFailed':"WFS-Transakcija: NJEPORADŹENA ${response}",'googleWarning':"Woršta Google njemóžeše so korektnje začitać.\x3cbr\x3e\x3cbr\x3eZo by tutu zdźělenku wotbył, wubjer nowy BaseLayer z wuběra worštow horjeka naprawo.\x3cbr\x3e\x3cbr\x3eNajskerje so to stawa, dokelž skript biblioteki Google Maps pak njebu zapřijaty pak njewobsahuje korektny kluč API za twoje sydło.\x3cbr\x3e\x3cbr\x3eWuwiwarjo: Za pomoc ke korektnemu fungowanju worštow\n\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3etu kliknyć\x3c/a\x3e",'getLayerWarning':"Woršta ${layerType} njemóžeše so korektnje začitać.\x3cbr\x3e\x3cbr\x3eZo by tutu zdźělenku wotbył, wubjer nowy BaseLayer z wuběra worštow horjeka naprawo.\x3cbr\x3e\x3cbr\x3eNajskerje so to stawa, dokelž skript biblioteki ${layerLib} njebu korektnje zapřijaty.\x3cbr\x3e\x3cbr\x3eWuwiwarjo: Za pomoc ke korektnemu fungowanju worštow\n\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3etu kliknyć\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Měritko = 1 : ${scaleDenom}",'W':"Z",'E':"W",'N':"S",'S':"J",'reprojectDeprecated':"Wužiwaš opciju \"reproject\" wořšty ${layerName}. Tuta opcija je zestarjena: jeje wužiwanje bě myslene, zo by zwobraznjenje datow nad komercielnymi bazowymi kartami podpěrało, ale funkcionalnosć měła so nětko z pomocu Sperical Mercator docpěć. Dalše informacije steja na http://trac.openlayers.org/wiki/SphericalMercator k dispoziciji.",'methodDeprecated':"Tuta metoda je so njeschwaliła a budźe so w 3.0 wotstronjeć. Prošu wužij ${newMethod} město toho."});OpenLayers.Lang["de"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Unbehandelte Anfragerückmeldung ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Grundkarte",'noFID':"Ein Feature, für das keine FID existiert, kann nicht aktualisiert werden.",'browserNotSupported':"Ihr Browser unterstützt keine Vektordarstellung. Aktuell unterstützte Renderer:\n${renderers}",'minZoomLevelError':"Die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Eigenschaft ist nur für die Verwendung mit \x3ccode\x3eFixedZoomLevels\x3c/code\x3e-untergeordneten Layers vorgesehen. Das dieser \x3ctt\x3ewfs\x3c/tt\x3e-Layer die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Eigenschaft überprüft ist ein Relikt der Vergangenheit. Wir können diese Überprüfung nicht entfernen, ohne das OL basierende Applikationen nicht mehr funktionieren. Daher markieren wir es als veraltet - die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Überprüfung wird in Version 3.0 entfernt werden. Bitte verwenden Sie stattdessen die Min-/Max-Lösung, wie sie unter http://trac.openlayers.org/wiki/SettingZoomLevels beschrieben ist.",'commitSuccess':"WFS-Transaktion: Erfolgreich ${response}",'commitFailed':"WFS-Transaktion: Fehlgeschlagen ${response}",'googleWarning':"Der Google-Layer konnte nicht korrekt geladen werden.\x3cbr\x3e\x3cbr\x3eUm diese Meldung nicht mehr zu erhalten, wählen Sie einen anderen Hintergrundlayer aus dem LayerSwitcher in der rechten oberen Ecke.\x3cbr\x3e\x3cbr\x3eSehr wahrscheinlich tritt dieser Fehler auf, weil das Skript der Google-Maps-Bibliothek nicht eingebunden wurde oder keinen gültigen API-Schlüssel für Ihre URL enthält.\x3cbr\x3e\x3cbr\x3eEntwickler: Besuche \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3edas Wiki\x3c/a\x3e für Hilfe zum korrekten Einbinden des Google-Layers",'getLayerWarning':"Der ${layerType}-Layer konnte nicht korrekt geladen werden.\x3cbr\x3e\x3cbr\x3eUm diese Meldung nicht mehr zu erhalten, wählen Sie einen anderen Hintergrundlayer aus dem LayerSwitcher in der rechten oberen Ecke.\x3cbr\x3e\x3cbr\x3eSehr wahrscheinlich tritt dieser Fehler auf, weil das Skript der \'${layerLib}\'-Bibliothek nicht eingebunden wurde.\x3cbr\x3e\x3cbr\x3eEntwickler: Besuche \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3edas Wiki\x3c/a\x3e für Hilfe zum korrekten Einbinden von Layern",'Scale = 1 : ${scaleDenom}':"Maßstab = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"S",'reprojectDeprecated':"Sie verwenden die „Reproject“-Option des Layers ${layerName}. Diese Option ist veraltet: Sie wurde entwickelt um die Anzeige von Daten auf kommerziellen Basiskarten zu unterstützen, aber diese Funktion sollte jetzt durch Unterstützung der „Spherical Mercator“ erreicht werden. Weitere Informationen sind unter http://trac.openlayers.org/wiki/SphericalMercator verfügbar.",'methodDeprecated':"Die Methode ist veraltet und wird in 3.0 entfernt. Bitte verwende stattdessen ${newMethod}."});OpenLayers.ProxyHost="";OpenLayers.Request={DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:true,user:undefined,password:undefined,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this),makeSameOrigin:function(url,proxy){var sameOrigin=url.indexOf("http")!==0;var urlParts=!sameOrigin&&url.match(this.URL_SPLIT_REGEX);if(urlParts){var location=window.location;sameOrigin=urlParts[1]==location.protocol&&urlParts[3]==location.hostname;var uPort=urlParts[4],lPort=location.port;if(uPort!=80&&uPort!=""||lPort!="80"&&lPort!=""){sameOrigin=sameOrigin&&uPort==lPort;}} +if(!sameOrigin){if(proxy){if(typeof proxy=="function"){url=proxy(url);}else{url=proxy+encodeURIComponent(url);}}else{OpenLayers.Console.warn(OpenLayers.i18n("proxyNeeded"),{url:url});}} +return url;},issue:function(config){var defaultConfig=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});config=OpenLayers.Util.applyDefaults(config,defaultConfig);var customRequestedWithHeader=false,headerKey;for(headerKey in config.headers){if(config.headers.hasOwnProperty(headerKey)){if(headerKey.toLowerCase()==='x-requested-with'){customRequestedWithHeader=true;}}} +if(customRequestedWithHeader===false){config.headers['X-Requested-With']='XMLHttpRequest';} +var request=new OpenLayers.Request.XMLHttpRequest();var url=OpenLayers.Util.urlAppend(config.url,OpenLayers.Util.getParameterString(config.params||{}));url=OpenLayers.Request.makeSameOrigin(url,config.proxy);request.open(config.method,url,config.async,config.user,config.password);for(var header in config.headers){request.setRequestHeader(header,config.headers[header]);} +var events=this.events;var self=this;request.onreadystatechange=function(){if(request.readyState==OpenLayers.Request.XMLHttpRequest.DONE){var proceed=events.triggerEvent("complete",{request:request,config:config,requestUrl:url});if(proceed!==false){self.runCallbacks({request:request,config:config,requestUrl:url});}}};if(config.async===false){request.send(config.data);}else{window.setTimeout(function(){if(request.readyState!==0){request.send(config.data);}},0);} +return request;},runCallbacks:function(options){var request=options.request;var config=options.config;var complete=(config.scope)?OpenLayers.Function.bind(config.callback,config.scope):config.callback;var success;if(config.success){success=(config.scope)?OpenLayers.Function.bind(config.success,config.scope):config.success;} +var failure;if(config.failure){failure=(config.scope)?OpenLayers.Function.bind(config.failure,config.scope):config.failure;} +if(OpenLayers.Util.createUrlObject(config.url).protocol=="file:"&&request.responseText){request.status=200;} +complete(request);if(!request.status||(request.status>=200&&request.status<300)){this.events.triggerEvent("success",options);if(success){success(request);}} +if(request.status&&(request.status<200||request.status>=300)){this.events.triggerEvent("failure",options);if(failure){failure(request);}}},GET:function(config){config=OpenLayers.Util.extend(config,{method:"GET"});return OpenLayers.Request.issue(config);},POST:function(config){config=OpenLayers.Util.extend(config,{method:"POST"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";} +return OpenLayers.Request.issue(config);},PUT:function(config){config=OpenLayers.Util.extend(config,{method:"PUT"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";} +return OpenLayers.Request.issue(config);},DELETE:function(config){config=OpenLayers.Util.extend(config,{method:"DELETE"});return OpenLayers.Request.issue(config);},HEAD:function(config){config=OpenLayers.Util.extend(config,{method:"HEAD"});return OpenLayers.Request.issue(config);},OPTIONS:function(config){config=OpenLayers.Util.extend(config,{method:"OPTIONS"});return OpenLayers.Request.issue(config);}};OpenLayers.Lang['da-DK']={'unhandledRequest':"En ikke håndteret forespørgsel returnerede ${statusText}",'Permalink':"Permalink",'Overlays':"Kortlag",'Base Layer':"Baggrundslag",'noFID':"Kan ikke opdateret en feature (et objekt) der ikke har et FID.",'browserNotSupported':"Din browser understøtter ikke vektor visning. Følgende vektor visninger understøttes:\n${renderers}",'minZoomLevelError':"Egenskaben minZoomLevel er kun beregnet til brug "+"med FixedZoomLevels. At dette WFS lag kontrollerer "+"minZoomLevel egenskaben, er et levn fra en tidligere "+"version. Vi kan desværre ikke fjerne dette uden at risikere "+"at ødelægge eksisterende OL baserede programmer der "+" benytter denne funktionalitet. "+"Egenskaben bør derfor ikke anvendes, og minZoomLevel "+"kontrollen herunder vil blive fjernet i version 3.0. "+"Benyt istedet min/max opløsnings indstillingerne, som "+"er beskrevet her: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS transaktion: LYKKEDES ${response}",'commitFailed':"WFS transaktion: MISLYKKEDES ${response}",'googleWarning':"Google laget kunne ikke indlæses.<br><br>"+"For at fjerne denne besked, vælg et nyt bagrundskort i "+"lagskifteren i øverste højre hjørne.<br><br>"+"Fejlen skyldes formentlig at Google Maps bibliotekts "+"scriptet ikke er inkluderet, eller ikke indeholder den "+"korrkte API nøgle for dit site.<br><br>"+"Udviklere: For hjælp til at få dette til at fungere, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>klik her</a>",'getLayerWarning':"${layerType}-laget kunne ikke indlæses.<br><br>"+"For at fjerne denne besked, vælg et nyt bagrundskort i "+"lagskifteren i øverste højre hjørne.<br><br>"+"Fejlen skyldes formentlig at ${layerLib} bibliotekts "+"scriptet ikke er inkluderet.<br><br>"+"Udviklere: For hjælp til at få dette til at fungere, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>klik her</a>",'Scale = 1 : ${scaleDenom}':"Målforhold = 1 : ${scaleDenom}",'reprojectDeprecated':"Du anvender indstillingen 'reproject' på laget ${layerName}."+"Denne indstilling bør ikke længere anvendes. Den var beregnet "+"til at vise data ovenpå kommercielle grundkort, men den funktionalitet "+"bør nu opnås ved at anvende Spherical Mercator understøttelsen. "+"Mere information er tilgængelig her: "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Denne funktion bør ikke længere anvendes, og vil blive fjernet i version 3.0. "+"Anvend venligst funktionen ${newMethod} istedet."};OpenLayers.Lang["hu"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nem kezelt kérés visszatérése ${statusText}",'Permalink':"Permalink",'Overlays':"Rávetítések",'Base Layer':"Alapréteg",'noFID':"Nem frissíthető olyan jellemző, amely nem rendelkezik FID-del.",'browserNotSupported':"A böngészője nem támogatja a vektoros renderelést. A jelenleg támogatott renderelők:\n${renderers}",'minZoomLevelError':"A minZoomLevel tulajdonságot csak a következővel való használatra szánták: FixedZoomLevels-leszármazott fóliák. Ez azt jelenti, hogy a minZoomLevel wfs fólia jelölőnégyzetei már a múlté. Mi azonban nem távolíthatjuk el annak a veszélye nélkül, hogy az esetlegesen ettől függő OL alapú alkalmazásokat tönkretennénk. Ezért ezt érvénytelenítjük -- a minZoomLevel az alul levő jelölőnégyzet a 3.0-s verzióból el lesz távolítva. Kérjük, helyette használja a min/max felbontás beállítást, amelyről az alábbi helyen talál leírást: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS tranzakció: SIKERES ${response}",'commitFailed':"WFS tranzakció: SIKERTELEN ${response}",'googleWarning':"A Google fólia betöltése sikertelen.\x3cbr\x3e\x3cbr\x3eAhhoz, hogy ez az üzenet eltűnjön, válasszon egy új BaseLayer fóliát a jobb felső sarokban található fóliakapcsoló segítségével.\x3cbr\x3e\x3cbr\x3eNagy valószínűséggel ez azért van, mert a Google Maps könyvtár parancsfájlja nem található, vagy nem tartalmazza az Ön oldalához tartozó megfelelő API-kulcsot.\x3cbr\x3e\x3cbr\x3eFejlesztőknek: A helyes működtetésre vonatkozó segítség az alábbi helyen érhető el, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ekattintson ide\x3c/a\x3e",'getLayerWarning':"A(z) ${layerType} fólia nem töltődött be helyesen.\x3cbr\x3e\x3cbr\x3eAhhoz, hogy ez az üzenet eltűnjön, válasszon egy új BaseLayer fóliát a jobb felső sarokban található fóliakapcsoló segítségével.\x3cbr\x3e\x3cbr\x3eNagy valószínűséggel ez azért van, mert a(z) ${layerLib} könyvtár parancsfájlja helytelen.\x3cbr\x3e\x3cbr\x3eFejlesztőknek: A helyes működtetésre vonatkozó segítség az alábbi helyen érhető el, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ekattintson ide\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Lépték = 1 : ${scaleDenom}",'W':"Ny",'E':"K",'N':"É",'S':"D",'reprojectDeprecated':"Ön a \'reproject\' beállítást használja a(z) ${layerName} fólián. Ez a beállítás érvénytelen: használata az üzleti alaptérképek fölötti adatok megjelenítésének támogatására szolgált, de ezt a funkció ezentúl a Gömbi Mercator használatával érhető el. További információ az alábbi helyen érhető el: http://trac.openlayers.org/wiki/SphericalMercator",'methodDeprecated':"Ez a módszer érvénytelenítve lett és a 3.0-s verzióból el lesz távolítva. Használja a(z) ${newMethod} módszert helyette."});OpenLayers.Lang["zh-TW"]={'unhandledRequest':"未處理的請求，傳回值為 ${statusText}。",'Permalink':"永久連結",'Overlays':"額外圖層",'Base Layer':"基礎圖層",'noFID':"因為沒有 FID 所以無法更新 feature。",'browserNotSupported':"您的瀏覽器未支援向量渲染. 目前支援的渲染方式是:\n${renderers}",'minZoomLevelError':"minZoomLevel 屬性僅適合用在 "+"FixedZoomLevels-descendent 類型的圖層. 這個"+"wfs layer 的 minZoomLevel 是過去所遺留下來的，"+"然而我們不能移除它而不讓它將"+"過去的程式相容性給破壞掉。"+"因此我們將會迴避使用它 -- minZoomLevel "+"會在3.0被移除，請改"+"用在這邊描述的 min/max resolution 設定: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: 成功 ${response}",'commitFailed':"WFS Transaction: 失敗 ${response}",'googleWarning':"The Google Layer 圖層無法被正確的載入。<br><br>"+"要迴避這個訊息, 請在右上角的圖層改變器裡，"+"選一個新的基礎圖層。<br><br>"+"很有可能是因為 Google Maps 的函式庫"+"腳本沒有被正確的置入，或沒有包含 "+"您網站上正確的 API key <br><br>"+"開發者: 要幫助這個行為正確完成，"+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>請按這裡</a>",'getLayerWarning':"${layerType} 圖層無法被正確的載入。<br><br>"+"要迴避這個訊息, 請在右上角的圖層改變器裡，"+"選一個新的基礎圖層。<br><br>"+"很有可能是因為 ${layerLib} 的函式庫"+"腳本沒有被正確的置入。<br><br>"+"開發者: 要幫助這個行為正確完成，"+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>請按這裡</a>",'Scale = 1 : ${scaleDenom}':"Scale = 1 : ${scaleDenom}",'reprojectDeprecated':"你正使用 'reproject' 這個選項 "+"在 ${layerName} 層。這個選項已經不再使用:"+"它的使用原本是設計用來支援在商業地圖上秀出資料，"+"但這個功能已經被"+"Spherical Mercator所取代。更多的資訊可以在 "+"http://trac.openlayers.org/wiki/SphericalMercator 找到。",'methodDeprecated':"這個方法已經不再使用且在3.0將會被移除，"+"請使用 ${newMethod} 來代替。",'end':''};OpenLayers.Control.DrawFeature=OpenLayers.Class(OpenLayers.Control,{layer:null,callbacks:null,multi:false,featureAdded:function(){},handlerOptions:null,initialize:function(layer,handler,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.callbacks=OpenLayers.Util.extend({done:this.drawFeature,modify:function(vertex,feature){this.layer.events.triggerEvent("sketchmodified",{vertex:vertex,feature:feature});},create:function(vertex,feature){this.layer.events.triggerEvent("sketchstarted",{vertex:vertex,feature:feature});}},this.callbacks);this.layer=layer;this.handlerOptions=this.handlerOptions||{};this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{renderers:layer.renderers,rendererOptions:layer.rendererOptions});if(!("multi"in this.handlerOptions)){this.handlerOptions.multi=this.multi;} var sketchStyle=this.layer.styleMap&&this.layer.styleMap.styles.temporary;if(sketchStyle){this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{styleMap:new OpenLayers.StyleMap({"default":sketchStyle})});} -this.handler=new handler(this,this.callbacks,this.handlerOptions);},drawFeature:function(geometry){var feature=new OpenLayers.Feature.Vector(geometry);var proceed=this.layer.events.triggerEvent("sketchcomplete",{feature:feature});if(proceed!==false){feature.state=OpenLayers.State.INSERT;this.layer.addFeatures([feature]);this.featureAdded(feature);this.events.triggerEvent("featureadded",{feature:feature});}},insertXY:function(x,y){if(this.handler&&this.handler.line){this.handler.insertXY(x,y);}},insertDeltaXY:function(dx,dy){if(this.handler&&this.handler.line){this.handler.insertDeltaXY(dx,dy);}},insertDirectionLength:function(direction,length){if(this.handler&&this.handler.line){this.handler.insertDirectionLength(direction,length);}},insertDeflectionLength:function(deflection,length){if(this.handler&&this.handler.line){this.handler.insertDeflectionLength(deflection,length);}},undo:function(){return this.handler.undo&&this.handler.undo();},redo:function(){return this.handler.redo&&this.handler.redo();},finishSketch:function(){this.handler.finishGeometry();},cancel:function(){this.handler.cancel();},CLASS_NAME:"OpenLayers.Control.DrawFeature"});OpenLayers.Lang["pt-br"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"A requisição retornou um erro não tratado: ${statusText}",'Permalink':"Link para essa página",'Overlays':"Camadas de Sobreposição",'Base Layer':"Camada Base",'readNotImplemented':"Leitura não implementada.",'writeNotImplemented':"Escrita não implementada.",'noFID':"Não é possível atualizar uma feição que não tenha um FID.",'errorLoadingGML':"Erro ao carregar o arquivo GML ${url}",'browserNotSupported':"Seu navegador não suporta renderização de vetores. Os renderizadores suportados atualmente são:\n${renderers}",'componentShouldBe':"addFeatures: o componente deve ser do tipo ${geomType}",'getFeatureError':"getFeatureFromEvent foi executado mas nenhum renderizador foi encontrado. Isso pode indicar que você destruiu uma camana, mas não o handler associado a ela.",'minZoomLevelError':"A propriedade minZoomLevel é de uso restrito das camadas descendentes de FixedZoomLevels. A verificação dessa propriedade pelas camadas wfs é um resíduo do passado. Não podemos, entretanto não é possível removê-la sem possívelmente quebrar o funcionamento de aplicações OL que possuem depência com ela. Portanto estamos tornando seu uso obsoleto -- a verificação desse atributo será removida na versão 3.0. Ao invés, use as opções de resolução min/max como descrito em: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transação WFS : SUCESSO ${response}",'commitFailed':"Transação WFS : ERRO ${response}",'googleWarning':"Não foi possível carregar a camada Google corretamente.\x3cbr\x3e\x3cbr\x3ePara se livrar dessa mensagem, selecione uma nova Camada Base, na ferramenta de alternação de camadas localização do canto superior direito.\x3cbr\x3e\x3cbr\x3eMuito provavelmente, isso foi causado porque o script da biblioteca do Google Maps não foi incluído, ou porque ele não contém a chave correta da API para o seu site.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: Para obter ajuda em solucionar esse problema \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ecliquem aqui\x3c/a\x3e",'getLayerWarning':"Não foi possível carregar a camada ${layerType} corretamente.\x3cbr\x3e\x3cbr\x3ePara se livrar dessa mensagem, selecione uma nova Camada Base, na ferramenta de alternação de camadas localização do canto superior direito.\x3cbr\x3e\x3cbr\x3eMuito provavelmente, isso foi causado porque o script da biblioteca ${layerLib} não foi incluído corretamente.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: Para obter ajuda em solucionar esse problema \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ecliquem aqui\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':"O",'E':"L",'N':"N",'S':"S",'layerAlreadyAdded':"Você tentou adicionar a camada: ${layerName} ao mapa, mas ela já foi adicionada",'reprojectDeprecated':"Você está usando a opção \'reproject\' na camada ${layerName}. Essa opção está obsoleta: seu uso foi projetado para suportar a visualização de dados sobre bases de mapas comerciais, entretanto essa funcionalidade deve agora ser alcançada usando o suporte à projeção Mercator. Mais informação está disponível em: http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Esse método está obsoleto e será removido na versão 3.0. Ao invés, por favor use ${newMethod}.",'boundsAddError':"Você deve informar ambos os valores x e y para a função add.",'lonlatAddError':"Você deve informar ambos os valores lon e lat para a função add.",'pixelAddError':"Você deve informar ambos os valores x e y para a função add.",'unsupportedGeometryType':"Tipo geométrico não suportado: ${geomType}.",'filterEvaluateNotImplemented':"evaluete não está implementado para este tipo de filtro."});OpenLayers.Lang["zh-CN"]={'unhandledRequest':"未处理的请求，返回值为 ${statusText}",'Permalink':"永久链接",'Overlays':"叠加层",'Base Layer':"基础图层",'readNotImplemented':"读取功能没有实现。",'writeNotImplemented':"写入功能没有实现。",'noFID':"无法更新feature，缺少FID。",'errorLoadingGML':"加载GML文件 ${url} 出现错误。",'browserNotSupported':"你使用的浏览器不支持矢量渲染。当前支持的渲染方式包括：\n${renderers}",'componentShouldBe':"addFeatures : 组件类型应该是 ${geomType}",'getFeatureError':"getFeatureFromEvent方法在一个没有渲染器的图层上被调用。 这通常意味着您"+"销毁了一个图层，但并未销毁其关联的handler。",'minZoomLevelError':"minZoomLevel属性仅适合用于"+"使用了固定缩放级别的图层。这个 "+"wfs 图层检查 minZoomLevel 是过去遗留下来的。"+"然而，我们不能移除它，"+"而破坏依赖于它的基于OL的应用程序。"+"因此，我们废除了它 -- minZoomLevel "+"将会在3.0中被移除。请改用 "+"min/max resolution 设置，参考："+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: 成功。 ${response}",'commitFailed':"WFS Transaction: 失败。 ${response}",'googleWarning':"Google图层不能正确加载。<br><br>"+"要消除这个信息，请在右上角的"+"图层控制面板中选择其他的基础图层。<br><br>"+"这种情况很可能是没有正确的包含Google地图脚本库，"+"或者是没有包含在你的站点上"+"使用的正确的Google Maps API密匙。<br><br>"+"开发者：获取使其正确工作的帮助信息，"+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>点击这里</a>",'getLayerWarning':"${layerType} 图层不能正确加载。<br><br>"+"要消除这个信息，请在右上角的"+"图层控制面板中选择其他的基础图层。<br><br>"+"这种情况很可能是没有正确的包含"+"${layerLib} 脚本库。<br><br>"+"开发者：获取使其正确工作的帮助信息，"+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>点击这里</a>",'Scale = 1 : ${scaleDenom}':"比例尺 = 1 : ${scaleDenom}",'layerAlreadyAdded':"你尝试添加图层： ${layerName} 到地图中，但是它之前就已经被添加。",'reprojectDeprecated':"你正在使用 ${layerName} 图层上的'reproject'选项。"+"这个选项已经不再使用："+"它是被设计用来支持显示商业的地图数据，"+"不过现在该功能可以通过使用Spherical Mercator来实现。"+"更多信息可以参阅"+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"该方法已经不再被支持，并且将在3.0中被移除。"+"请使用 ${newMethod} 方法来替代。",'boundsAddError':"您必须传递 x 和 y 两个参数值到 add 方法。",'lonlatAddError':"您必须传递 lon 和 lat 两个参数值到 add 方法。",'pixelAddError':"您必须传递 x and y 两个参数值到 add 方法。",'unsupportedGeometryType':"不支持的几何体类型： ${geomType}",'end':''};OpenLayers.Lang["pt"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Servidor devolveu erro não contemplado ${statusText}",'Permalink':"Ligação permanente",'Overlays':"Sobreposições",'Base Layer':"Camada Base",'readNotImplemented':"Leitura não implementada.",'writeNotImplemented':"Escrita não implementada.",'noFID':"Não é possível atualizar um elemento para a qual não há FID.",'errorLoadingGML':"Erro ao carregar ficheiro GML ${url}",'browserNotSupported':"O seu navegador não suporta renderização vetorial. Actualmente os renderizadores suportados são:\n${renderers}",'componentShouldBe':"addFeatures: componente deve ser um(a) ${geomType}",'getFeatureError':"getFeatureFromEvent foi chamado numa camada sem renderizador. Isto normalmente significa que destruiu uma camada, mas não um manipulador \'\'(handler)\'\' que lhe está associado.",'minZoomLevelError':"A propriedade minZoomLevel só deve ser usada com as camadas descendentes da FixedZoomLevels. A verificação da propriedade por esta camada wfs é uma relíquia do passado. No entanto, não podemos removê-la sem correr o risco de afectar aplicações OL que dependam dela. Portanto, estamos a torná-la obsoleta -- a verificação minZoomLevel será removida na versão 3.0. Em vez dela, por favor, use as opções de resolução min/max descritas aqui: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacção WFS: SUCESSO ${response}",'commitFailed':"Transacção WFS: FALHOU ${response}",'googleWarning':"A Camada Google não foi correctamente carregada.\x3cbr\x3e\x3cbr\x3ePara deixar de receber esta mensagem, seleccione uma nova Camada-Base no \'\'switcher\'\' de camadas no canto superior direito.\x3cbr\x3e\x3cbr\x3eProvavelmente, isto acontece porque o \'\'script\'\' da biblioteca do Google Maps não foi incluído ou não contém a chave API correcta para o seu sítio.\x3cbr\x3e\x3cbr\x3eProgramadores: Para ajuda sobre como solucionar o problema \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclique aqui\x3c/a\x3e .",'getLayerWarning':"A camada ${layerType} não foi correctamente carregada.\x3cbr\x3e\x3cbr\x3ePara desactivar esta mensagem, seleccione uma nova Camada-Base no \'\'switcher\'\' de camadas no canto superior direito.\x3cbr\x3e\x3cbr\x3eProvavelmente, isto acontece porque o \'\'script\'\' da biblioteca ${layerLib} não foi incluído correctamente.\x3cbr\x3e\x3cbr\x3eProgramadores: Para ajuda sobre como solucionar o problema \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclique aqui\x3c/a\x3e .",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':"O",'E':"E",'N':"N",'S':"S",'layerAlreadyAdded':"Você tentou adicionar a camada: ${layerName} ao mapa, mas ela já tinha sido adicionada antes",'reprojectDeprecated':"Está usando a opção \'reproject\' na camada ${layerName}. Esta opção é obsoleta: foi concebida para permitir a apresentação de dados sobre mapas-base comerciais, mas esta funcionalidade é agora suportada pelo Mercator Esférico. Mais informação está disponível em http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Este método foi declarado obsoleto e será removido na versão 3.0. Por favor, use ${newMethod} em vez disso.",'boundsAddError':"Você deve passar tanto o valor x como o y à função de adição.",'lonlatAddError':"Você deve passar tanto o valor lon como o lat à função de adição.",'pixelAddError':"Você deve passar tanto o valor x como o y à função de adição.",'unsupportedGeometryType':"Tipo de geometria não suportado: ${geomType}",'filterEvaluateNotImplemented':"avaliar não está implementado para este tipo de filtro."});OpenLayers.Symbolizer.Point=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Point"});OpenLayers.Symbolizer.Line=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Line"});OpenLayers.Symbolizer.Polygon=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Polygon"});OpenLayers.Symbolizer.Text=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Text"});OpenLayers.Symbolizer.Raster=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Raster"});OpenLayers.Rule=OpenLayers.Class({id:null,name:null,title:null,description:null,context:null,filter:null,elseFilter:false,symbolizer:null,symbolizers:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(options){this.symbolizer={};OpenLayers.Util.extend(this,options);if(this.symbolizers){delete this.symbolizer;} +this.handler=new handler(this,this.callbacks,this.handlerOptions);},drawFeature:function(geometry){var feature=new OpenLayers.Feature.Vector(geometry);var proceed=this.layer.events.triggerEvent("sketchcomplete",{feature:feature});if(proceed!==false){feature.state=OpenLayers.State.INSERT;this.layer.addFeatures([feature]);this.featureAdded(feature);this.events.triggerEvent("featureadded",{feature:feature});}},insertXY:function(x,y){if(this.handler&&this.handler.line){this.handler.insertXY(x,y);}},insertDeltaXY:function(dx,dy){if(this.handler&&this.handler.line){this.handler.insertDeltaXY(dx,dy);}},insertDirectionLength:function(direction,length){if(this.handler&&this.handler.line){this.handler.insertDirectionLength(direction,length);}},insertDeflectionLength:function(deflection,length){if(this.handler&&this.handler.line){this.handler.insertDeflectionLength(deflection,length);}},undo:function(){return this.handler.undo&&this.handler.undo();},redo:function(){return this.handler.redo&&this.handler.redo();},finishSketch:function(){this.handler.finishGeometry();},cancel:function(){this.handler.cancel();},CLASS_NAME:"OpenLayers.Control.DrawFeature"});OpenLayers.Lang["pt-br"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"A requisição retornou um erro não tratado: ${statusText}",'Permalink':"Link para essa página",'Overlays':"Camadas de Sobreposição",'Base Layer':"Camada Base",'noFID':"Não é possível atualizar uma feição que não tenha um FID.",'browserNotSupported':"Seu navegador não suporta renderização de vetores. Os renderizadores suportados atualmente são:\n${renderers}",'minZoomLevelError':"A propriedade minZoomLevel é de uso restrito das camadas descendentes de FixedZoomLevels. A verificação dessa propriedade pelas camadas wfs é um resíduo do passado. Não podemos, entretanto não é possível removê-la sem possívelmente quebrar o funcionamento de aplicações OL que possuem depência com ela. Portanto estamos tornando seu uso obsoleto -- a verificação desse atributo será removida na versão 3.0. Ao invés, use as opções de resolução min/max como descrito em: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transação WFS : SUCESSO ${response}",'commitFailed':"Transação WFS : ERRO ${response}",'googleWarning':"Não foi possível carregar a camada Google corretamente.\x3cbr\x3e\x3cbr\x3ePara se livrar dessa mensagem, selecione uma nova Camada Base, na ferramenta de alternação de camadas localização do canto superior direito.\x3cbr\x3e\x3cbr\x3eMuito provavelmente, isso foi causado porque o script da biblioteca do Google Maps não foi incluído, ou porque ele não contém a chave correta da API para o seu site.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: Para obter ajuda em solucionar esse problema \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ecliquem aqui\x3c/a\x3e",'getLayerWarning':"Não foi possível carregar a camada ${layerType} corretamente.\x3cbr\x3e\x3cbr\x3ePara se livrar dessa mensagem, selecione uma nova Camada Base, na ferramenta de alternação de camadas localização do canto superior direito.\x3cbr\x3e\x3cbr\x3eMuito provavelmente, isso foi causado porque o script da biblioteca ${layerLib} não foi incluído corretamente.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: Para obter ajuda em solucionar esse problema \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ecliquem aqui\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':"O",'E':"L",'N':"N",'S':"S",'reprojectDeprecated':"Você está usando a opção \'reproject\' na camada ${layerName}. Essa opção está obsoleta: seu uso foi projetado para suportar a visualização de dados sobre bases de mapas comerciais, entretanto essa funcionalidade deve agora ser alcançada usando o suporte à projeção Mercator. Mais informação está disponível em: http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Esse método está obsoleto e será removido na versão 3.0. Ao invés, por favor use ${newMethod}."});OpenLayers.Lang["zh-CN"]={'unhandledRequest':"未处理的请求，返回值为 ${statusText}",'Permalink':"永久链接",'Overlays':"叠加层",'Base Layer':"基础图层",'noFID':"无法更新feature，缺少FID。",'browserNotSupported':"你使用的浏览器不支持矢量渲染。当前支持的渲染方式包括：\n${renderers}",'minZoomLevelError':"minZoomLevel属性仅适合用于"+"使用了固定缩放级别的图层。这个 "+"wfs 图层检查 minZoomLevel 是过去遗留下来的。"+"然而，我们不能移除它，"+"而破坏依赖于它的基于OL的应用程序。"+"因此，我们废除了它 -- minZoomLevel "+"将会在3.0中被移除。请改用 "+"min/max resolution 设置，参考："+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: 成功。 ${response}",'commitFailed':"WFS Transaction: 失败。 ${response}",'googleWarning':"Google图层不能正确加载。<br><br>"+"要消除这个信息，请在右上角的"+"图层控制面板中选择其他的基础图层。<br><br>"+"这种情况很可能是没有正确的包含Google地图脚本库，"+"或者是没有包含在你的站点上"+"使用的正确的Google Maps API密匙。<br><br>"+"开发者：获取使其正确工作的帮助信息，"+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>点击这里</a>",'getLayerWarning':"${layerType} 图层不能正确加载。<br><br>"+"要消除这个信息，请在右上角的"+"图层控制面板中选择其他的基础图层。<br><br>"+"这种情况很可能是没有正确的包含"+"${layerLib} 脚本库。<br><br>"+"开发者：获取使其正确工作的帮助信息，"+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>点击这里</a>",'Scale = 1 : ${scaleDenom}':"比例尺 = 1 : ${scaleDenom}",'reprojectDeprecated':"你正在使用 ${layerName} 图层上的'reproject'选项。"+"这个选项已经不再使用："+"它是被设计用来支持显示商业的地图数据，"+"不过现在该功能可以通过使用Spherical Mercator来实现。"+"更多信息可以参阅"+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"该方法已经不再被支持，并且将在3.0中被移除。"+"请使用 ${newMethod} 方法来替代。",'end':''};OpenLayers.Lang["pt"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Servidor devolveu erro não contemplado ${statusText}",'Permalink':"Ligação permanente",'Overlays':"Sobreposições",'Base Layer':"Camada Base",'noFID':"Não é possível atualizar um elemento para a qual não há FID.",'browserNotSupported':"O seu navegador não suporta renderização vetorial. Actualmente os renderizadores suportados são:\n${renderers}",'minZoomLevelError':"A propriedade minZoomLevel só deve ser usada com as camadas descendentes da FixedZoomLevels. A verificação da propriedade por esta camada wfs é uma relíquia do passado. No entanto, não podemos removê-la sem correr o risco de afectar aplicações OL que dependam dela. Portanto, estamos a torná-la obsoleta -- a verificação minZoomLevel será removida na versão 3.0. Em vez dela, por favor, use as opções de resolução min/max descritas aqui: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacção WFS: SUCESSO ${response}",'commitFailed':"Transacção WFS: FALHOU ${response}",'googleWarning':"A Camada Google não foi correctamente carregada.\x3cbr\x3e\x3cbr\x3ePara deixar de receber esta mensagem, seleccione uma nova Camada-Base no \'\'switcher\'\' de camadas no canto superior direito.\x3cbr\x3e\x3cbr\x3eProvavelmente, isto acontece porque o \'\'script\'\' da biblioteca do Google Maps não foi incluído ou não contém a chave API correcta para o seu sítio.\x3cbr\x3e\x3cbr\x3eProgramadores: Para ajuda sobre como solucionar o problema \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclique aqui\x3c/a\x3e .",'getLayerWarning':"A camada ${layerType} não foi correctamente carregada.\x3cbr\x3e\x3cbr\x3ePara desactivar esta mensagem, seleccione uma nova Camada-Base no \'\'switcher\'\' de camadas no canto superior direito.\x3cbr\x3e\x3cbr\x3eProvavelmente, isto acontece porque o \'\'script\'\' da biblioteca ${layerLib} não foi incluído correctamente.\x3cbr\x3e\x3cbr\x3eProgramadores: Para ajuda sobre como solucionar o problema \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclique aqui\x3c/a\x3e .",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':"O",'E':"E",'N':"N",'S':"S",'reprojectDeprecated':"Está usando a opção \'reproject\' na camada ${layerName}. Esta opção é obsoleta: foi concebida para permitir a apresentação de dados sobre mapas-base comerciais, mas esta funcionalidade é agora suportada pelo Mercator Esférico. Mais informação está disponível em http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Este método foi declarado obsoleto e será removido na versão 3.0. Por favor, use ${newMethod} em vez disso."});OpenLayers.Rule=OpenLayers.Class({id:null,name:null,title:null,description:null,context:null,filter:null,elseFilter:false,symbolizer:null,symbolizers:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(options){this.symbolizer={};OpenLayers.Util.extend(this,options);if(this.symbolizers){delete this.symbolizer;} this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i in this.symbolizer){this.symbolizer[i]=null;} this.symbolizer=null;delete this.symbolizers;},evaluate:function(feature){var context=this.getContext(feature);var applies=true;if(this.minScaleDenominator||this.maxScaleDenominator){var scale=feature.layer.map.getScale();} if(this.minScaleDenominator){applies=scale>=OpenLayers.Style.createLiteral(this.minScaleDenominator,context);} @@ -1341,90 +1262,57 @@ if(applies&&this.filter){if(this.filter.CLASS_NAME=="OpenLayers.Filter.FeatureId return applies;},getContext:function(feature){var context=this.context;if(!context){context=feature.attributes||feature.data;} if(typeof this.context=="function"){context=this.context(feature);} return context;},clone:function(){var options=OpenLayers.Util.extend({},this);if(this.symbolizers){var len=this.symbolizers.length;options.symbolizers=new Array(len);for(var i=0;i<len;++i){options.symbolizers[i]=this.symbolizers[i].clone();}}else{options.symbolizer={};var value,type;for(var key in this.symbolizer){value=this.symbolizer[key];type=typeof value;if(type==="object"){options.symbolizer[key]=OpenLayers.Util.extend({},value);}else if(type==="string"){options.symbolizer[key]=value;}}} -options.filter=this.filter&&this.filter.clone();options.context=this.context&&OpenLayers.Util.extend({},this.context);return new OpenLayers.Rule(options);},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.Lang["gl"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Solicitude non xerada; a resposta foi: ${statusText}",'Permalink':"Ligazón permanente",'Overlays':"Capas superpostas",'Base Layer':"Capa base",'readNotImplemented':"Lectura non implementada.",'writeNotImplemented':"Escritura non implementada.",'noFID':"Non se pode actualizar a funcionalidade para a que non hai FID.",'errorLoadingGML':"Erro ao cargar o ficheiro GML ${url}",'browserNotSupported':"O seu navegador non soporta a renderización de vectores. Os renderizadores soportados actualmente son:\n${renderers}",'componentShouldBe':"addFeatures: o compoñente debera ser de tipo ${geomType}",'getFeatureError':"getFeatureFromEvent ten sido chamado a unha capa sen renderizador. Isto normalmente significa que destruíu unha capa, mais non o executador que está asociado con ela.",'minZoomLevelError':"A propiedade minZoomLevel é só para uso conxuntamente coas capas FixedZoomLevels-descendent. O feito de que esa capa wfs verifique o minZoomLevel é unha reliquia do pasado. Non podemos, con todo, eliminala sen a posibilidade de non romper as aplicacións baseadas en OL que poidan depender dela. Por iso a estamos deixando obsoleta (a comprobación minZoomLevel de embaixo será eliminada na versión 3.0). Por favor, no canto diso use o axuste de resolución mín/máx tal e como está descrito aquí: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacción WFS: ÉXITO ${response}",'commitFailed':"Transacción WFS: FALLIDA ${response}",'googleWarning':"A capa do Google non puido cargarse correctamente.\x3cbr\x3e\x3cbr\x3ePara evitar esta mensaxe, escolla unha nova capa base no seleccionador de capas na marxe superior dereita.\x3cbr\x3e\x3cbr\x3eProbablemente, isto acontece porque a escritura da libraría do Google Maps ou ben non foi incluída ou ben non contén a clave API correcta para o seu sitio.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: para axudar a facer funcionar isto correctamente, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3epremede aquí\x3c/a\x3e",'getLayerWarning':"A capa ${layerType} foi incapaz de cargarse correctamente.\x3cbr\x3e\x3cbr\x3ePara evitar esta mensaxe, escolla unha nova capa base no seleccionador de capas na marxe superior dereita.\x3cbr\x3e\x3cbr\x3eProbablemente, isto acontece porque a escritura da libraría ${layerLib} non foi ben incluída.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: para axudar a facer funcionar isto correctamente, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3epremede aquí\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':"O",'E':"L",'N':"N",'S':"S",'layerAlreadyAdded':"Intentou engadir a capa: ${layerName} ao mapa, pero xa fora engadida",'reprojectDeprecated':"Está usando a opción \"reproject\" na capa ${layerName}. Esta opción está obsoleta: o seu uso foi deseñado para a visualización de datos sobre mapas base comerciais, pero esta funcionalidade debera agora ser obtida utilizando a proxección Spherical Mercator. Hai dispoñible máis información en http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Este método está obsoleto e será eliminado na versión 3.0. Por favor, no canto deste use ${newMethod}.",'boundsAddError':"Debe achegar os valores x e y á función add.",'lonlatAddError':"Debe achegar tanto o valor lon coma o lat á función add.",'pixelAddError':"Debe achegar os valores x e y á función add.",'unsupportedGeometryType':"Tipo xeométrico non soportado: ${geomType}",'filterEvaluateNotImplemented':"avaliar non está implementado para este tipo de filtro."});OpenLayers.Lang["ar"]=OpenLayers.Util.applyDefaults({'Permalink':"وصلة دائمة",'Base Layer':"الطبقة الاساسية",'readNotImplemented':"القراءة غير محققة.",'writeNotImplemented':"الكتابة غير محققة",'errorLoadingGML':"خطأ عند تحميل الملف جي ام ال ${url}",'Scale = 1 : ${scaleDenom}':"النسبة = 1 : ${scaleDenom}",'W':"غ",'E':"شر",'N':"شم",'S':"ج"});OpenLayers.Handler.Pinch=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:false,pinching:false,last:null,start:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);},touchstart:function(evt){var propagate=true;this.pinching=false;if(OpenLayers.Event.isMultiTouch(evt)){this.started=true;this.last=this.start={distance:this.getDistance(evt.touches),delta:0,scale:1};this.callback("start",[evt,this.start]);propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;} +options.filter=this.filter&&this.filter.clone();options.context=this.context&&OpenLayers.Util.extend({},this.context);return new OpenLayers.Rule(options);},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.Lang["gl"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Solicitude non xerada; a resposta foi: ${statusText}",'Permalink':"Ligazón permanente",'Overlays':"Capas superpostas",'Base Layer':"Capa base",'noFID':"Non se pode actualizar a funcionalidade para a que non hai FID.",'browserNotSupported':"O seu navegador non soporta a renderización de vectores. Os renderizadores soportados actualmente son:\n${renderers}",'minZoomLevelError':"A propiedade minZoomLevel é só para uso conxuntamente coas capas FixedZoomLevels-descendent. O feito de que esa capa wfs verifique o minZoomLevel é unha reliquia do pasado. Non podemos, con todo, eliminala sen a posibilidade de non romper as aplicacións baseadas en OL que poidan depender dela. Por iso a estamos deixando obsoleta (a comprobación minZoomLevel de embaixo será eliminada na versión 3.0). Por favor, no canto diso use o axuste de resolución mín/máx tal e como está descrito aquí: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacción WFS: ÉXITO ${response}",'commitFailed':"Transacción WFS: FALLIDA ${response}",'googleWarning':"A capa do Google non puido cargarse correctamente.\x3cbr\x3e\x3cbr\x3ePara evitar esta mensaxe, escolla unha nova capa base no seleccionador de capas na marxe superior dereita.\x3cbr\x3e\x3cbr\x3eProbablemente, isto acontece porque a escritura da libraría do Google Maps ou ben non foi incluída ou ben non contén a clave API correcta para o seu sitio.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: para axudar a facer funcionar isto correctamente, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3epremede aquí\x3c/a\x3e",'getLayerWarning':"A capa ${layerType} foi incapaz de cargarse correctamente.\x3cbr\x3e\x3cbr\x3ePara evitar esta mensaxe, escolla unha nova capa base no seleccionador de capas na marxe superior dereita.\x3cbr\x3e\x3cbr\x3eProbablemente, isto acontece porque a escritura da libraría ${layerLib} non foi ben incluída.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: para axudar a facer funcionar isto correctamente, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3epremede aquí\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':"O",'E':"L",'N':"N",'S':"S",'reprojectDeprecated':"Está usando a opción \"reproject\" na capa ${layerName}. Esta opción está obsoleta: o seu uso foi deseñado para a visualización de datos sobre mapas base comerciais, pero esta funcionalidade debera agora ser obtida utilizando a proxección Spherical Mercator. Hai dispoñible máis información en http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Este método está obsoleto e será eliminado na versión 3.0. Por favor, no canto deste use ${newMethod}."});OpenLayers.Lang["ar"]=OpenLayers.Util.applyDefaults({'Permalink':"وصلة دائمة",'Base Layer':"الطبقة الاساسية",'Scale = 1 : ${scaleDenom}':"النسبة = 1 : ${scaleDenom}",'W':"غ",'E':"شر",'N':"شم",'S':"ج"});OpenLayers.Handler.Pinch=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:false,pinching:false,last:null,start:null,touchstart:function(evt){var propagate=true;this.pinching=false;if(OpenLayers.Event.isMultiTouch(evt)){this.started=true;this.last=this.start={distance:this.getDistance(evt.touches),delta:0,scale:1};this.callback("start",[evt,this.start]);propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;} OpenLayers.Event.stop(evt);return propagate;},touchmove:function(evt){if(this.started&&OpenLayers.Event.isMultiTouch(evt)){this.pinching=true;var current=this.getPinchData(evt);this.callback("move",[evt,current]);this.last=current;OpenLayers.Event.stop(evt);} return true;},touchend:function(evt){if(this.started){this.started=false;this.pinching=false;this.callback("done",[evt,this.start,this.last]);this.start=null;this.last=null;} return true;},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.pinching=false;activated=true;} return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.started=false;this.pinching=false;this.start=null;this.last=null;deactivated=true;} return deactivated;},getDistance:function(touches){var t0=touches[0];var t1=touches[1];return Math.sqrt(Math.pow(t0.clientX-t1.clientX,2)+ -Math.pow(t0.clientY-t1.clientY,2));},getPinchData:function(evt){var distance=this.getDistance(evt.touches);var scale=distance/this.start.distance;return{distance:distance,delta:this.last.distance-distance,scale:scale};},CLASS_NAME:"OpenLayers.Handler.Pinch"});OpenLayers.Lang['lt']=OpenLayers.Util.applyDefaults({'unhandledRequest':"Neapdorota užklausa gražino ${statusText}",'Permalink':"Pastovi nuoroda",'Overlays':"Papildomi sluoksniai",'Base Layer':"Pagrindinis sluoksnis",'readNotImplemented':"Skaitymas nėra įgyvendintas.",'writeNotImplemented':"Rašymas nėra įgyvendintas.",'noFID':"Negaliu atnaujinti objekto, kuris neturi FID.",'errorLoadingGML':"Klaida užkraunant GML failą ${url}",'browserNotSupported':"Jūsų naršyklė nemoka parodyti vektorių. Šiuo metu galima naudotis tokiais rodymo varikliais:\n{renderers}",'componentShouldBe':"addFeatures : komponentas turi būti ${geomType}",'getFeatureError':"getFeatureFromEvent buvo iškviestas sluoksniui, kuris neturi priskirto paišymo variklio. Tai paprastai nutinka, kai jūs pašalinate sluoksnį, bet paliekate su juo susijusį [handler]",'commitSuccess':"WFS Tranzakcija: PAVYKO ${response}",'commitFailed':"WFS Tranzakcija: ŽLUGO ${response}",'Scale = 1 : ${scaleDenom}':"Mastelis = 1 : ${scaleDenom}",'W':'V','E':'R','N':'Š','S':'P','Graticule':'Tinklelis','layerAlreadyAdded':"Bandėte pridėti prie žemėlapio sluoksnį ${layerName}, tačiau jis jau yra pridėtas",'methodDeprecated':"Šis metodas yra pasenęs ir 3.0 versijoje bus pašalintas. "+"Prašome naudoti ${newMethod}.",'boundsAddError':"Add funkcijai reikia pateikti tiek x, tiek y reikšmes.",'lonlatAddError':"Add funkcijai reikia pateikti tiek lon, tiek lat reikšmes",'pixelAddError':"Add funkcijai būtina perduoti tiek x, tiek y reikšmes.",'unsupportedGeometryType':"Nepalaikomas geometrijos tipas: ${geomType}",'end':''});OpenLayers.Lang.ca={'unhandledRequest':"Resposta a petició no gestionada ${statusText}",'Permalink':"Enllaç permanent",'Overlays':"Capes addicionals",'Base Layer':"Capa Base",'readNotImplemented':"Lectura no implementada.",'writeNotImplemented':"Escriptura no implementada.",'noFID':"No es pot actualitzar un element per al que no existeix FID.",'errorLoadingGML':"Error carregant el fitxer GML ${url}",'browserNotSupported':"El seu navegador no suporta renderització vectorial. Els renderitzadors suportats actualment són:\n${renderers}",'componentShouldBe':"addFeatures : el component ha de ser de tipus ${geomType}",'getFeatureError':"getFeatureFromEvent ha estat cridat des d'una capa sense renderizador. Això normalment vol dir que "+"s'ha eliminat una capa, però no el handler associat a ella.",'minZoomLevelError':"La propietat minZoomLevel s'ha d'utilitzar només "+"amb les capes que tenen FixedZoomLevels. El fet que "+"una capa wfs comprovi minZoomLevel és una relíquia del "+"passat. No podem, però, eliminar-la sense trencar "+"les aplicacions d'OpenLayers que en puguin dependre. "+"Així doncs estem fent-la obsoleta -- la comprovació "+"minZoomLevel s'eliminarà a la versió 3.0. Feu servir "+"els paràmetres min/max resolution en substitució, tal com es descriu aquí: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacció WFS: CORRECTA ${response}",'commitFailed':"Transacció WFS: HA FALLAT ${response}",'googleWarning':"La capa Google no s'ha pogut carregar correctament.<br><br>"+"Per evitar aquest missatge, seleccioneu una nova Capa Base "+"al gestor de capes de la cantonada superior dreta.<br><br>"+"Probablement això és degut a que l'script de la biblioteca de "+"Google Maps no ha estat inclòs a la vostra pàgina, o no "+"conté la clau de l'API correcta per a la vostra adreça.<br><br>"+"Desenvolupadors: Per obtenir consells sobre com fer anar això, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>féu clic aquí</a>",'getLayerWarning':"Per evitar aquest missatge, seleccioneu una nova Capa Base "+"al gestor de capes de la cantonada superior dreta.<br><br>"+"Probablement això és degut a que l'script de la biblioteca "+"${layerLib} "+"no ha estat inclòs a la vostra pàgina.<br><br>"+"Desenvolupadors: Per obtenir consells sobre com fer anar això, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>féu clic aquí</a>",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':'O','E':'E','N':'N','S':'S','Graticule':'Retícula','layerAlreadyAdded':"Heu intentat afegir la capa: ${layerName} al mapa, però ja ha estat afegida anteriorment",'reprojectDeprecated':"Esteu fent servir l'opció 'reproject' a la capa "+"${layerName}. Aquesta opció és obsoleta: el seu ús fou concebut "+"per suportar la visualització de dades sobre mapes base comercials, "+"però ara aquesta funcionalitat s'hauria d'assolir mitjançant el suport "+"de la projecció Spherical Mercator. Més informació disponible a "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Aquest mètode és obsolet i s'eliminarà a la versió 3.0. "+"Si us plau feu servir em mètode alternatiu ${newMethod}.",'boundsAddError':"Ha de proporcionar els valors x i y a la funció add.",'lonlatAddError':"Ha de proporcionar els valors lon i lat a la funció add.",'pixelAddError':"Ha de proporcionar els valors x i y a la funció add.",'unsupportedGeometryType':"Tipus de geometria no suportada: ${geomType}",'filterEvaluateNotImplemented':"evaluate no està implementat per aquest tipus de filtre.",'end':''};OpenLayers.Lang["id"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Permintaan yang tak tertangani menghasilkan ${statusText}",'Permalink':"Pranala permanen",'Overlays':"Hamparan",'Base Layer':"Lapisan Dasar",'readNotImplemented':"Membaca tidak diterapkan.",'writeNotImplemented':"Menyimpan tidak diterapkan.",'noFID':"Tidak dapat memperbarui fitur yang tidak memiliki FID.",'errorLoadingGML':"Kesalahan dalam memuat berkas GML ${url}",'browserNotSupported':"Peramban Anda tidak mendukung penggambaran vektor. Penggambar yang didukung saat ini adalah:\n${renderers}",'componentShouldBe':"addFeatures : komponen harus berupa ${geomType}",'getFeatureError':"getFeatureFromEvent diterapkan pada lapisan tanpa penggambar. Ini biasanya berarti Anda menghapus sebuah lapisan, tetapi tidak menghapus penangan yang terkait dengannya.",'minZoomLevelError':"Properti minZoomLevel hanya ditujukan bekerja dengan lapisan FixedZoomLevels-descendent. Pengecekan minZoomLevel oleh lapisan wfs adalah peninggalan masa lalu. Kami tidak dapat menghapusnya tanpa kemungkinan merusak aplikasi berbasis OL yang mungkin bergantung padanya. Karenanya, kami menganggapnya tidak berlaku -- Cek minZoomLevel di bawah ini akan dihapus pada 3.0. Silakan gunakan penyetelan resolusi min/maks seperti dijabarkan di sini: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaksi: BERHASIL ${respon}",'commitFailed':"WFS Transaksi: GAGAL ${respon}",'googleWarning':"Lapisan Google tidak dapat dimuat dengan benar.\x3cbr\x3e\x3cbr\x3eUntuk menghilangkan pesan ini, pilih suatu BaseLayer baru melalui penukar lapisan (layer switcher) di ujung kanan atas.\x3cbr\x3e\x3cbr\x3eKemungkinan besar ini karena pustaka skrip Google Maps tidak disertakan atau tidak mengandung kunci API yang tepat untuk situs Anda.\x3cbr\x3e\x3cbr\x3ePengembang: Untuk bantuan mengatasi masalah ini, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklik di sini\x3c/a\x3e",'getLayerWarning':"Lapisan ${layerType} tidak dapat dimuat dengan benar.\x3cbr\x3e\x3cbr\x3eUntuk menghilangkan pesan ini, pilih suatu BaseLayer baru melalui penukar lapisan (layer switcher) di ujung kanan atas.\x3cbr\x3e\x3cbr\x3eKemungkinan besar ini karena pustaka skrip Google Maps tidak disertakan dengan benar.\x3cbr\x3e\x3cbr\x3ePengembang: Untuk bantuan mengatasi masalah ini, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik di sini\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Sekala = 1 : ${scaleDenom}",'W':"B",'E':"T",'N':"U",'S':"S",'layerAlreadyAdded':"Anda mencoba menambahkan lapisan: ${layerName} ke dalam peta, tapi lapisan itu telah ditambahkan",'reprojectDeprecated':"Anda menggunakan opsi \'reproject\' pada lapisan ${layerName}. Opsi ini telah ditinggalkan: penggunaannya dirancang untuk mendukung tampilan data melalui peta dasar komersial, tapi fungsionalitas tersebut saat ini harus dilakukan dengan menggunakan dukungan Spherical Mercator. Informasi lebih lanjut tersedia di http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Metode ini telah usang dan akan dihapus di 3.0. Sebaliknya, harap gunakan ${newMethod}.",'boundsAddError':"Anda harus memberikan kedua nilai x dan y ke fungsi penambah.",'lonlatAddError':"Anda harus memberikan kedua nilai lon dan lat ke fungsi penambah.",'pixelAddError':"Anda harus memberikan kedua nilai x dan y ke fungsi penambah.",'unsupportedGeometryType':"Tipe geometri tak didukung: ${geomType}",'filterEvaluateNotImplemented':"evaluasi tidak tersedia untuk tipe filter ini."});OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:true,lowerBoundary:null,upperBoundary:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);if(this.type===OpenLayers.Filter.Comparison.LIKE&&options.matchCase===undefined){this.matchCase=null;}},evaluate:function(context){if(context instanceof OpenLayers.Feature.Vector){context=context.attributes;} -var result=false;var got=context[this.property];var exp;switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()==exp.toUpperCase());}else{result=(got==exp);} -break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()!=exp.toUpperCase());}else{result=(got!=exp);} -break;case OpenLayers.Filter.Comparison.LESS_THAN:result=got<this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN:result=got>this.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:result=got<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:result=got>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:result=(got>=this.lowerBoundary)&&(got<=this.upperBoundary);break;case OpenLayers.Filter.Comparison.LIKE:var regexp=new RegExp(this.value,"gi");result=regexp.test(got);break;} -return result;},value2regex:function(wildCard,singleChar,escapeChar){if(wildCard=="."){var msg="'.' is an unsupported wildCard character for "+"OpenLayers.Filter.Comparison";OpenLayers.Console.error(msg);return null;} -wildCard=wildCard?wildCard:"*";singleChar=singleChar?singleChar:".";escapeChar=escapeChar?escapeChar:"!";this.value=this.value.replace(new RegExp("\\"+escapeChar+"(.|$)","g"),"\\$1");this.value=this.value.replace(new RegExp("\\"+singleChar,"g"),".");this.value=this.value.replace(new RegExp("\\"+wildCard,"g"),".*");this.value=this.value.replace(new RegExp("\\\\.\\*","g"),"\\"+wildCard);this.value=this.value.replace(new RegExp("\\\\\\.","g"),"\\"+singleChar);return this.value;},regex2value:function(){var value=this.value;value=value.replace(/!/g,"!!");value=value.replace(/(\\)?\\\./g,function($0,$1){return $1?$0:"!.";});value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"!*";});value=value.replace(/\\\\/g,"\\");value=value.replace(/\.\*/g,"*");return value;},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(),this);},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Format.QueryStringFilter=(function(){var cmpToStr={};cmpToStr[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";cmpToStr[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN]="lt";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";cmpToStr[OpenLayers.Filter.Comparison.LIKE]="ilike";function regex2value(value){value=value.replace(/%/g,"\\%");value=value.replace(/\\\\\.(\*)?/g,function($0,$1){return $1?$0:"\\\\_";});value=value.replace(/\\\\\.\*/g,"\\\\%");value=value.replace(/(\\)?\.(\*)?/g,function($0,$1,$2){return $1||$2?$0:"_";});value=value.replace(/(\\)?\.\*/g,function($0,$1){return $1?$0:"%";});value=value.replace(/\\\./g,".");value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"*";});return value;} -return OpenLayers.Class(OpenLayers.Format,{wildcarded:false,srsInBBOX:false,write:function(filter,params){params=params||{};var className=filter.CLASS_NAME;var filterType=className.substring(className.lastIndexOf(".")+1);switch(filterType){case"Spatial":switch(filter.type){case OpenLayers.Filter.Spatial.BBOX:params.bbox=filter.value.toArray();if(this.srsInBBOX&&filter.projection){params.bbox.push(filter.projection.getCode());} -break;case OpenLayers.Filter.Spatial.DWITHIN:params.tolerance=filter.distance;case OpenLayers.Filter.Spatial.WITHIN:params.lon=filter.value.x;params.lat=filter.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+filter.type);} -break;case"Comparison":var op=cmpToStr[filter.type];if(op!==undefined){var value=filter.value;if(filter.type==OpenLayers.Filter.Comparison.LIKE){value=regex2value(value);if(this.wildcarded){value="%"+value+"%";}} -params[filter.property+"__"+op]=value;params.queryable=params.queryable||[];params.queryable.push(filter.property);}else{OpenLayers.Console.warn("Unknown comparison filter type "+filter.type);} -break;case"Logical":if(filter.type===OpenLayers.Filter.Logical.AND){for(var i=0,len=filter.filters.length;i<len;i++){params=this.write(filter.filters[i],params);}}else{OpenLayers.Console.warn("Unsupported logical filter type "+filter.type);} -break;default:OpenLayers.Console.warn("Unknown filter type "+filterType);} -return params;},CLASS_NAME:"OpenLayers.Format.QueryStringFilter"});})();OpenLayers.Lang["fur"]=OpenLayers.Util.applyDefaults({'Permalink':"Leam Permanent",'Overlays':"Livei parsore",'Base Layer':"Livel di base",'browserNotSupported':"Il to sgarfadôr nol supuarte la renderizazion vetoriâl. Al moment a son supuartâts:\n${renderers}",'Scale = 1 : ${scaleDenom}':"Scjale = 1 : ${scaleDenom}",'W':"O",'E':"E",'N':"N",'S':"S"});OpenLayers.Lang["km"]=OpenLayers.Util.applyDefaults({'Permalink':"តំណភ្ជាប់អចិន្ត្រៃយ៍",'Base Layer':"ស្រទាប់បាត​",'errorLoadingGML':"កំហុសកំឡុងពេលផ្ទុកឯកសារ GML ${url}",'Scale = 1 : ${scaleDenom}':"មាត្រដ្ឋាន = ១ ៖ ${scaleDenom}"});OpenLayers.Format.GML=OpenLayers.Class(OpenLayers.Format.XML,{featureNS:"http://mapserver.gis.umn.edu/mapserver",featurePrefix:"feature",featureName:"featureMember",layerName:"features",geometryName:"geometry",collectionName:"FeatureCollection",gmlns:"http://www.opengis.net/gml",extractAttributes:true,xy:true,initialize:function(options){this.regExes={trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)};OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);} -var featureNodes=this.getElementsByTagNameNS(data.documentElement,this.gmlns,this.featureName);var features=[];for(var i=0;i<featureNodes.length;i++){var feature=this.parseFeature(featureNodes[i]);if(feature){features.push(feature);}} -return features;},parseFeature:function(node){var order=["MultiPolygon","Polygon","MultiLineString","LineString","MultiPoint","Point","Envelope"];var type,nodeList,geometry,parser;for(var i=0;i<order.length;++i){type=order[i];nodeList=this.getElementsByTagNameNS(node,this.gmlns,type);if(nodeList.length>0){parser=this.parseGeometry[type.toLowerCase()];if(parser){geometry=parser.apply(this,[nodeList[0]]);if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}}else{OpenLayers.Console.error(OpenLayers.i18n("unsupportedGeometryType",{'geomType':type}));} -break;}} -var bounds;var boxNodes=this.getElementsByTagNameNS(node,this.gmlns,"Box");for(i=0;i<boxNodes.length;++i){var boxNode=boxNodes[i];var box=this.parseGeometry["box"].apply(this,[boxNode]);var parentNode=boxNode.parentNode;var parentName=parentNode.localName||parentNode.nodeName.split(":").pop();if(parentName==="boundedBy"){bounds=box;}else{geometry=box.toGeometry();}} -var attributes;if(this.extractAttributes){attributes=this.parseAttributes(node);} -var feature=new OpenLayers.Feature.Vector(geometry,attributes);feature.bounds=bounds;feature.gml={featureType:node.firstChild.nodeName.split(":")[1],featureNS:node.firstChild.namespaceURI,featureNSPrefix:node.firstChild.prefix};var childNode=node.firstChild;var fid;while(childNode){if(childNode.nodeType==1){fid=childNode.getAttribute("fid")||childNode.getAttribute("id");if(fid){break;}} -childNode=childNode.nextSibling;} -feature.fid=fid;return feature;},parseGeometry:{point:function(node){var nodeList,coordString;var coords=[];var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"pos");if(nodeList.length>0){coordString=nodeList[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.trimSpace,"");coords=coordString.split(this.regExes.splitSpace);} -if(coords.length==0){nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coordinates");if(nodeList.length>0){coordString=nodeList[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.removeSpace,"");coords=coordString.split(",");}} -if(coords.length==0){nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coord");if(nodeList.length>0){var xList=this.getElementsByTagNameNS(nodeList[0],this.gmlns,"X");var yList=this.getElementsByTagNameNS(nodeList[0],this.gmlns,"Y");if(xList.length>0&&yList.length>0){coords=[xList[0].firstChild.nodeValue,yList[0].firstChild.nodeValue];}}} -if(coords.length==2){coords[2]=null;} -if(this.xy){return new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);} -else{return new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]);}},multipoint:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"Point");var components=[];if(nodeList.length>0){var point;for(var i=0;i<nodeList.length;++i){point=this.parseGeometry.point.apply(this,[nodeList[i]]);if(point){components.push(point);}}} -return new OpenLayers.Geometry.MultiPoint(components);},linestring:function(node,ring){var nodeList,coordString;var coords=[];var points=[];nodeList=this.getElementsByTagNameNS(node,this.gmlns,"posList");if(nodeList.length>0){coordString=this.getChildValue(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coords=coordString.split(this.regExes.splitSpace);var dim=parseInt(nodeList[0].getAttribute("dimension"));var j,x,y,z;for(var i=0;i<coords.length/dim;++i){j=i*dim;x=coords[j];y=coords[j+1];z=(dim==2)?null:coords[j+2];if(this.xy){points.push(new OpenLayers.Geometry.Point(x,y,z));}else{points.push(new OpenLayers.Geometry.Point(y,x,z));}}} -if(coords.length==0){nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coordinates");if(nodeList.length>0){coordString=this.getChildValue(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coordString=coordString.replace(this.regExes.trimComma,",");var pointList=coordString.split(this.regExes.splitSpace);for(var i=0;i<pointList.length;++i){coords=pointList[i].split(",");if(coords.length==2){coords[2]=null;} -if(this.xy){points.push(new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]));}else{points.push(new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]));}}}} -var line=null;if(points.length!=0){if(ring){line=new OpenLayers.Geometry.LinearRing(points);}else{line=new OpenLayers.Geometry.LineString(points);}} -return line;},multilinestring:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"LineString");var components=[];if(nodeList.length>0){var line;for(var i=0;i<nodeList.length;++i){line=this.parseGeometry.linestring.apply(this,[nodeList[i]]);if(line){components.push(line);}}} -return new OpenLayers.Geometry.MultiLineString(components);},polygon:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"LinearRing");var components=[];if(nodeList.length>0){var ring;for(var i=0;i<nodeList.length;++i){ring=this.parseGeometry.linestring.apply(this,[nodeList[i],true]);if(ring){components.push(ring);}}} -return new OpenLayers.Geometry.Polygon(components);},multipolygon:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"Polygon");var components=[];if(nodeList.length>0){var polygon;for(var i=0;i<nodeList.length;++i){polygon=this.parseGeometry.polygon.apply(this,[nodeList[i]]);if(polygon){components.push(polygon);}}} -return new OpenLayers.Geometry.MultiPolygon(components);},envelope:function(node){var components=[];var coordString;var envelope;var lpoint=this.getElementsByTagNameNS(node,this.gmlns,"lowerCorner");if(lpoint.length>0){var coords=[];if(lpoint.length>0){coordString=lpoint[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.trimSpace,"");coords=coordString.split(this.regExes.splitSpace);} -if(coords.length==2){coords[2]=null;} -if(this.xy){var lowerPoint=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{var lowerPoint=new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]);}} -var upoint=this.getElementsByTagNameNS(node,this.gmlns,"upperCorner");if(upoint.length>0){var coords=[];if(upoint.length>0){coordString=upoint[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.trimSpace,"");coords=coordString.split(this.regExes.splitSpace);} -if(coords.length==2){coords[2]=null;} -if(this.xy){var upperPoint=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{var upperPoint=new OpenLayers.Geometry.Point(coords[1],coords[0],coords[2]);}} -if(lowerPoint&&upperPoint){components.push(new OpenLayers.Geometry.Point(lowerPoint.x,lowerPoint.y));components.push(new OpenLayers.Geometry.Point(upperPoint.x,lowerPoint.y));components.push(new OpenLayers.Geometry.Point(upperPoint.x,upperPoint.y));components.push(new OpenLayers.Geometry.Point(lowerPoint.x,upperPoint.y));components.push(new OpenLayers.Geometry.Point(lowerPoint.x,lowerPoint.y));var ring=new OpenLayers.Geometry.LinearRing(components);envelope=new OpenLayers.Geometry.Polygon([ring]);} -return envelope;},box:function(node){var nodeList=this.getElementsByTagNameNS(node,this.gmlns,"coordinates");var coordString;var coords,beginPoint=null,endPoint=null;if(nodeList.length>0){coordString=nodeList[0].firstChild.nodeValue;coords=coordString.split(" ");if(coords.length==2){beginPoint=coords[0].split(",");endPoint=coords[1].split(",");}} -if(beginPoint!==null&&endPoint!==null){return new OpenLayers.Bounds(parseFloat(beginPoint[0]),parseFloat(beginPoint[1]),parseFloat(endPoint[0]),parseFloat(endPoint[1]));}}},parseAttributes:function(node){var attributes={};var childNode=node.firstChild;var children,i,child,grandchildren,grandchild,name,value;while(childNode){if(childNode.nodeType==1){children=childNode.childNodes;for(i=0;i<children.length;++i){child=children[i];if(child.nodeType==1){grandchildren=child.childNodes;if(grandchildren.length==1){grandchild=grandchildren[0];if(grandchild.nodeType==3||grandchild.nodeType==4){name=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;value=grandchild.nodeValue.replace(this.regExes.trimSpace,"");attributes[name]=value;}}else{attributes[child.nodeName.split(":").pop()]=null;}}} -break;} -childNode=childNode.nextSibling;} -return attributes;},write:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} -var gml=this.createElementNS("http://www.opengis.net/wfs","wfs:"+this.collectionName);for(var i=0;i<features.length;i++){gml.appendChild(this.createFeatureXML(features[i]));} -return OpenLayers.Format.XML.prototype.write.apply(this,[gml]);},createFeatureXML:function(feature){var geometry=feature.geometry;var geometryNode=this.buildGeometryNode(geometry);var geomContainer=this.createElementNS(this.featureNS,this.featurePrefix+":"+ -this.geometryName);geomContainer.appendChild(geometryNode);var featureNode=this.createElementNS(this.gmlns,"gml:"+this.featureName);var featureContainer=this.createElementNS(this.featureNS,this.featurePrefix+":"+ -this.layerName);var fid=feature.fid||feature.id;featureContainer.setAttribute("fid",fid);featureContainer.appendChild(geomContainer);for(var attr in feature.attributes){var attrText=this.createTextNode(feature.attributes[attr]);var nodename=attr.substring(attr.lastIndexOf(":")+1);var attrContainer=this.createElementNS(this.featureNS,this.featurePrefix+":"+ -nodename);attrContainer.appendChild(attrText);featureContainer.appendChild(attrContainer);} -featureNode.appendChild(featureContainer);return featureNode;},buildGeometryNode:function(geometry){if(this.externalProjection&&this.internalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);} -var className=geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);var builder=this.buildGeometry[type.toLowerCase()];return builder.apply(this,[geometry]);},buildGeometry:{point:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:Point");gml.appendChild(this.buildCoordinatesNode(geometry));return gml;},multipoint:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:MultiPoint");var points=geometry.components;var pointMember,pointGeom;for(var i=0;i<points.length;i++){pointMember=this.createElementNS(this.gmlns,"gml:pointMember");pointGeom=this.buildGeometry.point.apply(this,[points[i]]);pointMember.appendChild(pointGeom);gml.appendChild(pointMember);} -return gml;},linestring:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:LineString");gml.appendChild(this.buildCoordinatesNode(geometry));return gml;},multilinestring:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:MultiLineString");var lines=geometry.components;var lineMember,lineGeom;for(var i=0;i<lines.length;++i){lineMember=this.createElementNS(this.gmlns,"gml:lineStringMember");lineGeom=this.buildGeometry.linestring.apply(this,[lines[i]]);lineMember.appendChild(lineGeom);gml.appendChild(lineMember);} -return gml;},linearring:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:LinearRing");gml.appendChild(this.buildCoordinatesNode(geometry));return gml;},polygon:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:Polygon");var rings=geometry.components;var ringMember,ringGeom,type;for(var i=0;i<rings.length;++i){type=(i==0)?"outerBoundaryIs":"innerBoundaryIs";ringMember=this.createElementNS(this.gmlns,"gml:"+type);ringGeom=this.buildGeometry.linearring.apply(this,[rings[i]]);ringMember.appendChild(ringGeom);gml.appendChild(ringMember);} -return gml;},multipolygon:function(geometry){var gml=this.createElementNS(this.gmlns,"gml:MultiPolygon");var polys=geometry.components;var polyMember,polyGeom;for(var i=0;i<polys.length;++i){polyMember=this.createElementNS(this.gmlns,"gml:polygonMember");polyGeom=this.buildGeometry.polygon.apply(this,[polys[i]]);polyMember.appendChild(polyGeom);gml.appendChild(polyMember);} -return gml;},bounds:function(bounds){var gml=this.createElementNS(this.gmlns,"gml:Box");gml.appendChild(this.buildCoordinatesNode(bounds));return gml;}},buildCoordinatesNode:function(geometry){var coordinatesNode=this.createElementNS(this.gmlns,"gml:coordinates");coordinatesNode.setAttribute("decimal",".");coordinatesNode.setAttribute("cs",",");coordinatesNode.setAttribute("ts"," ");var parts=[];if(geometry instanceof OpenLayers.Bounds){parts.push(geometry.left+","+geometry.bottom);parts.push(geometry.right+","+geometry.top);}else{var points=(geometry.components)?geometry.components:[geometry];for(var i=0;i<points.length;i++){parts.push(points[i].x+","+points[i].y);}} -var txtNode=this.createTextNode(parts.join(" "));coordinatesNode.appendChild(txtNode);return coordinatesNode;},CLASS_NAME:"OpenLayers.Format.GML"});OpenLayers.Lang["nl"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Het verzoek is niet afgehandeld met de volgende melding: ${statusText}",'Permalink':"Permanente verwijzing",'Overlays':"Overlays",'Base Layer':"Achtergrondkaart",'readNotImplemented':"Lezen is niet geïmplementeerd.",'writeNotImplemented':"Schrijven is niet geïmplementeerd.",'noFID':"Een optie die geen FID heeft kan niet bijgewerkt worden.",'errorLoadingGML':"Er is een fout opgetreden bij het laden van het GML bestand van ${url}",'browserNotSupported':"Uw browser ondersteunt het weergeven van vectoren niet.\nMomenteel ondersteunde weergavemogelijkheden:\n${renderers}",'componentShouldBe':"addFeatures : component moet van het type ${geomType} zijn",'getFeatureError':"getFeatureFromEvent is aangeroepen op een laag zonder rederer.\nDit betekent meestal dat u een laag hebt verwijderd, maar niet een handler die ermee geassocieerd was.",'minZoomLevelError':"De eigenschap minZoomLevel is alleen bedoeld voor gebruik lagen met die afstammen van FixedZoomLevels-lagen.\nDat deze WFS-laag minZoomLevel controleert, is een overblijfsel uit het verleden.\nWe kunnen deze controle echter niet verwijderen zonder op OL gebaseerde applicaties die hervan afhankelijk zijn stuk te maken.\nDaarom heeft deze functionaliteit de eigenschap \'deprecated\' gekregen - de minZoomLevel wordt verwijderd in versie 3.0.\nGebruik in plaats van deze functie de mogelijkheid om min/max voor resolutie in te stellen zoals op de volgende pagina wordt beschreven:\nhttp://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-transactie: succesvol ${response}",'commitFailed':"WFS-transactie: mislukt ${response}",'googleWarning':"De Google-Layer kon niet correct geladen worden.\x3cbr /\x3e\x3cbr /\x3e\nOm deze melding niet meer te krijgen, moet u een andere achtergrondkaart kiezen in de laagwisselaar in de rechterbovenhoek.\x3cbr /\x3e\x3cbr /\x3e\nDit komt waarschijnlijk doordat de bibliotheek ${layerLib} niet correct ingevoegd is.\x3cbr /\x3e\x3cbr /\x3e\nOntwikkelaars: \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik hier\x3c/a\x3e om dit werkend te krijgen.",'getLayerWarning':"De laag ${layerType} kon niet goed geladen worden.\x3cbr /\x3e\x3cbr /\x3e\nOm deze melding niet meer te krijgen, moet u een andere achtergrondkaart kiezen in de laagwisselaar in de rechterbovenhoek.\x3cbr /\x3e\x3cbr /\x3e\nDit komt waarschijnlijk doordat de bibliotheek ${layerLib} niet correct is ingevoegd.\x3cbr /\x3e\x3cbr /\x3e\nOntwikkelaars: \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik hier\x3c/a\x3e om dit werkend te krijgen.",'Scale = 1 : ${scaleDenom}':"Schaal = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"Z",'layerAlreadyAdded':"U hebt geprobeerd om de laag ${layerName} aan de kaart toe te voegen, maar deze is al toegevoegd",'reprojectDeprecated':"U gebruikt de optie \'reproject\' op de laag ${layerName}.\nDeze optie is vervallen: deze optie was ontwikkeld om gegevens over commerciële basiskaarten weer te geven, maar deze functionaliteit wordt nu bereikt door ondersteuning van Spherical Mercator.\nMeer informatie is beschikbaar op http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Deze methode is verouderd en wordt verwijderd in versie 3.0.\nGebruik ${newMethod}.",'boundsAddError':"U moet zowel de x- als de y-waarde doorgeven aan de toevoegfunctie.",'lonlatAddError':"U moet zowel de lengte- als de breedtewaarde doorgeven aan de toevoegfunctie.",'pixelAddError':"U moet zowel de x- als de y-waarde doorgeven aan de toevoegfunctie.",'unsupportedGeometryType':"Dit geometrietype wordt niet ondersteund: ${geomType}",'filterEvaluateNotImplemented':"evalueren is niet geïmplementeerd voor dit filtertype."});OpenLayers.Lang["fr"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Requête non gérée, retournant ${statusText}",'Permalink':"Permalien",'Overlays':"Calques",'Base Layer':"Calque de base",'readNotImplemented':"Lecture non implémentée.",'writeNotImplemented':"Ecriture non implémentée.",'noFID':"Impossible de mettre à jour un objet sans identifiant (fid).",'errorLoadingGML':"Erreur au chargement du fichier GML ${url}",'browserNotSupported':"Votre navigateur ne supporte pas le rendu vectoriel. Les renderers actuellement supportés sont : \n${renderers}",'componentShouldBe':"addFeatures : le composant devrait être de type ${geomType}",'getFeatureError':"getFeatureFromEvent a été appelé sur un calque sans renderer. Cela signifie généralement que vous avez détruit cette couche, mais que vous avez conservé un handler qui lui était associé.",'minZoomLevelError':"La propriété minZoomLevel doit seulement être utilisée pour des couches FixedZoomLevels-descendent. Le fait que cette couche WFS vérifie la présence de minZoomLevel est une relique du passé. Nous ne pouvons toutefois la supprimer sans casser des applications qui pourraient en dépendre. C\'est pourquoi nous la déprécions -- la vérification du minZoomLevel sera supprimée en version 3.0. A la place, merci d\'utiliser les paramètres de résolutions min/max tel que décrit sur : http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transaction WFS : SUCCES ${response}",'commitFailed':"Transaction WFS : ECHEC ${response}",'googleWarning':"La couche Google n\'a pas été en mesure de se charger correctement.\x3cbr\x3e\x3cbr\x3ePour supprimer ce message, choisissez une nouvelle BaseLayer dans le sélecteur de couche en haut à droite.\x3cbr\x3e\x3cbr\x3eCela est possiblement causé par la non-inclusion de la librairie Google Maps, ou alors parce que la clé de l\'API ne correspond pas à votre site.\x3cbr\x3e\x3cbr\x3eDéveloppeurs : pour savoir comment corriger ceci, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ecliquez ici\x3c/a\x3e",'getLayerWarning':"La couche ${layerType} n\'est pas en mesure de se charger correctement.\x3cbr\x3e\x3cbr\x3ePour supprimer ce message, choisissez une nouvelle BaseLayer dans le sélecteur de couche en haut à droite.\x3cbr\x3e\x3cbr\x3eCela est possiblement causé par la non-inclusion de la librairie ${layerLib}.\x3cbr\x3e\x3cbr\x3eDéveloppeurs : pour savoir comment corriger ceci, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ecliquez ici\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Echelle ~ 1 : ${scaleDenom}",'W':"O",'E':"E",'N':"N",'S':"S",'layerAlreadyAdded':"Vous avez essayé d\'ajouter à la carte le calque : ${layerName}, mais il est déjà présent",'reprojectDeprecated':"Vous utilisez l\'option \'reproject\' sur la couche ${layerName}. Cette option est dépréciée : Son usage permettait d\'afficher des données au dessus de couches raster commerciales.Cette fonctionalité est maintenant supportée en utilisant le support de la projection Mercator Sphérique. Plus d\'information est disponible sur http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Cette méthode est dépréciée, et sera supprimée à la version 3.0. Merci d\'utiliser ${newMethod} à la place.",'boundsAddError':"Vous devez passer les deux valeurs x et y à la fonction add.",'lonlatAddError':"Vous devez passer les deux valeurs lon et lat à la fonction add.",'pixelAddError':"Vous devez passer les deux valeurs x et y à la fonction add.",'unsupportedGeometryType':"Type de géométrie non supporté : ${geomType}",'filterEvaluateNotImplemented':"évaluer n\'a pas encore été implémenté pour ce type de filtre.",'proxyNeeded':"Vous avez très probablement besoin de renseigner OpenLayers.ProxyHost pour accéder à ${url}. Voir http://trac.osgeo.org/openlayers/wiki/FrequentlyAskedQuestions#ProxyHost"});OpenLayers.Lang["ksh"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Met dä Antwoot op en Aanfrooch ham_mer nix aanjefange: ${statusText}",'Permalink':"Lengk op Duuer",'Overlays':"Drövver jelaat",'Base Layer':"Jrund-Nivoh",'readNotImplemented':"„\x3ccode lang=\"en\"\x3eread\x3c/code\x3e“ is em Projramm nit fürjesinn.",'writeNotImplemented':"„\x3ccode lang=\"en\"\x3ewrite\x3c/code\x3e“ is em Projramm nit fürjesinn.",'noFID':"En Saach, woh kein \x3ci lang=\"en\"\x3eFID\x3c/i\x3e för doh es, löht sesch nit ändere.",'errorLoadingGML':"Fähler beim \x3ci lang=\"en\"\x3eGML\x3c/i\x3e-Datei-Laade vun \x3ccode\x3e${url}\x3c/code\x3e",'browserNotSupported':"Dinge Brauser kann kein Väktore ußjävve. De Zoote Ußjaabe, di em Momang jon, sen:\n${renderers}",'componentShouldBe':"\x3ccode lang=\"en\"\x3eaddFeatures\x3c/code\x3e: dä Aandeil sullt vun dä Zoot „\x3ccode lang=\"en\"\x3e${geomType}\x3c/code\x3e“ sin.",'getFeatureError':"\x3ccode lang=\"en\"\x3egetFeatureFromEvent\x3c/code\x3e es vun enem Nivoh opjeroofe woode, woh et kei Projramm zom Ußjävve jit. Dat bedügg för jewöhnlesch, dat De e Nivoh kapott jemaat häs, ävver nit e Projramm för domet ömzejonn, wat domet verbonge es.",'minZoomLevelError':"De Eijeschaff „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“ es bloß doför jedaach, dat mer se met dä Nivvohß bruch, di vun \x3ccode lang=\"en\"\x3eFixedZoomLevels\x3c/code\x3e affhange don. Dat dat \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Nivvoh övverhoup de Eijeschaff „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“ pröhfe deiht, es noch övveresch vun fröhjer. Mer künne dat ävver jez nit fott lohße, oohne dat mer Jevaa loufe, dat Aanwendunge vun OpenLayers nit mieh loufe, di sesch doh velleijsch noch drop am verlohße sin. Dröm sare mer, dat mer et nit mieh han welle, un de „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“-Eijeschaff weed hee vun de Version 3.0 af nit mieh jeprööf wäde. Nemm doför de Enstellung för de hühßte un de kleinßte Oplöhsung, esu wi et en http://trac.openlayers.org/wiki/SettingZoomLevels opjeschrevve es.",'commitSuccess':"Dä \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Vörjang es joot jeloufe: ${response}",'commitFailed':"Dä \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Vörjang es scheif jejange: ${response}",'googleWarning':"Dat Nivvoh \x3ccode lang=\"en\"\x3eGoogle\x3c/code\x3e kunnt nit reschtesch jelaade wääde.\x3cbr /\x3e\x3cbr /\x3eÖm hee di Nohreesch loß ze krijje, donn en ander Jrund-Nivvoh ußsöhke, rähß bovve en de Äk.\x3cbr /\x3e\x3cbr /\x3eWascheinlesch es dat wiel dat \x3ci lang=\"en\"\x3eGoogle-Maps\x3c/i\x3e-Skrepp entweeder nit reschtesch enjebonge wood, udder nit dä reschtejje \x3ci lang=\"en\"\x3eAPI\x3c/i\x3e-Schlößel för Ding Web-ßait scheke deiht.\x3cbr /\x3e\x3cbr /\x3eFör Projrammierer jidd_et Hölp do_drövver, \x3ca href=\"http://trac.openlayers.org/wiki/Google\" target=\"_blank\"\x3ewi mer dat aan et Loufe brengk\x3c/a\x3e.",'getLayerWarning':"Dat Nivvoh \x3ccode\x3e${layerType}\x3c/code\x3e kunnt nit reschtesch jelaade wääde.\x3cbr /\x3e\x3cbr /\x3eÖm hee di Nohreesch loß ze krijje, donn en ander Jrund-Nivvoh ußsöhkre, rähß bovve en de Äk.\x3cbr /\x3e\x3cbr /\x3eWascheinlesch es dat, wiel dat Skrepp \x3ccode\x3e${layerLib}\x3c/code\x3e nit reschtesch enjebonge wood.\x3cbr /\x3e\x3cbr /\x3eFör Projrammierer jidd_Et Hölp do_drövver, \x3ca href=\"http://trac.openlayers.org/wiki/${layerLib}\" target=\"_blank\"\x3ewi mer dat aan et Loufe brengk\x3c/a\x3e.",'Scale = 1 : ${scaleDenom}':"Mohßshtaab = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"S",'layerAlreadyAdded':"Do häß versöhk, dat Nivvoh \x3ccode\x3e${layerName}\x3c/code\x3e en di Kaat eren ze bränge, et wohr ävver ald do dren.",'reprojectDeprecated':"Do bruchs de Ußwahl \x3ccode\x3ereproject\x3c/code\x3e op däm Nivvoh \x3ccode\x3e${layerName}\x3c/code\x3e. Di Ußwahl es nit mieh jähn jesinn. Se wohr doför jedaach, öm Date op jeschääfsmäßesch eruß jejovve Kaate bovve drop ze moole, wat ävver enzwesche besser met dä Öngershtözung för de ßfääresche Mäkaator Beldscher jeiht. Doh kanns De mieh drövver fenge op dä Sigg: http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Hee di Metood es nim_mih aktoäll un et weed se en dä Version 3.0 nit mieh jävve. Nemm \x3ccode\x3e${newMethod}\x3c/code\x3e doföör.",'boundsAddError':"Do moß beeds vun de \x3ccode\x3ex\x3c/code\x3e un \x3ccode\x3ey\x3c/code\x3e Wääte aan de Fungkßjohn \x3ccode\x3eadd\x3c/code\x3e jävve.",'lonlatAddError':"Do moß beeds \x3ccode\x3elon\x3c/code\x3e un \x3ccode\x3elat\x3c/code\x3e aan de Fungkßjohn \x3ccode\x3eadd\x3c/code\x3e jävve.",'pixelAddError':"Do moß beeds \x3ccode\x3ex\x3c/code\x3e un \x3ccode\x3ey\x3c/code\x3e aan de Fungkßjohn \x3ccode\x3eadd\x3c/code\x3e jävve.",'unsupportedGeometryType':"De Zoot Jommetrii dom_mer nit ongershtöze: \x3ccode\x3e${geomType}\x3c/code\x3e",'filterEvaluateNotImplemented':"„\x3ccode lang=\"en\"\x3eevaluate\x3c/code\x3e“ es för di Zoot Fellter nit enjereschdt."});OpenLayers.Rico=OpenLayers.Rico||{};OpenLayers.Rico.Color=OpenLayers.Class({initialize:function(red,green,blue){this.rgb={r:red,g:green,b:blue};},setRed:function(r){this.rgb.r=r;},setGreen:function(g){this.rgb.g=g;},setBlue:function(b){this.rgb.b=b;},setHue:function(h){var hsb=this.asHSB();hsb.h=h;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setSaturation:function(s){var hsb=this.asHSB();hsb.s=s;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setBrightness:function(b){var hsb=this.asHSB();hsb.b=b;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},darken:function(percent){var hsb=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.max(hsb.b-percent,0));},brighten:function(percent){var hsb=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.min(hsb.b+percent,1));},blend:function(other){this.rgb.r=Math.floor((this.rgb.r+other.rgb.r)/2);this.rgb.g=Math.floor((this.rgb.g+other.rgb.g)/2);this.rgb.b=Math.floor((this.rgb.b+other.rgb.b)/2);},isBright:function(){var hsb=this.asHSB();return this.asHSB().b>0.5;},isDark:function(){return!this.isBright();},asRGB:function(){return"rgb("+this.rgb.r+","+this.rgb.g+","+this.rgb.b+")";},asHex:function(){return"#"+this.rgb.r.toColorPart()+this.rgb.g.toColorPart()+this.rgb.b.toColorPart();},asHSB:function(){return OpenLayers.Rico.Color.RGBtoHSB(this.rgb.r,this.rgb.g,this.rgb.b);},toString:function(){return this.asHex();}});OpenLayers.Rico.Color.createFromHex=function(hexCode){if(hexCode.length==4){var shortHexCode=hexCode;var hexCode='#';for(var i=1;i<4;i++){hexCode+=(shortHexCode.charAt(i)+ -shortHexCode.charAt(i));}} -if(hexCode.indexOf('#')==0){hexCode=hexCode.substring(1);} -var red=hexCode.substring(0,2);var green=hexCode.substring(2,4);var blue=hexCode.substring(4,6);return new OpenLayers.Rico.Color(parseInt(red,16),parseInt(green,16),parseInt(blue,16));};OpenLayers.Rico.Color.createColorFromBackground=function(elem){var actualColor=OpenLayers.Element.getStyle(OpenLayers.Util.getElement(elem),"backgroundColor");if(actualColor=="transparent"&&elem.parentNode){return OpenLayers.Rico.Color.createColorFromBackground(elem.parentNode);} -if(actualColor==null){return new OpenLayers.Rico.Color(255,255,255);} -if(actualColor.indexOf("rgb(")==0){var colors=actualColor.substring(4,actualColor.length-1);var colorArray=colors.split(",");return new OpenLayers.Rico.Color(parseInt(colorArray[0]),parseInt(colorArray[1]),parseInt(colorArray[2]));} -else if(actualColor.indexOf("#")==0){return OpenLayers.Rico.Color.createFromHex(actualColor);} -else{return new OpenLayers.Rico.Color(255,255,255);}};OpenLayers.Rico.Color.HSBtoRGB=function(hue,saturation,brightness){var red=0;var green=0;var blue=0;if(saturation==0){red=parseInt(brightness*255.0+0.5);green=red;blue=red;} -else{var h=(hue-Math.floor(hue))*6.0;var f=h-Math.floor(h);var p=brightness*(1.0-saturation);var q=brightness*(1.0-saturation*f);var t=brightness*(1.0-(saturation*(1.0-f)));switch(parseInt(h)){case 0:red=(brightness*255.0+0.5);green=(t*255.0+0.5);blue=(p*255.0+0.5);break;case 1:red=(q*255.0+0.5);green=(brightness*255.0+0.5);blue=(p*255.0+0.5);break;case 2:red=(p*255.0+0.5);green=(brightness*255.0+0.5);blue=(t*255.0+0.5);break;case 3:red=(p*255.0+0.5);green=(q*255.0+0.5);blue=(brightness*255.0+0.5);break;case 4:red=(t*255.0+0.5);green=(p*255.0+0.5);blue=(brightness*255.0+0.5);break;case 5:red=(brightness*255.0+0.5);green=(p*255.0+0.5);blue=(q*255.0+0.5);break;}} -return{r:parseInt(red),g:parseInt(green),b:parseInt(blue)};};OpenLayers.Rico.Color.RGBtoHSB=function(r,g,b){var hue;var saturation;var brightness;var cmax=(r>g)?r:g;if(b>cmax){cmax=b;} -var cmin=(r<g)?r:g;if(b<cmin){cmin=b;} -brightness=cmax/255.0;if(cmax!=0){saturation=(cmax-cmin)/cmax;}else{saturation=0;} -if(saturation==0){hue=0;}else{var redc=(cmax-r)/(cmax-cmin);var greenc=(cmax-g)/(cmax-cmin);var bluec=(cmax-b)/(cmax-cmin);if(r==cmax){hue=bluec-greenc;}else if(g==cmax){hue=2.0+redc-bluec;}else{hue=4.0+greenc-redc;} -hue=hue/6.0;if(hue<0){hue=hue+1.0;}} -return{h:hue,s:saturation,b:brightness};};OpenLayers.Lang["ja"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"未処理の要求は ${statusText} を返します",'Permalink':"パーマリンク",'Overlays':"オーバーレイ",'Base Layer':"基底レイヤー",'readNotImplemented':"読み込みは実装されていません。",'writeNotImplemented':"書き込みは実装されていません。",'noFID':"FID のない地物は更新できません。",'errorLoadingGML':"GML ファイル ${url} の読み込みエラー",'browserNotSupported':"あなたのブラウザはベクターグラフィックスの描写に対応していません。現時点で対応しているソフトウェアは以下のものです。\n${renderers}",'componentShouldBe':"addFeatures: 要素は ${geomType} であるべきです",'getFeatureError':"getFeatureFromEvent がレンダラーのないレイヤーから呼ばれました。通常、これはあなたがレイヤーを、それに関連づけられたいくつかのハンドラを除いて、破壊してしまったことを意味します。",'minZoomLevelError':"minZoomLevel プロパティは FixedZoomLevels を継承するレイヤーでの使用のみを想定しています。この minZoomLevel に対する WFS レイヤーの検査は歴史的なものです。しかしながら、この検査を除去するとそれに依存する OpenLayers ベースのアプリケーションを破壊してしまう可能性があります。よって廃止が予定されており、この minZoomLevel 検査はバージョン3.0で除去されます。代わりに、http://trac.openlayers.org/wiki/SettingZoomLevels で解説されている、最小および最大解像度設定を使用してください。",'commitSuccess':"WFS トランザクション: 成功 ${response}",'commitFailed':"WFS トランザクション: 失敗 ${response}",'googleWarning':"Google レイヤーが正しく読み込みを行えませんでした。\x3cbr\x3e\x3cbr\x3eこのメッセージを消すには、右上の隅にあるレイヤー切り替え部分で新しい基底レイヤーを選んでください。\x3cbr\x3e\x3cbr\x3eおそらく、これは Google マップ用ライブラリのスクリプトが組み込まれていないか、あなたのサイトに対応する正しい API キーが設定されていないためです。\x3cbr\x3e\x3cbr\x3e開発者の方へ: 正しい動作をさせるために\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eこちらのウィキ\x3c/a\x3eを参照してください。",'getLayerWarning':"${layerType} レイヤーが正しく読み込みを行えませんでした。\x3cbr\x3e\x3cbr\x3eこのメッセージを消すには、右上の隅にあるレイヤー切り替え部分で新しい基底レイヤーを選んでください。\x3cbr\x3e\x3cbr\x3eおそらく、これは ${layerLib} ライブラリのスクリプトが正しく組み込まれていないためです。\x3cbr\x3e\x3cbr\x3e開発者の方へ: 正しい動作をさせるために\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eこちらのウィキ\x3c/a\x3eを参照してください。",'Scale = 1 : ${scaleDenom}':"縮尺 = 1 : ${scaleDenom}",'W':"西",'E':"東",'N':"北",'S':"南",'layerAlreadyAdded':"あなたは「${layerName}」を地図に追加しようと試みましたが、そのレイヤーは既に追加されています",'reprojectDeprecated':"あなたは「${layerName}」レイヤーで reproject オプションを使っています。このオプションは商用の基底地図上に情報を表示する目的で設計されましたが、現在ではその機能は Spherical Mercator サポートを利用して実現されており、このオプションの使用は非推奨です。追加の情報は http://trac.openlayers.org/wiki/SphericalMercator で入手できます。",'methodDeprecated':"このメソッドは廃止が予定されており、バージョン3.0で除去されます。代わりに ${newMethod} を使用してください。",'boundsAddError':"x と y 両方の値を add 関数に渡さなければなりません。",'lonlatAddError':"lon と lat 両方の値を add 関数に渡さなければなりません。",'pixelAddError':"x と y の値両方を add 関数に渡さなければなりません。",'unsupportedGeometryType':"未対応の形状型: ${geomType}",'filterEvaluateNotImplemented':"このフィルター型について evaluate は実装されていません。"});OpenLayers.Lang["nds"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Unbehannelt Trüchmellels för de Anfraag ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Achtergrundkoort",'readNotImplemented':"Lesen is nich inricht.",'writeNotImplemented':"Schrieven is nich inricht.",'noFID':"En Feature, dat keen FID hett, kann nich aktuell maakt warrn.",'errorLoadingGML':"Fehler bi’t Laden vun de GML-Datei ${url}",'browserNotSupported':"Dien Browser ünnerstütt keen Vektorbiller. Ünnerstütt Renderers:\n${renderers}",'componentShouldBe':"addFeatures : Kumponent schull man den Typ ${geomType} hebben",'getFeatureError':"getFeatureFromEvent is von en Laag ahn Render opropen worrn. Dat bedüüdt normalerwies, dat en Laag wegmaakt worrn is, aver nich de Handler, de dor op verwiest.",'commitSuccess':"WFS-Transakschoon: hett klappt ${response}",'commitFailed':"WFS-Transakschoon: hett nich klappt ${response}",'Scale = 1 : ${scaleDenom}':"Skaal = 1 : ${scaleDenom}",'layerAlreadyAdded':"Du versöchst de Laag „${layerName}“ to de Koort totofögen, man de is al toföögt",'methodDeprecated':"Disse Methood is oold un schall dat in 3.0 nich mehr geven. Bruuk dor man beter ${newMethod} för.",'boundsAddError':"De Weert x un y, de mööt all beid an de add-Funkschoon övergeven warrn.",'lonlatAddError':"De Weert lon un lat, de mööt all beid an de add-Funkschoon övergeven warrn.",'pixelAddError':"De Weert x un y, de mööt all beid an de add-Funkschoon övergeven warrn.",'unsupportedGeometryType':"Nich ünnerstütt Geometrie-Typ: ${geomType}"});OpenLayers.Handler.RegularPolygon=OpenLayers.Class(OpenLayers.Handler.Drag,{sides:4,radius:null,snapAngle:null,snapToggle:'shiftKey',layerOptions:null,persist:false,irregular:false,angle:null,fixedRadius:false,feature:null,layer:null,origin:null,initialize:function(control,callbacks,options){if(!(options&&options.layerOptions&&options.layerOptions.styleMap)){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});} -OpenLayers.Handler.Drag.prototype.initialize.apply(this,[control,callbacks,options]);this.options=(options)?options:{};},setOptions:function(newOptions){OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);},activate:function(){var activated=false;if(OpenLayers.Handler.Drag.prototype.activate.apply(this,arguments)){var options=OpenLayers.Util.extend({displayInLayerSwitcher:false,calculateInRange:OpenLayers.Function.True},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);activated=true;} +Math.pow(t0.clientY-t1.clientY,2));},getPinchData:function(evt){var distance=this.getDistance(evt.touches);var scale=distance/this.start.distance;return{distance:distance,delta:this.last.distance-distance,scale:scale};},CLASS_NAME:"OpenLayers.Handler.Pinch"});OpenLayers.Lang['lt']=OpenLayers.Util.applyDefaults({'unhandledRequest':"Neapdorota užklausa gražino ${statusText}",'Permalink':"Pastovi nuoroda",'Overlays':"Papildomi sluoksniai",'Base Layer':"Pagrindinis sluoksnis",'noFID':"Negaliu atnaujinti objekto, kuris neturi FID.",'browserNotSupported':"Jūsų naršyklė nemoka parodyti vektorių. Šiuo metu galima naudotis tokiais rodymo varikliais:\n{renderers}",'commitSuccess':"WFS Tranzakcija: PAVYKO ${response}",'commitFailed':"WFS Tranzakcija: ŽLUGO ${response}",'Scale = 1 : ${scaleDenom}':"Mastelis = 1 : ${scaleDenom}",'W':'V','E':'R','N':'Š','S':'P','Graticule':'Tinklelis','methodDeprecated':"Šis metodas yra pasenęs ir 3.0 versijoje bus pašalintas. "+"Prašome naudoti ${newMethod}.",'end':''});OpenLayers.Lang.ca={'unhandledRequest':"Resposta a petició no gestionada ${statusText}",'Permalink':"Enllaç permanent",'Overlays':"Capes addicionals",'Base Layer':"Capa Base",'noFID':"No es pot actualitzar un element per al que no existeix FID.",'browserNotSupported':"El seu navegador no suporta renderització vectorial. Els renderitzadors suportats actualment són:\n${renderers}",'minZoomLevelError':"La propietat minZoomLevel s'ha d'utilitzar només "+"amb les capes que tenen FixedZoomLevels. El fet que "+"una capa wfs comprovi minZoomLevel és una relíquia del "+"passat. No podem, però, eliminar-la sense trencar "+"les aplicacions d'OpenLayers que en puguin dependre. "+"Així doncs estem fent-la obsoleta -- la comprovació "+"minZoomLevel s'eliminarà a la versió 3.0. Feu servir "+"els paràmetres min/max resolution en substitució, tal com es descriu aquí: "+"http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transacció WFS: CORRECTA ${response}",'commitFailed':"Transacció WFS: HA FALLAT ${response}",'googleWarning':"La capa Google no s'ha pogut carregar correctament.<br><br>"+"Per evitar aquest missatge, seleccioneu una nova Capa Base "+"al gestor de capes de la cantonada superior dreta.<br><br>"+"Probablement això és degut a que l'script de la biblioteca de "+"Google Maps no ha estat inclòs a la vostra pàgina, o no "+"conté la clau de l'API correcta per a la vostra adreça.<br><br>"+"Desenvolupadors: Per obtenir consells sobre com fer anar això, "+"<a href='http://trac.openlayers.org/wiki/Google' "+"target='_blank'>féu clic aquí</a>",'getLayerWarning':"Per evitar aquest missatge, seleccioneu una nova Capa Base "+"al gestor de capes de la cantonada superior dreta.<br><br>"+"Probablement això és degut a que l'script de la biblioteca "+"${layerLib} "+"no ha estat inclòs a la vostra pàgina.<br><br>"+"Desenvolupadors: Per obtenir consells sobre com fer anar això, "+"<a href='http://trac.openlayers.org/wiki/${layerLib}' "+"target='_blank'>féu clic aquí</a>",'Scale = 1 : ${scaleDenom}':"Escala = 1 : ${scaleDenom}",'W':'O','E':'E','N':'N','S':'S','Graticule':'Retícula','reprojectDeprecated':"Esteu fent servir l'opció 'reproject' a la capa "+"${layerName}. Aquesta opció és obsoleta: el seu ús fou concebut "+"per suportar la visualització de dades sobre mapes base comercials, "+"però ara aquesta funcionalitat s'hauria d'assolir mitjançant el suport "+"de la projecció Spherical Mercator. Més informació disponible a "+"http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Aquest mètode és obsolet i s'eliminarà a la versió 3.0. "+"Si us plau feu servir em mètode alternatiu ${newMethod}.",'end':''};OpenLayers.Lang["id"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Permintaan yang tak tertangani menghasilkan ${statusText}",'Permalink':"Pranala permanen",'Overlays':"Hamparan",'Base Layer':"Lapisan Dasar",'noFID':"Tidak dapat memperbarui fitur yang tidak memiliki FID.",'browserNotSupported':"Peramban Anda tidak mendukung penggambaran vektor. Penggambar yang didukung saat ini adalah:\n${renderers}",'minZoomLevelError':"Properti minZoomLevel hanya ditujukan bekerja dengan lapisan FixedZoomLevels-descendent. Pengecekan minZoomLevel oleh lapisan wfs adalah peninggalan masa lalu. Kami tidak dapat menghapusnya tanpa kemungkinan merusak aplikasi berbasis OL yang mungkin bergantung padanya. Karenanya, kami menganggapnya tidak berlaku -- Cek minZoomLevel di bawah ini akan dihapus pada 3.0. Silakan gunakan penyetelan resolusi min/maks seperti dijabarkan di sini: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaksi: BERHASIL ${respon}",'commitFailed':"WFS Transaksi: GAGAL ${respon}",'googleWarning':"Lapisan Google tidak dapat dimuat dengan benar.\x3cbr\x3e\x3cbr\x3eUntuk menghilangkan pesan ini, pilih suatu BaseLayer baru melalui penukar lapisan (layer switcher) di ujung kanan atas.\x3cbr\x3e\x3cbr\x3eKemungkinan besar ini karena pustaka skrip Google Maps tidak disertakan atau tidak mengandung kunci API yang tepat untuk situs Anda.\x3cbr\x3e\x3cbr\x3ePengembang: Untuk bantuan mengatasi masalah ini, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklik di sini\x3c/a\x3e",'getLayerWarning':"Lapisan ${layerType} tidak dapat dimuat dengan benar.\x3cbr\x3e\x3cbr\x3eUntuk menghilangkan pesan ini, pilih suatu BaseLayer baru melalui penukar lapisan (layer switcher) di ujung kanan atas.\x3cbr\x3e\x3cbr\x3eKemungkinan besar ini karena pustaka skrip Google Maps tidak disertakan dengan benar.\x3cbr\x3e\x3cbr\x3ePengembang: Untuk bantuan mengatasi masalah ini, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik di sini\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Sekala = 1 : ${scaleDenom}",'W':"B",'E':"T",'N':"U",'S':"S",'reprojectDeprecated':"Anda menggunakan opsi \'reproject\' pada lapisan ${layerName}. Opsi ini telah ditinggalkan: penggunaannya dirancang untuk mendukung tampilan data melalui peta dasar komersial, tapi fungsionalitas tersebut saat ini harus dilakukan dengan menggunakan dukungan Spherical Mercator. Informasi lebih lanjut tersedia di http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Metode ini telah usang dan akan dihapus di 3.0. Sebaliknya, harap gunakan ${newMethod}."});OpenLayers.Lang["km"]=OpenLayers.Util.applyDefaults({'Permalink':"តំណភ្ជាប់អចិន្ត្រៃយ៍",'Base Layer':"ស្រទាប់បាត​",'Scale = 1 : ${scaleDenom}':"មាត្រដ្ឋាន = ១ ៖ ${scaleDenom}"});OpenLayers.Lang["nl"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Het verzoek is niet afgehandeld met de volgende melding: ${statusText}",'Permalink':"Permanente verwijzing",'Overlays':"Overlays",'Base Layer':"Achtergrondkaart",'noFID':"Een optie die geen FID heeft kan niet bijgewerkt worden.",'browserNotSupported':"Uw browser ondersteunt het weergeven van vectoren niet.\nMomenteel ondersteunde weergavemogelijkheden:\n${renderers}",'minZoomLevelError':"De eigenschap minZoomLevel is alleen bedoeld voor gebruik lagen met die afstammen van FixedZoomLevels-lagen.\nDat deze WFS-laag minZoomLevel controleert, is een overblijfsel uit het verleden.\nWe kunnen deze controle echter niet verwijderen zonder op OL gebaseerde applicaties die hervan afhankelijk zijn stuk te maken.\nDaarom heeft deze functionaliteit de eigenschap \'deprecated\' gekregen - de minZoomLevel wordt verwijderd in versie 3.0.\nGebruik in plaats van deze functie de mogelijkheid om min/max voor resolutie in te stellen zoals op de volgende pagina wordt beschreven:\nhttp://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-transactie: succesvol ${response}",'commitFailed':"WFS-transactie: mislukt ${response}",'googleWarning':"De Google-Layer kon niet correct geladen worden.\x3cbr /\x3e\x3cbr /\x3e\nOm deze melding niet meer te krijgen, moet u een andere achtergrondkaart kiezen in de laagwisselaar in de rechterbovenhoek.\x3cbr /\x3e\x3cbr /\x3e\nDit komt waarschijnlijk doordat de bibliotheek ${layerLib} niet correct ingevoegd is.\x3cbr /\x3e\x3cbr /\x3e\nOntwikkelaars: \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik hier\x3c/a\x3e om dit werkend te krijgen.",'getLayerWarning':"De laag ${layerType} kon niet goed geladen worden.\x3cbr /\x3e\x3cbr /\x3e\nOm deze melding niet meer te krijgen, moet u een andere achtergrondkaart kiezen in de laagwisselaar in de rechterbovenhoek.\x3cbr /\x3e\x3cbr /\x3e\nDit komt waarschijnlijk doordat de bibliotheek ${layerLib} niet correct is ingevoegd.\x3cbr /\x3e\x3cbr /\x3e\nOntwikkelaars: \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik hier\x3c/a\x3e om dit werkend te krijgen.",'Scale = 1 : ${scaleDenom}':"Schaal = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"Z",'reprojectDeprecated':"U gebruikt de optie \'reproject\' op de laag ${layerName}.\nDeze optie is vervallen: deze optie was ontwikkeld om gegevens over commerciële basiskaarten weer te geven, maar deze functionaliteit wordt nu bereikt door ondersteuning van Spherical Mercator.\nMeer informatie is beschikbaar op http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Deze methode is verouderd en wordt verwijderd in versie 3.0.\nGebruik ${newMethod}."});OpenLayers.Lang["fr"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Requête non gérée, retournant ${statusText}",'Permalink':"Permalien",'Overlays':"Calques",'Base Layer':"Calque de base",'noFID':"Impossible de mettre à jour un objet sans identifiant (fid).",'browserNotSupported':"Votre navigateur ne supporte pas le rendu vectoriel. Les renderers actuellement supportés sont : \n${renderers}",'minZoomLevelError':"La propriété minZoomLevel doit seulement être utilisée pour des couches FixedZoomLevels-descendent. Le fait que cette couche WFS vérifie la présence de minZoomLevel est une relique du passé. Nous ne pouvons toutefois la supprimer sans casser des applications qui pourraient en dépendre. C\'est pourquoi nous la déprécions -- la vérification du minZoomLevel sera supprimée en version 3.0. A la place, merci d\'utiliser les paramètres de résolutions min/max tel que décrit sur : http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Transaction WFS : SUCCES ${response}",'commitFailed':"Transaction WFS : ECHEC ${response}",'googleWarning':"La couche Google n\'a pas été en mesure de se charger correctement.\x3cbr\x3e\x3cbr\x3ePour supprimer ce message, choisissez une nouvelle BaseLayer dans le sélecteur de couche en haut à droite.\x3cbr\x3e\x3cbr\x3eCela est possiblement causé par la non-inclusion de la librairie Google Maps, ou alors parce que la clé de l\'API ne correspond pas à votre site.\x3cbr\x3e\x3cbr\x3eDéveloppeurs : pour savoir comment corriger ceci, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ecliquez ici\x3c/a\x3e",'getLayerWarning':"La couche ${layerType} n\'est pas en mesure de se charger correctement.\x3cbr\x3e\x3cbr\x3ePour supprimer ce message, choisissez une nouvelle BaseLayer dans le sélecteur de couche en haut à droite.\x3cbr\x3e\x3cbr\x3eCela est possiblement causé par la non-inclusion de la librairie ${layerLib}.\x3cbr\x3e\x3cbr\x3eDéveloppeurs : pour savoir comment corriger ceci, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ecliquez ici\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Echelle ~ 1 : ${scaleDenom}",'W':"O",'E':"E",'N':"N",'S':"S",'reprojectDeprecated':"Vous utilisez l\'option \'reproject\' sur la couche ${layerName}. Cette option est dépréciée : Son usage permettait d\'afficher des données au dessus de couches raster commerciales.Cette fonctionalité est maintenant supportée en utilisant le support de la projection Mercator Sphérique. Plus d\'information est disponible sur http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Cette méthode est dépréciée, et sera supprimée à la version 3.0. Merci d\'utiliser ${newMethod} à la place.",'proxyNeeded':"Vous avez très probablement besoin de renseigner OpenLayers.ProxyHost pour accéder à ${url}. Voir http://trac.osgeo.org/openlayers/wiki/FrequentlyAskedQuestions#ProxyHost"});OpenLayers.Lang["ksh"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Met dä Antwoot op en Aanfrooch ham_mer nix aanjefange: ${statusText}",'Permalink':"Lengk op Duuer",'Overlays':"Drövver jelaat",'Base Layer':"Jrund-Nivoh",'noFID':"En Saach, woh kein \x3ci lang=\"en\"\x3eFID\x3c/i\x3e för doh es, löht sesch nit ändere.",'browserNotSupported':"Dinge Brauser kann kein Väktore ußjävve. De Zoote Ußjaabe, di em Momang jon, sen:\n${renderers}",'minZoomLevelError':"De Eijeschaff „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“ es bloß doför jedaach, dat mer se met dä Nivvohß bruch, di vun \x3ccode lang=\"en\"\x3eFixedZoomLevels\x3c/code\x3e affhange don. Dat dat \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Nivvoh övverhoup de Eijeschaff „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“ pröhfe deiht, es noch övveresch vun fröhjer. Mer künne dat ävver jez nit fott lohße, oohne dat mer Jevaa loufe, dat Aanwendunge vun OpenLayers nit mieh loufe, di sesch doh velleijsch noch drop am verlohße sin. Dröm sare mer, dat mer et nit mieh han welle, un de „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“-Eijeschaff weed hee vun de Version 3.0 af nit mieh jeprööf wäde. Nemm doför de Enstellung för de hühßte un de kleinßte Oplöhsung, esu wi et en http://trac.openlayers.org/wiki/SettingZoomLevels opjeschrevve es.",'commitSuccess':"Dä \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Vörjang es joot jeloufe: ${response}",'commitFailed':"Dä \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Vörjang es scheif jejange: ${response}",'googleWarning':"Dat Nivvoh \x3ccode lang=\"en\"\x3eGoogle\x3c/code\x3e kunnt nit reschtesch jelaade wääde.\x3cbr /\x3e\x3cbr /\x3eÖm hee di Nohreesch loß ze krijje, donn en ander Jrund-Nivvoh ußsöhke, rähß bovve en de Äk.\x3cbr /\x3e\x3cbr /\x3eWascheinlesch es dat wiel dat \x3ci lang=\"en\"\x3eGoogle-Maps\x3c/i\x3e-Skrepp entweeder nit reschtesch enjebonge wood, udder nit dä reschtejje \x3ci lang=\"en\"\x3eAPI\x3c/i\x3e-Schlößel för Ding Web-ßait scheke deiht.\x3cbr /\x3e\x3cbr /\x3eFör Projrammierer jidd_et Hölp do_drövver, \x3ca href=\"http://trac.openlayers.org/wiki/Google\" target=\"_blank\"\x3ewi mer dat aan et Loufe brengk\x3c/a\x3e.",'getLayerWarning':"Dat Nivvoh \x3ccode\x3e${layerType}\x3c/code\x3e kunnt nit reschtesch jelaade wääde.\x3cbr /\x3e\x3cbr /\x3eÖm hee di Nohreesch loß ze krijje, donn en ander Jrund-Nivvoh ußsöhkre, rähß bovve en de Äk.\x3cbr /\x3e\x3cbr /\x3eWascheinlesch es dat, wiel dat Skrepp \x3ccode\x3e${layerLib}\x3c/code\x3e nit reschtesch enjebonge wood.\x3cbr /\x3e\x3cbr /\x3eFör Projrammierer jidd_Et Hölp do_drövver, \x3ca href=\"http://trac.openlayers.org/wiki/${layerLib}\" target=\"_blank\"\x3ewi mer dat aan et Loufe brengk\x3c/a\x3e.",'Scale = 1 : ${scaleDenom}':"Mohßshtaab = 1 : ${scaleDenom}",'W':"W",'E':"O",'N':"N",'S':"S",'reprojectDeprecated':"Do bruchs de Ußwahl \x3ccode\x3ereproject\x3c/code\x3e op däm Nivvoh \x3ccode\x3e${layerName}\x3c/code\x3e. Di Ußwahl es nit mieh jähn jesinn. Se wohr doför jedaach, öm Date op jeschääfsmäßesch eruß jejovve Kaate bovve drop ze moole, wat ävver enzwesche besser met dä Öngershtözung för de ßfääresche Mäkaator Beldscher jeiht. Doh kanns De mieh drövver fenge op dä Sigg: http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Hee di Metood es nim_mih aktoäll un et weed se en dä Version 3.0 nit mieh jävve. Nemm \x3ccode\x3e${newMethod}\x3c/code\x3e doföör."});OpenLayers.Lang["fur"]=OpenLayers.Util.applyDefaults({'Permalink':"Leam Permanent",'Overlays':"Livei parsore",'Base Layer':"Livel di base",'browserNotSupported':"Il to sgarfadôr nol supuarte la renderizazion vetoriâl. Al moment a son supuartâts:\n${renderers}",'Scale = 1 : ${scaleDenom}':"Scjale = 1 : ${scaleDenom}",'W':"O",'E':"E",'N':"N",'S':"S"});OpenLayers.Lang["ja"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"未処理の要求は ${statusText} を返します",'Permalink':"パーマリンク",'Overlays':"オーバーレイ",'Base Layer':"基底レイヤー",'noFID':"FID のない地物は更新できません。",'browserNotSupported':"あなたのブラウザはベクターグラフィックスの描写に対応していません。現時点で対応しているソフトウェアは以下のものです。\n${renderers}",'minZoomLevelError':"minZoomLevel プロパティは FixedZoomLevels を継承するレイヤーでの使用のみを想定しています。この minZoomLevel に対する WFS レイヤーの検査は歴史的なものです。しかしながら、この検査を除去するとそれに依存する OpenLayers ベースのアプリケーションを破壊してしまう可能性があります。よって廃止が予定されており、この minZoomLevel 検査はバージョン3.0で除去されます。代わりに、http://trac.openlayers.org/wiki/SettingZoomLevels で解説されている、最小および最大解像度設定を使用してください。",'commitSuccess':"WFS トランザクション: 成功 ${response}",'commitFailed':"WFS トランザクション: 失敗 ${response}",'googleWarning':"Google レイヤーが正しく読み込みを行えませんでした。\x3cbr\x3e\x3cbr\x3eこのメッセージを消すには、右上の隅にあるレイヤー切り替え部分で新しい基底レイヤーを選んでください。\x3cbr\x3e\x3cbr\x3eおそらく、これは Google マップ用ライブラリのスクリプトが組み込まれていないか、あなたのサイトに対応する正しい API キーが設定されていないためです。\x3cbr\x3e\x3cbr\x3e開発者の方へ: 正しい動作をさせるために\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eこちらのウィキ\x3c/a\x3eを参照してください。",'getLayerWarning':"${layerType} レイヤーが正しく読み込みを行えませんでした。\x3cbr\x3e\x3cbr\x3eこのメッセージを消すには、右上の隅にあるレイヤー切り替え部分で新しい基底レイヤーを選んでください。\x3cbr\x3e\x3cbr\x3eおそらく、これは ${layerLib} ライブラリのスクリプトが正しく組み込まれていないためです。\x3cbr\x3e\x3cbr\x3e開発者の方へ: 正しい動作をさせるために\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eこちらのウィキ\x3c/a\x3eを参照してください。",'Scale = 1 : ${scaleDenom}':"縮尺 = 1 : ${scaleDenom}",'W':"西",'E':"東",'N':"北",'S':"南",'reprojectDeprecated':"あなたは「${layerName}」レイヤーで reproject オプションを使っています。このオプションは商用の基底地図上に情報を表示する目的で設計されましたが、現在ではその機能は Spherical Mercator サポートを利用して実現されており、このオプションの使用は非推奨です。追加の情報は http://trac.openlayers.org/wiki/SphericalMercator で入手できます。",'methodDeprecated':"このメソッドは廃止が予定されており、バージョン3.0で除去されます。代わりに ${newMethod} を使用してください。"});(function(){var oXMLHttpRequest=window.XMLHttpRequest;var bGecko=!!window.controllers,bIE=window.document.all&&!window.opera,bIE7=bIE&&window.navigator.userAgent.match(/MSIE 7.0/);function fXMLHttpRequest(){this._object=oXMLHttpRequest&&!bIE7?new oXMLHttpRequest:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[];};function cXMLHttpRequest(){return new fXMLHttpRequest;};cXMLHttpRequest.prototype=fXMLHttpRequest.prototype;if(bGecko&&oXMLHttpRequest.wrapped) +cXMLHttpRequest.wrapped=oXMLHttpRequest.wrapped;cXMLHttpRequest.UNSENT=0;cXMLHttpRequest.OPENED=1;cXMLHttpRequest.HEADERS_RECEIVED=2;cXMLHttpRequest.LOADING=3;cXMLHttpRequest.DONE=4;cXMLHttpRequest.prototype.readyState=cXMLHttpRequest.UNSENT;cXMLHttpRequest.prototype.responseText='';cXMLHttpRequest.prototype.responseXML=null;cXMLHttpRequest.prototype.status=0;cXMLHttpRequest.prototype.statusText='';cXMLHttpRequest.prototype.priority="NORMAL";cXMLHttpRequest.prototype.onreadystatechange=null;cXMLHttpRequest.onreadystatechange=null;cXMLHttpRequest.onopen=null;cXMLHttpRequest.onsend=null;cXMLHttpRequest.onabort=null;cXMLHttpRequest.prototype.open=function(sMethod,sUrl,bAsync,sUser,sPassword){delete this._headers;if(arguments.length<3) +bAsync=true;this._async=bAsync;var oRequest=this,nState=this.readyState,fOnUnload;if(bIE&&bAsync){fOnUnload=function(){if(nState!=cXMLHttpRequest.DONE){fCleanTransport(oRequest);oRequest.abort();}};window.attachEvent("onunload",fOnUnload);} +if(cXMLHttpRequest.onopen) +cXMLHttpRequest.onopen.apply(this,arguments);if(arguments.length>4) +this._object.open(sMethod,sUrl,bAsync,sUser,sPassword);else +if(arguments.length>3) +this._object.open(sMethod,sUrl,bAsync,sUser);else +this._object.open(sMethod,sUrl,bAsync);this.readyState=cXMLHttpRequest.OPENED;fReadyStateChange(this);this._object.onreadystatechange=function(){if(bGecko&&!bAsync) +return;oRequest.readyState=oRequest._object.readyState;fSynchronizeValues(oRequest);if(oRequest._aborted){oRequest.readyState=cXMLHttpRequest.UNSENT;return;} +if(oRequest.readyState==cXMLHttpRequest.DONE){delete oRequest._data;fCleanTransport(oRequest);if(bIE&&bAsync) +window.detachEvent("onunload",fOnUnload);} +if(nState!=oRequest.readyState) +fReadyStateChange(oRequest);nState=oRequest.readyState;}};function fXMLHttpRequest_send(oRequest){oRequest._object.send(oRequest._data);if(bGecko&&!oRequest._async){oRequest.readyState=cXMLHttpRequest.OPENED;fSynchronizeValues(oRequest);while(oRequest.readyState<cXMLHttpRequest.DONE){oRequest.readyState++;fReadyStateChange(oRequest);if(oRequest._aborted) +return;}}};cXMLHttpRequest.prototype.send=function(vData){if(cXMLHttpRequest.onsend) +cXMLHttpRequest.onsend.apply(this,arguments);if(!arguments.length) +vData=null;if(vData&&vData.nodeType){vData=window.XMLSerializer?new window.XMLSerializer().serializeToString(vData):vData.xml;if(!this._headers["Content-Type"]) +this._object.setRequestHeader("Content-Type","application/xml");} +this._data=vData;fXMLHttpRequest_send(this);};cXMLHttpRequest.prototype.abort=function(){if(cXMLHttpRequest.onabort) +cXMLHttpRequest.onabort.apply(this,arguments);if(this.readyState>cXMLHttpRequest.UNSENT) +this._aborted=true;this._object.abort();fCleanTransport(this);this.readyState=cXMLHttpRequest.UNSENT;delete this._data;};cXMLHttpRequest.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders();};cXMLHttpRequest.prototype.getResponseHeader=function(sName){return this._object.getResponseHeader(sName);};cXMLHttpRequest.prototype.setRequestHeader=function(sName,sValue){if(!this._headers) +this._headers={};this._headers[sName]=sValue;return this._object.setRequestHeader(sName,sValue);};cXMLHttpRequest.prototype.addEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) +if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture) +return;this._listeners.push([sName,fHandler,bUseCapture]);};cXMLHttpRequest.prototype.removeEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) +if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture) +break;if(oListener) +this._listeners.splice(nIndex,1);};cXMLHttpRequest.prototype.dispatchEvent=function(oEvent){var oEventPseudo={'type':oEvent.type,'target':this,'currentTarget':this,'eventPhase':2,'bubbles':oEvent.bubbles,'cancelable':oEvent.cancelable,'timeStamp':oEvent.timeStamp,'stopPropagation':function(){},'preventDefault':function(){},'initEvent':function(){}};if(oEventPseudo.type=="readystatechange"&&this.onreadystatechange) +(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[oEventPseudo]);for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) +if(oListener[0]==oEventPseudo.type&&!oListener[2]) +(oListener[1].handleEvent||oListener[1]).apply(this,[oEventPseudo]);};cXMLHttpRequest.prototype.toString=function(){return'['+"object"+' '+"XMLHttpRequest"+']';};cXMLHttpRequest.toString=function(){return'['+"XMLHttpRequest"+']';};function fReadyStateChange(oRequest){if(cXMLHttpRequest.onreadystatechange) +cXMLHttpRequest.onreadystatechange.apply(oRequest);oRequest.dispatchEvent({'type':"readystatechange",'bubbles':false,'cancelable':false,'timeStamp':new Date+0});};function fGetDocument(oRequest){var oDocument=oRequest.responseXML,sResponse=oRequest.responseText;if(bIE&&sResponse&&oDocument&&!oDocument.documentElement&&oRequest.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)){oDocument=new window.ActiveXObject("Microsoft.XMLDOM");oDocument.async=false;oDocument.validateOnParse=false;oDocument.loadXML(sResponse);} +if(oDocument) +if((bIE&&oDocument.parseError!=0)||!oDocument.documentElement||(oDocument.documentElement&&oDocument.documentElement.tagName=="parsererror")) +return null;return oDocument;};function fSynchronizeValues(oRequest){try{oRequest.responseText=oRequest._object.responseText;}catch(e){} +try{oRequest.responseXML=fGetDocument(oRequest._object);}catch(e){} +try{oRequest.status=oRequest._object.status;}catch(e){} +try{oRequest.statusText=oRequest._object.statusText;}catch(e){}};function fCleanTransport(oRequest){oRequest._object.onreadystatechange=new window.Function;};if(!window.Function.prototype.apply){window.Function.prototype.apply=function(oRequest,oArguments){if(!oArguments) +oArguments=[];oRequest.__func=this;oRequest.__func(oArguments[0],oArguments[1],oArguments[2],oArguments[3],oArguments[4]);delete oRequest.__func;};};OpenLayers.Request.XMLHttpRequest=cXMLHttpRequest;})();OpenLayers.Lang["nds"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Unbehannelt Trüchmellels för de Anfraag ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Achtergrundkoort",'noFID':"En Feature, dat keen FID hett, kann nich aktuell maakt warrn.",'browserNotSupported':"Dien Browser ünnerstütt keen Vektorbiller. Ünnerstütt Renderers:\n${renderers}",'commitSuccess':"WFS-Transakschoon: hett klappt ${response}",'commitFailed':"WFS-Transakschoon: hett nich klappt ${response}",'Scale = 1 : ${scaleDenom}':"Skaal = 1 : ${scaleDenom}",'methodDeprecated':"Disse Methood is oold un schall dat in 3.0 nich mehr geven. Bruuk dor man beter ${newMethod} för."});OpenLayers.Handler.RegularPolygon=OpenLayers.Class(OpenLayers.Handler.Drag,{sides:4,radius:null,snapAngle:null,snapToggle:'shiftKey',layerOptions:null,persist:false,irregular:false,citeCompliant:false,angle:null,fixedRadius:false,feature:null,layer:null,origin:null,initialize:function(control,callbacks,options){if(!(options&&options.layerOptions&&options.layerOptions.styleMap)){this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'],{});} +OpenLayers.Handler.Drag.prototype.initialize.apply(this,[control,callbacks,options]);this.options=(options)?options:{};},setOptions:function(newOptions){OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);},activate:function(){var activated=false;if(OpenLayers.Handler.Drag.prototype.activate.apply(this,arguments)){var options=OpenLayers.Util.extend({displayInLayerSwitcher:false,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,options);this.map.addLayer(this.layer);activated=true;} return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.Drag.prototype.deactivate.apply(this,arguments)){if(this.dragging){this.cancel();} if(this.layer.map!=null){this.layer.destroy(false);if(this.feature){this.feature.destroy();}} this.layer=null;this.feature=null;deactivated=true;} -return deactivated;},down:function(evt){this.fixedRadius=!!(this.radius);var maploc=this.map.getLonLatFromPixel(evt.xy);this.origin=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(!this.fixedRadius||this.irregular){this.radius=this.map.getResolution();} +return deactivated;},down:function(evt){this.fixedRadius=!!(this.radius);var maploc=this.layer.getLonLatFromViewPortPx(evt.xy);this.origin=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(!this.fixedRadius||this.irregular){this.radius=this.map.getResolution();} if(this.persist){this.clear();} -this.feature=new OpenLayers.Feature.Vector();this.createGeometry();this.callback("create",[this.origin,this.feature]);this.layer.addFeatures([this.feature],{silent:true});this.layer.drawFeature(this.feature,this.style);},move:function(evt){var maploc=this.map.getLonLatFromPixel(evt.xy);var point=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(this.irregular){var ry=Math.sqrt(2)*Math.abs(point.y-this.origin.y)/2;this.radius=Math.max(this.map.getResolution()/2,ry);}else if(this.fixedRadius){this.origin=point;}else{this.calculateAngle(point,evt);this.radius=Math.max(this.map.getResolution()/2,point.distanceTo(this.origin));} +this.feature=new OpenLayers.Feature.Vector();this.createGeometry();this.callback("create",[this.origin,this.feature]);this.layer.addFeatures([this.feature],{silent:true});this.layer.drawFeature(this.feature,this.style);},move:function(evt){var maploc=this.layer.getLonLatFromViewPortPx(evt.xy);var point=new OpenLayers.Geometry.Point(maploc.lon,maploc.lat);if(this.irregular){var ry=Math.sqrt(2)*Math.abs(point.y-this.origin.y)/2;this.radius=Math.max(this.map.getResolution()/2,ry);}else if(this.fixedRadius){this.origin=point;}else{this.calculateAngle(point,evt);this.radius=Math.max(this.map.getResolution()/2,point.distanceTo(this.origin));} this.modifyGeometry();if(this.irregular){var dx=point.x-this.origin.x;var dy=point.y-this.origin.y;var ratio;if(dy==0){ratio=dx/(this.radius*Math.sqrt(2));}else{ratio=dx/dy;} this.feature.geometry.resize(1,this.origin,ratio);this.feature.geometry.move(dx/2,dy/2);} this.layer.drawFeature(this.feature,this.style);},up:function(evt){this.finalize();if(this.start==this.last){this.callback("done",[evt.xy]);}},out:function(evt){this.finalize();},createGeometry:function(){this.angle=Math.PI*((1/this.sides)-(1/2));if(this.snapAngle){this.angle+=this.snapAngle*(Math.PI/180);} @@ -1432,12 +1320,12 @@ this.feature.geometry=OpenLayers.Geometry.Polygon.createRegularPolygon(this.orig for(var i=0;i<this.sides;++i){point=ring.components[i];angle=this.angle+(i*2*Math.PI/this.sides);point.x=this.origin.x+(this.radius*Math.cos(angle));point.y=this.origin.y+(this.radius*Math.sin(angle));point.clearBounds();}},calculateAngle:function(point,evt){var alpha=Math.atan2(point.y-this.origin.y,point.x-this.origin.x);if(this.snapAngle&&(this.snapToggle&&!evt[this.snapToggle])){var snapAngleRad=(Math.PI/180)*this.snapAngle;this.angle=Math.round(alpha/snapAngleRad)*snapAngleRad;}else{this.angle=alpha;}},cancel:function(){this.callback("cancel",null);this.finalize();},finalize:function(){this.origin=null;this.radius=this.options.radius;},clear:function(){if(this.layer){this.layer.renderer.clear();this.layer.destroyFeatures();}},callback:function(name,args){if(this.callbacks[name]){this.callbacks[name].apply(this.control,[this.feature.geometry.clone()]);} if(!this.persist&&(name=="done"||name=="cancel")){this.clear();}},CLASS_NAME:"OpenLayers.Handler.RegularPolygon"});OpenLayers.Renderer.VML=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"urn:schemas-microsoft-com:vml",symbolCache:{},offset:null,initialize:function(containerID){if(!this.supported()){return;} if(!document.namespaces.olv){document.namespaces.add("olv",this.xmlns);var style=document.createStyleSheet();var shapes=['shape','rect','oval','fill','stroke','imagedata','group','textbox'];for(var i=0,len=shapes.length;i<len;i++){style.addRule('olv\\:'+shapes[i],"behavior: url(#default#VML); "+"position: absolute; display: inline-block;");}} -OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);},supported:function(){return!!(document.namespaces);},setExtent:function(extent,resolutionChanged){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=(extent.left/resolution)|0;var top=(extent.top/resolution-this.size.h)|0;if(resolutionChanged||!this.offset){this.offset={x:left,y:top};left=0;top=0;}else{left=left-this.offset.x;top=top-this.offset.y;} -var org=left+" "+top;this.root.coordorigin=org;var roots=[this.root,this.vectorRoot,this.textRoot];var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];var size=this.size.w+" "+this.size.h;root.coordsize=size;} -this.root.style.flip="y";return true;},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);var roots=[this.rendererRoot,this.root,this.vectorRoot,this.textRoot];var w=this.size.w+"px";var h=this.size.h+"px";var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];root.style.width=w;root.style.height=h;}},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="olv:rect";}else if(this.isComplexSymbol(style.graphicName)){nodeType="olv:shape";}else{nodeType="olv:oval";} -break;case"OpenLayers.Geometry.Rectangle":nodeType="olv:rect";break;case"OpenLayers.Geometry.LineString":case"OpenLayers.Geometry.LinearRing":case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="olv:shape";break;default:break;} +OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);},supported:function(){return!!(document.namespaces);},setExtent:function(extent,resolutionChanged){var coordSysUnchanged=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=(extent.left/resolution)|0;var top=(extent.top/resolution-this.size.h)|0;if(resolutionChanged||!this.offset){this.offset={x:left,y:top};left=0;top=0;}else{left=left-this.offset.x;top=top-this.offset.y;} +var org=(left-this.xOffset)+" "+top;this.root.coordorigin=org;var roots=[this.root,this.vectorRoot,this.textRoot];var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];var size=this.size.w+" "+this.size.h;root.coordsize=size;} +this.root.style.flip="y";return coordSysUnchanged;},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);var roots=[this.rendererRoot,this.root,this.vectorRoot,this.textRoot];var w=this.size.w+"px";var h=this.size.h+"px";var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];root.style.width=w;root.style.height=h;}},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="olv:rect";}else if(this.isComplexSymbol(style.graphicName)){nodeType="olv:shape";}else{nodeType="olv:oval";} +break;case"OpenLayers.Geometry.Rectangle":nodeType="olv:rect";break;case"OpenLayers.Geometry.LineString":case"OpenLayers.Geometry.LinearRing":case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":nodeType="olv:shape";break;default:break;} return nodeType;},setStyle:function(node,style,options,geometry){style=style||node._style;options=options||node._options;var fillColor=style.fillColor;if(node._geometryClass==="OpenLayers.Geometry.Point"){if(style.externalGraphic){options.isFilled=true;if(style.graphicTitle){node.title=style.graphicTitle;} -var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var resolution=this.getResolution();var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);node.style.left=(((geometry.x/resolution-this.offset.x)+xOffset)|0)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)-(yOffset+height))|0)+"px";node.style.width=width+"px";node.style.height=height+"px";node.style.flip="y";fillColor="none";options.isStroked=false;}else if(this.isComplexSymbol(style.graphicName)){var cache=this.importSymbol(style.graphicName);node.path=cache.path;node.coordorigin=cache.left+","+cache.bottom;var size=cache.size;node.coordsize=size+","+size;this.drawCircle(node,geometry,style.pointRadius);node.style.flip="y";}else{this.drawCircle(node,geometry,style.pointRadius);}} +var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var resolution=this.getResolution();var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);node.style.left=((((geometry.x-this.featureDx)/resolution-this.offset.x)+xOffset)|0)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)-(yOffset+height))|0)+"px";node.style.width=width+"px";node.style.height=height+"px";node.style.flip="y";fillColor="none";options.isStroked=false;}else if(this.isComplexSymbol(style.graphicName)){var cache=this.importSymbol(style.graphicName);node.path=cache.path;node.coordorigin=cache.left+","+cache.bottom;var size=cache.size;node.coordsize=size+","+size;this.drawCircle(node,geometry,style.pointRadius);node.style.flip="y";}else{this.drawCircle(node,geometry,style.pointRadius);}} if(options.isFilled){node.fillcolor=fillColor;}else{node.filled="false";} var fills=node.getElementsByTagName("fill");var fill=(fills.length==0)?null:fills[0];if(!options.isFilled){if(fill){node.removeChild(fill);}}else{if(!fill){fill=this.createNode('olv:fill',node.id+"_fill");} fill.opacity=style.fillOpacity;if(node._geometryClass==="OpenLayers.Geometry.Point"&&style.externalGraphic){if(style.graphicOpacity){fill.opacity=style.graphicOpacity;} @@ -1452,17 +1340,17 @@ var width=Math.round(style.graphicWidth||size*aspectRatio);var height=Math.round image.style.width=width+"px";image.style.height=height+"px";image.src=style.externalGraphic;image.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader("+"src='', sizingMethod='scale')";var rot=rotation*Math.PI/180;var sintheta=Math.sin(rot);var costheta=Math.cos(rot);var filter="progid:DXImageTransform.Microsoft.Matrix(M11="+costheta+",M12="+(-sintheta)+",M21="+sintheta+",M22="+costheta+",SizingMethod='auto expand')\n";var opacity=style.graphicOpacity||style.fillOpacity;if(opacity&&opacity!=1){filter+="progid:DXImageTransform.Microsoft.BasicImage(opacity="+ opacity+")\n";} node.style.filter=filter;var centerPoint=new OpenLayers.Geometry.Point(-xOffset,-yOffset);var imgBox=new OpenLayers.Bounds(0,0,width,height).toGeometry();imgBox.rotate(style.rotation,centerPoint);var imgBounds=imgBox.getBounds();node.style.left=Math.round(parseInt(node.style.left)+imgBounds.left)+"px";node.style.top=Math.round(parseInt(node.style.top)-imgBounds.bottom)+"px";},postDraw:function(node){node.style.visibility="visible";var fillColor=node._style.fillColor;var strokeColor=node._style.strokeColor;if(fillColor=="none"&&node.fillcolor!=fillColor){node.fillcolor=fillColor;} -if(strokeColor=="none"&&node.strokecolor!=strokeColor){node.strokecolor=strokeColor;}},setNodeDimension:function(node,geometry){var bbox=geometry.getBounds();if(bbox){var resolution=this.getResolution();var scaledBox=new OpenLayers.Bounds((bbox.left/resolution-this.offset.x)|0,(bbox.bottom/resolution-this.offset.y)|0,(bbox.right/resolution-this.offset.x)|0,(bbox.top/resolution-this.offset.y)|0);node.style.left=scaledBox.left+"px";node.style.top=scaledBox.top+"px";node.style.width=scaledBox.getWidth()+"px";node.style.height=scaledBox.getHeight()+"px";node.coordorigin=scaledBox.left+" "+scaledBox.top;node.coordsize=scaledBox.getWidth()+" "+scaledBox.getHeight();}},dashStyle:function(style){var dash=style.strokeDashstyle;switch(dash){case'solid':case'dot':case'dash':case'dashdot':case'longdash':case'longdashdot':return dash;default:var parts=dash.split(/[ ,]/);if(parts.length==2){if(1*parts[0]>=2*parts[1]){return"longdash";} +if(strokeColor=="none"&&node.strokecolor!=strokeColor){node.strokecolor=strokeColor;}},setNodeDimension:function(node,geometry){var bbox=geometry.getBounds();if(bbox){var resolution=this.getResolution();var scaledBox=new OpenLayers.Bounds(((bbox.left-this.featureDx)/resolution-this.offset.x)|0,(bbox.bottom/resolution-this.offset.y)|0,((bbox.right-this.featureDx)/resolution-this.offset.x)|0,(bbox.top/resolution-this.offset.y)|0);node.style.left=scaledBox.left+"px";node.style.top=scaledBox.top+"px";node.style.width=scaledBox.getWidth()+"px";node.style.height=scaledBox.getHeight()+"px";node.coordorigin=scaledBox.left+" "+scaledBox.top;node.coordsize=scaledBox.getWidth()+" "+scaledBox.getHeight();}},dashStyle:function(style){var dash=style.strokeDashstyle;switch(dash){case'solid':case'dot':case'dash':case'dashdot':case'longdash':case'longdashdot':return dash;default:var parts=dash.split(/[ ,]/);if(parts.length==2){if(1*parts[0]>=2*parts[1]){return"longdash";} return(parts[0]==1||parts[1]==1)?"dot":"dash";}else if(parts.length==4){return(1*parts[0]>=2*parts[1])?"longdashdot":"dashdot";} return"solid";}},createNode:function(type,id){var node=document.createElement(type);if(id){node.id=id;} node.unselectable='on';node.onselectstart=OpenLayers.Function.False;return node;},nodeTypeCompare:function(node,type){var subType=type;var splitIndex=subType.indexOf(":");if(splitIndex!=-1){subType=subType.substr(splitIndex+1);} var nodeName=node.nodeName;splitIndex=nodeName.indexOf(":");if(splitIndex!=-1){nodeName=nodeName.substr(splitIndex+1);} -return(subType==nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_vmlRoot","div");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"olv:group");},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){if(!isNaN(geometry.x)&&!isNaN(geometry.y)){var resolution=this.getResolution();node.style.left=(((geometry.x/resolution-this.offset.x)|0)-radius)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)|0)-radius)+"px";var diameter=radius*2;node.style.width=diameter+"px";node.style.height=diameter+"px";return node;} -return false;},drawLineString:function(node,geometry){return this.drawLine(node,geometry,false);},drawLinearRing:function(node,geometry){return this.drawLine(node,geometry,true);},drawLine:function(node,geometry,closeLine){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var numComponents=geometry.components.length;var parts=new Array(numComponents);var comp,x,y;for(var i=0;i<numComponents;i++){comp=geometry.components[i];x=(comp.x/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;parts[i]=" "+x+","+y+" l ";} -var end=(closeLine)?" x e":" e";node.path="m"+parts.join("")+end;return node;},drawPolygon:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var j,jj,points,area,first,second,i,ii,comp,pathComp,x,y;for(j=0,jj=geometry.components.length;j<jj;j++){path.push("m");points=geometry.components[j].components;area=(j===0);first=null;second=null;for(i=0,ii=points.length;i<ii;i++){comp=points[i];x=(comp.x/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;pathComp=" "+x+","+y;path.push(pathComp);if(i==0){path.push(" l");} +return(subType==nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_vmlRoot","div");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"olv:group");},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){if(!isNaN(geometry.x)&&!isNaN(geometry.y)){var resolution=this.getResolution();node.style.left=((((geometry.x-this.featureDx)/resolution-this.offset.x)|0)-radius)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)|0)-radius)+"px";var diameter=radius*2;node.style.width=diameter+"px";node.style.height=diameter+"px";return node;} +return false;},drawLineString:function(node,geometry){return this.drawLine(node,geometry,false);},drawLinearRing:function(node,geometry){return this.drawLine(node,geometry,true);},drawLine:function(node,geometry,closeLine){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var numComponents=geometry.components.length;var parts=new Array(numComponents);var comp,x,y;for(var i=0;i<numComponents;i++){comp=geometry.components[i];x=((comp.x-this.featureDx)/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;parts[i]=" "+x+","+y+" l ";} +var end=(closeLine)?" x e":" e";node.path="m"+parts.join("")+end;return node;},drawPolygon:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var j,jj,points,area,first,second,i,ii,comp,pathComp,x,y;for(j=0,jj=geometry.components.length;j<jj;j++){path.push("m");points=geometry.components[j].components;area=(j===0);first=null;second=null;for(i=0,ii=points.length;i<ii;i++){comp=points[i];x=((comp.x-this.featureDx)/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;pathComp=" "+x+","+y;path.push(pathComp);if(i==0){path.push(" l");} if(!area){if(!first){first=pathComp;}else if(first!=pathComp){if(!second){second=pathComp;}else if(second!=pathComp){area=true;}}}} path.push(area?" x ":" ");} -path.push("e");node.path=path.join("");return node;},drawRectangle:function(node,geometry){var resolution=this.getResolution();node.style.left=((geometry.x/resolution-this.offset.x)|0)+"px";node.style.top=((geometry.y/resolution-this.offset.y)|0)+"px";node.style.width=((geometry.width/resolution)|0)+"px";node.style.height=((geometry.height/resolution)|0)+"px";return node;},drawText:function(featureId,style,location){var label=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX,"olv:rect");var textbox=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX+"_textbox","olv:textbox");var resolution=this.getResolution();label.style.left=((location.x/resolution-this.offset.x)|0)+"px";label.style.top=((location.y/resolution-this.offset.y)|0)+"px";label.style.flip="y";textbox.innerText=style.label;if(style.cursor!="inherit"&&style.cursor!=null){textbox.style.cursor=style.cursor;} +path.push("e");node.path=path.join("");return node;},drawRectangle:function(node,geometry){var resolution=this.getResolution();node.style.left=(((geometry.x-this.featureDx)/resolution-this.offset.x)|0)+"px";node.style.top=((geometry.y/resolution-this.offset.y)|0)+"px";node.style.width=((geometry.width/resolution)|0)+"px";node.style.height=((geometry.height/resolution)|0)+"px";return node;},drawText:function(featureId,style,location){var label=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX,"olv:rect");var textbox=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX+"_textbox","olv:textbox");var resolution=this.getResolution();label.style.left=(((location.x-this.featureDx)/resolution-this.offset.x)|0)+"px";label.style.top=((location.y/resolution-this.offset.y)|0)+"px";label.style.flip="y";textbox.innerText=style.label;if(style.cursor!="inherit"&&style.cursor!=null){textbox.style.cursor=style.cursor;} if(style.fontColor){textbox.style.color=style.fontColor;} if(style.fontOpacity){textbox.style.filter='alpha(opacity='+(style.fontOpacity*100)+')';} if(style.fontFamily){textbox.style.fontFamily=style.fontFamily;} @@ -1472,17 +1360,16 @@ if(style.fontStyle){textbox.style.fontStyle=style.fontStyle;} if(style.labelSelect===true){label._featureId=featureId;textbox._featureId=featureId;textbox._geometry=location;textbox._geometryClass=location.CLASS_NAME;} textbox.style.whiteSpace="nowrap";textbox.inset="1px,0px,0px,0px";if(!label.parentNode){label.appendChild(textbox);this.textRoot.appendChild(label);} var align=style.labelAlign||"cm";if(align.length==1){align+="m";} -var xshift=textbox.clientWidth*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(0,1)]);var yshift=textbox.clientHeight*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(1,1)]);label.style.left=parseInt(label.style.left)-xshift-1+"px";label.style.top=parseInt(label.style.top)+yshift+"px";},drawSurface:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var comp,x,y;for(var i=0,len=geometry.components.length;i<len;i++){comp=geometry.components[i];x=(comp.x/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;if((i%3)==0&&(i/3)==0){path.push("m");}else if((i%3)==1){path.push(" c");} -path.push(" "+x+","+y);} -path.push(" x e");node.path=path.join("");return node;},moveRoot:function(renderer){var layer=this.map.getLayer(renderer.container.id);if(layer instanceof OpenLayers.Layer.Vector.RootContainer){layer=this.map.getLayer(this.container.id);} +var xshift=textbox.clientWidth*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(0,1)]);var yshift=textbox.clientHeight*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(1,1)]);label.style.left=parseInt(label.style.left)-xshift-1+"px";label.style.top=parseInt(label.style.top)+yshift+"px";},moveRoot:function(renderer){var layer=this.map.getLayer(renderer.container.id);if(layer instanceof OpenLayers.Layer.Vector.RootContainer){layer=this.map.getLayer(this.container.id);} layer&&layer.renderer.clear();OpenLayers.Renderer.Elements.prototype.moveRoot.apply(this,arguments);layer&&layer.redraw();},importSymbol:function(graphicName){var id=this.container.id+"-"+graphicName;var cache=this.symbolCache[id];if(cache){return cache;} var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');} var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var pathitems=["m"];for(var i=0;i<symbol.length;i=i+2){var x=symbol[i];var y=symbol[i+1];symbolExtent.left=Math.min(symbolExtent.left,x);symbolExtent.bottom=Math.min(symbolExtent.bottom,y);symbolExtent.right=Math.max(symbolExtent.right,x);symbolExtent.top=Math.max(symbolExtent.top,y);pathitems.push(x);pathitems.push(y);if(i==0){pathitems.push("l");}} pathitems.push("x e");var path=pathitems.join(" ");var diff=(symbolExtent.getWidth()-symbolExtent.getHeight())/2;if(diff>0){symbolExtent.bottom=symbolExtent.bottom-diff;symbolExtent.top=symbolExtent.top+diff;}else{symbolExtent.left=symbolExtent.left+diff;symbolExtent.right=symbolExtent.right-diff;} -cache={path:path,size:symbolExtent.getWidth(),left:symbolExtent.left,bottom:symbolExtent.bottom};this.symbolCache[id]=cache;return cache;},CLASS_NAME:"OpenLayers.Renderer.VML"});OpenLayers.Renderer.VML.LABEL_SHIFT={"l":0,"c":.5,"r":1,"t":0,"m":.5,"b":1};OpenLayers.Lang["vi"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Không xử lý được phản hồi ${statusText} cho yêu cầu",'Permalink':"Liên kết thường trực",'Overlays':"Lấp bản đồ",'Base Layer':"Lớp nền",'readNotImplemented':"Chưa hỗ trợ chức năng đọc.",'writeNotImplemented':"Chưa hỗ trợ chức năng viết.",'noFID':"Không thể cập nhật tính năng thiếu FID.",'errorLoadingGML':"Lỗi tải tập tin GML tại ${url}",'browserNotSupported':"Trình duyệt của bạn không hỗ trợ chức năng vẽ bằng vectơ. Hiện hỗ trợ các bộ kết xuất:\n${renderers}",'componentShouldBe':"addFeatures: bộ phận cần phải là ${geomType}",'getFeatureError':"getFeatureFromEvent được gọi từ lớp không có bộ kết xuất. Thường thì có lẽ lớp bị xóa nhưng một phần xử lý của nó vẫn còn.",'minZoomLevelError':"Chỉ nên sử dụng thuộc tính minZoomLevel với các lớp FixedZoomLevels-descendent. Việc lớp wfs này tìm cho minZoomLevel là di tích còn lại từ xưa. Tuy nhiên, nếu chúng tôi dời nó thì sẽ vỡ các chương trình OpenLayers mà dựa trên nó. Bởi vậy chúng tôi phản đối sử dụng nó\x26nbsp;– bước tìm cho minZoomLevel sẽ được dời vào phiên bản 3.0. Xin sử dụng thiết lập độ phân tích tối thiểu / tối đa thay thế, theo hướng dẫn này: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Giao dịch WFS: THÀNH CÔNG ${response}",'commitFailed':"Giao dịch WFS: THẤT BẠI ${response}",'googleWarning':"Không thể tải lớp Google đúng đắn.\x3cbr\x3e\x3cbr\x3eĐể tránh thông báo này lần sau, hãy chọn BaseLayer mới dùng điều khiển chọn lớp ở góc trên phải.\x3cbr\x3e\x3cbr\x3eChắc script thư viện Google Maps hoặc không được bao gồm hoặc không chứa khóa API hợp với website của bạn.\x3cbr\x3e\x3cbr\x3e\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eTrợ giúp về tính năng này\x3c/a\x3e cho người phát triển.",'getLayerWarning':"Không thể tải lớp ${layerType} đúng đắn.\x3cbr\x3e\x3cbr\x3eĐể tránh thông báo này lần sau, hãy chọn BaseLayer mới dùng điều khiển chọn lớp ở góc trên phải.\x3cbr\x3e\x3cbr\x3eChắc script thư viện ${layerLib} không được bao gồm đúng kiểu.\x3cbr\x3e\x3cbr\x3e\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eTrợ giúp về tính năng này\x3c/a\x3e cho người phát triển.",'Scale = 1 : ${scaleDenom}':"Tỷ lệ = 1 : ${scaleDenom}",'W':"T",'E':"Đ",'N':"B",'S':"N",'layerAlreadyAdded':"Bạn muốn thêm lớp ${layerName} vào bản đồ, nhưng lớp này đã được thêm",'reprojectDeprecated':"Bạn đang áp dụng chế độ “reproject” vào lớp ${layerName}. Chế độ này đã bị phản đối: nó có mục đích hỗ trợ lấp dữ liệu trên các nền bản đồ thương mại; nên thực hiện hiệu ứng đó dùng tính năng Mercator Hình cầu. Có sẵn thêm chi tiết tại http://trac.openlayers.org/wiki/SphericalMercator .",'methodDeprecated':"Phương thức này đã bị phản đối và sẽ bị dời vào phiên bản 3.0. Xin hãy sử dụng ${newMethod} thay thế.",'boundsAddError':"Cần phải cho cả giá trị x và y vào hàm add.",'lonlatAddError':"Cần phải cho cả giá trị lon và lat vào hàm add.",'pixelAddError':"Cần phải cho cả giá trị x và y vào hàm add.",'unsupportedGeometryType':"Không hỗ trợ kiểu địa lý: ${geomType}",'filterEvaluateNotImplemented':"chưa hỗ trợ evaluate cho loại bộ lọc này."});OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:true,defaultFilter:null,initialize:function(options){options=options||{};OpenLayers.Util.extend(this,options);this.options=options;},mergeWithDefaultFilter:function(filter){var merged;if(filter&&this.defaultFilter){merged=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,filter]});}else{merged=filter||this.defaultFilter||undefined;} -return merged;},destroy:function(){this.options=null;this.format=null;},read:function(options){options=options||{};options.filter=this.mergeWithDefaultFilter(options.filter);},create:function(){},update:function(){},"delete":function(){},commit:function(){},abort:function(response){},createCallback:function(method,response,options){return OpenLayers.Function.bind(function(){method.apply(this,[response,options]);},this);},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:true,features:null,reqFeatures:null,priv:null,error:null,initialize:function(options){OpenLayers.Util.extend(this,options);},success:function(){return this.code>0;},CLASS_NAME:"OpenLayers.Protocol.Response"});OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:false,wildcarded:false,srsInBBOX:false,initialize:function(options){options=options||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var format=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams=function(filter,params){return format.write(filter,params);}}},destroy:function(){this.params=null;this.headers=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){OpenLayers.Protocol.prototype.read.apply(this,arguments);options=options||{};options.params=OpenLayers.Util.applyDefaults(options.params,this.options.params);options=OpenLayers.Util.applyDefaults(options,this.options);if(options.filter&&this.filterToParams){options.params=this.filterToParams(options.filter,options.params);} -var readWithPOST=(options.readWithPOST!==undefined)?options.readWithPOST:this.readWithPOST;var resp=new OpenLayers.Protocol.Response({requestType:"read"});if(readWithPOST){resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,resp,options),data:OpenLayers.Util.getParameterString(options.params),headers:{"Content-Type":"application/x-www-form-urlencoded"}});}else{resp.priv=OpenLayers.Request.GET({url:options.url,callback:this.createCallback(this.handleRead,resp,options),params:options.params,headers:options.headers});} -return resp;},handleRead:function(resp,options){this.handleResponse(resp,options);},create:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:features,requestType:"create"});resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleCreate,resp,options),headers:options.headers,data:this.format.write(features)});return resp;},handleCreate:function(resp,options){this.handleResponse(resp,options);},update:function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"update"});resp.priv=OpenLayers.Request.PUT({url:url,callback:this.createCallback(this.handleUpdate,resp,options),headers:options.headers,data:this.format.write(feature)});return resp;},handleUpdate:function(resp,options){this.handleResponse(resp,options);},"delete":function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"delete"});resp.priv=OpenLayers.Request.DELETE({url:url,callback:this.createCallback(this.handleDelete,resp,options),headers:options.headers});return resp;},handleDelete:function(resp,options){this.handleResponse(resp,options);},handleResponse:function(resp,options){var request=resp.priv;if(options.callback){if(request.status>=200&&request.status<300){if(resp.requestType!="delete"){resp.features=this.parseFeatures(request);} +cache={path:path,size:symbolExtent.getWidth(),left:symbolExtent.left,bottom:symbolExtent.bottom};this.symbolCache[id]=cache;return cache;},CLASS_NAME:"OpenLayers.Renderer.VML"});OpenLayers.Renderer.VML.LABEL_SHIFT={"l":0,"c":.5,"r":1,"t":0,"m":.5,"b":1};OpenLayers.Lang["vi"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Không xử lý được phản hồi ${statusText} cho yêu cầu",'Permalink':"Liên kết thường trực",'Overlays':"Lấp bản đồ",'Base Layer':"Lớp nền",'noFID':"Không thể cập nhật tính năng thiếu FID.",'browserNotSupported':"Trình duyệt của bạn không hỗ trợ chức năng vẽ bằng vectơ. Hiện hỗ trợ các bộ kết xuất:\n${renderers}",'minZoomLevelError':"Chỉ nên sử dụng thuộc tính minZoomLevel với các lớp FixedZoomLevels-descendent. Việc lớp wfs này tìm cho minZoomLevel là di tích còn lại từ xưa. Tuy nhiên, nếu chúng tôi dời nó thì sẽ vỡ các chương trình OpenLayers mà dựa trên nó. Bởi vậy chúng tôi phản đối sử dụng nó\x26nbsp;– bước tìm cho minZoomLevel sẽ được dời vào phiên bản 3.0. Xin sử dụng thiết lập độ phân tích tối thiểu / tối đa thay thế, theo hướng dẫn này: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Giao dịch WFS: THÀNH CÔNG ${response}",'commitFailed':"Giao dịch WFS: THẤT BẠI ${response}",'googleWarning':"Không thể tải lớp Google đúng đắn.\x3cbr\x3e\x3cbr\x3eĐể tránh thông báo này lần sau, hãy chọn BaseLayer mới dùng điều khiển chọn lớp ở góc trên phải.\x3cbr\x3e\x3cbr\x3eChắc script thư viện Google Maps hoặc không được bao gồm hoặc không chứa khóa API hợp với website của bạn.\x3cbr\x3e\x3cbr\x3e\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eTrợ giúp về tính năng này\x3c/a\x3e cho người phát triển.",'getLayerWarning':"Không thể tải lớp ${layerType} đúng đắn.\x3cbr\x3e\x3cbr\x3eĐể tránh thông báo này lần sau, hãy chọn BaseLayer mới dùng điều khiển chọn lớp ở góc trên phải.\x3cbr\x3e\x3cbr\x3eChắc script thư viện ${layerLib} không được bao gồm đúng kiểu.\x3cbr\x3e\x3cbr\x3e\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eTrợ giúp về tính năng này\x3c/a\x3e cho người phát triển.",'Scale = 1 : ${scaleDenom}':"Tỷ lệ = 1 : ${scaleDenom}",'W':"T",'E':"Đ",'N':"B",'S':"N",'reprojectDeprecated':"Bạn đang áp dụng chế độ “reproject” vào lớp ${layerName}. Chế độ này đã bị phản đối: nó có mục đích hỗ trợ lấp dữ liệu trên các nền bản đồ thương mại; nên thực hiện hiệu ứng đó dùng tính năng Mercator Hình cầu. Có sẵn thêm chi tiết tại http://trac.openlayers.org/wiki/SphericalMercator .",'methodDeprecated':"Phương thức này đã bị phản đối và sẽ bị dời vào phiên bản 3.0. Xin hãy sử dụng ${newMethod} thay thế."});OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:true,defaultFilter:null,initialize:function(options){options=options||{};OpenLayers.Util.extend(this,options);this.options=options;},mergeWithDefaultFilter:function(filter){var merged;if(filter&&this.defaultFilter){merged=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,filter]});}else{merged=filter||this.defaultFilter||undefined;} +return merged;},destroy:function(){this.options=null;this.format=null;},read:function(options){options=options||{};options.filter=this.mergeWithDefaultFilter(options.filter);},create:function(){},update:function(){},"delete":function(){},commit:function(){},abort:function(response){},createCallback:function(method,response,options){return OpenLayers.Function.bind(function(){method.apply(this,[response,options]);},this);},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:true,features:null,data:null,reqFeatures:null,priv:null,error:null,initialize:function(options){OpenLayers.Util.extend(this,options);},success:function(){return this.code>0;},CLASS_NAME:"OpenLayers.Protocol.Response"});OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:false,updateWithPOST:false,deleteWithPOST:false,wildcarded:false,srsInBBOX:false,initialize:function(options){options=options||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var format=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams=function(filter,params){return format.write(filter,params);};}},destroy:function(){this.params=null;this.headers=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){OpenLayers.Protocol.prototype.read.apply(this,arguments);options=options||{};options.params=OpenLayers.Util.applyDefaults(options.params,this.options.params);options=OpenLayers.Util.applyDefaults(options,this.options);if(options.filter&&this.filterToParams){options.params=this.filterToParams(options.filter,options.params);} +var readWithPOST=(options.readWithPOST!==undefined)?options.readWithPOST:this.readWithPOST;var resp=new OpenLayers.Protocol.Response({requestType:"read"});if(readWithPOST){var headers=options.headers||{};headers["Content-Type"]="application/x-www-form-urlencoded";resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,resp,options),data:OpenLayers.Util.getParameterString(options.params),headers:headers});}else{resp.priv=OpenLayers.Request.GET({url:options.url,callback:this.createCallback(this.handleRead,resp,options),params:options.params,headers:options.headers});} +return resp;},handleRead:function(resp,options){this.handleResponse(resp,options);},create:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:features,requestType:"create"});resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleCreate,resp,options),headers:options.headers,data:this.format.write(features)});return resp;},handleCreate:function(resp,options){this.handleResponse(resp,options);},update:function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"update"});var method=this.updateWithPOST?"POST":"PUT";resp.priv=OpenLayers.Request[method]({url:url,callback:this.createCallback(this.handleUpdate,resp,options),headers:options.headers,data:this.format.write(feature)});return resp;},handleUpdate:function(resp,options){this.handleResponse(resp,options);},"delete":function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"delete"});var method=this.deleteWithPOST?"POST":"DELETE";var requestOptions={url:url,callback:this.createCallback(this.handleDelete,resp,options),headers:options.headers};if(this.deleteWithPOST){requestOptions.data=this.format.write(feature);} +resp.priv=OpenLayers.Request[method](requestOptions);return resp;},handleDelete:function(resp,options){this.handleResponse(resp,options);},handleResponse:function(resp,options){var request=resp.priv;if(options.callback){if(request.status>=200&&request.status<300){if(resp.requestType!="delete"){resp.features=this.parseFeatures(request);} resp.code=OpenLayers.Protocol.Response.SUCCESS;}else{resp.code=OpenLayers.Protocol.Response.FAILURE;} options.callback.call(options.scope,resp);}},parseFeatures:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;} if(!doc||doc.length<=0){return null;} @@ -1495,26 +1382,25 @@ function callback(response){this.callUserCallback(response,options);success=succ var queue=types[OpenLayers.State.INSERT];if(queue.length>0){resp.push(this.create(queue,OpenLayers.Util.applyDefaults({callback:insertCallback,scope:this},options.create)));} queue=types[OpenLayers.State.UPDATE];for(var i=queue.length-1;i>=0;--i){resp.push(this.update(queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options.update)));} queue=types[OpenLayers.State.DELETE];for(var i=queue.length-1;i>=0;--i){resp.push(this["delete"](queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options["delete"])));} -return resp;},abort:function(response){if(response){response.priv.abort();}},callUserCallback:function(resp,options){var opt=options[resp.requestType];if(opt&&opt.callback){opt.callback.call(opt.scope,resp);}},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Lang["bg"]=OpenLayers.Util.applyDefaults({'Permalink':"Постоянна препратка",'Base Layer':"Основен слой",'errorLoadingGML':"Грешка при зареждане на GML файл ${url}",'Scale = 1 : ${scaleDenom}':"Мащаб = 1 : ${scaleDenom}",'layerAlreadyAdded':"Опитахте да добавите слой ${layerName} в картата, но той вече е добавен",'methodDeprecated':"Този метод е остарял и ще бъде премахват в 3.0. Вместо него използвайте ${newMethod}."});OpenLayers.Lang["hr"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nepodržani zahtjev ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Osnovna karta",'readNotImplemented':"Čitanje nije implementirano.",'writeNotImplemented':"Pisanje nije implementirano.",'noFID':"Ne mogu ažurirati značajku za koju ne postoji FID.",'errorLoadingGML':"Greška u učitavanju GML datoteke ${url}",'browserNotSupported':"Vaš preglednik ne podržava vektorsko renderiranje. Trenutno podržani rendereri su: ${renderers}",'componentShouldBe':"addFeatures : komponenta bi trebala biti ${geomType}",'getFeatureError':"getFeatureFromEvent je pozvao Layer bez renderera. Ovo obično znači da ste uništiili Layer, a ne neki Handler koji je povezan s njim.",'commitSuccess':"WFS Transakcija: USPJEŠNA ${response}",'commitFailed':"WFS Transakcija: NEUSPJEŠNA ${response}",'Scale = 1 : ${scaleDenom}':"Mjerilo = 1 : ${scaleDenom}",'layerAlreadyAdded':"Pokušali ste dodati layer: ${layerName} na kartu, ali je već dodan",'methodDeprecated':"Ova metoda nije odobrena i biti će maknuta u 3.0. Koristite ${newMethod}.",'boundsAddError':"Morate dati obje vrijednosti , x i y da bi dodali funkciju.",'lonlatAddError':"Morate dati obje vrijednosti , (lon i lat) da bi dodali funkciju.",'pixelAddError':"Morate dati obje vrijednosti , x i y da bi dodali funkciju.",'unsupportedGeometryType':"Nepodržani tip geometrije: ${geomType}"});OpenLayers.Lang["be-tarask"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Неапрацаваны вынік запыту ${statusText}",'Permalink':"Сталая спасылка",'Overlays':"Слаі",'Base Layer':"Базавы слой",'readNotImplemented':"Функцыянальнасьць чытаньня ня створаная.",'writeNotImplemented':"Функцыянальнасьць запісу ня створаная.",'noFID':"Немагчыма абнавіць магчымасьць, для якога не існуе FID.",'errorLoadingGML':"Памылка загрузкі файла GML ${url}",'browserNotSupported':"Ваш браўзэр не падтрымлівае вэктарную графіку. У цяперашні момант падтрымліваюцца: ${renderers}",'componentShouldBe':"addFeatures : кампанэнт павінен быць ${geomType}",'getFeatureError':"getFeatureFromEvent выкліканы для слоя бяз рэндэру. Звычайна гэта азначае, што Вы зьнішчылі слой, але пакінулі зьвязаны зь ім апрацоўшчык.",'minZoomLevelError':"Уласьцівасьць minZoomLevel прызначана толькі для выкарыстаньня са слаямі вытворнымі ад FixedZoomLevels. Тое, што гэты wfs-слой правяраецца на minZoomLevel — рэха прошлага. Але мы ня можам выдаліць гэтую магчымасьць, таму што ад яе залежаць некаторыя заснаваныя на OL дастасаваньні. Тым ня менш, праверка minZoomLevel будзе выдаленая ў вэрсіі 3.0. Калі ласка, выкарыстоўваеце замест яе ўстаноўкі мінімальнага/максымальнага памераў, як апісана тут: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-транзакцыя: ПОСЬПЕХ ${response}",'commitFailed':"WFS-транзакцыя: ПАМЫЛКА ${response}",'googleWarning':"Не атрымалася загрузіць слой Google. \x3cbr\x3e\x3cbr\x3eКаб пазбавіцца гэтага паведамленьня, выберыце новы базавы слой у сьпісе ў верхнім правым куце.\x3cbr\x3e\x3cbr\x3e Хутчэй за ўсё, прычына ў тым, што скрыпт бібліятэкі Google Maps ня быў уключаныя альбо не ўтрымлівае слушны API-ключ для Вашага сайта.\x3cbr\x3e\x3cbr\x3eРаспрацоўшчыкам: Для таго, каб даведацца як зрабіць так, каб усё працавала, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eнацісьніце тут\x3c/a\x3e",'getLayerWarning':"Немагчыма загрузіць слой ${layerType}.\x3cbr\x3e\x3cbr\x3eКаб пазбавіцца гэтага паведамленьня, выберыце новы базавы слой у сьпісе ў верхнім правым куце.\x3cbr\x3e\x3cbr\x3eХутчэй за ўсё, прычына ў тым, што скрыпт бібліятэкі ${layerLib} ня быў слушна ўключаны.\x3cbr\x3e\x3cbr\x3eРаспрацоўшчыкам: Для таго, каб даведацца як зрабіць так, каб усё працавала, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eнацісьніце тут\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Маштаб = 1 : ${scaleDenom}",'W':"З",'E':"У",'N':"Пн",'S':"Пд",'layerAlreadyAdded':"Вы паспрабавалі дадаць слой ${layerName} на мапу, але ён ужо дададзены",'reprojectDeprecated':"Вы выкарыстоўваеце ўстаноўку \'reproject\' для слоя ${layerName}. Гэтая ўстаноўка зьяўляецца састарэлай: яна выкарыстоўвалася для падтрымкі паказу зьвестак на камэрцыйных базавых мапах, але гэта функцыя цяпер рэалізаваная ў убудаванай падтрымцы сфэрычнай праекцыі Мэркатара. Дадатковая інфармацыя ёсьць на http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Гэты мэтад састарэлы і будзе выдалены ў вэрсіі 3.0. Калі ласка, замест яго выкарыстоўвайце ${newMethod}.",'boundsAddError':"Вам неабходна падаць абодва значэньні x і y для функцыі складаньня.",'lonlatAddError':"Вам неабходна падаць абодва значэньні lon і lat для функцыі складаньня.",'pixelAddError':"Вам неабходна падаць абодва значэньні x і y для функцыі складаньня.",'unsupportedGeometryType':"Тып геамэтрыі не падтрымліваецца: ${geomType}",'filterEvaluateNotImplemented':"evaluate не рэалізаваны для гэтага тыпу фільтру."});OpenLayers.Lang["cs-CZ"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nezpracovaná návratová hodnota ${statusText}",'Permalink':"Trvalý odkaz",'Overlays':"Překryvné vrstvy",'Base Layer':"Podkladové vrstvy",'readNotImplemented':"Read není implementováno.",'writeNotImplemented':"Write není implementováno.",'noFID':"Nelze aktualizovat prvek, pro který neexistuje FID.",'errorLoadingGML':"Chyba při načítání souboru GML ${url}",'browserNotSupported':"Váš prohlížeč nepodporuje vykreslování vektorů. Momentálně podporované nástroje jsou::\n${renderers}",'componentShouldBe':"addFeatures : komponenta by měla být ${geomType}",'getFeatureError':"getFeatureFromEvent bylo zavoláno na vrstvě, která nemá vykreslovač. To obyčejně znamená, že jste odstranil vrstvu, ale ne rutinu s ní asociovanou.",'minZoomLevelError':"Vlastnost minZoomLevel by se měla používat pouze s potomky FixedZoomLevels vrstvami. To znamená, že vrstva wfs kontroluje, zda-li minZoomLevel není zbytek z minulosti.Nelze to ovšem vyjmout bez možnosti, že bychom rozbili aplikace postavené na OL, které by na tom mohly záviset. Proto tuto vlastnost nedoporučujeme používat -- kontrola minZoomLevel bude odstraněna ve verzi 3.0. Použijte prosím raději nastavení min/max podle příkaldu popsaného na: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: ÚSPĚCH ${response}",'commitFailed':"WFS Transaction: CHYBA ${response}",'googleWarning':"Nepodařilo se správně načíst vrstvu Google.\x3cbr\x3e\x3cbr\x3eAbyste se zbavili této zprávy, zvolte jinou základní vrstvu v přepínači vrstev.\x3cbr\x3e\x3cbr\x3eTo se většinou stává, pokud nebyl načten skript, nebo neobsahuje správný klíč pro API pro tuto stránku.\x3cbr\x3e\x3cbr\x3eVývojáři: Pro pomoc, aby tohle fungovalo , \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklikněte sem\x3c/a\x3e",'getLayerWarning':"The ${layerType} Layer was unable to load correctly.\x3cbr\x3e\x3cbr\x3eTo get rid of this message, select a new BaseLayer in the layer switcher in the upper-right corner.\x3cbr\x3e\x3cbr\x3eMost likely, this is because the ${layerLib} library script was either not correctly included.\x3cbr\x3e\x3cbr\x3eDevelopers: For help getting this working correctly, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclick here\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Měřítko = 1 : ${scaleDenom}",'layerAlreadyAdded':"Pokusili jste se přidat vrstvu: ${layerName} do mapy, ale tato vrstva je již v mapě přítomna.",'reprojectDeprecated':"Použil jste volbu \'reproject\' ve vrstvě ${layerName}. Tato volba není doporučená: byla zde proto, aby bylo možno zobrazovat data z okomerčních serverů, ale tato funkce je nyní zajištěna pomocí podpory Spherical Mercator. Více informací naleznete na http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Tato metoda je zavržená a bude ve verzi 3.0 odstraněna. Prosím, použijte raději ${newMethod}.",'boundsAddError':"Pro přídavnou funkci musíte zadat obě souřadnice x a y.",'lonlatAddError':"Pro přídavnou funkci musíte zadat obě souřadnice lon a lat.",'pixelAddError':"Pro přídavnou funkci musíte zadat obě souřadnice x a y.",'unsupportedGeometryType':"Nepodporovaný typ geometrie: ${geomType}"});OpenLayers.Lang["br"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Distro evel reked anveret ${statusText}",'Permalink':"Peurliamm",'Overlays':"Gwiskadoù",'Base Layer':"Gwiskad diazez",'readNotImplemented':"N\'eo ket emplementet al lenn.",'writeNotImplemented':"N\'eo ket emplementet ar skrivañ.",'noFID':"N\'haller ket hizivaat un elfenn ma n\'eus ket a niverenn-anaout (FID) eviti.",'errorLoadingGML':"Fazi e-ser kargañ ar restr GML ${url}",'browserNotSupported':"N\'eo ket skoret an daskor vektorel gant ho merdeer. Setu aze an daskorerioù skoret evit ar poent :\n${renderers}",'componentShouldBe':"addFeatures : bez\' e tlefe ar parzh besañ eus ar seurt ${geomType}",'getFeatureError':"Galvet eo bet getFeatureFromEvent called war ur gwiskad hep daskorer. Kement-se a dalvez ez eus bet freuzet ur gwiskad hag hoc\'h eus miret un embreger bennak stag outañ.",'minZoomLevelError':"Ne zleer implijout ar perzh minZoomLevel nemet evit gwiskadoù FixedZoomLevels-descendent. Ar fed ma wiria ar gwiskad WHS-se hag-eñ ez eus eus minZoomLevel zo un aspadenn gozh. Koulskoude n\'omp ket evit e ziverkañ kuit da derriñ arloadoù diazezet war OL a c\'hallfe bezañ stag outañ. Setu perak eo dispredet -- Lamet kuit e vo ar gwiriañ minZoomLevel a-is er stumm 3.0. Ober gant an arventennoù bihanañ/brasañ evel deskrivet amañ e plas : http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Treuzgread WFS : MAT EO ${response}",'commitFailed':"Treuzgread WFS Transaction: C\'HWITET ${response}",'googleWarning':"N\'eus ket bet gallet kargañ ar gwiskad Google ent reizh.\x3cbr\x3e\x3cbr\x3eEvit en em zizober eus ar c\'hemenn-mañ, dibabit ur BaseLayer nevez en diuzer gwiskadoù er c\'horn dehoù el laez.\x3cbr\x3e\x3cbr\x3eSur a-walc\'h eo peogwir n\'eo ket bet ensoc\'het levraoueg Google Maps pe neuze ne glot ket an alc\'hwez API gant ho lec\'hienn.\x3cbr\x3e\x3cbr\x3eDiorroerien : Evit reizhañ an dra-se, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclick here\x3c/a\x3e",'getLayerWarning':"N\'haller ket kargañ ar gwiskad ${layerType} ent reizh.\x3cbr\x3e\x3cbr\x3eEvit en em zizober eus ar c\'hemenn-mañ, dibabit ur BaseLayer nevez en diuzer gwiskadoù er c\'horn dehoù el laez.\x3cbr\x3e\x3cbr\x3eSur a-walc\'h eo peogwir n\'eo ket bet ensoc\'het mat al levraoueg ${layerLib}.\x3cbr\x3e\x3cbr\x3eDiorroerien : Evit gouzout penaos reizhañ an dra-se, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclick here\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Skeul = 1 : ${scaleDenom}",'W':"K",'E':"R",'N':"N",'S':"S",'layerAlreadyAdded':"Klasket hoc\'h eus ouzhpennañ ar gwiskad : ${layerName} d\'ar gartenn, met ouzhpennet e oa bet c\'hoazh",'reprojectDeprecated':"Emaoc\'h oc\'h implijout an dibarzh \'reproject\' war ar gwiskad ${layerName}. Dispredet eo an dibarzh-mañ : bet eo hag e talveze da ziskwel roadennoù war-c\'horre kartennoù diazez kenwerzhel, un dra hag a c\'haller ober bremañ gant an arc\'hwel dre skor banndres boullek Mercator. Muioc\'h a ditouroù a c\'haller da gaout war http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Dispredet eo an daore-se ha tennet e vo kuit eus ar stumm 3.0. Grit gant ${newMethod} e plas.",'boundsAddError':"Rekis eo tremen an div dalvoudenn x ha y d\'an arc\'hwel add.",'lonlatAddError':"Rekis eo tremen an div dalvoudenn hedred ha ledred d\'an arc\'hwel add.",'pixelAddError':"Rekis eo tremen an div dalvoudenn x ha y d\'an arc\'hwel add.",'unsupportedGeometryType':"Seurt mentoniezh anskoret : ${geomType}",'filterEvaluateNotImplemented':"N\'eo ket bet emplementet ar priziañ evit seurt siloù c\'hoazh."});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,containerOrigin:null,pinchOrigin:null,currentCenter:null,autoActivate:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions);},activate:function(){var activated=OpenLayers.Control.prototype.activate.apply(this,arguments);if(activated){this.map.events.on({moveend:this.updateContainerOrigin,scope:this});this.updateContainerOrigin();} -return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.apply(this,arguments);if(this.map&&this.map.events){this.map.events.un({moveend:this.updateContainerOrigin,scope:this});} -return deactivated;},updateContainerOrigin:function(){var container=this.map.layerContainerDiv;this.containerOrigin={x:parseInt(container.style.left,10),y:parseInt(container.style.top,10)};},pinchStart:function(evt,pinchData){this.pinchOrigin=evt.xy;this.currentCenter=evt.xy;},pinchMove:function(evt,pinchData){var scale=pinchData.scale;var containerOrigin=this.containerOrigin;var pinchOrigin=this.pinchOrigin;var current=evt.xy;var dx=Math.round((current.x-pinchOrigin.x)+(scale-1)*(containerOrigin.x-pinchOrigin.x));var dy=Math.round((current.y-pinchOrigin.y)+(scale-1)*(containerOrigin.y-pinchOrigin.y));this.applyTransform("translate("+dx+"px, "+dy+"px) scale("+scale+")");this.currentCenter=current;},applyTransform:function(transform){var style=this.map.layerContainerDiv.style;style['-webkit-transform']=transform;style['-moz-transform']=transform;},pinchDone:function(evt,start,last){this.applyTransform("");var zoom=this.map.getZoomForResolution(this.map.getResolution()/last.scale,true);if(zoom!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){var resolution=this.map.getResolutionForZoom(zoom);var location=this.map.getLonLatFromPixel(this.pinchOrigin);var zoomPixel=this.currentCenter;var size=this.map.getSize();location.lon+=resolution*((size.w/2)-zoomPixel.x);location.lat-=resolution*((size.h/2)-zoomPixel.y);this.map.setCenter(location,zoom);}},CLASS_NAME:"OpenLayers.Control.PinchZoom"});OpenLayers.Lang["io"]=OpenLayers.Util.applyDefaults({'Scale = 1 : ${scaleDenom}':"Skalo = 1 : ${scaleDenom}"});OpenLayers.Control.LayerSwitcher=OpenLayers.Class(OpenLayers.Control,{roundedCorner:true,roundedCornerColor:"darkblue",layerStates:null,layersDiv:null,baseLayersDiv:null,baseLayers:null,dataLbl:null,dataLayersDiv:null,dataLayers:null,minimizeDiv:null,maximizeDiv:null,ascending:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.layerStates=[];},destroy:function(){OpenLayers.Event.stopObservingElement(this.div);OpenLayers.Event.stopObservingElement(this.minimizeDiv);OpenLayers.Event.stopObservingElement(this.maximizeDiv);this.clearLayersArray("base");this.clearLayersArray("data");this.map.events.un({"addlayer":this.redraw,"changelayer":this.redraw,"removelayer":this.redraw,"changebaselayer":this.redraw,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.on({"addlayer":this.redraw,"changelayer":this.redraw,"removelayer":this.redraw,"changebaselayer":this.redraw,scope:this});},draw:function(){OpenLayers.Control.prototype.draw.apply(this);this.loadContents();if(!this.outsideViewport){this.minimizeControl();} -this.redraw();return this.div;},clearLayersArray:function(layersType){var layers=this[layersType+"Layers"];if(layers){for(var i=0,len=layers.length;i<len;i++){var layer=layers[i];OpenLayers.Event.stopObservingElement(layer.inputElem);OpenLayers.Event.stopObservingElement(layer.labelSpan);}} -this[layersType+"LayersDiv"].innerHTML="";this[layersType+"Layers"]=[];},checkRedraw:function(){var redraw=false;if(!this.layerStates.length||(this.map.layers.length!=this.layerStates.length)){redraw=true;}else{for(var i=0,len=this.layerStates.length;i<len;i++){var layerState=this.layerStates[i];var layer=this.map.layers[i];if((layerState.name!=layer.name)||(layerState.inRange!=layer.inRange)||(layerState.id!=layer.id)||(layerState.visibility!=layer.visibility)){redraw=true;break;}}} +return resp;},abort:function(response){if(response){response.priv.abort();}},callUserCallback:function(resp,options){var opt=options[resp.requestType];if(opt&&opt.callback){opt.callback.call(opt.scope,resp);}},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Lang["bg"]=OpenLayers.Util.applyDefaults({'Permalink':"Постоянна препратка",'Base Layer':"Основен слой",'Scale = 1 : ${scaleDenom}':"Мащаб = 1 : ${scaleDenom}",'methodDeprecated':"Този метод е остарял и ще бъде премахват в 3.0. Вместо него използвайте ${newMethod}."});OpenLayers.Lang["hr"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nepodržani zahtjev ${statusText}",'Permalink':"Permalink",'Overlays':"Overlays",'Base Layer':"Osnovna karta",'noFID':"Ne mogu ažurirati značajku za koju ne postoji FID.",'browserNotSupported':"Vaš preglednik ne podržava vektorsko renderiranje. Trenutno podržani rendereri su: ${renderers}",'commitSuccess':"WFS Transakcija: USPJEŠNA ${response}",'commitFailed':"WFS Transakcija: NEUSPJEŠNA ${response}",'Scale = 1 : ${scaleDenom}':"Mjerilo = 1 : ${scaleDenom}",'methodDeprecated':"Ova metoda nije odobrena i biti će maknuta u 3.0. Koristite ${newMethod}."});OpenLayers.Lang["be-tarask"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Неапрацаваны вынік запыту ${statusText}",'Permalink':"Сталая спасылка",'Overlays':"Слаі",'Base Layer':"Базавы слой",'noFID':"Немагчыма абнавіць магчымасьць, для якога не існуе FID.",'browserNotSupported':"Ваш браўзэр не падтрымлівае вэктарную графіку. У цяперашні момант падтрымліваюцца: ${renderers}",'minZoomLevelError':"Уласьцівасьць minZoomLevel прызначана толькі для выкарыстаньня са слаямі вытворнымі ад FixedZoomLevels. Тое, што гэты wfs-слой правяраецца на minZoomLevel — рэха прошлага. Але мы ня можам выдаліць гэтую магчымасьць, таму што ад яе залежаць некаторыя заснаваныя на OL дастасаваньні. Тым ня менш, праверка minZoomLevel будзе выдаленая ў вэрсіі 3.0. Калі ласка, выкарыстоўваеце замест яе ўстаноўкі мінімальнага/максымальнага памераў, як апісана тут: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS-транзакцыя: ПОСЬПЕХ ${response}",'commitFailed':"WFS-транзакцыя: ПАМЫЛКА ${response}",'googleWarning':"Не атрымалася загрузіць слой Google. \x3cbr\x3e\x3cbr\x3eКаб пазбавіцца гэтага паведамленьня, выберыце новы базавы слой у сьпісе ў верхнім правым куце.\x3cbr\x3e\x3cbr\x3e Хутчэй за ўсё, прычына ў тым, што скрыпт бібліятэкі Google Maps ня быў уключаныя альбо не ўтрымлівае слушны API-ключ для Вашага сайта.\x3cbr\x3e\x3cbr\x3eРаспрацоўшчыкам: Для таго, каб даведацца як зрабіць так, каб усё працавала, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eнацісьніце тут\x3c/a\x3e",'getLayerWarning':"Немагчыма загрузіць слой ${layerType}.\x3cbr\x3e\x3cbr\x3eКаб пазбавіцца гэтага паведамленьня, выберыце новы базавы слой у сьпісе ў верхнім правым куце.\x3cbr\x3e\x3cbr\x3eХутчэй за ўсё, прычына ў тым, што скрыпт бібліятэкі ${layerLib} ня быў слушна ўключаны.\x3cbr\x3e\x3cbr\x3eРаспрацоўшчыкам: Для таго, каб даведацца як зрабіць так, каб усё працавала, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eнацісьніце тут\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Маштаб = 1 : ${scaleDenom}",'W':"З",'E':"У",'N':"Пн",'S':"Пд",'reprojectDeprecated':"Вы выкарыстоўваеце ўстаноўку \'reproject\' для слоя ${layerName}. Гэтая ўстаноўка зьяўляецца састарэлай: яна выкарыстоўвалася для падтрымкі паказу зьвестак на камэрцыйных базавых мапах, але гэта функцыя цяпер рэалізаваная ў убудаванай падтрымцы сфэрычнай праекцыі Мэркатара. Дадатковая інфармацыя ёсьць на http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Гэты мэтад састарэлы і будзе выдалены ў вэрсіі 3.0. Калі ласка, замест яго выкарыстоўвайце ${newMethod}."});OpenLayers.Lang["cs-CZ"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Nezpracovaná návratová hodnota ${statusText}",'Permalink':"Trvalý odkaz",'Overlays':"Překryvné vrstvy",'Base Layer':"Podkladové vrstvy",'noFID':"Nelze aktualizovat prvek, pro který neexistuje FID.",'browserNotSupported':"Váš prohlížeč nepodporuje vykreslování vektorů. Momentálně podporované nástroje jsou::\n${renderers}",'minZoomLevelError':"Vlastnost minZoomLevel by se měla používat pouze s potomky FixedZoomLevels vrstvami. To znamená, že vrstva wfs kontroluje, zda-li minZoomLevel není zbytek z minulosti.Nelze to ovšem vyjmout bez možnosti, že bychom rozbili aplikace postavené na OL, které by na tom mohly záviset. Proto tuto vlastnost nedoporučujeme používat -- kontrola minZoomLevel bude odstraněna ve verzi 3.0. Použijte prosím raději nastavení min/max podle příkaldu popsaného na: http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"WFS Transaction: ÚSPĚCH ${response}",'commitFailed':"WFS Transaction: CHYBA ${response}",'googleWarning':"Nepodařilo se správně načíst vrstvu Google.\x3cbr\x3e\x3cbr\x3eAbyste se zbavili této zprávy, zvolte jinou základní vrstvu v přepínači vrstev.\x3cbr\x3e\x3cbr\x3eTo se většinou stává, pokud nebyl načten skript, nebo neobsahuje správný klíč pro API pro tuto stránku.\x3cbr\x3e\x3cbr\x3eVývojáři: Pro pomoc, aby tohle fungovalo , \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklikněte sem\x3c/a\x3e",'getLayerWarning':"The ${layerType} Layer was unable to load correctly.\x3cbr\x3e\x3cbr\x3eTo get rid of this message, select a new BaseLayer in the layer switcher in the upper-right corner.\x3cbr\x3e\x3cbr\x3eMost likely, this is because the ${layerLib} library script was either not correctly included.\x3cbr\x3e\x3cbr\x3eDevelopers: For help getting this working correctly, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclick here\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Měřítko = 1 : ${scaleDenom}",'reprojectDeprecated':"Použil jste volbu \'reproject\' ve vrstvě ${layerName}. Tato volba není doporučená: byla zde proto, aby bylo možno zobrazovat data z okomerčních serverů, ale tato funkce je nyní zajištěna pomocí podpory Spherical Mercator. Více informací naleznete na http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Tato metoda je zavržená a bude ve verzi 3.0 odstraněna. Prosím, použijte raději ${newMethod}."});OpenLayers.Lang["br"]=OpenLayers.Util.applyDefaults({'unhandledRequest':"Distro evel reked anveret ${statusText}",'Permalink':"Peurliamm",'Overlays':"Gwiskadoù",'Base Layer':"Gwiskad diazez",'noFID':"N\'haller ket hizivaat un elfenn ma n\'eus ket a niverenn-anaout (FID) eviti.",'browserNotSupported':"N\'eo ket skoret an daskor vektorel gant ho merdeer. Setu aze an daskorerioù skoret evit ar poent :\n${renderers}",'minZoomLevelError':"Ne zleer implijout ar perzh minZoomLevel nemet evit gwiskadoù FixedZoomLevels-descendent. Ar fed ma wiria ar gwiskad WHS-se hag-eñ ez eus eus minZoomLevel zo un aspadenn gozh. Koulskoude n\'omp ket evit e ziverkañ kuit da derriñ arloadoù diazezet war OL a c\'hallfe bezañ stag outañ. Setu perak eo dispredet -- Lamet kuit e vo ar gwiriañ minZoomLevel a-is er stumm 3.0. Ober gant an arventennoù bihanañ/brasañ evel deskrivet amañ e plas : http://trac.openlayers.org/wiki/SettingZoomLevels",'commitSuccess':"Treuzgread WFS : MAT EO ${response}",'commitFailed':"Treuzgread WFS Transaction: C\'HWITET ${response}",'googleWarning':"N\'eus ket bet gallet kargañ ar gwiskad Google ent reizh.\x3cbr\x3e\x3cbr\x3eEvit en em zizober eus ar c\'hemenn-mañ, dibabit ur BaseLayer nevez en diuzer gwiskadoù er c\'horn dehoù el laez.\x3cbr\x3e\x3cbr\x3eSur a-walc\'h eo peogwir n\'eo ket bet ensoc\'het levraoueg Google Maps pe neuze ne glot ket an alc\'hwez API gant ho lec\'hienn.\x3cbr\x3e\x3cbr\x3eDiorroerien : Evit reizhañ an dra-se, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclick here\x3c/a\x3e",'getLayerWarning':"N\'haller ket kargañ ar gwiskad ${layerType} ent reizh.\x3cbr\x3e\x3cbr\x3eEvit en em zizober eus ar c\'hemenn-mañ, dibabit ur BaseLayer nevez en diuzer gwiskadoù er c\'horn dehoù el laez.\x3cbr\x3e\x3cbr\x3eSur a-walc\'h eo peogwir n\'eo ket bet ensoc\'het mat al levraoueg ${layerLib}.\x3cbr\x3e\x3cbr\x3eDiorroerien : Evit gouzout penaos reizhañ an dra-se, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclick here\x3c/a\x3e",'Scale = 1 : ${scaleDenom}':"Skeul = 1 : ${scaleDenom}",'W':"K",'E':"R",'N':"N",'S':"S",'reprojectDeprecated':"Emaoc\'h oc\'h implijout an dibarzh \'reproject\' war ar gwiskad ${layerName}. Dispredet eo an dibarzh-mañ : bet eo hag e talveze da ziskwel roadennoù war-c\'horre kartennoù diazez kenwerzhel, un dra hag a c\'haller ober bremañ gant an arc\'hwel dre skor banndres boullek Mercator. Muioc\'h a ditouroù a c\'haller da gaout war http://trac.openlayers.org/wiki/SphericalMercator.",'methodDeprecated':"Dispredet eo an daore-se ha tennet e vo kuit eus ar stumm 3.0. Grit gant ${newMethod} e plas."});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,containerCenter:null,pinchOrigin:null,currentCenter:null,autoActivate:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions);},activate:function(){var activated=OpenLayers.Control.prototype.activate.apply(this,arguments);if(activated){this.map.events.on({moveend:this.updateContainerCenter,scope:this});this.updateContainerCenter();} +return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.apply(this,arguments);if(this.map&&this.map.events){this.map.events.un({moveend:this.updateContainerCenter,scope:this});} +return deactivated;},updateContainerCenter:function(){var container=this.map.layerContainerDiv;this.containerCenter={x:parseInt(container.style.left,10)+50,y:parseInt(container.style.top,10)+50};},pinchStart:function(evt,pinchData){this.pinchOrigin=evt.xy;this.currentCenter=evt.xy;},pinchMove:function(evt,pinchData){var scale=pinchData.scale;var containerCenter=this.containerCenter;var pinchOrigin=this.pinchOrigin;var current=evt.xy;var dx=Math.round((current.x-pinchOrigin.x)+(scale-1)*(containerCenter.x-pinchOrigin.x));var dy=Math.round((current.y-pinchOrigin.y)+(scale-1)*(containerCenter.y-pinchOrigin.y));this.applyTransform("translate("+dx+"px, "+dy+"px) scale("+scale+")");this.currentCenter=current;},applyTransform:function(transform){var style=this.map.layerContainerDiv.style;style['-webkit-transform']=transform;style['-moz-transform']=transform;},pinchDone:function(evt,start,last){this.applyTransform("");var zoom=this.map.getZoomForResolution(this.map.getResolution()/last.scale,true);if(zoom!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){var resolution=this.map.getResolutionForZoom(zoom);var location=this.map.getLonLatFromPixel(this.pinchOrigin);var zoomPixel=this.currentCenter;var size=this.map.getSize();location.lon+=resolution*((size.w/2)-zoomPixel.x);location.lat-=resolution*((size.h/2)-zoomPixel.y);this.map.div.clientWidth=this.map.div.clientWidth;this.map.setCenter(location,zoom);}},CLASS_NAME:"OpenLayers.Control.PinchZoom"});OpenLayers.Lang["io"]=OpenLayers.Util.applyDefaults({'Scale = 1 : ${scaleDenom}':"Skalo = 1 : ${scaleDenom}"});OpenLayers.Control.LayerSwitcher=OpenLayers.Class(OpenLayers.Control,{roundedCorner:false,roundedCornerColor:"darkblue",layerStates:null,layersDiv:null,baseLayersDiv:null,baseLayers:null,dataLbl:null,dataLayersDiv:null,dataLayers:null,minimizeDiv:null,maximizeDiv:null,ascending:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.layerStates=[];if(this.roundedCorner){OpenLayers.Console.warn('roundedCorner option is deprecated');}},destroy:function(){this.clearLayersArray("base");this.clearLayersArray("data");this.map.events.un({buttonclick:this.onButtonClick,addlayer:this.redraw,changelayer:this.redraw,removelayer:this.redraw,changebaselayer:this.redraw,scope:this});this.events.unregister("buttonclick",this,this.onButtonClick);OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.on({addlayer:this.redraw,changelayer:this.redraw,removelayer:this.redraw,changebaselayer:this.redraw,scope:this});if(this.outsideViewport){this.events.attachToElement(this.div);this.events.register("buttonclick",this,this.onButtonClick);}else{this.map.events.register("buttonclick",this,this.onButtonClick);}},draw:function(){OpenLayers.Control.prototype.draw.apply(this);this.loadContents();if(!this.outsideViewport){this.minimizeControl();} +this.redraw();return this.div;},onButtonClick:function(evt){var button=evt.buttonElement;if(button===this.minimizeDiv){this.minimizeControl();}else if(button===this.maximizeDiv){this.maximizeControl();}else if(button._layerSwitcher===this.id){if(button["for"]){button=document.getElementById(button["for"]);} +if(!button.disabled){if(button.type=="radio"){button.checked=true;this.map.setBaseLayer(this.map.getLayer(button._layer));}else{button.checked=!button.checked;this.updateMap();}}}},clearLayersArray:function(layersType){this[layersType+"LayersDiv"].innerHTML="";this[layersType+"Layers"]=[];},checkRedraw:function(){var redraw=false;if(!this.layerStates.length||(this.map.layers.length!=this.layerStates.length)){redraw=true;}else{for(var i=0,len=this.layerStates.length;i<len;i++){var layerState=this.layerStates[i];var layer=this.map.layers[i];if((layerState.name!=layer.name)||(layerState.inRange!=layer.inRange)||(layerState.id!=layer.id)||(layerState.visibility!=layer.visibility)){redraw=true;break;}}} return redraw;},redraw:function(){if(!this.checkRedraw()){return this.div;} this.clearLayersArray("base");this.clearLayersArray("data");var containsOverlays=false;var containsBaseLayers=false;var len=this.map.layers.length;this.layerStates=new Array(len);for(var i=0;i<len;i++){var layer=this.map.layers[i];this.layerStates[i]={'name':layer.name,'visibility':layer.visibility,'inRange':layer.inRange,'id':layer.id};} var layers=this.map.layers.slice();if(!this.ascending){layers.reverse();} for(var i=0,len=layers.length;i<len;i++){var layer=layers[i];var baseLayer=layer.isBaseLayer;if(layer.displayInLayerSwitcher){if(baseLayer){containsBaseLayers=true;}else{containsOverlays=true;} -var checked=(baseLayer)?(layer==this.map.baseLayer):layer.getVisibility();var inputElem=document.createElement("input");inputElem.id=this.id+"_input_"+layer.name;inputElem.name=(baseLayer)?this.id+"_baseLayers":layer.name;inputElem.type=(baseLayer)?"radio":"checkbox";inputElem.value=layer.name;inputElem.checked=checked;inputElem.defaultChecked=checked;if(!baseLayer&&!layer.inRange){inputElem.disabled=true;} -var context={'inputElem':inputElem,'layer':layer,'layerSwitcher':this};OpenLayers.Event.observe(inputElem,"mouseup",OpenLayers.Function.bindAsEventListener(this.onInputClick,context));var labelSpan=document.createElement("span");OpenLayers.Element.addClass(labelSpan,"labelSpan");if(!baseLayer&&!layer.inRange){labelSpan.style.color="gray";} -labelSpan.innerHTML=layer.name;labelSpan.style.verticalAlign=(baseLayer)?"bottom":"baseline";OpenLayers.Event.observe(labelSpan,"click",OpenLayers.Function.bindAsEventListener(this.onInputClick,context));var br=document.createElement("br");var groupArray=(baseLayer)?this.baseLayers:this.dataLayers;groupArray.push({'layer':layer,'inputElem':inputElem,'labelSpan':labelSpan});var groupDiv=(baseLayer)?this.baseLayersDiv:this.dataLayersDiv;groupDiv.appendChild(inputElem);groupDiv.appendChild(labelSpan);groupDiv.appendChild(br);}} -this.dataLbl.style.display=(containsOverlays)?"":"none";this.baseLbl.style.display=(containsBaseLayers)?"":"none";return this.div;},onInputClick:function(e){if(!this.inputElem.disabled){if(this.inputElem.type=="radio"){this.inputElem.checked=true;this.layer.map.setBaseLayer(this.layer);}else{this.inputElem.checked=!this.inputElem.checked;this.layerSwitcher.updateMap();}} -OpenLayers.Event.stop(e);},onLayerClick:function(e){this.updateMap();},updateMap:function(){for(var i=0,len=this.baseLayers.length;i<len;i++){var layerEntry=this.baseLayers[i];if(layerEntry.inputElem.checked){this.map.setBaseLayer(layerEntry.layer,false);}} -for(var i=0,len=this.dataLayers.length;i<len;i++){var layerEntry=this.dataLayers[i];layerEntry.layer.setVisibility(layerEntry.inputElem.checked);}},maximizeControl:function(e){this.div.style.width="";this.div.style.height="";this.showControls(false);if(e!=null){OpenLayers.Event.stop(e);}},minimizeControl:function(e){this.div.style.width="0px";this.div.style.height="0px";this.showControls(true);if(e!=null){OpenLayers.Event.stop(e);}},showControls:function(minimize){this.maximizeDiv.style.display=minimize?"":"none";this.minimizeDiv.style.display=minimize?"none":"";this.layersDiv.style.display=minimize?"none":"";},loadContents:function(){OpenLayers.Event.observe(this.div,"mouseup",OpenLayers.Function.bindAsEventListener(this.mouseUp,this));OpenLayers.Event.observe(this.div,"click",this.ignoreEvent);OpenLayers.Event.observe(this.div,"mousedown",OpenLayers.Function.bindAsEventListener(this.mouseDown,this));OpenLayers.Event.observe(this.div,"dblclick",this.ignoreEvent);this.layersDiv=document.createElement("div");this.layersDiv.id=this.id+"_layersDiv";OpenLayers.Element.addClass(this.layersDiv,"layersDiv");this.baseLbl=document.createElement("div");this.baseLbl.innerHTML=OpenLayers.i18n("Base Layer");OpenLayers.Element.addClass(this.baseLbl,"baseLbl");this.baseLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.baseLayersDiv,"baseLayersDiv");this.dataLbl=document.createElement("div");this.dataLbl.innerHTML=OpenLayers.i18n("Overlays");OpenLayers.Element.addClass(this.dataLbl,"dataLbl");this.dataLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.dataLayersDiv,"dataLayersDiv");if(this.ascending){this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);}else{this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);} +var checked=(baseLayer)?(layer==this.map.baseLayer):layer.getVisibility();var inputElem=document.createElement("input");inputElem.id=this.id+"_input_"+layer.name;inputElem.name=(baseLayer)?this.id+"_baseLayers":layer.name;inputElem.type=(baseLayer)?"radio":"checkbox";inputElem.value=layer.name;inputElem.checked=checked;inputElem.defaultChecked=checked;inputElem.className="olButton";inputElem._layer=layer.id;inputElem._layerSwitcher=this.id;if(!baseLayer&&!layer.inRange){inputElem.disabled=true;} +var labelSpan=document.createElement("label");labelSpan["for"]=inputElem.id;OpenLayers.Element.addClass(labelSpan,"labelSpan olButton");labelSpan._layer=layer.id;labelSpan._layerSwitcher=this.id;if(!baseLayer&&!layer.inRange){labelSpan.style.color="gray";} +labelSpan.innerHTML=layer.name;labelSpan.style.verticalAlign=(baseLayer)?"bottom":"baseline";var br=document.createElement("br");var groupArray=(baseLayer)?this.baseLayers:this.dataLayers;groupArray.push({'layer':layer,'inputElem':inputElem,'labelSpan':labelSpan});var groupDiv=(baseLayer)?this.baseLayersDiv:this.dataLayersDiv;groupDiv.appendChild(inputElem);groupDiv.appendChild(labelSpan);groupDiv.appendChild(br);}} +this.dataLbl.style.display=(containsOverlays)?"":"none";this.baseLbl.style.display=(containsBaseLayers)?"":"none";return this.div;},updateMap:function(){for(var i=0,len=this.baseLayers.length;i<len;i++){var layerEntry=this.baseLayers[i];if(layerEntry.inputElem.checked){this.map.setBaseLayer(layerEntry.layer,false);}} +for(var i=0,len=this.dataLayers.length;i<len;i++){var layerEntry=this.dataLayers[i];layerEntry.layer.setVisibility(layerEntry.inputElem.checked);}},maximizeControl:function(e){this.div.style.width="";this.div.style.height="";this.showControls(false);if(e!=null){OpenLayers.Event.stop(e);}},minimizeControl:function(e){this.div.style.width="0px";this.div.style.height="0px";this.showControls(true);if(e!=null){OpenLayers.Event.stop(e);}},showControls:function(minimize){this.maximizeDiv.style.display=minimize?"":"none";this.minimizeDiv.style.display=minimize?"none":"";this.layersDiv.style.display=minimize?"none":"";},loadContents:function(){this.layersDiv=document.createElement("div");this.layersDiv.id=this.id+"_layersDiv";OpenLayers.Element.addClass(this.layersDiv,"layersDiv");this.baseLbl=document.createElement("div");this.baseLbl.innerHTML=OpenLayers.i18n("Base Layer");OpenLayers.Element.addClass(this.baseLbl,"baseLbl");this.baseLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.baseLayersDiv,"baseLayersDiv");this.dataLbl=document.createElement("div");this.dataLbl.innerHTML=OpenLayers.i18n("Overlays");OpenLayers.Element.addClass(this.dataLbl,"dataLbl");this.dataLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.dataLayersDiv,"dataLayersDiv");if(this.ascending){this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);}else{this.layersDiv.appendChild(this.dataLbl);this.layersDiv.appendChild(this.dataLayersDiv);this.layersDiv.appendChild(this.baseLbl);this.layersDiv.appendChild(this.baseLayersDiv);} this.div.appendChild(this.layersDiv);if(this.roundedCorner){OpenLayers.Rico.Corner.round(this.div,{corners:"tl bl",bgColor:"transparent",color:this.roundedCornerColor,blend:false});OpenLayers.Rico.Corner.changeOpacity(this.layersDiv,0.75);} -var sz=new OpenLayers.Size(18,18);var img=OpenLayers.Util.getImageLocation('layer-switcher-maximize.png');this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MaximizeDiv",null,sz,img,"absolute");OpenLayers.Element.addClass(this.maximizeDiv,"maximizeDiv");this.maximizeDiv.style.display="none";OpenLayers.Event.observe(this.maximizeDiv,"click",OpenLayers.Function.bindAsEventListener(this.maximizeControl,this));this.div.appendChild(this.maximizeDiv);var img=OpenLayers.Util.getImageLocation('layer-switcher-minimize.png');var sz=new OpenLayers.Size(18,18);this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MinimizeDiv",null,sz,img,"absolute");OpenLayers.Element.addClass(this.minimizeDiv,"minimizeDiv");this.minimizeDiv.style.display="none";OpenLayers.Event.observe(this.minimizeDiv,"click",OpenLayers.Function.bindAsEventListener(this.minimizeControl,this));this.div.appendChild(this.minimizeDiv);},ignoreEvent:function(evt){OpenLayers.Event.stop(evt);},mouseDown:function(evt){this.isMouseDown=true;this.ignoreEvent(evt);},mouseUp:function(evt){if(this.isMouseDown){this.isMouseDown=false;this.ignoreEvent(evt);}},CLASS_NAME:"OpenLayers.Control.LayerSwitcher"});OpenLayers.Lang["el"]=OpenLayers.Util.applyDefaults({'Scale = 1 : ${scaleDenom}':"Κλίμακα ~ 1 : ${scaleDenom}"});OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(url){url=url||window.location.href;var parameters=OpenLayers.Util.getParameters(url);var index=url.indexOf('#');if(index>0){url='?'+url.substring(index+1,url.length);OpenLayers.Util.extend(parameters,OpenLayers.Util.getParameters(url));} +var img=OpenLayers.Util.getImageLocation('layer-switcher-maximize.png');this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MaximizeDiv",null,null,img,"absolute");OpenLayers.Element.addClass(this.maximizeDiv,"maximizeDiv olButton");this.maximizeDiv.style.display="none";this.div.appendChild(this.maximizeDiv);var img=OpenLayers.Util.getImageLocation('layer-switcher-minimize.png');this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MinimizeDiv",null,null,img,"absolute");OpenLayers.Element.addClass(this.minimizeDiv,"minimizeDiv olButton");this.minimizeDiv.style.display="none";this.div.appendChild(this.minimizeDiv);},CLASS_NAME:"OpenLayers.Control.LayerSwitcher"});OpenLayers.Lang["el"]=OpenLayers.Util.applyDefaults({'Scale = 1 : ${scaleDenom}':"Κλίμακα ~ 1 : ${scaleDenom}"});OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(url){url=url||window.location.href;var parameters=OpenLayers.Util.getParameters(url);var index=url.indexOf('#');if(index>0){url='?'+url.substring(index+1,url.length);OpenLayers.Util.extend(parameters,OpenLayers.Util.getParameters(url));} return parameters;},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0,len=this.map.controls.length;i<len;i++){var control=this.map.controls[i];if((control!=this)&&(control.CLASS_NAME=="OpenLayers.Control.ArgParser")){if(control.displayProjection!=this.displayProjection){this.displayProjection=control.displayProjection;} break;}} if(i==this.map.controls.length){var args=this.getParameters();if(args.layers){this.layers=args.layers;this.map.events.register('addlayer',this,this.configureLayers);this.configureLayers();} -if(args.lat&&args.lon){this.center=new OpenLayers.LonLat(parseFloat(args.lon),parseFloat(args.lat));if(args.zoom){this.zoom=parseInt(args.zoom);} +if(args.lat&&args.lon){this.center=new OpenLayers.LonLat(parseFloat(args.lon),parseFloat(args.lat));if(args.zoom){this.zoom=parseFloat(args.zoom);} this.map.events.register('changebaselayer',this,this.setCenter);this.setCenter();}}},setCenter:function(){if(this.map.baseLayer){this.map.events.unregister('changebaselayer',this,this.setCenter);if(this.displayProjection){this.center.transform(this.displayProjection,this.map.getProjectionObject());} this.map.setCenter(this.center,this.zoom);}},configureLayers:function(){if(this.layers.length==this.map.layers.length){this.map.events.unregister('addlayer',this,this.configureLayers);for(var i=0,len=this.layers.length;i<len;i++){var layer=this.map.layers[i];var c=this.layers.charAt(i);if(c=="B"){this.map.setBaseLayer(layer);}else if((c=="T")||(c=="F")){layer.setVisibility(c=="T");}}}},CLASS_NAME:"OpenLayers.Control.ArgParser"}); \ No newline at end of file diff --git a/vendor/assets/openlayers/OpenStreetMap.js b/vendor/assets/openlayers/OpenStreetMap.js index 20588e2a0..b6479a700 100644 --- a/vendor/assets/openlayers/OpenStreetMap.js +++ b/vendor/assets/openlayers/OpenStreetMap.js @@ -1,33 +1,3 @@ -/** - * Namespace: Util.OSM - */ -OpenLayers.Util.OSM = {}; - -/** - * Constant: MISSING_TILE_URL - * {String} URL of image to display for missing tiles - */ -OpenLayers.Util.OSM.MISSING_TILE_URL = OpenLayers.Util.getImagesLocation() + "404.png"; - -/** - * Property: originalOnImageLoadError - * {Function} Original onImageLoadError function. - */ -OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError; - -/** - * Function: onImageLoadError - */ -OpenLayers.Util.onImageLoadError = function() { - if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) { - this.src = OpenLayers.Util.OSM.MISSING_TILE_URL; - } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) { - // do nothing - this layer is transparent - } else { - OpenLayers.Util.OSM.originalOnImageLoadError; - } -}; - /** * Class: OpenLayers.Layer.OSM.Mapnik * @@ -60,38 +30,6 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { CLASS_NAME: "OpenLayers.Layer.OSM.Mapnik" }); -/** - * Class: OpenLayers.Layer.OSM.Osmarender - * - * Inherits from: - * - <OpenLayers.Layer.OSM> - */ -OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { - /** - * Constructor: OpenLayers.Layer.OSM.Osmarender - * - * Parameters: - * name - {String} - * options - {Object} Hashtable of extra options to tag onto the layer - */ - initialize: function(name, options) { - var url = [ - "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png" - ]; - options = OpenLayers.Util.extend({ - numZoomLevels: 18, - buffer: 0, - transitionEffect: "resize" - }, options); - var newArguments = [name, url, options]; - OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); - }, - - CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender" -}); - /** * Class: OpenLayers.Layer.OSM.CycleMap * diff --git a/vendor/assets/openlayers/theme/default/google.tidy.css b/vendor/assets/openlayers/theme/default/google.tidy.css deleted file mode 100644 index 4ba0cd845..000000000 --- a/vendor/assets/openlayers/theme/default/google.tidy.css +++ /dev/null @@ -1 +0,0 @@ -.olLayerGoogleCopyright{right:3px;bottom:2px;left:auto;}.olLayerGoogleV3.olLayerGoogleCopyright{bottom:0;right:0!important;}.olLayerGooglePoweredBy{left:2px;bottom:2px;}.olLayerGoogleV3.olLayerGooglePoweredBy{bottom:0!important;} \ No newline at end of file diff --git a/vendor/assets/openlayers/theme/default/ie6-style.tidy.css b/vendor/assets/openlayers/theme/default/ie6-style.tidy.css deleted file mode 100644 index 7a23bbc78..000000000 --- a/vendor/assets/openlayers/theme/default/ie6-style.tidy.css +++ /dev/null @@ -1 +0,0 @@ -.olControlZoomPanel div{background-image:url(img/zoom-panel-NOALPHA.png);}.olControlPanPanel div{background-image:url(img/pan-panel-NOALPHA.png);}.olControlEditingToolbar{width:200px;} \ No newline at end of file diff --git a/vendor/assets/openlayers/theme/default/style.css b/vendor/assets/openlayers/theme/default/style.css index 3aeac29c2..8e0abb70f 100644 --- a/vendor/assets/openlayers/theme/default/style.css +++ b/vendor/assets/openlayers/theme/default/style.css @@ -23,16 +23,16 @@ div.olLayerDiv { } .olLayerGooglePoweredBy { left: 2px; - bottom: 15px; + bottom: 15px; } .olLayerGoogleV3.olLayerGooglePoweredBy { bottom: 15px !important; } .olControlAttribution { - font-size: smaller; - right: 3px; - bottom: 4.5em; - position: absolute; + font-size: smaller; + right: 3px; + bottom: 4.5em; + position: absolute; display: block; } .olControlScale { @@ -67,10 +67,10 @@ div.olLayerDiv { display: block; position: absolute; font-size: smaller; -} +} div.olControlMousePosition { - bottom: 0em; + bottom: 0; right: 3px; display: block; position: absolute; @@ -90,13 +90,10 @@ div.olControlMousePosition { -moz-border-radius: 1em 0 0 0; } -.olControlOverviewMapMinimizeButton { - right: 0; - bottom: 80px; - cursor: pointer; -} - +.olControlOverviewMapMinimizeButton, .olControlOverviewMapMaximizeButton { + height: 18px; + width: 18px; right: 0; bottom: 80px; cursor: pointer; @@ -136,7 +133,7 @@ div.olControlMousePosition { .olPopupContent { padding:5px; overflow: auto; -} +} .olControlNavigationHistory { background-image: url("img/navigation_history.png"); @@ -145,25 +142,25 @@ div.olControlMousePosition { height: 24px; } -.olControlNavigationHistoryPreviousItemActive { +.olControlNavigationHistoryPreviousItemActive { background-position: 0 0; } -.olControlNavigationHistoryPreviousItemInactive { +.olControlNavigationHistoryPreviousItemInactive { background-position: 0 -24px; } -.olControlNavigationHistoryNextItemActive { +.olControlNavigationHistoryNextItemActive { background-position: -24px 0; } -.olControlNavigationHistoryNextItemInactive { +.olControlNavigationHistoryNextItemInactive { background-position: -24px -24px; } -div.olControlSaveFeaturesItemActive { +div.olControlSaveFeaturesItemActive { background-image: url(img/save_features_on.png); background-repeat: no-repeat; background-position: 0 1px; } -div.olControlSaveFeaturesItemInactive { +div.olControlSaveFeaturesItemInactive { background-image: url(img/save_features_off.png); background-repeat: no-repeat; background-position: 0 1px; @@ -184,12 +181,12 @@ div.olControlSaveFeaturesItemInactive { opacity: 0.50; font-size: 1px; filter: alpha(opacity=50); -} +} .olControlPanPanel { top: 10px; left: 5px; -} +} .olControlPanPanel div { background-image: url(img/pan-panel.png); @@ -224,7 +221,7 @@ div.olControlSaveFeaturesItemInactive { .olControlZoomPanel { top: 71px; left: 14px; -} +} .olControlZoomPanel div { background-image: url(img/zoom-panel.png); @@ -252,9 +249,9 @@ div.olControlSaveFeaturesItemInactive { background-position: 0 18px; } -/* +/* * When a potential text is bigger than the image it move the image - * with some headers (closes #3154) + * with some headers (closes #3154) */ .olControlPanZoomBar div { font-size: 1px; @@ -323,10 +320,8 @@ div.olControlSaveFeaturesItemInactive { padding-top: 5px; padding-left: 10px; padding-bottom: 5px; - padding-right: 75px; + padding-right: 10px; background-color: darkblue; - width: 100%; - height: 100%; } .olControlLayerSwitcher .layersDiv .baseLbl, @@ -343,6 +338,8 @@ div.olControlSaveFeaturesItemInactive { .olControlLayerSwitcher .maximizeDiv, .olControlLayerSwitcher .minimizeDiv { + width: 18px; + height: 18px; top: 5px; right: 0; cursor: pointer; @@ -431,3 +428,57 @@ span.olGoogleAttribution.hybrid a, span.olGoogleAttribution.satellite a { .olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { background-position: -26px -24px; } + +div.olControlZoom { + position: absolute; + top: 8px; + left: 8px; + background: rgba(255,255,255,0.4); + border-radius: 4px; + padding: 2px; +} +div.olControlZoom a { + display: block; + margin: 1px; + padding: 0; + color: white; + font-size: 18px; + font-family: 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif; + font-weight: bold; + text-decoration: none; + text-align: center; + height: 22px; + width:22px; + line-height: 19px; + background: #130085; /* fallback for IE - IE6 requires background shorthand*/ + background: rgba(0, 60, 136, 0.5); + filter: alpha(opacity=80); +} +div.olControlZoom a:hover { + background: #130085; /* fallback for IE */ + background: rgba(0, 60, 136, 0.7); + filter: alpha(opacity=100); +} +@media only screen and (max-width: 600px) { + div.olControlZoom a:hover { + background: rgba(0, 60, 136, 0.5); + } +} +a.olControlZoomIn { + border-radius: 4px 4px 0 0; +} +a.olControlZoomOut { + border-radius: 0 0 4px 4px; +} + + +/** + * Animations + */ + +.olLayerGrid .olTileImage { + -webkit-transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; +} diff --git a/vendor/assets/openlayers/theme/default/style.mobile.css b/vendor/assets/openlayers/theme/default/style.mobile.css new file mode 100644 index 000000000..2d4d39257 --- /dev/null +++ b/vendor/assets/openlayers/theme/default/style.mobile.css @@ -0,0 +1,63 @@ +div.olControlZoom { + position: absolute; + top: 8px; + left: 8px; + background: rgba(255,255,255,0.4); + border-radius: 4px; + padding: 2px; +} +* { + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} +div.olControlZoom a { + display: block; + margin: 1px; + padding: 0; + color: white; + font-size: 28px; + font-family: sans-serif; + font-weight: bold; + text-decoration: none; + text-align: center; + height: 32px; + width: 32px; + line-height: 28px; + text-shadow: 0 0 3px rgba(0,0,0,0.8); + background: #130085; /* fallback for IE - IE6 requires background shorthand*/ + background: rgba(0, 60, 136, 0.5); + filter: alpha(opacity=80); +} +a.olControlZoomIn { + border-radius: 4px 4px 0 0; +} +a.olControlZoomOut { + border-radius: 0 0 4px 4px; +} +div.olControlZoom a:hover { + background: #130085; /* fallback for IE */ + background: rgba(0, 60, 136, 0.7); + filter: alpha(opacity=100); +} +@media only screen and (max-width: 600px) { + div.olControlZoom a:hover { + background: rgba(0, 60, 136, 0.5); + } +} +.olLayerGrid .olTileImage { + -webkit-transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; +} +/* Enable 3d acceleration when operating on tiles, this is + known to yield better performance on IOS Safari. + http://osgeo-org.1803224.n2.nabble.com/Harware-accelerated-CSS3-animations-for-iOS-td6255560.html + + It also prevents tile blinking effects in iOS 5. + See https://github.com/openlayers/openlayers/issues/511 +*/ +@media (-webkit-transform-3d) { +img.olTileImage { + -webkit-transform: translate3d(0, 0, 0); +} +} diff --git a/vendor/assets/openlayers/theme/default/style.tidy.css b/vendor/assets/openlayers/theme/default/style.tidy.css deleted file mode 100644 index b3a73b3fc..000000000 --- a/vendor/assets/openlayers/theme/default/style.tidy.css +++ /dev/null @@ -1 +0,0 @@ -div.olMap{z-index:0;cursor:default;margin:0!important;padding:0!important;}div.olMapViewport{text-align:left;}.olLayerGoogleCopyright{left:2px;bottom:2px;}.olLayerGoogleV3.olLayerGoogleCopyright{right:auto!important;}.olLayerGooglePoweredBy{left:2px;bottom:15px;}.olLayerGoogleV3.olLayerGooglePoweredBy{bottom:15px!important;}.olControlAttribution{font-size:smaller;right:3px;bottom:4.5em;position:absolute;display:block;}.olControlScale{right:3px;bottom:3em;display:block;position:absolute;font-size:smaller;}.olControlScaleLine{display:block;position:absolute;left:10px;bottom:15px;font-size:xx-small;}.olControlScaleLineBottom{border:solid 2px #000;border-bottom:none;margin-top:-2px;text-align:center;}.olControlScaleLineTop{border:solid 2px #000;border-top:none;text-align:center;}.olControlPermalink{right:3px;bottom:1.5em;display:block;position:absolute;font-size:smaller;}div.olControlMousePosition{bottom:0;right:3px;display:block;position:absolute;font-family:Arial;font-size:smaller;}.olControlOverviewMapContainer{position:absolute;bottom:0;right:0;}.olControlOverviewMapElement{background-color:#00008B;-moz-border-radius:1em 0 0;padding:10px 18px 10px 10px;}.olControlOverviewMapExtentRectangle{overflow:hidden;background-image:url(img/blank.gif);cursor:move;border:2px dotted red;}.olControlOverviewMapRectReplacement{overflow:hidden;cursor:move;background-image:url(img/overview_replacement.gif);background-repeat:no-repeat;background-position:center;}.olLayerGeoRSSDescription{float:left;width:100%;overflow:auto;font-size:1em;}.olLayerGeoRSSClose{float:right;color:gray;font-size:1.2em;margin-right:6px;font-family:sans-serif;}.olLayerGeoRSSTitle{float:left;font-size:1.2em;}.olControlNavigationHistory{background-image:url(img/navigation_history.png);background-repeat:no-repeat;width:24px;height:24px;}.olControlNavigationHistoryPreviousItemActive{background-position:0 0;}.olControlNavigationHistoryPreviousItemInactive{background-position:0 -24px;}.olControlNavigationHistoryNextItemActive{background-position:-24px 0;}.olControlNavigationHistoryNextItemInactive{background-position:-24px -24px;}div.olControlSaveFeaturesItemActive{background-image:url(img/save_features_on.png);background-repeat:no-repeat;background-position:0 1px;}div.olControlSaveFeaturesItemInactive{background-image:url(img/save_features_off.png);background-repeat:no-repeat;background-position:0 1px;}.olHandlerBoxZoomBox{border:2px solid red;position:absolute;background-color:#FFF;opacity:.5;font-size:1px;filter:alpha(opacity=50);}.olHandlerBoxSelectFeature{border:2px solid blue;position:absolute;background-color:#FFF;opacity:.5;font-size:1px;filter:alpha(opacity=50);}.olControlPanPanel{top:10px;left:5px;}.olControlPanPanel div{background-image:url(img/pan-panel.png);height:18px;width:18px;cursor:pointer;position:absolute;}.olControlPanPanel .olControlPanNorthItemInactive{top:0;left:9px;background-position:0 0;}.olControlPanPanel .olControlPanSouthItemInactive{top:36px;left:9px;background-position:18px 0;}.olControlPanPanel .olControlPanWestItemInactive{position:absolute;top:18px;left:0;background-position:0 18px;}.olControlPanPanel .olControlPanEastItemInactive{top:18px;left:18px;background-position:18px 18px;}.olControlZoomPanel{top:71px;left:14px;}.olControlZoomPanel div{background-image:url(img/zoom-panel.png);position:absolute;height:18px;width:18px;cursor:pointer;}.olControlZoomPanel .olControlZoomInItemInactive{top:0;left:0;background-position:0 0;}.olControlZoomPanel .olControlZoomToMaxExtentItemInactive{top:18px;left:0;background-position:0 -18px;}.olControlZoomPanel .olControlZoomOutItemInactive{top:36px;left:0;background-position:0 18px;}.olControlPanZoomBar div{font-size:1px;}.olPopupCloseBox{background:url(img/close.gif) no-repeat;cursor:pointer;}.olImageLoadError{background-color:#FFC0CB;opacity:.5;filter:alpha(opacity=50);}.olCursorWait{cursor:wait;}.olDrawBox{cursor:crosshair;}.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown{cursor:0;}.olControlLayerSwitcher{position:absolute;top:25px;right:0;width:20em;font-family:sans-serif;font-weight:700;margin-top:3px;margin-left:3px;margin-bottom:3px;font-size:smaller;color:#FFF;background-color:transparent;}.olControlLayerSwitcher .layersDiv{background-color:#00008B;width:100%;height:100%;padding:5px 75px 5px 10px;}.olControlLayerSwitcher .layersDiv .baseLbl,.olControlLayerSwitcher .layersDiv .dataLbl{margin-top:3px;margin-left:3px;margin-bottom:3px;}.olControlLayerSwitcher .layersDiv .baseLayersDiv,.olControlLayerSwitcher .layersDiv .dataLayersDiv{padding-left:10px;}.olControlLayerSwitcher .maximizeDiv,.olControlLayerSwitcher .minimizeDiv{top:5px;right:0;cursor:pointer;}.olBingAttribution{color:#DDD;}span.olGoogleAttribution a{color:#77C;}.olControlNavToolbar,.olControlEditingToolbar{margin:5px 5px 0 0;}.olControlNavToolbar div,.olControlEditingToolbar div{background-image:url(img/editing_tool_bar.png);background-repeat:no-repeat;width:24px;height:22px;cursor:pointer;margin:0 0 5px 5px;}.olControlEditingToolbar{right:0;top:0;}.olControlNavToolbar{top:295px;left:9px;}.olControlEditingToolbar div{float:right;}.olControlNavToolbar .olControlNavigationItemInactive,.olControlEditingToolbar .olControlNavigationItemInactive{background-position:-103px -1px;}.olControlNavToolbar .olControlNavigationItemActive,.olControlEditingToolbar .olControlNavigationItemActive{background-position:-103px -24px;}.olControlNavToolbar .olControlZoomBoxItemInactive{background-position:-128px -1px;}.olControlNavToolbar .olControlZoomBoxItemActive{background-position:-128px -24px;}.olControlEditingToolbar .olControlDrawFeaturePointItemInactive{background-position:-77px -1px;}.olControlEditingToolbar .olControlDrawFeaturePointItemActive{background-position:-77px -24px;}.olControlEditingToolbar .olControlDrawFeaturePathItemInactive{background-position:-51px -1px;}.olControlEditingToolbar .olControlDrawFeaturePathItemActive{background-position:-51px -24px;}.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive{background-position:-26px -1px;}.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive{background-position:-26px -24px;}div.olLayerDiv,.olControlNoSelect{-khtml-user-select:none;-moz-user-select:none;}.olControlOverviewMapMinimizeButton,.olControlOverviewMapMaximizeButton{bottom:80px;cursor:pointer;right:0;}.olPopupContent,.olFramedCloudPopupContent{overflow:auto;padding:5px;}.olDragDown,.olControlDragFeatureOver{cursor:move;}.olBingAttribution.road,.olGoogleAttribution{color:#333;}.olGoogleAttribution.hybrid,.olGoogleAttribution.satellite,span.olGoogleAttribution.hybrid a,span.olGoogleAttribution.satellite a{color:#EEE;} \ No newline at end of file diff --git a/public/potlatch2/help/introduction.jpg b/vendor/assets/potlatch2/help/introduction.jpg similarity index 100% rename from public/potlatch2/help/introduction.jpg rename to vendor/assets/potlatch2/help/introduction.jpg diff --git a/public/potlatch2/help/introduction.mp4 b/vendor/assets/potlatch2/help/introduction.mp4 similarity index 100% rename from public/potlatch2/help/introduction.mp4 rename to vendor/assets/potlatch2/help/introduction.mp4 diff --git a/vendor/assets/potlatch2/potlatch2.swf b/vendor/assets/potlatch2/potlatch2.swf new file mode 100644 index 000000000..e9016633a Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2.swf differ diff --git a/public/potlatch2/FontLibrary.swf b/vendor/assets/potlatch2/potlatch2/FontLibrary.swf similarity index 100% rename from public/potlatch2/FontLibrary.swf rename to vendor/assets/potlatch2/potlatch2/FontLibrary.swf diff --git a/vendor/assets/potlatch2/potlatch2/assets.zip b/vendor/assets/potlatch2/potlatch2/assets.zip new file mode 100644 index 000000000..fdc97079d Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/assets.zip differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ar.swf b/vendor/assets/potlatch2/potlatch2/locales/ar.swf new file mode 100644 index 000000000..cf6ab00e1 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ar.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ast.swf b/vendor/assets/potlatch2/potlatch2/locales/ast.swf new file mode 100644 index 000000000..5cccfca9e Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ast.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf b/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf new file mode 100644 index 000000000..6019d2618 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/br.swf b/vendor/assets/potlatch2/potlatch2/locales/br.swf new file mode 100644 index 000000000..d592490cf Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/br.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ca.swf b/vendor/assets/potlatch2/potlatch2/locales/ca.swf new file mode 100644 index 000000000..356650820 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ca.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf b/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf new file mode 100644 index 000000000..cd26325b8 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/da.swf b/vendor/assets/potlatch2/potlatch2/locales/da.swf new file mode 100644 index 000000000..4a56c496b Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/da.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf new file mode 100644 index 000000000..b6a2cd83d Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/diq.swf b/vendor/assets/potlatch2/potlatch2/locales/diq.swf new file mode 100644 index 000000000..c299e46c2 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/diq.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/dsb.swf b/vendor/assets/potlatch2/potlatch2/locales/dsb.swf new file mode 100644 index 000000000..c3c6d6741 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/dsb.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/el.swf b/vendor/assets/potlatch2/potlatch2/locales/el.swf new file mode 100644 index 000000000..d7c603040 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/el.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf new file mode 100644 index 000000000..72a0296e9 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/en_US.swf b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf new file mode 100644 index 000000000..e84ca77ab Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf new file mode 100644 index 000000000..79bd1cc86 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/et.swf b/vendor/assets/potlatch2/potlatch2/locales/et.swf new file mode 100644 index 000000000..e8fb53e2a Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/et.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fa.swf b/vendor/assets/potlatch2/potlatch2/locales/fa.swf new file mode 100644 index 000000000..618a6509b Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/fa.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fi.swf b/vendor/assets/potlatch2/potlatch2/locales/fi.swf new file mode 100644 index 000000000..048515ed1 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/fi.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf new file mode 100644 index 000000000..c21eed422 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ga.swf b/vendor/assets/potlatch2/potlatch2/locales/ga.swf new file mode 100644 index 000000000..8e4c01084 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ga.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/gl.swf b/vendor/assets/potlatch2/potlatch2/locales/gl.swf new file mode 100644 index 000000000..1c5ab6f34 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/gl.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/he.swf b/vendor/assets/potlatch2/potlatch2/locales/he.swf new file mode 100644 index 000000000..8512604c1 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/he.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/hsb.swf b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf new file mode 100644 index 000000000..24bcfd7fd Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/hu.swf b/vendor/assets/potlatch2/potlatch2/locales/hu.swf new file mode 100644 index 000000000..a458940db Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/hu.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ia.swf b/vendor/assets/potlatch2/potlatch2/locales/ia.swf new file mode 100644 index 000000000..7647a27a7 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ia.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf b/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf new file mode 100644 index 000000000..a15b5ad63 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf new file mode 100644 index 000000000..6b72ef653 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ka.swf b/vendor/assets/potlatch2/potlatch2/locales/ka.swf new file mode 100644 index 000000000..26f8e6b6e Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ka.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ko.swf b/vendor/assets/potlatch2/potlatch2/locales/ko.swf new file mode 100644 index 000000000..7d09c1ac3 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ko.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lb.swf b/vendor/assets/potlatch2/potlatch2/locales/lb.swf new file mode 100644 index 000000000..c526193b1 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/lb.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lt.swf b/vendor/assets/potlatch2/potlatch2/locales/lt.swf new file mode 100644 index 000000000..6fb8688aa Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/lt.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lv.swf b/vendor/assets/potlatch2/potlatch2/locales/lv.swf new file mode 100644 index 000000000..2d53172cf Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/lv.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/mk.swf b/vendor/assets/potlatch2/potlatch2/locales/mk.swf new file mode 100644 index 000000000..4e84358a8 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/mk.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ms.swf b/vendor/assets/potlatch2/potlatch2/locales/ms.swf new file mode 100644 index 000000000..ef7fde7b0 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ms.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf new file mode 100644 index 000000000..b7304c3f8 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf new file mode 100644 index 000000000..82e6547e0 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf new file mode 100644 index 000000000..29d227682 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf new file mode 100644 index 000000000..9eec3c3bd Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf b/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf new file mode 100644 index 000000000..d25faf931 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf b/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf new file mode 100644 index 000000000..55348fb45 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ru.swf b/vendor/assets/potlatch2/potlatch2/locales/ru.swf new file mode 100644 index 000000000..62b4e527c Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ru.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/rue.swf b/vendor/assets/potlatch2/potlatch2/locales/rue.swf new file mode 100644 index 000000000..4ff619cac Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/rue.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sk.swf b/vendor/assets/potlatch2/potlatch2/locales/sk.swf new file mode 100644 index 000000000..fc4316b9c Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sk.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sl.swf b/vendor/assets/potlatch2/potlatch2/locales/sl.swf new file mode 100644 index 000000000..8ce66cd86 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sl.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sq.swf b/vendor/assets/potlatch2/potlatch2/locales/sq.swf new file mode 100644 index 000000000..2d4c1fd84 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sq.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf b/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf new file mode 100644 index 000000000..d1bef0c0a Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf b/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf new file mode 100644 index 000000000..4cabdb9d5 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf b/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf new file mode 100644 index 000000000..c226a91a7 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ta.swf b/vendor/assets/potlatch2/potlatch2/locales/ta.swf new file mode 100644 index 000000000..88582ac77 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ta.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/tl.swf b/vendor/assets/potlatch2/potlatch2/locales/tl.swf new file mode 100644 index 000000000..a7e789740 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/tl.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/tr.swf b/vendor/assets/potlatch2/potlatch2/locales/tr.swf new file mode 100644 index 000000000..5387478ea Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/tr.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/uk.swf b/vendor/assets/potlatch2/potlatch2/locales/uk.swf new file mode 100644 index 000000000..c2a563a96 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/uk.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf new file mode 100644 index 000000000..d3c4222ad Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf new file mode 100644 index 000000000..7dad55007 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf differ diff --git a/app/assets/swfobject/expressInstall.swf b/vendor/assets/swfobject/expressInstall.swf similarity index 100% rename from app/assets/swfobject/expressInstall.swf rename to vendor/assets/swfobject/expressInstall.swf diff --git a/app/assets/swfobject/swfobject.js b/vendor/assets/swfobject/swfobject.js similarity index 100% rename from app/assets/swfobject/swfobject.js rename to vendor/assets/swfobject/swfobject.js