--- /dev/null
+version: 2
+updates:
+ - package-ecosystem: "bundler"
+ versioning-strategy: "increase-if-necessary"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "npm"
+ versioning-strategy: "increase-if-necessary"
+ directory: "/"
+ schedule:
+ interval: "daily"
gem "actionpack-page_caching", ">= 1.2.0"
gem "active_record_union"
gem "activerecord-import"
-gem "bootstrap", "~> 4.3.1"
+gem "bootstrap", "~> 4.5.0"
gem "cancancan"
gem "composite_primary_keys", "~> 12.0.0"
gem "config"
gem "delayed_job_active_record"
gem "dynamic_form"
-gem "http_accept_language", "~> 2.0.0"
+gem "http_accept_language", "~> 2.1.1"
gem "i18n-js", ">= 3.0.0"
gem "oauth-plugin", ">= 0.5.1"
gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
gem "rack-cors"
-gem "rails-i18n", "~> 4.0.0"
+gem "rails-i18n", "~> 6.0.0"
gem "rinku", ">= 2.0.6", :require => "rails_rinku"
gem "strong_migrations"
gem "validates_email_format_of", ">= 1.5.1"
gem "erb_lint", :require => false
gem "factory_bot_rails"
gem "minitest", "~> 5.1"
- gem "puma", "~> 3.11"
+ gem "puma", "~> 4.3"
gem "rails-controller-testing"
gem "rubocop"
gem "rubocop-minitest"
autoprefixer-rails (9.8.4)
execjs
aws-eventstream (1.1.0)
- aws-partitions (1.333.0)
- aws-sdk-core (3.101.0)
+ aws-partitions (1.338.0)
+ aws-sdk-core (3.103.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.35.0)
+ aws-sdk-kms (1.36.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.70.0)
- aws-sdk-core (~> 3, >= 3.99.0)
+ aws-sdk-s3 (1.73.0)
+ aws-sdk-core (~> 3, >= 3.102.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.2.0)
+ aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2)
better_errors (2.7.1)
coderay (>= 1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.6)
msgpack (~> 1.0)
- bootstrap (4.3.1)
+ bootstrap (4.5.0)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
concurrent-ruby (~> 1.0)
dry-core (~> 0.2)
dry-equalizer (~> 0.2)
- dry-schema (1.5.1)
+ dry-schema (1.5.2)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.8, >= 0.8.3)
dry-core (~> 0.4)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.13.1)
- ffi-libarchive (1.0.0)
+ ffi-libarchive (1.0.3)
ffi (~> 1.0)
fspath (3.1.2)
gd2-ffij (0.4.0)
hashie (4.1.0)
html_tokenizer (0.0.7)
htmlentities (4.3.4)
- http_accept_language (2.0.5)
- i18n (0.9.5)
+ http_accept_language (2.1.1)
+ i18n (1.8.3)
concurrent-ruby (~> 1.0)
- i18n-js (3.7.0)
+ i18n-js (3.7.1)
i18n (>= 0.6.6)
image_optim (0.26.5)
exifr (~> 1.2, >= 1.2.2)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- json (2.3.0)
+ json (2.3.1)
jwt (2.2.1)
kgio (2.11.3)
- kramdown (2.2.1)
+ kramdown (2.3.0)
rexml
libxml-ruby (3.2.0)
listen (3.2.1)
progress (3.5.2)
psych (3.1.0)
public_suffix (4.0.5)
- puma (3.12.6)
+ puma (4.3.5)
+ nio4r (~> 2.0)
quad_tile (1.0.1)
r2 (0.2.7)
rack (2.2.3)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
- rails-i18n (4.0.2)
- i18n (~> 0.6)
- rails (>= 4.0)
+ rails-i18n (6.0.0)
+ i18n (>= 0.7, < 2)
+ railties (>= 6.0.0, < 7)
railties (6.0.3.2)
actionpack (= 6.0.3.2)
activesupport (= 6.0.3.2)
rubocop-ast (>= 0.0.3, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
- rubocop-ast (0.0.3)
+ rubocop-ast (0.1.0)
parser (>= 2.7.0.1)
rubocop-minitest (0.9.0)
rubocop (>= 0.74)
- rubocop-performance (1.6.1)
- rubocop (>= 0.71.0)
+ rubocop-performance (1.7.0)
+ rubocop (>= 0.82.0)
rubocop-rails (2.6.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
sprockets (> 3.0)
sprockets-rails
tilt
- secure_headers (6.3.0)
+ secure_headers (6.3.1)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.3.0)
+ zeitwerk (2.3.1)
PLATFORMS
ruby
bigdecimal (~> 1.1.0)
binding_of_caller
bootsnap (>= 1.4.2)
- bootstrap (~> 4.3.1)
+ bootstrap (~> 4.5.0)
browser
bzip2-ffi
cancancan
ffi-libarchive
gd2-ffij (>= 0.4.0)
htmlentities
- http_accept_language (~> 2.0.0)
+ http_accept_language (~> 2.1.1)
i18n-js (>= 3.0.0)
image_optim_rails
jbuilder (~> 2.7)
openstreetmap-deadlock_retry (>= 1.3.0)
pg
psych
- puma (~> 3.11)
+ puma (~> 4.3)
quad_tile (~> 1.0.1)
r2 (~> 0.2.7)
rack-cors
rack-uri_sanitizer
rails (= 6.0.3.2)
rails-controller-testing
- rails-i18n (~> 4.0.0)
+ rails-i18n (~> 6.0.0)
rinku (>= 2.0.6)
rotp
rubocop
This repository consists of:
-* The web site, including user accounts, diary entries, user-to-user messaging
-* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6)
-* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors
-* The Browse pages - a web front-end to the OpenStreetMap data
+* The web site, including user accounts, diary entries, user-to-user messaging.
+* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6).
+* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors.
+* The Browse pages - a web front-end to the OpenStreetMap data.
* The GPX uploads, browsing and API.
A fully-functional Rails Port installation depends on other services, including map tile
# Installation
The Rails Port is a Ruby on Rails application that uses PostgreSQL as its database, and has a large
-number of dependencies for installation. For full details please see [INSTALL.md](INSTALL.md)
+number of dependencies for installation. For full details please see [INSTALL.md](INSTALL.md).
# Development
We're always keen to have more developers! Pull requests are very welcome.
* Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues).
-* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components
-* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap)
+* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components.
+* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap).
* There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion.
* IRC - there is the #osm-dev channel on irc.oftc.net.
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
#container { position: relative; }
-.column-1 {
- width: 50%;
- margin: 0 0 $lineheight/2 0;
-}
-
.small_icon {
vertical-align: middle;
margin-right: $lineheight/4;
/* 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 */
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%;
display: inline !important;
}
-.content_map.settings_map {
- width: 50%;
- float: none;
-}
-
/* Rules for the oauth settings page */
.oauth_clients .buttons .oauth-edit {
display: none;
}
-.messages-show .message-buttons {
- margin-top: $lineheight;
- margin-bottom: $lineheight * 1.5;
- padding-top: $lineheight;
- border-top: 1px solid $lightgrey;
-}
-
-.messages-show .buttons .mark-unread-button {
- border-radius: 0;
-}
-
/* Rules for "flash" notice boxes shown at the top of the content area */
.flash {
-webkit-appearance: none;
}
- .column-1 {
- width: 100%;
- }
-
#menu-icon {
display: inline-block !important;
}
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 {
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
before_action :check_database_writable, :only => [:create, :update, :destroy]
before_action :check_api_readable, :only => [:show, :data]
before_action :check_api_writable, :only => [:create, :update, :destroy]
- before_action :offline_redirect, :only => [:create, :destroy, :data]
+ before_action :offline_error, :only => [:create, :destroy, :data]
around_action :api_call_handle_error
def show
trace
end
- def offline_redirect
- redirect_to :action => :offline if Settings.status == "gpx_offline"
+ def offline_error
+ report_error "GPX files offline for maintenance", :service_unavailable if Settings.status == "gpx_offline"
end
end
end
module Api
class UsersController < ApiController
- layout "site", :except => [:api_details]
-
before_action :disable_terms_redirect, :only => [:details]
before_action :authorize, :only => [:details, :gpx_files]
e = e.cause
if e.is_a?(Timeout::Error) ||
- (e.is_a?(ActiveRecord::StatementInvalid) && e.message =~ /execution expired/)
+ (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))
render :action => "timeout"
else
raise
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
end
def offline_redirect
- redirect_to :action => :offline if Settings.status == "gpx_offline"
+ render :action => :offline if Settings.status == "gpx_offline"
end
def default_visibility
#
class Trace < ApplicationRecord
+ require "open3"
+
self.table_name = "gpx_files"
belongs_to :user, :counter_cache => true
def mime_type
filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
- gzipped = filetype =~ /gzip compressed/
- bzipped = filetype =~ /bzip2 compressed/
- zipped = filetype =~ /Zip archive/
- tarred = filetype =~ /tar archive/
+ gzipped = filetype.include?("gzip compressed")
+ bzipped = filetype.include?("bzip2 compressed")
+ zipped = filetype.include?("Zip archive")
+ tarred = filetype.include?("tar archive")
mimetype = if gzipped
"application/x-gzip"
def extension_name
filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
- gzipped = filetype =~ /gzip compressed/
- bzipped = filetype =~ /bzip2 compressed/
- zipped = filetype =~ /Zip archive/
- tarred = filetype =~ /tar archive/
+ gzipped = filetype.include?("gzip compressed")
+ bzipped = filetype.include?("bzip2 compressed")
+ zipped = filetype.include?("Zip archive")
+ tarred = filetype.include?("tar archive")
extension = if tarred && gzipped
".tar.gz"
def xml_file
filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
- gzipped = filetype =~ /gzip compressed/
- bzipped = filetype =~ /bzip2 compressed/
- zipped = filetype =~ /Zip archive/
- tarred = filetype =~ /tar archive/
+ gzipped = filetype.include?("gzip compressed")
+ bzipped = filetype.include?("bzip2 compressed")
+ zipped = filetype.include?("Zip archive")
+ tarred = filetype.include?("tar archive")
if gzipped || bzipped || zipped || tarred
file = Tempfile.new("trace.#{id}")
<div class="richtext"><%= @message.body.to_html %></div>
- <div class='message-buttons buttons'>
- <%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %>
- <%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %>
- <%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %>
- <%= link_to t(".back"), inbox_messages_path, :class => "button deemphasize" %>
+ <div>
+ <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
+ <%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
+ <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-primary" %>
+ <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
</div>
<% else %>
<div class="richtext"><%= @message.body.to_html %></div>
- <div class='message-buttons buttons'>
- <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
+ <div>
+ <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
</div>
<% end %>
<% 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" %>
<h4 class='heading'><%= t ".title_html" %></h4>
-<ul>
+<ul class='list-unstyled'>
<li>
<h4><%= t ".headings" %></h4>
<p># <%= t ".heading" %><br>
<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
<p><%= t ".legal_babble.intro_1_html", :locale => @locale %></p>
<p><%= t ".legal_babble.intro_2_html", :locale => @locale %></p>
- <p><%= t ".legal_babble.intro_3_html", :locale => @locale %></p>
+ <p><%= t ".legal_babble.intro_3_1_html", :locale => @locale %></p>
<h3><%= t ".legal_babble.credit_title_html", :locale => @locale %></h3>
<p><%= t ".legal_babble.credit_1_html", :locale => @locale %></p>
- <p><%= t ".legal_babble.credit_2_html", :locale => @locale %></p>
- <p><%= t ".legal_babble.credit_3_html", :locale => @locale %></p>
+ <p><%= t ".legal_babble.credit_2_1_html", :locale => @locale %></p>
+ <p><%= t ".legal_babble.credit_3_1_html", :locale => @locale %></p>
+ <p><%= t ".legal_babble.credit_4_html", :locale => @locale %></p>
<p><%= image_tag("attribution_example.png",
:alt => t(".legal_babble.attribution_example.alt"),
:border => 0,
<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") %>
<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 %>
+<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>
# Use memcached for caching if required
config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)
+ # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+ # the I18n.default_locale when a translation cannot be found).
+ config.i18n.fallbacks = true
+
# Use logstash for logging if required
if Settings.key?(:logstash_path)
config.logstasher.enabled = true
-sotm_africa_2019:
- id: sotm_africa_2019
- alt: State of the Map Africa 2019
- link: https://2019.stateofthemap.africa/
- img: banners/sotm_africa_2019.png
- enddate: 2019-nov-24
+sotm_2020:
+ id: sotm_2020
+ alt: State of the Map 2020
+ link: https://2020.stateofthemap.org/
+ img: banners/sotm_2020.png
+ enddate: 2020-jul-05
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
- # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
- # the I18n.default_locale when a translation cannot be found).
- config.i18n.fallbacks = true
-
# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify
module ESLintRails
module ExcludeI18n
def assets
- super.reject { |a| a.to_s =~ %r{/i18n/} }
+ super.reject { |a| a.to_s.include?("/i18n/") }
end
end
end
kontribuesit, CC BY-SA ". Nëse jeni duke përdorur të dhëna vetëm në hartë,
ne kerkojme "Organizimi i të dhënave © kontribuesit OpenStreetMap,
CC BY-SA ".
- credit_2_html: |-
+ credit_2_1_html: |-
Ku të jetë e mundur, duhet të jetë OpenStreetMap hyperlinked në <a
href = "http://www.openstreetmap.org/"> http://www.openstreetmap.org/ </ a>
dhe CC BY-SA për <a
خريطة الشارع المفتوحة\nوالمساهمين فيها، إذا عدلت أو بنيت على بياناتنا، \nفلا
يحق لك توزيع النتيجة إلا تحت نفس الترخيص، و\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">الكود
القانوني</a> الكامل يشرح حقوقك ومسؤولياتك."
- intro_3_html: |-
+ intro_3_1_html: |-
يتم ترخيص رسم الخرائط في بلاط خرائطنا، ووثائقنا
بموجب ترخيص <a href="https://creativecommons.org/licenses/by-sa/2.0/">رخصة المشاع الإبداعي: النسبة-الترخيص بالمثل 2.0</a> (CC BY-SA).
credit_title_html: كيفية النسبة لخريطة الشارع المفتوحة
credit_1_html: |-
نطلب منك استخدام الائتمان “© OpenStreetMap
contributors”.
- credit_2_html: "يجب أيضا أن توضح أن البيانات متوفرة بموجب ترخيص\nقاعدة البيانات
+ credit_2_1_html: "يجب أيضا أن توضح أن البيانات متوفرة بموجب ترخيص\nقاعدة البيانات
المفتوحة، وفي حالة استخدام بلاط خرائطنا، يتم \nترخيص رسم الخرائط كـCC BY-SA،
يمكنك القيام بذلك عن طريق الربط بـ\n<a href=\"https://www.openstreetmap.org/copyright\">صفحة
حقوق الطبع والنشر هذه</a>.\nبدلا من ذلك، وكشرط إذا كنت تقوم بتوزيع خريطة
\nتوجيه القراء إلى openstreetmap.org (ربما عن طريق توسيع \n'OpenStreetMap'
إلى هذا العنوان الكامل)، وإلى opendatacommons.org، \nوإذا كان ذلك مناسبا،
إلى creativecommons.org."
- credit_3_html: 'للحصول على الخريطة الإلكترونية للتصفح; يجب أن يظهر الائتمان
+ credit_4_html: 'للحصول على الخريطة الإلكترونية للتصفح; يجب أن يظهر الائتمان
في زاوية من الخريطة، مثلا:'
attribution_example:
alt: مثال على كيفية إسناد خريطة الشارع المفتوحة على صفحة ويب
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_html: La cartografía de los mosaicos del mapa y la nuesa documentación,
+ 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).
credit_title_html: Cómo dar reconocimientu a OpenStreetMap
credit_1_html: Riquimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”.
- credit_2_html: |-
+ 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_html: |-
+ credit_4_html: |-
Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa.
Por casu:
attribution_example:
more_info_2: 'іх можна знайсьці на:'
success:
subject: '[OpenStreetMap] імпарт GPX адбыўся пасьпяхова'
+ loaded_successfully:
+ one: пасьпяхова загружаны з %{trace_points} з 1 магчымага пункту.
+ few: пасьпяхова загружаныя %{trace_points} пункты з магчымых %{possible_points}.
+ many: пасьпяхова загружаныя %{trace_points} пунктаў з магчымых %{possible_points}.
+ other: пасьпяхова загружаныя %{trace_points} пунктаў з магчымых %{possible_points}.
signup_confirm:
subject: '[OpenStreetMap] Вітаем у OpenStreetMap'
email_confirm:
credit_1_html: |-
Мы патрабуем, каб
Вы пазначалі “© удзельнікі OpenStreetMap”.
- credit_2_html: Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле
+ credit_2_1_html: Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле
ліцэнзіі Open Database, а калі карыстаецеся нашымі кавалкамі мапаў, што
картаграфія ліцэнзаваная паводле CC BY-SA. Гэта можна зрабіць, спаслаўшыся
на <a href="https://www.openstreetmap.org/copyright">гэтую старонку правоў</a>.
ўдзельнікаў. Калі Вы змяняеце ці выкарыстоўваеце нашыя дадзеныя, Вы можаце
распаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">тэкст
ліцэнзіі</a> растлумачыць Вам правы і абавязкі."
- intro_3_html: "Карты ў графічным выглядзе, а таксама дакументацыя распаўсюджваюцца
+ intro_3_1_html: "Карты ў графічным выглядзе, а таксама дакументацыя распаўсюджваюцца
на ўмовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцэнзіі
Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
credit_title_html: Як спасылацца на OpenStreetMap
credit_1_html: |-
Мы патрабуем, каб выкарыстоўвалася спасылка “© OpenStreetMap
contributors”.
- credit_2_html: Вы павінны таксама даваць дакладна разумець, што дадзеныя даступныя
- на Ñ\9eмоваÑ\85 Open Database License, а Ñ\9e вÑ\8bпадкÑ\83, калÑ\96 вÑ\8b каÑ\80Ñ\8bÑ\81Ñ\82аеÑ\86еÑ\81Ñ\8f гÑ\80аÑ\84Ñ\96Ñ\87нÑ\8bмÑ\96
- каÑ\80Ñ\82амÑ\96 з наÑ\88ага Ñ\81еÑ\80веÑ\80а, на Ñ\96Ñ\85 Ñ\80аÑ\81паÑ\9eÑ\81Ñ\8eджваÑ\8eÑ\86Ñ\86а Ñ\9eмовÑ\8b CC-BY-SA. Ð\92Ñ\8b можаÑ\86е
- зрабіць гэта падаўшы спасылкі на <a href="http://www.openstreetmap.org/copyright">гэтую
+ credit_2_1_html: Вы павінны таксама даваць дакладна разумець, што дадзеныя
+ даÑ\81Ñ\82Ñ\83пнÑ\8bÑ\8f на Ñ\9eмоваÑ\85 Open Database License, а Ñ\9e вÑ\8bпадкÑ\83, калÑ\96 вÑ\8b каÑ\80Ñ\8bÑ\81Ñ\82аеÑ\86еÑ\81Ñ\8f
+ гÑ\80аÑ\84Ñ\96Ñ\87нÑ\8bмÑ\96 каÑ\80Ñ\82амÑ\96 з наÑ\88ага Ñ\81еÑ\80веÑ\80а, на Ñ\96Ñ\85 Ñ\80аÑ\81паÑ\9eÑ\81Ñ\8eджваÑ\8eÑ\86Ñ\86а Ñ\9eмовÑ\8b CC-BY-SA.
+ Ð
\92Ñ\8b можаÑ\86е зÑ
\80абÑ
\96Ñ
\86Ñ
\8c гÑ
\8dÑ
\82а падаÑ
\9eÑ
\88Ñ
\8b Ñ
\81паÑ
\81Ñ
\8bлкÑ
\96 на <a href="http://www.openstreetmap.org/copyright">гÑ
\8dÑ
\82Ñ
\83Ñ
\8e старонку з тлумачэннем лiцэнзiйных патрабаванняў</a>. Ці для выканання
нашых патрабаванняў пры распаўсюдзе дадзеных OSM вы можаце непасрэдна ўказваць
назву ліцэнзіі(й) і спасылкі на яе(іх) тэкст. Пры выкарыстанні носьбітамі,
матэрыялы), мы прапануем спасылацца непасрэдна на openstreetmap.org (або
пашыраючы "OpenStreetMap" да гэтага поўнага адраса), opendatacommons.org,
а калі трэба, і на creativecommons.org.
- credit_3_html: "Для электронных карт, згадка пра крыніцу дадзеных павінна
+ credit_4_html: "Для электронных карт, згадка пра крыніцу дадзеных павінна
знаходзіцца ў куце карты. \nНапрыклад:"
attribution_example:
alt: Прыклад таго, як трэба спасылацца на OpenStreetMap на старонцы
ওপেনস্ট্রীটম্যাপ<sup><a href="#trademarks">®</a></sup> একটি <i>মুক্ত উপাত্ত</i> যা <a
href="http://osmfoundation.org/">ওপেনস্ট্রীটম্যাপ ফাউন্ডেশন কর্তৃক</a> (OSMF) <a
href="http://opendatacommons.org/licenses/odbl/">মুক্ত উপাত্ত কমন্স মুক্ত তথ্যভিত লাইসেন্সের</a> (ODbL) আওতায় লাইসেন্সকৃত।
+ intro_3_1_html: আমাদের নথিপত্র <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.bn">ক্রিয়েটিভ
+ কমন্স অ্যাট্রিবিউশন-শেয়ারএলাইক ২.০</a> (সিসি বাই-এসএ ২.০) লাইসেন্সের অধীনে
+ লাইসেন্সকৃত।
credit_title_html: ওপেনস্ট্রীটম্যাপকে কীভাবে কৃতিত্ব দিবেন
attribution_example:
title: আরোপণ উদাহরণ
Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,ne
c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n<a href=\"https://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
+ intro_3_1_html: "Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout
<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons
Attribution-ShareAlike 2.0</a> license (CC-BY-SA)."
credit_title_html: Penaos reiñ kred da OpenStreetMap
credit_1_html: Goulenn a reomp diganeoc'h lakaat en ho kred ar meneg “©
kenlabourerien OpenStreetMap”.
- credit_2_html: |-
+ credit_2_1_html: |-
Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du <a
href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
ha CC BY-SA war-du <a
www.openstreetmap.org (marteze en ur astenn
‘OpenStreetMap’ ar chomlec'h klok) ha da
www.creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Evit ur gartenn elektronek a c'haller merdeiñ enni e tlefe ar c'hred dont war wel e korn ar gartenn.
Da skouer :
attribution_example:
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_html: |-
+ intro_3_1_html: |-
Kartografija u našim dijelovima karte, i naša dokumentacija, su licencirani pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> licencom (CC-BY-SA).
credit_title_html: Kako navesti zasluge OpenStreetMap projekta kao izvora
credit_1_html: |-
Tražimo da koristite navedete zasluge “© OpenStreetMap
contributors”.
- credit_2_html: Gdje je moguće, OpenStreetMap treba biti kao hyperlink na <a
- href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>and
+ credit_2_1_html: Gdje je moguće, OpenStreetMap treba biti kao hyperlink na
+ <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>and
CC BY-SA to <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>.
Ako koristite medij gdje linkovi nisu mogući (npr. tiskane karte), predlažemo
da uputite vaše čitatelje na www.openstreetmap.org (proširenjem na ‘OpenStreetMap’
za ovo punu adresu) i na www.creativecommons.org.
- credit_3_html: 'Za pretraživu elektronsku kartu, navođenje zasluge se treba
+ credit_4_html: 'Za pretraživu elektronsku kartu, navođenje zasluge se treba
pojaviti u uglu karte. Naprimjer:'
attribution_example:
alt: Primjer kako se navodi zasluga projekta OpenStreetMap na web stranici
dades, només podreu distribuir l'obra \nresultant amb la mateixa llicència.
El\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">codi legal</a>
complet explica detalladament els vostres drets i responsabilitats."
- intro_3_html: La cartografia de les nostres tessel·les i la nostra documentació
+ intro_3_1_html: La cartografia de les nostres tessel·les i la nostra documentació
són disponibles sota llicència <a href="http://creativecommons.org/licenses/by-sa/2.0/">Text
de la llicència de Creative Commons Reconeixement-Compartir Igual 2.0</a>(CC-BY-SA).
credit_title_html: Com atribuir autoria a OpenStreetMap
credit_1_html: Demanem que es reconegui “© Col·laboradors d'OpenStreetMap”
com a autors.
- credit_2_html: També heu de deixar clar que les dades són disponibles sota
+ credit_2_1_html: També heu de deixar clar que les dades són disponibles sota
llicència de base de dades oberta i, si utilitzeu els nostres mapes, que
la cartografia té llicència CC-BY-SA. Podeu fer-ho enllaçant a <a href="http://www.openstreetmap.org/copyright">aquesta
pàgina de copyright</a>. De manera alternativa, però com a requisit obligatori
no són possibles (per exemple, obres impreses), us suggerim d'adreçar els
lectors a openstreetmap.org (potser indicant l'adreça completa d'OpenStreetMap),
a opendatacommons.org i, si s'escau, a creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
En el cas d'un mapa electrònic navegable, els crèdits han d'aparèixer a la cantonada del mapa.
Per exemple:
attribution_example:
posted_by_html: 'ДӀабахийтина %{link_user} %{created}, мотт: %{language_link}'
comment_link: Йитта коммент
reply_link: Жоп ло
+ comment_count:
+ few: '%{count} коммент яц'
+ other: '%{count} коммент яц'
edit_link: Хийца дӀаяздар
hide_link: Къайладаккха дӀаяздар
unhide_link: Гучудаккха хӀара дӀаяздар
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="https://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
+ intro_3_1_html: Kartografická díla v našich mapových dlaždicích a naše dokumentace
jsou k dispozici pod licencí <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.cs">Creative
Commons Uveďte autora-Zachovejte licenci 2.0</a> (CC-BY-SA).
credit_title_html: Jak uvádět OpenStreetMap
credit_1_html: Vyžadujeme uvádění autorství „© Přispěvatelé OpenStreetMap“.
- credit_2_html: |-
+ credit_2_1_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="https://www.openstreetmap.org/copyright">tuto stránku</a>.
Nebo 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_3_html: |-
+ credit_4_html: |-
U interaktivní elektronické mapy by autorství mělo být uvedeno v rohu mapy.
Příklad:
attribution_example:
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_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
+ 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).
credit_title_html: Kildeangivelse og OpenStreetMap
credit_1_html: Vi kræver at din kildeangivelse mindst består af “©
OpenStreetMap-bidragsydere”.
- 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 kartografien
+ credit_2_1_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 kartografien
er\n licenseret som CC BY-SA. Du kan gøre dette ved at linke til\n<a href=\"https://www.openstreetmap.org/copyright\">denne
side om ophavsret</a>. \nAlternativt, og som et krav, hvis du distribuerer
OSM som\n data, kan du navngive og oprette et hyperlink direkte til licenserne.
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_html: |-
+ credit_4_html: |-
For et navigerbart elektronisk kort, skal kildeangivelsen være i hjørnet af kortet.
For eksempel:
attribution_example:
# Author: Atomkraftzwerg
# Author: Avatar
# Author: Bpw85
+# Author: Bxalber
# Author: Campmaster
# Author: Candid Dauth
# Author: CarstenG
Der vollständige Lizenztext ist unter
<a href="https://opendatacommons.org/licenses/odbl/1.0/">Lizenz</a>
einsehbar und erläutert deine Rechte und Pflichten.
- intro_3_html: Die Kartografie in unseren Kartenkacheln und unsere Dokumentation
+ intro_3_1_html: Die Kartografie in unseren Kartenkacheln und unsere Dokumentation
sind unter der ''Creative-Commons''-Lizenz <a href="https://creativecommons.org/licenses/by-sa/2.0/">„Namensnennung
– Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA) verfügbar.
credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen
ist
credit_1_html: Wir verlangen die Verwendung des Hinweises „© OpenStreetMap-Mitwirkende“.
- credit_2_html: |-
+ credit_2_1_html: |-
Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz
verfügbar sind, und, sofern du unsere Kartenkacheln verwendest, dass die
Kartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf
deine Leser direkt auf openstreetmap.org zu verweisen (möglicherweise mit
dem Erweitern von „OpenStreetMap“ zur vollen Adresse), auf opendatacommons.org,
und, sofern zutreffend, auf creativecommons.org.
- credit_3_html: |-
+ credit_3_1_html: "Die Kartenkacheln im “Standardstil” auf www.openstreetmap.org
+ sind ein \nProduziert von der OpenStreetMap Foundation unter Verwendung
+ von OpenStreetMap-Daten \nunter der Open Database License. Wenn Sie diese
+ Kacheln verwenden, verwenden Sie bitte \ndie folgende Zuschreibung: \n“Basiskarte
+ und Daten von OpenStreetMap und OpenStreetMap Foundation”."
+ credit_4_html: |-
Der Hinweis sollte für eine durchsuchbare elektronische Karte in der Ecke der Karte stehen.
Zum Beispiel:
attribution_example:
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
+ intro_3_1_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.
credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap
credit_1_html: Pominamy se, až pódawaš sobustatkujucych “© OpenStreetMap”.
- credit_2_html: Musyš teke wujasniś, až daty stoje pód licencu Open Database,
+ credit_2_1_html: Musyš teke wujasniś, až daty stoje pód licencu Open Database,
a, jolic naše kórtowe kachle se wužywaju, až kartografija licencěrujo se
pód CC-BY-SA. Móžoš to cyniś, z tym až wótkazujoš do <a href="http://www.openstreetmap.org/copyright">toś
togo boka awtorskego pšawa</a>. Alternatiwnje, a ako pótrěbnosć, jolic rozdźělujoš
śi, twójich cytarjow na openstreetmap.org (snaź z tym až rozšyrjujoš 'OpenStreetMap'
k toś tej połnej adresy), na opendatacommons.org a, jolic to jo relewantne,
na creativecommons.org dopomnjeś.
- credit_3_html: 'Za pśepytujobnu elektronisku kórtu by měło se źěkowanje w
+ credit_4_html: 'Za pśepytujobnu elektronisku kórtu by měło se źěkowanje w
rožku kórty pokazaś. Na pśikład:'
attribution_example:
alt: Pśikład, kak pokazujo se na webboku na OpenStreetMap
μπορείτε να διανείμετε το αποτέλεσμα μόνο σύμφωνα με την ίδια άδεια. Ο πλήρης
<a href="https://opendatacommons.org/licenses/odbl/1.0/">νομικός κώδικας</a>
εξηγεί τα δικαιώματα και τις υποχρεώσεις.
- intro_3_html: |-
+ intro_3_1_html: |-
Η χαρτογράφηση στα πλακίδια χάρτη και η τεκμηρίωση μας, είναι αδειοδοτημένες υπό την άδεια <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
credit_title_html: Πως να κάνετε αναφορά στο OpenStreetMap
credit_1_html: Απαιτείται να χρησιμοποιείτε την αναφορά στο “©
Συνεισφέροντες του OpenStreetMap”.
- credit_2_html: |-
+ credit_2_1_html: |-
Επίσης πρέπει να κάνετε σαφές ότι τα δεδομένα διατίθενται υπό την άδεια Open Database License και αν χρησιμοποιείτε τα πλακίδια χάρτη, ότι η χαρτογραφία είναι υπό την άδεια CC-BY-SA. Μπορείτε να το κάνετε αυτό με σύνδεσμο σε <a href="https://www.openstreetmap.org/copyright">αυτήν τη σελίδα δικαιωμάτων</a>.
Εναλλακτικά και σαν προαπαιτούμενο εάν διαμοιράζετε δεδομένα OSM, μπορείτε να δώσετε απευθείας σύνδεσμο προς τις άδειες. Σε μέσα στα οποία οι σύνδεσμοι δεν είναι εφικτοί (π.χ. εκτυπώσεις), προτείνουμε να κατευθύνετε τους αναγνώστες σας στο openstreetmap.org (ίσως επεκτείνοντας το «OpenStreetMap» σε αυτήν τη πλήρη διεύθυνση), προς opendatacommons.org και αναλόγως στο creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Για έναν ηλεκτρονικά εμφανιζόμενο χάρτη, η αναφορά θα πρέπει να εμφανίζεται στη γωνία του χάρτη.
Για παράδειγμα:
attribution_example:
build upon our data, you may distribute the result only under the same licence.
The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
code</a> explains your rights and responsibilities.
- intro_3_html: |-
+ intro_3_1_html: |-
The cartography in our map tiles, and our documentation, are
licenced under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
credit_1_html: |-
We require that you use the credit “© OpenStreetMap
contributors”.
- credit_2_html: |-
+ credit_2_1_html: |-
You must also make it clear that the data is available under the Open
Database Licence, and if using our map tiles, that the cartography is
licenced as CC BY-SA. You may do this by linking to
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: |-
+ credit_4_html: |-
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
attribution_example:
about:
next: Next
copyright_html: <span>©</span>OpenStreetMap<br>contributors
- used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+ used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"
lede_text: |
OpenStreetMap is built by a community of mappers that contribute and maintain data
about roads, trails, cafés, railway stations, and much more, all over the world.
may distribute the result only under the same licence. The
full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
code</a> explains your rights and responsibilities.
- intro_3_html: |
- The cartography in our map tiles, and our documentation, are
-
licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
+ intro_3_1_html: |
+ Our documentation is licensed under the
+ <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
credit_title_html: How to credit OpenStreetMap
credit_1_html: |
We require that you use the credit “© OpenStreetMap
contributors”.
- credit_2_html: |
+ credit_2_1_html: |
You must also make it clear that the data is available under the Open
- Database License, and if using our map tiles, that the cartography is
- licensed as CC BY-SA. You may do this by linking to
+ Database License. You may do this by linking to
<a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
Alternatively, and as a requirement if you are distributing OSM in a
data form, you can name and link directly to the license(s). In media
where links are not possible (e.g. printed works), we suggest you
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: |
+ 'OpenStreetMap' to this full address) and to opendatacommons.org.
+ credit_3_1_html: |
+ The map tiles in the “standard style” at www.openstreetmap.org are a
+ Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
+ under the Open Database License. If you are using these tiles please use
+ the following attribution:
+ “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+ credit_4_html: |
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
attribution_example:
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}"
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_html: La kartografio de niaj map-kaheloj kaj nia dokumentaro estas
+ 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).
credit_title_html: Kiel atribui aŭtorecon
credit_1_html: 'Ni postulas, ke vi markos: “© Kontribuintoj de
OpenStreetMap”.'
- credit_2_html: Vi ankaŭ devas klarigi, ke datumoj estas disponeblaj laŭ la
- permesilo Open Database License, kaj kartografio de map-kaheloj laŭ la permesilo
- CC BY-SA. Vi povas indiki tion per fari ligilon al <a href="https://www.openstreetmap.org/copyright">tiu
+ credit_2_1_html: Vi ankaŭ devas klarigi, ke datumoj estas disponeblaj laŭ
+ la permesilo Open Database License, kaj kartografio de map-kaheloj laŭ la
+
permesilo CC BY-SA. Vi povas indiki tion per fari ligilon al <a href="https://www.openstreetmap.org/copyright">tiu
ĉi paĝo pri permesilo</a>. Alimaniere, se vi distribuas OSM en datuma formo,
vi povas mencii nomo(j)n kaj ligilo(j)n al la permesilo(j). Se ne estas
eble meti ligilojn (ekz. en paperaj mapoj), ni sugestas direkti viajn legantojn
al openstreetmap.org (eble meti plenan retadreson), al opendatacommons.org
kaj (se necesas) al creativecommons.org.
- credit_3_html: |-
+ credit_3_1_html: |-
+ La map-kaheloj kaj la stilo “norma” ĉe www.openstreetmap.org estas la produktaĵo de la Fondaĵo OpenStreetMap uzante OpenStreetMap-datumojn laŭ la permesilo Open Database License. Por uzi tiujn ĉi map-kahelojn necesas enmeti la jenan atribuon:
+ “Baza mapo kaj datumoj de OpenStreetMap kaj Fondaĵo OpenStreetMap”.
+ credit_4_html: |-
En esploreblaj elektronikaj mapoj, la aŭtorecon povas esti montrata ĉe la angulo de mapo.
Ekzemplo:
attribution_example:
e información, solo podrás distribuir estos cambios bajo la misma licencia.
El <a href="https://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="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ intro_3_1_html: La cartografía en nuestros mosaicos de mapas y en nuestra
+
documentación, están licenciados bajo la licencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Reconocimiento-CompartirIgual 2.0</a> (CC BY-SA).
credit_title_html: Cómo dar reconocimiento a OpenStreetMap
credit_1_html: Requerimos que utilices los créditos "© Colaboradores de OpenStreetMap".
- credit_2_html: |-
+ credit_2_1_html: |-
También debe dejar en 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="https://www.openstreetmap.org/copyright">esta página de derechos de autor</a>.
Como 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 dirija 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_3_html: |-
+ credit_4_html: |-
En un mapa electrónico navegable, los créditos deben aparecer en la esquina del mapa.
Por ejemplo:
attribution_example:
Kui muudad andmeid või teed neist tuletise, siis tohid
tulemust levitada ainult sama litsentsi tingimustel.
Sinu õigusi ja kohustusi selgitab litsentsi <a href="https://opendatacommons.org/licenses/odbl/1.0/">täistekst</a>.
- intro_3_html: |-
+ intro_3_1_html: |-
Kaardipaanide kujutised ja dokumentatsioon kuuluvad Creative Commonsi
litsentsi "<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.et">Autorile viitamine + jagamine samadel tingimustel 2.0</a>" (CC BY-SA) alla.
credit_title_html: OpenStreetMapile viitamine
credit_1_html: |-
Nõuame, et kasutad omistamiseks teksti “© OpenStreetMapi
kaastöölised”.
- credit_2_html: |-
+ credit_2_1_html: |-
Samuti pead selgelt välja tooma, et andmed kuuluvad litsentsi Open
Database License alla ja kui kasutatakse kaardipaane, siis et kujutised
kuuluvad litsentsi CC BY-SA alla. Üks võimalus selleks on linkida
aadressidele openstreetmap.org (võimalik, et laiendades teksti
"OpenStreetMap" täisaadressiks), opendatacommons.org ja
kui vaja, siis ka aadressile creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Sirvitaval elektroonilisel kaardil peaks viide olema näha kaardi nurgas.
Näiteks:
attribution_example:
Kopiatu, banatu, transmititu eta gure datuak egokitzeko baimena duzu, betiere kredituetan OpenStreetMap eta bere
laguntzaileak sartuz. Zure datuak aldatzen edo erauzten badituzu, lizentzia horren azpian soilik banatzea gerta daiteke. <a href="http://opendatacommons.org/licenses/odbl/1.0/"> legal
kodeak </a> zure eskubideak eta erantzukizunak azaltzen ditu.
- intro_3_html: |-
+ intro_3_1_html: |-
Gure mapa fitxen kartografia, eta gure dokumentazioa, <a href="http://creativecommons.org/licenses/by-sa/2.0/"> Creative
Commons Attribution-ShareAlike 2.0 </a> lizentziapean eskaintzen dira (CC BY-SA).
credit_title_html: OpenStreetMap nola kreditatu
credit_1_html: '“© OpenStreetMap contributors” kreditua erabiltzeko
eskatzen dizugu.'
- credit_2_html: "Halaber, argi utzi behar duzu datuak Open azpian erabilgarri
+ credit_2_1_html: "Halaber, argi utzi behar duzu datuak Open azpian erabilgarri
dauden\nDatu-basearen lizentziapean, eta gure mapa fitxak erabiltzen badituzu,
kartografia CC BY-SA lizentziatu daramala. Horretarako \n<a href=\"http://www.openstreetmap.org/copyright\">
copyright-orri honetan egin dezakezu</a>.\nBestela, eta behar izanez gero,
inprimatutako lanak), gomendatzen dizugu\nzure irakurleei openstreetmap.org
(agian hedapenean)\n'OpenStreetMap' helbide honetaraino), opendatacommons.org
helbidera, eta\ndagokionean, creativecommons.org-era zuzentzea."
- credit_3_html: |-
+ credit_4_html: |-
Mapa elektroniko bateragarrientzat, kredituak maparen izkinan agertu behar dira.
Adibidez:
attribution_example:
ما را تغییر دهید یا بر پایهٔ آنها تولید کنید، باید نتایج را فقط تحت همان
مجوز توزیع کنید. نسخهٔ کامل <a href="http://opendatacommons.org/licenses/odbl/1.0/">بایدونبایدهای
قانونی</a> حقوق و وظایف شما را توضیح میدهد.
- intro_3_html: |-
+ intro_3_1_html: |-
نقشهنگاریهای ارائهشده در کاشیهای نقشهٔ ما و در مستنداتمان، همگی تحت پروانهٔ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> (CC BY-SA) هستند.
credit_title_html: چگونه از OpenStreetMap یاد کنیم
credit_1_html: |-
بایسته است که اینگونه از ما یاد کنید:
“©مشارکتکنندگان OpenStreetMap”.
- credit_2_html: همچنین باید روشن کنید که دادهها تحت پروانهٔ پایگاهدادهٔ باز
- (Open Database License) قرار دارند و اگر کاشیهای نقشهٔ ما را استفاده کردید
- باید بهروشنی بیان کنید که نقشهنگاریها تحت پروانهٔ CC BY-SA است. این کار
- را با Ù¾Û\8cÙ\88Ù\86ددادÙ\86 بÙ\87 <a href="https://www.openstreetmap.org/copyright"> اÛ\8cÙ\86
- صفحهٔ حقنشر</a> انجام دهید. بهعنوان جایگزین، میتوانید با نام و پیوند
+ credit_2_1_html: همچنین باید روشن کنید که دادهها تحت پروانهٔ پایگاهدادهٔ
+ باز (Open Database License) قرار دارند و اگر کاشیهای نقشهٔ ما را استفاده
+ کردید باید بهروشنی بیان کنید که نقشهنگاریها تحت پروانهٔ CC BY-SA است.
+ اÛ\8cÙ\86 کار را با Ù¾Û\8cÙ\88Ù\86ددادÙ\86 بÙ\87 <a href="https://www.openstreetmap.org/copyright">
+ اÛ\8cÙ\86 صÙ\81ØÙ\87Ù\94 ØÙ\82â\80\8cÙ\86شر</a> اÙ\86جاÙ\85 دÙ\87Û\8cد. بÙ\87â\80\8cعÙ\86Ù\88اÙ\86 جاÛ\8cگزÛ\8cÙ\86Ø\8c Ù\85Û\8câ\80\8cتÙ\88اÙ\86Û\8cد با Ù\86اÙ\85 Ù\88 Ù¾Û\8cÙ\88Ù\86د
مستقیماً به پروانه(ها) ارجاع بدهید (اگر OSM را در قالب داده توزیع میکنید
انجام این کار ضروری است). در رسانههایی که درج پیوند ممکن نیست ( مثلاً کارهای
چاپی)، توصیه میکنیم که خوانندگان خود را به openstreetmap.org (شاید با
گسترش OpenStreetMap به این نشانی کامل)، به opendatacommons.org و در صورت
تناسب به creativecommons.org هدایت کنید.
- credit_3_html: |-
+ credit_4_html: |-
در یک نقشهٔ الکترونیکی قابل مرور، یادکرد باید در گوشهٔ نقشه ظاهر شود.
برای مثال:
attribution_example:
# Export driver: phpyaml
# Author: 01miki10
# Author: Abijeet Patro
+# Author: Actuallyisjoha
# Author: Alluk.
# Author: Antsa
# Author: BriskyBlizzard
create: Luo redaktio
update: Tallenna redaktio
trace:
- create: Lähetä
+ create: Lataa
update: Tallenna muutokset
user_block:
create: Luo esto
feed:
title: Muutoskokoelma %{id}
title_comment: Muutoskokoelma %{id} - %{comment}
- join_discussion: Kirjaudu sisään, jos haluat osallistua keskusteluun
+ join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun
discussion: Keskustelu
still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun
muutoskokoelma on suljettu.
entry_html: Relaatio %{relation_name}
entry_role_html: Relaatio %{relation_name} (rooli %{relation_role})
not_found:
- sorry: 'Pahoittelemme, %{type} #%{id} ei ole olemassa.'
+ sorry: 'Pahoittelemme, %{type} #%{id} ei pystytty löytämään.'
type:
node: Pistettä
way: Polkua
changeset: muutoskokoelma
note: merkintä
timeout:
- sorry: Tietojen hakeminen (kohde %{type}:%{id}) kesti liian kauan.
+ sorry: Pahoittelut, tietojen hakeminen (kohde %{type}:%{id}) kesti liian kauan.
type:
node: piste
way: polku
report: Ilmianna karttailmoitus
query:
title: Ominaisuuskysely
- introduction: Näytä luettelo lähistön karttakohteista napsauttamalla karttaa.
+ introduction: Napsauta karttaa löytääksesi lähistön karttakohteita.
nearby: Lähistön karttakohteet
enclosing: Ympäröivät karttakohteet
changesets:
in_language_title: Päiväkirjamerkinnät kielellä %{language}
new: Lisää päiväkirjamerkintä
new_title: Kirjoita uusi merkintä käyttäjän päiväkirjaani
+ my_diary: Päiväkirjani
no_entries: Päiväkirjassa ei ole merkintöjä.
recent_entries: Uusimmat päiväkirjamerkinnät
older_entries: Vanhempia...
more_info_2: 'ne löytyvät osoitteesta:'
success:
subject: '[OpenStreetMap] GPX-tuonti onnistui'
- loaded_successfully: '%{trace_points} pistettä ladattu onnistuneesti mahdollisista
- %{possible_points} pisteestä.'
+ loaded_successfully:
+ one: '%{trace_points} pistettä mahdollisesta 1 pisteestä ladattu onnistuneesti.'
+ other: ' {trace_points} pistettä mahdollisista %{possible_points} ladattu
+ onnistuneesti pisteestä.'
signup_confirm:
subject: '[OpenStreetMap] Tervetuloa OpenStreetMapiin'
greeting: Hei!
legal_1_html: |-
Tämä sivusto ja monet siihen liittyvät palvelut ovat muodollisesti <a href='https://osmfoundation.org/'>OpenStreetMap-säätiön</a> (OSMF) hallinnoimia OSM-yhteisön puolesta. Kaikkien OSMF:n hallinnoimien palveluiden käyttöön sovelletaan <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
sallitun käytön käytäntöjä</a>, <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">käyttöehtoja</a> ja <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">tietosuojakäytäntöä</a> (molemmat sisällöt saatavilla vain englanniksi).
+ legal_2_html: |-
+ <a href='https://osmfoundation.org/Contact'>Ota yhteyttä OSMF</a>:ään
+ jos sinulla on lisensointi-, tekijänoikeus- tai muita kysymyksiä.
+ <br>
+ OpenStreetMap, suurennuslasilogo ja State of the Map ovat <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">OSMF:n rekisteröityjä tavaramerkkejä</a>.
partners_title: Kumppanit
copyright:
foreign:
Jos karttoja tai tietoja muutetaan tai kehitetään, niitä saa levittää vain
samalla lisenssillä.\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">Lakitekstissä</a>
mainitaan levittäjän oikeudet ja velvollisuudet."
- intro_3_html: |-
+ 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).
credit_title_html: OpenStreetMapin mainitseminen
credit_1_html: OpenStreetMapin sisältöä levitettäessä on mainittava teksti
"© OpenStreetMapin tekijät" tai sen englanninkielinen vastine
"© OpenStreetMap contributors".
- credit_2_html: "Levittäjän tulee tehdä selväksi, että aineisto on saatavilla
+ credit_2_1_html: "Levittäjän tulee tehdä selväksi, että aineisto on saatavilla
Open Database -lisenssillä\nja kartta-aineisto CC-BY-SA-lisenssillä. Tämä
voidaan tehdä sijoittamalla sivulle linkki\n<a href=\"https://www.openstreetmap.org/copyright\">tälle
tekijänoikeussivulle</a>. \nJos linkkien käyttö ei ole mahdollista (esimerkiksi
paperille tulostettu aineisto),\nsuosittelemme ohjaamaan lukijat osoitteisiin
www.openstreetmap.org, opendatacommons.org ja tarvittaessa myös creativecommons.org."
- credit_3_html: 'Sivustolle upotetun interaktiivisen karttaikkunan tulee sisältää
+ credit_3_1_html: "“Standardityylin” karttalaatat osoitteessa www.openstreetmap.org
+ ovat OpenStreetMap Foundationin työtä käyttäen OpenStreetMapin datan Open
+ Database-lisenssin alaisuudessa. Jos käytät näitä karttalaattoja, käytä
+ seuraavaa lainausta: \n“Pohjakartta ja data OpenStreetMapista ja OpenStreetMap
+ Foundationilta”."
+ credit_4_html: 'Sivustolle upotetun interaktiivisen karttaikkunan tulee sisältää
tekijän nimi kartan alaosassa:'
attribution_example:
alt: Esimerkki siitä, miten nimetä OpenStreetMap nettisivulla
donate_link_text: <a class='donate-attr' href='%{donate_url}'>Tee lahjoitus</a>
terms: <a href='%{terms_url}' target='_blank'>Sivuston ja sovellusrajapinnan
ehdot</a>
+ thunderforest: Laattojen tekijä <a href='%{thunderforest_url}' target='_blank'>Andy
+ Allan</a>
+ hotosm: Laattojen tyylin on tehnyt <a href='%{hotosm_url}' target='_blank'>Humanitarian
+ OpenStreetMap Team</a> ja hostannut <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+ France</a>
site:
edit_tooltip: Muokkaa karttaa
edit_disabled_tooltip: Lähennä karttaa ennen muokkaamisen aloittamista
Jos karttoja tai tietoja muutethaan tai kehitethään, niitä saa levithää
vain samalla lisensilä.\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">Lakitekstissä</a>
mainitaan levittäjän oikeudet ja velvollisuudet."
- intro_3_html: |-
+ intro_3_1_html: |-
Kartta-aineisto ja dokumentaatio oon lisensoitu <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.fi">Creative
Commons Nimeä-Jaa samoin 2.0</a> -lisensillä (CC-BY-SA).
credit_title_html: OpenStreetMapin mainitseminen
credit_1_html: OpenStreetMapin sisältöä levitettäessä oon mainittava teksti
"© OpenStreetMapin tekijät" tai sen engelskankielinen vastine
"© OpenStreetMap contributors".
- credit_2_html: "Levittäjän tulee tehdä selväksi, ette aineisto oon saatavilla
+ credit_2_1_html: "Levittäjän tulee tehdä selväksi, ette aineisto oon saatavilla
Open Database -lisensillä\nja kartta-aineisto CC-BY-SA-lisensillä. Tämä
voidaan tehdä sijoittamalla sivule länkki\n<a href=\"https://www.openstreetmap.org/copyright\">tälle
tekijänoikeussivule</a>. \nJos länkkien käyttö ei ole mahollista (esimerkiksi
paperille printattu aineisto),\nsuosittelemme ohjaamaan lukijat atresseihin
www.openstreetmap.org, opendatacommons.org ja tarvittaessa myös creativecommons.org."
- credit_3_html: 'Sivustolle upotetun interaktiivisen karttaikkunan tulee sisältää
+ credit_4_html: 'Sivustolle upotetun interaktiivisen karttaikkunan tulee sisältää
tekijän nimi kartan alaosassa:'
attribution_example:
alt: Esimerkki siitä, miten nimetä OpenStreetMap nettisivula
about:
next: Suivant
copyright_html: © Contributeurs<br /> d’OpenStreetMap
- used_by_html: '%{name} fournit des données cartographiques sur des milliers
- de sites web, applications mobiles et appareils'
+ used_by_html: '%{name} fournit les données cartographiques de milliers de sites
+ web, d''applications mobiles et d''appareils'
lede_text: OpenStreetMap est bâti par une communauté de cartographes bénévoles
qui contribuent et maintiennent les données des routes, sentiers, cafés, stations
ferroviaires et bien plus encore, partout dans le monde.
contributeurs. Si vous modifiez ou utilisez nos données dans d’autres œuvres dérivées, vous
ne pouvez distribuer celles-ci que sous la même licence. Le <a href="https://opendatacommons.org/licenses/odbl/1.0/">texte
légal</a> complet détaille vos droits et responsabilités.
- intro_3_html: |-
- Nos carreaux de rendu cartographiques, ainsi que notre documentation, sont disponibles sous
- la licence <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons paternité – partage à l’identique 2.0</a> (CC-BY-SA).
+ intro_3_1_html: "Notre documentation est disponible sous la licence \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+ paternité – partage à l’identique 2.0</a> (CC-BY-SA 2.0)."
credit_title_html: Comment créditer OpenStreetMap
credit_1_html: Nous demandons que votre crédit comporte la mention « © les
contributeurs d’OpenStreetMap ».
- credit_2_html: |-
+ credit_2_1_html: |-
Vous devez également préciser clairement que les données sont disponibles sous la licence
ODbL (Open Database License) et, si vous utilisez les tuiles de notre carte, que la carte est sous la
licence CC BY-SA. Vous pouvez mentionner ceci avec un lien hypertexte vers
<a href="https://www.openstreetmap.org/copyright">cette page de mentions légales</a>.
Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences. Sur les supports où les liens hypertexte sont impossibles (par exemple sur un support papier), nous vous suggérons de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant « OpenStreetMap » en son adresse complète openstreetmap.org), vers opendatacommons.org et, si c’est pertinent, vers creativecommons.org.
- credit_3_html: |-
+ 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”."
+ credit_4_html: |-
Pour une carte électronique navigable, le crédit devrait apparaître dans un coin de la carte.
Par exemple :
attribution_example:
tú orthu, ní fhéadfaidh tú an toradh sin a dháileadh ach faoin gceadúnas
céanna. Tá míniú ar do chearta agus ar do fhreagrachtaí sa <a href="https://opendatacommons.org/licenses/odbl/1.0/">chód
dlíthiúil</a> iomlán.
- intro_3_html: Tá an chartagrafaíocht sna tíleanna léarscáile atá againn, agus
- an doiciméadú, ceadúnaithe faoin gceadúnas <a href="https://creativecommons.org/licenses/by-sa/2.0/">Sannta-Comhroinnte
+ intro_3_1_html: Tá an chartagrafaíocht sna tíleanna léarscáile atá againn,
+ a
gus an doiciméadú, ceadúnaithe faoin gceadúnas <a href="https://creativecommons.org/licenses/by-sa/2.0/">Sannta-Comhroinnte
Comhionann 2.0 de chuid Creative Commons</a> (CC BY-SA).
credit_title_html: Conas OpenStreetMap a lua
credit_1_html: Ceanglaímid ort an lua “©Rannchuiditheoirí OpenStreetMap”
a úsáid.
- credit_2_html: Ní mór duit a chinntiú freisin go bhfuil soiléir go bhfuil
+ credit_2_1_html: Ní mór duit a chinntiú freisin go bhfuil soiléir go bhfuil
na sonraí ar fáil faoin gCeadúnas Bunachar sonraí Oscailte agus, má úsáideann
tú na tíleanna léarscáile atá againn, go bhfuil an chartagrafaíocht ceadúnaithe
mar CC BY-SA. Is féidir leat é sin a dhéanamh ach nasc a dhéanamh chuig
threorú chuig openstreetmap.org (d'fhéadfá é sin a dhéanamh ach an seoladh
iomlán seo a thabhairt in áit 'OpenStreetMap'), chuig opendatacommons.org,
agus, más ábhartha, chuig creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
I gcás léarscáil leictreonach is féidir a bhrabhsáil, ba cheart an lua a bheith le feiceáil i gcúinne na léarscáile.
Mar shampla:
attribution_example:
an toradh a sgaoileadh fon aon cheadachas. Mìnichidh an
<a href="http://opendatacommons.org/licenses/odbl/1.0/">còd laghail</a>
slàn dè na còirichean agus na dleastanasan a tha agad.
- intro_3_html: |-
+ intro_3_1_html: |-
Tha am mapachadh sna leacan mapa againn agus an docamaideadh againn
fo cheadachas <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
credit_1_html: |-
Tha e riatanach gun chleachd thu “© OpenStreetMap
contributors” mar urram.
- credit_2_html: |-
+ credit_2_1_html: |-
Feumaidh tu mìneachadh gu soilleir cuideachd gu bheil an dàta ri fhaighinn
fo cheadachas Open Database License, agus ma chleachdas tu na leacan mapa
againn gu bheil am mapachadh fo cheadachas CC BY-SA. Faodaidh tu seo
openstreetmap.org (dh'fhaoidte gun leudaich thu 'OpenStreetMap' leis
an t-seòladh shlàn seo), gu opendatacommons.org agus ma tha seo iomchaidh gu
creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
airson mapa leatronaigeach a ghabhas rùrachadh, bu chòir dhan urram a nochdadh air
oisean a' mhapa. Mar eisimpleir:
attribution_example:
que distribuír o resultado baixo a mesma licenza. O
<a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
legal</a> ó completo explica os teus dereitos e responsabilidades.
- intro_3_html: |-
+ intro_3_1_html: |-
Os datos cartográficos das teselas dos nosos mapas e a nosa documentación
atópanse baixo a licenza <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons recoñecemento compartir igual 2.0</a> (CC BY-SA).
credit_1_html: |-
Pedímoslle que acredite o traballo así: “© dos contribuíntes do
OpenStreetMap”.
- credit_2_html: "Cómpre tamén deixar claro que os datos están dispoñíbeis baixo
- a Open \nDatabase License e, empréganse as teselas dos nosos mapas, que
- os datos cartográficos\nestán baixo a licenza CC-BY-SA. Pode facelo ligando
- con\n<a href=\"https://www.openstreetmap.org/copyright/gl\">esta páxina</a>.\nComa
- alternativa, e de xeito obrigatorio se está a distribuír o OSM nun\nformulario
- de datos, pode nomear e ligar de xeito directo cara á(s) licenza(s). Naqueles
- medios\nnos que non sexa posíbel incluír as ligazóns (por exemplo, nas obras
- impresas), suxerimos\nque dirixa ós lectores ó openstreetmap.org (quizabes
- pondo o texto\n\"OpenStreetMap\" no enderezo completo), a opendatacommons.org
+ credit_2_1_html: "Cómpre tamén deixar claro que os datos están dispoñíbeis
+ baixo a Open \nDatabase License e, empréganse as teselas dos nosos mapas,
+ que os datos cartográficos\nestán baixo a licenza CC-BY-SA. Pode facelo
+ ligando con\n<a href=\"https://www.openstreetmap.org/copyright/gl\">esta
+ páxina</a>.\nComa alternativa, e de xeito obrigatorio se está a distribuír
+ o OSM nun\nformulario de datos, pode nomear e ligar de xeito directo cara
+ á(s) licenza(s). Naqueles medios\nnos que non sexa posíbel incluír as ligazóns
+ (por exemplo, nas obras impresas), suxerimos\nque dirixa ós lectores ó openstreetmap.org
+ (quizabes pondo o texto\n\"OpenStreetMap\" no enderezo completo), a opendatacommons.org
e,\nse fose relevante, a creativecommons.org."
- credit_3_html: |-
+ credit_4_html: |-
Nun mapa electrónico explorábel, o crédito debe aparecer na beira do mapa.
Por exemplo:
attribution_example:
מותר לכם להפיץ את התוצאות רק לפי תנאי אותו הרישיון.
<a href="https://opendatacommons.org/licenses/odbl/1.0/">המסמך
המשפטי</a> המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם.
- intro_3_html: |-
+ intro_3_1_html: |-
המיפוי באריחי המפה שלנו, והתיעוד שלנו מוגשים בכפוף
לרישיון <a href="https://creativecommons.org/licenses/by-sa/2.0/">קריאייטיב
קומונז ייחוס–שיתוף־זהה 2.0</a> license (בקיצור CC-BY-SA).
credit_title_html: איך לתת ייחוס ל־OpenStreetMap
credit_1_html: אנו דורשים ייחוס אל „© תורמי OpenStreetMap”.
- credit_2_html: |-
+ credit_2_1_html: |-
כמו־כן, חובתך להבהיר שהנתונים זמינים בכפוף לרישיון למסדי
נתונים פתוחים, ואם נעשה שימוש באריחי המפה שלנו, שהמיפוי כפופות
לרישיון CC-BY-SA. באפשרותך לעשות זאת באמצעות קישור אל
להפנות את הקוראים שלך אל openstreetmap.org (אולי על־ידי הרחבת
„OpenStreetMap” ככתובת מלאה), אל opendatacommons.org, ואם
זה מתאים, אל creativecommons.org.
- credit_3_html: 'בשביל מפה אלקטרונית שאפשר לעיין בה, הייחוס צריך להופיע בפינת
+ credit_4_html: 'בשביל מפה אלקטרונית שאפשר לעיין בה, הייחוס צריך להופיע בפינת
המפה. למשל:'
attribution_example:
alt: דוגמה לצורה הנכונה לתת ייחוס ל־OpenStreetMap באתר האינטרנט
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_html: Kartografija koja je prisutna u našim sličicama karte i naša
+ 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).
credit_title_html: Kako navoditi OpenStreetMap kao izvor
credit_1_html: |-
Zahtjevamo da istaknete zasluge “© OpenStreetMap
contributors”.
- credit_2_html: |-
+ credit_2_1_html: |-
Također morate jasno naznačiti da su podaci dostupni po licenci Open Database Licence i, ako koristite naše sličice karte, naznačiti da je kartografija licencirana pod CC BY-SA. Možete to učiniti postavljanjem poveznice na <a href="http://www.openstreetmap.org/copyright">ovu stranicu sa autorskim pravima</a>.
Alternativno, a kao nužna potreba ako distribuirate OSM samo u obliku podataka, možete postaviti poveznicu izravno na tekst licence/a. Ako oblik medija ne omogućuje korištenje poveznica (npr. printani radovi), predlažemo da uputite Vaše čitatelje na openstreetmap.org (označava točno adresu web stranice umjesto samo ime projekta - 'OpenStreetMap'), na opendatacommons.org i ako je potrebno na creativecommons.org.
attribution_example:
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/">tekst licency</a>
wujasnja twoje prawa a winowatosće.
- intro_3_html: Kartografija w našich kartowych kachličkach a naša dokumentacija
+ intro_3_1_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.
credit_title_html: Kak ma so na awtorstwo OpenStreetMap pokazać
credit_1_html: Žadamy sej wužiwanje pokazki „© sobuskutkowacy OpenStreetMap“.
- credit_2_html: Dyrbiš tež wujasnić, zo steja daty pod licencu Open Database,
+ credit_2_1_html: Dyrbiš tež wujasnić, zo steja daty pod licencu Open Database,
a, jelizo wužiwaš naše kartowe kachlički, zo je kartografija pod CC-BY-SA
licencowana. Móžeš to činić wotkazujo na stronu <a href="http://www.openstreetmap.org/copyright">www.openstreetmap.org/copyright</a>.
Alternatiwnje, a winowatostnje, jeli OSM w formje datow dale dawaš, móžeš
njejsu (na př. ćišćane dźěła), doporučimy tebi, twojich čitarjow na openstreetmap.org
(snadź rozšěrjejo 'OpenStreetMap' k połnej adresy), na opendatacommons.org
a, jeli přitrjechi, na creativecommons.org skedźbnić.
- credit_3_html: 'Za přepytujomnu elektronisku kartu měła so pokazka w róžku
+ credit_4_html: 'Za přepytujomnu elektronisku kartu měła so pokazka w róžku
karty jewić. Na přikład:'
attribution_example:
alt: Přikład, kak so na webstronje na OpenStreetMap pokazuje
email_confirm_html:
greeting: Szia!
hopefully_you: 'Valaki (remélhetőleg Te) meg szeretné változtatni az e-mail
- címét erről: %{server_url} erre: %{new_address}.'
+ címét az %{server_url} oldalon erre: %{new_address}.'
click_the_link: Ha ez Te vagy, akkor a módosítás megerősítéséhez kattints az
alábbi hivatkozásra.
lost_password:
Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és közreműködőit. Ha módosítod vagy felhasználod az adatainkat, akkor az eredményt is csak azonos licenccel terjesztheted. A teljes <a
href="https://opendatacommons.org/licenses/odbl/1.0/">jogi
szabályzat</a> ismerteti a jogaidat és kötelezettségeidet.
- intro_3_html: |2-
+ intro_3_1_html: |2-
Az OpenStreetMap <i>térképeire</i> és dokumentumaira a <a
href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Nevezd meg! - Így add tovább! 2.0</a> licenc (CC BY-SA) vonatkozik.
credit_title_html: Hogyan kell feltüntetned az OpenStreetMapot?
credit_1_html: Kérjük, hogy forrásként a “© OpenStreetMap közreműködők”
szöveget tüntesd fel.
- credit_2_html: Azt is egyértelművé kell tenned, hogy az adatok az Open Database
+ credit_2_1_html: Azt is egyértelművé kell tenned, hogy az adatok az Open Database
Licenc alatt elérhetőek, illetve ha a mi térkép csempéinket használod, akkor
azt, hogy a grafikai megjelenítés a CC BY-SA licenc feltételeivel használható.
Ezt megteheted egy erre a <a href="https://www.openstreetmap.org/copyright">copyright
hogy a felhasználókat irányítsd az openstreetmap.org címre (esetlegesen
az "OpenStreetMap" szót kiegészítve erre a teljes címre), és az opendatacommons.org
címre, illetve - ha szükséges - a creativecommons.org címre.
- credit_3_html: |-
+ credit_4_html: |-
Böngészhető elektronikus térkép esetén a forrásra vonatkozó hivatkozás jelenjen meg a térkép sarkában.
Például:
attribution_example:
Si vos altera o extende nostre datos, vos pote distribuer le resultato solmente
sub le mesme licentia. Le <a href="https://opendatacommons.org/licenses/odbl/1.0/">codice
juridic</a> complete explica vostre derectos e responsabilitates.
- intro_3_html: Le cartographia in nostre tegulas cartographic, e nostre documentation,
+ intro_3_1_html: Le cartographia in nostre tegulas cartographic, e nostre documentation,
es publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
credit_title_html: Como dar recognoscentia a OpenStreetMap
credit_1_html: |-
Nos require que vos usa le recognoscentia “© OpenStreetMap
contributors”.
- credit_2_html: |-
+ credit_2_1_html: |-
Vos debe etiam indicar clarmente que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="https://www.openstreetmap.org/copyright">iste pagina de copyright</a>.
Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola ‘OpenStreetMap’), a opendatacommons.org, e (si relevante) a creativecommons.org.
- credit_3_html: 'Pro un carta electronic navigabile, le recognoscentia debe
+ credit_4_html: 'Pro un carta electronic navigabile, le recognoscentia debe
apparer in le angulo del carta. Per exemplo:'
attribution_example:
alt: Exemplo de como recognoscer OpenStreetMap in un pagina web
selama Anda menyertakan OpenStreetMap dan kontributornya. Jika Anda mengubah atau membangun
data kami, Anda harus menyalurkan hasilnya dalam lisensi yang sama.
<a href="http://opendatacommons.org/licenses/odbl/1.0/">Kode legal</a> berisi penjelasan hak dan kewajiban Anda.
- intro_3_html: |-
+ intro_3_1_html: |-
Kartografi dalam tampilan peta dan dokumentasi kami
berlisensi di bawah <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> lisensi (CC-BY-SA).
credit_title_html: Cara memberikan kredit pada OpenStreetMap
credit_1_html: Kami mewajibkan Anda untuk menggunakan kredit “©
Kontributor OpenStreetMap”.
- credit_2_html: Anda juga harus memperjelas bahwa data tersedia di bawah Lisensi
- Database Terbuka, dan jika menggunakan tiles peta kami, kartografi berlisensi
- sebagai CC-BY-SA. Anda dapat melakukannya dengan menghubungkan ke <a href="http://www.openstreetmap.org/copyright">halaman
- hak cipta</a>. Alternatifnya, dan sebagai sebuah persyaratan jika Anda mendistribusikan
+ credit_2_1_html: Anda juga harus memperjelas bahwa data tersedia di bawah
+ Lisensi Database Terbuka, dan jika menggunakan tiles peta kami, kartografi
+ berlisensi sebagai CC-BY-SA. Anda dapat melakukannya dengan menghubungkan
+ ke <a href="http://www.openstreetmap.org/copyright">halaman hak cipta</a>.
+ Alternatifnya, dan sebagai sebuah persyaratan jika Anda mendistribusikan
OSM dalam bentuk data, Anda dapat menamakan dan menghubungkannya langsung
pada lisensinya. Pada media yang tidak memungkinkan tautan (misalnya hasil
cetak), kami menyarankan Anda untuk mengarahkan pembaca Anda pada openstreetmap.org
(mungkin dengan memperluas halaman 'OpenStreetMap' secara penuh), untuk
opendatacommons.org, dan jika relevan, untuk creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Untuk peta elektronik dapat ditelusuri, kredit harus muncul di sudut peta.
Sebagai contoh:
attribution_example:
sama leyfi.
<a href="https://opendatacommons.org/licenses/odbl/1.0/">Leyfistextinn</a>
útskýrir réttindi þín og skyldur.
- intro_3_html: |-
+ intro_3_1_html: |-
Landupplýsingarnar í kortaflísunum okkar, og í hjálparskjölunum, eru
gefnar út með <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> notkunarleyfi (CC BY-SA).
credit_1_html: |-
Við gerum kröfu um að þú notir tilvísunina “© Þátttakendur í
OpenStreetMap verkefninu”.
- credit_2_html: "Þú þarft líka að taka skýrt fram að gögnin séu tiltæk með
+ credit_2_1_html: "Þú þarft líka að taka skýrt fram að gögnin séu tiltæk með
Open\nDatabase notkunarleyfi, og ef verið sé að nota kortaflísar frá okkur,
að kortagögnin \nséu með CC BY-SA notkunarleyfi. Þú getur gert það með því
að tengja\ná <a href=\"https://www.openstreetmap.org/copyright\">þessa höfundarréttarsíðu</a>.\nAnnars,
mögulegir (t.d. prentuðum verkum), stingum við upp á að\nþú beinir lesendum
á openstreetmap.org (mögulega að tengja\n'OpenStreetMap' við fullt vistfang
þessarar síðu), á opendatacommons.org, og\nef slíkt á við, á creativecommons.org."
- credit_3_html: |-
+ credit_4_html: |-
Á flettanlegum rafrænum landakortum ætti tilvísunin að birtast í horni kortsins.
Til dæmis:
attribution_example:
way_tag: Etichetta del percorso
attributes:
diary_comment:
- body: Corpo del messaggio
+ body: Corpo
diary_entry:
user: Utente
title: Oggetto
message:
sender: Mittente
title: Oggetto
- body: Corpo del messaggio
+ body: Corpo
recipient: Destinatario
user:
email: Email
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_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
+ 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)."
credit_title_html: Come si attribuisce a OpenStreetMap
credit_1_html: Si richiede che l'attribuzione sia “© OpenStreetMap
contributors ”.
- credit_2_html: |-
+ 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_html: |-
+ credit_4_html: |-
In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa.
Ad esempio:
attribution_example:
in_language_title: '%{language} の日記エントリ'
new: 日記エントリを新規作成
new_title: 自分の日記にエントリを新規作成
+ my_diary: 自分の日記
no_entries: 日記エントリはありません
recent_entries: 最近の日記エントリ
older_entries: 以前のエントリ
href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) の下にライセンスする<i>オープンデータ</i>です。
intro_2_html: OpenStreetMapとその協力者をクレジットすれば、データを自由にコピー、配布、送信、利用することができます。変更したり翻案したりしたデータは同じライセンスに従う場合のみ、提供することができます。あなたの権利と責任は、<a
href="https://opendatacommons.org/licenses/odbl/1.0/">ライセンス契約</a>の全文で説明しています。
- intro_3_html: |-
+ intro_3_1_html: |-
地図画像やドキュメントは、<a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> ライセンス (CC BY-SA) に基づいてライセンスされます。
credit_title_html: OpenStreetMap のクレジット表記の仕方
credit_1_html: '“© OpenStreetMap contributors”のクレジットを必ず使用してください。'
- credit_2_html: あなたはデータが Open Database License に基づいて提供されていること、そして地図タイルを使用する場合は、地図画像が
+ credit_2_1_html: あなたはデータが Open Database License に基づいて提供されていること、そして地図タイルを使用する場合は、地図画像が
CC BY-SA としてライセンスされていることを明確にしなければなりません。<a href="https://www.openstreetmap.org/copyright">著作権表示ページ</a>にリンクすることでこれを表現することができます。また、データの形式でOpenStreetMapを配布する場合の要件として、名前を表示の上、ライセンスに直接リンクすることができます。リンクを張れないメディア（印刷など）の場合は、openstreetmap.org（OpenStreetMapをアドレスとして展開した形）、opendatacommons.org、さらに関連がある場合はcreativecommons.orgへ読者を誘導することをお勧めします。
- credit_3_html: |-
+ credit_4_html: |-
閲覧可能な電子地図の場合は、地図の隅にクレジットを表示してください。
例:
attribution_example:
같은 라이선스에 따라서만 결과를 배포할 수 있습니다.
<a href="https://opendatacommons.org/licenses/odbl/1.0/">전문</a>은
당신의 권리와 책임을 설명합니다.
- intro_3_html: |-
+ intro_3_1_html: |-
지도 타일의 지도 제작과 설명문서는
<a href="https://creativecommons.org/licenses/by-sa/2.0/">크리에이티브
커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC BY-SA)에 따라 사용할 수 있습니다.
credit_title_html: OpenStreetMap 제작진 넣는 방법
credit_1_html: '“© OpenStreetMap 기여자”를 저작자로 사용해야 합니다.'
- credit_2_html: |-
+ credit_2_1_html: |-
또한 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며, 지도 제작은
지도 타일을 사용할 때에 CC-BY-SA로 허가한다는 내용을 명확하게 통지해야 합니다.
<a href="https://www.openstreetmap.org/copyright">이 저작권 문서</a>로
매체(예를 들어 인쇄 작업)에서는 opendatacommons.org와
openstreetmap.org('OpenStreetMap'을 전체 주소로 확장)로
독자에 직접 알려주세요. 관련 있다면 creativecommons.org로 알려주세요.
- credit_3_html: |-
+ credit_4_html: |-
찾아볼 수 있는 전자 지도에 대해서는 제작진은 지도의 모서리에 보여야만 합니다.
예를 들어:
attribution_example:
trace_uploaded: GPX 파일을 올리고 있으며 데이터베이스에 삽입을 기다리고 있습니다. 이 작업은 보통 반 시간 내에 수행하며
완료되면 이메일을 보낼 것입니다.
upload_failed: 죄송합니다. GPX 업로드를 실패했습니다. 관리자는 해당 오류에 대해 알림을 받았습니다. 다시 시도해 주십시오
+ traces_waiting:
+ one: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지 더
+ 기다려주십시오.
+ other: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지
+ 더 기다려주십시오.
edit:
title: '%{name} 경로 편집'
heading: '%{name} 경로 편집'
create: Tomar bike
diary_entry:
create: Biweșîne
+ update: Rojane bike
+ issue_comment:
+ create: Şîroveyekê tevlî bike
message:
create: Bişîne
client_application:
create: Astengiyê çêbike
update: Astengê nû bike
activerecord:
+ errors:
+ messages:
+ invalid_email_address: wekî navnîşaneke e-peyamê ya derbasdar nayê xuyan
+ email_address_not_routable: ne alîkirinbar e
models:
acl: Lîsteya Kontrolê Têketinan
changeset: Qeyda Guhertinan
diary_comment: Şîroveya rojane
diary_entry: Nivîsa Rojane
friend: Heval
+ issue: Pirsgirêk
language: Ziman
message: Peyam
node: Nuqte
relation: Pêwendî
relation_member: Endamê Eleqedar
relation_tag: Nîşana Eleqeyê
+ report: Ragihîne
session: Danişîn
trace: Rêç
tracepoint: Nuqteya Taqîbkirinê
description: Danasîn
languages: Ziman
pass_crypt: Şîfre
+ datetime:
+ distance_in_words_ago:
+ about_x_hours:
+ one: teqrîben berî saetekê
+ other: teqrîben berî %{count} saetan
+ about_x_months:
+ one: teqrîben berî mehekê
+ other: teqrîben berî %{count} mehan
+ about_x_years:
+ one: teqrîben berî salekê
+ other: teqrîben berî %{count} salan
+ almost_x_years:
+ one: hema bêje berî salekê
+ other: hema bêja berî %{count} salan
+ half_a_minute: berî nîv deqeyê
+ less_than_x_seconds:
+ one: kêmtirî saniyeyekê
+ other: kêmtirî berî %{count} saniyeyan
+ less_than_x_minutes:
+ one: berî kêmtir deqeyekê
+ other: berî kêmtir ji %{count} deqeyan
+ over_x_years:
+ one: berî zêdetirî salekê
+ other: berî zêdetirî %{count} salan
+ x_seconds:
+ one: berî saniyeyekê
+ other: Berî %{count} saniyeyan
+ x_minutes:
+ one: Berî deqeyekê
+ other: Berî %{count} deqeyan
+ x_days:
+ one: berî rojekê
+ other: berî %{count} rojan
+ x_months:
+ one: berî mehekê
+ other: beî %{count} mehan
+ x_years:
+ one: berî salekê
+ other: berî %{count} salan
editor:
default: Standard (vêga %{name})
potlatch:
remote:
name: Ji Dûr Ve Îdarekirin
description: Ji dûr ve kontrol (JOSM yan jî Merkaartor)
+ auth:
+ providers:
+ none: Tune
+ openid: OpenID
+ google: Google
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wîkîpediya
api:
notes:
comment:
- opened_at_html: Berî %{when} hate çêkirin
- opened_at_by_html: Berî %{when} ji aliyê %{user} ve hate çêkirin
- commented_at_html: Berî %{when} hate nûkirin
- commented_at_by_html: Berî %{when} ji aliyê %{user} ve hate rojanekirin
- closed_at_html: Berî %{when} hatte çareserkirin
- closed_at_by_html: Berî %{when} ji aliyê %{user} ve hate çareserkirin
- reopened_at_html: Berî %{when} jinûve hate aktîvkirin
- reopened_at_by_html: Berî %{when} ji aliyê %{user} ve jinûve hate aktîvkirin
+ opened_at_html: '%{when} hate çêkirin'
+ opened_at_by_html: '%{when} ji aliyê %{user} ve hate çêkirin'
+ commented_at_html: '%{when} hate nûkirin'
+ commented_at_by_html: '%{when} ji aliyê %{user} ve hate rojanekirin'
+ closed_at_html: '%{when} hate çareserkirin'
+ closed_at_by_html: '%{when} ji aliyê %{user} ve hate çareserkirin'
+ reopened_at_html: '%{when} ji nû ve hate aktîvkirin'
+ reopened_at_by_html: '%{when} ji aliyê %{user} ve jinûve hate aktîvkirin'
rss:
title: Notên OpenStreetMapê
description_area: Lîsteya notên herêma te yên ku hatine raporkirin, şirovekirin
browse:
created: Hate çêkirin
closed: Hate girtin
- created_html:
Berî</abbr> <abbr title='%{title}'>%{time} hatiye çêkirin
- closed_html:
Berî</abbr> <abbr title='%{title}'>%{time} hatiye girtin
- created_by_html: Ji aliyê %{user} ve berî</abbr> <abbr title='%{title}'>%{time}
- hatiye çêkirin
- deleted_by_html: Ji aliyê %{user} ve berî</abbr> <abbr title='%{title}'>%{time}
- hatiye jêbirin
- edited_by_html: Ji aliyê %{user} ve berî</abbr> <abbr title='%{title}'>%{time}
- hatiye sererastkirin
- closed_by_html: Ji aliyê %{user} ve berî</abbr> <abbr title='%{title}'>%{time}
- hatiye girtin
+ created_html: </abbr> <abbr title='%{title}'>%{time} hatiye çêkirin
+ closed_html: </abbr> <abbr title='%{title}'>%{time} hatiye girtin
+ created_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{title}'>%{time} hatiye
+ çêkirin
+ deleted_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{title}'>%{time} hatiye
+ jêbirin
+ edited_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{title}'>%{time} hatiye
+ sererastkirin
+ closed_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{title}'>%{time} hatiye
+ girtin
version: Guherto
in_changeset: Qeyda Guhertinan
anonymous: anonîm
relation: Eleqe (%{count})
relation_paginated: Eleqe (%{x}-%{y} bi tevahî %{count})
comment: Şîrove (%{count})
- hidden_commented_by: Şîroveya veşartî yê ji alî %{user} ve, berî</abbr> <abbr
- title='%{exact_time}'>%{when}
- commented_by: Şîrove ji aliyê %{user} ve, berî</abbr> <abbr title='%{exact_time}'>%{when}
+ hidden_commented_by: Şîroveya veşartî yê ji alî %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
+ commented_by: Şîrove ji aliyê %{user} ve, </abbr> <abbr title='%{exact_time}'>%{when}
changesetxml: Desteya guhertinan a XML
osmchangexml: osmChange XML
feed:
tag: Ji bo nîşana %{key}=%{value} rûpela terîfkirinê ya wîkî'yê
wikidata_link: Maddeya %{page} a li ser Wîkîdaneyê
wikipedia_link: Gotara %{page} ya li ser Wîkîpediyayê
+ wikimedia_commons_link: Hêmana %{page} li ser Wîkîmediya Commonsê
telephone_link: Li %{phone_number} bigere
+ colour_preview: Pêşdîtina rengê %{colour_value}
note:
title: 'Not: %{id}'
new_note: Notê nû
hatiye çêkirin
opened_by_anonymous: Berî</abbr> <abbr title='%{exact_time}'>%{when} wek anonîm
hate çêkirin.
- commented_by: Şiroveya ji %{user} yê berî</abbr> <abbr title='%{exact_time}'>%{when}
- commented_by_anonymous: Şîrove ji alî bikarhênerek anonîm ve berî</abbr> <abbr
- title='%{exact_time}'>%{when}
- closed_by: Ji aliyê %{user} ve berî</abbr> <abbr title='%{exact_time}'>%{when}
- hate çareserkirin
- closed_by_anonymous: Ji aliyê bikarhênerek anonîm ve berî</abbr> <abbr title='%{exact_time}'>%{when}
+ commented_by: Şiroveya ji %{user} </abbr> <abbr title='%{exact_time}'>%{when}
+ commented_by_anonymous: Şîrove ji alî bikarhênerek anonîm ve </abbr> <abbr title='%{exact_time}'>%{when}
+ closed_by: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when} hate
+ çareserkirin
+ closed_by_anonymous: Ji aliyê bikarhênerek anonîm ve </abbr> <abbr title='%{exact_time}'>%{when}
hate çareserkirin
- reopened_by: Ji aliyê %{user} ve
berî</abbr> <abbr title='%{exact_time}'>%{when}
+ reopened_by: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
ji nû ve hate aktîvkirin
- reopened_by_anonymous: Ji aliyê bikarhênerek anonîm ve
berî</abbr> <abbr title='%{exact_time}'>%{when}
+ reopened_by_anonymous: Ji aliyê bikarhênerek anonîm ve </abbr> <abbr title='%{exact_time}'>%{when}
ji nû ve hate aktîvkirin
- hidden_by: Ji aliyê %{user} ve berî</abbr> <abbr title='%{exact_time}'>%{when}
- hate veşartin
+ hidden_by: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when} hate
+ veşartin
report: Vê nîşeyê gilî bike
query:
title: Taybetmendiyan Nîşan Bide
comment:
comment: Şîroveya nû yê li ser qeyda guhertinan a %{changeset_id} yê ji alî
%{author} ve
- commented_at_by_html: Berî %{when} ji aliyê %{user} ve hate rojanekirin
+ commented_at_by_html: '%{when} ji aliyê %{user} ve hate rojanekirin'
+ comments:
+ comment: 'Şîroveya nû li ser desteya guhertinan ya #%{changeset_id} ji aliyê
+ %{author} ve'
index:
title_all: Gotûbêja qeyda guhertinên OpenStreetMapê
title_particular: Gotûbêja qeyda guhertinan a %{changeset_id} yê OpenStreetMapê
+ timeout:
+ sorry: Bibore, bidestxistina lîsteya şîroveyên desteya guhertinan ê ku te xwest
+ demeke dirêj girt.
diary_entries:
new:
title: Nivîsa nû yê rojane
in_language_title: Nivîsên Rojane yên bi %{language}
new: Nivîsa nû yê rojane
new_title: Di rojnivîska min de nivîsekî nû binivîse
+ my_diary: Rojnivîska min
no_entries: Nivîsên rojane tine
recent_entries: Nivîsên rojane yên dawîn
older_entries: Nivîsên Kevintir
zero: Bêşîrove
one: '%{count} şîrove'
other: '%{count} şîrove'
- edit_link: Vê nivîse biguherîne
+ edit_link: Vê nivîsê biguherîne
hide_link: Vê nivîsê biveşêre
- confirm: Pesend bike
+ unhide_link: Veşartina vê nivîsê rake
+ confirm: Tesdîq bike
report: Vê ketanê gilî bike
diary_comment:
comment_from_html: Şîroveya %{link_user} a %{comment_created_at}
- hide_link: Vê şiroveyê vebişêre
+ hide_link: Vê şîroveyê biveşêre
+ unhide_link: Veşartina vê şîroveyê rake
confirm: Pesend bike
- report: Vê şîroveyê rapor bike
+ report: Vê şîroveyê ragihîne
location:
location: 'Cih:'
view: Bibîne
comments:
has_commented_on: '%{display_name} van nivîsên rojane yên li xwarê şirove kir'
post: Nivîs
- when: Kengî
+ when: Kengê
comment: Şîrove
newer_comments: Şîroveyên nûtir
older_comments: Şîroveyên kevintir
"yes": Dikan
tourism:
alpine_hut: Qulûbeya çiyayê
- apartment: Qata apartmanê
+ apartment: Apartmana Tatîlê
artwork: Berhemên hunerî
attraction: Cihên balkêş
bed_and_breakfast: Pansiyona tevî 'taştê û nivîn'
status: Rewş
reports: Rapor
last_updated: Rojanekirina dawî
- last_updated_time_html:
Berî </abbr> <abbr title='%{title}'>%{time}
- last_updated_time_user_html: <abbr title='%{title}'>%{time} berê</abbr> ji %{user}
+ last_updated_time_html: </abbr> <abbr title='%{title}'>%{time}
+ last_updated_time_user_html: <abbr title='%{title}'>%{time} </abbr> ji %{user}
link_to_reports: Raporan Bibîne
reports_count:
one: 1 Rapor
reopen:
reopened: Rewşa pirsgirêk wekî "Vekirî" hat eyarkirin
comments:
+ comment_from_html: Şîrove ji %{user_link} li ser %{comment_created_at}
reassign_param: Bila pirsgirêk ji nû ve bê tayînkirin?
reports:
- reported_by_html: Ji aliyê %{user} ve wekî %{category} hat raporkirin
+ reported_by_html: Ji aliyê %{user} ve wekî %{category} hat raporkirin li ser
+ %{updated_at}
helper:
reportable_title:
diary_comment: '%{entry_title}, şîrove #%{comment_id}'
intro_text: OpenStreetMap xerîteyekî dinyayê ye ku ji aliyê kesên wek te ve tê
çêkirin û emilandina we belaş e û di bin lîsansa azad de ye.
intro_2_create_account: Ji xwe re hesabekî çêbike
+ hosting_partners_html: Xizmeta hewandinê tê piştgirîkirin ji aliyê %{ucl}, %{bytemark},
+ û %{partners} din ve.
partners_ucl: University College London
partners_bytemark: Bytemark Hosting
partners_partners: şirîkên me
more_info_2: 'ji vir dikarî bibînî:'
success:
subject: '[OpenStreetMap] Împortkirina GPXê bi ser ket'
- loaded_successfully: Ji nuqteyên %{possible_points} yê muhtemel bi %{trace_points}
- bi awayekî serkefî hate barkirin.
+ loaded_successfully:
+ one: ji nuqteyekê %{possible_points} yê muhtemel bi %{trace_points} bi awayekî
+ serkefî hate barkirin.
+ other: Ji nuqteyên %{possible_points} yê muhtemel bi %{trace_points} bi
+ awayekî serkefî hate barkirin.
signup_confirm:
subject: '[OpenStreetMap] Bi xêr hatî OpenStreetMapê'
greeting: Merhebaǃ
şiroveyek nivîsand'
subject_other: '[OpenStreetMap] %{commenter} desteyekî guherandinê ê ku tu
pê eleqedar dibî şirove kir'
- your_changeset: '%{commenter} li ser desteyekî te yê guherandinê ê ku di %{time}
- de hatibû çêkirin, şiroveyek berda'
- commented_changeset: '%{commenter} li ser desteya guhertinê yê ku tu dişopînî
- şiroveyek berda, ji aliyê %{changeset_author} ve di %{time} de hatiye çêkirin'
+ your_changeset: '%{commenter} li ser desteyekî te yê guherandinê şîroveyekê
+ berda di %{time} de'
+ commented_changeset: '%{commenter} di %{time} de li ser desteya guhertinê
+ yê ku tu dişopînî şiroveyek berda, ji aliyê %{changeset_author} ve hatiye
+ çêkirin'
partial_changeset_with_comment: tevî şiroveya '%{changeset_comment}'
partial_changeset_without_comment: bêyî şirove
details: Dêtayên zêdetir yên derbarê desteya guherandinê de hûn dikarin ji %{url}
<a href=''%{copyright_path}''>rûpela lîsans û mafê daneriyê</a>.'
legal_title: Zagonî
legal_1_html: |-
- Ev malper û gelek xizmetên din yên pêwendîdar bi awayekî fermî ji aliyê <a href='https://osmfoundation.org/'>Weqfa OpenStreetMapê</a> (OSMF) ve li ser navê civatê tê birêvebirin. Bikaranîna hemû karûbarên ku ji aliyê OSMF ve tê birêvebirin mijara <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
- Politikayên Bikaranînê yê Qebûlbar</a> û <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Politikaya me ya Veşarîtiyê</a> ye
- <br> Eger di derbarê lîsanskirin, mafê daneriyê de pirsên we hebin an jî ji bo pirsên we yên din ên qanûnî xêra xwe <a href='https://osmfoundation.org/Contact'>bi OSMF re bikevin têkiliyê</a>. <br>OpenStreetMap, logoya mercekê û State of the Map <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">marqeyên ticarî yên qeydkirî yê OSMFê nin</a>.
+ Ev malper û gelek xizmetên din yên pêwendîdar bi awayekî fermî ji aliyê <a href='https://osmfoundation.org/'>Weqfa OpenStreetMapê</a> (OSMF) ve li ser navê civatê tê birêvebirin. Bikaranîna hemû karûbarên ku ji aliyê OSMF ve tê birêvebirin mijara <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Mercên Bikaranînê</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+ Politikayên Bikaranînê yê Qebûlbar</a> û <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Politikaya me ya Veşarîtiyê</a> ye.
+ legal_2_html: Eger di derbarê lîsanskirin, mafê daneriyê de pirsên we hebin
+ an jî ji bo pirsên we yên din ên qanûnî xêra xwe <a href='https://osmfoundation.org/Contact'>bi
+ OSMF re têkiliyê deynin</a>. <br>OpenStreetMap, logoya mercekê û State of
+ the Map <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">marqeyên
+ ticarî yên qeydkirî yê OSMFê nin</a>.
partners_title: Şirîkên me
copyright:
foreign:
Eger hûn daneyên me biguherînin an jî baştir bikin hûn vê netîceyê tenê
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_html: |-
+ 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.
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ê ”.
- credit_2_html: Herwiha divê hûn zelal bikin ku daneyên me di bin lîsansa Open
- Database License de hatiye lîsanskirin, û eger karoyên nexşeya me were emilandin,
- diyar bikin ku ev kartografî jî bi CC BY-SA hatiye lîsanskirin. Hûn vê bi
- lînkdana ji <a href="https://www.openstreetmap.org/copyright">rûpela mafê
- daneriyê</a> re dikarin bikin. Wekî alternatîv, û wekî hewcehiyek eger tu
- OSMyê di formekî daneyan de belav bikî tu dikarî rasterast lîsansan bi nav
- bikî an jî girê bidî lîsansê(n) rasterast. Di medyayên ku lînkkirin 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_html: "Ji bo nexşeyekî elektronîk yê gerrînbar, çavkanî divê li jêra
+ credit_2_1_html: Herwiha divê hûn zelal bikin ku daneyên me di bin lîsansa
+ Open Database License de hatiye lîsanskirin, û eger karoyên nexşeya me were
+ emilandin, diyar bikin ku ev kartografî jî bi CC BY-SA hatiye lîsanskirin.
+ Hûn vê bi lînkdana ji <a href="https://www.openstreetmap.org/copyright">rûpela
+ mafê daneriyê</a> re dikarin bikin. Wekî alternatîv, û wekî hewcehiyek eger
+ tu OSMyê di formekî daneyan de belav bikî tu dikarî rasterast lîsansan bi
+ nav bikî an jî girê bidî lîsansê(n) rasterast. Di medyayên ku lînkkirin
+ 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_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:
alt: Mînakekê atfkirinê ya OpenSteetMapê yê li ser malperekî înternetê
contributors_at_html: |-
<strong>Awistirya</strong>: Daneyên ji <a href="https://data.wien.gv.at/">Stadt Wien</a> (di bin
<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> de), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> û Land Tirol (tevî guhertinan di bin lîsansa <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT de</a>) dihundirrîne.
+ contributors_au_html: |-
+ <strong>Awistralya</strong>: Daneyên ji
+ <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a> yên ku ji aliyê Commonwealth of Australia ve li bin
+ <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> hatine lîsanskirin dihewîne.
contributors_ca_html: |-
<strong>Keneda</strong>: Daneyên ji GeoBase®, GeoGratis (© Department of Natural
Resources Canada), CanVec (© Department of Natural
<strong>Slovenya</strong>: Daneyên ji <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> û
<a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
(agahiyên ji xelkê re vekirî yên Slovenyayê) dihundirrîne.
+ contributors_es_html: |-
+ <strong>Spanya</strong>: Daneyên ji
+ Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) û
+ National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
+ yên ji bo cardinbikaranînê di bin <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> de hatine lîsanskirin dihewîne.
contributors_za_html: |-
<strong>Afrîkaya Başûr</strong>: Daneyên ku ji <a href="http://www.ngi.gov.za/">Chief Directorate:
National Geo-Spatial Information</a> hatine bidestxistin dihundirrîne. Mafê daneriyê yê dewletê parastî ye.
contributors_gb_html: |-
<strong>Mîrnişîna Yekbûyî</strong>: Daneyên Ordnance
- Survey data © dihundirrîne; mafê daneriyê yê Crownê û mafê databasê parastî ne 2010-12.
+ Survey data © dihundirrîne; mafê daneriyê yê Crownê û mafê databasê parastî ne 2010-19.
contributors_footer_1_html: |-
Ji bo dêtayên van û çavkaniyên din yên ku di pêşdebirina OpenStreeteMapê de hatine bikaranîn agahiyên zêdetir werbigrî, xêra xwe ji ser OpenStreetMap Wiki'yê binêre <a
href="https://wiki.openstreetmap.org/wiki/Contributors">rûpela Beşdaran</a>.
xwediyê çend çavkaniyan e.
welcome:
url: /welcome
- title: Bi xêr hatî OSMê
+ title: Bi xêr hatî OpenStreetMapê
description: Bi vê rêbernameya kurt ê ku tê de esasên OpenStreetMapê heye
dest pê bike.
beginners_guide:
description: Civata me, ji bo kesên ku nû dest pê kirine rêbertî dike.
help:
url: https://help.openstreetmap.org/
- title: help.openstreetmap.org
- description: Pirsek bipirsin an binêrin cewabên li ser malpera OSMê ya pirs-û-bersivê.
+ title: Foruma Alîkariyê
+ description: Pirsek bipirsin an binêrin cewabên li ser malpera OpenStreetMapê
+ ya pirs-û-bersivê.
mailing_lists:
title: Lîsteya E-nameyan
description: Di lîsteyên e-nameyan yên deverî an jî herêmî yên cur bi cur
description: Alikariya ji bo şirket û komeleyên ku derbasî nexşe û xizmetên
din yên bi bingeha OpenStreetMapê dibin.
welcomemat:
+ url: https://welcome.openstreetmap.org/
title: Ji bo rêxistinan
+ description: Tevî sazî an komeleyekê planên te yên ji bo OpenStreetMapê hene?
+ Tiştê ku ji te re lazim e di Rûpela Xêrhatinê de peyda bike.
wiki:
url: https://wiki.openstreetmap.org/
- title: wiki.openstreetmap.org
- description: Ji bo belgeyên OSMyê yên bi berfirehî binêrin wîkiyê.
+ title: Wîkiya OpenStreetMapê
+ description: Ji bo belgeyên OpenStreetMapyê yên bi berfirehî binêrin wîkiyê.
sidebar:
search_results: Encamên lêgerînê
close: Bigire
preview: Pêşdîtin
markdown_help:
title_html: |-
- Bi <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
+ Bi <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
hate analîzkirin
headings: Sernivîs
heading: Sernivîs
paragraph_1_html: OpenStreetMap ji bo hînbûna projeyê, pirskirin û cewabdana
pirsan, û ji bo nîqaşên ku bi hevkarî têne kirin û ji bo belgekirina mijarên
nexşeyê xwediyê çend çavkaniyan e. <a href='%{help_url}'>Ji vir alîkariyê
- werbigrin</a>.
+ werbigire</a>. Bi sazî an komeleyeke dixwazî planan çêkî ji bo OpenStreetMapê?
+ <a href='https://welcome.openstreetmap.org/'>Rûpela Xêrhatinê kontrol bike</a>.
start_mapping: Dest bi çêkirina nexşeyan bike
add_a_note:
title: Ji bo sererastkirinê wextê te tine? Wê gavê notek lê zêde bike!
tags_help: bi bêhnokê hatiye veqetandin
visibility: Kî dikare bibîneː
visibility_help: Ev tê çi wateyê?
+ visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
help: Alîkarî
help_url: https://wiki.openstreetmap.org/wiki/Upload
create:
trace_uploaded: Dosyeya te ya GPXê hate barkirin û ji bo ku li databasê were
zêdekirin li bendê ye. Ev kar pirrî caran di nîv saetê de temam dibe û gava
ku temam be wê ji te re e-peyamek were şandin.
+ upload_failed: Bibore, barkirina GPXê têk çû. Admîneke hate haydarkirin ji ber
+ xetayê. Ji kerama xwe cardin biceribîne
traces_waiting:
one: '%{count} şopê te yê ku li hêviya barkirinê disekine heye. Ji bo ku ji
bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan bar nekir,
newer: Şopên nûtir
trace:
pending: LI BENDÊ YE
- count_points: '%{count} nuqte'
+ count_points:
+ one: Nuqteyekê
+ other: '%{count} nuqte'
more: dêtay
trace_details: Dêtayên Şopê Bibîne
view_map: Nexşeyê bibîne
other: Dosyeya GPXê yê bi %{count} nuqteyan ya ji %{user}
description_without_count: Dosyeya GPXê yê ji %{user}
application:
+ permission_denied: Destûra te tine ji bo gihîna vê kiryarê
require_cookies:
cookies_needed: Tê xuyan ku te kûkiyan girtiye - xêra xwe berî ku tu dewam bikî,
kûkiyan di geroka xwe de aktîv bike.
no_apps_html: Gelo sepanek heye tu bixwazibî wê qeyd bikî û pê standarda %{oauth}
biemilînî ji bo ku digel me bi kar bînî? Berî ku tu ji OAuthê vê xizmetê bixwazibî
divê tu sepanê xwe yê webê bidî qeydkirin.
+ oauth: OAuth
registered_apps: Van sepanên telebkar bide qeydkirinː
register_new: Sepanê xwe qeyd bike
form:
kirǃ
terms declined: Em xemgîn in ji ber ku te şertên beşdariyê yê nû qebûl nekir.
Ji bo zêdetir agahiyan xêra xwe binêre <a href="%{url}">vê rûpela wîkiyê</a>.
+ terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
terms:
- title: Şertên beşdariyê
- heading: Şertên beşdariyê
- consider_pd: Tevî vê peymana li jorê, tu dikarî bibijêrî ku beşdariyên te wek
- Malê Giştî (malê ku ne aîdî şexsekî ye) were qebûlkirin.
+ title: Şertûmerc
+ heading: Şertûmerc
+ heading_ct: Şertên beşdariyê
+ read and accept with tou: Ji kerema xwe peymana beşdariyê û mercên bikaranînê
+ bixwîne û herdu qutîkan kontrol bike gava temam bû û dû re pêlî bişkoka dewamkirinê
+ bike.
+ contributor_terms_explain: Ev peymana şertûmercan ji bo beşdariyên te yên heyî
+ û ji bo yên dahatûyê hukm dike.
+ read_ct: Min peymana mercên beşdariyê yê li jor xwend û qebûl kir
+ tou_explain_html: Ev %{tou_link} bikaranîna malperê û jêrxana ku ji aliyê OSMF
+ ve tê temînkirin bi rê ve dibe. Ji kerema xwe bitikîne ser lînkê, nivîsê bixwîne
+ û qebûl bike.
+ read_tou: Min Şertûmercên Bikaranînê xwend û qebûl kir
+ consider_pd: Tevî evên li jorê, tu dikarî bibijêrî ku beşdariyên te wek Malê
+ Giştî (malê ku ne aîdî şexsekî ye) were qebûlkirin.
consider_pd_why: Ev çi ye?
+ consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
guidance_html: 'Li vir agahiyên alîkar yên ji bo tu van şertan fam bikî hene:
<a href="%{summary}">kurteyek ku dikare were xwendin</a> û çend <a href="%{translations}">tercumeyên
nefermî</a>'
+ continue: Dewam bike
+ declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
decline: Red bike
you need to accept or decline: Ji bo ku dewam bikî, xêra xwe şertên beşdariyê
bixwîne û piştre qebûl an jî red bike.
ct status: Şertên beşdariyêː
ct undecided: Bêqerar
ct declined: Redkirî
- latest edit: 'Guherandina axirkî %{ago}:'
+ latest edit: 'Guherandina axirkî (%{ago}):'
email address: 'Navnîşana e-nameyê:'
created from: Ji van hate çêkirinː
status: 'Rewş:'
bikî û qebûl bikî xêra xwe vê lînkê taqîb bike.
agreed_with_pd: Herwiha te beyan kir ku tu dixwazî guherandinên te wek Malê
Giştî were qebûlkirin.
+ link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
link text: Ev çi ye?
profile description: Danasîna profîlêː
preferred languages: Zimanên ku têne tercîhkirinː
image: 'Wêne:'
gravatar:
gravatar: Gravatarê bi kar bîne
+ link: https://wiki.openstreetmap.org/wiki/Gravatar
link text: ev çi ye
disabled: Gravatar hate neçalakkirin.
enabled: Gravatarê te niha dikare were xuyan.
heading_html: Rakirina astengiya ku ji aliyê %{block_by} ve li ser %{block_on}
hatiye çêkirin
time_future: Wê astengî di %{time} de xilas bibe.
- past: Ev astengî berî %{time} xilas bûye û niha nikare were rakirin.
+ past: Ev astengî %{time} xilas bûye û niha nikare were rakirin.
confirm: Tu bawer î ku tu dixwazî vî astengiyê rabikî?
revoke: Betal bike!
flash: Ev astengî hate betalkirin.
time_future: Di %{time} de diqede.
until_login: Heta ku bikarhêner têkeve aktîv e
time_future_and_until_login: Di %{time} de û gava ku bikarhêner têket wê biqede.
- time_past: Berî %{time} qediya.
+ time_past: '%{time} qediya.'
block_duration:
hours:
one: 1 saetê
other: '%{count} saetan'
+ days:
+ one: 1 roj
+ other: '%{count} rojan'
+ weeks:
+ one: 1 heftî
+ other: '%{count} heftiyan'
+ months:
+ one: 1 meh
+ other: '%{count} mehan'
+ years:
+ one: 1 sal
+ other: '%{count} salan'
blocks_on:
title: Astengiyên ser %{name}
heading_html: Lîsteya astengiyên ser %{name}
out: Dûr bike
locate:
title: Cihê min nîşan bide
+ metersPopup:
+ one: Tu di nava 1 metreya vê nuqteyê de yî
+ other: Tu di nava %{count} metreyên vê nuqteyê de yî
+ feetPopup:
+ one: Tu 1 gav di nava vê nuqteyê de yî
+ other: Tu d nava %{count} gavên vê nuqteyê de yî
base:
standard: Standard
cycle_map: Nexşeya bisiklête
title: Tebeqeyên nexşeyê
copyright: © <a href='%{copyright_url}'>Beşdarên OpenStreetMapê</a>
donate_link_text: <a class='donate-attr' href='%{donate_url}'>Bexşek bike</a>
+ 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>
+ 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
site:
edit_tooltip: Nexşeyê sererast bike
edit_disabled_tooltip: Ji bo sererastkirina nexşeyê nêzîk bike
directions:
ascend: Bilind bike
engines:
+ fossgis_osrm_bike: Bisiklêt (OSMR)
fossgis_osrm_car: Erebe (OSRM)
+ fossgis_osrm_foot: Pê (OSMR)
graphhopper_bicycle: Bisiklêt (GraphHopper)
graphhopper_car: Erebe (GraphHopper)
graphhopper_foot: Peyade (GraphHopper)
offramp_right_with_exit_name_directions: Li alî rastê di ser %{name} re ji
EXİT'a %{exit} here ber bi %{directions} ve
offramp_right_with_name: Ji rampayê li alî rastê ber bi %{name} ve biçe
+ offramp_right_with_directions: Bikeve rampeyê ji aliyê rastê ber bi %{directions}
+ ve
+ offramp_right_with_name_directions: Bikeve rampeyê ji aliyê rastê ji ser %{name},
+ ber bi %{directions} ve
+ onramp_right_without_exit: Bizivire rastê ji rampeyê, ji ser %{name}
+ onramp_right_with_directions: Bizivire rastê ji ser rampeyê, ber bi %{directions}
+ ve
+ onramp_right_with_name_directions: Bizivire rastê ji ser rampeyê ji ser %{name},
+ ber bi %{directions} ve
onramp_right_without_directions: Ji ser rampayê bi alî rastê ve bizivire
+ onramp_right: Bizivire rastê ji ser rampeyê
+ endofroad_right_without_exit: Di dawiya cadeyê de bizivire aliyê rastê ji
+ ser %{name}
+ merge_right_without_exit: Bigihîje yê din ji ser %{name}
+ fork_right_without_exit: Li duriyanê bizivire aliyê rastê, ji ser %{name}
turn_right_without_exit: Ji ser %{name} bi alî rastê ve bizivire
sharp_right_without_exit: Ji ser %{name} bi alî rastê ve vîrajek tûj
uturn_without_exit: Bi dirêjahiya %{name} wek U'yê vegere
turn_left_without_exit: Ji ser %{name} bi alî çepê ve bizivire
offramp_left: Here rampaya li çepê
offramp_left_with_exit: Li alî çepê ji EXİT'a %{exit} derbikeve
+ offramp_left_with_exit_name: Ji aliyê çepê here cihê derketinê %{exit}, ji
+ ser %{name}
+ offramp_left_with_exit_directions: Ji aliyê çepê here cihê derketinê %{exit},
+ ber bi %{directions} ve
+ offramp_left_with_exit_name_directions: Here cihê derketinê %{exit} ji aliyê
+ çepê, ji ser %{name}, ber bi %{directions} ve
+ offramp_left_with_name: Bikeve rampeyê ji aliyê çepê ji ser %{name}
+ offramp_left_with_directions: Bikeve rampeyê ji aliyê çepê, ber bi %{directions}
+ ve
+ offramp_left_with_name_directions: Bikeve rampeyê ji aliyê çepê ji ser %{name},
+ ber bi %{directions} ve
+ onramp_left_without_exit: Bizivire aliyê çepê ji ser %{name}
+ onramp_left_with_directions: Bizivire aliyê çepê ji ser rampeyê, ber bi %{directions}
+ ve
+ onramp_left_with_name_directions: Bizivire aliyê çepê ji ser %{name}, ber
+ bi%{directions} ve
+ onramp_left_without_directions: Bizivire aliyê çepê ji ser rampeyê
+ onramp_left: Bizivire aliyê çepê ji ser rampeyê
+ endofroad_left_without_exit: Li dawiya cadeyê bizivire aliyê çepê ji ser %{name}
+ merge_left_without_exit: Bigihîje yê çepê ji ser %{name}
+ fork_left_without_exit: Li duriyanê bizivire aliyê çepê, ji ser %{name}
+ slight_left_without_exit: Piçekî bi aliyê çepê ve ji ser %{name}
via_point_without_exit: (ji ser nuqteyê)
follow_without_exit: '%{name} bişopîne'
roundabout_without_exit: Ji çerxeriyê ber bi %{name} ve biçe
end_oneway_without_exit: Dawiya rêya yek-alî yê %{name}
roundabout_with_exit: Li çerxeriyê exit'a %{exit} bi kar bîne û ber bi %{name}
ve biçe
+ roundabout_with_exit_ordinal: Li çerxeriyê cihê derketinê yê %{exit} bi kar
+ bîne ji ser %{name}
+ exit_roundabout: Ji çerxeriyê derkeve ji ser %{name}
unnamed: rêya bênav
+ courtesy: Îstîqamet bi xêra %{link}
exit_counts:
first: 1em
second: 2yem
versiyonên wê ji nû ve sererast bike.
flash: Redaksiyon hate rakirin.
error: Gava ku ev redaksiyon dihate rakirin xetayek derket.
+ validations:
+ leading_whitespace: cihên vala yê li pêş hene
+ trailing_whitespace: li dawiyê cihên vala hene
+ invalid_characters: karakterên nederbasdar dihewîne
+ url_characters: karakterên URLyê yên xisûsî (%{characters}) dihewîne
...
intro_2_html: |-
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_html: |-
+ 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
Commons Attribution-ShareAlike 2.0</a> licenciją (CC-BY-SA).
credit_title_html: Kaip paminėti OpenStreetMap
credit_1_html: |-
Mes reikalaujame, kad jūs parašytumėte "© OpenStreetMap
autoriai ".
- credit_2_html: Jūs turite aiškiai parodyti, kad duomenys yra laisvai prieinami
+ credit_2_1_html: Jūs turite aiškiai parodyti, kad duomenys yra laisvai prieinami
pagal Open Database licenciją, o jei naudojate mūsų žemėlapio kaladėles,
tai kartografijos licencija yra CC-BY-SA. Tai padaryti galite pridėdami
nuorodą į <a href="http://www.openstreetmap.org/copyright">šį autorinių
darbuose), mes siūlome jūsų skaitytojus nukreipti į openstreetmap.org (ko
gero išplečiant „OpenStreetMap“ iki pilno adreso), į opendatacommons.org
ir, jei tinka, į creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Naršant po elektroninį žemėlapį, kūrėjų sąrašas turėtų pasirodyti žemėlapio kampe.
Pavyzdžiui:
veidotājiem. Ja tu maini vai veido uz mūsu kartēm, tu
vari izplatīt rezultātu tikai zem tās pašas licences. Pilns
<a href="http://opendatacommons.org/licenses/odbl/1.0/">juridiskais kods</a> izskaidro tavas tiesības un pienākumus.
- intro_3_html: |-
+ intro_3_1_html: |-
Kartogrāfija mūsu karšu flīzēs un mūsu dokumentācija ir licencēti zem <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> licences (CC-BY-SA).
credit_title_html: Kā atsaukties uz OpenStreetMap
credit_1_html: |-
Mēs pieprasām, ka tu izmanto atsauci “© OpenStreetMap
veidotāji”.
- credit_2_html: "Kur iespējams, OpenStreetMap vajadzētu būt iesaitētam uz <a\n
- \ href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n
+ credit_2_1_html: "Kur iespējams, OpenStreetMap vajadzētu būt iesaitētam uz
+ <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n
\ un CC BY-SA uz <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.
Ja\n tu lieto mediju, kur saites nav iespējamas (piem. \n printēts darbs),
mēs iesakām pārsūtīt savus lasītājus uz\n www.openstreetmap.org (piemēram
paplašinot\n ‘OpenStreetMap.org’ uz pilno adresi) un uz\n www.creativecommons.org."
- credit_3_html: 'Priekš pārlūkojamas elektroniskās kartes, atsaucei ir jāparādās
+ credit_4_html: 'Priekš pārlūkojamas elektroniskās kartes, atsaucei ir jāparādās
kartes stūrī. Piemēram:'
attribution_example:
alt: Piemērs, kā OpenStreetMap apzīmēt web lapā
Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате
само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот
<a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">правен текст</a>."
- intro_3_html: |-
+ intro_3_1_html: |-
Картографијата во нашите полиња на картите и нашата документација
се нудат под лиценцата <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.mk">Криејтив комонс Наведи извор-Сподели под исти услови 2.0</a> (CC-BY-SA).
credit_title_html: Како да ја наведете OpenStreetMap
credit_1_html: |-
Задолжително наведувајте нè со “© Учесници на
OpenStreetMap ”.
- credit_2_html: "Исто така мора јасно да истакнете дека податоците се нудат
+ credit_2_1_html: "Исто така мора јасно да истакнете дека податоците се нудат
под \nЛиценцата за отворени бази, и, доколку ги користите нашите полиња
на картите, дека\nкартографијата е под лиценцата CC-BY-SA. Ова може да го
сторите со ставање на врска\nдо <a href=\"https://www.openstreetmap.org/copyright\">оваа
(на пр. печатени дела), предлагаме \nда ги упатите читателите кон openstreetmap.org
(можеби со проширување на \n'OpenStreetMap' на оваа полна адреса), кон opendatacommons.org
и\n(ако е релевантно) кон creativecommons.org."
- credit_3_html: |-
+ credit_3_1_html: "Картографските полиња во “стандардниот стил”
+ на www.openstreetmap.org се \nдело на Задолжбината OpenStreetMap користејќи
+ податоци од OpenStreetMap под лиценцата Отворена база на податоци. Ако ги
+ користите полињава, ве молиме наведете го изворот: \n“Основна карта
+ и податоци OpenStreetMap и Задолжбина OpenStreetMap”."
+ credit_4_html: |-
Кај пребарливата електронска карта, припишувањето треба да се прикаже во аголот од картата.
На пример:
attribution_example:
di bawah lesen yang sama sahaja. <a href="http://opendatacommons.org/licenses/odbl/1.0/">Kanun
undang-undang</a> yang lengkap ini menerangkan hak-hak dan tanggungjawab
anda.
- intro_3_html: Kartografi jubin peta kami serta pendokumenan kami dilesenkan
+ intro_3_1_html: Kartografi jubin peta kami serta pendokumenan kami dilesenkan
di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Pengiktirafan-PerkongsianSerupa
2.0</a> (CC-BY-SA).
credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap
credit_1_html: Kami memerlukan anda menggunakan dikenali sebagai “©
penyumbang OpenStreetMap” dalam penghargaan.
- credit_2_html: |-
+ credit_2_1_html: |-
Anda juga mesti memperjelas bahawa data ini tersedia di bawah Open Database License, dan juga kartografinya berada di bawah lesen CC-BY-SA jika jubin peta kami turut digunakan. Anda boleh berbuat demikian dengan membuat pautan ke <a href="http://www.openstreetmap.org/copyright">halaman hak cipta ini</a>.
Selain itu, dan sebagai kemestian untuk mengedarkan OSM dalam bentuk data, anda boleh menyatakan nama dan membuat pautan secara terus kepada lesen. Untuk media yang tidak membolehkan pautan (cth. bahan cetakan), kami mencadangkan supaya anda menghalakan pembaca-pembaca ke openstreetmap.org (misalnya, dengan meluaskan 'OpenStreetMap' ke alamat penuh ini), ke opendatacommons.org, dan juga creativecommons.org jika berkenaan.
- credit_3_html: |-
+ credit_4_html: |-
Untuk peta elektronik yang boleh disemak imbas, kredit seharusnya disiarkan di sudut peta.
Contoh:
attribution_example:
bidragsytere. Hvis du endrer eller bygger videre på våre kart eller data, må du
distribuere resultatet under samme lisens. Den
fullstendige <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">juridiske teksten</a> beskriver rettigheter og ansvar.
- intro_3_html: |-
+ intro_3_1_html: |-
Kartografien i våre kartruter, samt dokumentasjonen, er lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> lisensen (CC BY-SA).
credit_title_html: Hvordan kreditere OpenStreetMap
credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene».
- credit_2_html: "Du må også gjøre det klart at dataene er tilgjengelige under
+ credit_2_1_html: "Du må også gjøre det klart at dataene er tilgjengelige under
Open \nDatabase License, og dersom du bruker våre kartfliser, at kartografien
er\n lisensert som CC BY-SA. Du kan gjøre dette ved å lenke til\n<a href=\"http://www.openstreetmap.org/copyright\">denne
siden om opphavsrett</a>. \nAlternativt, og som et krav, hvis du distribuerer
foreslår vi at du\n henviser dine lesere til openstreetmap.org (kanskje
ved å utvide\n'OpenStreetMap' til denne fulle adressen), til opendatacommons.org,
og\n hvis relevant, til creativecommons.org."
- credit_3_html: For et navigerbart elektronisk kart bør krediteringen vises
+ credit_4_html: For et navigerbart elektronisk kart bør krediteringen vises
i hjørnet på kartet.
attribution_example:
alt: Eksempel på hvordan man angir OpenStreetMap som kartkilde på en nettside
mag u het resultaat enkel onder dezelfde licentie distribueren. In de
volledige <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridische
tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.
- intro_3_html: |-
+ 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).
credit_1_html: |-
We vereisen dat u het volgende vermeldt bij gebruik:
“© OpenStreetMap-auteurs”.
- credit_2_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn
+ credit_2_1_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn
onder de Open\nDatabase License, en als u onze kaarttegels gebruikt, dat
de cartografie\nde licentie CC BY-SA heeft. U kunt dit doen door te verwijzen
naar\n<a href=\"https://www.openstreetmap.org/copyright\">de auteursrechtenpagina</a>.
naar openstreetmap.org (mogelijk door de naam \"OpenStreetMap\" naar dit
webadres uit te breiden), naar opendatacommons.org en naar, indien van toepassing,
creativecommons.org."
- credit_3_html: |-
+ credit_4_html: |-
Voor een doorbladerbare, digitale kaart, moet de naamsvermelding in een hoek van de kaart weergegeven worden.
Bijvoorbeeld:
attribution_example:
trace</a> of kom meer te weten over GPS tracen op de <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikipagina</a>.
upload_trace: Trace uploaden
see_all_traces: Alle traces bekijken
- see_my_traces: Weergeef mijn tracks
+ see_my_traces: Mijn traces bekijken
destroy:
scheduled_for_deletion: Trace staat op de lijst voor verwijdering
make_public:
Dersom du endrar eller byggjer på dataa våre, kan du berre distribuere resultatet
under same lisens. \n Den fullstendige <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiske\n
\ teksten</a> forklarer rettane og ansvaret."
- intro_3_html: |-
+ intro_3_1_html: |-
Kartografien i våre kartfliser, og dokumentasjonen vår, er lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA).
credit_title_html: Korleis kreditere OpenStreetMap
credit_1_html: Me krev at du brukar godskrivinga «© OpenStreetMap-bidragsytarane».
- credit_2_html: Du må óg gjere det klart at dataa er tilgjengeleg under Open
+ credit_2_1_html: Du må óg gjere det klart at dataa er tilgjengeleg under Open
Database License, og dersom du brukar kartflisene, at kartografien er lisensiert
under CC BY-SA. Du kan gjere dette ved å lenkje til <a href="http://www.openstreetmap.org/copyright">denne
sida</a>. Alternativt, og eit krav om du distribuerer OSM i dataform, kan
umogleg (t.d. trykte verk), føreslår me at du viser lesarane dine til openstreetmap.org
(kanskje ved å utvide «OpenStreetMap» til denne fulle adressa), til opendatacommons.org,
og dersom relevant, til creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
For et navigerbart elektronisk kart, skal kjelda visast i hjørnet av kartet.
Til dømes:
attribution_example:
las podètz distribuir sonque jos la meteissa licéncia. Lo
<a href="https://opendatacommons.org/licenses/odbl/1.0/">tèxte
legal</a> complet detalha vòstres dreits e responsabilitats.
- intro_3_html: Nòstres carrèus de rendut cartografics, e tanben de nòstra documentacion,
- son disponibles jos la licéncia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ intro_3_1_html: Nòstres carrèus de rendut cartografics, e tanben de nòstra
+
documentacion, son disponibles jos la licéncia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons paternitat – partiment a l’identic 2.0</a> (CC-BY-SA).
credit_title_html: Cossí creditar OpenStreetMap
credit_1_html: Demandam que vòstre crèdit compòrta la mencion « © los contributors
d’OpenStreetMap ».
- credit_2_html: Vos fau tanben botar en evidéncia que lei donadas son disponiblas
+ credit_2_1_html: Vos fau tanben botar en evidéncia que lei donadas son disponiblas
sota licéncia de basa de donadas dubèrtas e, s'utilizatz nòstrei mapas,
que la cartografia a licéncia CC-BY-SA. Podètz o far en ligant <a href="http://www.openstreetmap.org/copyright">aquela
pagina de copyright</a>. De maniera alternativa, mai coma requisit obligatòri
de hipertext i son pas possibles (per exemple, òbras estampadas), vos suggerissèm
d'adreiçar lei lectors a openstreetmap.org (En indicant benlèu l'adreiça
completa de OpenStreetMap), a opendatacommons.org E, se s'escau, a creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Per una mapa electronica navigabla, lo crèdit deuriá aparéisser dins lo canton de la mapa.
Per exemple :
attribution_example:
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_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane
+ 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
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”.
- credit_2_html: Musisz także jasno zaznaczyć, że dane dostępne są na licencji
+ credit_2_1_html: Musisz także jasno zaznaczyć, że dane dostępne są na licencji
Open Database License, a w przypadku kafelków – CC BY-SA. Możesz to zrobić
przez podlinkowanie <a href="https://www.openstreetmap.org/copyright">tej
strony licencyjnej</a>. W przypadku rozpowszechniania OSM w formie danych
jest umieszczenie linków (np. mapy papierowe), sugerujemy pokierowanie czytelników
na stronę openstreetmap.org (lub OpenStreetMap.org), opendatacommons.org
i, jeśli odpowiednie, creativecommons.org.
- credit_3_html: W przypadku map elektronicznych podziękowania powinny pojawić
+ credit_3_1_html: 'Kafelki mapy w stylu podstawowym na www.openstreetmap.org
+ są dziełem OpenStreetMap Foundation na podstawie danych OpenStreetMap na
+ licencji Open Database Licence. Jeśli używasz tych kafelków, użyj następującej
+ atrybucji: „Mapa podstawowa i dane z OpenStreetMap i OpenStreetMap Foundation”.'
+ credit_4_html: W przypadku map elektronicznych podziękowania powinny pojawić
się w rogu mapy.
attribution_example:
alt: Przykład, jak przypisywać OpenStreetMap na stronie internetowej
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.
- local_knowledge_title: Conhecimento Local
+ local_knowledge_title: Conhecimento local
local_knowledge_html: O OpenStreetMap valoriza o conhecimento local. Os contribuidores
utilizam fotografias aéreas, dispositivos GPS, e mapas do terreno para verificar
que a informação no OpenStreetMap é rigorosa e atualizada.
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_html: A cartografia nas nossas telas de mapas (imagens dos mapas)
+ 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>.
credit_title_html: Como fazer atribuição ao OpenStreetMap
credit_1_html: Requeremos que você faça atribuição citando “© contribuidores
do OpenStreetMap”.
- credit_2_html: Também tem de indicar claramente que os dados estão disponíveis
+ credit_2_1_html: Também tem de indicar claramente que os dados estão disponíveis
sob a Open Database License (ODbL), e caso utilize as telas de mapas (imagens
dos mapas), que a cartografia é disponibilizada sob a licença CC-BY-SA.
Pode fazer isto colocando uma hiperligação para <a href="https://www.openstreetmap.org/copyright">esta
sugerimos que indique o endereço do sítio www.openstreetmap.org (talvez
substituindo ‘OpenStreetMap’ por este endereço web), para www.opendatacommons.org
e, caso se aplique, para www.creativecommons.org
- credit_3_html: |-
+ credit_3_1_html: |-
+ Os mosaicos de mapa no “estilo padrão” no www.openstreetmap.org é um
+ trabalho produzido pela Fundação OpenStreetMap usando
+ dados do OpenStreetMap
+ sob a Open Database License. Se você estiver usando esses mosaicos por favor use
+ a seguinte atribuição:
+ “Mapa base e dados de OpenStreetMap e Fundação OpenStreetMap”.
+ credit_4_html: |-
Para um mapa eletrônico navegável, a atribuição deve aparecer no canto do mapa.
Por exemplo:
attribution_example:
contributors_footer_2_html: "A inclusão de dados no OpenStreetMap não implica
que fornecedor \noriginal apoie o OpenStreetMap, ou dê qualquer garantia,
ou \naceite qualquer responsabilidade."
- infringement_title_html: Violação de Direitos Autorais
+ infringement_title_html: Violação de direitos autorais
infringement_1_html: |2-
Os contribuidores do OSM são lembrados de nunca adicionar dados de quaisquer
fontes com direitos autorais protegidos (ex.: Google Maps ou mapas impressos) sem
seus contribuidores. 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_html: A cartografia nas nossas telas de mapas (imagens dos mapas)
+ 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-CompartilhaIgual 2.0 (CC BY-SA)</a>.
credit_title_html: Como creditar o OpenStreetMap
credit_1_html: Pedimos que use os créditos “© contribuidores do
OpenStreetMap” ou, se for mais adequado, em inglês “© OpenStreetMap
contributors”.
- credit_2_html: Também deve indicar claramente que os dados estão disponíveis
+ credit_2_1_html: Também deve indicar claramente que os dados estão disponíveis
sob a Open Database License (ODbL) e, caso utilize as telas de mapas (imagens
dos mapas), que a cartografia é disponibilizada sob a licença CC-BY-SA.
Pode fazer isto colocando uma hiperligação para <a href="https://www.openstreetmap.org/copyright">esta
sugerimos que indique o endereço do sítio www.openstreetmap.org (talvez
substituindo ‘OpenStreetMap’ por este endereço web), para www.opendatacommons.org
e, caso se aplique, para www.creativecommons.org
- credit_3_html: |-
+ credit_4_html: |-
Num mapa eletrónico navegável, os créditos devem aparecer num canto do mapa.
Por exemplo:
attribution_example:
users:
login:
title: Entrar
- heading: Iniciar sessão
+ heading: Iniciar Sessão
email or username: 'E-mail ou nome de utilizador:'
password: 'Palavra-passe:'
openid_html: '%{logo} OpenID:'
ei. Dacă modificați sau folosiți datele noastre, puteți distribui rezultatul
doar sub aceeași licență. Aici <a href="https://opendatacommons.org/licenses/odbl/1.0/">codul
legal</a> sunt explicate drepturile și responsabilitățile.
- intro_3_html: |-
+ intro_3_1_html: |-
Cartografia din hărțile noastre și documentația noastră sunt
licențiat sub <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
credit_title_html: Cum se creditează OpenStreetMap
credit_1_html: Noi cerem să utilizați creditul© contribuitori OpenStreetMap&
rdquo;.
- credit_2_html: |-
+ credit_2_1_html: |-
De asemenea, trebuie să clarificați faptul că datele sunt disponibile în cadrul licenței libere a bazei de date și, dacă folosim bucăți de hartă, atunci cartografierea este licențiată de CC BY-SA. Puteți face acest lucru prin conectarea la
<a href="https://www.openstreetmap.org/copyright"> această pagină de copyright</a>.
Alternativ, și ca o cerință dacă distribuim OSM într-un
formularul de date, puteți numi și să vă conectați direct la licența (licențele). Acolo unde legăturile nu sunt posibile (de exemplu lucrări tipărite), vă sugerăm să direcționați cititorii dvs. la openstreetmap.org (probabil prin extinderea "OpenStreetMap" la această adresă completă), la opendatacommons.org, și dacă este cazul, la creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Pentru o hartă electronică care poate fi răsfoită, creditul ar trebui să apară în colțul hărții.
De exemplu:
attribution_example:
вы должны распространять результат только по такой же лицензии. Полный <a
href="https://opendatacommons.org/licenses/odbl/1.0/">юридический текст
лицензии</a> разъясняет ваши права и обязанности.
- intro_3_html: Изготовленные нами изображения карты, также как и наша документация
+ intro_3_1_html: Изготовленные нами изображения карты, также как и наша документация
распространяются по лицензии <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
credit_title_html: Как сослаться на OpenStreetMap
credit_1_html: Мы требуем, чтобы вы указывали «© Участники OpenStreetMap».
- credit_2_html: Вы должны также ясно обозначить, что по лицензии Open Database
+ credit_2_1_html: Вы должны также ясно обозначить, что по лицензии Open Database
License распространяется база геоданных, в то время как готовые изображения
карты лицензированы под CC BY-SA. Вы можете сделать это, разместив ссылку
на <a href="https://www.openstreetmap.org/copyright">эту страницу</a>. Если
мы рассчитываем, что вы направите читателей на openstreetmap.org (обозначив
именно адрес сайта вместо только лишь названия проекта, 'OpenStreetMap'),
на opendatacommons.org, и, при необходимости, на creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
В случае электронной карты с прокруткой, ссылка должна всегда находиться в углу окна просмотра карты.
Например:
attribution_example:
intro_2_html: |-
Sî lìbbiru di cupiari, diffùnniri, trasmèttiri e adattari li nostri dati, fintantu chi l'attribbuisci a OpenStreetMap e ê sò cuntribbutura. Si canci li dati o l'adòpiri comu puntu di partenza, poi distribbuiri lu travagghiu risurtanti sulamenti sutta â stissa licenza. Lu <a href="http://opendatacommons.org/licenses/odbl/1.0/">còdici ligali
code</a> cumpletu spiega quali sunnu li tò dritti e li tò rispunzabbilità.
- intro_3_html: |-
+ intro_3_1_html: |-
La cartugrafìa ntê mattunelli dâ nostra cartina, e la nostra ducumintazzioni, sunnu sutta â licenza <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
credit_title_html: Comu s'attribbuisci a OpenStreetMap
credit_1_html: Addumannamu chi s'usa l'attribbuzzioni «© li cuntribbutura
d'OpenStreetMap».
- credit_2_html: "S'havi a rènniri chiaru ca li dati sunnu misi a dispusizzioni
+ credit_2_1_html: "S'havi a rènniri chiaru ca li dati sunnu misi a dispusizzioni
sutta dâ Open\nDatabase License, e si s’adòpiranu li mattunelli dâ nostra
cartina, chi la cartugrafìa è sutta dâ licenza CC BY-SA. Sta cosa si pò
fari mittennu nu culligamentu a \n<a href=\"http://www.openstreetmap.org/copyright\">sta
li littura direttamenti unni openstreetmap.org (macari espannennu \n‘OpenStreetMap’
a stu nnirizzu cumpletu), unni opendatacommons.org, e, quann'è oppurtunu,
unni\n creativecommons.org."
- credit_3_html: |-
+ credit_4_html: |-
Nta na cartina elittrònica navigàbbili, l’attribbuzzioni avissi a spuntari nta l'àngulu dâ cartina.
P'esempiu:
attribution_example:
mey distribute the result anly unner the same licence. The
full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
code</a> explains yer richts an responsibilities.
- intro_3_html: |-
+ intro_3_1_html: |-
The cairtografie in oor cairt tiles, an oor documentation, are
licensed unner the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
credit_1_html: |-
We require that ye uise the credit “© OpenStreetMap
contributors”.
- credit_2_html: |-
+ credit_2_1_html: |-
Ye must an aa mak it clear that the data is available unner the Open
Database License, an if uisin oor cairt tiles, that the cairtografie is
licensed as CC BY-SA. Ye mey dae this bi airtin tae
direct yer readers tae openstreetmap.org (perhaps bi expandin
'OpenStreetMap' tae this full address), tae opendatacommons.org, an
if relevant, to creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
For a brousable electronic cairt, the credit should appear in the corner o the cairt.
For example:
attribution_example:
musíte výsledné dielo šíriť pod rovnakou licenciou. Vaše práva a povinnosti
sú vysvetlené v <a href="http://opendatacommons.org/licenses/odbl/">plnom
znení licenčnej zmluvy</a>.'
- intro_3_html: Kartografia v našich mapových podkladoch a naša dokumentácia
+ intro_3_1_html: Kartografia v našich mapových podkladoch a naša dokumentácia
je zverejnená pod licenciou <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Uveďte autora – Zachovajte licenciu 2.0</a> (CC-BY-SA).
credit_title_html: Ako uvádzať OpenStreetMap
credit_1_html: Vyžadujeme uviesť „<em>© Prispievatelia OpenStreetMap</em>“.
- credit_2_html: |-
+ credit_2_1_html: |-
Musíte tiež zdôrazniť, že údaje sú dostupné pod licenciou Open Database Licence, a pokiaľ používate naše mapové dlaždice, že ich kartografický obsah je licencovaný pod CC-BY-SA. Uvedené môžete splniť hypertextovým odkazom na <a href="http://www.openstreetmap.org/copyright">tuto stránku</a>.
Alternatívne môžete (a ak šírite OSM v dátovej forme, tak musíte) vymenovať licencie a uviesť hypertextové odkazy priamo na ne. Pri médiách, kde hypertextové odkazy nie sú možné (napr. tlačené diela), odporúčame, aby ste nasmerovali čitateľov na openstreetmap.org (napríklad rozšírením slova 'OpenStreetMap' na túto plnú adresu), na opendatacommons.org a na creativecommons.org (ak je to relevenantné).
- credit_3_html: |-
+ credit_4_html: |-
V prípade interaktívnej elektronickej mapy by autorstvo malo byť uvedené v rohu mapy.
Napríklad:
attribution_example:
spremenite ali obogatite jih lahko\nrazširjate le pod enakimi licenčnimi
pogoji. Polno\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">besedilo\nlicence</a>
opisuje vaše pravice in obveznosti."
- intro_3_html: Kartografija v obliki slik zemljevida in naša dokumentacija
+ intro_3_1_html: Kartografija v obliki slik zemljevida in naša dokumentacija
sta na voljo pod pogoji <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.sl">Priznanje
avtorstva-Deljenje pod enakimi pogoji 2.0</a> license (CC BY-SA).
credit_title_html: Kako pripisati zasluge projektu OpenStreetMap
të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\nmund
të shpërndani rezultatet nën licencën e njëjtë. Licenca e plotë <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n
\ code</a> shpjegon të drejtat dhe përgjegjësitë tuaja."
- intro_3_html: |-
+ intro_3_1_html: |-
Hartografimi i pjesëve tona, dhe dokumantacioni ynë, janë të licencuara nën licensë të <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a>(CC BY-SA).
credit_title_html: Si të citoni OpenStreetMap
credit_1_html: Ne kërkojmë që ju të përdorni kreditet e “© OpenStreetMap
contributors”.
- credit_2_html: " Ku është e mundur, OpenStreetMap duhet të hyperlinked to
- <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n
+ credit_2_1_html: " Ku është e mundur, OpenStreetMap duhet të hyperlinked
+
to <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n
\ dhe CC BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.
Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n
\ letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n www.openstreetmap.org
Openstritmapa, CC BY-SA”. Ako koristite samo podatke mapa,
navedite “Kartografski podaci © Doprinosioci Openstritmapa,
CC BY-SA”.
- credit_2_html: |2-
+ credit_2_1_html: |2-
Gde je moguće, Openstritmap bi trebalo da vodi do adrese <a
href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
i CC BY-SA do <a
можете их делити само под истом лиценцом.
Цео <a href="https://opendatacommons.org/licenses/odbl/1.0/">
текст уговора</a> објашњава вам ваша права и одговорности.
- intro_3_html: |-
+ intro_3_1_html: |-
Картографија у нашим пољима мапа и документацији
нуди се под лиценцом <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.mk">Кријејтив комонс Ауторство-Делити под истим условима 2.0</a> (CC BY-SA).
credit_title_html: Како да именујете OpenStreetMap
credit_1_html: |-
Захтевамо да као носиоце ауторских права наведете “© ОпенСтитМап
сарадници”.
- credit_2_html: |-
+ credit_2_1_html: |-
Такође неопходно је недвосмислено навести да су подаци доступни под лиценцом отворене базе података "Open
Database License", и ако користите наше плочице за карту, да је картографија лиценцирана под CC BY-SA. Ово можете учинити упућивањем на
<a href="https://www.openstreetmap.org/copyright">ову страницу за ауторска права</a>.
Друга могућност је да ако ширите ОСМ у облику податка, лиценце можете навести и повезати директно. У медијима у којима повезивање није могуће (нпр. штампани материјали), предлажемо да упутите читаоце на openstreetmap.org (можда проширујући
'OpenStreetMap' на пуну адресу), на opendatacommons.org, и ако је потребно, на creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
Ради прегледније електронске мапе, приписивање би требало да се прикаже у углу мапе.
На пример:
attribution_example:
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_html: |-
+ 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).
credit_1_html: |-
Vi kräver att din källhänvisning består av “© OpenStreetMaps
bidragsgivare”.
- credit_2_html: |-
+ credit_2_1_html: |-
Du måste också göra klart att datan är tillgänglig under licensen
Open Database License, och om du använder våra kartrutor, att kartografin är
tillgänglig under licensen CC BY-SA. Du kan göra detta genom att länka till
och länka direkt till licenserna. I media där länkar ej är möjliga
(t.ex. tryckt material), förslår vi att du hänvisar dina läsare till openstreetmap.org
(förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.
Till exempel:
attribution_example:
# Author: Ariesanywhere
# Author: B20180
# Author: Karit
+# Author: Korrawit
# Author: Pon44695
# Author: Ruila
# Author: TMo3289
copyright_html: |2-
<span>©ผู้มีส่วนร่วม </span>OpenStreetMap<br>
- used_by_html: '%{name} - ข้อมูลแผนที่ซึ่งขับเคลื่อนเว็บไซต์ แอปพลิเคชั่นมือถือ
- และอุปกรณ์นำทางมากมายรอบตัวคุณ'
+ used_by_html: '%{name} ให้ข้อมูลแผนที่แก่เว็บไซต์ แอปพลิเคชั่นมือถือ และอุปกรณ์นับพัน'
lede_text: OpenStreetMap เป็นโครงการซึ่งสร้างสรรค์ขึ้นจากชุมชนของผู้ใช้และผู้สนใจ
ที่ได้ทำการสำรวจ ปรับปรุง แบ่งปันข้อมูลแผนที่ถนน ทางหลวง ทางเดินป่า, รวมถึงสถานที่ที่น่าสนใจอย่าง
ร้านกาแฟ สถานีรถไฟ และอื่นๆ อีกมากมาย จากทั่วทุกมุมโลก
ท่านสามารถ\nแจกจ่ายผลลัพธ์ที่ได้ภายใต้สัญญาอนุญาตเดียวกันเท่านั้น โปรดดู
<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">ข้อกำหนดทางกฎหมาย</a>
\nซึ่งจะอธิบายสิทธิและหน้าที่ที่ท่านพึงมี"
- intro_3_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_html: |-
+ credit_2_1_html: |-
ท่านจะต้องระบุให้ชัดเจนเจาะจงว่าข้อมูลอนุญาตให้ใช้ตามสัญญาอนุญาต Open
Database License และถ้ามีการนำรูปแผนที่ไปใช้ รูปนั้นอนุญาตให้ใช้ตามสัญญาอนุญาต
CC BY-SA ในการนี้อาจจะลิงก์ไปยังหน้า
นอกจากนี้ (จำเป็นหากท่านจ่ายแจกข้อมูล OSM) ท่านสามารถลิงก์ไปยังสัญญาอนุญาตโดยตรง
ในสื่ออย่างอื่น อาทิ สิ่งพิมพ์ ซึ่งไม่สามารถลิงก์ข้อมูลได้แนะนำให้ระบุเพียง openstreetmap.org
และ/หรือ opendatacommons.org และ/หรือ creativecommons.org
- credit_3_html: สำหรับแผนที่อิเล็กทรอนิกส์ที่ค้นได้ รายชื่อผู้มีส่วนร่วมควรปรากฏที่มุมของแผนที่
+ credit_4_html: สำหรับแผนที่อิเล็กทรอนิกส์ที่ค้นได้ รายชื่อผู้มีส่วนร่วมควรปรากฏที่มุมของแผนที่
attribution_example:
alt: ตัวอย่างการอ้างอิง OpenStreetMap บนหน้าเว็บ
title: ตัวอย่างการอ้างอิง
dato, maaari\nmong ipamahagi ang resulta sa ilalim lamang ng katulad na
lisensiya. Ipinapaliwanag \nng buong <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">kodigong
pambatas</a> \nang mga karapatan at mga pananagutan mo."
- intro_3_html: |-
+ intro_3_1_html: |-
Ang kartograpya sa aming mga tile na mapa at ang aming dokumentasyon ay lisensyado sa ilalim ng <a
href="http://creativecommons.org/licenses/by-sa/2.0/">lisensiyang Creative
Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
credit_title_html: Paano babanggitin ang OpenStreetMap
credit_1_html: "Kinakailangan namin na gamitin ang kredito na “©
mga tagapag-ambag ng \nOpenStreetMap”."
- credit_2_html: "Kung saan maaari, dapat na ikawing nang labis (lagyan ng hyperlink)
- ang OpenStreetMap\nna papunta sa <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nat
+ credit_2_1_html: "Kung saan maaari, dapat na ikawing nang labis (lagyan ng
+
hyperlink) ang OpenStreetMap\nna papunta sa <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nat
CC BY-SA sa <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.
Kung\ngumagamit ka ng isang midyum o kasangkapan kung saan hindi maaari
ang mga kawing (iyong isang\nakdang nakalimbag), iminumungkahi namin na
disclaimer:
intro: 'Raporunuzu site moderatörlerine göndermeden önce, lütfen şunlardan
emin olun:'
- not_just_mistake: Sorunun sadece bir hata olmadığına eminseniz
+ not_just_mistake: Sorunun yalnızca bir hata olmadığından eminsiniz
unable_to_fix: Sorunu kendiniz veya diğer topluluk üyelerinin yardımıyla düzeltemiyorsanız
resolve_with_user: Sorunu ilgili kullanıcıyla çözmeyi denediyseniz
categories:
about:
next: İleri
copyright_html: <span>©</span>OpenStreetMap<br>katkıda bulunanları
- used_by_html: '%{name}, binlerce web sitesinde, mobil uygulamalarda ve donanım
- cihazlarında verileri eşleştirir.'
+ used_by_html: '%{name} binlerce web sitesi, mobil uygulama ve donanım cihazı
+ için harita verileri sağlar'
lede_text: OpenStreetMap; tüm dünyada yollar, yollar, kafeler, tren istasyonları
ve daha pek çok şey hakkında veri sağlayan ve koruyan bir haritalar topluluğu
tarafından oluşturulmuştur.
Verilerimizi değiştirir veya geliştirirseniz
sonucu sadece aynı lisans altında dağıtabilirsiniz.
Tüm <a href="https://opendatacommons.org/licenses/odbl/1.0/">yasal kod</a>, haklarınızı ve sorumluluklarınızı açıklamaktadır.
- intro_3_html: |-
- Haritalarımızdaki haritacılık ve belgelerimiz, <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Attribution-ShareAlike 2.0</a> lisansı (CC BY-SA) ile yetkilendirilmiştir.
+ intro_3_1_html: |-
+ Belgelerimiz
+ <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.tr">Creative Commons Atıf-BenzerPaylaşım 2.0</a>
+ lisansı (CC BY-SA 2.0) ile lisanslanmıştır.
credit_title_html: OpenStreetMap'e nasıl atıfta bulunulur
credit_1_html: |-
Atıf için şu şekilde yazmak gerekir: “© OpenStreetMap
katılımcıları”.
- credit_2_html: |-
+ credit_2_1_html: |-
Ayrıca, verilerin Açık Veritabanı Lisansı (Open Database License) altında ve haritalarımızdaki karoları kullanıyorsanız haritacılığımızın CC BY-SA ile lisanslandırıldığını açıkça belirtmelisiniz. Bunu, <a href="https://www.openstreetmap.org/copyright">bu telif hakkı sayfasına</a> bağlantı vererek gerçekleştirebilirsiniz.
Alternatif ve bir gereksinim olarak OSM'yi bir veri formunda dağıtıyorsanız direkt olarak lisansları adlandırabilir
veya doğrudan lisanslara bağlayabilirsiniz. Bağlantıların
okuyucularınızı openstreetmap.org'a, opendatacommons.org'a
ve varsa creativecommons.org'a yönlendirmenizi
öneriyoruz.
- credit_3_html: |-
+ credit_3_1_html: "Harita “standart stili” www.openstreetmap.org
+ \nadresindeki OpenStreetMap Vakfı tarafından\nOpen Database Lisansı altında
+ OpenStreetMap verileri kullanılarak Üretilmiş Bir Çalışmadır. Bu döşemeleri
+ kullanıyorsanız, lütfen\naşağıdaki ilişkilendirmeyi kullanın:\n“OpenStreetMap
+ ve OpenStreetMap Vakfı'dan temel harita ve veriler”."
+ credit_4_html: |-
Bir gezinebilir elektronik haritanın sağ alt köşesinde atfın görünmesi lazım.
Örnegin;
attribution_example:
bir süre veriniz.
flash: '%{name} kullanıcısına engel oluşturuldu.'
update:
- only_creator_can_edit: Sadece bu engeli oluşturan moderatör düzenleyebilir.
+ only_creator_can_edit: Yalnızca bu engeli oluşturan moderatör düzenleyebilir.
success: Engelleme güncellendi.
index:
title: Kullanıcı engelleri
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'
- id: iD
+ id: Kimlik
creator: Oluşturan
description: Açıklama
created_at: Oluşturulma tarihi
in_language_title: Записи щоденника мовою %{language}
new: Нова нотатка у щоденнику
new_title: Зробити новий запис у моєму щоденнику
+ my_diary: Мій щоденник
no_entries: У щоденнику немає записів
recent_entries: Останні записи в щоденнику
older_entries: Старіші записи
змінюєте наші дані чи створюєте на їх основі свої, ви повинні розповсюджувати
результати під такою ж Ліцензією. Повний <a href="http://opendatacommons.org/licenses/odbl/1.0/">чинний
текст</a> Ліцензії пояснює ваші права та обов’язки.
- intro_3_html: "Картографія в наших тайлах мап, а також документація поширюються
- на умовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцензії
+ intro_3_1_html: "Наша документація поширюється на умовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцензії
Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
credit_title_html: Як вказати посилання на OpenStreetMap
credit_1_html: Ми вимагаємо, щоб ви зазначали “© OpenStreetMap
contributors”.
- credit_2_html: Ви повинні також чітко вказувати, що дані доступні на умовах
- ліцензії Open Database License, а у разі, коли ви використовуєте тайли
- мап із нашого сервера, на них поширюються умови CC-BY-SA. Ви можете зробити
- це, навівши посилання на <a href="http://www.openstreetmap.org/copyright">цю
- сторінку з роз’ясненням ліцензійних вимог</a>. Або ж, для виконання наших
- вимог під час розповсюдження даних OSM, ви можете безпосередньо вказувати
- назву ліцензії(й) та посилання на її(їх) текст. Якщо ви користуєтесь носіями,
- де використання гіпертекстових посилань неможливе (наприклад друковані матеріали),
- ми пропонуємо посилатися безпосередньо на www.openstreetmap.org (або розширено
- "www.openstreetmap.org, OpenStreetMap"), opendatacommons.org, а якщо треба,
- і на creativecommons.org.
- credit_3_html: |-
- Для електронних мап, згадка про джерело даних повинна знаходитись у кутку мапи.
+ credit_2_1_html: Ви повинні також чітко вказувати, що дані доступні на умовах
+ ліцензії Open Database License. Ви можете зробити це, навівши посилання
+ на <a href="http://www.openstreetmap.org/copyright">цю сторінку з роз’ясненням
+ ліцензійних вимог</a>. Або ж, для виконання наших вимог під час розповсюдження
+ даних OSM, ви можете безпосередньо вказувати назву ліцензії(й) та посилання
+ на її(їх) текст. Якщо ви користуєтесь носіями, де використання гіпертекстових
+ посилань неможливе (наприклад друковані матеріали), ми пропонуємо посилатися
+ безпосередньо на www.openstreetmap.org (або розширено "www.openstreetmap.org,
+ OpenStreetMap") та на opendatacommons.org.
+ credit_3_1_html: Тайли мап “Стандартного шару” з www.openstreetmap.org
+ є Виробленим твором (Produced Work) Фундації OpenStreetMap, створеним на
+ основі даних OpenStreetMap на умовах Open Database License. В разі використання
+ цих тайлів, будь ласка, посилайтесь відповідно – “Base map and data
+ from OpenStreetMap and OpenStreetMap Foundation” (“Мапа і дані
+ – OpenStreetMap та Фундація OpenStreetMap”)
+ credit_4_html: |-
+ Для мап, що використовуються в електронному вигляді, посилання на їх джерело повинне знаходитись у кутку мапи.
Наприклад:
attribution_example:
alt: Приклад того, як треба посилатись на OpenStreetMap на веб-сторінці
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_html: "Các hình ảnh bản đồ và tài liệu của chúng tôi được phát hành
+ 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
\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
đóng góp vào OpenStreetMap”.
- credit_2_html: Bạn cũng phải giải thích rõ rằng dữ liệu được phát hành theo
+ credit_2_1_html: Bạn cũng phải giải thích rõ rằng dữ liệu được phát hành theo
Giấy phép Cơ sở dữ liệu Mở, và, nếu bạn đang sử dung các hình ảnh bản đồ
của chúng tôi, rằng các hình ảnh này được phát hành theo giấy phép CC BY-SA.
Bạn có thể thỏa mãn điều này bằng cách đặt liên kết đến <a href="https://www.openstreetmap.org/copyright">trang
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_html: |-
+ 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ụ:
attribution_example:
href="https://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a>（ODbL）授权。
intro_2_html: 只要您表明来源为 OpenStreetMap 及其贡献者，您就可以自由地复制、分发、传送和改编我们的数据。如果您想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表您的作品。完整的<a
href="https://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了您的权利和义务。
- intro_3_html: 我们的地图图块中的绘图数据以及我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享“署名-相同方式共享
+ intro_3_
1_html: 我们的地图图块中的绘图数据以及我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享“署名-相同方式共享
2.0”</a>许可协议授权。
credit_title_html: 如何表明作者是 OpenStreetMap
credit_1_html: 我们需要您署名“© OpenStreetMap 贡献者”。
- credit_2_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图图块，其协议须为 CC-BY-SA。您可以链接<a href="https://www.openstreetmap.org/copyright">此版权页</a>以注明。另外，若您要以数据形式发布
+ credit_2_1_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图图块，其协议须为 CC-BY-SA。您可以链接<a
+ href="https://www.openstreetmap.org/copyright">此版权页</a>以注明。另外，若您要以数据形式发布
OSM，您可以属名并直接链接协议。若某些媒介无法进行链接(如印刷品)，我们建议您引导您的读者至 openstreetmap.org (或 OpenStreetMap
的完整网址)、opendatacommons.org，及可能相关的 creativecommons.org。
- credit_3_html: |-
+ credit_4_html: |-
对于可浏览的电子地图，标记会出现在地图的右下角。
例如：
attribution_example:
intro_2_html: |-
您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為 OpenStreetMap 及其貢獻者。若您在我們的資料上作修改或據之衍生其他資料
，則只可依相同授權條款散佈有關成果。授權的<a href="https://opendatacommons.org/licenses/odbl/1.0/">法律原文</a>詳述您的權責。
- intro_3_html: 我們地圖影像塊的製圖法以及我們的文件，以<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用CC
+ 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_html: 您亦須清晰註明，有關資料可透過開放資料庫授權條款取得。若使用我們的影像塊，則須註明其製圖法是按 CC-BY-SA 授權。您可以透過連結至<a
- href="https://www.openstreetmap.org/copyright">此版權頁</a>以作註明。您亦可以指明並直接連結至授權內容
+ credit_2_1_html: 您亦須清晰註明，有關資料可透過開放資料庫授權條款取得。若使用我們的影像塊，則須註明其製圖法是按 CC-BY-SA
+ 授權。您可以透過連結至<a href="https://www.openstreetmap.org/copyright">此版權頁</a>以作註明。您亦可以指明並直接連結至授權內容
(但若您要以資料形式發布 OSM，這是必要條件) 。在無法作出連結的媒體 (如印刷品) ，我們建議你引導你的讀者至 openstreetmap.org
(如註明 OpenStreetMap 的完整網址) 、opendatacommons.org，及 (如相關的話) creativecommons.org。
- credit_3_html: |-
+ credit_3_1_html: |-
+ 在 www.openstreetmap.org 上的“標準樣式”地圖圖塊是由 OpenStreetMap 基金會使用基於開放資料庫授權的 OpenStreetMap 資料來完成。如果您有使用這些圖塊，請使用以下署名：
+ “出自 OpenStreetMap 與 OpenStreetMap 基金會的底圖與資料”。
+ credit_4_html: |-
對於可瀏覽的電子地圖，標明出處的文字應放在地圖的一角。
例如：
attribution_example:
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 }
def self.check(hash, salt, candidate)
if salt.nil?
candidate = Digest::MD5.hexdigest(candidate)
- elsif salt.match?(/!/)
+ elsif salt.include?("!")
algorithm, iterations, salt = salt.split("!")
size = Base64.strict_decode64(hash).length
candidate = self.hash(candidate, salt, iterations.to_i, size, algorithm)
def self.upgrade?(hash, salt)
if salt.nil?
return true
- elsif salt.match?(/!/)
+ elsif salt.include?("!")
algorithm, iterations, salt = salt.split("!")
return true if Base64.strict_decode64(salt).length != SALT_BYTE_SIZE
return true if Base64.strict_decode64(hash).length != HASH_BYTE_SIZE
"private": true,
"dependencies": {},
"devDependencies": {
- "eslint": "^6.8.0"
+ "eslint": "^7.3.1"
}
}
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
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
-acorn@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
- integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+acorn@^7.2.0:
+ version "7.3.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
+ integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
ajv@^6.10.0, ajv@^6.10.2:
version "6.12.0"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
-ansi-escapes@^4.2.1:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
- integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
- dependencies:
- type-fest "^0.11.0"
+ansi-colors@^3.2.1:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+ integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
ansi-regex@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-chalk@^2.0.0, chalk@^2.1.0:
+chalk@^2.0.0:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
- integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+chalk@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+ integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
dependencies:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
-chardet@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
- integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-cli-cursor@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
- integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
- dependencies:
- restore-cursor "^3.1.0"
-
-cli-width@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
- integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-cross-spawn@^6.0.5:
- version "6.0.5"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
- integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+cross-spawn@^7.0.2:
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+ integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
dependencies:
- nice-try "^1.0.4"
- path-key "^2.0.1"
- semver "^5.5.0"
- shebang-command "^1.2.0"
- which "^1.2.9"
+ path-key "^3.1.0"
+ shebang-command "^2.0.0"
+ which "^2.0.1"
debug@^4.0.1:
version "4.1.1"
dependencies:
ms "^2.1.1"
-deep-is@~0.1.3:
+deep-is@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-emoji-regex@^8.0.0:
- version "8.0.0"
- resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
- integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+enquirer@^2.3.5:
+ version "2.3.5"
+ resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.5.tgz#3ab2b838df0a9d8ab9e7dff235b0e8712ef92381"
+ integrity sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==
+ dependencies:
+ ansi-colors "^3.2.1"
escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-eslint-scope@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
- integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+eslint-scope@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
+ integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
dependencies:
esrecurse "^4.1.0"
estraverse "^4.1.1"
-eslint-utils@^1.4.3:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
- integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-utils@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+ integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
dependencies:
eslint-visitor-keys "^1.1.0"
-eslint-visitor-keys@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
- integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.2.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+ integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-eslint@^6.8.0:
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
- integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+eslint@^7.3.1:
+ version "7.4.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.4.0.tgz#4e35a2697e6c1972f9d6ef2b690ad319f80f206f"
+ integrity sha512-gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g==
dependencies:
"@babel/code-frame" "^7.0.0"
ajv "^6.10.0"
- chalk "^2.1.0"
- cross-spawn "^6.0.5"
+ chalk "^4.0.0"
+ cross-spawn "^7.0.2"
debug "^4.0.1"
doctrine "^3.0.0"
- eslint-scope "^5.0.0"
- eslint-utils "^1.4.3"
- eslint-visitor-keys "^1.1.0"
- espree "^6.1.2"
- esquery "^1.0.1"
+ enquirer "^2.3.5"
+ eslint-scope "^5.1.0"
+ eslint-utils "^2.0.0"
+ eslint-visitor-keys "^1.2.0"
+ espree "^7.1.0"
+ esquery "^1.2.0"
esutils "^2.0.2"
file-entry-cache "^5.0.1"
functional-red-black-tree "^1.0.1"
ignore "^4.0.6"
import-fresh "^3.0.0"
imurmurhash "^0.1.4"
- inquirer "^7.0.0"
is-glob "^4.0.0"
js-yaml "^3.13.1"
json-stable-stringify-without-jsonify "^1.0.1"
- levn "^0.3.0"
+ levn "^0.4.1"
lodash "^4.17.14"
minimatch "^3.0.4"
- mkdirp "^0.5.1"
natural-compare "^1.4.0"
- optionator "^0.8.3"
+ optionator "^0.9.1"
progress "^2.0.0"
- regexpp "^2.0.1"
- semver "^6.1.2"
- strip-ansi "^5.2.0"
- strip-json-comments "^3.0.1"
+ regexpp "^3.1.0"
+ semver "^7.2.1"
+ strip-ansi "^6.0.0"
+ strip-json-comments "^3.1.0"
table "^5.2.3"
text-table "^0.2.0"
v8-compile-cache "^2.0.3"
-espree@^6.1.2:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
- integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+espree@^7.1.0:
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-7.1.0.tgz#a9c7f18a752056735bf1ba14cb1b70adc3a5ce1c"
+ integrity sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==
dependencies:
- acorn "^7.1.1"
+ acorn "^7.2.0"
acorn-jsx "^5.2.0"
- eslint-visitor-keys "^1.1.0"
+ eslint-visitor-keys "^1.2.0"
esprima@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-esquery@^1.0.1:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48"
- integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==
+esquery@^1.2.0:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+ integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
dependencies:
- estraverse "^4.0.0"
+ estraverse "^5.1.0"
esrecurse@^4.1.0:
version "4.2.1"
dependencies:
estraverse "^4.1.0"
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.0, estraverse@^4.1.1:
version "4.3.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+estraverse@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+ integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
esutils@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-external-editor@^3.0.3:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
- integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
- dependencies:
- chardet "^0.7.0"
- iconv-lite "^0.4.24"
- tmp "^0.0.33"
-
fast-deep-equal@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-figures@^3.0.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
- integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
- dependencies:
- escape-string-regexp "^1.0.5"
-
file-entry-cache@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-iconv-lite@^0.4.24:
- version "0.4.24"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
- integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
- dependencies:
- safer-buffer ">= 2.1.2 < 3"
-
ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-inquirer@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
- integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
- dependencies:
- ansi-escapes "^4.2.1"
- chalk "^3.0.0"
- cli-cursor "^3.1.0"
- cli-width "^2.0.0"
- external-editor "^3.0.3"
- figures "^3.0.0"
- lodash "^4.17.15"
- mute-stream "0.0.8"
- run-async "^2.4.0"
- rxjs "^6.5.3"
- string-width "^4.1.0"
- strip-ansi "^6.0.0"
- through "^2.3.6"
-
is-extglob@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-is-fullwidth-code-point@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
- integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
is-glob@^4.0.0, is-glob@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
dependencies:
is-extglob "^2.1.1"
-is-promise@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
- integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
isexe@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-levn@^0.3.0, levn@~0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
- integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+levn@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+ integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
dependencies:
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
+ prelude-ls "^1.2.1"
+ type-check "~0.4.0"
-lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.17.14:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-mimic-fn@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
- integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-mute-stream@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
- integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-nice-try@^1.0.4:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
- integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
once@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
dependencies:
wrappy "1"
-onetime@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
- integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
- dependencies:
- mimic-fn "^2.1.0"
-
-optionator@^0.8.3:
- version "0.8.3"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
- integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+optionator@^0.9.1:
+ version "0.9.1"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+ integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
dependencies:
- deep-is "~0.1.3"
- fast-levenshtein "~2.0.6"
- levn "~0.3.0"
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
- word-wrap "~1.2.3"
-
-os-tmpdir@~1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
- integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+ deep-is "^0.1.3"
+ fast-levenshtein "^2.0.6"
+ levn "^0.4.1"
+ prelude-ls "^1.2.1"
+ type-check "^0.4.0"
+ word-wrap "^1.2.3"
parent-module@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-path-key@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
- integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+path-key@^3.1.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+ integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-prelude-ls@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
- integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+prelude-ls@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+ integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
progress@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-regexpp@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
- integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+regexpp@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+ integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
resolve-from@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-restore-cursor@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
- integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
- dependencies:
- onetime "^5.1.0"
- signal-exit "^3.0.2"
-
rimraf@2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
dependencies:
glob "^7.1.3"
-run-async@^2.4.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
- integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
- dependencies:
- is-promise "^2.1.0"
-
-rxjs@^6.5.3:
- version "6.5.4"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
- integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
- dependencies:
- tslib "^1.9.0"
+semver@^7.2.1:
+ version "7.3.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+ integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-"safer-buffer@>= 2.1.2 < 3":
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
- integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver@^5.5.0:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^6.1.2:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-shebang-command@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
- integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+shebang-command@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+ integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
dependencies:
- shebang-regex "^1.0.0"
+ shebang-regex "^3.0.0"
-shebang-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
- integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-signal-exit@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
- integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+shebang-regex@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+ integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
slice-ansi@^2.1.0:
version "2.1.0"
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
-string-width@^4.1.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
- integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
- dependencies:
- emoji-regex "^8.0.0"
- is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.0"
-
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.1.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
dependencies:
ansi-regex "^5.0.0"
-strip-json-comments@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
- integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+strip-json-comments@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
+ integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-through@^2.3.6:
- version "2.3.8"
- resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
- integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-tmp@^0.0.33:
- version "0.0.33"
- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
- integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+type-check@^0.4.0, type-check@~0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+ integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
dependencies:
- os-tmpdir "~1.0.2"
-
-tslib@^1.9.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
- integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
-
-type-check@~0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
- integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
- dependencies:
- prelude-ls "~1.1.2"
-
-type-fest@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
- integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+ prelude-ls "^1.2.1"
type-fest@^0.8.1:
version "0.8.1"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
-which@^1.2.9:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
- integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+which@^2.0.1:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+ integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
dependencies:
isexe "^2.0.0"
-word-wrap@~1.2.3:
+word-wrap@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
projects / rails.git / commitdiff
