cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into notes

Browse source 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
This commit is contained in:
Tom Hughes 2012-10-13 15:55:34 +01:00
commit 0037502426
190 changed files with 3488 additions and 2999 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -20,7 +20,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
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.8'
gem 'composite_primary_keys', '>= 5.0.9'
gem 'http_accept_language', '>= 1.0.2'
gem 'paperclip', '~> 2.0'
gem 'deadlock_retry', '>= 1.2.0'
@ -64,4 +64,5 @@ group :assets do
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
gem 'therubyracer'
gem 'ejs'
end

34
Gemfile.lock
View file

@ -32,7 +32,7 @@ GEM
arel (3.0.2)
bigdecimal (1.1.0)
builder (3.0.3)
cocaine (0.3.0)
cocaine (0.4.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@ -40,10 +40,11 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
composite_primary_keys (5.0.8)
activerecord (~> 3.2.0)
composite_primary_keys (5.0.9)
activerecord (~> 3.2.0, >= 3.2.8)
deadlock_retry (1.2.0)
dynamic_form (1.1.4)
ejs (1.1.1)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
@ -52,14 +53,14 @@ GEM
hike (1.2.1)
htmlentities (4.3.1)
http_accept_language (1.0.2)
httpauth (0.1)
httpclient (2.2.7)
httpauth (0.2.0)
httpclient (2.3.0.1)
i18n (0.6.1)
i18n-js (3.0.0.rc2)
i18n
iconv (0.1)
journey (1.0.4)
jquery-rails (2.1.2)
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
@ -76,9 +77,9 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memcached (1.4.5)
memcached (1.4.6)
mime-types (1.19)
minitest (3.4.0)
minitest (4.1.0)
multi_json (1.3.6)
multipart-post (1.1.5)
nokogiri (1.5.5)
@ -96,7 +97,7 @@ GEM
rack (~> 1.2)
open_id_authentication (1.1.0)
rack-openid (~> 1.3)
paperclip (2.7.0)
paperclip (2.8.0)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
@ -111,7 +112,7 @@ GEM
ruby-openid (>= 2.1.8)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
@ -133,9 +134,9 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
rinku (1.7.0)
ruby-openid (2.2.0)
redcarpet (2.2.1)
rinku (1.7.2)
ruby-openid (2.2.1)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.2.1)
@ -151,8 +152,8 @@ GEM
libv8 (~> 3.3.10)
thor (0.16.0)
tilt (1.3.3)
timecop (0.5.1)
treetop (1.4.10)
timecop (0.5.2)
treetop (1.4.11)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
@ -168,9 +169,10 @@ DEPENDENCIES
SystemTimer (>= 1.1.3)
bigdecimal
coffee-rails (~> 3.2.1)
composite_primary_keys (>= 5.0.8)
composite_primary_keys (>= 5.0.9)
deadlock_retry (>= 1.2.0)
dynamic_form
ejs
htmlentities
http_accept_language (>= 1.0.2)
httpclient

BIN
app/assets/images/attribution_example.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

18
app/assets/javascripts/application.js
View file

@ -6,13 +6,9 @@
//= require augment
//= require openlayers
//= require i18n/translations
//= require globals
//= require params
//= require osm
//= require piwik
//= require browse
//= require export
//= require map
//= require key
//= require menu
//= require sidebar
//= require richtext
@ -30,7 +26,7 @@ function zoomPrecision(zoom) {
* Called as the user scrolls/zooms around to aniplate hrefs of the
* view tab and various other links
*/
function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,objid) {
function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
var toPrecision = zoomPrecision(zoom);
var node;
@ -59,8 +55,8 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
args.layers = layers;
}
if (objtype && $(link).hasClass("object")) {
args[objtype] = objid;
if (object && $(link).hasClass("object")) {
args[object.type] = object.id;
}
var minzoom = $(link).data("minzoom");
@ -88,8 +84,8 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
var prefix = shortlinkPrefix();
// Add ?{node,way,relation}=id to the arguments
if (objtype && objid) {
args[objtype] = objid;
if (object) {
args[object.type] = object.id;
}
// This is a hack to omit the default mapnik layer from the shortlink.
@ -104,7 +100,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
// ?{node,way,relation}= can be safely omitted from the shortlink
// which encodes lat/lon/zoom. If new URL parameters are added to
// the main slippy map this needs to be changed.
if (args.layers || args[objtype]) {
if (args.layers || object) {
this.href = setArgs(prefix + "/go/" + code, args);
} else {
this.href = prefix + "/go/" + code;

604
app/assets/javascripts/browse.js
View file

@ -1,549 +1,99 @@
function startBrowse(sidebarHtml) {
var browseBoxControl;
var browseMode = "auto";
var browseBounds;
var browseFeatureList;
var browseActiveFeature;
var browseDataLayer;
var browseSelectControl;
var browseObjectList;
var areasHidden = false;
$(document).ready(function () {
function remoteEditHandler(bbox, select) {
var left = bbox.left - 0.0001;
var top = bbox.top + 0.0001;
var right = bbox.right + 0.0001;
var bottom = bbox.bottom - 0.0001;
var loaded = false;
OpenLayers.Feature.Vector.style['default'].strokeWidth = 3;
OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
$("#linkloader").load(function () { loaded = true; });
map.dataLayer.active = true;
$("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
$("#sidebar_content").html(sidebarHtml);
openSidebar();
var vectors = new OpenLayers.Layer.Vector();
browseBoxControl = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, {
handlerOptions: {
sides: 4,
snapAngle: 90,
irregular: true,
persist: true
if (select) {
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
} else {
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
}
});
browseBoxControl.handler.callbacks.done = endDrag;
map.addControl(browseBoxControl);
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(I18n.t('browse.start_rjs.hide_areas'));
$("#browse_hide_areas_box").show();
$("#browse_hide_areas_box").click(hideAreas);
function updateData() {
if (browseMode == "auto") {
if (map.getZoom() >= 15) {
useMap(false);
} else {
setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
}
}
}
$("#sidebar").one("closed", function () {
if (map.dataLayer.active) {
map.dataLayer.active = false;
if (browseSelectControl) {
browseSelectControl.destroy();
browseSelectControl = null;
}
if (browseBoxControl) {
browseBoxControl.destroy();
browseBoxControl = null;
}
if (browseActiveFeature) {
browseActiveFeature.destroy();
browseActiveFeature = null;
}
if (browseDataLayer) {
browseDataLayer.destroy();
browseDataLayer = null;
}
map.dataLayer.setVisibility(false);
map.events.unregister("moveend", map, updateData);
}
});
function startDrag() {
$("#browse_select_box").html(I18n.t('browse.start_rjs.drag_a_box'));
browseBoxControl.activate();
setTimeout(function () {
if (!loaded) alert(I18n.t('site.index.remote_failed'));
}, 1000);
return false;
}
function useMap(reload) {
var bounds = map.getExtent();
var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
var map = createMap("small_map", {
controls: [ new OpenLayers.Control.Navigation() ]
});
if (!browseBounds || !browseBounds.containsBounds(projected)) {
var center = bounds.getCenterLonLat();
var tileWidth = bounds.getWidth() * 1.2;
var tileHeight = bounds.getHeight() * 1.2;
var tileBounds = new OpenLayers.Bounds(center.lon - (tileWidth / 2),
center.lat - (tileHeight / 2),
center.lon + (tileWidth / 2),
center.lat + (tileHeight / 2));
var params = $("#small_map").data();
if (params.type == "changeset") {
var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
var centre = bbox.getCenterLonLat();
browseBounds = tileBounds;
getData(tileBounds, reload);
map.zoomToExtent(proj(bbox));
addBoxToMap(bbox);
browseMode = "auto";
$("#loading").hide();
$("#browse_map .geolink").show();
$("#browse_select_view").hide();
$("a[data-editor=remote]").click(function () {
return remoteEditHandler(bbox);
});
updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
} else if (params.type == "note") {
var centre = new OpenLayers.LonLat(params.lon, params.lat);
setMapCenter(centre, 16);
addMarkerToMap(centre);
var bbox = getMapExtent();
$("#loading").hide();
$("#browse_map .geolink").show();
$("a[data-editor=remote]").click(function () {
return remoteEditHandler(bbox);
});
updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
} else {
$("#object_larger_map").hide();
$("#object_edit").hide();
var object = {type: params.type, id: params.id};
if (!params.visible) {
object.version = params.version - 1;
}
return false;
}
addObjectToMap(object, true, function(extent) {
$("#loading").hide();
$("#browse_map .geolink").show();
function hideAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
$("#browse_hide_areas_box").show();
$("#browse_hide_areas_box").click(showAreas);
if (extent) {
extent = unproj(extent);
areasHidden = true;
var centre = extent.getCenterLonLat();
useMap(true);
}
function showAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
$("#browse_hide_areas_box").show();
$("#browse_hide_areas_box").click(hideAreas);
areasHidden = false;
useMap(true);
}
function endDrag(bbox) {
var bounds = bbox.getBounds();
var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
browseBoxControl.deactivate();
browseBounds = projected;
getData(bounds);
browseMode = "manual";
$("#browse_select_box").html(I18n.t('browse.start_rjs.manually_select'));
$("#browse_select_view").show();
}
function displayFeatureWarning(count, limit, callback) {
clearStatus();
var div = document.createElement("div");
var p = document.createElement("p");
p.appendChild(document.createTextNode(I18n.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 = I18n.t('browse.start_rjs.load_data');
input.onclick = callback;
div.appendChild(input);
$("#browse_content").html("");
$("#browse_content").append(div);
}
function customDataLoader(resp, options) {
if (map.dataLayer.active) {
var request = resp.priv;
var doc = request.responseXML;
if (!doc || !doc.documentElement) {
doc = request.responseText;
}
resp.features = this.format.read(doc);
if (!this.maxFeatures || resp.features.length <= this.maxFeatures) {
options.callback.call(options.scope, resp);
} else {
displayFeatureWarning(resp.features.length, this.maxFeatures, function () {
options.callback.call(options.scope, resp);
$("a.bbox[data-editor=remote]").click(function () {
return remoteEditHandler(extent);
});
$("a.object[data-editor=remote]").click(function () {
return remoteEditHandler(extent, params.type + params.id);
});
$("#object_larger_map").show();
$("#object_edit").show();
updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, object);
} else {
$("#small_map").hide();
}
}
}
function getData(bounds, reload) {
var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
var size = projected.getWidth() * projected.getHeight();
if (size > OSM.MAX_REQUEST_AREA) {
setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
} else {
loadData("/api/" + OSM.API_VERSION + "/map?bbox=" + projected.toBBOX(), reload);
}
}
function loadData(url, reload) {
setStatus(I18n.t('browse.start_rjs.loading'));
$("#browse_content").empty();
var formatOptions = {
checkTags: true,
interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
};
if (areasHidden) formatOptions.areaTags = [];
if (!browseDataLayer || reload) {
var style = new OpenLayers.Style();
style.addRules([new OpenLayers.Rule({
symbolizer: {
Polygon: { fillColor: '#ff0000', strokeColor: '#ff0000' },
Line: { fillColor: '#ffff00', strokeColor: '#000000', strokeOpacity: '0.4' },
Point: { fillColor: '#00ff00', strokeColor: '#00ff00' }
}
})]);
if (browseDataLayer) browseDataLayer.destroyFeatures();
/*
* Modern browsers are quite happy showing far more than 100 features in
* the data browser, so increase the limit to 2000 by default, but keep
* it restricted to 500 for IE8 and 100 for older IEs.
*/
var maxFeatures = 2000;
/*@cc_on
if (navigator.appVersion < 8) {
maxFeatures = 100;
} else if (navigator.appVersion < 9) {
maxFeatures = 500;
}
@*/
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: maxFeatures,
handleRead: customDataLoader
}),
projection: new OpenLayers.Projection("EPSG:4326"),
displayInLayerSwitcher: false,
styleMap: new OpenLayers.StyleMap({
'default': style,
'select': { strokeColor: '#0000ff', strokeWidth: 8 }
})
});
browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded );
map.addLayer(browseDataLayer);
browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect });
browseSelectControl.handlers.feature.stopDown = false;
browseSelectControl.handlers.feature.stopUp = false;
map.addControl(browseSelectControl);
browseSelectControl.activate();
} else {
browseDataLayer.destroyFeatures();
browseDataLayer.refresh({ url: url });
}
browseActiveFeature = null;
}
function dataLoaded() {
if (this.map.dataLayer.active) {
clearStatus();
browseObjectList = document.createElement("div");
var heading = document.createElement("p");
heading.className = "browse_heading";
heading.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.heading')));
browseObjectList.appendChild(heading);
var list = document.createElement("ul");
for (var i = 0; i < this.features.length; i++) {
var feature = this.features[i];
// Type, for linking
var type = featureType(feature);
var typeName = featureTypeName(feature);
var li = document.createElement("li");
li.appendChild(document.createTextNode(typeName + " "));
// Link, for viewing in the tab
var link = document.createElement("a");
link.href = "/browse/" + type + "/" + feature.osm_id;
var name = featureName(feature);
link.appendChild(document.createTextNode(name));
link.feature = feature;
link.onclick = OpenLayers.Function.bind(viewFeatureLink, link);
li.appendChild(link);
list.appendChild(li);
}
browseObjectList.appendChild(list);
var link = document.createElement("a");
link.href = this.protocol.url;
link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.api')));
browseObjectList.appendChild(link);
$("#browse_content").html(browseObjectList);
}
}
function viewFeatureLink() {
var layer = this.feature.layer;
for (var i = 0; i < layer.selectedFeatures.length; i++) {
var f = layer.selectedFeatures[i];
layer.drawFeature(f, layer.styleMap.createSymbolizer(f, "default"));
}
onFeatureSelect(this.feature);
if (browseMode != "auto") {
map.setCenter(this.feature.geometry.getBounds().getCenterLonLat());
}
return false;
}
function loadObjectList() {
$("#browse_content").empty();
$("#browse_content").append(browseObjectList);
return false;
}
function onFeatureSelect(feature) {
// Unselect previously selected feature
if (browseActiveFeature) {
browseActiveFeature.layer.drawFeature(
browseActiveFeature,
browseActiveFeature.layer.styleMap.createSymbolizer(browseActiveFeature, "default")
);
}
// Redraw in selected style
feature.layer.drawFeature(
feature, feature.layer.styleMap.createSymbolizer(feature, "select")
);
// If the current object is the list, don't innerHTML="", since that could clear it.
if ($("#browse_content").firstChild == browseObjectList) {
$("#browse_content").removeChild(browseObjectList);
} else {
$("#browse_content").empty();
}
// Create a link back to the object list
var div = document.createElement("div");
div.style.textAlign = "center";
div.style.marginBottom = "20px";
$("#browse_content").append(div);
var link = document.createElement("a");
link.href = "#";
link.onclick = loadObjectList;
link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.back')));
div.appendChild(link);
var table = document.createElement("table");
table.width = "100%";
table.className = "browse_heading";
$("#browse_content").append(table);
var tr = document.createElement("tr");
table.appendChild(tr);
var heading = document.createElement("td");
heading.appendChild(document.createTextNode(featureNameSelect(feature)));
tr.appendChild(heading);
var td = document.createElement("td");
td.align = "right";
tr.appendChild(td);
var type = featureType(feature);
var link = document.createElement("a");
link.href = "/browse/" + type + "/" + feature.osm_id;
link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.details')));
td.appendChild(link);
var div = document.createElement("div");
div.className = "browse_details";
$("#browse_content").append(div);
// Now the list of attributes
var ul = document.createElement("ul");
for (var key in feature.attributes) {
var li = document.createElement("li");
var b = document.createElement("b");
b.appendChild(document.createTextNode(key));
li.appendChild(b);
li.appendChild(document.createTextNode(": " + feature.attributes[key]));
ul.appendChild(li);
}
div.appendChild(ul);
var link = document.createElement("a");
link.href = "/browse/" + type + "/" + feature.osm_id + "/history";
link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.show_history')));
link.onclick = OpenLayers.Function.bind(loadHistory, {
type: type, feature: feature, link: link
});
div.appendChild(link);
// Stash the currently drawn feature
browseActiveFeature = feature;
}
function loadHistory() {
this.link.href = "";
this.link.innerHTML = I18n.t('browse.start_rjs.wait');
$.ajax("/api/" + OSM.API_VERSION + "/" + this.type + "/" + this.feature.osm_id + "/history", {
complete: OpenLayers.Function.bind(displayHistory, this)
});
return false;
}
function displayHistory(request) {
if (browseActiveFeature.osm_id != this.feature.osm_id || $("#browse_content").firstChild == browseObjectList) {
return false;
}
this.link.parentNode.removeChild(this.link);
var doc = request.responseXML;
var table = document.createElement("table");
table.width = "100%";
table.className = "browse_heading";
$("#browse_content").append(table);
var tr = document.createElement("tr");
table.appendChild(tr);
var heading = document.createElement("td");
heading.appendChild(document.createTextNode(I18n.t("browse.start_rjs.history_for_feature", { feature: featureNameHistory(this.feature) })));
tr.appendChild(heading);
var td = document.createElement("td");
td.align = "right";
tr.appendChild(td);
var link = document.createElement("a");
link.href = "/browse/" + this.type + "/" + this.feature.osm_id + "/history";
link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.details')));
td.appendChild(link);
var div = document.createElement("div");
div.className = "browse_details";
var nodes = doc.getElementsByTagName(this.type);
var history = document.createElement("ul");
for (var i = nodes.length - 1; i >= 0; i--) {
var user = nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user');
var timestamp = nodes[i].getAttribute("timestamp");
var item = document.createElement("li");
item.appendChild(document.createTextNode(I18n.t("browse.start_rjs.edited_by_user_at_timestamp", { user: user, timestamp: timestamp })));
history.appendChild(item);
}
div.appendChild(history);
$("#browse_content").append(div);
}
function featureType(feature) {
if (feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
return "node";
} else {
return "way";
}
}
function featureTypeName(feature) {
if (featureType(feature) == "node") {
return I18n.t('browse.start_rjs.object_list.type.node');
} else if (featureType(feature) == "way") {
return I18n.t('browse.start_rjs.object_list.type.way');
}
}
function featureName(feature) {
var lang = $('html').attr('lang');
if (feature.attributes['name:' + lang]) {
return feature.attributes['name:' + lang];
} else if (feature.attributes.name) {
return feature.attributes.name;
} else {
return feature.osm_id;
}
}
function featureNameSelect(feature) {
var lang = $('html').attr('lang');
if (feature.attributes['name:' + lang]) {
return feature.attributes['name:' + lang];
} else if (feature.attributes.name) {
return feature.attributes.name;
} else if (featureType(feature) == "node") {
return I18n.t("browse.start_rjs.object_list.selected.type.node", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return I18n.t("browse.start_rjs.object_list.selected.type.way", { id: feature.osm_id });
}
}
function featureNameHistory(feature) {
var lang = $('html').attr('lang');
if (feature.attributes['name:' + lang]) {
return feature.attributes['name:' + lang];
} else if (feature.attributes.name) {
return feature.attributes.name;
} else if (featureType(feature) == "node") {
return I18n.t("browse.start_rjs.object_list.history.type.node", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return I18n.t("browse.start_rjs.object_list.history.type.way", { id: feature.osm_id });
}
}
function setStatus(status) {
$("#browse_status").html(status);
$("#browse_status").show();
}
function clearStatus() {
$("#browse_status").html("");
$("#browse_status").hide();
}
}
createMenu("area_edit", "area_edit_menu", "right");
createMenu("object_edit", "object_edit_menu", "right");
});

83
app/assets/javascripts/changeset.js Normal file
View file

@ -0,0 +1,83 @@
$(document).ready(function () {
var highlight;
function highlightChangeset(id) {
var feature = vectors.getFeatureByFid(id);
var bounds = feature.geometry.getBounds();
if (bounds.containsBounds(map.getExtent())) {
bounds = map.getExtent().scale(1.1);
}
if (highlight) vectors.removeFeatures(highlight);
highlight = new OpenLayers.Feature.Vector(bounds.toGeometry(), {}, {
strokeWidth: 2,
strokeColor: "#ee9900",
fillColor: "#ffff55",
fillOpacity: 0.5
});
vectors.addFeatures(highlight);
$("#tr-changeset-" + id).addClass("selected");
}
function unHighlightChangeset(id) {
vectors.removeFeatures(highlight);
$("#tr-changeset-" + id).removeClass("selected");
}
var map = createMap("changeset_list_map", {
controls: [
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.Zoom(),
new OpenLayers.Control.SimplePanZoom()
]
});
var bounds = new OpenLayers.Bounds();
$("[data-changeset]").each(function () {
var changeset = $(this).data('changeset');
if (changeset.bbox) {
var bbox = new OpenLayers.Bounds(changeset.bbox.minlon, changeset.bbox.minlat, changeset.bbox.maxlon, changeset.bbox.maxlat);
bounds.extend(bbox);
addBoxToMap(bbox, changeset.id, true);
}
});
vectors.events.on({
"featureselected": function(feature) {
highlightChangeset(feature.feature.fid);
},
"featureunselected": function(feature) {
unHighlightChangeset(feature.feature.fid);
}
});
var selectControl = new OpenLayers.Control.SelectFeature(vectors, {
multiple: false,
hover: true
});
map.addControl(selectControl);
selectControl.activate();
var params = OSM.mapParams();
if (params.bbox) {
map.zoomToExtent(proj(new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat)));
} else {
map.zoomToExtent(proj(bounds));
}
$("[data-changeset]").mouseover(function() {
highlightChangeset($(this).data("changeset").id);
});
$("[data-changeset]").mouseout(function() {
unHighlightChangeset($(this).data("changeset").id);
});
});

37
app/assets/javascripts/diary_entry.js Normal file
View file

@ -0,0 +1,37 @@
$(document).ready(function () {
var marker;
function setLocation(e) {
closeMapPopup();
var lonlat = getEventPosition(e);
$("#latitude").val(lonlat.lat);
$("#longitude").val(lonlat.lon);
if (marker) {
removeMarkerFromMap(marker);
}
marker = addMarkerToMap(lonlat, null, I18n.t('diary_entry.edit.marker_text'));
}
$("#usemap").click(function (e) {
e.preventDefault();
$("#map").show();
$("#usemap").hide();
var params = $("#map").data();
var centre = new OpenLayers.LonLat(params.lon, params.lat);
var map = createMap("map");
setMapCenter(centre, params.zoom);
if ($("#latitude").val() && $("#longitude").val()) {
marker = addMarkerToMap(centre, null, I18n.t('diary_entry.edit.marker_text'));
}
map.events.register("click", map, setLocation);
});
});

43
app/assets/javascripts/edit.js Normal file
View file

@ -0,0 +1,43 @@
function maximiseMap() {
$("#left").hide();
$("#greeting").hide();
$("#tabnav").hide();
$("#content").css("top", "0px");
if ($("html").attr("dir") == "ltr") {
$("#content").css("left", "0px");
} else {
$("#content").css("right", "0px");
}
handleResize();
}
function minimiseMap() {
$("#left").show();
$("#greeting").show();
$("#tabnav").show();
$("#content").css("top", "30px");
if ($("html").attr("dir") == "ltr") {
$("#content").css("left", "185px");
} else {
$("#content").css("right", "185px");
}
handleResize();
}
$(document).ready(function () {
$(window).resize(handleResize);
handleResize();
$("#search_form").submit(function () {
$("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
$("#sidebar_content").load($(this).attr("action"), {
query: $("#query").val()
}, openSidebar);
return false;
});
});

318
app/assets/javascripts/export.js
View file

@ -1,318 +0,0 @@
function startExport(sidebarHtml) {
var vectors,
box,
transform,
markerLayer,
markerControl,
epsg4326 = new OpenLayers.Projection("EPSG:4326"),
epsg900913 = new OpenLayers.Projection("EPSG:900913");
vectors = new OpenLayers.Layer.Vector("Vector Layer", {
displayInLayerSwitcher: false
});
map.addLayer(vectors);
box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, {
handlerOptions: {
sides: 4,
snapAngle: 90,
irregular: true,
persist: true
}
});
box.handler.callbacks.done = endDrag;
map.addControl(box);
transform = new OpenLayers.Control.TransformFeature(vectors, {
rotate: false,
irregular: true
});
transform.events.register("transformcomplete", transform, transformComplete);
map.addControl(transform);
map.events.register("moveend", map, mapMoved);
map.events.register("changebaselayer", map, htmlUrlChanged);
$("#sidebar_title").html(I18n.t('export.start_rjs.export'));
$("#sidebar_content").html(sidebarHtml);
$("#maxlat,#minlon,#maxlon,#minlat").change(boundsChanged);
$("#drag_box").click(startDrag);
$("#add_marker").click(startMarker);
$("#format_osm,#format_mapnik,#format_html").click(formatChanged);
$("#mapnik_scale").change(mapnikSizeChanged);
openSidebar();
if (map.baseLayer.name == "Mapnik") {
$("#format_mapnik").prop("checked", true);
}
formatChanged();
setBounds(map.getExtent());
$("body").removeClass("site-index").addClass("site-export");
$("#sidebar").one("closed", function () {
$("body").removeClass("site-export").addClass("site-index");
clearBox();
clearMarker();
map.events.unregister("moveend", map, mapMoved);
map.events.unregister("changebaselayer", map, htmlUrlChanged);
map.removeLayer(vectors);
});
function getMercatorBounds() {
var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(),
$("#maxlon").val(), $("#maxlat").val());
return bounds.transform(epsg4326, epsg900913);
}
function boundsChanged() {
var bounds = getMercatorBounds();
map.events.unregister("moveend", map, mapMoved);
map.zoomToExtent(bounds);
clearBox();
drawBox(bounds);
validateControls();
mapnikSizeChanged();
}
function startDrag() {
$("#drag_box").html(I18n.t('export.start_rjs.drag_a_box'));
clearBox();
box.activate();
};
function endDrag(bbox) {
var bounds = bbox.getBounds();
map.events.unregister("moveend", map, mapMoved);
setBounds(bounds);
drawBox(bounds);
box.deactivate();
validateControls();
$("#drag_box").html(I18n.t('export.start_rjs.manually_select'));
}
function transformComplete(event) {
setBounds(event.feature.geometry.bounds);
validateControls();
}
function startMarker() {
$("#add_marker").html(I18n.t('export.start_rjs.click_add_marker'));
if (!markerLayer) {
markerLayer = new OpenLayers.Layer.Vector("",{
displayInLayerSwitcher: false,
style: {
externalGraphic: OpenLayers.Util.getImageLocation("marker.png"),
graphicXOffset: -10.5,
graphicYOffset: -25,
graphicWidth: 21,
graphicHeight: 25
}
});
map.addLayer(markerLayer);
markerControl = new OpenLayers.Control.DrawFeature(markerLayer, OpenLayers.Handler.Point);
map.addControl(markerControl);
markerLayer.events.on({ "featureadded": endMarker });
}
markerLayer.destroyFeatures();
markerControl.activate();
return false;
}
function endMarker(event) {
markerControl.deactivate();
$("#add_marker").html(I18n.t('export.start_rjs.change_marker'));
$("#marker_inputs").show();
var geom = event.feature.geometry.clone().transform(epsg900913, epsg4326);
$("#marker_lon").val(geom.x.toFixed(5));
$("#marker_lat").val(geom.y.toFixed(5));
htmlUrlChanged();
}
function clearMarker() {
$("#marker_lon,#marker_lat").val("");
$("#marker_inputs").hide();
$("#add_marker").html(I18n.t('export.start_rjs.add_marker'));
if (markerLayer) {
markerControl.destroy();
markerLayer.destroy();
markerLayer = null;
markerControl = null;
}
}
function mapMoved() {
setBounds(map.getExtent());
validateControls();
}
function setBounds(bounds) {
var toPrecision = zoomPrecision(map.getZoom());
bounds = bounds.clone().transform(map.getProjectionObject(), epsg4326);
$("#minlon").val(toPrecision(bounds.left));
$("#minlat").val(toPrecision(bounds.bottom));
$("#maxlon").val(toPrecision(bounds.right));
$("#maxlat").val(toPrecision(bounds.top));
mapnikSizeChanged();
htmlUrlChanged();
}
function clearBox() {
transform.deactivate();
vectors.destroyFeatures();
}
function drawBox(bounds) {
var feature = new OpenLayers.Feature.Vector(bounds.toGeometry());
vectors.addFeatures(feature);
transform.setFeature(feature);
}
function validateControls() {
var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val());
if (bounds.getWidth() * bounds.getHeight() > OSM.MAX_REQUEST_AREA) {
$("#export_osm_too_large").show();
} else {
$("#export_osm_too_large").hide();
}
var max_scale = maxMapnikScale();
var disabled = true;
if ($("#format_osm").prop("checked")) {
disabled = bounds.getWidth() * bounds.getHeight() > OSM.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));
}
function htmlUrlChanged() {
var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val());
var layerName = map.baseLayer.keyid;
var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBOX() + "&amp;layer=" + layerName;
var markerUrl = "";
if ($("#marker_lat").val() && $("#marker_lon").val()) {
markerUrl = "&amp;mlat=" + $("#marker_lat").val() + "&amp;mlon=" + $("#marker_lon").val();
url += "&amp;marker=" + $("#marker_lat").val() + "," + $("#marker_lon").val();
}
var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'" style="border: 1px solid black"></iframe>';
// Create "larger map" link
var center = bounds.getCenterLonLat();
bounds.transform(epsg4326, epsg900913);
var zoom = map.getZoomForExtent(bounds);
var layers = getMapLayers();
var text = I18n.t('export.start_rjs.view_larger_map');
var escaped = [];
for (var i = 0; i < text.length; ++i) {
var c = text.charCodeAt(i);
escaped.push(c < 127 ? text.charAt(i) : "&#" + c + ";");
}
html += '<br /><small><a href="http://' + OSM.SERVER_URL + '/?lat='+center.lat+'&amp;lon='+center.lon+'&amp;zoom='+zoom+'&amp;layers='+layers+markerUrl+'">'+escaped.join("")+'</a></small>';
$("#export_html_text").val(html);
if ($("#format_html").prop("checked")) {
$("#export_html_text").prop("selected", true);
}
}
function formatChanged() {
$("#export_commit").show();
if ($("#format_osm").prop("checked")) {
$("#export_osm").show();
} else {
$("#export_osm").hide();
}
if ($("#format_mapnik").prop("checked")) {
$("#mapnik_scale").val(roundScale(map.getScale()));
$("#export_mapnik").show();
mapnikSizeChanged();
} else {
$("#export_mapnik").hide();
}
if ($("#format_html").prop("checked")) {
$("#export_html").show();
$("#export_commit").hide();
$("#export_html_text").prop("selected", true);
} else {
$("#export_html").hide();
clearMarker();
}
validateControls();
}
function maxMapnikScale() {
var bounds = getMercatorBounds();
return Math.floor(Math.sqrt(bounds.getWidth() * bounds.getHeight() / 0.3136));
}
function mapnikImageSize(scale) {
var bounds = getMercatorBounds();
return new OpenLayers.Size(Math.round(bounds.getWidth() / scale / 0.00028),
Math.round(bounds.getHeight() / scale / 0.00028));
}
function roundScale(scale) {
var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2);
return precision * Math.ceil(scale / precision);
}
function mapnikSizeChanged() {
var size = mapnikImageSize($("#mapnik_scale").val());
$("#mapnik_image_width").html(size.w);
$("#mapnik_image_height").html(size.h);
validateControls();
}
}

9
app/assets/javascripts/globals.js.erb
View file

@ -1,9 +0,0 @@
OSM = {
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
PIWIK_LOCATION: <%= PIWIK_LOCATION.to_json %>,
PIWIK_SITE: <%= PIWIK_SITE.to_json %>,
<% end %>
MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
SERVER_URL: <%= SERVER_URL.to_json %>,
API_VERSION: <%= API_VERSION.to_json %>
};

122
app/assets/javascripts/index.js Normal file
View file

@ -0,0 +1,122 @@
//= require index/browse
//= require index/export
//= require index/key
$(document).ready(function () {
var marker;
var params = OSM.mapParams();
var map = createMap("map");
map.events.register("moveend", map, updateLocation);
map.events.register("changelayer", map, updateLocation);
if (!params.object_zoom) {
if (params.bbox) {
var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
map.zoomToExtent(proj(bbox));
if (params.box) {
addBoxToMap(bbox);
}
} else {
setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
}
}
if (params.layers) {
setMapLayers(params.layers);
}
if (params.marker) {
marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
}
if (params.object) {
addObjectToMap(params.object, params.object_zoom);
}
handleResize();
$("body").on("click", "a.set_position", function () {
var data = $(this).data();
var centre = new OpenLayers.LonLat(data.lon, data.lat);
if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
map.zoomToExtent(proj(bbox));
} else {
setMapCenter(centre, data.zoom);
}
if (marker) {
removeMarkerFromMap(marker);
}
marker = addMarkerToMap(centre, getArrowIcon());
return false;
});
function updateLocation() {
var lonlat = unproj(map.getCenter());
var zoom = map.getZoom();
var layers = getMapLayers();
var extents = unproj(map.getExtent());
var expiry = new Date();
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object);
expiry.setYear(expiry.getFullYear() + 10);
$.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
}
function remoteEditHandler(event) {
var extent = unproj(map.getExtent());
var loaded = false;
$("#linkloader").load(function () { loaded = true; });
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
setTimeout(function () {
if (!loaded) alert(I18n.t('site.index.remote_failed'));
}, 1000);
return false;
}
$("a[data-editor=remote]").click(remoteEditHandler);
if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
remoteEditHandler();
}
$(window).resize(function() {
var centre = map.getCenter();
var zoom = map.getZoom();
handleResize();
map.setCenter(centre, zoom);
});
$("#search_form").submit(function () {
var extent = unproj(map.getExtent());
$("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
$("#sidebar_content").load($(this).attr("action"), {
query: $("#query").val(),
minlon: extent.left,
minlat: extent.bottom,
maxlon: extent.right,
maxlat: extent.top
}, openSidebar);
return false;
});
if ($("#query").val()) {
$("#search_form").submit();
}
});

