activerecord (>= 3.2, < 7.0)
rake (>= 10.4, < 14.0)
ast (2.4.1)
- autoprefixer-rails (9.8.4)
+ autoprefixer-rails (9.8.5)
execjs
aws-eventstream (1.1.0)
- aws-partitions (1.338.0)
+ aws-partitions (1.340.0)
aws-sdk-core (3.103.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sdk-kms (1.36.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.73.0)
+ aws-sdk-s3 (1.74.0)
aws-sdk-core (~> 3, >= 3.102.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
erubi (1.9.0)
execjs (2.7.0)
exifr (1.3.6)
- factory_bot (6.0.2)
+ factory_bot (6.1.0)
activesupport (>= 5.0.0)
- factory_bot_rails (6.0.0)
- factory_bot (~> 6.0.0)
+ factory_bot_rails (6.1.0)
+ factory_bot (~> 6.1.0)
railties (>= 5.0.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
multi_xml (0.6.0)
multipart-post (2.1.1)
nio4r (2.5.2)
- nokogiri (1.10.9)
+ nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
can [:index, :feed], Changeset
can :index, ChangesetComment
can [:index, :rss, :show, :comments], DiaryEntry
- can [:mine], Note
+ can [:index], Note
can [:index, :show], Redaction
can [:index, :show, :data, :georss, :picture, :icon], Trace
can [:terms, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :auth_success, :auth_failure], User
var windowWidth = $(window).width();
if (windowWidth < compactWidth) {
- $("body").removeClass("compact").addClass("small");
+ $("body").removeClass("compact-nav").addClass("small-nav");
} else if (windowWidth < headerWidth) {
- $("body").addClass("compact").removeClass("small");
+ $("body").addClass("compact-nav").removeClass("small-nav");
} else {
- $("body").removeClass("compact").removeClass("small");
+ $("body").removeClass("compact-nav").removeClass("small-nav");
}
}
headerWidth = headerWidth + $(e).outerWidth();
});
- $("body").addClass("compact");
+ $("body").addClass("compact-nav");
$("header").children(":visible").each(function (i, e) {
compactWidth = compactWidth + $(e).outerWidth();
});
- $("body").removeClass("compact");
+ $("body").removeClass("compact-nav");
updateHeader();
new L.OSM.CycleMap(thunderforestOptions).addTo(map);
} else if (args.layer === "transportmap") {
new L.OSM.TransportMap(thunderforestOptions).addTo(map);
+ } else if (args.layer === "opnvkarte") {
+ new L.OSM.OPNVKarte().addTo(map);
} else if (args.layer === "hot") {
new L.OSM.HOT().addTo(map);
}
function displayFeatureWarning(count, limit, add, cancel) {
$("#browse_status").html(
- $("<p class='warning'></p>")
- .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
- .prepend(
- $("<span class='icon close'></span>")
- .click(cancel))
+ $("<div>")
.append(
- $("<input type='submit'>")
- .val(I18n.t("browse.start_rjs.load_data"))
- .click(add)));
+ $("<h2>")
+ .text(I18n.t("browse.start_rjs.load_data"))
+ .prepend($("<span class='icon close'></span>").click(cancel)))
+ .append(
+ $("<div class='inner12'>")
+ .append(
+ $("<p class='alert alert-warning clearfix'></p>")
+ .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })))
+ .append(
+ $("<input type='submit'>")
+ .val(I18n.t("browse.start_rjs.load_data"))
+ .click(add))));
}
var dataLoader;
$("<p>")
.text(I18n.t("javascripts.map.layers.overlays"))
- .attr("class", "deemphasize")
+ .attr("class", "text-muted")
.appendTo(overlaySection);
var overlays = $("<ul class='list-unstyled'>")
var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" });
var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" });
var thunderforest = I18n.t("javascripts.map.thunderforest", { thunderforest_url: "https://www.thunderforest.com/" });
+ var memomaps = I18n.t("javascripts.map.opnvkarte", { memomaps_url: "https://memomaps.de/" });
var hotosm = I18n.t("javascripts.map.hotosm", { hotosm_url: "https://www.hotosm.org/", osmfrance_url: "https://openstreetmap.fr/" });
this.baseLayers = [];
}));
}
+ this.baseLayers.push(new L.OSM.OPNVKarte({
+ attribution: copyright + ". " + memomaps + ". " + terms,
+ code: "O",
+ keyid: "opnvkarte",
+ name: I18n.t("javascripts.map.base.opnvkarte")
+ }));
+
this.baseLayers.push(new L.OSM.HOT({
attribution: copyright + ". " + hotosm + ". " + terms,
code: "H",
.on("click", select))
.append(
$("<p>")
- .attr("class", "deemphasize")
+ .attr("class", "text-muted")
.text(I18n.t("javascripts.share.paste_html"))
.appendTo($linkSection));
$("<div>")
.attr("id", "export-warning")
- .attr("class", "deemphasize")
+ .attr("class", "text-muted")
.text(I18n.t("javascripts.share.only_standard_layer"))
.appendTo($imageSection);
.appendTo($form);
$("<p>")
- .attr("class", "deemphasize")
+ .attr("class", "text-muted")
.html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
.appendTo($form);
#container { position: relative; }
-.column-1 {
- width: 50%;
- margin: 0 0 $lineheight/2 0;
-}
-
.small_icon {
vertical-align: middle;
margin-right: $lineheight/4;
}
-.red { color: $red; }
-
-.piwik { border: 0; }
-
[dir=rtl] { /* no-r2 */ text-align: right; }
[dir=ltr] { /* no-r2 */ text-align: left; }
a {
color: #24d;
text-decoration: none;
- -webkit-appearance: none;
outline: 0;
&:hover {
text-decoration: underline;
}
}
+.text-muted a {
+ color: $blue;
+}
+
/* Rules for the header */
#menu-icon {
display: none;
}
-body.compact {
+body.compact-nav {
#compact-secondary-nav {
display: inline-block;
}
}
#browse_status {
- p {
- padding: $lineheight;
- }
-
input {
display: block;
margin-left: auto;
}
}
- .warning {
- margin: 0 0 $lineheight/2 0;
- padding: 0 $lineheight/2;
- }
-
.note-comments li, .changeset-comments li {
margin: $lineheight/2 0;
background: $lightgrey;
}
-.content-body {
- h1, h2, h3, p, ul, ol {
- margin-bottom: $lineheight;
- }
-
- h1, h2, h3 {
- margin-top: $lineheight/2;
- }
-}
-
.content-inner {
position: relative;
max-width: 900px;
/* Rules for small maps in content areas */
.content_map {
- position: relative;
- width: 45%;
- height: 400px;
+ height: 200px;
border: 1px solid $grey;
margin-bottom: $lineheight;
- float: right;
+}
+
+@include media-breakpoint-up(md) {
+ .content_map {
+ height: 400px;
+ }
}
/* Rules for the new trace form */
/* Rules for the user profile page */
#userinformation {
-
min-height: 100px;
.userinformation-inner {
float: left;
}
- h2 {
- margin-top: 0;
- }
.user-description {
width: 100%;
clear: both;
}
- .deemphasize {
- margin: 0;
- }
}
.admin-user-info small {
margin-right: $lineheight;
}
-.activity-block {
- clear: left;
- border-bottom: 1px solid $grey;
- padding-bottom: $lineheight;
- float: left;
- h3 {
- margin-bottom: $lineheight/2;
- }
-}
-
.contact-activity {
margin-top: $lineheight;
width: 100%;
margin-top: $lineheight/2;
}
- &.deemphasize {
+ &.deleted {
background-color: #fee;
}
padding-top: $lineheight;
border-top: 1px solid $grey;
}
- &.deemphasize {
+ &.deleted {
background-color: #fee;
}
p {
/* Rules for the account settings page */
-#accountForm .user_map {
- position: relative;
- width: 500px;
- height: 400px;
- border: 1px solid $grey;
-}
-
#accountForm .user_image {
margin-bottom: 0;
}
display: inline !important;
}
-.content_map.settings_map {
- width: 50%;
- float: none;
-}
-
/* Rules for the oauth settings page */
.oauth_clients .buttons .oauth-edit {
display: block;
color: white;
font-weight: 300;
- font-size: 34px;
+ font-size: 28px;
span {
color: $vibrant-green;
}
}
+ @include media-breakpoint-up(sm) {
+ h1 {
+ font-size: 34px;
+ }
+ }
+
.user-image {
position: absolute;
top: 0px;
display: none;
}
}
-
-.read-reports {
- background: $lightgrey;
- opacity: 0.7;
-}
/* Styles specific to a small screen, such as iPhone, Android, etc... */
-body.small {
-
- input[type="submit"],
- input[type="text"] {
- -webkit-appearance: none;
- }
-
- .column-1 {
- width: 100%;
- }
-
+body.small-nav {
#menu-icon {
display: inline-block !important;
}
.compact-hide {
display: inline-block;
}
-
.overlay-sidebar #sidebar .welcome.visible {
display: none;
.leaflet-top.leaflet-right {
top: 10px !important;
}
-
- .content_map {
- width: 100%;
- border: none;
- float: none;
- height: 200px;
- max-height: none;
- min-height: auto;
- }
-
- /* Rules for the login form */
-
- #login_login input#user_email {
- width: 100%;
- max-width: 18em;
- }
-
- #login_login input#user_password {
- width: 100%;
- max-width: 18em;
- }
-
- #login_login input#openid_url {
- width: 100%;
- max-width: 18em;
- }
-
- #login_openid_buttons td {
- padding: 2px;
- }
-
- /* Rules for the user view */
-
- .user_map {
- width: 100% !important;
- height: 300px !important;
- }
-
- #userinformation .deemphasize {
- position: relative;
- right: auto; left: auto;
- margin-top: 10px;
- top: auto;
- }
-
- &.site-about #content .attr h1 {
- font-size: 28px;
- }
-
}
@media (max-width: 767.98px) {
}
}
}
+
+@media (max-width: 575.98px) {
+ /* Rules for the login form */
+
+ #login_login input#user_email {
+ width: 100%;
+ max-width: 18em;
+ }
+
+ #login_login input#user_password {
+ width: 100%;
+ max-width: 18em;
+ }
+
+ #login_login input#openid_url {
+ width: 100%;
+ max-width: 18em;
+ }
+
+ #login_openid_buttons td {
+ padding: 2px;
+ }
+}
module Api
class ChangesetsController < ApiController
- layout "site"
require "xml/libxml"
before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
module Api
class NotesController < ApiController
- layout "site", :only => [:mine]
-
before_action :check_api_readable
before_action :setup_user_auth, :only => [:create, :comment, :show]
before_action :authorize, :only => [:close, :reopen, :destroy, :comment]
module Api
class TracesController < ApiController
- layout "site", :except => :georss
-
before_action :authorize_web
before_action :set_locale
before_action :authorize
module Api
class UsersController < ApiController
- layout "site", :except => [:api_details]
-
before_action :disable_terms_redirect, :only => [:details]
before_action :authorize, :only => [:details, :gpx_files]
class NotesController < ApplicationController
- layout "site", :only => [:mine]
+ layout "site"
before_action :check_api_readable
before_action :authorize_web
##
# Display a list of notes by a specified user
- def mine
+ def index
if params[:display_name]
if @user = User.active.find_by(:display_name => params[:display_name])
@params = params.permit(:display_name)
- @title = t "notes.mine.title", :user => @user.display_name
+ @title = t ".title", :user => @user.display_name
@page = (params[:page] || 1).to_i
@page_size = 10
@notes = @user.notes
<% @comments.each do |comment| %>
<% if comment.visible %>
<li id="c<%= comment.id %>">
- <small class='deemphasize'>
+ <small class='text-muted'>
<%= t(".commented_by",
:when => friendly_date_ago(comment.created_at),
:exact_time => l(comment.created_at),
</li>
<% elsif current_user and current_user.moderator? %>
<li id="c<%= comment.id %>">
- <small class='deemphasize'>
+ <small class='text-muted'>
<%= t(".hidden_commented_by",
:when => friendly_date_ago(comment.created_at),
:exact_time => l(comment.created_at),
</h2>
<div class="note browse-section">
- <p class="warning"><%= t("javascripts.notes.new.intro") %></p>
+ <p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
<form action="#">
<input type="hidden" name="lon">
<input type="hidden" name="lat">
</div>
<div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
- <%= note_event("opened", @note.created_at, @note.author) %>
+ <p><%= note_event("opened", @note.created_at, @note.author) %></p>
<% if @note.status == "closed" %>
- <br />
- <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
+ <p><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
<% end %>
</div>
<% if @note_comments.find { |comment| comment.author.nil? } -%>
- <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+ <p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
<% end -%>
<% if current_user && current_user != @note.author %>
- <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>
+ <p class="text-muted"><%= report_link(t(".report"), @note) %></p>
<% end %>
<% if @note_comments.length > 1 %>
<ul class="list-unstyled">
<% @note_comments[1..-1].each do |comment| %>
<li id="c<%= comment.id %>">
- <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+ <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
<%= comment.body.to_html %>
</li>
<% end %>
-<div class="clearfix diary-comment<%= " deemphasize" unless diary_comment.visible? %>">
+<div class="clearfix diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
<%= user_thumbnail diary_comment.user %>
- <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
+ <p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
<% if current_user and diary_comment.user.id != current_user.id %>
| <%= report_link(t(".report"), diary_comment) %>
<% end %>
-<div class='diary_post<%= " deemphasize" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
+<div class='diary_post<%= " text-muted px-3 deleted" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
<div class='post_heading clearfix'>
<% if !@user %>
<%= user_thumbnail diary_entry.user %>
<h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
- <small class='deemphasize'>
+ <small class='text-muted'>
<%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
</small>
<% content_for :heading do %>
<h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
<p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
-<p class="deemphasize">
+<p class="text-muted">
<small>
<%= @issue.assigned_role %>
| <%= t ".reports", :count => @issue.reports.count %>
<h3><%= t ".reports_of_this_issue" %></h3>
<% if @read_reports.present? %>
- <div class="read-reports">
+ <div class="bg-light text-muted">
<h4><%= t ".read_reports" %></h4>
<%= render "reports", :reports => @read_reports %>
</div>
<% end %>
<% if @unread_reports.any? %>
- <div class="unread-reports">
+ <div>
<h4><%= t ".new_reports" %></h4>
<%= render "reports", :reports => @unread_reports %>
</div>
<% content_for :heading do %>
- <h2><%= t "notes.mine.heading", :user => @user.display_name %></h2>
- <p><%= t "notes.mine.subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
+ <h2><%= t ".heading", :user => @user.display_name %></h2>
+ <p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
<% end %>
<%= render :partial => "notes_paging_nav" %>
<p><%= t ".export_details_html" %></p>
<div id="export_osm_too_large">
- <p class="warning">
+ <p class="alert alert-warning">
<%= t ".too_large.body" %>
</p>
</div>
<% end %>
</td>
<td><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
- <span class="deemphasize" title="<%= trace.timestamp %>"> ...
+ <span class="text-muted" title="<%= trace.timestamp %>"> ...
<% if trace.inserted %>
(<%= t ".count_points", :count => trace.size %>)
<% end %>
<%= render :partial => "trace_paging_nav" %>
<table id="trace_list" class="table table-borderless table-striped">
- <thead>
- <tr>
- <th></th>
- <th></th>
- </tr>
- </thead>
<tbody>
<%= render @traces unless @traces.nil? %>
</tbody>
<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
<%= user_thumbnail contact %>
<div class='activity-details'>
- <p class='deemphasize'>
+ <p class='text-muted'>
<%= link_to contact.display_name, user_path(contact) %>
<% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
<% distance = @user.distance(contact) %>
<% end %>
</p>
- <ul class='secondary-actions clearfix deemphasize'>
+ <ul class='secondary-actions clearfix text-muted'>
<li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
<li>
<% if current_user.is_friends_with?(contact) %>
<input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
</div>
- <%= tag.div "", :id => "map", :class => "content_map settings_map set_location" %>
+ <%= tag.div "", :id => "map", :class => "content_map set_location" %>
</fieldset>
<%= submit_tag t(".save changes button") %>
<% else %>
<h1>
<%= t ".introduction_1" %>
- <span class="deemphasize">
+ <span class="text-muted">
<%= t ".introduction_2" %>
</span>
</h1>
- <p class='deemphasize'><%= t ".reconfirm_html",
- :reconfirm => url_for(:action => "confirm_resend") %></p>
+ <p class='text-muted'><%= t ".reconfirm_html",
+ :reconfirm => url_for(:action => "confirm_resend") %></p>
<% end %>
<%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
<%= hidden_field_tag("referer", h(params[:referer])) %>
- <p class='deemphasize'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
+ <p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
<div id="loginForm" class="standard-form">
<span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
</li>
<li>
- <%= link_to t(".my notes"), :controller => "notes", :action => "mine" %>
+ <%= link_to t(".my notes"), user_notes_path(@user) %>
</li>
<li>
<%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
<span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
</li>
<li>
- <%= link_to t(".notes"), :controller => "notes", :action => "mine" %>
+ <%= link_to t(".notes"), user_notes_path(@user) %>
</li>
<li>
<%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
<% end %>
- <p class='deemphasize'>
+ <p class='text-muted'>
<small>
<%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
<% unless @user.terms_agreed %>
</div>
<% if current_user and current_user.administrator? -%>
- <div class='admin-user-info deemphasize'>
+ <div class='admin-user-info text-muted'>
<small><b><%= t ".email address" %></b> <%= @user.email %></small>
<% unless @user.creation_ip.nil? -%>
<small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>
<% end %>
+<div class="row">
<% if current_user and @user.id == current_user.id %>
- <% if @user.home_lat.nil? or @user.home_lon.nil? %>
- <div id="map" class="content_map">
- <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
- </div>
- <% else %>
- <% content_for :head do %>
- <%= javascript_include_tag "user" %>
+ <div class="col-md order-md-last">
+ <% if @user.home_lat.nil? or @user.home_lon.nil? %>
+ <div id="map" class="content_map">
+ <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
+ </div>
+ <% else %>
+ <% content_for :head do %>
+ <%= javascript_include_tag "user" %>
+ <% end %>
+ <% user_data = {
+ :lon => current_user.home_lon,
+ :lat => current_user.home_lat,
+ :icon => image_path("marker-red.png"),
+ :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
+ } %>
+ <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
<% end %>
- <% user_data = {
- :lon => current_user.home_lon,
- :lat => current_user.home_lat,
- :icon => image_path("marker-red.png"),
- :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
- } %>
- <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
- <% end %>
-
- <% friends = @user.friends %>
- <% nearby = @user.nearby - friends %>
-
- <div class="activity-block column-1">
- <h3><%= t ".my friends" %></h3>
-
- <% if friends.empty? %>
- <%= t ".no friends" %>
- <% else %>
- <ul class='secondary-actions clearfix'>
- <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
- <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
- </ul>
- <div id="friends-container">
- <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
- </div>
- <% end %>
- </div>
- <div class="activity-block column-1">
- <h3><%= t ".nearby users" %></h3>
-
- <% if nearby.empty? %>
- <%= t ".no nearby users" %>
- <% else %>
- <ul class='secondary-actions clearfix'>
- <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
- <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
- </ul>
- <div id="nearbyusers">
- <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
- </div>
- <% end %>
- </div>
-<% end %>
+ <% friends = @user.friends %>
+ <% nearby = @user.nearby - friends %>
+ </div>
+
+ <div class="col-md">
+ <h3><%= t ".my friends" %></h3>
+
+ <% if friends.empty? %>
+ <%= t ".no friends" %>
+ <% else %>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
+ <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
+ </ul>
+ <div id="friends-container">
+ <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
+ </div>
+ <% end %>
+
+ <hr>
+
+ <h3><%= t ".nearby users" %></h3>
+
+ <% if nearby.empty? %>
+ <%= t ".no nearby users" %>
+ <% else %>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
+ <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
+ </ul>
+ <div id="nearbyusers">
+ <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+</div>
<%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>
<!-- legale is <%= @legale %> -->
- <p class="deemphasize"><%= t ".read and accept with tou" %></p>
+ <p class="text-muted"><%= t ".read and accept with tou" %></p>
<h4>
<%= t ".heading_ct" %>
</h4>
<div class='standard-form-row horizontal-list clearfix'>
- <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
+ <p class="text-muted"><%= t ".contributor_terms_explain" %></p>
<label class="standard-label">
<%= t ".legale_select" %>
</label>
</div>
<div>
- <p id="contributorGuidance" class="deemphasize">
+ <p id="contributorGuidance" class="text-muted">
<%= t ".guidance_html",
:summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
:translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
<h4>
<%= t "layouts.tou" %>
</h4>
- <p class="deemphasize"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
+ <p class="text-muted"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
<div class="standard-form-row">
<label for="read_tou">
<%= check_box_tag "read_tou" %>
:form_action => %w['self'],
:frame_ancestors => %w['self'],
:frame_src => %w['self'],
- :img_src => %w['self' data: www.gravatar.com *.wp.com tile.openstreetmap.org *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr],
+ :img_src => %w['self' data: www.gravatar.com *.wp.com tile.openstreetmap.org *.tile.openstreetmap.org *.tile.thunderforest.com tileserver.memomaps.de *.openstreetmap.fr],
:manifest_src => %w['self'],
:media_src => %w['none'],
:object_src => %w['self'],
next: التالي »
previous: « السابق
notes:
- mine:
+ index:
title: ملاحظات مقدمة أو علق عليها %{user}
heading: ملاحظات %{user}
subheading_html: تم إرسال الملاحظات أو التعليق عليها بواسطة %{user}
collaboradores. Si camudes o crees conteníu sobre los nuesos datos, namái
podrás distribuir el resultáu baxo la mesma llicencia. El <a href="https://opendatacommons.org/licenses/odbl/1.0/">códigu
llegal</a> completu t'esplica los tos drechos y obligaciones.
- intro_3_1_html: La cartografía de los mosaicos del mapa y la nuesa documentación,
- tán llicenciaos baxo la llicencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Reconocimientu-CompartirIgual 2.0</a> (CC BY-SA).
+ intro_3_1_html: La nuesa documentación úfrese baxo la llicencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Reconocimientu-CompartirIgual 2.0</a> (CC BY-SA 2.0).
credit_title_html: Cómo dar reconocimientu a OpenStreetMap
credit_1_html: Riquimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”.
credit_2_1_html: |-
Tamién tienes de dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC BY-SA. Puedes facelo enllazando a <a href="https://www.openstreetmap.org/copyright">esta páxina de drechos d'autor</a>.
Alternativamente, y como requisitu si distribues OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres imprentaes), suxerímoste dirixir a los llectores a openstreetmap.org (espandiendo 'OpenStreetMap' a esta dirección completa, seique), a opendatacommons.org y, si ye'l casu, a creativecommons.org.
+ credit_3_1_html: |-
+ Los mosaicos del mapa del “estilu estándar” de www.openstreetmap.org son una Obra Producida de la Fundación OpenStreetMap usando datos d'OpenStreetMap baxo llicencia Open Database License. Si tas usando estos mosaicos, usa la siguiente atribución:
+ “Mapa base y datos d'OpenStreetMap y de la Fundación OpenStreetMap”.
credit_4_html: |-
Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa.
Por casu:
next: Siguiente »
previous: « Anterior
notes:
- mine:
+ index:
title: Notes unviaes o comentaes por %{user}
heading: notes de %{user}
subheading_html: Notes unviaes o comentaes por %{user}
cycle_map: Mapa ciclista
transport_map: Mapa de tresportes
hot: Humanitariu
+ opnvkarte: ÖPNVKarte
layers:
header: Capes del mapa
notes: Notes de mapa
la API</a>
thunderforest: Mosaicu cortesía de <a href='%{thunderforest_url}' target='_blank'>Andy
Allan</a>
+ opnvkarte: Mosaicos por cortesía de <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
hotosm: Estilu del mosaicu por <a href='%{hotosm_url}' target='_blank'>Equipu
Humanitariu d'OpenStreetMap</a> agospiáu por <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
Francia</a>
in_language_title: Дзённік запісаў на %{language}
new: Новы запіс дзённіку
new_title: Напісаць у вашым дзённіку
+ my_diary: Мой дзённік
no_entries: Няма запісаў
recent_entries: Свежыя запісы ў дзённіку
older_entries: Даўнейшыя запісы
ўдзельнікаў. Калі Вы змяняеце ці выкарыстоўваеце нашыя дадзеныя, Вы можаце
распаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">тэкст
ліцэнзіі</a> растлумачыць Вам правы і абавязкі."
- intro_3_1_html: "Карты ў графічным выглядзе, а таксама дакументацыя распаўсюджваюцца
- на ўмовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцэнзіі
- Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
+ intro_3_1_html: "Наша дакументацыя распаўсюджваюцца на ўмовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцэнзіі
+ Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA 2.0)."
credit_title_html: Як спасылацца на OpenStreetMap
credit_1_html: |-
Мы патрабуем, каб выкарыстоўвалася спасылка “© OpenStreetMap
next: Далей »
previous: « Назад
notes:
- mine:
+ index:
title: Заўвагі, створаныя ці пракаментаваныя %{user}
heading: Заўвагі %{user}'а
subheading_html: Заўвагі, створаныя ці пракаментаваныя %{user}
cycle_map: Веласіпедная карта
transport_map: Транспартная карта
hot: Гуманітарная карта
+ opnvkarte: ÖPNVKarte
layers:
header: Слаі карты
notes: Заўвагі на карце
next: Следваща »
previous: « Предишна
notes:
- mine:
+ index:
title: Бележки създадени или с коментар от %{user}
heading: Бележките на %{user}
subheading_html: Бележки създадени или с коментар от %{user}
next: ↓War-lerc'h »
previous: ↓« Kent
notes:
- mine:
+ index:
title: Notennoù kaset pe addispleget gant %{user}
heading: notennoù %{user}
subheading_html: Notennoù kaset pe addispleget gant %{user}
next: Sljedeća »
previous: « Prethodna
notes:
- mine:
+ index:
id: Id
creator: Izradio
description: Opis
next: Endavant »
previous: « Enrere
notes:
- mine:
+ index:
title: Notes enviades o comentades per %{user}
heading: notes de %{user}
subheading_html: Notes enviades o comentades per %{user}
next: ТӀехьа йогӀург →
previous: ← Хьалхара
notes:
- mine:
+ index:
heading: '%{user} декъашхочун билгалонаш'
id: Идентификатор
creator: Автор
next: Následující »
previous: « Předchozí
notes:
- mine:
+ index:
title: Poznámky vytvořené nebo okomentované uživatelem %{user}
heading: Poznámky uživatele %{user}
subheading_html: Poznámky vytvořené nebo okomentované uživatelem %{user}
next: Nesaf »
previous: « Blaenorol
notes:
- mine:
+ index:
id: Id
javascripts:
close: Cau
diary_comment: Blogkommentar
diary_entry: Blogindlæg
friend: Ven
+ issue: Problem
language: Sprog
message: Meddelelse
node: Punkt
relation: Relation
relation_member: Relationsmedlem
relation_tag: Relationsegenskab
+ report: Rapporter
session: Session
trace: Spor
tracepoint: Sporpunkt
auth:
providers:
none: Ingen
+ openid: OpenID
google: Google
facebook: Facebook
windowslive: Windows Live
way: vej
relation: relation
start_rjs:
- feature_warning: Henter %{num_features} kortobjekter, som kan gøre din browser
- langsom eller få den til at ikke at svare. Er du sikker på du ønsker at få
+ feature_warning: Henter %{num_features} kortobjekter, dette kan gøre din browser
+ langsom eller få den til ikke at svare. Er du sikker på at du ønsker at få
vist disse data?
load_data: Indlæs data
loading: Indlæser...
more_info_2: 'dem kan findes på:'
success:
subject: '[OpenStreetMap] GPX-importering lykkedes'
- loaded_successfully: indlæst med %{trace_points} ud af %{possible_points}
- mulige punkter.
+ loaded_successfully:
+ one: indlæst med %{trace_points} ud af 1 muligt punkt.
+ other: indlæst med %{trace_points} ud af %{possible_points} mulige punkter.
signup_confirm:
subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
greeting: Halløj!
about:
next: Næste
copyright_html: <span>©</span>OpenStreetMap<br>bidragsydere
- used_by_html: '%{name} stiller kortdata til rådighed for tusindvis af websteder,
- mobile apps og hardware-enheder'
+ used_by_html: '%{name} leverer kortdata til tusindvis af websteder, mobile apps
+ og hardware-enheder'
lede_text: OpenStreetMap er bygget af et fællesskab af kortlæggere, der bidrager
og vedligeholder data om veje, stier, caféer, jernbanestationer og meget mere,
over hele verden.
Hvis du ændrer eller bygger på vores\ndata, må du kun distribuere resultatet
under den samme licens. Den\nfulde <a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">juridiske
tekst</a>\nforklarer dine rettigheder og pligter."
- intro_3_1_html: Kartografien i vores kort-fliser, samt vores dokumentation
- er licenseret under <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.da">Creative
- Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA).
+ intro_3_1_html: Vores dokumentation er licenseret under <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.da">Creative
+ Commons Kreditering-Deling på samme vilkår 2.0</a> (CC BY-SA 2.0).
credit_title_html: Kildeangivelse og OpenStreetMap
credit_1_html: Vi kræver at din kildeangivelse mindst består af “©
OpenStreetMap-bidragsydere”.
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_3_1_html: "Kort-fliserne i “standard kortlaget” på www.openstreetmap.org
+ er et produceret værk (\"Produced Work\") af OpenStreetMap Foundation ved
+ brug af OpenStreetMap-data licenseret \nunder Open Database License. Hvis
+ du anvender disse fliser så brug venligst den følgende kreditering: \n“Grundkort
+ og data fra OpenStreetMap og OpenStreetMap Foundation”."
credit_4_html: |-
For et navigerbart elektronisk kort, skal kildeangivelsen være i hjørnet af kortet.
For eksempel:
potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch
2 skal du trykke på gem-knappen).
id_not_configured: iD er ikke blevet konfigureret
- no_iframe_support: Din browser understøtter ikke HTML-iframes som er nødvendige
+ no_iframe_support: Din browser understøtter ikke HTML-iframes, hvilket er nødvendigt
for denne funktion.
export:
title: Eksportér
next: Næste »
previous: « Forrige
notes:
- mine:
+ index:
title: Bemærkninger indsendt eller kommenteret af %{user}
heading: '%{user}s bemærkninger'
subheading_html: Bemærkninger indsendt eller kommenteret af %{user}
out: Zoom ud
locate:
title: Vis min placering
+ metersPopup:
+ one: Du er indenfor en meter fra dette punkt
+ other: Du er indenfor %{count} meter fra dette punkt
+ feetPopup:
+ one: Du er indenfor en fod fra dette punkt
+ other: Du er indenfor %{count} fod fra dette punkt
base:
standard: Standard
cycle_map: Cykelkort
transport_map: Transportkort
hot: Humanitær
+ opnvkarte: Offentlig transport
layers:
header: Kortlag
notes: Kortbemærkninger
copyright: © <a href='%{copyright_url}'>OpenStreetMap-bidragsydere</a>
donate_link_text: <a class='donate-attr' href='%{donate_url}'>Lav en donation</a>
terms: <a href='%{terms_url}' target='_blank'>Hjemmeside og API-vilkår</a>
+ thunderforest: Fliser venligst leveret af <a href='%{thunderforest_url}' target='_blank'>Andy
+ Allan</a>
+ opnvkarte: Fliser venligst leveret af <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
+ hotosm: Flise-stil af <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap
+ Team</a> hosted af <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+ Frankrig</a>
site:
edit_tooltip: Rediger kortet
edit_disabled_tooltip: Zoom ind for at redigere kortet
roundabout_with_exit_ordinal: Ved rundkørslen, tag afkørsel %{exit} mod %{name}
exit_roundabout: Forlad rundkørsel mod %{name}
unnamed: unavngiven vej
- courtesy: Anvisninger stillet til rådighed af %{link}
+ courtesy: Anvisninger venligst leveret af %{link}
exit_counts:
first: "1."
second: "2."
next: Nächste »
previous: « Vorige
notes:
- mine:
+ index:
title: Hinweise/Fehler erstellt oder kommentiert von %{user}
heading: Hinweise von %{user}
subheading_html: Hinweise/Fehler erstellt oder kommentiert von %{user}
next: Peyên »
previous: « Verên
notes:
- mine:
+ index:
description: Şınasnayış
javascripts:
close: Kip ke
next: Pśiducy »
previous: « Pjerwjejšny
notes:
- mine:
+ index:
title: Pokazki, kótarež su se wót %{user} dali abo komentěrowali
heading: Pokazki wužywarja %{user}
subheading_html: Pokazki, kótarež su se wót %{user} dali abo komentěrowali
next: Επόμενη »
previous: « Προηγούμενη
notes:
- mine:
+ index:
title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user}
heading: σημειώσεις του %{user}
subheading_html: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user}
next: Next »
previous: « Previous
notes:
- mine:
+ index:
title: Notes submitted or commented on by %{user}
heading: '%{user}''s notes'
subheading_html: Notes submitted or commented on by %{user}
diary_entry:
posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
comment_link: Comment on this entry
- reply_link: Reply to this entry
+ reply_link: Send a message to the author
comment_count:
zero: No comments
one: "%{count} comment"
subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
- footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
+ footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
message_notification:
subject_header: "[OpenStreetMap] %{subject}"
hi: "Hi %{to_user},"
header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
- footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
+ footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
friendship_notification:
hi: "Hi %{to_user},"
subject: "[OpenStreetMap] %{user} added you as a friend"
next: "Next »"
previous: "« Previous"
notes:
- mine:
+ index:
title: "Notes submitted or commented on by %{user}"
heading: "%{user}'s notes"
subheading_html: "Notes submitted or commented on by %{user}"
cycle_map: Cycle Map
transport_map: Transport Map
hot: Humanitarian
+ opnvkarte: ÖPNVKarte
layers:
header: Map Layers
notes: Map Notes
donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+ opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
site:
edit_tooltip: Edit the map
vi modifos aŭ uzos niajn datumojn, vi povos distribui la verkon laŭ la sama
permesilo. La plena <a href="https://opendatacommons.org/licenses/odbl/1.0/">interkonsento
de uzado</a> klarigas viajn rajtojn kaj devojn.
- intro_3_1_html: La kartografio de niaj map-kaheloj kaj nia dokumentaro estas
- disponeblaj laŭ la permesilo <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.eo">Krea
- Komunaĵo Atribuite-Samkondiĉe 2.0</a> (CC BY-SA).
+ intro_3_1_html: Nia dokumentaro estas eldonita laŭ la permesilo <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.eo">Krea
+ Komunaĵo Atribuite-Samkondiĉe 2.0</a> (CC BY-SA 2.0).
credit_title_html: Kiel atribui aŭtorecon
credit_1_html: 'Ni postulas, ke vi markos: “© Kontribuintoj de
OpenStreetMap”.'
next: Sekva »
previous: « Antaŭa
notes:
- mine:
+ index:
title: Rimarkoj kreitaj aŭ komentitaj de %{user}
heading: Rimarkoj de %{user}
subheading_html: Rimarkoj kreitaj aŭ komentitaj de %{user}
cycle_map: Biciklada mapo
transport_map: Transporta mapo
hot: Hom-helpa mapo
+ opnvkarte: ÖPNVKarte
layers:
header: Tavoloj de mapo
notes: Map-rimarkoj
terms: <a href='%{terms_url}' target='_blank'>Kondiĉoj pri Retejo kaj API</a>
thunderforest: Kaheloj danke al <a href='%{thunderforest_url}' target='_blank'>Andy
ALLAN</a>
+ opnvkarte: Kaheloj danke al <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
hotosm: Kahela stilo de <a href='%{hotosm_url}' target='_blank'>Humanitarian
OpenStreetMap Team</a> gastigata de <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
France</a>
next: Siguiente »
previous: « Anterior
notes:
- mine:
+ index:
title: Notas remitidas o comentadas por %{user}
heading: Notas de %{user}
subheading_html: Notas remitidas o comentadas por %{user}
next: Järgmine »
previous: « Eelmine
notes:
- mine:
+ index:
title: Kasutaja %{user} loodud või kommenteeritud märkused
heading: Kasutaja %{user} märkused
subheading_html: Kasutaja %{user} loodud või kommenteeritud märkused
next: Hurrengoa »
previous: « Aurrekoa
notes:
- mine:
+ index:
title: '%{user}k igotako edo iruzkinak utzitako oharrak'
heading: '%{user} erabiltzailearen oharrak'
subheading_html: '%{user}k igotako edo iruzkinak utzitako oharrak'
state: ایالت
subdivision: زیربخش
suburb: حومه شهر
- town: شهر کوچک
+ town: شهر
unincorporated_area: منطقه گنجانده نشده
village: روستا
"yes": Siedlung
geonames: مکان از <a href="http://www.geonames.org/">GeoNames</a>
types:
cities: شهرها
- towns: شهرهای کوچک
+ towns: شهرها
places: مکانها
results:
no_results: نتیجهای یافت نشد
about:
next: بعدی
copyright_html: <span>©</span>مشارکتکنندگان<br>OpenStreetMap
- used_by_html: صدها وبسایت، برنامهٔ موبایل و دستگاه سختافزاری از دادهٔ %{name}
- نیرو گرفتهاند.
+ used_by_html: '%{name} برای هزاران وبسایت، برنامهٔ موبایل و دستگاه سختافزاری
+ دادهٔ نقشه فراهم میکند.'
lede_text: OpenStreetMap را جامعهای از نقشهکشان ساختهاند که در ایجاد و نگهداری
دادههای مربوط به جادهها، مسیرهای تریل، کافهها، ایستگاههای راهآهن و بسیاری
موارد دیگر در سرتاسر جهان نقش ایفا میکنند.
مجوز توزیع کنید. نسخهٔ کامل <a href="http://opendatacommons.org/licenses/odbl/1.0/">بایدونبایدهای
قانونی</a> حقوق و وظایف شما را توضیح میدهد.
intro_3_1_html: |-
- Ù
\86Ù\82Ø´Ù\87â\80\8cÙ\86گارÛ\8câ\80\8cÙ\87اÛ\8c ارائÙ\87â\80\8cشدÙ\87 در کاشÛ\8câ\80\8cÙ\87اÛ\8c Ù\86Ù\82Ø´Ù\87Ù\94 Ù\85ا Ù\88 در Ù\85ستÙ\86داتÙ\85اÙ\86Ø\8c Ù\87Ù\85Ú¯Û\8c تØت پرÙ\88اÙ\86Ù\87Ù\94 <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Attribution-ShareAlike 2.0</a> (CC BY-SA) هستند.
+ Ù
\85ستÙ\86دات Ù\85ا تØت پرÙ\88اÙ\86Ù\87Ù\94 <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) است.
credit_title_html: چگونه از OpenStreetMap یاد کنیم
credit_1_html: |-
بایسته است که اینگونه از ما یاد کنید:
چاپی)، توصیه میکنیم که خوانندگان خود را به openstreetmap.org (شاید با
گسترش OpenStreetMap به این نشانی کامل)، به opendatacommons.org و در صورت
تناسب به creativecommons.org هدایت کنید.
+ credit_3_1_html: |-
+ کاشیهای نقشهٔ www.openstreetmap.org در «سبک استاندارد»، کار تولیدی (Produced Work) محسوب میشوند که بنیاد اوپناستریتمپ با استفاده از دادهٔ اوپناستریتمپ تحت پروانهٔ پایگاهدادهٔ باز (ODbL) ساختهاست. اگر از این کاشیها استفاده میکنید لطفاً این انتساب را به کار ببرید:
+ «نقشه و دادهٔ پایه از OpenStreetMap و بنیاد OpenStreetMap»
credit_4_html: |-
در یک نقشهٔ الکترونیکی قابل مرور، یادکرد باید در گوشهٔ نقشه ظاهر شود.
برای مثال:
روزآمد میشود
metro:
title: خلاصه های مترو
- description: گزÛ\8cدÙ\87â\80\8cÙ\87اÛ\8cÛ\8c براÛ\8c شهرهای بزرگ جهان و مناطق اطرافشان
+ description: گزÛ\8cدÙ\87â\80\8cÙ\87اÛ\8cÛ\8c از شهرهای بزرگ جهان و مناطق اطرافشان
other:
title: سایر منابع
description: منابع بیشتر در ویکی OpenStreetMap ذکر شده است
next: بعدی »
previous: « قبلی
notes:
- mine:
+ index:
title: یادداشتهایی که %{user} ارسال کرده یا روی آنها نظر داده
heading: یادداشتهای %{user}
subheading_html: یادداشتهایی که %{user} ارسال کرده یا روی آنها نظر داده
terms: <a href='%{terms_url}' target='_blank'>شرایط وبسایت و API</a>
thunderforest: کاشیها با لطف <a href='%{thunderforest_url}' target='_blank'>Andy
Allan</a>
+ opnvkarte: کاشیها با لطف <a href='%{memomaps_url}' target='_blank'></a>
hotosm: سبک کاشیها از <a href='%{hotosm_url}' target='_blank'>Humanitarian
OpenStreetMap Team</a> میزبانی با <a href='%{osmfrance_url}' target='_blank'>اوپناستریتمپ
فرانسه </a>
samalla lisenssillä.\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">Lakitekstissä</a>
mainitaan levittäjän oikeudet ja velvollisuudet."
intro_3_1_html: |-
-
Kartta-aineisto ja dokumentaatio on lisensoitu <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.fi">Creative
- Commons Nimeä-Jaa samoin 2.0</a> -lisenssillä (CC-BY-SA).
+
Dokumentaatio on lisensoitu <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.fi">Creative
+ Commons Nimeä-JaaSamoin 2.0</a> -lisenssillä (CC-BY-SA 2.0).
credit_title_html: OpenStreetMapin mainitseminen
credit_1_html: OpenStreetMapin sisältöä levitettäessä on mainittava teksti
"© OpenStreetMapin tekijät" tai sen englanninkielinen vastine
next: Seuraava »
previous: « Edellinen
notes:
- mine:
+ index:
title: Käyttäjän %{user} kommentoimat ja luomat huomautukset
heading: Käyttäjän %{user} karttailmoitukset
subheading_html: Käyttäjän %{user} kommentoimat ja luomat karttailmoitukset
next: Seuraava »
previous: « Eelinen
notes:
- mine:
+ index:
description: Kuvvaus
javascripts:
close: Sulje
credit_3_1_html: "Les carrés de la carte dans le “style standard”
sur www.openstreetmap.org sont un travail produit par la fondation OpenStreetMap
en utilisant les données de OpenStreetMap sous la licence Open Database.
- Si vous utilisez ces briques, veuillez utiliser l’attribution suivante :
- \n“Carte de base et données de OpenStreetMap et la fondation OpenStreetMap”."
+ Si vous utilisez ces carrés, veuillez utiliser l’attribution suivante :
+ \n“Carte de base et données de OpenStreetMap et de la Fondation OpenStreetMap”."
credit_4_html: |-
Pour une carte électronique navigable, le crédit devrait apparaître dans un coin de la carte.
Par exemple :
next: Suivant »
previous: « Précédent
notes:
- mine:
+ index:
title: Notes soumises ou commentées par « %{user} »
heading: Notes de « %{user} »
subheading_html: Notes soumises ou commentées par « %{user} »
cycle_map: Carte cyclable
transport_map: Carte de transport
hot: Humanitaire
+ opnvkarte: ÖPNVKarte
layers:
header: Couches de carte
notes: Notes de carte
terms: <a href='%{terms_url}' target='_blank'>Conditions du site web et de l’API</a>
thunderforest: Priorité des carreaux de <a href='%{thunderforest_url}' target='_blank'>Andy
Allan</a>
+ opnvkarte: Tuiles obtenues grâce à l'amabilité de <a href='%{memomaps_url}'
+ target='_blank'>MeMoMaps</a>
hotosm: Style des carreaux de <a href='%{hotosm_url}' target='_blank'>l’équipe
humanitaire de OpenStreetMap</a> hébergé par <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
France</a>
next: Sucessîf »
previous: « Precedent
notes:
- mine:
+ index:
title: Note inseride o comentade di %{user}
heading: Lis notis di %{user}
subheading_html: Lis notis inseridis o comentadis di %{user}
next: Ar aghaidh »
previous: « Roimhe
notes:
- mine:
+ index:
id: ID
last_changed: Athrú deireanach
javascripts:
next: Air adhart »
previous: « Air ais
notes:
- mine:
+ index:
title: Nòtaichean a chuir %{user} a-null no a thug %{user} beachd dhaibh
heading: nòtaichean aig %{user}
subheading_html: Nòtaichean a chuir %{user} a-null no a thug %{user} beachd
next: Seguinte »
previous: « Anterior
notes:
- mine:
+ index:
title: Notas enviadas ou comentadas por %{user}
heading: Notas de %{user}
subheading_html: Notas enviadas ou comentadas por %{user}
about:
next: הבא
copyright_html: <span>©</span>תורמי<br>OpenStreetMap
- used_by_html: '%{name} ×\9eפע×\99×\9c×\94 × ×ª×\95× ×\99 ×\94×\9eפ×\94 ×\91אלפי אתרי אינטרנט, יישומים ומכשירים
+ used_by_html: '%{name} ×\9eספקת × ×ª×\95× ×\99 ×\9eפ×\95ת ×\9cאלפי אתרי אינטרנט, יישומים ומכשירים
שונים'
lede_text: את OpenStreetMap בונה קהילת ממפים שתורמים ומתחזקים נתונים על דרכים,
שבילים, בתי־קפה, תחנות רכבת ועוד הרבה יותר, מסביב לעולם.
next: הבא »
previous: « הקודם
notes:
- mine:
+ index:
title: הערות ותגובות של %{user}
heading: הערות של %{user}
subheading_html: הערות ותגובות של %{user}
not_revoke_admin_current_user: वर्तमान उपयोगकर्ता के द्वारा व्यवस्थापक भूमिका
को रद्द नहीं कर सकता है|
notes:
- mine:
+ index:
created_at: 'निर्माण का समय:'
last_changed: अंतिम परिवर्तन
javascripts:
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.
- intro_3_1_html: Kartografija koja je prisutna u našim sličicama karte i naša
- dokumentacija je pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Imenovanje-Dijeli
- pod istim uvjetima 2.0</a> licencijom (CC BY-SA).
+ intro_3_1_html: Naša dokumentacija licencirana je pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Imenovanje-Dijeli
+ pod istim uvjetima 2.0</a> licencijom (CC BY-SA 2.0).
credit_title_html: Kako navoditi OpenStreetMap kao izvor
credit_1_html: |-
Zahtjevamo da istaknete zasluge “© OpenStreetMap
next: Sljedeća »
previous: « Prethodna
notes:
- mine:
+ index:
title: Bilješke stvorio ili komentirao %{user}
heading: Bilješke korisnika %{user}
subheading_html: Bilješke stvorio ili komentirao %{user}
next: Přichodny »
previous: « Předchadny
notes:
- mine:
+ index:
title: Pokazki, kotrež su so wot %{user} dali abo komentowali
heading: Pokazki wužiwarja %{user}
subheading_html: Pokazki, kotrež su so wot %{user} dali abo komentowali
next: Következő »
previous: « Előző
notes:
- mine:
+ index:
title: '%{user} által beküldött vagy kommentált jegyzetek'
heading: '%{user} jegyzetei'
subheading_html: '%{user} által beküldött vagy kommentált jegyzetek'
next: Sequente »
previous: « Precedente
notes:
- mine:
+ index:
title: Notas submittite o commentate per %{user}
heading: Notas de %{user}
subheading_html: Notas submittite o commentate per %{user}
next: Berikutnya »
previous: « Sebelumnya
notes:
- mine:
+ index:
title: Catatan dimasukkan atau dikomentari oleh %{user}
heading: catatan oleh %{user}
subheading_html: Catatan dimasukkan atau dikomentari oleh %{user}
next: Næsta »
previous: « Fyrri
notes:
- mine:
+ index:
title: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir við af
%{user}
heading: Minnispunktar frá %{user}
about:
next: Successivo
copyright_html: <span>©</span>OpenStreetMap<br>contributors
- used_by_html: '%{name} fornisce dati geografici su migliaia di siti web, applicazioni
+ used_by_html: '%{name} fornisce dati geografici per migliaia di siti web, applicazioni
mobili e dispositivi hardware'
lede_text: OpenStreetMap è costruito da una comunità di mappatori che contribuiscono
e mantengono i dati sulle strade, sentieri, caffè, stazioni ferroviarie e
Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo
sotto la stessa licenza. Il \n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">codice\nlegale
completo</a> illustra i tuoi diritti e le tue responsabilità."
- intro_3_1_html: "La cartografia contenuta nelle nostre tavole, e la nostra
- documentazione, sono rilasciate sotto licenza <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative
- \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC BY-SA)."
+ intro_3_1_html: "La nostra documentazione è rilasciata in base alla licenza
+ <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.it\">Creative
+ \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC BY-SA 2.0)."
credit_title_html: Come si attribuisce a OpenStreetMap
credit_1_html: Si richiede che l'attribuzione sia “© OpenStreetMap
contributors ”.
credit_2_1_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="https://www.openstreetmap.org/copyright">questa pagina di copyright</a>.
In 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_3_1_html: 'I tasselli della mappa nello “stile predefinito”
+ su www.openstreetmap.org sono frutto del lavoro della fondazione OpenStreetMap
+ a partire da dati OpenStreetMap rilasciati con licenza Open Database. Se
+ utilizzi questi tasselli, inserisci la seguente attribuzione: “Mappa
+ di base e dati da OpenStreetMap e dalla fondazione OpenStreetMap”.'
credit_4_html: |-
In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa.
Ad esempio:
next: Successivo »
previous: « Precedente
notes:
- mine:
+ index:
title: Note inserite o commentate da %{user}
heading: Note dell'utente %{user}
subheading_html: Note inserite o commentate da %{user}
cycle_map: Mappa ciclabile
transport_map: Mappa dei trasporti
hot: Umanitario
+ opnvkarte: ÖPNVKarte
layers:
header: Livelli mappa
notes: Note sulla mappa
API</a>
thunderforest: Tasselli forniti da <a href='%{thunderforest_url}' target='_blank'>Andy
Allan</a>
+ opnvkarte: Tasselli forniti da <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
hotosm: Stile dei tasselli di <a href='%{hotosm_url}' target='_blank'>Humanitarian
OpenStreetMap Team</a> ospitato da <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
France</a>
# Author: Vigorous action
# Author: Wrightbus
# Author: Yusuke1109
+# Author: はまのまさと
# Author: ネイ
# Author: 沈澄心
# Author: 神樂坂秀吉
next: 次へ »
previous: « 前へ
notes:
- mine:
+ index:
title: '%{user} さんが投稿またはコメントしたメモ'
heading: '%{user}さんのメモ'
subheading_html: '%{user}さんが投稿またはコメントしたメモ'
next: შემდეგი »
previous: « წინა
notes:
- mine:
+ index:
creator: შემქმნელი
description: აღწერა
javascripts:
next: Ar zdat»
previous: « ar deffir
notes:
- mine:
+ index:
heading: Tizmilin n %{user}
id: Asulay
creator: Amernay
next: 다음 »
previous: « 이전
notes:
- mine:
+ index:
title: '%{user} 님이 제출했거나 덧글을 남긴 참고'
heading: '%{user}의 참고'
subheading_html: '%{user} 님이 제출했거나 덧글을 남긴 참고'
next: Pêşve
copyright_html: <span>©</span>Beşdarên<br> OpenStreetMapê
used_by_html: '%{name} li ser bi hezaran malper, sepanên mobîl û cîhazên hişkalavan,
- daneyên nexşeyê li hev tîne'
+ daneyên nexşeyê pêşkêş dike'
lede_text: OpenStreetMap ji alî civata nexşesazên ku ji seransera dinyayê der
barê kolanan, kafeyan, stasyonên trênan û zêdetirê wan de daneyan tevlî vir
dike û diparêze.
di bin eynî lîsansê de dikarin belav bikin. Temamiya <a href="https://opendatacommons.org/licenses/odbl/1.0/">koda
qanûnî</a>, maf û berpirsiyariyên we îzah dike.
intro_3_1_html: |-
-
Nexşesazî û belgekirinên di nexşeya me de, di bin lîsansa <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Attribution-ShareAlike 2.0</a> (CC BY-SA) de hatiye lîsanskirin.
+
Belgekirinên di nexşeya me de, di bin lîsansa <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) de hatiye lîsanskirin.
credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin
credit_1_html: Ji bo referansgirtinê divê tu wisa binivîsîː “©
beşarên OpenStreetMapê ”.
ne mimkun bin de (wekî mînak. xebatên çapkirî), em ji we re pêşniyar dikin
ku hûn xwînerên xwe tewcîhê openstreetmap.org'ê, opendatacommons.org'ê,
û heke minasib be creativecommons.org'ê bikin.
+ credit_3_1_html: 'Karoyên nexşeyê yên di “stîla standard” de yên
+ li www.openstreetmap.org-ê Xebateke Çêkirî yê Weqfa OpenStreetMapê ye ku
+ bi bikaranîna daneyên OpenStreetMapê di bin lîsansa Open Database de çêbûye.
+ Ger van karoyan bi kar bînî ji kerema xwe van sifetan bi kar bînin: “Nexşeya
+ esasî û dane ji OpenStreetMap û Weqfa OpenStreetMapê ne”.'
credit_4_html: "Ji bo nexşeyekî elektronîk yê gerrînbar, çavkanî divê li jêra
goşeya alî rastê were xuyan. \nWek nimûne:"
attribution_example:
next: Pêşve »
previous: « Paşve
notes:
- mine:
+ index:
title: Notên ku ji aliyê %{user} ve hatine şandin an jî şirovekirin
heading: Notên %{user}
subheading_html: Notên ku ji aliyê %{user} ve hatine şandin an jî şirovekirin
cycle_map: Nexşeya bisiklête
transport_map: Nexşeya transportê
hot: Mirovatî
+ opnvkarte: ÖPNVKarte
layers:
header: Tebeqeyên nexşeyê
notes: Notên nexşeyê
terms: <a href='%{terms_url}' target='_blank'>Mercên malper û APIyê</a>
thunderforest: Kiremît bi destûra <a href='%{thunderforest_url}' target='_blank'>Andy
Allan</a>
+ opnvkarte: Kiremît bi xêra <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
hotosm: Şêweya kiremîtan ji aliyê <a href='%{hotosm_url}' target='_blank'>Tîma
Mirovayî ya OpenStreetMapê</a> ve, hewandin ji aliyê <a href='%{osmfrance_url}'
target='_blank'>OpenStreetMap Fransa</a> ve
next: Nächst »
previous: « Vireg
notes:
- mine:
+ index:
description: Beschreiwung
last_changed: Lescht Ännerung
javascripts:
diary_comment: Dienoraščio komentaras
diary_entry: Dienoraščio įrašas
friend: Draugas
+ issue: Problema
language: Kalba
message: Žinutė
node: Taškas
description: nuotolinį valdymą (JOSM arba Merkaartor)
auth:
providers:
+ openid: OpenID
google: Google
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wikipedia
api:
notes:
comment:
tag: Žymos %{key}=%{value} wiki aprašymo puslapis
wikidata_link: '%{page} elementas Wikidata svetainėje'
wikipedia_link: '%{page} straipsnis Vikipedijoje'
+ wikimedia_commons_link: '%{page} Wikimedia Commons elementas'
telephone_link: Skambinti %{phone_number}
colour_preview: Spalvos %{colour_value} peržiūra
note:
in_language_title: 'Dienoraščio įrašai: %{language}'
new: Naujas dienoraščio įrašas
new_title: Sukurti naują mano dienoraščio įrašą
+ my_diary: Mano dienoraštis
no_entries: Nėra dienoraščio įrašų
recent_entries: Paskutiniai dienoraščio įrašai
older_entries: Senesni įrašai
search: Ieškoti
status: Būsena
last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+ last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> %{user}
link_to_reports: Žiūrėti pranešimus
reports_count:
one: 1 Report
ignored: Problemos būsena pakeista į „Ignoruota“
reopen:
reopened: Problemos būsena pakeista į „Atvira“
+ comments:
+ comment_from_html: '%{user_link} komentavo %{comment_created_at}'
+ reassign_param: Iš naujo priskirti problemą?
+ reports:
+ reported_by_html: Pranešta kaip %{category} naudotojo %{user} %{updated_at}
helper:
reportable_title:
+ diary_comment: '%{entry_title}, komentaras #%{comment_id}'
note: 'Pastaba #%{note_id}'
issue_comments:
create:
new:
title_html: Pranešimas %{link}
missing_params: Negalima sukurti naujo pranešimo
+ details: Prašoma pateikti daugiau informacijos apie problemą (privaloma).
select: 'Parinktie jūsų pranešimo priežastį:'
disclaimer:
intro: 'Prieš siųsdami jūsų pranešimą svetainės moderatoriams, įsitikinkite,
offensive_label: Dienoraššio įrašas yra įžeidžiantis
threat_label: Dienoraščio įraše yra grasinimų
other_label: Kita
+ diary_comment:
+ spam_label: Šiame/šis dienoraščio komentare yra reklama
+ offensive_label: Šis dienoraščio komentaras yra įžeidžiantis
+ threat_label: Šiame dienoraščio įraše yra grasinimas
+ other_label: Kita
user:
+ spam_label: Šis naudotojo profilis yra/turi reklamos
+ offensive_label: Šis naudotojo profilis yra įžeidžiantis
+ threat_label: Šiame naudotojo profilyje yra grasinimas
vandal_label: Šis naudotojas yra vandalas
other_label: Kita
note:
Jūs galite laisvai platinti ir pritaikyti mūsų duomenis tol, kol paminite OpenStreetMap ir jo kūrėjus. Jei naudodamiesi mūsų duomenimis sukursite savo duomenis, jūsų duomenys irgi turi būti licencijuoti pagal tą pačią licenziją.
<a href="http://opendatacommons.org/licenses/odbl/1.0/">Pilnas teisinis aprašymas</a> paaiškins jūsų teises ir atsakomybes.
intro_3_1_html: |-
- Mūsų
žemėlapio duomenys ir mūsų dokumentacija yra licencijuoti pagal <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Mūsų dokumentacija yra licencijuoti pagal <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> licenciją (CC-BY-SA).
credit_title_html: Kaip paminėti OpenStreetMap
credit_1_html: |-
next: Kitas »
previous: « Ankstesnis
notes:
- mine:
+ index:
title: Pastabas pateikė arba komentavo %{user}
heading: '%{user} pastabos'
subheading_html: Pastabas pateikė arba komentavo %{user}
next: Nākamais »
previous: « Iepriekšējais
notes:
- mine:
+ index:
title: Piezīmes, kuras veidojis vai komentējis %{user}
heading: '%{user} piezīmes'
subheading_html: Piezīmes, kuras veidojis vai komentējis %{user}
Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате
само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот
<a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">правен текст</a>."
- intro_3_1_html: |-
- Картографијата во нашите полиња на картите и нашата документација
- се нудат под лиценцата <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.mk">Криејтив комонс Наведи извор-Сподели под исти услови 2.0</a> (CC-BY-SA).
+ intro_3_1_html: "Нашата документација се нуди под лиценцата \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив
+ комонс Наведи извор-Сподели под исти услови 2.0</a> (CC BY-SA 2.0)."
credit_title_html: Како да ја наведете OpenStreetMap
credit_1_html: |-
Задолжително наведувајте нè со “© Учесници на
next: Следна »
previous: « Претходна
notes:
- mine:
+ index:
title: Белешки создадени или коментирани од %{user}
heading: Белешки на %{user}
subheading_html: Белешки создадени или коментирани од %{user}
cycle_map: Велосипедска
transport_map: Сообраќајна
hot: Хуманитарна
+ opnvkarte: ÖPNVKarte
layers:
header: Слоеви на картата
notes: Белешки на картата
terms: <a href='%{terms_url}' target='_blank'>Услови за мреж. место и приложникот</a>
thunderforest: 'Полиња: <a href=''%{thunderforest_url}'' target=''_blank''>Енди
Алан</a>'
+ opnvkarte: Полињата ги достави <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
hotosm: 'Стил на полињата: <a href=''%{hotosm_url}'' target=''_blank''>Хуманитарна
екипа на OpenStreetMap</a> вдомена од <a href=''%{osmfrance_url}'' target=''_blank''>OpenStreetMap
Франција</a>'
next: Berikutnya »
previous: « Sebelumnya
notes:
- mine:
+ index:
title: Nota yang dikemukakan atau diulas oleh %{user}
heading: nota-nota %{user}
subheading_html: Nota yang dikemukakan atau diulas oleh %{user}
next: ရှေ့ »
previous: « ယခင်က
notes:
- mine:
+ index:
creator: ဖန်တီးသူ
description: ဖော်ပြချက်
javascripts:
next: Neste »
previous: « Forrige
notes:
- mine:
+ index:
title: Merknader sendt inn eller kommentert på av %{user}
heading: '%{user} sine merknader'
subheading_html: Merknader sendt inn eller kommentert på av %{user}
next: अर्को »
previous: « अघिल्लो
notes:
- mine:
+ index:
id: आईडी
creator: सर्जक
description: वर्णन
# Author: Carsrac
# Author: Donarreiskoffer
# Author: Duckson32
+# Author: Dutchy45
+# Author: Eebie
# Author: Elroy
# Author: Esketti
# Author: Freek
# Author: Jochempluim
# Author: Joost schouppe
# Author: Jouke
+# Author: Kars
# Author: Ldp
# Author: Lemondoge
# Author: M!dgard
create: Opslaan
diary_entry:
create: Publiceren
- update: Updaten
+ update: Bijwerken
issue_comment:
create: Opmerking toevoegen
message:
activerecord:
errors:
messages:
- invalid_email_address: '"%s" lijkt geen geldig e-mailadres te zijn.'
+ invalid_email_address: lijkt geen geldig e-mailadres te zijn.
email_address_not_routable: is niet routeerbaar
models:
acl: Rechtenoverzicht
relation: Relatie
relation_member: Relatielid
relation_tag: Relatietag
+ report: Rapport
session: Sessie
trace: Track
tracepoint: Trackpunt
remote:
name: Afstandsbediening
description: Afstandsbediening (JOSM of Merkaartor)
+ auth:
+ providers:
+ none: Geen
+ openid: OpenID
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wikipedia
api:
notes:
comment:
in_language_title: Dagboekberichten in het %{language}
new: Nieuw dagboekbericht
new_title: Nieuw bericht in mijn dagboek schrijven
+ my_diary: Mijn dagboek
no_entries: Het dagboek is leeg
recent_entries: Recente dagboekberichten
older_entries: Oudere berichten
"yes": Landgebruik
leisure:
beach_resort: Badplaats
- bird_hide: Nestplaats
+ bird_hide: Vogelkijkplek
common: Meent
dog_park: Hondenpark
firepit: Vuurplaats
more_info_2: 'te vermijden is te vinden op:'
success:
subject: '[OpenStreetMap] GPX-import afgerond'
- loaded_successfully: geladen met %{trace_points} punten van de mogelijke %{possible_points}
- punten.
+ loaded_successfully: '{{PLURAL|one=geladen met %{trace_points} punt.|geladen
+ met %{trace_points} van de %{possible_points} mogelijke punten.'
signup_confirm:
subject: '[OpenStreetMap] Welkom bij OpenStreetMap'
greeting: Hallo!
about:
next: Volgende
copyright_html: <span>©</span>OpenStreetMap-<br />bijdragers
- used_by_html: '%{name} levert gegevens voor duizenden websites, mobiele apps
- en hardwareimplementaties'
+ used_by_html: '%{name} levert kaart gegevens voor duizenden websites, mobiele
+ apps en hardware implementaties'
lede_text: OpenStreetMap wordt gemaakt door een gemeenschap van kaartenmakers
die gegevens over wegen, paden, cafés, treinstations en nog veel meer, over
de hele wereld bijdragen en onderhouden.
volledige <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridische
tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.
intro_3_1_html: |-
- De cartografie in onze kaarttegels en onze documentatie zijn
- vrijgegeven onder de licentie <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Naamsvermelding-Gelijk delen 2.0</a> (CC BY-SA).
+ Onze documentatie is vrijgegeven onder de licentie <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Naamsvermelding-Gelijk delen 2.0</a> (CC BY-SA 2.0).
credit_title_html: Hoe OpenStreetMap te vermelden
credit_1_html: |-
We vereisen dat u het volgende vermeldt bij gebruik:
next: Volgende »
previous: « Vorige
notes:
- mine:
+ index:
title: Opmerkingen gemaakt door %{user}
heading: Opmerkingen van %{user}
subheading_html: Opmerkingen gemaakt door %{user}
out: Uitzoomen
locate:
title: Uw locatie weergeven
+ metersPopup:
+ one: U bevindt zich binnen één meter van dit punt
+ other: U bevindt zich binnen %{count} meter van dit punt
+ feetPopup:
+ one: U bevindt zich binnen één voet van dit punt
+ other: U bevindt zich binnen %{count} voet van dit punt
base:
standard: Standaard
cycle_map: Fietskaart
transport_map: Transportkaart
hot: Humanitarian
+ opnvkarte: ÖPNVKarte
layers:
header: Kaartlagen
notes: Opmerkingen bij kaart
copyright: © <a href='%{copyright_url}'>bijdragers OpenStreetMap</a>
donate_link_text: <a class='donate-attr' href='%{donate_url}'>Doneer nu</a>
terms: <a href='%{terms_url}' target='_blank'>Website en API-voorwaarden</a>
+ thunderforest: Rasterkaart met dank aan <a href='%{thunderforest_url}' target='_blank'>Andy
+ Allan</a>
+ opnvkarte: Tegels met dank aan <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
+ hotosm: Rasterkaart in de stijl van <a href='%{hotosm_url}' target='_blank'>Humanitarian
+ OpenStreetMap Team</a> wordt gehost door <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+ Frankrijk</a>
site:
edit_tooltip: Kaart bewerken
edit_disabled_tooltip: Zoom in om de kaart te bewerken
next: Neste »
previous: « Forrige
notes:
- mine:
+ index:
heading: '%{user} sine merknadar'
subheading_html: Merknadar sendt inn eller kommentert av %{user}
id: ID
next: Seguent »
previous: « Precedent
notes:
- mine:
+ index:
title: Nòtas somesas o comentadas per %{user}
heading: Nòtas de %{user}
subheading_html: Nòtas somesas o comentadas per %{user}
next: ਅਗਲਾ »
previous: « ਪਿਛਲਾ
notes:
- mine:
+ index:
creator: ਸਿਰਜਣਹਾਰ
description: ਵੇਰਵਾ
created_at: ਕਦੋਂ ਸਿਰਜਿਆ ਗਿਆ
wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji.
<a href="https://opendatacommons.org/licenses/odbl/1.0/">Pełny tekst licencji</a>
dokładnie opisuje twoje prawa i obowiązki.
- intro_3_1_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane
-
na warunkach licencji <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pl">Uznanie
+ intro_3_1_html: Nasza dokumentacja rozpowszechniana jest na warunkach licencji
+ <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pl">Uznanie
autorstwa na tych samych warunkach 2.0</a> (CC BY-SA 2.0).
credit_title_html: Jak podać źródło
credit_1_html: Wymagamy podania źródła w postaci „© autorzy OpenStreetMap”.
next: Następna »
previous: « Poprzednia
notes:
- mine:
+ index:
title: Uwagi utworzone lub skomentowane przez %{user}
heading: Uwagi użytkownika %{user}
subheading_html: Uwagi utworzone lub skomentowane przez %{user}
terms: <a href='%{terms_url}' target='_blank'>Warunki użytkowania</a>
thunderforest: Kafelki dzięki uprzejmości <a href='%{thunderforest_url}' target='_blank'>Andy'ego
Allana</a>
+ opnvkarte: Kafelki dzięki uprzejmości <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
hotosm: 'Styl kafelków: <a href=''%{hotosm_url}'' target=''_blank''>Humanitarian
OpenStreetMap Team</a>. Hosting: <a href=''%{osmfrance_url}'' target=''_blank''>OpenStreetMap
France</a>'
about:
next: Próximo
copyright_html: <span>©</span>contribuidores<br>do OpenStreetMap
- used_by_html: O %{name} fornece dados a centenas de sites na internet, aplicações
- de celular e outros dispositivos
+ used_by_html: O %{name} ffornece dados de mapa para milhares de sites, aplicativos
+ móveis e dispositivos de hardware
lede_text: O OpenStreetMap é desenvolvido por uma comunidade voluntária de mapeadores
que contribuem e mantêm atualizados os dados sobre estradas, trilhos, cafés,
estações ferroviárias e muito mais por todo o mundo.
Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado
apenas com a mesma licença. O <a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
legal completo</a> explica os seus direitos e responsabilidades.
- intro_3_1_html: A cartografia nas nossas telas de mapas (imagens dos mapas)
- e a nossa documentação são disponibilizadas sob a licença <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative
- Commons Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA)</a>.
+ intro_3_1_html: "Nossa documentação é licenciada sob a \nlicença <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+ Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0)."
credit_title_html: Como fazer atribuição ao OpenStreetMap
credit_1_html: Requeremos que você faça atribuição citando “© contribuidores
do OpenStreetMap”.
next: Próximo »
previous: « Anterior
notes:
- mine:
+ index:
title: Notas postadas ou comentadas por %{user}
heading: Notas de %{user}
subheading_html: Notas postadas ou comentadas por %{user}
cycle_map: Ciclístico
transport_map: Transporte Público
hot: Humanitário
+ opnvkarte: ÖPNVKarte
layers:
header: Camadas do mapa
notes: Notas de mapa
terms: <a href='%{terms_url}' target='_blank'>Termos do site e da API</a>
thunderforest: Mosaicos cortesia de <a href='%{thunderforest_url}' target='_blank'>Andy
Allan</a>
+ opnvkarte: A camada cortesia por <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
hotosm: Estilo de ladrilhos por <a href='%{hotosm_url}' target='_blank'>Equipe
de Humanitarian OpenStreetMap</a> hospedado por <a href='%{osmfrance_url}'
target='_blank'>OpenStreetMap França</a>
next: Seguinte »
previous: « Anterior
notes:
- mine:
+ index:
title: Notas submetidas ou comentadas por %{user}
heading: Notas de %{user}
subheading_html: Notas submetidas ou comentadas por %{user}
next: Următoarea »
previous: « Precedenta
notes:
- mine:
+ index:
title: Notele trimise sau comentate de %{user}
heading: Notele %{user}
subheading_html: Notele trimise sau comentate de %{user}
# Author: MaxSem
# Author: Mechano
# Author: Meerrahtar
+# Author: Mike like0708
# Author: Mixaill
# Author: Movses
# Author: Nemo bis
вы должны распространять результат только по такой же лицензии. Полный <a
href="https://opendatacommons.org/licenses/odbl/1.0/">юридический текст
лицензии</a> разъясняет ваши права и обязанности.
- intro_3_1_html: Изготовленные нами изображения карты, также как и наша документация
- распространяются по лицензии <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
+ intro_3_1_html: Наша документация распространяются по лицензии <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
credit_title_html: Как сослаться на OpenStreetMap
credit_1_html: Мы требуем, чтобы вы указывали «© Участники OpenStreetMap».
credit_2_1_html: Вы должны также ясно обозначить, что по лицензии Open Database
next: Следующая →
previous: ← Предыдущая
notes:
- mine:
+ index:
title: Заметки, созданные или прокомментированный участником %{user}
heading: Заметки участника %{user}
subheading_html: Заметки, созданные или прокомментированные участником %{user}
next: Imbeniente »
previous: « Pretzedente
notes:
- mine:
+ index:
creator: Creadore
description: Descritzione
javascripts:
next: Appressu »
previous: « Arreri
notes:
- mine:
+ index:
title: Noti scritti o cummintati di l'utenti %{user}
heading: Noti di %{user}
subheading_html: Noti scritti o cummintati di l'utenti %{user}
next: Ďalšia stránka »
previous: « Predchádzajúca stránka
notes:
- mine:
+ index:
id: ID
creator: Autor
description: Popis
next: Naslednja »
previous: « Prejšnja
notes:
- mine:
+ index:
title: Opombe, ki jih je posredoval/-a ali komentiral/-a %{user}
heading: Opombe uporabnika %{user}
subheading_html: Opombe, ki jih je posredoval/-a ali komentiral/-a %{user}
next: Следеће »
previous: « Претходно
notes:
- mine:
+ index:
title: Белешке послао или коментарисао %{user}
heading: Белешке корисника %{user}
subheading_html: Белешке послао или коментарисао %{user}
# Author: Pyscowicz
# Author: Rockyfelle
# Author: Ruila
+# Author: Sabelöga
# Author: Sannab
# Author: Sendelbach
# Author: Sertion
about:
next: Nästa
copyright_html: <span>©</span>OpenStreetMap<br>bidragsgivare
- used_by_html: '%{name} förser tusentals webbsidor, mobilappar och fysiska apparater
- med kartdata'
+ used_by_html: '%{name} förser tusentals webbsidor, mobilappar, appar och fysiska
+ apparater med kartdata'
lede_text: OpenStreetMap är byggt av en gemenskap av kartografer som bidrar
och underhåller data om vägar, stigar, caféer, järnvägsstationer och mycket
mer, över hela världen.
endast distribuera resultatet under samma licens. Den
fullständiga <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridiska
texten</a> förklarar dina rättigheter och skyldigheter.
- intro_3_1_html: |-
- Kartografin i våra kartrutor, och vår dokumentation, är
- tillgängliga under licensen <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Erkännande-DelaLika 2.0</a> (CC BY-SA).
+ intro_3_1_html: "Vår dokumentation är tillgänglig under licensen \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+ Erkännande-DelaLika 2.0</a> (CC BY-SA 2.0)."
credit_title_html: Hur du anger OpenStreetMap som källa
credit_1_html: |-
Vi kräver att din källhänvisning består av “© OpenStreetMaps
next: Nästa »
previous: « Föregående
notes:
- mine:
+ index:
title: Anteckningar skapade eller kommenterade av %{user}
heading: '%{user}s anteckningar'
subheading_html: Anteckningar skapade eller kommenterade av %{user}
cycle_map: Cykelkarta
transport_map: Transportkarta
hot: Humanitärt
+ opnvkarte: ÖPNVKarte
layers:
header: Kartskikt
notes: Kartanteckningar
next: తదుపరి »
previous: « మునుపటి
notes:
- mine:
+ index:
heading: '%{user} గమనికలు'
description: వివరణ
last_changed: చివరి మార్పు
next: ถัดไป »
previous: « ก่อนหน้า
notes:
- mine:
+ index:
heading: หมายเหตุของ %{user}
creator: ผู้สร้าง
javascripts:
next: Susunod »
previous: « Nakaraan
notes:
- mine:
+ index:
heading: mga tala ni %{user}
id: Id
description: Paglalarawan
count_points:
one: 1 puan
other: '%{count} puan'
- more: ayrıntı
+ more: daha fazla
trace_details: İz Ayrıntılarını Görüntüle
view_map: Haritayı Görüntüle
edit: düzenle
next: Sonraki »
previous: « Önceki
notes:
- mine:
+ index:
title: '%{user} tarafından gönderilen veya yorumlanan notlar'
heading: '%{user} kullanıcıya ait notlar'
subheading_html: '%{user} tarafından gönderilen veya yorumlanan notlar'
cycle_map: Bisiklet Haritası
transport_map: Ulaşım Haritası
hot: İnsancıl
+ opnvkarte: ÖPNVKarte
layers:
header: Harita Katmanları
notes: Harita Notları
terms: <a href='%{terms_url}' target='_blank'>Web sitesi ve API şartları</a>
thunderforest: Fayans <a href='%{thunderforest_url} 'target='_blank'>Andy Allan</a>'ın
izniyle
+ opnvkarte: Fayanslar <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>'in
+ izniyle
hotosm: <a href='%{hotosm_url}' target='_blank'>İnsani OpenStreetMap Ekibi</a>
tarafından <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap Fransa</a>
tarafından sunulan karo tarzı
next: Киләсе »
previous: « Алдагы
notes:
- mine:
+ index:
creator: Төзүче
description: Тасвирлама
created_at: Төзелде
befriend_them: Ви також можете додати їх у якості друзів %{befriendurl}.
gpx_notification:
greeting: Привіт,
- your_gpx_file: Схоже, що це ваш файл GPX
+ your_gpx_file: Схоже, що ваш файл GPX
with_description: з описом
and_the_tags: 'та наступними теґами:'
and_no_tags: та без теґів.
about:
next: Далі
copyright_html: <span>©</span>Учасники<br>OpenStreetMap
- used_by_html: '%{name} надає картографічні дані для тисяч веб-сайтів, мобільних
+ used_by_html: '%{name} надає картографічні дані для тисяч вебсайтів, мобільних
застосунків та різних пристроїв'
lede_text: OpenStreetMap створений спільнотою маперів, які вносять і підтримують
дані про дороги, стежки, кав’ярні, вокзали і багато чого іншого по всьому
дозволу правовласників.
infringement_2_html: Якщо ви вважаєте, що захищений авторським правом матеріал
був недоречно доданий до бази даних OpenStreetMap або до цього сайту, ознайомтесь
-
із нашим <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">порядком
- з вилучення таких даних</a> або скорист
уйтесь безпосередньо нашою <a href="https://dmca.openstreetmap.org/">сторінкою
+ з нашим <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">порядком
+ з вилучення таких даних</a> або скорист
айтесь безпосередньо <a href="https://dmca.openstreetmap.org/">сторінкою
для онлайн звернень</a>.
trademarks_title_html: <span id="trademarks"></span>Торгові марки
trademarks_1_html: OpenStreetMap і логотип з лупою є зареєстрованими торговими
next: Наступна →
previous: ← Попередня
notes:
- mine:
+ index:
title: Нотатки створені чи прокоментовані користувачем %{user}
heading: Нотатки користувача %{user}
subheading_html: Нотатки, створені чи прокоментовані користувачем %{user}
in_language_title: Các mục nhật ký bằng %{language}
new: Mục nhật ký mới
new_title: Soạn thảo mục mới trong nhật ký của tôi
+ my_diary: Nhật ký của Tôi
no_entries: Chưa có mục nhật ký
recent_entries: Mục nhật ký gần đây
older_entries: Mục cũ hơn
import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=vi
success:
subject: '[OpenStreetMap] Nhập GPX thành công'
- loaded_successfully: |-
- %{trace_points} điểm được tải thành công trên tổng số
- %{possible_points} điểm.
+ loaded_successfully:
+ one: '%{trace_points} điểm được tải thành công trên tổng số 1 điểm.'
+ other: '%{trace_points} điểm được tải thành công trên tổng số %{possible_points}
+ điểm.'
signup_confirm:
subject: '[OpenStreetMap] Chào mừng bạn đã tham gia OpenStreetMap'
greeting: Chào bạn!
about:
next: Tiếp
copyright_html: <span>©</span>những người<br>đóng góp vào<br>OpenStreetMap
- used_by_html: '%{name} là nguồn dữ liệu bản đồ của hàng ngàn trang Web, ứng
+ used_by_html: '%{name} cung cấp dữ liệu bản đồ cho hàng ngàn trang Web, ứng
dụng di động, và thiết bị phần cứng'
lede_text: OpenStreetMap được xây dựng bởi cộng đồng những người đóng góp và
bảo quản dữ liệu về đường sá, tòa nhà, quán cà phê, nhà ga, và đủ mọi thứ
các dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng
giấy phép. <a href="https://opendatacommons.org/licenses/odbl/1.0/">Mã pháp
lý</a> đầy đủ giải thích các quyền và trách nhiệm của bạn.
- intro_3_1_html: "Các hình ảnh bản đồ và tài liệu của chúng tôi được phát hành
- theo giấy phép <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative
+ intro_3_1_html: "Tài liệu của chúng tôi được phát hành theo giấy phép <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative
\nCommons Ghi công–Chia sẻ tương tự 2.0</a> (CC BY-SA)."
credit_title_html: Cách ghi công OpenStreetMap
credit_1_html: Chúng tôi bắt bạn phải sử dụng lời ghi công “© những người
gợi ý chỉ các độc giả đến openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap”
trở thành địa chỉ đầy đủ này), đến opendatacommons.org, và nếu hợp lý, đến
creativecommons.org.
+ credit_3_1_html: "Các hình ảnh bản đồ lớp “Chuẩn” tại www.openstreetmap.org
+ là một Tác phẩm được Sản xuất bởi Quỹ OpenStreetMap dùng dữ liệu OpenStreetMap
+ theo Giấy phép Cơ sở dữ liệu Mở. Nếu bạn đang sử dụng các hình ảnh này,
+ xin vui lòng ghi công như sau: \n“Bản đồ gốc và dữ liệu từ OpenStreetMap
+ và Quỹ OpenStreetMap”."
credit_4_html: |-
Đối với một bản đồ điện tử tương tác, lời ghi công nên xuất hiện ở góc bản đồ.
Ví dụ:
next: Sau »
previous: « Trước
notes:
- mine:
+ index:
title: Các ghi chú do %{user} lưu hoặc bình luận
heading: Ghi chú của %{user}
subheading_html: Các ghi chú do %{user} lưu hoặc bình luận
out: Thu nhỏ
locate:
title: Bay tới Vị trí của Tôi
+ metersPopup:
+ one: Bạn đang cách địa điểm này trong vòng 1 mét
+ other: Bạn đang cách địa điểm này trong vòng %{count} mét
+ feetPopup:
+ one: Bạn đang cách địa điểm này trong vòng 1 foot
+ other: Bạn đang cách địa điểm này trong vòng %{count} foot
base:
standard: Chuẩn
cycle_map: Bản đồ Xe đạp
copyright: © <a href='%{copyright_url}'>những người đóng góp vào OpenStreetMap</a>
donate_link_text: <a class='donate-attr' href='%{donate_url}'>Quyên góp</a>
terms: <a href='%{terms_url}' target='_blank'>Điều khoản trang Web và API</a>
+ thunderforest: Các hình ảnh bản đồ do <a href='%{thunderforest_url}' target='_blank'>Andy
+ Allan</a> cung cấp
+ hotosm: Kiểu hình ảnh bản đồ do <a href='%{hotosm_url}' target='_blank'>Tổ chức
+ Nhân đạo OpenStreetMap</a> do <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+ Pháp</a> phục vụ
site:
edit_tooltip: Sửa đổi bản đồ
edit_disabled_tooltip: Phóng to để sửa đổi bản đồ
about:
next: 下一页
copyright_html: <span>©</span>OpenStreetMap<br> 贡献者
- used_by_html: '%{name} 驱动了数以千计的网站，移动应用，以及硬件设备的地图数据。'
+ used_by_html: '%{name} 为数以千计的网站、移动应用以及硬件设备提供地图数据'
lede_text: OpenStreetMap 是一个由地图制作爱好者组成的社区。这些爱好者提供并维护世界各地关于道路、小道、咖啡馆、铁路车站等各种各样的数据。
local_knowledge_title: 本地知识库
local_knowledge_html: OpenStreetMap 强调使用本地知识。贡献者们使用航空图像、GPS 设备与传统的地区地图来确保 OSM
href="https://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a>（ODbL）授权。
intro_2_html: 只要您表明来源为 OpenStreetMap 及其贡献者，您就可以自由地复制、分发、传送和改编我们的数据。如果您想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表您的作品。完整的<a
href="https://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了您的权利和义务。
- intro_3_1_html: 我们的地图图块中的绘图数据以及我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享“署名-相同方式共享
- 2.0”</a>许可协议授权。
+ intro_3_1_html: 我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享
+ 署名-相同方式共享 2.0 （CC BY-SA 2.0）</a>许可协议授权。
credit_title_html: 如何表明作者是 OpenStreetMap
credit_1_html: 我们需要您署名“© OpenStreetMap 贡献者”。
credit_2_1_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图图块，其协议须为 CC-BY-SA。您可以链接<a
next: 下一页 »
previous: « 上一页
notes:
- mine:
+ index:
title: '%{user} 提交或评论的笔记'
heading: '%{user} 的笔记'
subheading_html: '%{user} 提交或评论的笔记'
about:
next: 下一頁
copyright_html: <span>©</span>OpenStreetMap<br>貢獻者
- used_by_html: '%{name} 為數以千計的網站、app 與硬體裝置提供地圖資料'
+ used_by_html: '%{name} 為數以千計的網站、行動應用程式和硬件提供地圖資料'
lede_text: OpenStreetMap 是由製圖者社群所建立，他們提供及不斷更新包括有關世界各地的道路、路徑、咖啡館、火車站等等的資料。
local_knowledge_title: 地方知識
local_knowledge_html: |-
intro_2_html: |-
您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為 OpenStreetMap 及其貢獻者。若您在我們的資料上作修改或據之衍生其他資料
，則只可依相同授權條款散佈有關成果。授權的<a href="https://opendatacommons.org/licenses/odbl/1.0/">法律原文</a>詳述您的權責。
- intro_3_1_html: 我們地圖影像塊的製圖法以及我們的文件，以<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用CC
- 姓名標示-相同方式分享 (CC BY-SA) 2.0版</a>條款授權。
+ intro_3_1_html: 我們的文件以<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用
+ CC 姓名標示-相同方式分享（CC BY-SA 2.0版）</a>條款授權。
credit_title_html: 如何標明作者是 OpenStreetMap
credit_1_html: 我們要求您以“© OpenStreetMap 貢獻者”標明作者。
credit_2_1_html: 您亦須清晰註明，有關資料可透過開放資料庫授權條款取得。若使用我們的影像塊，則須註明其製圖法是按 CC-BY-SA
next: 下一頁 »
previous: « 上一頁
notes:
- mine:
+ index:
title: 由 %{user} 送出或評論的註記
heading: '%{user} 的註記'
subheading_html: '%{user} 送出或評論的註記'
cycle_map: 自行車地圖
transport_map: 交通運輸地圖
hot: 人道救援
+ opnvkarte: ÖPNVKarte
layers:
header: 地圖圖層
notes: 地圖註記
terms: <a href='%{terms_url}' target='_blank'>網站與 API 項目</a>
thunderforest: 由 <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>
提供的影像塊
+ opnvkarte: 由 <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a> 提供的影像塊
hotosm: 由 <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap 法國</a>主持的<a
href='%{hotosm_url}' target='_blank'>人道 OpenStreetMap 團隊</a>提供的影像塊樣式
site:
get "/note/new" => "browse#new_note"
get "/user/:display_name/history" => "changesets#index"
get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom }
- get "/user/:display_name/notes" => "notes#mine", :as => :my_notes
+ get "/user/:display_name/notes" => "notes#index", :as => :user_notes
get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
test "note permissions for a guest" do
ability = Ability.new nil
- [:mine].each do |action|
+ [:index].each do |action|
assert ability.can?(action, Note), "should be able to #{action} Notes"
end
end
def test_routes
assert_routing(
{ :path => "/user/username/notes", :method => :get },
- { :controller => "notes", :action => "mine", :display_name => "username" }
+ { :controller => "notes", :action => "index", :display_name => "username" }
)
end
- def test_mine_success
+ def test_index_success
first_user = create(:user)
second_user = create(:user)
moderator_user = create(:moderator_user)
end
# Note that the table rows include a header row
- get my_notes_path(:display_name => first_user.display_name)
+ get user_notes_path(:display_name => first_user.display_name)
assert_response :success
assert_select "table.note_list tr", :count => 2
- get my_notes_path(:display_name => second_user.display_name)
+ get user_notes_path(:display_name => second_user.display_name)
assert_response :success
assert_select "table.note_list tr", :count => 2
- get my_notes_path(:display_name => "non-existent")
+ get user_notes_path(:display_name => "non-existent")
assert_response :not_found
session_for(moderator_user)
- get my_notes_path(:display_name => first_user.display_name)
+ get user_notes_path(:display_name => first_user.display_name)
assert_response :success
assert_select "table.note_list tr", :count => 2
- get my_notes_path(:display_name => second_user.display_name)
+ get user_notes_path(:display_name => second_user.display_name)
assert_response :success
assert_select "table.note_list tr", :count => 3
- get my_notes_path(:display_name => "non-existent")
+ get user_notes_path(:display_name => "non-existent")
assert_response :not_found
end
- def test_mine_paged
+ def test_index_paged
user = create(:user)
create_list(:note, 50) do |note|
create(:note_comment, :note => note, :author => user)
end
- get my_notes_path(:display_name => user.display_name)
+ get user_notes_path(:display_name => user.display_name)
assert_response :success
assert_select "table.note_list tr", :count => 11
- get my_notes_path(:display_name => user.display_name, :page => 2)
+ get user_notes_path(:display_name => user.display_name, :page => 2)
assert_response :success
assert_select "table.note_list tr", :count => 11
end
sign_in_as(create(:user))
visit diary_entries_path
- click_on "Reply to this entry"
+ click_on "Send a message to the author"
assert page.has_content? "Send a new message"
assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
}
});
+L.OSM.OPNVKarte = L.OSM.TileLayer.extend({
+ options: {
+ url: 'https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png',
+ maxZoom: 18,
+ attribution: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="http://memomaps.de/" target="_blank">MeMoMaps</a>'
+ }
+});
+
L.OSM.HOT = L.OSM.TileLayer.extend({
options: {
url: 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',
projects / rails.git / commitdiff