467
app/assets/javascripts/index/browse.js Normal file
View file

@ -0,0 +1,467 @@
//= require templates/browse/feature
//= require templates/browse/feature_list
//= require templates/browse/feature_history
$(document).ready(function () {
$("#show_data").click(function (e) {
$.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
startBrowse(sidebarHtml);
}});
e.preventDefault();
});
function startBrowse(sidebarHtml) {
var browseBoxControl;
var browseMode = "auto";
var browseBounds;
var browseFeatureList;
var browseActiveFeature;
var browseDataLayer;
var browseSelectControl;
var browseObjectList;
var areasHidden = false;
OpenLayers.Feature.Vector.style['default'].strokeWidth = 3;
OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
map.dataLayer.active = true;
$("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
$("#sidebar_content").html(sidebarHtml);
openSidebar();
var vectors = new OpenLayers.Layer.Vector();
browseBoxControl = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, {
handlerOptions: {
sides: 4,
snapAngle: 90,
irregular: true,
persist: true
}
});
browseBoxControl.handler.callbacks.done = endDrag;
map.addControl(browseBoxControl);
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(I18n.t('browse.start_rjs.hide_areas'));
$("#browse_hide_areas_box").show();
$("#browse_hide_areas_box").click(hideAreas);
function updateData() {
if (browseMode == "auto") {
if (map.getZoom() >= 15) {
useMap(false);
} else {
setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
}
}
}
$("#sidebar").one("closed", function () {
if (map.dataLayer.active) {
map.dataLayer.active = false;
if (browseSelectControl) {
browseSelectControl.destroy();
browseSelectControl = null;
}
if (browseBoxControl) {
browseBoxControl.destroy();
browseBoxControl = null;
}
if (browseActiveFeature) {
browseActiveFeature.destroy();
browseActiveFeature = null;
}
if (browseDataLayer) {
browseDataLayer.destroy();
browseDataLayer = null;
}
map.dataLayer.setVisibility(false);
map.events.unregister("moveend", map, updateData);
}
});
function startDrag() {
$("#browse_select_box").html(I18n.t('browse.start_rjs.drag_a_box'));
browseBoxControl.activate();
return false;
}
function useMap(reload) {
var bounds = map.getExtent();
var projected = unproj(bounds);
if (!browseBounds || !browseBounds.containsBounds(projected)) {
var center = bounds.getCenterLonLat();
var tileWidth = bounds.getWidth() * 1.2;
var tileHeight = bounds.getHeight() * 1.2;
var tileBounds = new OpenLayers.Bounds(center.lon - (tileWidth / 2),
center.lat - (tileHeight / 2),
center.lon + (tileWidth / 2),
center.lat + (tileHeight / 2));
browseBounds = tileBounds;
getData(tileBounds, reload);
browseMode = "auto";
$("#browse_select_view").hide();
}
return false;
}
function hideAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
$("#browse_hide_areas_box").show();
$("#browse_hide_areas_box").click(showAreas);
areasHidden = true;
useMap(true);
}
function showAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
$("#browse_hide_areas_box").show();
$("#browse_hide_areas_box").click(hideAreas);
areasHidden = false;
useMap(true);
}
function endDrag(bbox) {
var bounds = bbox.getBounds();
var projected = unproj(bounds);
browseBoxControl.deactivate();
browseBounds = projected;
getData(bounds);
browseMode = "manual";
$("#browse_select_box").html(I18n.t('browse.start_rjs.manually_select'));
$("#browse_select_view").show();
}
function displayFeatureWarning(count, limit, callback) {
clearStatus();
var div = document.createElement("div");
var p = document.createElement("p");
p.appendChild(document.createTextNode(I18n.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 = I18n.t('browse.start_rjs.load_data');
input.onclick = callback;
div.appendChild(input);
$("#browse_content").html("");
$("#browse_content").append(div);
}
function customDataLoader(resp, options) {
if (map.dataLayer.active) {
var request = resp.priv;
var doc = request.responseXML;
if (!doc || !doc.documentElement) {
doc = request.responseText;
}
resp.features = this.format.read(doc);
if (!this.maxFeatures || resp.features.length <= this.maxFeatures) {
options.callback.call(options.scope, resp);
} else {
displayFeatureWarning(resp.features.length, this.maxFeatures, function () {
options.callback.call(options.scope, resp);
});
}
}
}
function getData(bounds, reload) {
var projected = unproj(bounds);
var size = projected.getWidth() * projected.getHeight();
if (size > OSM.MAX_REQUEST_AREA) {
setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
} else {
loadData("/api/" + OSM.API_VERSION + "/map?bbox=" + projected.toBBOX(), reload);
}
}
function loadData(url, reload) {
setStatus(I18n.t('browse.start_rjs.loading'));
$("#browse_content").empty();
var formatOptions = {
checkTags: true,
interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
};
if (areasHidden) formatOptions.areaTags = [];
if (!browseDataLayer || reload) {
var style = new OpenLayers.Style();
style.addRules([new OpenLayers.Rule({
symbolizer: {
Polygon: { fillColor: '#ff0000', strokeColor: '#ff0000' },
Line: { fillColor: '#ffff00', strokeColor: '#000000', strokeOpacity: '0.4' },
Point: { fillColor: '#00ff00', strokeColor: '#00ff00' }
}
})]);
if (browseDataLayer) browseDataLayer.destroyFeatures();
/*
* Modern browsers are quite happy showing far more than 100 features in
* the data browser, so increase the limit to 2000 by default, but keep
* it restricted to 500 for IE8 and 100 for older IEs.
*/
var maxFeatures = 2000;
/*@cc_on
if (navigator.appVersion < 8) {
maxFeatures = 100;
} else if (navigator.appVersion < 9) {
maxFeatures = 500;
}
@*/
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: maxFeatures,
handleRead: customDataLoader
}),
projection: new OpenLayers.Projection("EPSG:4326"),
displayInLayerSwitcher: false,
styleMap: new OpenLayers.StyleMap({
'default': style,
'select': { strokeColor: '#0000ff', strokeWidth: 8 }
})
});
browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded );
map.addLayer(browseDataLayer);
browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect });
browseSelectControl.handlers.feature.stopDown = false;
browseSelectControl.handlers.feature.stopUp = false;
map.addControl(browseSelectControl);
browseSelectControl.activate();
} else {
browseDataLayer.destroyFeatures();
browseDataLayer.refresh({ url: url });
}
browseActiveFeature = null;
}
function dataLoaded() {
if (this.map.dataLayer.active) {
clearStatus();
var features = [];
for (var i = 0; i < this.features.length; i++) {
var feature = this.features[i];
features.push({
typeName: featureTypeName(feature),
url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
name: featureName(feature),
id: feature.id
});
}
browseObjectList = $(JST["templates/browse/feature_list"]({
features: features,
url: this.protocol.url
}))[0];
loadObjectList();
}
}
function viewFeatureLink() {
var feature = browseDataLayer.getFeatureById($(this).data("feature-id"));
var layer = feature.layer;
for (var i = 0; i < layer.selectedFeatures.length; i++) {
var f = layer.selectedFeatures[i];
layer.drawFeature(f, layer.styleMap.createSymbolizer(f, "default"));
}
onFeatureSelect(feature);
if (browseMode != "auto") {
map.setCenter(feature.geometry.getBounds().getCenterLonLat());
}
return false;
}
function loadObjectList() {
$("#browse_content").html(browseObjectList);
$("#browse_content").find("a[data-feature-id]").click(viewFeatureLink);
return false;
}
function onFeatureSelect(feature) {
// Unselect previously selected feature
if (browseActiveFeature) {
browseActiveFeature.layer.drawFeature(
browseActiveFeature,
browseActiveFeature.layer.styleMap.createSymbolizer(browseActiveFeature, "default")
);
}
// Redraw in selected style
feature.layer.drawFeature(
feature, feature.layer.styleMap.createSymbolizer(feature, "select")
);
// If the current object is the list, don't innerHTML="", since that could clear it.
if ($("#browse_content").firstChild == browseObjectList) {
$("#browse_content").removeChild(browseObjectList);
} else {
$("#browse_content").empty();
}
$("#browse_content").html(JST["templates/browse/feature"]({
name: featureNameSelect(feature),
url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
attributes: feature.attributes
}));
$("#browse_content").find("a.browse_show_list").click(loadObjectList);
$("#browse_content").find("a.browse_show_history").click(loadHistory);
// Stash the currently drawn feature
browseActiveFeature = feature;
}
function loadHistory() {
$(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
var feature = browseActiveFeature;
$.ajax({
url: "/api/" + OSM.API_VERSION + "/" + featureType(feature) + "/" + feature.osm_id + "/history",
success: function (xml) {
if (browseActiveFeature != feature || $("#browse_content").firstChild == browseObjectList) {
return;
}
$(this).remove();
var history = [];
var nodes = xml.getElementsByTagName(featureType(feature));
for (var i = nodes.length - 1; i >= 0; i--) {
history.push({
user: nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user'),
timestamp: nodes[i].getAttribute("timestamp")
});
}
$("#browse_content").append(JST["templates/browse/feature_history"]({
name: featureNameHistory(feature),
url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
history: history
}));
}.bind(this)
});
return false;
}
function featureType(feature) {
if (feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
return "node";
} else {
return "way";
}
}
function featureTypeName(feature) {
if (featureType(feature) == "node") {
return I18n.t('browse.start_rjs.object_list.type.node');
} else if (featureType(feature) == "way") {
return I18n.t('browse.start_rjs.object_list.type.way');
}
}
function featureName(feature) {
var lang = $('html').attr('lang');
if (feature.attributes['name:' + lang]) {
return feature.attributes['name:' + lang];
} else if (feature.attributes.name) {
return feature.attributes.name;
} else {
return feature.osm_id;
}
}
function featureNameSelect(feature) {
var lang = $('html').attr('lang');
if (feature.attributes['name:' + lang]) {
return feature.attributes['name:' + lang];
} else if (feature.attributes.name) {
return feature.attributes.name;
} else if (featureType(feature) == "node") {
return I18n.t("browse.start_rjs.object_list.selected.type.node", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return I18n.t("browse.start_rjs.object_list.selected.type.way", { id: feature.osm_id });
}
}
function featureNameHistory(feature) {
var lang = $('html').attr('lang');
if (feature.attributes['name:' + lang]) {
return feature.attributes['name:' + lang];
} else if (feature.attributes.name) {
return feature.attributes.name;
} else if (featureType(feature) == "node") {
return I18n.t("browse.start_rjs.object_list.history.type.node", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return I18n.t("browse.start_rjs.object_list.history.type.way", { id: feature.osm_id });
}
}
function setStatus(status) {
$("#browse_status").html(status);
$("#browse_status").show();
}
function clearStatus() {
$("#browse_status").html("");
$("#browse_status").hide();
}
}
});

328
app/assets/javascripts/index/export.js Normal file
View file

@ -0,0 +1,328 @@
$(document).ready(function () {
$("#exportanchor").click(function (e) {
$.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
startExport(sidebarHtml);
}});
e.preventDefault();
});
if (window.location.pathname == "/export") {
$("#exportanchor").click();
}
function startExport(sidebarHtml) {
var vectors,
box,
transform,
markerLayer,
markerControl;
vectors = new OpenLayers.Layer.Vector("Vector Layer", {
displayInLayerSwitcher: false
});
map.addLayer(vectors);
box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, {
handlerOptions: {
sides: 4,
snapAngle: 90,
irregular: true,
persist: true
}
});
box.handler.callbacks.done = endDrag;
map.addControl(box);
transform = new OpenLayers.Control.TransformFeature(vectors, {
rotate: false,
irregular: true
});
transform.events.register("transformcomplete", transform, transformComplete);
map.addControl(transform);
map.events.register("moveend", map, mapMoved);
map.events.register("changebaselayer", map, htmlUrlChanged);
$("#sidebar_title").html(I18n.t('export.start_rjs.export'));
$("#sidebar_content").html(sidebarHtml);
$("#maxlat,#minlon,#maxlon,#minlat").change(boundsChanged);
$("#drag_box").click(startDrag);
$("#add_marker").click(startMarker);
$("#format_osm,#format_mapnik,#format_html").click(formatChanged);
$("#mapnik_scale").change(mapnikSizeChanged);
openSidebar();
if (map.baseLayer.name == "Mapnik") {
$("#format_mapnik").prop("checked", true);
}
formatChanged();
setBounds(map.getExtent());
$("body").removeClass("site-index").addClass("site-export");
$("#sidebar").one("closed", function () {
$("body").removeClass("site-export").addClass("site-index");
clearBox();
clearMarker();
map.events.unregister("moveend", map, mapMoved);
map.events.unregister("changebaselayer", map, htmlUrlChanged);
map.removeLayer(vectors);
});
function getMercatorBounds() {
var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(),
$("#maxlon").val(), $("#maxlat").val());
return proj(bounds);
}
function boundsChanged() {
var bounds = getMercatorBounds();
map.events.unregister("moveend", map, mapMoved);
map.zoomToExtent(bounds);
clearBox();
drawBox(bounds);
validateControls();
mapnikSizeChanged();
}
function startDrag() {
$("#drag_box").html(I18n.t('export.start_rjs.drag_a_box'));
clearBox();
box.activate();
};
function endDrag(bbox) {
var bounds = bbox.getBounds();
map.events.unregister("moveend", map, mapMoved);
setBounds(bounds);
drawBox(bounds);
box.deactivate();
validateControls();
$("#drag_box").html(I18n.t('export.start_rjs.manually_select'));
}
function transformComplete(event) {
setBounds(event.feature.geometry.bounds);
validateControls();
}
function startMarker() {
$("#add_marker").html(I18n.t('export.start_rjs.click_add_marker'));
if (!markerLayer) {
markerLayer = new OpenLayers.Layer.Vector("",{
displayInLayerSwitcher: false,
style: {
externalGraphic: OpenLayers.Util.getImageLocation("marker.png"),
graphicXOffset: -10.5,
graphicYOffset: -25,
graphicWidth: 21,
graphicHeight: 25
}
});
map.addLayer(markerLayer);
markerControl = new OpenLayers.Control.DrawFeature(markerLayer, OpenLayers.Handler.Point);
map.addControl(markerControl);
markerLayer.events.on({ "featureadded": endMarker });
}
markerLayer.destroyFeatures();
markerControl.activate();
return false;
}
function endMarker(event) {
markerControl.deactivate();
$("#add_marker").html(I18n.t('export.start_rjs.change_marker'));
$("#marker_inputs").show();
var geom = unproj(event.feature.geometry);
$("#marker_lon").val(geom.x.toFixed(5));
$("#marker_lat").val(geom.y.toFixed(5));
htmlUrlChanged();
}
function clearMarker() {
$("#marker_lon,#marker_lat").val("");
$("#marker_inputs").hide();
$("#add_marker").html(I18n.t('export.start_rjs.add_marker'));
if (markerLayer) {
markerControl.destroy();
markerLayer.destroy();
markerLayer = null;
markerControl = null;
}
}
function mapMoved() {
setBounds(map.getExtent());
validateControls();
}
function setBounds(bounds) {
var toPrecision = zoomPrecision(map.getZoom());
bounds = unproj(bounds);
$("#minlon").val(toPrecision(bounds.left));
$("#minlat").val(toPrecision(bounds.bottom));
$("#maxlon").val(toPrecision(bounds.right));
$("#maxlat").val(toPrecision(bounds.top));
mapnikSizeChanged();
htmlUrlChanged();
}
function clearBox() {
transform.deactivate();
vectors.destroyFeatures();
}
function drawBox(bounds) {
var feature = new OpenLayers.Feature.Vector(bounds.toGeometry());
vectors.addFeatures(feature);
transform.setFeature(feature);
}
function validateControls() {
var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val());
if (bounds.getWidth() * bounds.getHeight() > OSM.MAX_REQUEST_AREA) {
$("#export_osm_too_large").show();
} else {
$("#export_osm_too_large").hide();
}
var max_scale = maxMapnikScale();
var disabled = true;
if ($("#format_osm").prop("checked")) {
disabled = bounds.getWidth() * bounds.getHeight() > OSM.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));
}
function htmlUrlChanged() {
var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val());
var layerName = map.baseLayer.keyid;
var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBOX() + "&amp;layer=" + layerName;
var markerUrl = "";
if ($("#marker_lat").val() && $("#marker_lon").val()) {
markerUrl = "&amp;mlat=" + $("#marker_lat").val() + "&amp;mlon=" + $("#marker_lon").val();
url += "&amp;marker=" + $("#marker_lat").val() + "," + $("#marker_lon").val();
}
var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'" style="border: 1px solid black"></iframe>';
// Create "larger map" link
var center = bounds.getCenterLonLat();
var zoom = map.getZoomForExtent(proj(bounds));
var layers = getMapLayers();
var text = I18n.t('export.start_rjs.view_larger_map');
var escaped = [];
for (var i = 0; i < text.length; ++i) {
var c = text.charCodeAt(i);
escaped.push(c < 127 ? text.charAt(i) : "&#" + c + ";");
}
html += '<br /><small><a href="http://' + OSM.SERVER_URL + '/?lat='+center.lat+'&amp;lon='+center.lon+'&amp;zoom='+zoom+'&amp;layers='+layers+markerUrl+'">'+escaped.join("")+'</a></small>';
$("#export_html_text").val(html);
if ($("#format_html").prop("checked")) {
$("#export_html_text").prop("selected", true);
}
}
function formatChanged() {
$("#export_commit").show();
if ($("#format_osm").prop("checked")) {
$("#export_osm").show();
} else {
$("#export_osm").hide();
}
if ($("#format_mapnik").prop("checked")) {
$("#mapnik_scale").val(roundScale(map.getScale()));
$("#export_mapnik").show();
mapnikSizeChanged();
} else {
$("#export_mapnik").hide();
}
if ($("#format_html").prop("checked")) {
$("#export_html").show();
$("#export_commit").hide();
$("#export_html_text").prop("selected", true);
} else {
$("#export_html").hide();
clearMarker();
}
validateControls();
}
function maxMapnikScale() {
var bounds = getMercatorBounds();
return Math.floor(Math.sqrt(bounds.getWidth() * bounds.getHeight() / 0.3136));
}
function mapnikImageSize(scale) {
var bounds = getMercatorBounds();
return new OpenLayers.Size(Math.round(bounds.getWidth() / scale / 0.00028),
Math.round(bounds.getHeight() / scale / 0.00028));
}
function roundScale(scale) {
var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2);
return precision * Math.ceil(scale / precision);
}
function mapnikSizeChanged() {
var size = mapnikImageSize($("#mapnik_scale").val());
$("#mapnik_image_width").html(size.w);
$("#mapnik_image_height").html(size.h);
validateControls();
}
}
});

0
app/assets/javascripts/key.js → app/assets/javascripts/index/key.js
View file

11
app/assets/javascripts/map.js.erb
View file

@ -106,13 +106,13 @@ function addMarkerToMap(position, icon, description) {
return marker;
}
function addObjectToMap(url, zoom, callback) {
function addObjectToMap(object, zoom, callback) {
var layer = new OpenLayers.Layer.Vector("Objects", {
strategies: [
new OpenLayers.Strategy.Fixed()
],
protocol: new OpenLayers.Protocol.HTTP({
url: url,
url: OSM.apiUrl(object),
format: new OpenLayers.Format.OSM()
}),
style: {
@ -196,7 +196,6 @@ function openMapPopup(marker, description) {
function closeMapPopup() {
if (popup) {
map.removePopup(popup);
delete popup;
}
}
@ -204,10 +203,6 @@ function removeMarkerFromMap(marker){
markers.removeMarker(marker);
}
function removeBoxFromMap(box){
vectors.removeFeature(box);
}
function proj(x) {
return x.clone().transform(epsg4326, map.getProjectionObject());
}
@ -224,7 +219,7 @@ function setMapCenter(center, zoom) {
}
function getEventPosition(event) {
return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
return unproj(map.getLonLatFromViewPortPx(event.xy));
}
function getMapLayers() {

392
app/assets/javascripts/notes.js.erb
View file

@ -1,213 +1,227 @@
function addNoteLayer(map, notesUrl, newNoteControls, newNoteForm, minZoom) {
var newNotes;
$(document).ready(function () {
var params = OSM.mapParams();
var saveNewNotes = function (o) {
var layer = o.object;
newNotes = layer.getFeaturesByAttribute("status", "new")
layer.removeFeatures(newNotes, { silent: true });
};
// map.noteLayer = addNoteLayer(map, $("#show_notes").attr("href"), $("#createnoteanchor"), $("#new-note"), 11);
var restoreNewNotes = function (o) {
var layer = o.object;
layer.addFeatures(newNotes);
newNotes = undefined;
};
$("#show_notes").click(function () {
map.noteLayer.setVisibility(true);
});
var describeNote = function (n) {
var description = "<h2>Note " + n.id + "</h2>";
n.comments.forEach(function (c) {
description += "<p><small class='deemphasize'>" + c.action + " by ";
description += c.user + " at " + c.date + "</small><br/>" + c.text + "</p>";
});
return description;
if (params.notes) {
map.noteLayer.setVisibility(true);
}
var noteSelected = function (o) {
var feature = o.feature;
var location = feature.geometry.getBounds().getCenterLonLat();
var content;
var close;
function addNoteLayer(map, notesUrl, newNoteControls, newNoteForm, minZoom) {
var newNotes;
if (feature.attributes.status === "new") {
var form = newNoteForm.clone();
form.removeClass("hidden");
content = form.html();
close = false;
} else {
content = describeNote(feature.attributes);
close = true;
var saveNewNotes = function (o) {
var layer = o.object;
newNotes = layer.getFeaturesByAttribute("status", "new")
layer.removeFeatures(newNotes, { silent: true });
};
feature.popup = new OpenLayers.Popup.FramedCloud(
feature.attributes.id, location, null, content, null, close,
function (e) { map.noteSelector.unselect(feature) }
);
var restoreNewNotes = function (o) {
var layer = o.object;
layer.addFeatures(newNotes);
newNotes = undefined;
};
map.addPopup(feature.popup);
// feature.popup.show();
var describeNote = function (n) {
var description = "<h2>Note " + n.id + "</h2>";
$(feature.popup.contentDiv).find("textarea").autoGrow();
$(feature.popup.contentDiv).find("input#note-submit").click(function (e) {
var location = unproj(feature.geometry.getBounds().getCenterLonLat());
var form = $(e.target).parents("form").first();
$.ajax(form.prop("action"), {
type: form.prop("method"),
data: {
lon: location.lon,
lat: location.lat,
text: form.find("textarea#comment").val()
},
success: function (data) {
map.noteSelector.unselect(feature);
feature.attributes.status = "open";
feature.attributes.id = data;
map.noteLayer.drawFeature(feature);
map.noteMover.deactivate();
}
n.comments.forEach(function (c) {
description += "<p><small class='deemphasize'>" + c.action + " by ";
description += c.user + " at " + c.date + "</small><br/>" + c.text + "</p>";
});
e.preventDefault();
});
$(feature.popup.contentDiv).find("input#note-cancel").click(function (e) {
feature.attributes.status = "cancelled";
map.noteSelector.unselect(feature);
map.noteLayer.removeFeatures(feature);
feature.destroy();
map.noteMover.deactivate();
e.preventDefault();
});
feature.popup.updateSize();
};
var noteUnselected = function (o) {
var feature = o.feature;
map.removePopup(feature.popup);
delete feature.popup;
};
var allowNoteReports = function () {
if (map.getZoom() > minZoom) {
newNoteControls.show();
} else {
newNoteControls.hide();
return description;
}
};
var addNote = function () {
var lonlat = map.getCenter();
var layer = map.noteLayer;
var geometry = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
var feature = new OpenLayers.Feature.Vector(geometry, {
status: "new"
var noteSelected = function (o) {
var feature = o.feature;
var location = feature.geometry.getBounds().getCenterLonLat();
var content;
var close;
if (feature.attributes.status === "new") {
var form = newNoteForm.clone();
form.removeClass("hidden");
content = form.html();
close = false;
} else {
content = describeNote(feature.attributes);
close = true;
};
feature.popup = new OpenLayers.Popup.FramedCloud(
feature.attributes.id, location, null, content, null, close,
function (e) { map.noteSelector.unselect(feature) }
);
map.addPopup(feature.popup);
// feature.popup.show();
$(feature.popup.contentDiv).find("textarea").autoGrow();
$(feature.popup.contentDiv).find("input#note-submit").click(function (e) {
var location = unproj(feature.geometry.getBounds().getCenterLonLat());
var form = $(e.target).parents("form").first();
$.ajax(form.prop("action"), {
type: form.prop("method"),
data: {
lon: location.lon,
lat: location.lat,
text: form.find("textarea#comment").val()
},
success: function (data) {
map.noteSelector.unselect(feature);
feature.attributes.status = "open";
feature.attributes.id = data;
map.noteLayer.drawFeature(feature);
map.noteMover.deactivate();
}
});
e.preventDefault();
});
$(feature.popup.contentDiv).find("input#note-cancel").click(function (e) {
feature.attributes.status = "cancelled";
map.noteSelector.unselect(feature);
map.noteLayer.removeFeatures(feature);
feature.destroy();
map.noteMover.deactivate();
e.preventDefault();
});
feature.popup.updateSize();
};
var noteUnselected = function (o) {
var feature = o.feature;
map.removePopup(feature.popup);
delete feature.popup;
};
var allowNoteReports = function () {
if (map.getZoom() > minZoom) {
newNoteControls.show();
} else {
newNoteControls.hide();
}
};
var addNote = function () {
var lonlat = map.getCenter();
var layer = map.noteLayer;
var geometry = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
var feature = new OpenLayers.Feature.Vector(geometry, {
status: "new"
});
layer.addFeatures(feature);
map.noteSelector.unselectAll();
map.noteSelector.select(feature);
map.noteMover.activate();
map.noteLayer.setVisibility(true);
};
map.noteLayer = new OpenLayers.Layer.Vector("Notes", {
visibility: false,
displayInLayerSwitcher: false,
projection: new OpenLayers.Projection("EPSG:4326"),
styleMap: new OpenLayers.StyleMap(new OpenLayers.Style({
graphicWidth: 22,
graphicHeight: 22,
graphicOpacity: 0.7,
graphicXOffset: -11,
graphicYOffset: -11
}, {
rules: [
new OpenLayers.Rule({
filter: new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "status",
value: "new"
}),
symbolizer: {
externalGraphic: "<%= image_path 'new_note_marker.png' %>"
}
}),
new OpenLayers.Rule({
filter: new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "status",
value: "open"
}),
symbolizer: {
externalGraphic: "<%= image_path 'open_note_marker.png' %>"
}
}),
new OpenLayers.Rule({
filter: new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "status",
value: "closed"
}),
symbolizer: {
externalGraphic: "<%= image_path 'closed_note_marker.png' %>"
}
})
]
})),
strategies: [
new OpenLayers.Strategy.BBOX()
],
protocol: new OpenLayers.Protocol.HTTP({
url: notesUrl,
format: new OpenLayers.Format.GeoJSON()
})
});
layer.addFeatures(feature);
map.noteSelector.unselectAll();
map.noteSelector.select(feature);
map.noteMover.activate();
map.noteLayer.setVisibility(true);
};
map.noteLayer.events.register("beforefeaturesremoved", map, saveNewNotes);
map.noteLayer.events.register("featuresremoved", map, restoreNewNotes);
map.noteLayer.events.register("featureselected", map, noteSelected);
map.noteLayer.events.register("featureunselected", map, noteUnselected);
map.noteLayer = new OpenLayers.Layer.Vector("Notes", {
visibility: false,
displayInLayerSwitcher: false,
projection: new OpenLayers.Projection("EPSG:4326"),
styleMap: new OpenLayers.StyleMap(new OpenLayers.Style({
graphicWidth: 22,
graphicHeight: 22,
graphicOpacity: 0.7,
graphicXOffset: -11,
graphicYOffset: -11
}, {
rules: [
new OpenLayers.Rule({
filter: new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "status",
value: "new"
}),
symbolizer: {
externalGraphic: "<%= image_path 'new_note_marker.png' %>"
map.addLayer(map.noteLayer);
map.noteSelector = new OpenLayers.Control.SelectFeature(map.noteLayer, {
autoActivate: true
});
map.addControl(map.noteSelector);
map.noteMover = new OpenLayers.Control.DragFeature(map.noteLayer, {
onDrag: function (feature, pixel) {
feature.popup.lonlat = feature.geometry.getBounds().getCenterLonLat();
feature.popup.updatePosition();
},
featureCallbacks: {
over: function (feature) {
if (feature.attributes.status === "new") {
map.noteMover.overFeature.apply(map.noteMover, [feature]);
}
}),
new OpenLayers.Rule({
filter: new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "status",
value: "open"
}),
symbolizer: {
externalGraphic: "<%= image_path 'open_note_marker.png' %>"
}
}),
new OpenLayers.Rule({
filter: new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "status",
value: "closed"
}),
symbolizer: {
externalGraphic: "<%= image_path 'closed_note_marker.png' %>"
}
})
]
})),
strategies: [
new OpenLayers.Strategy.BBOX()
],
protocol: new OpenLayers.Protocol.HTTP({
url: notesUrl,
format: new OpenLayers.Format.GeoJSON()
})
});
map.noteLayer.events.register("beforefeaturesremoved", map, saveNewNotes);
map.noteLayer.events.register("featuresremoved", map, restoreNewNotes);
map.noteLayer.events.register("featureselected", map, noteSelected);
map.noteLayer.events.register("featureunselected", map, noteUnselected);
map.addLayer(map.noteLayer);
map.noteSelector = new OpenLayers.Control.SelectFeature(map.noteLayer, {
autoActivate: true
});
map.addControl(map.noteSelector);
map.noteMover = new OpenLayers.Control.DragFeature(map.noteLayer, {
onDrag: function (feature, pixel) {
feature.popup.lonlat = feature.geometry.getBounds().getCenterLonLat();
feature.popup.updatePosition();
},
featureCallbacks: {
over: function (feature) {
if (feature.attributes.status === "new") {
map.noteMover.overFeature.apply(map.noteMover, [feature]);
}
}
}
});
});
map.addControl(map.noteMover);
map.addControl(map.noteMover);
newNoteControls.click(addNote);
newNoteControls.click(addNote);
map.events.register("zoomend", map, allowNoteReports);
map.events.register("zoomend", map, allowNoteReports);
return map.noteLayer;
}
return map.noteLayer;
}
});

121
app/assets/javascripts/osm.js.erb Normal file
View file

@ -0,0 +1,121 @@
OSM = {
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
PIWIK_LOCATION: <%= PIWIK_LOCATION.to_json %>,
PIWIK_SITE: <%= PIWIK_SITE.to_json %>,
<% end %>
MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
SERVER_URL: <%= SERVER_URL.to_json %>,
API_VERSION: <%= API_VERSION.to_json %>,
apiUrl: function (object) {
var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
if (object.type != "node") {
url += "/full";
} else if (object.version) {
url += "/" + object.version;
}
return url;
},
mapParams: function (search) {
var params = {}, mapParams = {}, loc;
search = (search || window.location.search).replace('?', '').split('&');
for (var i = 0; i < search.length; ++i) {
var pair = search[i],
j = pair.indexOf('='),
key = pair.slice(0, j),
val = pair.slice(++j);
params[key] = decodeURIComponent(val);
}
if (params.mlon && params.mlat) {
mapParams.marker = true;
mapParams.mlon = parseFloat(params.mlon);
mapParams.mlat = parseFloat(params.mlat);
}
if (params.layers) {
mapParams.layers = params.layers;
}
if (params.node || params.way || params.relation) {
mapParams.object_zoom = true;
if (params.node) {
mapParams.object = {type: 'node', id: parseInt(params.node)};
} else if (params.way) {
mapParams.object = {type: 'way', id: parseInt(params.way)};
} else if (params.relation) {
mapParams.object = {type: 'relation', id: parseInt(params.relation)};
}
}
// Decide on a lat lon to initialise the map with. Various ways of doing this
if (params.bbox) {
var bbox = params.bbox.split(",");
mapParams.bbox = true;
mapParams.minlon = parseFloat(bbox[0]);
mapParams.minlat = parseFloat(bbox[1]);
mapParams.maxlon = parseFloat(bbox[2]);
mapParams.maxlat = parseFloat(bbox[3]);
mapParams.object_zoom = false;
} else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
mapParams.bbox = true;
mapParams.minlon = parseFloat(params.minlon);
mapParams.minlat = parseFloat(params.minlat);
mapParams.maxlon = parseFloat(params.maxlon);
mapParams.maxlat = parseFloat(params.maxlat);
mapParams.object_zoom = false;
} else if (params.lon && params.lat) {
mapParams.lon = parseFloat(params.lon);
mapParams.lat = parseFloat(params.lat);
mapParams.zoom = parseInt(params.zoom || 5);
mapParams.object_zoom = false;
} else if (params.mlon && params.mlat) {
mapParams.lon = parseFloat(params.mlon);
mapParams.lat = parseFloat(params.mlat);
mapParams.zoom = parseInt(params.zoom || 12);
mapParams.object_zoom = false;
} else if (loc = $.cookie('_osm_location')) {
loc = loc.split("|");
mapParams.lon = parseFloat(loc[0]);
mapParams.lat = parseFloat(loc[1]);
mapParams.zoom = parseInt(loc[2]);
mapParams.layers = loc[3];
} else if (OSM.home) {
mapParams.lon = OSM.home.lon;
mapParams.lat = OSM.home.lat;
mapParams.zoom = 10;
} else if (OSM.location) {
mapParams.bbox = true;
mapParams.minlon = OSM.location.minlon;
mapParams.minlat = OSM.location.minlat;
mapParams.maxlon = OSM.location.maxlon;
mapParams.maxlat = OSM.location.maxlat;
} else {
mapParams.lon = -0.1;
mapParams.lat = 51.5;
mapParams.zoom = parseInt(params.zoom || 5);
}
if (mapParams.bbox) {
mapParams.box = params.box == "yes";
mapParams.lon = (mapParams.minlon + mapParams.maxlon) / 2;
mapParams.lat = (mapParams.minlat + mapParams.maxlat) / 2;
}
mapParams.notes = params.notes == "yes";
var scale = parseFloat(params.scale);
if (scale > 0) {
mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);
}
return mapParams;
}
};

100
app/assets/javascripts/params.js
View file

@ -1,100 +0,0 @@
OSM.mapParams = function (search) {
var params = {}, mapParams = {}, loc;
search = (search || window.location.search).replace('?', '').split('&');
for (var i = 0; i < search.length; ++i) {
var pair = search[i],
j = pair.indexOf('='),
key = pair.slice(0, j),
val = pair.slice(++j);
params[key] = decodeURIComponent(val);
}
if (params.mlon && params.mlat) {
mapParams.marker = true;
mapParams.mlon = parseFloat(params.mlon);
mapParams.mlat = parseFloat(params.mlat);
}
if (params.layers) {
mapParams.layers = params.layers;
}
if (params.node || params.way || params.relation) {
mapParams.object = true;
mapParams.object_zoom = true;
if (params.node) {
mapParams.object_type = 'node';
mapParams.object_id = parseInt(params.node);
} else if (params.way) {
mapParams.object_type = 'way';
mapParams.object_id = parseInt(params.way);
} else if (params.relation) {
mapParams.object_type = 'relation';
mapParams.object_id = parseInt(params.relation);
}
}
// Decide on a lat lon to initialise the map with. Various ways of doing this
if (params.bbox) {
var bbox = params.bbox.split(",");
mapParams.bbox = true;
mapParams.minlon = parseFloat(bbox[0]);
mapParams.minlat = parseFloat(bbox[1]);
mapParams.maxlon = parseFloat(bbox[2]);
mapParams.maxlat = parseFloat(bbox[3]);
mapParams.object_zoom = false;
} else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
mapParams.bbox = true;
mapParams.minlon = parseFloat(params.minlon);
mapParams.minlat = parseFloat(params.minlat);
mapParams.maxlon = parseFloat(params.maxlon);
mapParams.maxlat = parseFloat(params.maxlat);
mapParams.object_zoom = false;
} else if (params.lon && params.lat) {
mapParams.lon = parseFloat(params.lon);
mapParams.lat = parseFloat(params.lat);
mapParams.zoom = parseInt(params.zoom || 5);
mapParams.object_zoom = false;
} else if (params.mlon && params.mlat) {
mapParams.lon = parseFloat(params.mlon);
mapParams.lat = parseFloat(params.mlat);
mapParams.zoom = parseInt(params.zoom || 12);
mapParams.object_zoom = false;
} else if (loc = $.cookie('_osm_location')) {
loc = loc.split("|");
mapParams.lon = parseFloat(loc[0]);
mapParams.lat = parseFloat(loc[1]);
mapParams.zoom = parseInt(loc[2]);
mapParams.layers = loc[3];
} else if (OSM.home) {
mapParams.lon = OSM.home.lon;
mapParams.lat = OSM.home.lat;
mapParams.zoom = 10;
} else if (OSM.location) {
mapParams.bbox = true;
mapParams.minlon = OSM.location.minlon;
mapParams.minlat = OSM.location.minlat;
mapParams.maxlon = OSM.location.maxlon;
mapParams.maxlat = OSM.location.maxlat;
} else {
mapParams.lon = -0.1;
mapParams.lat = 51.5;
mapParams.zoom = parseInt(params.zoom || 5);
}
if (mapParams.bbox) {
mapParams.box = params.box == "yes";
mapParams.lon = (mapParams.minlon + mapParams.maxlon) / 2;
mapParams.lat = (mapParams.minlat + mapParams.maxlat) / 2;
}
var scale = parseFloat(params.scale);
if (scale > 0) {
mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);
}
return mapParams;
};

19
app/assets/javascripts/templates/browse/feature.jst.ejs Normal file
View file

@ -0,0 +1,19 @@
<div style="text-align: center; margin-bottom: 20px;">
<a href="#" class="browse_show_list"><%- I18n.t('browse.start_rjs.object_list.back') %></a>
</div>
<table width="100%" class="browse_heading">
<tr>
<td><%- name %></td>
<td align="right">
<a href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.details') %></a>
</td>
</tr>
</table>
<div class="browse_details">
<ul>
<% for (var key in attributes) { %>
<li><b><%- key %></b>: <%- attributes[key] %></li>
<% } %>
</ul>
<a href="<%- url %>/history" class="browse_show_history"><%- I18n.t('browse.start_rjs.show_history') %></a>
</div>

15
app/assets/javascripts/templates/browse/feature_history.jst.ejs Normal file
View file

@ -0,0 +1,15 @@
<table width="100%" class="browse_heading">
<tr>
<td><%- I18n.t("browse.start_rjs.history_for_feature", {feature: name}) %></td>
<td align="right">
<a href="<%- url %>/history"><%- I18n.t('browse.start_rjs.details') %></a>
</td>
</tr>
</table>
<div class="browse_details">
<ul>
<% for (var i = 0; i < history.length; i++) { %>
<li><%- I18n.t("browse.start_rjs.edited_by_user_at_timestamp", history[i]) %></li>
<% } %>
</ul>
</div>

9
app/assets/javascripts/templates/browse/feature_list.jst.ejs Normal file
View file

@ -0,0 +1,9 @@
<div>
<p class="browse_heading"><%- I18n.t('browse.start_rjs.object_list.heading') %></p>
<ul>
<% for (var i = 0; i < features.length; i++) { %>
<li><%- features[i].typeName %> <a href="<%- features[i].url %>" data-feature-id="<%- features[i].id %>"><%- features[i].name %></a></li>
<% } %>
</ul>
<a href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.api') %></a>
</div>

42
app/assets/javascripts/user.js Normal file
View file

@ -0,0 +1,42 @@
$(document).ready(function () {
var map = createMap("map");
if (OSM.home) {
setMapCenter(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat), 12);
} else {
setMapCenter(new OpenLayers.LonLat(0, 0), 0);
}
if ($("#map").hasClass("set_location")) {
var marker;
if (OSM.home) {
marker = addMarkerToMap(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat));
}
map.events.register("click", map, function (e) {
if ($('#updatehome').is(':checked')) {
var lonlat = getEventPosition(e);
$('#homerow').removeClass();
$('#home_lat').val(lonlat.lat);
$('#home_lon').val(lonlat.lon);
if (marker) {
removeMarkerFromMap(marker);
}
marker = addMarkerToMap(lonlat);
}
});
} else {
$("[data-user]").each(function () {
var user = $(this).data('user');
if (user.lon && user.lat) {
var icon = OpenLayers.Marker.defaultIcon();
icon.url = OpenLayers.Util.getImageLocation(user.icon);
addMarkerToMap(new OpenLayers.LonLat(user.lon, user.lat), icon, user.description);
}
});
}
});

BIN
app/assets/openlayers/theme/openstreetmap/img/missing-tile.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

54
app/assets/stylesheets/common.css.scss
View file

@ -652,6 +652,12 @@ body.site-export #tabnav a#exportanchor {
margin-bottom: 5px;
}
/* Rules for text content pages */
.wide-table {
width: 100%;
}
/* Rules for the home page */
.site-index #map {
@ -1004,18 +1010,48 @@ p#contributorGuidance {
/* Rules for message in/out box page */
#messages {
border: 1px solid #ccc;
.messages {
width: 100%;
border-collapse: collapse;
border-spacing: 0px;
border-width: 0px;
}
.inbox-row-unread .inbox-subject {
font-weight: bold;
.messages tbody tr {
border-top: 1px solid #ccc;
}
.messages .inbox-row {
background: #eee;
}
.messages tr td,
.messages tr th {
padding: 0px 5px;
}
.inbox-row .inbox-mark-read {
display: none;
}
.info-line {
border-bottom: 1px solid #ccc;
padding: 5px 0px 4px 0px;
}
.info-line form,
.info-line form div {
display: inline;
}
.info-line .user_thumbnail_tiny {
vertical-align: middle;
}
.right {
float: right;
}
.inbox-row-unread .inbox-mark-unread {
display: none;
}
@ -1113,13 +1149,19 @@ textarea {
img.user_image {
max-width: 100px;
max-height: 100px;
border: 1px solid black;
border: 1px solid #ccc;
}
img.user_thumbnail {
max-width: 50px;
max-height: 100px;
border: 1px solid black;
border: 1px solid #ccc;
}
img.user_thumbnail_tiny {
max-width: 25px;
max-height: 25px;
border: 1px solid #ccc;
}
/* Rule for "nowrap" class that can be applied to anything to stop wrapping */

3
app/controllers/browse_controller.rb
View file

@ -30,9 +30,6 @@ class BrowseController < ApplicationController
@way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members])
@next = Way.visible.where("id > ?", @way.id).order("id ASC").first
@prev = Way.visible.where("id < ?", @way.id).order("id DESC").first
# Used for edit link, takes approx middle node of way
@midnode = @way.nodes[@way.nodes.length/2]
rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found
end

2
app/controllers/changeset_controller.rb
View file

@ -328,8 +328,6 @@ class ChangesetController < ApplicationController
@page = (params[:page] || 1).to_i
@page_size = 20
@bbox = bbox
@edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags)
render :action => :list

15
app/controllers/site_controller.rb
View file

@ -39,6 +39,21 @@ class SiteController < ApplicationController
if editor == "remote"
render :action => :index
return
end
if params[:node]
bbox = Node.find(params[:node]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
elsif params[:way]
bbox = Way.find(params[:way]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
elsif params[:gpx]
trace = Trace.visible_to(@user).find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
end
end

31
app/controllers/user_controller.rb
View file

@ -1,20 +1,22 @@
class UserController < ApplicationController
layout :choose_layout
skip_before_filter :verify_authenticity_token, :only => [:api_details, :api_gpx_files]
skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files]
before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
before_filter :authorize, :only => [:api_details, :api_gpx_files]
before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
before_filter :set_locale, :except => [:api_details, :api_gpx_files]
before_filter :authorize_web, :except => [:api_read, :api_details, :api_gpx_files]
before_filter :set_locale, :except => [:api_read, :api_details, :api_gpx_files]
before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
before_filter :check_database_readable, :except => [:login, :api_details, :api_gpx_files]
before_filter :check_database_readable, :except => [:login, :api_read, :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 :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files]
before_filter :require_allow_read_prefs, :only => [:api_details]
before_filter :require_allow_read_gpx, :only => [:api_gpx_files]
before_filter :require_cookies, :only => [:login, :confirm]
before_filter :require_administrator, :only => [:set_status, :delete, :list]
before_filter :lookup_this_user, :only => [:set_status, :delete]
around_filter :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files]
before_filter :lookup_user_by_id, :only => [:api_read]
before_filter :lookup_user_by_name, :only => [:set_status, :delete]
cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
@ -373,6 +375,15 @@ class UserController < ApplicationController
end
end
def api_read
render :nothing => true, :status => :gone unless @this_user.visible?
end
def api_details
@this_user = @user
render :action => :api_read
end
def api_gpx_files
doc = OSM::API.new.get_xml_doc
@user.traces.each do |trace|
@ -714,7 +725,13 @@ private
##
# ensure that there is a "this_user" instance variable
def lookup_this_user
def lookup_user_by_id
@this_user = User.find(params[:id])
end
##
# ensure that there is a "this_user" instance variable
def lookup_user_by_name
@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

8
app/helpers/browse_helper.rb
View file

@ -14,7 +14,7 @@ module BrowseHelper
name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
end
# don't look at object tags if redacted, so as to avoid giving
# 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}"
@ -63,7 +63,7 @@ module BrowseHelper
private
ICON_TAGS = [
ICON_TAGS = [
"aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
"leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
]
@ -97,10 +97,10 @@ private
if key == "wikipedia"
# This regex should match Wikipedia language codes, everything
# from de to zh-classical
if value =~ /^([a-z-]{2,12}):(.+)$/
if value =~ /^([a-z-]{2,12}):(.+)$/i
# Value is <lang>:<title> so split it up
# Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315
lang = $1
value = $2
else
# Value is <title> so default to English Wikipedia
lang = 'en'

6
app/helpers/user_helper.rb
View file

@ -11,6 +11,12 @@ module UserHelper
image_tag user.image.url(:small), options
end
def user_thumbnail_tiny(user, options = {})
options[:class] ||= "user_thumbnail_tiny"
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

4
app/models/diary_entry.rb
View file

@ -1,7 +1,7 @@
class DiaryEntry < ActiveRecord::Base
belongs_to :user
belongs_to :user, :counter_cache => true
belongs_to :language, :foreign_key => 'language_code'
has_many :comments, :class_name => "DiaryComment",
:include => :user,
:order => "diary_comments.id"

6
app/models/relation.rb
View file

@ -77,6 +77,12 @@ class Relation < ActiveRecord::Base
relation.add_tag_keyval(tag['k'], tag['v'])
end
# need to initialise the relation members array explicitly, as if this
# isn't done for a new relation then @members attribute will be nil,
# and the members will be loaded from the database instead of being
# empty, as intended.
relation.members = Array.new
pt.find('member').each do |member|
#member_type =
logger.debug "each member"

221
app/views/browse/_map.html.erb
View file

@ -2,23 +2,73 @@
</iframe>
<div id="browse_map">
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
<div id="small_map">
</div>
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
<% content_for :head do %>
<%= javascript_include_tag "browse" %>
<% end %>
<%
if map.instance_of? Changeset
bbox = map.bbox.to_unscaled
data = {
:type => "changeset",
:id => map.id,
:minlon => bbox.min_lon,
:minlat => bbox.min_lat,
:maxlon => bbox.max_lon,
:maxlat => bbox.max_lat
}
elsif map.instance_of? Note
data = {
:type => "note",
:lon => map.lon,
:lon => map.lat
}
else
data = {
:type => map.class.name.downcase,
:id => map.id,
:version => map.version,
:visible => map.visible
}
end
%>
<%= content_tag "div", "", :id => "small_map", :data => data %>
<span id="loading"><%= t 'browse.map.loading' %></span>
<% if map.instance_of? Note -%>
<%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :notes => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
<%= link_to t("browse.map.larger.area"),
root_path(:note => "yes"),
:id => "area_larger_map",
:class => "geolink bbox" %>
<% else -%>
<%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
<%= link_to t("browse.map.larger.area"),
root_path(:box => "yes"),
:id => "area_larger_map",
:class => "geolink bbox" %>
<% end -%>
<br />
<%= link_to(h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
<%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"),
edit_path,
:id => "area_edit",
:data => { :editor => preferred_editor },
:class => "geolink bbox" %>
<% unless map.instance_of? Changeset or map.instance_of? Note %>
<br />
<%= link_to(t("browse.map.larger." + map.class.to_s.downcase), { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
<%= link_to t("browse.map.larger." + map.class.to_s.downcase),
root_path,
:id => "object_larger_map",
:class => "geolink object" %>
<br />
<%= 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" }) %>
<%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"),
edit_path,
:id => "object_edit",
:data => { :editor => preferred_editor },
:class => "geolink object" %>
<% end %>
<% else %>
<%= t 'browse.map.deleted' %>
<% end %>
@ -26,157 +76,22 @@
<div id="area_edit_menu" class="menu">
<ul>
<% 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}_area_edit", :class => "geolink bbox" } %></li>
<% Editors::RECOMMENDED_EDITORS.each do |editor| %>
<li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
edit_path(:editor => editor),
:data => {:editor => editor},
:class => "geolink bbox" %></li>
<% end %>
</ul>
</div>
<div id="object_edit_menu" class="menu">
<ul>
<% 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}_object_edit", :class => "geolink object" } %></li>
<% Editors::RECOMMENDED_EDITORS.each do |editor| %>
<li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
edit_path(:editor => editor),
:data => {:editor => editor},
:class => "geolink object" %></li>
<% end %>
</ul>
</div>
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
<script type="text/javascript">
function remoteEditHandler(event, bbox, select) {
var left = bbox.left - 0.0001;
var top = bbox.top + 0.0001;
var right = bbox.right + 0.0001;
var bottom = bbox.bottom - 0.0001;
var loaded = false;
$("#linkloader").load(function () { loaded = true; });
if (select) {
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
} else {
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
}
setTimeout(function () {
if (!loaded) alert("<%=j t('site.index.remote_failed') %>");
}, 1000);
return false;
}
function init() {
var map = createMap("small_map", {
controls: [ new OpenLayers.Control.Navigation() ]
});
<% if map.instance_of? Changeset -%>
<% bbox = map.bbox.to_unscaled %>
var minlon = <%= bbox.min_lon %>;
var minlat = <%= bbox.min_lat %>;
var maxlon = <%= bbox.max_lon %>;
var maxlat = <%= bbox.max_lat %>;
var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
var centre = bbox.getCenterLonLat();
map.zoomToExtent(proj(bbox));
addBoxToMap(bbox);
$("#loading").hide();
$("#browse_map .geolink").show();
$("#remote_area_edit").click(function (event) {
return remoteEditHandler(event, bbox);
});
<% if preferred_editor == "remote" -%>
$("#area_edit").click(function (event) {
return remoteEditHandler(event, bbox);
});
<% end -%>
updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
<% elsif map.instance_of? Note %>
var centre = new OpenLayers.LonLat(<%= map.lon %>, <%= map.lat %>);
setMapCenter(centre, 16);
addMarkerToMap(centre);
var bbox = getMapExtent();
$("#loading").hide();
$("#browse_map .geolink").show();
$("#remote_area_edit").click(function (event) {
return remoteEditHandler(event, bbox);
});
<% if preferred_editor == "remote" -%>
$("#area_edit").click(function (event) {
return remoteEditHandler(event, bbox);
});
<% end -%>
updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
<% else %>
var obj_type = "<%= map.class.name.downcase %>";
var obj_id = <%= map.id %>;
var obj_version = <%= map.version %>;
var obj_visible = <%= map.visible %>;
var url = "/api/<%= API_VERSION %>/<%= map.class.name.downcase %>/<%= map.id %>";
if (obj_type != "node") {
url += "/full";
} else if (!obj_visible) {
var previous_version = obj_version - 1;
url += "/" + previous_version;
}
$("#object_larger_map").hide();
$("#object_edit").hide();
addObjectToMap(url, true, function(extent) {
$("#loading").hide();
$("#browse_map .geolink").show();
if (extent) {
extent.transform(map.getProjectionObject(), map.displayProjection);
var centre = extent.getCenterLonLat();
$("#remote_area_edit").click(function (event) {
return remoteEditHandler(event, extent);
});
<% if preferred_editor == "remote" -%>
$("#area_edit").click(function (event) {
return remoteEditHandler(event, extent);
});
<% end -%>
$("#remote_object_edit").click(function (event) {
return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
});
<% if preferred_editor == "remote" -%>
$("#object_edit").click(function (event) {
return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
});
<% 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 {
$("#small_map").hide();
}
});
<% end -%>
createMenu("area_edit", "area_edit_menu", "right");
createMenu("object_edit", "object_edit_menu", "right");
}
window.onload = init;
</script>
<% end %>

4
app/views/browse/way.html.erb
View file

@ -12,6 +12,4 @@
<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 -%>
| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id) %>

28
app/views/changeset/_changeset.html.erb
View file

@ -1,6 +1,18 @@
<% cl = cycle('table0', 'table1') %>
<%
changeset_data = {:id => changeset.id}
<tr class="<%= cl %>" id="tr-changeset-<%= changeset.id%>">
if changeset.has_valid_bbox?
bbox = changeset.bbox.to_unscaled
changeset_data[:bbox] = {
:minlon => bbox.min_lon,
:minlat => bbox.min_lat,
:maxlon => bbox.max_lon,
:maxlat => bbox.max_lat
}
end
%>
<%= content_tag "tr", :class => cycle('table0', 'table1'), :id => "tr-changeset-#{changeset.id}", :data => {:changeset => changeset_data} do %>
<td>
<%=
id_link = link_to(changeset.id,
@ -35,14 +47,4 @@
<%= t'changeset.changeset.no_comment' %>
<% end %>
</td>
</tr>
<script type="text/javascript">
$("#tr-changeset-<%= changeset.id%>").mouseover(function() {
highlightChangeset("<%= changeset.id %>");
});
$("#tr-changeset-<%= changeset.id%>").mouseout(function() {
unHighlightChangeset("<%= changeset.id %>");
});
</script>
<% end %>

81
app/views/changeset/_map.html.erb
View file

@ -1,83 +1,2 @@
<div id="changeset_list_map">
</div>
<script type="text/javascript">
var highlight;
function highlightChangeset(id) {
var feature = vectors.getFeatureByFid(id);
var bounds = feature.geometry.getBounds();
if (bounds.containsBounds(map.getExtent())) {
bounds = map.getExtent().scale(1.1);
}
if (highlight) vectors.removeFeatures(highlight);
highlight = new OpenLayers.Feature.Vector(bounds.toGeometry(), {}, {
strokeWidth: 2,
strokeColor: "#ee9900",
fillColor: "#ffff55",
fillOpacity: 0.5
});
vectors.addFeatures(highlight);
$("#tr-changeset-" + id).addClass("selected");
}
function unHighlightChangeset(id) {
vectors.removeFeatures(highlight);
$("#tr-changeset-" + id).removeClass("selected");
}
$(document).ready(function () {
var map = createMap("changeset_list_map", {
controls: [
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.Zoom(),
new OpenLayers.Control.SimplePanZoom()
]
});
var bounds = new OpenLayers.Bounds();
<% @edits.each do |edit| %>
<% if edit.has_valid_bbox? %>
<% bbox = edit.bbox.to_unscaled %>
var minlon = <%= bbox.min_lon %>;
var minlat = <%= bbox.min_lat %>;
var maxlon = <%= bbox.max_lon %>;
var maxlat = <%= bbox.max_lat %>;
var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
bounds.extend(bbox);
addBoxToMap(bbox, "<%= edit.id %>", true);
<% end %>
<% end %>
vectors.events.on({
"featureselected": function(feature) {
highlightChangeset(feature.feature.fid);
},
"featureunselected": function(feature) {
unHighlightChangeset(feature.feature.fid);
}
});
var selectControl = new OpenLayers.Control.SelectFeature(vectors, {
multiple: false,
hover: true
});
map.addControl(selectControl);
selectControl.activate();
<% if ! @bbox.nil? %>
map.zoomToExtent(proj(new OpenLayers.Bounds(<%= @bbox %>)));
<% else %>
map.zoomToExtent(proj(bounds));
<% end %>
});
</script>

4
app/views/changeset/list.html.erb
View file

@ -1,3 +1,7 @@
<% content_for :head do -%>
<%= javascript_include_tag "changeset" %>
<% end -%>
<h1><%= @heading %></h1>
<p><%= raw(@description) %></p>

47
app/views/diary_entry/edit.html.erb
View file

@ -1,3 +1,7 @@
<% content_for :head do %>
<%= javascript_include_tag "diary_entry" %>
<% end %>
<h1><%= @title %></h1>
<%= error_messages_for 'diary_entry' %>
@ -19,9 +23,9 @@
<tr valign="top">
<td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
<td>
<div id="map"></div>
<%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
<span class="location"><%= t 'diary_entry.edit.latitude' -%> <%= f.text_field :latitude, :size => 20, :id => "latitude" %> <%= t 'diary_entry.edit.longitude' -%> <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
<a href="javascript:openMap()" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
<a href="#" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
<br/><br/>
</td>
</tr>
@ -34,42 +38,3 @@
</tr>
</table>
<% end %>
<script type="text/javascript">
<!--
var marker;
function setLocation( e ) {
closeMapPopup();
var lonlat = getEventPosition(e);
$("#latitude").val(lonlat.lat);
$("#longitude").val(lonlat.lon);
if (marker) {
removeMarkerFromMap(marker);
}
marker = addMarkerToMap(lonlat, null, "<%= t 'diary_entry.edit.marker_text' -%>");
}
function openMap() {
$("#map").show();
$("#usemap").hide();
var centre = new OpenLayers.LonLat(<%= @lon %>, <%= @lat %>);
var zoom = <%= @zoom %>;
var map = createMap("map");
setMapCenter(centre, zoom);
<% if @diary_entry.latitude and @diary_entry.longitude %>
marker = addMarkerToMap(centre, null, "<%= t 'diary_entry.edit.marker_text' -%>");
<% end %>
map.events.register("click", map, setLocation);
}
// -->
</script>

2
app/views/layouts/_head.html.erb
View file

@ -29,6 +29,8 @@
<% if session[:location] %>
OSM.location = <%= session[:location].to_json.html_safe %>;
<% end %>
OSM.preferred_editor = <%= preferred_editor.to_json.html_safe %>;
</script>
<title><%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %></title>
</head>

7
app/views/layouts/site.html.erb
View file

@ -32,7 +32,7 @@
<li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, {
:id => 'editanchor',
:title => t('javascripts.site.edit_tooltip'),
:data => { :minzoom => 13 },
:data => { :minzoom => 13, :editor => preferred_editor },
:class => 'geolink llz object disabled'
} %></li>
<li><%= link_to t('layouts.history'), browse_changesets_path, {
@ -44,17 +44,18 @@
<li><%= link_to t('layouts.export'), export_path, {
:id => 'exportanchor',
:title => t('layouts.export_tooltip'),
:data => { :url => url_for(:controller => :export, :action => :start) },
:class => 'geolink llz layers'
} %></li>
</ul>
</div>
<div id="editmenu" class="menu">
<ul>
<% Editors::ALL_EDITORS.each do |editor| %>
<% Editors::RECOMMENDED_EDITORS.each do |editor| %>
<li><%= link_to t('layouts.edit_with',
:editor => t("editor.#{editor}.description")),
edit_path(:editor => editor), {
:id => editor + 'anchor',
:data => { :editor => editor },
:class => "geolink llz object"
} %></li>
<% end %>

9
app/views/message/_message_summary.html.erb
View file

@ -1,11 +1,8 @@
<% this_colour = cycle('lightgrey', 'white') %>
<tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" if not message_summary.message_read? %>">
<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>
<td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %></td>
<td class="inbox-subject"><%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %></td>
<td class="inbox-sent nowrap"><%= l message_summary.sent_on, :format => :friendly %></td>
<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>

8
app/views/message/_sent_message_summary.html.erb
View file

@ -1,8 +1,6 @@
<% 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 => '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 class="inbox-sender"><%= 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"><%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %></td>
<td class="inbox-sent nowrap"><%= 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>
</tr>

17
app/views/message/inbox.html.erb
View file

@ -1,21 +1,24 @@
<div class='text-content'>
<h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %></h2>
<%= render :partial => "message_count" %>
<% if @user.messages.size > 0 %>
<div id="messages">
<table class="messages">
<table class="messages">
<thead>
<tr>
<th><%= t'message.inbox.from' %></th>
<th><%= t'message.inbox.subject' %></th>
<th><%= t'message.inbox.date' %></th>
<th></th>
<th></th>
<th></th>
</tr>
<%= render :partial => "message_summary", :collection => @user.messages %>
</table>
</div>
</thead>
<tbody>
<%= render :partial => "message_summary", :collection => @user.messages %>
</tbody>
</table>
<% else %>
<div id="messages"><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
<div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
<% end %>
</div>

12
app/views/message/outbox.html.erb
View file

@ -3,17 +3,19 @@
<p><%= t'message.outbox.messages', :count => @user.sent_messages.size %></p>
<% if @user.sent_messages.size > 0 %>
<div id="messages">
<table class="messages">
<table class="messages">
<thead>
<tr>
<th><%= t'message.outbox.to' %></th>
<th><%= t'message.outbox.subject' %></th>
<th><%= t'message.outbox.date' %></th>
<th></th>
</tr>
</thead>
<tbody>
<%= render :partial => "sent_message_summary", :collection => @user.sent_messages %>
</table>
</div>
</tbody>
</table>
<% else %>
<div id="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
<div class="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
<% end %>

84
app/views/message/read.html.erb
View file

@ -1,73 +1,37 @@
<div class='text-content'>
<% if @user == @message.recipient %>
<h2><%= t'message.read.reading_your_messages' %></h2>
<h2><%= h(@message.title) %></h2>
<table>
<tr>
<th class="fieldName"><%= t'message.read.from' %></th>
<td><%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
<td rowspan="4" valign="top"><%= user_thumbnail @message.sender %></td>
</tr>
<tr>
<th class="fieldName"><%= t'message.read.subject' %></th>
<td><%= h(@message.title) %></td>
<td></td>
</tr>
<tr>
<th class="fieldName"><%= t'message.read.date' %></th>
<td><%= l @message.sent_on, :format => :friendly %></td>
<td></td>
</tr>
<tr>
<th></th>
<td><%= @message.body.to_html %></td>
<td></td>
</tr>
</table>
<div class='info-line'>
<%= user_thumbnail_tiny @message.sender %>
<%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
<div class='right'>
<%= l @message.sent_on, :format => :friendly %>
<%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %>
<%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %>
</div>
</div>
<br />
<%= @message.body.to_html %></td>
<table>
<tr>
<td><%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %></td>
<td><%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
<td><%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
</tr>
</table>
<%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
<% else %>
<h2><%= t'message.read.reading_your_sent_messages' %></h2>
<h2><%= h(@message.title) %></h2>
<table>
<tr>
<th class="fieldName"><%= t'message.read.to' %></th>
<td><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
<td rowspan="4" valign="top"><%= user_thumbnail @message.recipient %></td>
</tr>
<tr>
<th class="fieldName"><%= t'message.read.subject' %></th>
<td><%= h(@message.title) %></td>
<td></td>
</tr>
<tr>
<th class="fieldName"><%= t'message.read.date' %></th>
<td><%= l @message.sent_on, :format => :friendly %></td>
<td></td>
</tr>
<tr>
<th></th>
<td><%= @message.body.to_html %></td>
<td></td>
</tr>
</table>
<div class='info-line'>
<%= user_thumbnail_tiny @message.recipient %>
<%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
<div class='right'>
<%= l @message.sent_on, :format => :friendly %>
</div>
</div>
<br />
<%= @message.body.to_html %></td>
<table>
<tr>
<td><%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %></td>
</tr>
</table>
<%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
<% end %>
</div>

5
app/views/site/_home_link.html.erb Normal file
View file

@ -0,0 +1,5 @@
<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
<% content_for :greeting do %>
<%= 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 %>

3
app/views/site/_key.html.erb
View file

@ -1,3 +0,0 @@
<% content_for :left_menu do %>
<li><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></li>
<% end %>

10
app/views/site/_potlatch.html.erb
View file

@ -42,16 +42,18 @@
// 700,600 for fixed size, 100%,100% for resizable
}
<% if @lat && @lon -%>
doSWF(<%= @lat %>,<%= @lon %>,16);
<% else -%>
var params = OSM.mapParams();
doSWF(params.lat, params.lon, params.zoom || 17);
<% end -%>
$(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"));
var data = $(this).data();
doSWF(lat, lon, zoom || 15);
doSWF(data.lat, data.lon, data.zoom || 15);
});
});
</script>

17
app/views/site/_potlatch2.html.erb
View file

@ -63,15 +63,8 @@
// 700,600 for fixed size, 100%,100% for resizable
}
<% if params[:node] -%>
<% bbox = Node.find(params[:node]).bbox.to_unscaled -%>
doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
<% elsif params[:way] -%>
<% bbox = Way.find(params[:way]).bbox.to_unscaled -%>
doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
<% elsif params[:gpx] -%>
<% trace = Trace.find(params[:gpx]) -%>
doSWF(<%= trace.latitude %>,<%= trace.longitude %>,16);
<% if @lat && @lon -%>
doSWF(<%= @lat %>,<%= @lon %>,16);
<% else -%>
var params = OSM.mapParams();
doSWF(params.lat, params.lon, params.zoom || 17);
@ -79,12 +72,10 @@
$(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"));
var data = $(this).data();
$("#potlatch").each(function () {
this.setPosition(lat, lon, Math.max(zoom || 15, 13));
this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));
});
});
});

30
app/views/site/_search.html.erb
View file

@ -10,34 +10,6 @@
zoom: args["zoom"]
}, openSidebar);
}
function doSearch(query) {
$("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>");
<% if params[:action] == 'index' -%>
var extent = unproj(map.getExtent());
$("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :search %>", {
query: $("#query").val(),
minlon: extent.left,
minlat: extent.bottom,
maxlon: extent.right,
maxlat: extent.top
}, openSidebar);
<% else -%>
$("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :search %>", {
query: $("#query").val()
}, openSidebar);
<% end -%>
}
$(document).ready(function () {
$("#search_form").submit(function (event) {
doSearch($("#query").val());
return false;
});
});
// -->
</script>
@ -45,7 +17,7 @@
<div class="optionalbox">
<div class="search_container">
<div id="search_field">
<%= form_tag "#", :id => "search_form" do %>
<%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
<%= submit_tag t('site.search.submit_text') %>
<%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search') %>
<% end %>

7
app/views/site/copyright.html.erb
View file

@ -38,6 +38,13 @@
<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>
<p><%= t "license_page.legal_babble.credit_3_html", :locale => @locale %></p>
<p><%= image_tag("attribution_example.png",
:alt => t('license_page.legal_babble.attribution_example.alt'),
:border => 0,
:width => 193,
:height => 69,
:title => t('license_page.legal_babble.attribution_example.title')) %>
<h3><%= t "license_page.legal_babble.more_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.more_1_html", :locale => @locale %></p>

42
app/views/site/edit.html.erb
View file

@ -9,49 +9,13 @@
<p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
<p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>
<% else %>
<% content_for :greeting do %>
<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
<%= 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 %>
<% content_for :head do %>
<%= javascript_include_tag "edit" %>
<% end %>
<%= render :partial => 'home_link' %>
<%= render :partial => 'sidebar' %>
<%= render :partial => 'search' %>
<%= render :partial => preferred_editor %>
<script type="text/javascript">
function maximiseMap() {
$("#left").hide();
$("#greeting").hide();
$("#tabnav").hide();
$("#content").css("top", "0px");
<% if t('html.dir') == "ltr" -%>
$("#content").css("left", "0px");
<% else -%>
$("#content").css("right", "0px");
<% end -%>
handleResize();
}
function minimiseMap() {
$("#left").show();
$("#greeting").show();
$("#tabnav").show();
$("#content").css("top", "30px");
<% if t('html.dir') == "ltr" -%>
$("#content").css("left", "185px");
<% else -%>
$("#content").css("right", "185px");
<% end -%>
handleResize();
}
$(document).ready(handleResize);
$(window).resize(handleResize);
</script>
<% end %>

190
app/views/site/index.html.erb
View file

@ -1,18 +1,20 @@
<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
<% content_for :greeting do %>
<%= 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 %>
<% content_for :head do %>
<%= javascript_include_tag "index" %>
<% end %>
<% unless STATUS == :api_offline or STATUS == :database_offline -%>
<% content_for :editmenu do -%>
<li><%= link_to t("browse.start_rjs.notes_layer_name"), "#", :id => "show_notes" %></li>
<li><%= link_to t("browse.start_rjs.notes_layer_name"), notes_url(:format => :json), :id => "show_notes" %></li>
<li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
<% end -%>
<% end -%>
<% content_for :left_menu do %>
<li><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></li>
<% end %>
<%= render :partial => 'home_link' %>
<%= render :partial => 'sidebar' %>
<%= render :partial => 'key' %>
<%= render :partial => 'search' %>
<noscript>
@ -46,179 +48,3 @@
</div>
<div id="new-note" class="hidden"><%= render :partial => "notes/new" %></div>
<script type="text/javascript">
var marker;
var map;
var params = OSM.mapParams();
<% if @user %>
var loginName = "<%= @user.display_name %>"
<% end %>
function mapInit(){
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,
displayInLayerSwitcher: false
});
map.addLayer(map.dataLayer);
map.noteLayer = addNoteLayer(map, "<%= notes_url :format => 'json' %>", $("#createnoteanchor"), $("#new-note"), 11);
<% if params[:notes] == "yes" -%>
map.noteLayer.setVisibility(true);
<% end -%>
<% end %>
if (!params.object_zoom) {
if (params.bbox) {
var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
map.zoomToExtent(proj(bbox));
if (params.box) {
$(window).load(function() { addBoxToMap(bbox) });
}
} else {
setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
}
}
if (params.layers) {
setMapLayers(params.layers);
}
if (params.marker) {
marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
}
if (params.object) {
var url = "/api/" + OSM.API_VERSION + "/" + params.object_type + "/" + params.object_id;
if (params.object_type != "node") {
url += "/full";
}
$(window).load(function() { addObjectToMap(url, params.object_zoom) });
}
map.events.register("moveend", map, updateLocation);
map.events.register("changelayer", map, updateLocation);
updateLocation();
handleResize();
}
$(document).ready(function () {
$("#show_notes").click(function () {
map.noteLayer.setVisibility(true);
});
$("#show_data").click(function (e) {
$.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
startBrowse(sidebarHtml);
}});
e.preventDefault();
});
$("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);
}
if (marker) {
removeMarkerFromMap(marker);
}
marker = addMarkerToMap(centre, getArrowIcon());
return false;
});
});
function updateLocation() {
var lonlat = unproj(map.getCenter());
var zoom = map.getZoom();
var layers = getMapLayers();
var extents = unproj(map.getExtent());
var expiry = new Date();
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
expiry.setYear(expiry.getFullYear() + 10);
$.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
}
function remoteEditHandler(event) {
var extent = unproj(map.getExtent());
var loaded = false;
$("#linkloader").load(function () { loaded = true; });
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
setTimeout(function () {
if (!loaded) alert("<%=j t('site.index.remote_failed') %>");
}, 1000);
return false;
}
function installEditHandler() {
$("#remoteanchor").click(remoteEditHandler);
<% if preferred_editor == "remote" %>
$("#editanchor").click(remoteEditHandler);
<% if params[:action] == "edit" %>
remoteEditHandler();
<% end %>
<% end %>
}
$(document).ready(mapInit);
$(document).ready(installEditHandler);
$(document).ready(handleResize);
$(window).resize(function() {
var centre = map.getCenter();
var zoom = map.getZoom();
handleResize();
map.setCenter(centre, zoom);
});
$(document).ready(function () {
$("#exportanchor").click(function (e) {
$.ajax({ url: "<%= url_for :controller => :export, :action => :start %>", success: function (sidebarHtml) {
startExport(sidebarHtml);
}});
e.preventDefault();
});
<% if params[:export] -%>
$("#exportanchor").click();
<% end -%>
<% if params[:query] -%>
doSearch("<%= params[:query] %>");
<% end %>
});
// -->
</script>

12
app/views/user/_contact.html.erb
View file

@ -1,7 +1,15 @@
<tr>
<td rowspan="3">
<%
user_data = {
:lon => contact.home_lon,
:lat => contact.home_lat,
:icon => type == "friend" ? "marker-blue.png" : "marker-green.png",
:description => render(:partial => "popup", :object => contact, :locals => {:type => type})
}
%>
<%= content_tag "td", :rowspan => 3, :data => {:user => user_data} do %>
<%= user_thumbnail contact %>
</td>
<% end %>
<td>
<%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %>
<% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>

91
app/views/user/_map.html.erb
View file

@ -1,91 +0,0 @@
<%
if @user.home_lat.nil? or @user.home_lon.nil?
lon = h(params['lon'] || '0')
lat = h(params['lat'] || '20')
zoom = h(params['zoom'] || '1')
else
marker = true
mlon = @user.home_lon
mlat = @user.home_lat
lon = @user.home_lon
lat = @user.home_lat
zoom = '12'
end
%>
<script type="text/javascript">
<!--
var marker;
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 %>;
<% end -%>
var map = createMap("map");
setMapCenter(centre, zoom);
<% if marker %>
marker = addMarkerToMap(
new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)
<% if not setting_location %>
, null, '<%=escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
<% end %>
);
<% end %>
<% if setting_location %>
map.events.register("click", map, setHome);
<% end %>
<% if show_other_users %>
<% friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? } %>
<% nearest = @user.nearby - friends %>
var near_icon = OpenLayers.Marker.defaultIcon();
near_icon.url = OpenLayers.Util.getImageLocation("marker-green.png");
<% nearest.each do |u| %>
addMarkerToMap(new OpenLayers.LonLat(
<%= u.home_lon %>, <%= u.home_lat %>), near_icon.clone(),
'<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "nearby mapper" })) %>'
);
<% end %>
var friend_icon = OpenLayers.Marker.defaultIcon();
friend_icon.url = OpenLayers.Util.getImageLocation("marker-blue.png");
<% friends.each do |u| %>
addMarkerToMap(new OpenLayers.LonLat(
<%= u.home_lon %>, <%= u.home_lat %>), friend_icon.clone(),
'<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "friend" })) %>'
);
<% end %>
<% end %>
}
<% if setting_location %>
function setHome( e ) {
closeMapPopup();
if (document.getElementById('updatehome').checked) {
var lonlat = getEventPosition(e);
document.getElementById('homerow').className = '';
document.getElementById('home_lat').value = lonlat.lat;
document.getElementById('home_lon').value = lonlat.lon;
if (marker) {
removeMarkerFromMap(marker);
}
marker = addMarkerToMap(lonlat);
}
}
<% end %>
window.onload = init;
// -->
</script>

7
app/views/user/account.html.erb
View file

@ -117,7 +117,10 @@
<td></td>
<td>
<p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
<div id="map" class="user_map"></div>
<% content_for :head do %>
<%= javascript_include_tag "user" %>
<% end %>
<%= content_tag "div", "", :id => "map", :class => "user_map set_location" %>
</td>
</tr>
@ -128,8 +131,6 @@
</table>
<% end %>
<%= render :partial => 'map', :locals => { :setting_location => true, :show_other_users => false } %>
<% unless @user.data_public? %>
<a name="public"></a>
<h2><%= t 'user.account.public editing note.heading' %></h2>

26
app/views/user/api_details.builder
View file

@ -1,26 +0,0 @@
xml.instruct! :xml, :version => "1.0"
xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
xml.tag! "user", :id => @user.id,
:display_name => @user.display_name,
:account_created => @user.creation_time.xmlschema do
if @user.description
xml.tag! "description", @user.description
end
xml.tag! "contributor-terms",
:agreed => !!@user.terms_agreed,
:pd => !!@user.consider_pd
if @user.home_lat and @user.home_lon
xml.tag! "home", :lat => @user.home_lat,
:lon => @user.home_lon,
:zoom => @user.home_zoom
end
if @user.image.file?
xml.tag! "img", :href => "http://#{SERVER_URL}#{@user.image.url}"
end
if @user.languages
xml.tag! "languages" do
@user.languages.split(",") { |lang| xml.tag! "lang", lang }
end
end
end
end

46
app/views/user/api_read.builder Normal file
View file

@ -0,0 +1,46 @@
xml.instruct! :xml, :version => "1.0"
xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
xml.tag! "user", :id => @this_user.id,
:display_name => @this_user.display_name,
:account_created => @this_user.creation_time.xmlschema do
if @this_user.description
xml.tag! "description", @this_user.description
end
if @user && @user == @this_user
xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed,
:pd => !!@this_user.consider_pd
else
xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed
end
if @this_user.image.file?
xml.tag! "img", :href => "http://#{SERVER_URL}#{@this_user.image.url}"
end
xml.tag! "roles" do
@this_user.roles.each do |role|
xml.tag! role.role
end
end
xml.tag! "changesets", :count => @this_user.changesets.size
xml.tag! "traces", :count => @this_user.traces.size
xml.tag! "blocks" do
xml.tag! "received", :count => @this_user.blocks.size,
:active => @this_user.blocks.active.size
if @this_user.moderator?
xml.tag! "issued", :count => @this_user.blocks_created.size,
:active => @this_user.blocks_created.active.size
end
end
if @user && @user == @this_user
if @this_user.home_lat and @this_user.home_lon
xml.tag! "home", :lat => @this_user.home_lat,
:lon => @this_user.home_lon,
:zoom => @this_user.home_zoom
end
if @this_user.languages
xml.tag! "languages" do
@this_user.languages.split(",") { |lang| xml.tag! "lang", lang }
end
end
end
end
end

29
app/views/user/view.html.erb
View file

@ -14,6 +14,7 @@
<%= link_to t('user.view.my notes'), :controller => 'note', :action=> 'mine' %>
|
<%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
|
<%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
|
@ -41,6 +42,7 @@
<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
|
<%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
<span class='count-number'><%= number_with_delimiter(@this_user.diary_entries.size) %></span>
|
<%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
|
@ -99,7 +101,7 @@
</p>
<% if @user and @user.administrator? -%>
<p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>
<p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>
<% unless @this_user.creation_ip.nil? -%>
<p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
<% end -%>
@ -108,13 +110,24 @@
<% end -%>
<% if @user and @this_user.id == @user.id %>
<div id="map" class="user_map">
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
<div id="map" class="user_map">
<p id="no_home_location"><%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %></p>
<% else %>
<%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %>
</div>
<% else %>
<% content_for :head do %>
<%= javascript_include_tag "user" %>
<% end %>
</div>
<%
user_data = {
:lon => @user.home_lon,
:lat => @user.home_lat,
:icon => "marker.png",
:description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
}
%>
<%= content_tag "div", "", :id => "map", :class => "user_map", :data => {:user => user_data} %>
<% end %>
<% friends = @this_user.friends.collect { |f| f.befriendee } %>
<% nearby = @this_user.nearby - friends %>
@ -127,7 +140,7 @@
<%= link_to t('user.view.friends_changesets'), friend_changesets_path %><br/>
<%= link_to t('user.view.friends_diaries'), friend_diaries_path %><br/><br/>
<table id="friends">
<%= render :partial => "contact", :collection => friends %>
<%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
</table>
<% end %>
@ -139,7 +152,7 @@
<%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %><br/>
<%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %><br/><br/>
<table id="nearbyusers">
<%= render :partial => "contact", :collection => nearby %>
<%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>
</table>
<% end %>
<% end %>

3
config/environments/production.rb
View file

@ -56,7 +56,8 @@ OpenStreetMap::Application.configure do
# config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
config.assets.precompile += %w( pngfix.js swfobject.js )
config.assets.precompile += %w( index.js edit.js browse.js changeset.js )
config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.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/openstreetmap/style.css )

3
config/i18n-js.yml
View file

@ -26,3 +26,6 @@ translations:
- "*.browse.start_rjs.*"
- "*.export.start_rjs.*"
- "*.javascripts.*"
- "*.site.index.remote_failed"
- "*.site.sidebar.search_results"
- "*.diary_entry.edit.marker_text"

7
config/initializers/i18n.rb
View file

@ -1,12 +1,5 @@
module I18n
module Backend
module Fallbacks
def find_first_string_or_lambda_default(defaults)
defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) }
nil
end
end
module PluralizationFallback
def pluralize(locale, entry, count)
super

9
config/locales/af.yml
View file

@ -210,6 +210,8 @@ af:
list:
description: Onlangse wysigings
diary_entry:
comments:
when: Wanneer
diary_comment:
comment_from: Kommentaar van %{link_user} op %{comment_created_at}
confirm: Bevestig
@ -306,13 +308,10 @@ af:
description:
title:
geonames: Ligging vanaf <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} vanaf <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
types:
cities: Stede
places: Plekke
towns: Dorpe
description_osm_namefinder:
prefix: "%{distance} %{direction} van %{type}"
direction:
east: oos
north: noord
@ -334,12 +333,8 @@ af:
ca_postcode: Resultate vanaf <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Resultate vanaf <a href="http://www.geonames.org/">GeoNames</a>
latlon: Resultate vanaf <a href="http://openstreetmap.org/">intern</a>
osm_namefinder: Resultate vanaf <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
uk_postcode: Resultate vanaf <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Resultate vanaf <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} van %{parentname})"
suffix_place: ", %{distance} %{direction} van %{placename}"
search_osm_nominatim:
prefix:
amenity:

7
config/locales/aln.yml
View file

@ -380,14 +380,11 @@ aln:
description:
title:
geonames: Lokacioni prej <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} prej <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Lokacioni prej <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Qytetet
places: Places
towns: Qytetet
description_osm_namefinder:
prefix: "%{distance} %{direction} e %{type}"
direction:
east: lindja
north: veriu
@ -409,13 +406,9 @@ aln:
ca_postcode: Rezultatet prej <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Rezultatet prej <a href="http://www.geonames.org/">GeoNames</a>
latlon: Rezultatet prej <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Rezultatet prej <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Rezultatet prej <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Rezultatet prej <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Rezultatet prej <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} prej %{parentname})"
suffix_place: ", %{distance} %{direction} prej %{placename}"
search_osm_nominatim:
prefix:
amenity:

7
config/locales/ar.yml
View file

@ -432,14 +432,11 @@ ar:
description:
title:
geonames: موقع من <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} من <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</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: شمال
@ -461,13 +458,9 @@ ar:
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 Namefinder</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} (%{parentdistance} %{parentdirection} من %{parentname})"
suffix_place: ، %{distance} %{direction} من %{placename}
search_osm_nominatim:
prefix:
aeroway:

7
config/locales/arz.yml
View file

@ -357,14 +357,11 @@ arz:
description:
title:
geonames: موقع من <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} من <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</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: شمال
@ -385,13 +382,9 @@ arz:
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 Namefinder</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} (%{parentdistance} %{parentdirection} من %{parentname})"
suffix_place: ، %{distance} %{direction} من %{placename}
search_osm_nominatim:
prefix:
amenity:

8
config/locales/ast.yml
View file

@ -423,14 +423,11 @@ ast:
description:
title:
geonames: Llugar 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: Llugar de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Ciudaes
places: Llugares
towns: Villes
description_osm_namefinder:
prefix: "%{distance} al %{direction} de %{type}"
direction:
east: este
north: norte
@ -452,13 +449,9 @@ ast:
ca_postcode: Resultaos de <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Resultaos de <a href="http://www.geonames.org/">GeoNames</a>
latlon: Resultaos <a href="http://openstreetmap.org/">internos</a>
osm_namefinder: Resultaos de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Resultaos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Resultaos de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Resultaos de <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})"
suffix_place: ", %{distance} al %{direction} de %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -987,6 +980,7 @@ ast:
partners_ucl: el Centru de RV de la UCL
sign_up: dase d'alta
sign_up_tooltip: Crear una cuenta pa editar
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

9
config/locales/be-Tarask.yml
View file

@ -1,4 +1,4 @@
# Messages for Belarusian (Taraškievica orthography) (‪беларуская (тарашкевіца)‬)
# Messages for Belarusian (Taraškievica orthography) (беларуская (тарашкевіца)‎)
# Exported from translatewiki.net
# Export driver: syck-pecl
# Author: EugeneZelenko
@ -415,14 +415,11 @@ be-Tarask:
description:
title:
geonames: Месцазнаходжаньне з <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} з <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</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: поўнач
@ -446,13 +443,9 @@ be-Tarask:
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/">Internal</a>
osm_namefinder: Вынікі з <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</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} (%{parentdistance} %{parentdirection} %{parentname})"
suffix_place: ", %{distance} %{direction} %{placename}"
search_osm_nominatim:
prefix:
aeroway:

26
config/locales/br.yml
View file

@ -396,7 +396,7 @@ br:
area_to_export: Takad da ezporzhiañ
embeddable_html: HTML enkorfadus
export_button: Ezporzhiañ
export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
format: Furmad
format_to_export: Furmad da ezporzhiañ
image_size: Ment ar skeudenn
@ -427,14 +427,11 @@ br:
description:
title:
geonames: Lec'hiadur diwar <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} diwar <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Lec'hiadur adalek <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Keodedoù
places: Lec'hioù
towns: Kêrioù
description_osm_namefinder:
prefix: "%{distance} %{direction} eus %{type}"
direction:
east: reter
north: norzh
@ -456,13 +453,9 @@ br:
ca_postcode: Disoc'hoù diwar <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>
latlon: Disoc'hoù diwar <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Disoc'hoù diwar <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Disoc'hoù diwar <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Disoc'hoù diwar <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Disoc'hoù diwar <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} eus %{parentname})"
suffix_place: " %{distance} %{direction} diouzh %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -992,6 +985,7 @@ br:
partners_ucl: ↓Kreizenn VR an UCL
sign_up: En em enskrivañ
sign_up_tooltip: Krouiñ ur gont evit aozañ
sotm2012: Kemerit perzh e kendalc'h OpenStreetMap 2012, Stad ar gartenn, d'ar 13 ha d'ar 14 a viz Here e Portland, Oregon !
tag_line: Kartenn digoust eus ar bed Wiki
user_diaries: Deizlevrioù an implijer
user_diaries_tooltip: Gwelet deizlevrioù an implijerien
@ -1012,19 +1006,23 @@ br:
contributors_footer_1_html: "↓Evit muioc'h a vunudoù diwar-benn ar re-se, hag ar mammennoù all a zo bet implijet da sikour da wellaat OpenStreetMap, sellit ouzh ar <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Bajenn Skoazellerien</a> e Wiki OpenStreetMap."
contributors_footer_2_html: Enlakaat roadennoù e OpenStreetMap ne empleg ket ez aprou ar bourchaserien orin a endalc'had OpenStreetMap, na ne bourchasont, na ne waratomp pe na ne zegemeront ne vern pe atebegezh e vefe.
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 &copy; Crown copyright and database right 2010."
contributors_intro_html: "Hervez hon aotre-implijout CC BY-SA e tleit &ldquo;reiñ kred a-walc'h \n d'an aozer orin diouzh ar media a implijit&rdquo;.\n Kartennourien hiniennel OSM ne c'houlennont ket\n kred panevet &ldquo;kenlabourerien OpenStreetMap&rdquo;,\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_gb_html: "<strong>Rouantelezh-Unanet</strong> : Ennañ roadennoù eus Ordnance\n Survey data &copy; Crown copyright and database right 2010-12."
contributors_intro_html: "Miliadoù a hiniennoù a labour ganimp. Ebarzhiñ a reomp ivez roadennoù digor eus ajañsoù kartennañ hag eus mamennoù all, hag en o zouez :"
contributors_nl_html: "<strong>Netherlands</strong> : Contains &copy; 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_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 &ldquo;&copy; kenlabourerien OpenStreetMap\n CC BY-SA&rdquo;. Ma ne implijit nemet roadennoù ar c'hartennoù,\n e c'houlennomp diganeoc'h lakaat &ldquo;Roadennoù ar gartenn &copy; kenlabourerien OpenStreetMap,\n CC BY-SA&rdquo;."
credit_1_html: Goulenn a reomp diganeoc'h lakaat en ho kred ar meneg &ldquo;&copy; kenlabourerien OpenStreetMap&rdquo;.
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 &lsquo;OpenStreetMap&rsquo; ar chomlec'h klok) ha da\n www.creativecommons.org."
credit_title_html: Penaos reiñ kred da OpenStreetMap
infringement_1_html: "Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\neus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre\nezpleg ar re zo ar gwirioù-aozer ganto."
infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se da c'houzout d'hon <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">argerzh dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="http://dmca.openstreetmap.org/">furmskrid enlinenn</a>.
infringement_title_html: Terriñ ar gwir-eilañ
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ù."
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://opendatacommons.org/licenses/odbl/1.0/\">legal\ncode</a> e kavot munudoù ho kwirioù hag ho teverioù."
intro_3_html: "Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons Attribution-ShareAlike 2.0</a> license (CC-BY-SA)."
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_2_html: "Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas\n un API digoust evit an diorroerien diavaez.\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:
@ -1299,6 +1297,8 @@ 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.
license:
copyright: Gwir-eilañ gant OpenStreetMap hag ar genlabourerien, dindan un aotre-implijout digor
permalink: Peurliamm
remote_failed: C'hwitet eo ar c'hemm - gwiriit hag-eñ eo karget JOSM or Merkaartor ha gweredekaet an dibarzh kontroll a-bell
shortlink: Liamm berr

7
config/locales/ca.yml
View file

@ -425,14 +425,11 @@ ca:
description:
title:
geonames: Localització des 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: Localització des de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Ciutats
places: Llocs
towns: Municipis
description_osm_namefinder:
prefix: "%{distance} %{direction} de %{type}"
direction:
east: est
north: nord
@ -454,13 +451,9 @@ ca:
ca_postcode: Resultats de <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Resultats des de <a href="http://www.geonames.org/">GeoNames</a>
latlon: Resultats <a href="http://openstreetmap.org/">propis</a>
osm_namefinder: Resultats de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Resultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap nominatim</a>
uk_postcode: Resultats de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Resultats 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:

33
config/locales/cs.yml
View file

@ -408,7 +408,7 @@ cs:
area_to_export: Oblast k exportu
embeddable_html: Vkládatelné HTML
export_button: Export
export_details: Data OpenStreetMap jsou k dispozici pod licencí <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.cs">Creative Commons Uveďte autora-Zachovejte licenci 2.0</a>.
export_details: Data OpenStreetMap jsou k dispozici pod licencí <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
format: Formát
format_to_export: Formát exportu
image_size: Velikost obrázku
@ -439,14 +439,11 @@ cs:
description:
title:
geonames: Poloha podle <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} podle <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Poloha podle <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Velkoměsta
places: Místa
towns: Města
description_osm_namefinder:
prefix: "%{distance} na %{direction} od %{type}"
direction:
east: východ
north: sever
@ -468,14 +465,9 @@ cs:
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ýsledky z <a href="http://openstreetmap.org/">interní databáze</a>
osm_namefinder: Výsledky z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</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} na %{parentdirection} od %{parentname})"
suffix_place: ", %{distance} na %{direction} od %{placename}"
suffix_suburb: "%{parentname} - %{suffix}"
search_osm_nominatim:
prefix:
aeroway:
@ -1005,6 +997,7 @@ cs:
partners_ucl: středisko VR UCL
sign_up: zaregistrovat se
sign_up_tooltip: Vytvořit si uživatelský účet pro editaci
sotm2012: Přijeďte na letošní americkou konferenci OpenStreetMap, The State of the Map US, 13.–14. října v Portlandu v Oregonu!
tag_line: Otevřená wiki-mapa světa
user_diaries: Deníčky
user_diaries_tooltip: Zobrazit deníčky uživatelů
@ -1026,19 +1019,23 @@ cs:
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 &copy; 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_gb_html: "<strong>Spojené království</strong>: Obsahuje data Ordnance Survey &copy; Crown copyright a právo k databázi 2010–12."
contributors_intro_html: "Našimi přispěvateli jsou tisíce jednotlivců. Také zahrnujeme svobodně licencovaná data z národních zeměměřických úřadů a dalších zdrojů, mimo jiné:"
contributors_nl_html: "<strong>Nizozemsko</strong>: Obsahuje &copy; 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_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_1_html: Vyžadujeme uvádění autorství „© Přispěvatelé OpenStreetMap“.
credit_2_html: "Také musíte jasně uvést, že data jsou dostupná za podmínek Open Database License, a pokud používáte naše mapové dlaždice, že jejich kartografický obsah je licencován pod CC-BY-SA. To můžete splnit odkázáním na <a href=\"http://www.openstreetmap.org/copyright\">tuto stránku</a>.\n\nNebo můžete (a pokud šíříte OSM jako data, tak musíte) uvést název licence a odkaz na ni přímo. 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 openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy), na opendatacommons.org a, pokud se vás to týká, na 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.
infringement_1_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.
infringement_2_html: Pokud si myslíte, že byl do databáze OpenStreetMap nebo na tento server neoprávněně vložen autorskoprávně chráněný obsah, postupujte podle našeho <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postupu pro odstranění</a> nebo přímo podejte výzvu pomocí <a href="http://dmca.openstreetmap.org/">on-line formuláře</a>.
infringement_title_html: Porušení autorských práv
intro_1_html: OpenStreetMap jsou <i>svobodná data</i>, nabízená za podmínek <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
intro_2_html: Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat naše data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud naše 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://opendatacommons.org/licenses/odbl/1.0/">licenčním ujednání</a>.
intro_3_html: Kartografická díla v našich mapových dlaždicích a naše dokumentace jsou k dispozici pod licencí <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).
more_1_html: O používání našich dat a způsobu uvádění autorství 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řestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API.\nVizte 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:
@ -1318,6 +1315,8 @@ 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.
license:
copyright: Copyright OpenStreetMap a přispěvatelé, pod svobodnou licencí
permalink: Trvalý odkaz
remote_failed: Editace se nezdařila – ujistěte se, že JOSM nebo Merkaartor běží a je zapnuto dálkové ovládání
shortlink: Krátký odkaz

67
config/locales/da.yml
View file

@ -9,6 +9,7 @@
# Author: Hylle
# Author: Nemo bis
# Author: OleLaursen
# Author: Peter Alberti
# Author: The real emj
# Author: Winbladh
da:
@ -177,6 +178,8 @@ da:
of: af
showing_page: Viser side
redacted:
message_html: Version %{version} af denne %{type} kan ikke vises, da den er omarbejdet. Se venligst %{redaction_link} for detaljer.
redaction: Omarbejdelse %{id}
type:
node: punkt
relation: relation
@ -399,7 +402,7 @@ da:
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.
export_details: OpenStreetMaps data er licenseret under <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
format: Format
format_to_export: Format for eksport
image_size: "Billedestørrelse:"
@ -430,14 +433,11 @@ da:
description:
title:
geonames: Position fra <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} fra <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Position fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Storbyer
places: Steder
towns: Byer
description_osm_namefinder:
prefix: "%{distance} %{direction} for %{type}"
direction:
east: øst
north: nord
@ -459,13 +459,9 @@ da:
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 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>
us_postcode: Resultater fra <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} for %{parentname})"
suffix_place: ", %{distance} %{direction} for %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -489,6 +485,7 @@ da:
bench: Bænk
bicycle_parking: Cykelparkering
bicycle_rental: Cykeludlejning
biergarten: Udendørs øludskænkning
brothel: Bordel
bureau_de_change: Vekselkontor
bus_station: Busstation
@ -516,6 +513,7 @@ da:
ferry_terminal: Færgeterminal
fire_hydrant: Brandhane
fire_station: Brandstation
food_court: Food Court
fountain: Springvand
fuel: Benzinstation
grave_yard: Kirkegård
@ -557,6 +555,7 @@ da:
shop: Forretning
shopping: Indkøb
shower: Brusebad
social_centre: Socialcenter
social_club: Social klub
studio: Studie
supermarket: Supermarked
@ -674,6 +673,7 @@ da:
railway: Jernbane
recreation_ground: Idrætsplads
reservoir: Reservoir
reservoir_watershed: Vandreservoir
residential: Boligområde
retail: Detailhandel
road: Vejområde
@ -686,6 +686,7 @@ da:
bird_hide: Fugleskjul
common: Fælles arealer
fishing: Fiskeområde
fitness_station: Udendørs fitness udstyr
garden: Have
golf_course: Golfbane
ice_rink: Skøjtebane
@ -772,6 +773,7 @@ da:
houses: Huse
island: Ø
islet: Holm
isolated_dwelling: Enlig bolig
locality: Sted
moor: Hede
municipality: Kommune
@ -987,6 +989,7 @@ da:
partners_ucl: UCL VR centret
sign_up: opret konto
sign_up_tooltip: Opret en konto for at kunne redigere
sotm2012: Kom til den amerikanske 2012 OpenStreetMap-konference, Kortets tilstand USA, 13.-14. oktober i Portland, Oregon!
tag_line: Det frie Wiki-verdenskort
user_diaries: Brugerblogs
user_diaries_tooltip: Vis brugerblogs
@ -1007,19 +1010,23 @@ da:
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 &copy; Crown copyright and database right\n2010."
contributors_intro_html: "Vores CC BY-SA licens kræver at du &ldquo;giver den oprindelige\nforfatter kredit i rimeligt omfang i forhold til mediet eller de midler\ndu anvender&rdquo;. Individuelle OSM-kortlæggere anmoder ikke om\nkildeangivelse ud over &ldquo;OpenStreetMap-bidragydere&rdquo;, 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_gb_html: "<strong>Storbritannien</strong>: indeholder Ordnance\nSurvey data &copy; Crown copyright and database right\n2010-12."
contributors_intro_html: "Vores bidragydere er tusinder af individer. Vi medtager også\n åbent licenseret data fra nationale kortlægningsagenturer\n og andre kilder, blandt dem:"
contributors_nl_html: "<strong>Holland</strong>: Indeholder &copy; 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_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 &ldquo;&copy; OpenStreetMap-bidragydere,\nCC BY-SA&rdquo;. Hvis du kun bruger kortdata, anmoder vi om &ldquo;Kortdata\n&copy; OpenStreetMap-bidragydere, CC BY-SA&rdquo;."
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&lsquo;OpenStreetMap&rsquo; til denne fulde adresse) og til www.creativecommons.org."
credit_1_html: Vi kræver at din kildeangivelse mindst består af &ldquo;&copy; OpenStreetMap-bidragyderer&rdquo;..
credit_2_html: "Du skal også gøre det klart, at dataene er tilgængelige under Open \nDatabase License, og hvis du bruger vores kort fliser, at kartografi er\n licenseret som CC-BY-SA. Du kan gøre dette ved at linke til\n<a href=\"http://www.openstreetmap.org/copyright\">denne side om ophavsret</a>. \nAlternativt, og som et krav, hvis du distribuerer OSM i en\n dataform, kan du navngive og oprette et hyperlink direkte til licenserne. I medier\n hvor hyperlinks ikke er mulig (f.eks. trykte værker), foreslår vi, at du\n henviser dine læsere til openstreetmap.org (måske ved at udvide\n'OpenStreetMap' til denne fuld adresse), til opendatacommons.org, og\n hvis relevant, til creativecommons.org."
credit_title_html: Kildeangivelse og OpenStreetMap
infringement_1_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."
infringement_2_html: "Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er\n føjet til OpenStreetMap databasen eller dette websted, bedes du følge\n vores <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">procedure til fjernelse a materiale</a> eller udfyld formular direkte på vores\n<a href=\"http://dmca.openstreetmap.org/\">on-line side</a>."
infringement_title_html: Krænkelse af ophavsretten
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."
intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores data, \nså længe du angiver OpenStreetMap og dets\nbidragydere som kilde. Hvis du ændrer eller bygger på vores\ndata, må du kun distribuere resultatet under den samme licens. Den\nfulde <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiske tekst</a>\nforklarer dine rettigheder og pligter."
intro_3_html: "Kartografi i vores kort, og vores dokumentation er\n licenseret under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a>-licensen (CC-BY-SA)."
more_1_html: "Læs mere om brug af vores data, og hvordan du kreditere os, på den <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiske\nFAQ</a>."
more_2_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:
@ -1207,9 +1214,11 @@ da:
allow_write_diary: oprette blogindlæg, kommentarer og lave venskaber.
allow_write_gpx: upload GPS-spor.
allow_write_prefs: ændre deres brugerindstillinger.
callback_url: Callback URL
name: Navn
requests: "Anmod brugeren om følgende tilladelser:"
required: Påkrævet
support_url: Support URL
url: Programmets hovedadresse
index:
application: Programnavn
@ -1228,6 +1237,7 @@ da:
not_found:
sorry: Beklager, men %{type} kunne ikke findes.
show:
access_url: "Access Token URL:"
allow_read_gpx: læse deres private GPS-spor.
allow_read_prefs: læs deres brugerindstillinger.
allow_write_api: tilpas kortet.
@ -1243,16 +1253,37 @@ da:
secret: "Forbrugerhemmelighed:"
support_notice: Vi understøtter HMAC-SHA1 (anbefales) og almindelig tekst i SSL-tilstand.
title: OAuth detaljer for %{app_name}
url: "Request Token URL:"
update:
flash: Opdateret klientoplysninger
redaction:
create:
flash: Omarbejdelse oprettet.
destroy:
error: Der opstod en fejl under sletning af denne omarbejdelse.
flash: Omarbejdelse slettet.
not_empty: Omarbejdelse er ikke tom. Venligst fjern omarbejdelsen af alle versioner der tilhører denne omarbejdelse, før du sletter den.
edit:
description: Beskrivelse
heading: Rediger omarbejdelse
submit: Gem omarbejdelse
title: Rediger omarbejdelse
index:
empty: Ingen omarbejdelser at vise.
heading: Liste over omarbejdelser
title: Liste over omarbejdelser
new:
description: Beskrivelse
heading: Angiv oplysninger om ny omarbejdelse
submit: Opret omarbejdelse
title: Opretter ny omarbejdelse
show:
confirm: Er du sikker?
description: "Beskrivelse:"
destroy: Fjern denne omarbejdelse
edit: Rediger denne omarbejdelse
heading: Viser omarbejdelse "%{title}"
title: Viser omarbejdelse
user: "Oprettet af:"
update:
flash: Ændringer gemt.
@ -1270,6 +1301,8 @@ da:
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.
license:
copyright: Ophavsret tilhører OpenStreetMap og bidragsydere, under en open license
permalink: Permalink
remote_failed: Redigering mislykkede - tjek at JOSM eller Merkaartor er startet og fjernbetjening er aktiveret
shortlink: Kort link
@ -1602,7 +1635,9 @@ da:
title: Glemt adgangskode
make_friend:
already_a_friend: Du er allerede ven med %{name}.
button: Tilføj som en ven
failed: Desværre, kunne ikke tilføje %{name} som din ven.
heading: Tilføj %{user} som en ven?
success: "%{name} er nu din ven."
new:
confirm email address: "Bekræft e-mail-adresse:"
@ -1635,6 +1670,8 @@ da:
nearby mapper: Bruger i nærheden
your location: Din position
remove_friend:
button: Fjern som en ven
heading: Fjern %{user} som en ven?
not_a_friend: "%{name} er ikke en af dine venner."
success: "%{name} blev fjernet fra din liste af venner."
reset_password:

41
config/locales/de.yml
View file

@ -1,6 +1,7 @@
# Messages for German (Deutsch)
# Exported from translatewiki.net
# Export driver: syck-pecl
# Author: Al
# Author: Als-Holder
# Author: Apmon
# Author: Avatar
@ -415,7 +416,7 @@ de:
area_to_export: Bereich für den Export
embeddable_html: HTML zum Einbinden
export_button: Export
export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter der <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 Lizenz</a> lizenziert.
export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter der <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database Lizenz</a> (ODbL) lizenziert.
format: "Format:"
format_to_export: Format für den Export
image_size: "Bildgröße:"
@ -446,14 +447,11 @@ de:
description:
title:
geonames: Ort von <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} vom <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Position von <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Großstädte
places: Orte
towns: Städte
description_osm_namefinder:
prefix: "%{distance} %{direction} von %{type}"
direction:
east: östlich
north: nördlich
@ -475,13 +473,9 @@ de:
ca_postcode: Suchergebnisse von <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Suchergebnisse von <a href="http://www.geonames.org/">GeoNames</a>
latlon: Suchergebnisse von <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Suchergebnisse von <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Ergebnisse von <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Suchergebnisse von <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Suchergebnisse von <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} von %{parentname})"
suffix_place: ", %{distance} %{direction} von %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -857,7 +851,7 @@ de:
doityourself: Baumarkt
dry_cleaning: Textilreinigung
electronics: Elektronikgeschäft
estate_agent: Imobilienhändler
estate_agent: Immobilienhändler
farm: Hofladen
fashion: Modegeschäft
fish: Fischereiladen
@ -932,7 +926,7 @@ de:
ditch: Wassergraben
dock: Dock
drain: Abfluss
lock: Lock
lock: Schiffsschleuse
lock_gate: Schleusentor
mineral_spring: Mineralquelle
mooring: Anlegeplatz
@ -1028,6 +1022,7 @@ de:
partners_url: http://wiki.openstreetmap.org/wiki/Partners
sign_up: Registrieren
sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen
sotm2012: Komm zur OpenStreetMap-Konferenz „The State of the Map US“ 2012 vom 13. bis 14. Oktober in Portland, Oregon!
tag_line: Die freie Wiki-Weltkarte
user_diaries: Benutzer-Blogs
user_diaries_tooltip: Benutzer-Blogs lesen
@ -1044,24 +1039,28 @@ de:
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:
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_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 Landes Vorarlberg</a> und des Landes Tirol (<a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">beides lizenziert gemäß CC BY AT mit Anpassungen zur Lizenz</a>)."
contributors_ca_html: "<strong>Kanada</strong>: Enthält Daten von GeoBase&reg;, GeoGratis (&copy; <i>Department of Natural Resources Canada</i>), CanVec (&copy; <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> &copy; Urheber- und Datenbankrecht 2010."
contributors_intro_html: Die von uns verwendete Lizenz CC BY-SA verlangt, dass du &bdquo;in dem betreffenden Medium in angemessener Weise, auf die ursprünglichen Bearbeiter hinweist.&ldquo; Einige an OpenStreetMap Mitwirkende verlangen keine über den Vermerk &bdquo;OpenStreetMap und Mitwirkende&ldquo; 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_gb_html: "<strong>Vereinigtes Königreich</strong>: Enthält Daten des <i>Ordnance Survey</i> &copy; Urheber- und Datenbankrecht 2010-12."
contributors_intro_html: "Unsere Mitwirkenden sind Tausende einzelner Menschen. Wir beziehen auch\noffen lizenzierte Daten von nationalen Kartenagenturen\nund anderen Quellen ein, darunter:"
contributors_nl_html: "<strong>Niederlande</strong>: Enthält, &copy; 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_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 &bdquo;&copy; OpenStreetMap und Mitwirkende, CC BY-SA&ldquo; als Quelle anzugeben. Werden hingegen ausschließlich Geodaten genutzt, so ist mindestens &bdquo;Geodaten &copy; OpenStreetMap und Mitwirkende, CC BY-SA&ldquo; 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_1_html: Wir verlangen die Verwendung des Hinweises „&copy; OpenStreetMap-Mitwirkende“.
credit_2_html: "Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz\nverfügbar sind, und sofern du unsere Kartenkacheln verwendest, dass die\nKartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf\n<a href=\"http://www.openstreetmap.org/copyright\">diese Seite</a> verlinkst.\nErsatzweise, und als Erfordernis, falls du OSM in Datenform weitergibst,\nkannst du die Lizenz(en) direkt verlinken und benennen. In Medien, in denen\nkeine Links möglich sind (z.&nbsp;B. gedruckten Werken), empfehlen wir dir,\ndeine Leser direkt auf openstreetmap.org zu verweisen (möglicherweise mit\ndem Erweitern von „OpenStreetMap“ zur vollen Adresse), auf opendatacommons.org,\nund, sofern zutreffend, auf creativecommons.org."
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.
infringement_1_html: Die Mitwirkenden von OpenStreetMap weisen wir darauf hin, dass keinesfalls Daten aus urheberrechtlich geschützten Quellen verwendet werden dürfen (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben.
infringement_2_html: "Sofern du denkst, dass urheberrechtlich geschütztes Material unerlaubterweise zur\nOpenStreetMap-Datenbank oder auf dieser Website hinzugefügt wurde, informiere dich\nbitte über unser <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">Verfahren\nzum Entfernen von Inhalten</a> oder melde dies direkt mit unserem\n<a href=\"http://dmca.openstreetmap.org/\">Onlineformular</a>."
infringement_title_html: Urheberrechtsverletzung
intro_1_html: OpenStreetMap sind <i>„Open Data“</i>, die gemäß der <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database Lizenz</a> (ODbL) verfügbar sind.
intro_2_html: "Es steht dir frei unsere Daten zu kopieren, weiterzugeben,\nzu übermitteln sowie anzupassen, sofern du OpenStreetMap\nund die Mitwirkenden als Quelle angibst. Für den Fall, dass\ndu auf Basis unserer Daten Anpassungen vornimmst, oder sie\nals Grundlage für weitere Bearbeitungen verwendest, kannst\ndu das Ergebnis auch nur gemäß der selben Lizenz weitergeben.\nDer vollständige Lizenztext ist unter\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">Lizenz</a>\neinsehbar und erläutert deine Rechte und Pflichten."
intro_3_html: "Die Kartografie in unseren Kartenkacheln und unsere Dokumentation sind unter der Lizenz <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons „Namensnennung, Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA) verfügbar."
more_1_html: Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist, kann man unter <a href="http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ">Häufige rechtliche Fragen</a> nachlesen.
more_2_html: "Obwohl OpenStreetMap „Open Data“ ist, können wir keine \nunentgeltliche Karten-API für Drittparteienentwickler bereitstellen.\nSiehe unsere <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-Verwendungsrichtlinie</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Kachelverwendungsrichtlinie</a>\nund <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim-Verwendungsrichtlinie</a>."
more_title_html: Mehr hierzu in Erfahrung bringen
title_html: Urheberrecht und Lizenz
native:
@ -1289,7 +1288,7 @@ de:
requests: "Die Benutzer werden um Folgendes um Erlaubnis gebeten:"
secret: "Geheimnis:"
support_notice: Wir unterstützen HMAC-SHA1 (empfolen) und Reintext im SSL-Modus.
title: OAuth-Details für %{app_name}
title: OAuth-Einzelheiten für %{app_name}
url: "Tokenanfrage-URL:"
update:
flash: Client-Informationen erfolgreich aktualisiert
@ -1338,6 +1337,8 @@ de:
index:
js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.
js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung.
license:
copyright: Copyright OpenStreetMap und Mitwirkende, unter einer offenen Lizenz
permalink: Permanentlink
remote_failed: Das Bearbeiten ist fehlgeschlagen. Stelle sicher, dass JOSM oder Merkaartor gestartet ist und die Remote-Control-Option aktiviert ist.
shortlink: Shortlink

12
config/locales/diq.yml
View file

@ -7,7 +7,7 @@ diq:
activerecord:
attributes:
diary_comment:
body: Mesac
body: Vêrey mesaci
diary_entry:
language: Zıwan
latitude: Heralem
@ -249,7 +249,7 @@ diq:
edit_link: Nê dekewti bıvurne
hide_link: Nê dekewti bınımne
edit:
body: "Mesac:"
body: "Vêrey mesaci:"
language: "Zıwan:"
latitude: "Heralem:"
location: Lokasyon
@ -306,13 +306,9 @@ diq:
ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey
geonames: <a href="http://www.geonames.org/">GeoNames.org</a> ra neticey
latlon: <a href="http://openstreetmap.org/">OSM</a> ra neticey
osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap name vinen cu</a> ra neticey
osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a> ra neticey
uk_postcode: <a href="http://www.npemap.org.uk/">FreeThe Postcode</a> ra neticey
us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> ra neticey
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} sera %{parentname})"
suffix_place: ", %{distance} %{direction} sera %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -579,7 +575,7 @@ diq:
history: Ravêrden
intro_1: OpenStreetMap yew xeritey dınyayo u merduma hemın rê belaso.
intro_2_download: ronayış
log_in: Cı kewe
log_in: Ronıştış akerê
logout: bıveciyên
logout_tooltip: Bıveciyên
sign_up: Qeyd bı
@ -598,7 +594,7 @@ diq:
delete_button: Besterne
reply_button: Cewab bıde
new:
body: Mesac
body: Vêrey mesaci
send_button: Bırşê
subject: Mersel
outbox:

24
config/locales/dsb.yml
View file

@ -402,7 +402,7 @@ dsb:
area_to_export: Wurězk za eksport
embeddable_html: Zasajźujobny HTML
export_button: Eksport
export_details: Daty OpenStreetMap licencěruju se pód licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
export_details: Daty OpenStreetMap licencěruju se pód licencu <a href="http://opendatacommons.org/licenses/odbl/1.0/">Licenca Data Commons Open Database</a> (ODbL).
format: "Format:"
format_to_export: Format za eksport
image_size: "Wobrazowa wjelikosć:"
@ -433,14 +433,11 @@ dsb:
description:
title:
geonames: Městno z <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} z <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Městno z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Wjelike města
places: Městna
towns: Města
description_osm_namefinder:
prefix: "%{distance} %{direction} wót %{type}"
direction:
east: pódzajtšo
north: pódpołnoc
@ -464,13 +461,9 @@ dsb:
ca_postcode: Wuslědki z <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Wuslědki z <a href="http://www.geonames.org/">GeoNames</a>
latlon: Wuslědki z <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Wuslědki z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Wuslědki z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Wuslědki z <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} wót %{parentname})"
suffix_place: ", %{distance} %{direction} wót %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -1001,6 +994,7 @@ dsb:
partners_ucl: z UCL VR Centre
sign_up: registrěrowaś
sign_up_tooltip: Konto za wobźěłowanje załožyś
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ś
@ -1021,18 +1015,20 @@ dsb:
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) &copy; Awtorske pšawo a pšawo za datowe banki 2010."
contributors_intro_html: Naša licenca CC BY-SA pomina se, až &ldquo;dajoš spócetnemu awtoroju źěk pśiměrjonemu medijoju abo srědkoju, kótaryž wužywaš&rdquo;. Jadnotliwe kartěrowarje OSM njepominaju se pśidatne źěkowanje k &ldquo;sobustatkujucym OpenStreetMap&rdquo;, 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_gb_html: "<strong>Zjadnośone kralojstwo</strong>: Wopśimujo daty z Ordnance Survey (Amtske rozměrjenje kraja) &copy; Awtorske pšawo a pšawo za datowe banki 2010-2012."
contributors_intro_html: "Naše sobustatkujuce su towzynty wósobow. Zapśimujomy teke daty wótwórjoneje licence z narodnych kartěrowańskich pśedewześow a drugich žrědłow, mjaz nimi:"
contributors_nl_html: "<strong>Nižozemska</strong>: Wopsimujo daty &copy; 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_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š &ldquo;&copy; OpenStreetMap a sobustatkujucych, CC BY-SA&rdquo;. Jolic wužywaš jano kórtowe daty, musyš &ldquo;kórtowe daty &copy; OpenStreetMap a sobustatkujucych, CC BY-SA&rdquo; pódaś.
credit_1_html: Pominamy se, až pódawaš sobustatkujucych &ldquo;&copy; OpenStreetMap&rdquo;.
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
infringement_title_html: Pśejźenje stwóriśelskego pšawa
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>.
intro_2_html: Móžoš naše 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://opendatacommons.org/licenses/odbl/1.0/">pšawniski code</a> wujasnjujo twóje pšawa a zagronitosći.
intro_3_html: Kartografija w našych kórtowych kachlach a naša dokumentacija stej pód licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA) licencěrowanej.
more_1_html: Cytaj wěcej wó wužywanju našych datow a kak dajo se nas pśipóznaś pód <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_title_html: Dalšne informacije
title_html: Awtorske pšawo a licenca
@ -1314,6 +1310,8 @@ 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.
license:
copyright: Copyright OpenStreetMap a sobustatkujuce, pód wótewrjoneju licencu
permalink: Trajny wótkaz
remote_failed: Wobźěłowanje jo se njeraźiło - pśeznań se, lěc JOSM jo zacytany a opcija zdalokawóźenje jo zmóžnjona
shortlink: Krotki wótkaz

6
config/locales/el.yml
View file

@ -420,7 +420,6 @@ el:
description:
title:
geonames: Τοποθεσία από το <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} από <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Τοποθεσία από <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Πόλεις
@ -447,14 +446,9 @@ el:
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 Namefinder</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:
prefix: "%{type}"
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} από %{parentname})"
suffix_place: ", %{distance} %{direction} από %{placename}"
search_osm_nominatim:
prefix:
aeroway:

6
config/locales/en.yml
View file

@ -1053,6 +1053,12 @@ en:
direct your readers to openstreetmap.org (perhaps by expanding
'OpenStreetMap' to this full address), to opendatacommons.org, and
if relevant, to creativecommons.org.
credit_3_html: |
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
attribution_example:
alt: Example of how to attribute OpenStreetMap on a webpage
title: Attribution example
more_title_html: Finding out more
more_1_html: |
Read more about using our data, and how to credit us, at the <a

46
config/locales/eo.yml
View file

@ -1,11 +1,13 @@
# Messages for Esperanto (Esperanto)
# Exported from translatewiki.net
# Export driver: syck-pecl
# Author: Airon90
# Author: Cfoucher
# Author: Lucas
# Author: LyzTyphone
# Author: Michawiki
# Author: Petrus Adamus
# Author: Timsk
# Author: Yekrats
eo:
activerecord:
@ -44,12 +46,15 @@ eo:
changeset_tag: Etikedo de ŝanĝaro
country: Lando
diary_comment: Ĵurnala komento
diary_entry: Ĵurnala ero
friend: Amiko
language: Lingvo
message: Mesaĝo
node: Nodo
node_tag: Nodetikedo
node_tag: Etikedo de nodo
notifier: Atentigilo
old_node: Malnova nodo
old_node_tag: Etikedo de malnova nodo
old_relation: Malnova rilato
old_way: Malnova vojo
relation: Rilato
@ -91,6 +96,8 @@ eo:
show_area_box: Montri la skatolon de la areo
common_details:
changeset_comment: "Komento:"
deleted_at: "Forigita je:"
deleted_by: "Forigita fare de:"
edited_at: "Redaktita je:"
edited_by: "Redaktita de:"
in_changeset: "En ŝanĝaro:"
@ -100,6 +107,11 @@ eo:
entry_role: Rilato %{relation_name} (kiel %{relation_role})
map:
deleted: Forviŝita
edit:
area: Redakti areon
node: Redakti nodon
relation: Redakti rilaton
way: Redakti vojon
larger:
area: Vidi la areon en pli granda mapo
node: Vidi la nodon en pli granda mapo
@ -109,7 +121,13 @@ eo:
navigation:
all:
next_changeset_tooltip: Sekvanta ŝanĝaro
next_node_tooltip: Sekva nodo
next_relation_tooltip: Sekva rilato
next_way_tooltip: Sekva vojo
prev_changeset_tooltip: Antaŭa ŝanĝaro
prev_node_tooltip: Antaŭa nodo
prev_relation_tooltip: Antaŭa rilato
prev_way_tooltip: Antaŭa vojo
user:
name_changeset_tooltip: Vidi redaktojn el %{user}
next_changeset_tooltip: Sekvanta redakto de %{user}
@ -262,6 +280,15 @@ eo:
save_button: Konservi
title: Uzantĵurnaloj | %{user}
user_title: Ĵurnalo de %{user}
editor:
potlatch:
description: Potlatch 1 (redaktilo en TTT-legilo)
name: Potlatch 1
potlatch2:
description: Potlatch 2 (redaktilo en TTT-legilo)
name: Potlatch 2
remote:
name: Teleregilo
export:
start:
add_marker: Aldoni markon al la mapo
@ -291,14 +318,11 @@ eo:
description:
title:
geonames: Loko el <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} el <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Loko el <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Grandurboj
places: Lokoj
towns: Urboj
description_osm_namefinder:
prefix: "%{distance} %{direction} de %{type}"
direction:
east: oriento
north: nordo
@ -319,13 +343,9 @@ eo:
ca_postcode: Rezultoj el <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Rezultoj el <a href="http://www.geonames.org/">GeoNames</a>
latlon: Rezultoj el <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Rezultoj el <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Rezultoj el <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Rezultoj el <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Rezultoj el <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})"
suffix_place: ", %{distance} %{direction} de %{placename}"
layouts:
donate: Subtenu OpenStreetMap %{link} al Fonduso de Ĝisdatigo de Aparataro.
donate_link_text: donacante
@ -337,13 +357,10 @@ eo:
history: Historio
home: hejmo
home_tooltip: Iri al hejmloko
inbox: leterkesto (%{count})
inbox_tooltip:
one: Via leterkesto enhavas 1 nelegitan mesaĝon
other: Via leterkesto enhavas %{count} nelegitajn mesaĝojn
zero: Via leterkesto ne enhavas nelegitajn mesaĝojn
license:
title: Datenoj de OpenStreetMap estas disponeblaj laŭ la permesilo Krea Komunaĵo Atribuite-Samkondiĉe 2.0 Ĝenerala
log_in: ensaluti
log_in_tooltip: Ensaluti kun ekzistanta konto
logo:
@ -447,10 +464,6 @@ eo:
site:
edit:
user_page_link: uzantpaĝo
index:
license:
license_name: Creative Commons Atribuite-Samkondiĉe 2.0
project_name: projekto OpenStreetMap
key:
map_key: Klarigo de signoj
table:
@ -507,6 +520,9 @@ eo:
sidebar:
close: Fermi
search_results: Serĉrezultoj
time:
formats:
friendly: "%e %B %Y je %H:%M"
trace:
create:
trace_uploaded: Via GPX dosiero estis alŝutita kaj atendas enkonduko en la datumbason. Tiu ĝenerale okazas antaŭ duonhoro, kaj retletero estos sendita al vi je finaĵo.

30
config/locales/es.yml
View file

@ -407,7 +407,7 @@ es:
area_to_export: Área a exportar
embeddable_html: HTML para pegar
export_button: Exportar
export_details: Los datos de OpenStreetMap se encuentran bajo una <a href='http://creativecommons.org/licenses/by-sa/2.0/'>licencia Creative Commons Reconocimiento- Compartir bajo la misma licencia 2.0</a>.
export_details: Los datos de OpenStreetMap se encuentran bajo la a href="http://opendatacommons.org/licenses/odbl/1.0/">licencia Open Database (ODbL) de Open Data Commons</a>.
format: Formato
format_to_export: Formato de exportación
image_size: Tamaño de la imagen
@ -438,14 +438,11 @@ es:
description:
title:
geonames: Ubicación 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: Situaciones desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Ciudades
places: Lugares
towns: Municipios
description_osm_namefinder:
prefix: "%{distance} %{direction} de %{type}"
direction:
east: este
north: norte
@ -467,13 +464,9 @@ es:
ca_postcode: Resultados en <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Resultados en <a href="http://www.geonames.org/">GeoNames</a>
latlon: Resultados en <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Resultados en <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Resultados en <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Resultados en <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:
@ -1004,6 +997,7 @@ es:
partners_url: http://wiki.openstreetmap.org/wiki/Partners
sign_up: registrarse
sign_up_tooltip: Cree una cuenta para editar
sotm2012: ¡Ven a la Conferencia de OpenStreetMap Estados Unidos 2012, El Estado del Mapa en los EE.UU., del 13 al 14 de octubre en Portland, Oregon!
tag_line: El WikiMapaMundi libre
user_diaries: Diarios de usuario
user_diaries_tooltip: Ver diarios de usuario
@ -1024,19 +1018,23 @@ es:
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 &copy; Crown copyright and database right\n 2010."
contributors_intro_html: Nuestra licencia CC BY-SA requiere &ldquo;reconocer al autor original, de manera razonable conforme al medio o a los medios que usted esté utilizando&rdquo;. Las persona que hacen contribuciones individualmente a OSM no solicitan la mención de un crédito adicional al de &ldquo;Colaboradores de OpenStreetMap&rdquo;, 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_gb_html: "<strong>Reino Unido</strong>: Contiene datos de Ordnance Survey &copy; Crown copyright and database right\n 2010-12."
contributors_intro_html: "Nuestros colaboradores son miles de personas. Incluimos también datos con licencia abierta de organismos cartográficos nacionales y otras fuentes, entre ellas:"
contributors_nl_html: "<strong>Holanda</strong>: Contiene datos de &copy; 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_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í: &ldquo;&copy; Colaboradores de OpenStreetMap, CC BY-SA&rdquo;. Si sólo utilizas información del mapa, solicitamos que muestres &ldquo;Información del mapa &copy; Colaboradores de OpenstreetMap, CC BY-SA&rdquo;"
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 &lsquo;OpenStreetMap&rsquo; a su dirección completa) y a www.creativecommons.org."
credit_1_html: Requerimos que utilices los créditos "© Colaboradores de OpenStreetMap".
credit_2_html: "Usted debe también dejar claro que los datos están disponibles bajo la licencia Open Database License (ODbL), y si utiliza nuestros mapas, que la cartografía posee licencia CC-BY-SA. Puede hacer esto mediante el enlace a <a href=\"http://www.openstreetmap.org/copyright\">esta página de derechos de autor</a>.\nComo alternativa y como un requisito si están distribuyendo OSM en un formulario de datos, puede nombrar y enlazar directamente a las licencias. En medios de comunicación donde los enlaces no sean posibles (por ejemplo, obras impresas), le sugerimos que\ndirija a sus lectores a openstreetmap.org (quizás expandiendo 'OpenStreetMap' hasta esta dirección completa), a opendatacommons.org, y si procede, a creativecommons.org."
credit_title_html: Cómo dar reconocimiento a OpenStreetMap
infringement_1_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.
infringement_2_html: Si usted cree que algún material con derechos de autor ha sido incorrectamente agregado a la base de datos de OpenStreetMap o a este sitio, consulte nuestro <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimiento de desmantelamiento</a> o preséntelo directamente en nuestra <a href="http://dmca.openstreetmap.org/">página de presentación en línea</a>.
infringement_title_html: Violación de copyright
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.
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://opendatacommons.org/licenses/odbl/1.0/">código legal completo</a> explica tus derechos y obligaciones.
intro_3_html: La cartografía en nuestros mosaicos de mapas y en nuestra documentación, están licenciados bajo la licencia <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Reconocimiento-CompartirIgual 2.0</a> (CC-BY-SA).
more_1_html: Encontrarás más información acerca de cómo utilizar nuestros datos, y cómo darnos créditos, en <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Preguntas legales más frecuentes</a>.
more_2_html: "A pesar de que OpenStreetMap es contenido abierto, no podemos suminstrar una API de mapas gratuita para desarrolladores de aplicaciones para terceros.\n\nPor favor, lea nuestra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso del API</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de uso de <i>mosaicos de mapas</i></a> y <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Políticas de uso de Nominatim</a>."
more_title_html: Para saber más...
title_html: Derechos de autor y licencia
native:
@ -1313,6 +1311,8 @@ es:
index:
js_1: Está usando un navegador que no soporta o tiene desactivado JavaScript
js_2: OpenStreetMap utiliza JavaScript para mostrar su mapa
license:
copyright: Copyright OpenStreetMap y colaboradores, bajo una licencia abierta
permalink: Enlace permanente
remote_failed: Error de edición - asegúrese de que JOSM o Merkaartor están cargados y con la opción de control remoto activada
shortlink: Atajo

41
config/locales/et.yml
View file

@ -78,6 +78,7 @@ et:
deleted: kustutatud
edit:
area: Muuda ala
node: Muuda sõlme
relation: Muuda relatsiooni
larger:
area: Vaata ala suuremal kaardil
@ -122,6 +123,10 @@ et:
paging_nav:
of: " /"
showing_page: Näitan lehte
redacted:
type:
node: sõlm
relation: relatsioon
relation:
download_xml: Laadi XML
relation: relatsioon
@ -253,6 +258,7 @@ et:
older_entries: Vanemad...
recent_entries: "Hiljutised päeviku sissekanded:"
title: Kasutajate päevikud
title_friends: Sõprade päevikud
user_title: Kasutaja %{user} päevik
location:
edit: muuda
@ -284,7 +290,7 @@ et:
area_to_export: Eksporditav ala
embeddable_html: Põimitav HTML
export_button: Ekspordi
export_details: OpenStreetMapi andmed on avaldatud <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 litsentsi</a> tingimustel.
export_details: OpenStreetMap'i andmed on avaldatud <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database litsentsi</a> tingimustel.
format: "Vorming:"
format_to_export: Eksporditav vorming
image_size: Pildi suurus
@ -329,12 +335,9 @@ et:
title:
ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> tulemused
geonames: <a href="http://www.geonames.org/">GeoNames</a>i tulemused
osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMapi Namefinder</a>i tulemused
osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>i tulemused
uk_postcode: " <a href=\"http://www.npemap.org.uk/\">NPEMap / FreeThe Postcode</a> tulemused"
us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> tulemused
search_osm_namefinder:
suffix_place: ", %{distance} %{direction} kohast %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -632,6 +635,7 @@ et:
foundation: Sihtasutus
foundation_title: OpenStreetMapi Sihtasutus
gps_traces: GPS rajad
gps_traces_tooltip: Halda GPS radasid
help: Juhend
help_title: Projekti abiinfo
history: Ajalugu
@ -641,6 +645,7 @@ et:
one: Sul on üks lugemata sõnum
other: Sul on %{count} lugemata sõnumit
zero: Sul ei ole lugemata sõnumeid
intro_1: OpenStreetMap on vaba, kogu maailma hõlmav kaart, mille on loonud inimesed, nagu sina.
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
@ -654,6 +659,7 @@ et:
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
@ -766,14 +772,28 @@ et:
oauth_clients:
edit:
submit: Redigeeri
title: Redigeeri oma avaldust
title: Redigeeri oma rakendust
form:
allow_read_gpx: lugeda enda privaatseid GPS-radasid.
allow_read_prefs: Lugeda oma kasutajaeelistusi.
allow_write_api: muuta kaarti
allow_write_diary: luua päeviku sissekandeid, kommenteerida ja saada sõpradeks.
allow_write_prefs: Muuta oma kasutajaeelistusi.
name: Nimi
requests: "Kasutajalt nõutakse järgmisi õiguseid:"
required: Nõutav
url: Põhirakenduse URL
index:
application: Avalduse nimi
application: Rakenduse nimi
issued_at: Väljastatud
list_tokens: "Järgmised turvamärgid on rakendustele väljastatud sinu nime all:"
my_apps: Minu kliendirakendused
no_apps: Kas omad rakendust, mida soovid siin kasutamiseks registreerida, kasutades %(oauth) standardit? Selleks tuleb kõigepealt registreerida oma veebirakendus enne kui see saab teostada OAuth päringuid antud teenusele.
register_new: Registreeri oma rakendus
revoke: Tühista!
new:
submit: Registreeri
title: Registreeri uus avaldus
title: Registreeri uus rakendus
site:
edit:
user_page_link: kasutajaleht
@ -894,6 +914,9 @@ et:
uploaded_at: "Üles laaditud:"
visibility: "Nähtavus:"
visibility_help: Mida see tähendab?
list:
public_traces: Avalikud GPS rajad
your_traces: Sinu GPS rajad
trace:
ago: "%{time_in_words_ago} tagasi"
count_points:
@ -975,6 +998,7 @@ et:
return to profile: Tagasi profiili juurde
save changes button: Salvesta muudatused
title: Redigeeri kasutajakontot
update home location on click: Kas uuendan kodu asukohta kui ma klõpsan kaardil?
confirm:
already active: See konto on juba kinnitatud.
button: Kinnita
@ -1071,6 +1095,7 @@ et:
confirm: Kinnita
create_block: blokeeri see kasutaja
ct accepted: Vastu võetud %{ago} tagasi
ct status: "Kaastöötingimused:"
delete_user: kustuta see kasutaja
description: Kirjeldus
diary: päevik
@ -1115,6 +1140,8 @@ et:
partial:
confirm: Oled Sa kindel?
edit: Redigeeri
next: Järgmine »
previous: « Eelmine
reason: Blokeerimise põhjus
show: Näita
show:

4
config/locales/eu.yml
View file

@ -206,8 +206,6 @@ eu:
cities: Hiriak
places: Lekuak
towns: Herriak
description_osm_namefinder:
prefix: "%{type}tik %{distance} %{direction}ra"
direction:
east: ekialde
north: iparra
@ -221,8 +219,6 @@ eu:
one: km bat inguru
other: "%{count}km inguru"
zero: km bat baino gutxiago
search_osm_namefinder:
suffix_place: ", %{placename}tik %{distance} %{direction}ra"
search_osm_nominatim:
prefix:
amenity:

10
config/locales/fa.yml
View file

@ -113,7 +113,7 @@ fa:
node: مشاهده منطقه روی نقشه بزرگتر
relation: مشاهده رابطه در نقشه بزرگتر
way: روش نمایش بر روی نقشه بزرگتر
loading: در حال بارگذاری…
loading: در حال بارگیری...
navigation:
all:
next_changeset_tooltip: تغییرات بعدی
@ -189,7 +189,7 @@ fa:
history_for_feature: "%{feature} تاریخچه برای"
load_data: بارگذاری داده ها
loaded_an_area_with_num_features: " شما منطقه‌ای را بارگذاری کردید که شامل%{num_features} می‌شود. به طورکلی بعضی از مرورگرها نمی توانند با این مقدار اطلاعات تصویری کار کنند.کلا مرورگرها برای نمایش اطلاعات کمتر از 100 مورد در زمان در بهترین وضعیت هستند: و هر میزان دیگر میتواند مرورگر ار کند یا قفل کند.اگر شما میخواهید این اطلاعات دیده شود دکمه زیر را فشار دهید."
loading: در حال بارگذاری…
loading: در حال بارگیری...
manually_select: به صورت دستی منطقه دیگری را انتخاب کنید
object_list:
api: بازیابی این منطقه از ای‌پی‌آی
@ -344,8 +344,6 @@ fa:
cities: شهرها
places: مکانها
towns: شهرستانها
description_osm_namefinder:
prefix: "%{distance} %{direction} %{type}"
direction:
east: شرق
north: شمال
@ -367,13 +365,9 @@ fa:
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 Namefinder</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} (%{parentdistance} %{parentdirection} %{parentname})"
suffix_place: ", %{distance} %{direction} %{placename}"
search_osm_nominatim:
prefix:
aeroway:

50
config/locales/fi.yml
View file

@ -158,10 +158,10 @@ fi:
prev_changeset_tooltip: Käyttäjän %{user} edellinen muutos
node:
download_xml: Lataa XML
edit: muokkaa
edit: Muokkaa pistettä
node: Piste
node_title: "Piste: %{node_name}"
view_history: näytä muokkaushistoria
view_history: Näytä historia
node_details:
coordinates: "Koordinaatit:"
part_of: "Osana teitä:"
@ -169,7 +169,7 @@ fi:
download_xml: Lataa muokkaushistorian XML
node_history: Pisteen muokkaushistoria
node_history_title: Pisteen %{node_name} historia
view_details: näytä pisteen tiedot
view_details: Näytä tiedot
not_found:
sorry: "%{type} %{id} ei ole olemassa."
type:
@ -191,7 +191,7 @@ fi:
download_xml: Lataa XML
relation: Relaatio
relation_title: "Relaatio: %{relation_name}"
view_history: näytä historia
view_history: Näytä historia
relation_details:
members: "Jäsenet:"
part_of: "Relaatiojäsenyydet:"
@ -199,7 +199,7 @@ fi:
download_xml: Lataa XML
relation_history: Relaation muokkaushistoria
relation_history_title: Relaation %{relation_name} historia
view_details: näytä yksityiskohdat
view_details: Näytä tiedot
relation_member:
entry_role: "%{type} %{name} roolissa %{role}"
type:
@ -218,7 +218,7 @@ fi:
hide_areas: Piilota alueet
history_for_feature: Ominaisuuden %{feature} historia
load_data: Lataa tiedot
loaded_an_area_with_num_features: Olet ladannut alueen, joka sisältää %{num_features} osiota. Yleensä jotkin selaimet eivät kykene näyttämään tätä määrää dataa. Yleisesti selaimet toimivat parhaiten näyttäessään alle 100 osiota kerrallaan. Muussa tapauksessa selain saattaa tulla hitaaksi tai lakata toimimasta kokonaan. Jos olet varma että haluat näyttää tämän datan, voit tehdä niin napsauttamalla alla olevaa painiketta.
loaded_an_area_with_num_features: Olet ladannut alueen, joka sisältää %{num_features} osiota. Yleensä jotkin selaimet eivät kykene näyttämään tätä määrää dataa. Yleisesti selaimet toimivat parhaiten näyttäessään alle %{max_features} kohdetta kerrallaan. Muussa tapauksessa selain saattaa tulla hitaaksi tai lakata toimimasta kokonaan. Jos olet varma että haluat näyttää tämän datan, voit tehdä niin napsauttamalla alla olevaa painiketta.
loading: Ladataan tietoja...
manually_select: Rajaa pienempi alue käsin
object_list:
@ -258,8 +258,8 @@ fi:
way: polku
way:
download_xml: Lataa XML
edit: muokkaa
view_history: näytä historia
edit: Muokkaa polkua
view_history: Näytä historia
way: Polku
way_title: "Polku: %{way_name}"
way_details:
@ -270,7 +270,7 @@ fi:
part_of: "Relaatiojäsenyydet:"
way_history:
download_xml: Lataa XML
view_details: näytä tiedot
view_details: Näytä tiedot
way_history: Polun muokkaushistoria
way_history_title: Polun %{way_name} historia
changeset:
@ -405,7 +405,7 @@ fi:
area_to_export: Vietävä alue
embeddable_html: HTML-koodi
export_button: Vie
export_details: OpenStreetMap-karttatietoja saa käyttää <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 lisenssin</a> (engl.) ehdoilla.
export_details: OpenStreetMap-karttatietoja saa käyttää <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL) (engl.) ehdoilla.
format: "Tiedostomuoto:"
format_to_export: Vientimuoto
image_size: Kuvan koko
@ -436,14 +436,11 @@ fi:
description:
title:
geonames: Sijainti palvelusta <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinderistä</a>"
osm_nominatim: Sijainti <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatimista</a>
types:
cities: Kaupungit
places: Paikat
towns: Kylät
description_osm_namefinder:
prefix: "%{distance} %{direction} kohteesta %{type}"
direction:
east: itään
north: pohjoiseen
@ -465,13 +462,9 @@ fi:
ca_postcode: Tulokset palvelusta <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Tulokset palvelusta <a href="http://www.geonames.org/">GeoNames</a>
latlon: <a href="http://openstreetmap.org/">Sisäiset</a> tulokset
osm_namefinder: Tulokset <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinderistä</a>
osm_nominatim: Tulokset <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatimista</a>
uk_postcode: Tulokset palvelusta <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Tulokset palvelusta <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} kohdasta %{parentname})"
suffix_place: ", %{distance} %{direction} paikasta %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -999,6 +992,7 @@ fi:
partners_ucl: UCL VR Centre
sign_up: rekisteröidy
sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta
sotm2012: Tule OpenStreetMapin kansainväliseen kokoukseen, The State of the Map 2012:een, joka järjestetään 6.–8. syyskuuta Tokiossa!
tag_line: Vapaa wikipohjainen maailmankartta
user_diaries: Päiväkirjamerkinnät
user_diaries_tooltip: Näytä käyttäjän päiväkirjat
@ -1019,19 +1013,20 @@ fi:
contributors_footer_1_html: "Täydellinen lista OpenStreetMapin tukijoista löytyy OpenStreetMapin wikistä <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Avustajat-sivulta</a>."
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>: Sisältää karttatietoja\n Direction Générale des Impôtsista."
contributors_gb_html: "<strong>Iso-Britanna</strong>: Sisältää Ordnance\n Surveyn keräämiä karttatietoja © 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_gb_html: "<strong>Iso-Britanna</strong>: Sisältää Ordnance Surveyn\nkeräämiä karttatietoja © Crown Copyright ja tietokantojen käyttöoikeus 2010-12."
contributors_intro_html: "Tekijöinämme on tuhansia yksityishenkilöitä. Olemme myös sisällyttäneet\nvapaasti lisensöityä dataa kansallisilta kartoitustoimistoilta\nja muista lähteistä, muun muassa:"
contributors_nl_html: "<strong>Alankomaat</strong>: Sisältää &copy; AND-karttatietoja vuodelta 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
contributors_nz_html: "<strong>Uusi-Seelanti</strong>: Sisältää karttatietoja Land Information New Zealandista. Crown Copyright."
contributors_title_html: Tekijät
contributors_za_html: "<strong>Etelä-Afrikka</strong>: Sisältää karttatietoja\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Informationista</a>, kaikki oikeudet pidätetään."
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_1_html: Vaadimme että mainitset &quot;&copy; OpenStreetMapin tekijät, CC BY-SA&quot;.
credit_2_html: "Teidän tulee tehdä selväksi, että data on saatavilla Open Database Lisenssillä,\nja jos käytätte karttaruutuja, ne ovat lisenssöity CC-BY-SA-lisenssillä.\nVoit tehdä tämän linkittämällä\n<a href=\"http://www.openstreetmap.org/copyright\">tekijänoikeussivulle</a>. \nJos hyperlinkit eivät ole mahdollisia (esimerkiksi tulostettu työ),\nsuosittelemme, että ohjaat lukijat osoitteisiin www.openstreetmap.org\nja opendatacommons.org, ja jos merkityksellistä, osoitteeseen creativecommons.org."
credit_title_html: OpenStreetMapin mainitseminen
infringement_title_html: Tekijänoikeusloukkaus
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."
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://opendatacommons.org/licenses/odbl/1.0/\">Legal codessa</a>\nkerrotaan oikeutesi ja velvollisuutesi."
more_1_html: Lue lisää datan käyttämisestä <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ:sta</a>.
more_2_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:
@ -1299,6 +1294,8 @@ fi:
index:
js_1: Selaimesi ei tue JavaScriptiä tai sen suoritus on estetty.
js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan.
license:
copyright: "Tekijänoikeus: OpenStreetMapin tekijät, avoimella lisenssillä"
permalink: Ikilinkki
remote_failed: Muokkaus epäonnistui - varmista, että JOSM tai Merkaartor on ladattu ja etähallinta-asetus on käytössä
shortlink: Lyhytosoite
@ -1502,6 +1499,7 @@ fi:
account:
contributor terms:
agreed: Olet hyväksynyt Kartoittajan ehdot.
agreed_with_pd: Olet myös ilmaissut muokkaustesi olevan tekijänoikeudesta vapaita (Public Domain).
heading: "Kartoittajan ehdot:"
link text: Mitä tämä tarkoittaa?
not yet agreed: Et ole vielä hyväksynyt Kartoittajan ehtoja.
@ -1690,7 +1688,7 @@ fi:
activate_user: aktivoi tämä käyttäjä
add as friend: lisää kaveriksi
ago: (%{time_in_words_ago} sitten)
block_history: näytä estot
block_history: saadut estot
blocks by me: tekemäni estot
blocks on me: saadut estot
comments: kommentit
@ -1716,7 +1714,7 @@ fi:
latest edit: "Viimeisin muutos %{ago}:"
m away: "%{count} metrin päässä"
mapper since: "Liittyi palveluun:"
moderator_history: näytä tehdyt estot
moderator_history: tehdyt estot
my comments: omat kommentit
my diary: oma päiväkirja
my edits: omat muokkaukset

30
config/locales/fr.yml
View file

@ -416,7 +416,7 @@ fr:
area_to_export: Zone à exporter
embeddable_html: HTML incorporable.
export_button: Exporter
export_details: Les données d’OpenStreetMap sont publiées sous <a href="http://creativecommons.org/licenses/by-sa/2.0/">licence Creative Commons paternité – partage à l’identique 2.0</a>.
export_details: Les données d’OpenStreetMap sont publiées sous la <a href="http://opendatacommons.org/licenses/odbl/1.0/">licence Open Data Commons ­– Base de données Ouverte</a> (ODbL).
format: Format
format_to_export: Format à exporter
image_size: Taille de l'image
@ -447,14 +447,11 @@ fr:
description:
title:
geonames: Localisation depuis <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} depuis <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Localisation depuis <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Villes
places: Places
towns: Villages
description_osm_namefinder:
prefix: "%{distance} %{direction} de %{type}"
direction:
east: est
north: nord
@ -476,13 +473,9 @@ fr:
ca_postcode: Résultats depuis <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Résultats depuis <a href="http://www.geonames.org/">GeoNames</a>
latlon: Résultats <a href="http://openstreetmap.org/">internes</a>
osm_namefinder: Résultats depuis <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Résultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Résultats depuis <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Résultats depuis <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:
@ -1013,6 +1006,7 @@ fr:
partners_url: http://wiki.openstreetmap.org/wiki/Partners
sign_up: S'inscrire
sign_up_tooltip: Créer un compte pour la modification
sotm2012: Venez à la Conférence OpenStreetMap 2012 aux États-Unis, l’état de la carte US, les 13 et 14 octobre à Portland, Oregon!
tag_line: La carte coopérative libre
user_diaries: Journaux
user_diaries_tooltip: Voir les journaux d'utilisateurs
@ -1033,19 +1027,23 @@ fr:
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 &copy; 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_gb_html: "<strong>Royaume Uni</strong>: Contient des données de l'Institut Géographique National &copy; Droits de la couronne et de la base de données 2010-12."
contributors_intro_html: "Nos collaborateurs sont des milliers de personnes. Nous incluons également \n ouvertement-données sous licence des agences nationales de cartographie \n et d'autres sources, parmi eux&nbsp;:"
contributors_nl_html: "<strong>Pays-Bas</strong>: Contient &copy; 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_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_1_html: Nous demandons que votre crédit comporte la mention &laquo;&nbsp;&copy; les contributeurs d’OpenStreetMap&nbsp;&raquo;.
credit_2_html: "Vous devez également préciser clairement que les données sont disponibles sous la licence\n ODbL, et si vous utilisez les tuiles de notre carte, que la carte est sous\n la licence CC-BY-SA. Vous pouvez mentionner ceci avec un lien hypertexte vers\n <a href=\"http://www.openstreetmap.org/copyright\">cette page de mentions légales</a>.\n Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous\n forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences.\n Sur les supports où les liens hypertexte sont impossibles (par exemple sur un support papier), nous vous suggérons\n de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant\n &laquo;&nbsp;OpenStreetMap&nbsp;&raquo; en l'adresse openstreetmap.org), vers opendatacommons.org, et,\n si c'est pertinent, vers creativecommons.org."
credit_title_html: Comment créditer OpenStreetMap
infringement_1_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."
infringement_2_html: Si vous pensez que des données ont été ajoutées à la base de données OpenStreetMap ou à ce site en violation des droits d'auteur, veuillez vous référer à notre <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procédure de retrait de données</a> ou notifiez nous directement à travers notre <a href="http://dmca.openstreetmap.org/">formulaire en ligne</a>.
infringement_title_html: Violation des droits d'auteur
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."
intro_2_html: " Vous êtes libre de copier, distribuer, transmettre et adapter nos données,\n à condition que vous créditiez OpenStreetMap et ses\n contributeurs. Si vous modifiez ou utilisez nos 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://opendatacommons.org/licenses/odbl/1.0/\">texte\n légal</a> complet détaille vos droits et responsabilités."
intro_3_html: "Les tuiles de notre carte, ainsi que notre documentation, sont\n disponibles sous la licence <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons paternité – partage à l’identique 2.0</a> (CC-BY-SA)."
more_1_html: "Si vous voulez obtenir plus d’informations sur comment réutiliser nos données et nous créditer, lisez la <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n légale</a>."
more_2_html: "Bien qu'OpenStreetMap soit un ensemble de données libres et ouverte, nous ne pouvons pas fournir une API gratuite en libre accès pour les développeurs tiers.\nVeuillez vous référer à notre <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politique d'utilisation de l'API</a>, à notre <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politique d'utilisation des tuiles</a>, et à la <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politique d'utilisation de Nominatim</a>."
more_title_html: Pour trouver plus d’informations
title_html: Copyright et Licence
native:
@ -1321,6 +1319,8 @@ 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.
license:
copyright: Copyright OpenStreetMap et ses contributeurs, sous une licence ouverte
permalink: Lien permanent
remote_failed: Échec de la modification - vérifiez que JOSM ou Merkaartor sont ouverts et que le greffon de contrôle à distance RemoteControl est activé.
shortlink: Lien court

7
config/locales/fur.yml
View file

@ -372,14 +372,11 @@ fur:
description:
title:
geonames: Lûc cjolt di <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} dal <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Lûc di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Citâts
places: Puescj
towns: Citadinis
description_osm_namefinder:
prefix: "%{distance} a %{direction} di %{type}"
direction:
east: est
north: nord
@ -401,13 +398,9 @@ fur:
ca_postcode: Risultâts cjolts di <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Risultâts cjolts di <a href="http://www.geonames.org/">GeoNames</a>
latlon: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît interni</a>
osm_namefinder: Risultâts cjolts di <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Risultâts cjolts di <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Risultâts cjolts di <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} di %{parentname})"
suffix_place: ", %{distance} a %{direction} di %{placename}"
search_osm_nominatim:
prefix:
amenity:

30
config/locales/gl.yml
View file

@ -394,7 +394,7 @@ gl:
area_to_export: Zona a exportar
embeddable_html: HTML incorporable
export_button: Exportar
export_details: Os datos do OpenStreetMap están licenciados baixo a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.gl">licenza Creative Commons recoñecemento compartir igual 2.0</a> .
export_details: Os datos do OpenStreetMap están licenciados baixo a <a href="http://opendatacommons.org/licenses/odbl/1.0/">licenza Open Data Commons Open Database License</a> (ODbL).
format: Formato
format_to_export: Formato de exportación
image_size: Tamaño da imaxe
@ -425,14 +425,11 @@ gl:
description:
title:
geonames: Localización desde <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} desde <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Localización desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Cidades
places: Lugares
towns: Municipios
description_osm_namefinder:
prefix: "%{distance} ao %{direction} de %{type}"
direction:
east: leste
north: norte
@ -454,13 +451,9 @@ gl:
ca_postcode: Resultados desde <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Resultados desde <a href="http://www.geonames.org/">GeoNames</a>
latlon: Resultados <a href="http://openstreetmap.org/">internos</a>
osm_namefinder: Resultados desde <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Resultados desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Resultados desde <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Resultados desde <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})"
suffix_place: ", %{distance} ao %{direction} de %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -989,6 +982,7 @@ gl:
partners_ucl: centro de realidade virtual do UCL
sign_up: rexistrarse
sign_up_tooltip: Crear unha conta para editar
sotm2012: Veña á conferencia do OpenStreetMap de 2012 nos Estados Unidos de América, O estado do mapa nos EUA, do 13 ao 14 de outubro en Portland, Oregon!
tag_line: O mapa mundial libre
user_diaries: Diarios de usuario
user_diaries_tooltip: Ollar os diarios do usuario
@ -1009,19 +1003,23 @@ gl:
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 &copy; Dereitos de autor da coroa e dereitos da base de datos\n2010."
contributors_intro_html: "A nosa licenza CC BY-SA necesita que &ldquo;dea crédito ao autor\norixinal de xeito razoable segundo o medio ou medios que estea a\nutilizar&rdquo;. Os usuarios individuais do OSM non solicitan outro\ncrédito ca &ldquo;colaboradores do OpenStreetMap&rdquo;,\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_gb_html: "<strong>Reino Unido:</strong> Contén datos da Ordnance\nSurvey &copy; Dereitos de autor da coroa e dereito da base de datos\n2010-12."
contributors_intro_html: "Os nosos colaboradores son miles de persoas. Tamén incluímos\ndatos baixo licenzas abertas de axencias nacionais de cartografía\ne outras fontes, entre elas:"
contributors_nl_html: "<strong>Países Baixos:</strong> Contén datos de &copy; 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_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: &ldquo;&copy; dos colaboradores do\nOpenStreetMap, CC BY-SA&rdquo;. Se tan só emprega datos dos mapas,\npedímoslle que inclúa: &ldquo;Datos do mapa &copy; dos colaboradores do OpenStreetMap,\nCC BY-SA&rdquo;."
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&ldquo;OpenStreetMap&ldquo; ao enderezo ao completo) e cara a\nwww.creativecommons.org."
credit_1_html: "Pedímoslle que acredite o traballo así: &ldquo;&copy; dos colaboradores do\nOpenStreetMap&rdquo;."
credit_2_html: "Cómpre tamén deixar claro que os datos están dispoñibles baixo a Open \nDatabase License e, se utiliza os cuadrantes dos nosos mapas, que os datos cartográficos\nestán baixo a licenza CC-BY-SA. Pode facelo ligando con\n<a href=\"http://www.openstreetmap.org/copyright/gl\">esta páxina</a>.\nComo alternativa, e obrigatoriamente se está distribuíndo o OSM nun\nformulario de datos, pode nomear e ligar directamente cara á(s) licenza(s). Naqueles medios\nnos que non sexa posible incluír as ligazóns (por exemplo, nas obras impresas), suxerimos\nque dirixa aos lectores a openstreetmap.org (quizais poñendo o texto\n\"OpenStreetMap\" no enderezo completo), a opendatacommons.org e,\nse fose relevante, a creativecommons.org."
credit_title_html: Como acreditar o OpenStreetMap
infringement_1_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."
infringement_2_html: "Se pensa que se engadiu material protexido de xeito inapropiado\ná base de datos do OpenStreetMap ou a este sitio, consulte\no noso <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">procedemento\npara retirar datos</a> ou deixe unha notificación no noso\n<a href=\"http://dmca.openstreetmap.org/\">formulario en liña</a>."
infringement_title_html: Violación dos dereitos de autoría
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."
intro_2_html: "Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos datos,\nna medida en que acredite o OpenStreetMap e mais os seus\ncolaboradores. Se altera ou constrúe a partir dos nosos datos, terá\nque distribuír o resultado baixo a mesma licenza. O\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">texto\nlegal</a> ao completo explica os seus dereitos e responsabilidades."
intro_3_html: "Os datos cartográficos dos cuadrantes dos nosos mapas e a nosa documentación\natópanse baixo a licenza <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons recoñecemento compartir igual 2.0</a> (CC BY-SA)."
more_1_html: "Descubra máis sobre como empregar os nosos datos e como acreditarnos nas <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">preguntas máis frecuentes\nsobre asuntos legais</a>."
more_2_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:
@ -1296,6 +1294,8 @@ 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.
license:
copyright: Dereitos de autor do OpenStreetMap e os seus colaboradores, baixo unha licenza aberta
permalink: Ligazón permanente
remote_failed: Fallo de edición; comprobe que ou ben JOSM ou ben Merkaartor estea cargado e que a opción do control remoto estea activada
shortlink: Atallo

9
config/locales/he.yml
View file

@ -432,14 +432,11 @@ he:
description:
title:
geonames: מיקום מאתר <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} מ־<a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</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: צפון
@ -461,13 +458,9 @@ he:
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 Namefinder</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} (%{parentdistance} %{parentdirection} ל־%{parentname})"
suffix_place: ", %{distance} מ%{direction} ל־%{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -999,6 +992,7 @@ he:
partners_url: http://wiki.openstreetmap.org/wiki/Partners
sign_up: הרשמה
sign_up_tooltip: יצירת חשבון לעריכה
sotm2012: בואו לוועידת OpenStreetMap 2012, „מצב המפה”, 6–8 בספטמבר, בטוקיו!
tag_line: מפת עולם חופשית בשיטת הוויקי
user_diaries: יומני משתמשים
user_diaries_tooltip: צפייה ביומני המשתמש
@ -1028,6 +1022,7 @@ he:
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
infringement_title_html: הפרת זכויות יוצרים
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>."

22
config/locales/hr.yml
View file

@ -2,6 +2,7 @@
# Exported from translatewiki.net
# Export driver: syck-pecl
# Author: Ex13
# Author: Janjko
# Author: Mnalis
# Author: Mvrban
# Author: Nemo bis
@ -396,14 +397,11 @@ hr:
description:
title:
geonames: Lokacija sa <a href="http://www.geonames.org/">GeoNames-a</a>
osm_namefinder: "%{types} sa <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefindera</a>"
osm_nominatim: Lokacija sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatima</a>
types:
cities: Gradovi
places: Mjesta
towns: Manji gradovi
description_osm_namefinder:
prefix: "%{distance} %{direction} od %{type}"
direction:
east: istočno
north: sjeverno
@ -425,13 +423,9 @@ hr:
ca_postcode: Rezultati iz <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Rezultati iz <a href="http://www.geonames.org/">GeoNames</a>
latlon: Rezultati iz <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Rezultati iz <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Rezultati sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Rezultati iz <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Rezultati iz <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} od %{parentname})"
suffix_place: ", %{distance} %{direction} od %{placename}"
search_osm_nominatim:
prefix:
amenity:
@ -630,12 +624,16 @@ hr:
pitch: Sportski teren
playground: Igralište
recreation_ground: Rekreacijski teren
sauna: Sauna
slipway: Navoz
sports_centre: Sportski centar
stadium: Stadion
swimming_pool: Bazen
track: Staza za trčanje
water_park: Vodeni park
military:
barracks: Barake
bunker: Bunker
natural:
bay: Zaljev
beach: Plaža
@ -644,6 +642,7 @@ hr:
channel: Kanal
cliff: Litica
crater: Krater
dune: Dina
feature: Obilježje
fell: Brdo
fjord: Fjord
@ -666,6 +665,7 @@ hr:
scrub: Guštara
shoal: Sprud
spring: Izvor
stone: Kamen
strait: Tjesnac
tree: Drvo
valley: Dolina
@ -674,6 +674,10 @@ hr:
wetland: Močvara
wetlands: Močvara
wood: Šuma
office:
lawyer: Odvjetnik
ngo: Ured nedržavne organizacije
"yes": Ured
place:
airport: Zračna luka
city: Grad
@ -809,6 +813,8 @@ hr:
valley: Dolina
viewpoint: Vidikovac
zoo: Zoo
tunnel:
"yes": Tunel
waterway:
boatyard: Brodogradilište
canal: Kanal
@ -907,7 +913,7 @@ hr:
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 &lsquo;OpenStreetMap&rsquo; 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."
intro_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati naše podatke, sve dok navodite OpenStreetMap i njegove doprinositelje kao izvor. Ako izmijenite ili nadogradite naše podatke, možete distribuirati rezultate samo pod istom licencom. Puni <a href="http://opendatacommons.org/licenses/odbl/1.0/">pravni tekst</a> objašnjava vaša 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_title_html: Više o

24
config/locales/hsb.yml
View file

@ -402,7 +402,7 @@ hsb:
area_to_export: Wobłuk za eksport
embeddable_html: Zasadźujomny HTML
export_button: Eksport
export_details: Daty OpenStreetMap su pod licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> licencowane.
export_details: Daty OpenStreetMap su pod licencu <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database</a> (ODbL).
format: "Format:"
format_to_export: Format za eksport
image_size: "Wobrazowa wulkosć:"
@ -433,14 +433,11 @@ hsb:
description:
title:
geonames: Městno wot from <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} wot <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Městno z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Wulkoměsta
places: Městna
towns: Města
description_osm_namefinder:
prefix: "%{distance} %{direction} wot %{type}"
direction:
east: wuchod
north: sewjer
@ -462,13 +459,9 @@ hsb:
ca_postcode: Wuslědki wot <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Wuslědki wot <a href="http://www.geonames.org/">GeoNames</a>
latlon: Wuslědki wot <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Wuslědki wot <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Wuslědki wot <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Wuslědki wot <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} wot %{parentname})"
suffix_place: ", %{distance} %{direction} z %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -1001,6 +994,7 @@ hsb:
partners_url: http://wiki.openstreetmap.org/wiki/Partners
sign_up: registrować
sign_up_tooltip: Konto za wobdźěłowanje załožić
sotm2012: Dojědźće do konferency OpenStreetMap 2012, "The State of the Map US", 13. - 14. oktobra w Portlandźe, Oregon!
tag_line: Swobodna swětowa karta
user_diaries: Dźeniki
user_diaries_tooltip: Wužiwarske dźeniki čitać
@ -1021,18 +1015,20 @@ hsb:
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) &copy; Awtorske prawo a prawo za datowe banki 2010."
contributors_intro_html: Naša licenca CC BY-SA žada sej, zo &ldquo;daš prěnjotnemu awtorej dźak přiměrjeny medijej abo srědkej, kotryž wužiwaš&rdquo;. Jednotliwi kartěrowarjo OSM nježadaja sej přidatne dźakprajenje k &ldquo;sobuskutkowarjam OpenStreetMap&rdquo;, 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_gb_html: "<strong>Zjednoćene kralestwo</strong>: Wobsahuje daty z Ordnance Survey (Zarjadniske krajměrjenstwo) &copy; Awtorske prawo a prawo za datowe banki 2010-2012."
contributors_intro_html: "Naši sobuskutkowacy su tysacy wosobow. Zapřijimamy tež daty wotewrjeneje licency z narodnych kartowanskich předewzaćow a druhich žórłow, mjez nimi:"
contributors_nl_html: "<strong>Nižozemska</strong>: Wobsahuje daty &copy; 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_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š &ldquo;&copy; OpenStreetMap a sobuskutkowacych, CC BY-SA&rdquo;. Jeli jenož kartowe daty wužiwaš, dyrbiš &ldquo;kartowe daty &copy; OpenStreetMap a sobuskutkowacych, CC BY-SA&rdquo; podać.
credit_1_html: Žadamy sej, zo podawaš sobuskutkowarjow &ldquo;&copy; OpenStreetMap&rdquo;.
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ć
infringement_title_html: Přeńdźenje awtorskeho prawa
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>.
intro_2_html: Móžeš naše 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 daty abo zepěraš so na nje, móžeš wuslědk jenož pod samsnej licencu rozdźělić. Dospołny <a href="http://opendatacommons.org/licenses/odbl/1.0/">prawniski kod</a> wujasnja twoje prawa a zamołwitosće.
intro_3_html: Kartografija w našich kartowych kachličkach a naša dokumentacija stej pod licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA) licencowanej.
more_1_html: Čitaj wjace wo wužiwanju našich datow a kak hodźi so nas připóznać, pod <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_title_html: Dalše informacije
title_html: Awtorske prawo a licenca
@ -1314,6 +1310,8 @@ 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.
license:
copyright: Copyright OpenStreetMap a sobuskutkowarjo, pod wotewrjenej licencu
permalink: Trajny wotkaz
remote_failed: Wobdźěłowanje je so njeporadźiło - zawěsć, zo JOSM abo Merkaartor je začitany a dalokowodźenska opcija je zmóžnjena
shortlink: Krótki wotkaz

12
config/locales/hu.yml
View file

@ -430,14 +430,11 @@ hu:
description:
title:
geonames: Helyek a <a href="http://www.geonames.org/">GeoNames</a>ről
osm_namefinder: "%{types} az <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>ről"
osm_nominatim: Helyek az <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>tól
types:
cities: Nagyvárosok
places: Helyek
towns: Városok
description_osm_namefinder:
prefix: "%{type}: %{distance}-re %{direction}"
direction:
east: keletre
north: északra
@ -459,15 +456,9 @@ hu:
ca_postcode: Eredmények a <a href="http://geocoder.ca/">Geocoder.CA</a>-ről
geonames: Eredmények a <a href="http://www.geonames.org/">GeoNames</a>ről
latlon: Eredmények az <a href="http://openstreetmap.org/">Internal</a>ról
osm_namefinder: Eredmények az <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>ről
osm_nominatim: Eredmények az <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>tól
uk_postcode: Eredmények a <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>-ról
us_postcode: Eredmények a <a href="http://geocoder.us/">Geocoder.us</a>-ról
search_osm_namefinder:
prefix: "%{type}:"
suffix_parent: "%{suffix} (%{parentdistance}-re %{parentdirection} innen: %{parentname})"
suffix_place: " %{distance}-re %{direction} innen: %{placename}"
suffix_suburb: "%{suffix} (%{parentname})"
search_osm_nominatim:
prefix:
aeroway:
@ -994,6 +985,7 @@ hu:
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
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
@ -1020,7 +1012,7 @@ hu:
credit_1_html: "Ha az OpenStreetMap térkép képeit használod, kérünk, hogy\n legyen feltüntetve legalább az &ldquo;&copy; OpenStreetMap\n közreműködői, CC BY-SA&rdquo; szöveg. Ha csak a térkép adatait használod,\n akkor a &ldquo;Térképadatok &copy; OpenStreetMap közreműködői,\n CC BY-SA&rdquo; 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 &lsquo;OpenStreetMap&rsquo; 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_1_html: " Az OpenStreetMap egy <i>szabad adathalmaz</i>, amelyre az <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> licenc (ODbL) 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."

8
config/locales/ia.yml
View file

@ -424,14 +424,11 @@ ia:
description:
title:
geonames: Position 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: Loco de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Citates
places: Locos
towns: Villages
description_osm_namefinder:
prefix: "%{distance} %{direction} del %{type}"
direction:
east: est
north: nord
@ -453,13 +450,9 @@ ia:
ca_postcode: Resultatos de <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
latlon: Resultatos <a href="http://openstreetmap.org/">interne</a>
osm_namefinder: Resultatos de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Resultatos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Resultatos de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Resultatos de <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} al %{parentdirection} de %{parentname})"
suffix_place: ", %{distance} al %{direction} de %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -990,6 +983,7 @@ ia:
partners_url: http://wiki.openstreetmap.org/wiki/Partners
sign_up: inscriber se
sign_up_tooltip: Crear un conto pro modification
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

7
config/locales/is.yml
View file

@ -374,14 +374,11 @@ is:
description:
title:
geonames: Staðsetning frá <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} frá <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Staðsetning frá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Borgir
places: Staðir
towns: Bæir
description_osm_namefinder:
prefix: "%{distance} %{direction} af%{type}"
direction:
east: austur
north: norður
@ -403,13 +400,9 @@ is:
ca_postcode: Niðurstöður frá <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>
latlon: Niðurstöður frá <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Niðurstöður frá <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Niðurstöður frá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Niðurstöður frá <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Niðurstöður frá <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} af %{parentname})"
suffix_place: ", %{distance} %{direction} af %{placename}"
search_osm_nominatim:
prefix:
amenity:

55
config/locales/it.yml
View file

@ -9,6 +9,7 @@
# Author: Davio
# Author: Gianfranco
# Author: Karika
# Author: Lollo
# Author: LucioGE
# Author: McDutchie
# Author: Nemo bis
@ -217,7 +218,7 @@ it:
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 %{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."
loaded_an_area_with_num_features: "È 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:
@ -404,7 +405,7 @@ it:
area_to_export: Area da esportare
embeddable_html: HTML incapsulabile
export_button: Esporta
export_details: I dati di OpenStreetMap sono rilasciati sotto la <a href="http://creativecommons.org/licenses/by-sa/2.0/">licenza Creative Commons Attribution-ShareAlike 2.0</a>.
export_details: I dati OpenStreetMap sono rilasciati in base alla <a href="http://opendatacommons.org/licenses/odbl/1.0/">licenza Open Data Commons Open Database</a> (ODbL).
format: Formato
format_to_export: Formato di esportazione
image_size: Dimensione immagine
@ -435,14 +436,11 @@ it:
description:
title:
geonames: Località da <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} da <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Località da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Città
places: Luoghi
towns: Città
description_osm_namefinder:
prefix: "%{distance} a %{direction} di %{type}"
direction:
east: est
north: nord
@ -464,13 +462,9 @@ it:
ca_postcode: Risultati da <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Risultati da <a href="http://www.geonames.org/">GeoNames</a>
latlon: Risultati da <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Risultati da <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
osm_nominatim: Risultati restituiti da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Risultati da <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} a %{parentdirection} di %{parentname})"
suffix_place: ", %{distance} a %{direction} di %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -975,7 +969,7 @@ it:
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 contiene solo messaggi già letti
intro_1: OpenStreetMap è una mappa liberamente modificabile dell'intero pianeta. E' fatta da persone come te.
intro_1: OpenStreetMap è una mappa liberamente modificabile dell'intero pianeta. È realizzata da persone come te.
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.
@ -999,6 +993,7 @@ it:
partners_ucl: UCL VR Centre
sign_up: iscriviti
sign_up_tooltip: Crea un profilo utente per apportare modifiche
sotm2012: Vieni alla conferenza di OpenStreetMap Stati Uniti 2012, lo State of the Map US, il 13-14 ottobre a Portlan, Oregon!
tag_line: La wiki-mappa Libera del Mondo
user_diaries: Diari degli utenti
user_diaries_tooltip: Visualizza diari utente
@ -1019,19 +1014,23 @@ it:
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 &copy; Crown copyright and database right\n2010."
contributors_intro_html: "La nostra licenza CC BY-SA richiede di &ldquo;dare l'attribuzione\nall'autore originale ragionevolmente al mezzo o ai mezzi che stai\nutilizzando&rdquo;. I mappatori individuali OSM non richiedono\nun'attribuzione al di là che per i &ldquo;contributori\nOpenStreetMap&rdquo;, 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_gb_html: "<strong>Regno Unito</strong>: contiene i dati della\nOrdnance Survey &copy; Crown copyright and database right\n2010-12."
contributors_intro_html: "I nostri contributori sono migliaia di individui. Includiamo anche dati distribuiti sotto licenze aperte provenienti da agenzie cartografiche nazionali o di altra fonte, tra cui:"
contributors_nl_html: "strong>Olanda</strong>: contiene dati &copy; 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_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 &ldquo;&copy; OpenStreetMap\ncontributors, CC BY-SA&rdquo;. Se utilizzi solo i dati delle mappe\nsi richiede &ldquo;Map data &copy; OpenStreetMap contributors,\nCC BY-SA&rdquo;."
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&lsquo;OpenStreetMap&rsquo; a questo indirizzo completo) e a\nwww.creativecommons.org."
credit_1_html: Si richiede che l'attribuzione sia &ldquo;&copy; OpenStreetMap contributors &rdquo;.
credit_2_html: "Inoltre devi specificare chiaramente che i dati sono disponibili sotto la Open Database Licese e, se usi le nostre tavole, che la cartografia è pubblicata con licenza CC-BY-SA. Puoi fare ciò mettendo un collegamento URL a <a href=\"http://www.openstreetmap.org/copyright\">questa pagina di copyright</a>.\nIn alternativa, e necessariamente se stai distribuendo OSM sotto forma di dati, puoi citare e creare un collegamento diretto alle licenze. In mezzi di comunicazione dove i collegamenti URL non sono possibili (per esempio un'opera stampata), ti suggeriamo di indirizzare i lettori verso openstreetmap.org (magari esplicitando 'OpenStreetMap' come nome completo), verso opendatacommons.org e, se necessario, verso creativecommons.org."
credit_title_html: Come si attribuisce a OpenStreetMap
infringement_1_html: Ai contributori OSM si ricorda di non aggiungere dati da qualsiasi fonte protetta da copyright (ad esempio Google Maps o mappe stampate) senza esplicita autorizzazione dei titolare del copyright.
infringement_2_html: "Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra\n <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra\n<a href=\"http://dmca.openstreetmap.org/\">pagina di segnalazione on-line</a>."
infringement_title_html: Violazione del copyright
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."
intro_2_html: "Sei libero di copiare, distribuire, trasmettere e adattare i nostri dati, finché lo attribuisci a OpenStreetMap e ai suoi contributori. Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo sotto la stessa licenza. Il \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">codice\nlegale completo</a> illustra i tuoi diritti e le tue responsabilità."
intro_3_html: "La cartografia contenuta nelle nostre tavole, e la nostra documentazione, sono rilasciate sotto licenza <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC-BY-SA)."
more_1_html: "Per saperne di più su come utilizzare i nostri dati, e come accreditarci, consulta\nle <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Domande\nlegali frequenti</a>."
more_2_html: "Anche se i dati OpenStreetMap sono aperti, non possiamo fornire accesso alle API della mappa gratuitamente per gli sviluppatori di terze parti.\nVedi la nostra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Politica di utilizzo delle API</a>, la\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politica di utilizzo delle tavole della mappa</a>\ne la <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Politica di utilizzo di Nominatim</a>."
more_title_html: Per saperne di più
title_html: Copyright e licenza
native:
@ -1164,7 +1163,7 @@ it:
signup_confirm:
subject: "[OpenStreetMap] Conferma il tuo indirizzo email"
signup_confirm_html:
ask_questions: E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro <a href="http://help.openstreetmap.org/">sito di domande e risposte</a>.
ask_questions: È possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro <a href="http://help.openstreetmap.org/">sito di domande e risposte</a>.
click_the_link: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
current_user: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui essi operano, è disponibile su <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
get_reading: Leggi di OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">sul wiki</a>, non perdere le ultime notizie sul <a href="http://blog.openstreetmap.org/">blog di OpenStreetMap</a> o su <a href="http://twitter.com/openstreetmap">Twitter</a>, oppure sfoglia il blog <a href="http://www.opengeodata.org/">OpenGeoData</a> di Steve Coast, fondatore di OpenStreetMap, per una storia completa del progetto; ci sono anche dei <a href="http://www.opengeodata.org/?cat=13">podcast da ascoltare</a>!
@ -1173,11 +1172,11 @@ 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 cui si opera, come ad esempio <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
user_wiki_page: È consigliato creare una pagina utente sul wiki includendo delle categorie per il proprio luogo di residenza, 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:
ask_questions: "E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte:"
ask_questions: "È possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte:"
blog_and_twitter: "Ottieni le ultime notizie tramite il blog di OpenStreetMap oppure Twitter:"
click_the_link_1: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante
click_the_link_2: per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
@ -1189,7 +1188,7 @@ it:
more_videos: "Ci sono ulteriori video qui:"
opengeodata: "OpenGeoData.org è il blog del fondatore di OpenStreetMap, Steve Coast, che mette a disposizione anche dei podcast:"
the_wiki: "Puoi avere altre informazioni su OpenStreetMap sul wiki:"
user_wiki_1: E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria
user_wiki_1: È consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria
user_wiki_2: che si riferiscano al luogo in si opera, come ad esempio [[Category:Users_in_Friuli-Venezia_Giulia]].
wiki_signup: "Ci si può anche iscrivere al wiki di OpenStreetMap a:"
oauth:
@ -1201,7 +1200,7 @@ it:
allow_write_diary: creare pagine di diario, commenti e fare amicizia.
allow_write_gpx: carica tracciati GPS.
allow_write_prefs: modificare le tue preferenze utente.
request_access: L'applicazione %{app_name} sta richiedendo l'accesso al tuo profilo, %{user}. Si prega di verificare se si desidera che l'applicazione abbia le seguenti funzionalità. E' possibile scegliere a piacere.
request_access: L'applicazione %{app_name} sta richiedendo l'accesso al tuo profilo, %{user}. Si prega di verificare se si desidera che l'applicazione abbia le seguenti capacità. È possibile scegliere a piacere.
revoke:
flash: Hai revocato il token per %{application}
oauth_clients:
@ -1295,7 +1294,7 @@ it:
site:
edit:
anon_edits_link_text: Leggi il perché.
flash_player_required: E' necessario un visualizzatore Flash per utilizzare Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si può <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scaricare il Flash Player da Adobe.com</a>. Sono disponibili anche <a href="http://wiki.openstreetmap.org/wiki/Editing">altre possibilità</a> per apportare modifiche a OpenStreetMap.
flash_player_required: È necessario un visualizzatore Flash per utilizzare Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si può <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scaricare il Flash Player da Adobe.com</a>. Sono disponibili anche <a href="http://wiki.openstreetmap.org/wiki/Editing">altre possibilità</a> per apportare modifiche a OpenStreetMap.
no_iframe_support: Il proprio browser non supporta gli iframe HTML, necessari per questa funzionalità.
not_public: Non si sono impostate come pubbliche le proprie modifiche.
not_public_description: Non è possibile modificare la mappa finché non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria %{user_page}.
@ -1306,6 +1305,8 @@ 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.
license:
copyright: Copyright OpenStreetMap e collaboratori, sotto una licenza aperta
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
@ -1561,13 +1562,13 @@ it:
unknown token: Questo token non sembra esistere.
confirm_email:
button: Conferma
failure: E' stato già confermato un indirizzo email con questo codice.
failure: Un indirizzo email con questo codice è già stato confermato.
heading: Conferma una variazione di indirizzo email
press confirm button: Premere sul pulsante di conferma sottostante per confermare il nuovo indirizzo email.
success: L'indirizzo email è stato confermato, grazie per l'iscrizione!
confirm_resend:
failure: Utente %{name} non trovato.
success: E' stato spedito un nuovo messaggio di conferma all'indirizzo %{email} e non appena verrà confermato il proprio profilo si sarà in grado di mappare.<br /><br />Se si utilizzano dei filtri antispam che spediscono richieste di conferma assicurarsi di inserire l'indirizzo webmaster@openstreetmap.org nella whitelist, altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma.
success: È stato spedito un nuovo messaggio di conferma all'indirizzo %{email} e non appena verrà confermato il proprio profilo si sarà in grado di mappare.<br /><br />Se si utilizzano dei filtri antispam che spediscono richieste di conferma assicurarsi di inserire l'indirizzo webmaster@openstreetmap.org nella whitelist, altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma.
filter:
not_an_administrator: Bisogna essere amministratori per poter eseguire questa azione.
go_public:
@ -1732,7 +1733,7 @@ it:
friends_changesets: Visualizza tutti i gruppi di modifica degli amici
friends_diaries: Sfoglia tutte le note dei diari degli amici
hide_user: nascondi questo utente
if set location: Se si imposta una propria posizione, una bella mappa ed altre informazioni compariranno di seguito. E' possibile impostare la propria posizione sulla pagina delle %{settings_link}.
if set location: Se si imposta una propria posizione, una bella mappa ed altre informazioni compariranno di seguito. È possibile impostare la propria posizione sulla pagina delle %{settings_link}.
km away: distante %{count} km
latest edit: "Ultima modifica %{ago}:"
m away: "%{count}m di distanza"
@ -1778,7 +1779,7 @@ it:
heading: Lista dei blocchi su %{name}
title: Blocchi su %{name}
create:
flash: E' stato imposto un blocco sull'utente %{name}.
flash: È stato imposto un blocco sull'utente %{name}.
try_contacting: Per favore prova a contattare l'utente prima di bloccarlo e forniscigli un tempo ragionevole per rispondere.
try_waiting: Per favore fornisci all'utente un tempo ragionevole per rispondere prima di bloccarlo.
edit:

547
config/locales/ja.yml
View file

File diff suppressed because it is too large Load diff

5
config/locales/ka.yml
View file

@ -351,8 +351,6 @@ ka:
cities: ქალაქები
places: ადგილები
towns: დაბები
description_osm_namefinder:
prefix: "%{distance} %{direction} %{type}"
direction:
east: აღმოსავლეთი
north: ჩრდილოეთი
@ -374,12 +372,9 @@ ka:
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 Namefinder</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_place: ", %{distance} %{direction} %{placename}–დან"
search_osm_nominatim:
prefix:
aeroway:

469
config/locales/ko.yml
View file

File diff suppressed because it is too large Load diff

3
config/locales/lb.yml
View file

@ -244,11 +244,8 @@ lb:
ca_postcode: Resultater vu <a href="http://geocoder.ca/">Geocoder.ca</a>
geonames: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>
latlon: Resultater vun <a href="http://openstreetmap.org/">Internal</a>
osm_namefinder: Resultater vun <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
uk_postcode: Resultater vun <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
us_postcode: Resultater vu <a href="http://geocoder.us/">Geocoder.us</a>
search_osm_namefinder:
suffix_place: ", %{distance} %{direction} vu(n) %{placename}"
search_osm_nominatim:
prefix:
amenity:

4
config/locales/lt.yml
View file

@ -450,13 +450,9 @@ lt:
ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> rezultatai
geonames: <a href="http://www.geonames.org/">GeoNames</a> rezultatai
latlon: <a href="http://openstreetmap.org/">Vidiniai</a> rezultatai
osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a> rezultatai
osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> rezultatai
uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> rezultatai
us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> rezultatai
search_osm_namefinder:
suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection}, %{parentname}"
suffix_place: ", %{distance}, į %{direction}, %{placename}"
search_osm_nominatim:
prefix:
aeroway:

8
config/locales/lv.yml
View file

@ -430,14 +430,11 @@ 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
@ -459,13 +456,9 @@ lv:
ca_postcode: Rezultāti no <a href="http://geocoder.ca/">Geocoder.CA</a>
geonames: Rezultāti no <a href="http://www.geonames.org/">GeoNames</a>
latlon: Rezultāti no <a href="http://openstreetmap.org/">Iekšējās meklēšanas</a>
osm_namefinder: Rezultāti no <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
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:
@ -995,6 +988,7 @@ lv:
partners_url: http://wiki.openstreetmap.org/wiki/Partners
sign_up: piereģistrēties
sign_up_tooltip: Izveidot kontu rediģēšanai
sotm2012: Nāc uz 2012 OpenStreetMap Konferenci, Kartes Stāvoklis, 6.-8. septembrī Tokijā!
tag_line: Atvērtā Wiki pasaules karte
user_diaries: Lietotāju dienasgrāmatas
user_diaries_tooltip: Skatīt lietotāju dienasgrāmatas

30
config/locales/mk.yml
View file

@ -394,7 +394,7 @@ mk:
area_to_export: Простор за извоз
embeddable_html: Вметнат HTML код
export_button: Извези
export_details: Податоците на OpenStreetMap се нудат под лиценцата <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.mk">Криејтив комонс НаведиИзвор-СподелиПодИстиУслови 2.0</a>.
export_details: Податоците на OpenStreetMap се нудат под <a href="http://opendatacommons.org/licenses/odbl/1.0/">Лиценцата за отворени бази на Складиштето на отворени податоци</a> (ODbL, Open Data Commons Open Database License).
format: Формат
format_to_export: Формат за извоз
image_size: Големина на сликата
@ -425,14 +425,11 @@ mk:
description:
title:
geonames: Местоположба од <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "%{types} од <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">Именикот на OpenStreetMap</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: северно
@ -454,13 +451,9 @@ mk:
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} (%{parentdistance} %{parentdirection} од %{parentname})"
suffix_place: ", %{distance} %{direction} од %{placename}"
search_osm_nominatim:
prefix:
aeroway:
@ -993,6 +986,7 @@ mk:
partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=mk
sign_up: регистрација
sign_up_tooltip: Создај сметка за уредување
sotm2012: Повелете на конференцијата на OpenStreetMap во САД за 2012 „The State of the Map US“ што ќе се одржи на 13 и 14 октомври во Портленд, Орегон!
tag_line: Слободна вики-карта на светот
user_diaries: Кориснички дневници
user_diaries_tooltip: Види кориснички дневници
@ -1014,19 +1008,23 @@ mk:
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од Картографскиот завод на Обединетото Кралство&copy; Крунски авторски права и\nправа на базата 2010."
contributors_intro_html: " Нашата лиценца CC BY-SA бара да &ldquo;го наведете изворниот\n автор разумно за медиумот или средството што го\n користите&rdquo;. Поединечните картографи на OSM не бараат да\n бидат наведувани посебно, туку само како &ldquo;Учесници на\n OpenStreetMap&rdquo;, но онаму кадешто OpenStreetMap содржи податоци\n од некоја државна картографска установа или друг важен извор,\n веројатно би било разумно да ги наведете нив директно,\n наведувајќи ги како што тие обично се наведуваат, или ставајќи врска до нивната страница."
contributors_gb_html: "<strong>Велика Британија</strong>: Содржи податоци\nод Картографскиот завод на Обединетото Кралство&copy; Крунски авторски права и\nправа на базата 2010-12."
contributors_intro_html: "Во нашиот проект учествуваат илјадници поединци. Користиме и\nподатоци со отворена лиценца од државни картографски установи\nи други извори, меѓу кои се:"
contributors_nl_html: "<strong>Холандија</strong>: Содржи &copy; податоци од AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
contributors_nz_html: "<strong>Нов Зеланд</strong>: Содржи податоци од\nКатастарската служба на Нов Зеланд. Крунски авторски права."
contributors_title_html: Нашите учесници
contributors_za_html: "<strong>ЈАР</strong>: Содржи податоци од\n<a href=\"http://www.ngi.gov.za/\">Главната управа:\nНационална катастарска служба</a>, државни авторски права задржани."
credit_1_html: " Доколку користите слики од карти на OpenStreetMap, бараме\n наводот да содржи барем &ldquo;&copy; Учесници на\n OpenStreetMap, CC BY-SA&rdquo;. Ако користите само податоци од картите,\n бараме наводот да гласи &ldquo;Картографски податоци &copy; Учесници на OpenStreetMap,\n CC BY-SA&rdquo;."
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 &lsquo;OpenStreetMap&rsquo; со полнава адреса) и до\n www.creativecommons.org."
credit_1_html: "Задолжително наведувајте нè со &ldquo;&copy; Учесници на\nOpenStreetMap &rdquo;."
credit_2_html: "Исто така мора јасно да истакнете дека податоците се нудат под \nЛиценцата за отворени бази, и, доколку ги користите нашите полиња на картите, дека\nкартографијата е под лиценцата CC-BY-SA. Ова може да го сторите со ставање на врска\nдо <a href=\"http://www.openstreetmap.org/copyright\">оваа страница за авторство</a>. \nДруга можност (задолжителна ако го распространувате OSM во \nподаточен облик) е непосредно да го наведете името на лиценцата и да ставите врска. \nВо медиумите каде врските не се можни are not possible (на пр. печатени дела), предлагаме \nда ги упатите читателите кон openstreetmap.org (можеби со проширување на \n'OpenStreetMap' на оваа полна адреса), кон opendatacommons.org и\n(ако е релевантно) кон creativecommons.org."
credit_title_html: Како да ја наведете OpenStreetMap
infringement_1_html: "Би сакале да ги потсетиме учесниците на OSM дека никогаш не смеат да ставаат\nподатоци од извори заштитени со авторски права (на пр. Google Карти или печатени карти) без\nизрична дозвола од имателите на тие права."
infringement_2_html: "Доколку сметате дека базата на OpenStreetMap или ова мрежно место\nсодржи бесправно или неисправно поставени податоци, погледајте ја\n<a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">процедурата \nза отстранување</a> или поднесете жалба на \n<a href=\"http://dmca.openstreetmap.org/\">оваа наменска страница</a>."
infringement_title_html: Прекршување на авторските права
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изрична дозвола од имателите на тие права."
intro_2_html: "Нашите податоци слободно можете да ги умножувате, распространувате, предавате и менувате, \nдоколку ја наведете OpenStreetMap и нејзините\nучесници. Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">правен текст</a>."
intro_3_html: "Картографијата во нашите полиња на картите и нашата документација\nсе нудат под лиценцата <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив комонс НаведиИзвор-СподелиПодИстиУслови 2.0</a> (CC-BY-SA)."
more_1_html: "Повеќе за употребата на податоци и како да не наведувате, ќе најдете на <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Правни ЧПП</a>."
more_2_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:
@ -1307,6 +1305,8 @@ mk:
index:
js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го оневозможиле тој програм.
js_2: OpenStreetMap користи JavaScript за нејзината лизгава карта.
license:
copyright: Авторски права OpenStreetMap и учесниците, под отворена лиценца
permalink: Постојана врска
remote_failed: Уредувањето не успеа - проверете дали е вчитан JOSM или Merkaartor и дали е овозможено далечинското управување
shortlink: Кратка врска

Some files were not shown because too many files have changed in this diff Show more