with:
ruby-version: ${{ env.ruby }}
- name: Cache gems
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
with:
ruby-version: ${{ env.ruby }}
- name: Cache gems
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
with:
ruby-version: ${{ env.ruby }}
- name: Cache gems
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
restore-keys: |
bundle-${{ env.os }}-${{ env.ruby }}-
- name: Cache node modules
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: node_modules
key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
with:
ruby-version: ${{ env.ruby }}
- name: Cache gems
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
with:
ruby-version: ${{ matrix.ruby }}
- name: Cache gems
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: vendor/bundle
key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }}
restore-keys: |
bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-
- name: Cache node modules
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: node_modules
key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}
color: $blue;
}
+/* Rules for borders */
+/* These add additional colours to those provided by bootstrap */
+.border-grey {
+ border-color: $grey !important;
+}
+
+.border-lightgrey {
+ border-color: $lightgrey !important;
+}
+
/* Rules for the header */
#menu-icon {
}
}
- img.user_thumbnail_tiny {
- border: 0;
- border-radius: 3px;
- }
-
#inboxanchor {
display: inline-block;
height: 25px;
top: 20px;
}
}
-
- .icon.close {
- float: right;
- cursor: pointer;
- }
-
- .flash {
- padding: 15px;
-
- picture {
- margin-right: -25px;
- }
-
- div.message {
- margin-left: 30px;
- }
- }
}
.overlay-sidebar #sidebar {
border-bottom: none;
}
- .paginate {
- float: right;
- padding: 1px 6px;
- border: 1px solid $lightgrey;
- border-radius: 3px;
- }
-
- .browse-field {
- margin-bottom: 10px;
-
- h4 {
- padding: 5px 0 5px 10px;
- font-size: 12px;
- border: 1px solid $grey;
- border-radius: 4px 4px 0 0;
- background-color: $offwhite;
- }
-
- p {
- padding: 7px 10px;
- font-size: 12px;
- background-color: #FFF;
- border: 1px solid $grey;
- border-top: 0;
- border-radius: 0 0 4px 4px;
- }
- }
-
.browse-tag-list {
background-color: $offwhite;
- border: 1px solid $grey;
- border-radius: 3px;
table-layout: fixed;
border-collapse: separate;
border-spacing: 0;
}
}
- .comments-header {
- float: left;
- }
-
- .subscribe-buttons {
- float: left;
- margin: 0 10px;
- min-width: 80px;
- }
-
.subscribe-buttons input {
font-size: 90%;
line-height: 15px;
.export_boxy {
background: $lightgrey;
- border: 1px solid $grey;
- border-radius: 3px;
#maxlat { margin-top: -1px; }
#minlon {
.content_map {
height: 200px;
- border: 1px solid $grey;
margin-bottom: $lineheight;
}
padding-bottom: $lineheight/2;
border-top: 1px solid $grey;
- &:first-of-type {
- margin-top: $lineheight/2;
- }
-
&.deleted {
background-color: #fee;
}
-
- .post_heading {
- margin-bottom: $lineheight;
-
- h2 {
- margin-top: 0;
- margin-bottom: $lineheight/2;
- }
- }
-
- img.user_thumbnail {
- float: left;
- }
}
/* Rules for the diary entry page */
.diary_entries {
#map {
height: 400px;
- border: 1px solid $grey;
display: none;
margin-bottom: $lineheight;
}
}
}
-.diary_entries-show img.user_thumbnail {
- float: left;
-}
-
/* Rules for the log in page */
#login_auth_buttons {
.users-terms {
.legale {
- border: 1px solid $grey;
padding: $lineheight;
margin-bottom: $lineheight;
overflow: auto;
/* Rules for "flash" notice boxes shown at the top of the content area */
.flash {
- padding: $lineheight;
-
&.error {
background-color: #ff7070;
}
img.user_image {
max-width: 100px;
max-height: 100px;
- border: 1px solid $grey;
}
img.user_thumbnail {
max-width: 50px;
max-height: 50px;
- border: 1px solid $grey;
}
img.user_thumbnail_tiny {
height: auto;
max-width: 25px;
max-height: 25px;
- border: 1px solid $grey;
}
/* Rules for geo microformats */
$headerHeight: 55px;
$sidebarWidth: 350px;
$keyline: 1px solid $lightgrey;
-$border-radius: 3px;
$list-highlight: #FFFFC0;
$border: 1px solid $grey;
end
def comments
+ @title = t ".title", :user => @user.display_name
+
conditions = { :user_id => @user }
conditions[:visible] = true unless can? :unhidecomment, DiaryEntry
# User images
def user_image(user, options = {})
- options[:class] ||= "user_image"
+ options[:class] ||= "user_image border border-grey"
options[:alt] ||= ""
if user.image_use_gravatar
end
def user_thumbnail(user, options = {})
- options[:class] ||= "user_thumbnail"
+ options[:class] ||= "user_thumbnail border border-grey"
options[:alt] ||= ""
if user.image_use_gravatar
end
def user_thumbnail_tiny(user, options = {})
- options[:class] ||= "user_thumbnail_tiny"
+ options[:class] ||= "user_thumbnail_tiny border border-grey"
options[:alt] ||= ""
if user.image_use_gravatar
-<% if pages.page_count > 1 %>
- <span class="paginate">
- <%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %>
- </span>
-<% end %>
+<div class="row">
+ <div class="col">
+ <h4><%= heading %></h4>
+ </div>
+ <% if pages.page_count > 1 %>
+ <div class="col-auto">
+ <h4>
+ <span class="border border-lightgrey rounded p-1">
+ <%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %>
+ </span>
+ </h4>
+ </div>
+ <% end %>
+</div>
<% unless tag_details.empty? %>
<h4><%= t ".tags" %></h4>
- <table class='browse-tag-list'>
+ <table class='browse-tag-list border border-grey rounded'>
<%= render :partial => "tag", :collection => tag_details.sort %>
</table>
<% end %>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
- <h4 class="comments-header"><%= t(".discussion") %></h4>
-
- <% if current_user %>
- <div class="buttons clearfix subscribe-buttons">
- <form action="#">
- <% if @changeset.subscribers.exists?(current_user.id) %>
- <input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
- <% else %>
- <input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
- <% end %>
- </form>
+ <div class="row">
+ <div class="col">
+ <h4><%= t(".discussion") %></h4>
</div>
- <% end %>
- <div class="clearfix"></div>
+ <% if current_user %>
+ <div class="col-auto">
+ <div class="subscribe-buttons">
+ <form action="#">
+ <% if @changeset.subscribers.exists?(current_user.id) %>
+ <input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
+ <% else %>
+ <input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
+ <% end %>
+ </form>
+ </div>
+ </div>
+ <% end %>
+ </div>
<% if @comments.length > 0 %>
<div class='changeset-comments'>
<div class="form-group">
<textarea class="form-control" name="text" cols="40" rows="5"></textarea>
</div>
- <div class="buttons clearfix">
+ <div>
<input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />
</div>
</form>
<% end %>
<% unless @ways.empty? %>
- <h4>
- <%= type_and_paginated_count("way", @way_pages) %>
- <%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %>
- </h4>
+ <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :pages => @way_pages, :page_param => "way_page" } %>
<ul class="list-unstyled">
<% @ways.each do |way| %>
<li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
<% end %>
<% unless @relations.empty? %>
- <h4>
- <%= type_and_paginated_count("relation", @relation_pages) %>
- <%= render :partial => "paging_nav", :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
- </h4>
+ <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :pages => @relation_pages, :page_param => "relation_page" } %>
<ul class="list-unstyled">
<% @relations.each do |relation| %>
<li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
<% end %>
<% unless @nodes.empty? %>
- <h4>
- <%= type_and_paginated_count("node", @node_pages) %>
- <%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %>
- </h4>
+ <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_page" } %>
<ul class="list-unstyled">
<% @nodes.each do |node| %>
<li><%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>
<% if current_user and @user.id == current_user.id %>
<div class="col-md order-md-last">
<% if @user.home_lat.nil? or @user.home_lon.nil? %>
- <div id="map" class="content_map">
+ <div id="map" class="content_map border border-grey">
<p class="m-3"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
</div>
<% else %>
: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 } %>
+ <%= tag.div "", :id => "map", :class => "content_map border border-grey rounded", :data => { :user => user_data } %>
<% end %>
<% friends = @user.friends %>
<div class='diary_post<%= " text-muted px-3 deleted" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
- <div class='post_heading'>
+ <div class='mb-3'>
<% if @user %>
<h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
<% else %>
<fieldset>
<legend><%= t ".location" -%></legend>
- <%= tag.div "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
+ <%= tag.div "", :id => "map", :class => "border border-grey rounded", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
<div class="form-row">
<%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %>
<% content_for :heading do %>
- <h1><%= t(".has_commented_on", :display_name => @user.display_name) %></h1>
+ <h1><%= t ".heading", :user => @user.display_name %></h1>
+ <p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
<% end %>
<% if @comments.empty? %>
<% if flash[:error] %>
- <div class="flash error row align-items-center">
+ <div class="flash error row mx-0 p-3 align-items-center">
<div class="col-auto">
<picture>
<source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />
<% end %>
<% if flash[:warning] %>
- <div class="flash warning row align-items-center">
+ <div class="flash warning row mx-0 p-3 align-items-center">
<div class="col-auto">
<picture>
<source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
<% end %>
<% if flash[:notice] %>
- <div class="flash notice row align-items-center">
+ <div class="flash notice row mx-0 p-3 align-items-center">
<div class="col-auto">
<picture>
<source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
<% if current_user && current_user.id %>
<div class='d-inline-flex dropdown user-menu logged-in clearfix'>
<a class='dropdown-toggle btn btn-outline-secondary pl-2 py-1 flex-grow-1' data-toggle='dropdown' href="#">
- <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>
+ <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-sm") %>
<%= render :partial => "layouts/inbox" %>
<span class="user-button">
<span class='username'>
<input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label>
</div>
- <%= tag.div "", :id => "map", :class => "content_map set_location" %>
+ <%= tag.div "", :id => "map", :class => "content_map set_location border border-grey rounded" %>
</fieldset>
<%= f.primary t(".save") %>
<%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
<div class='export_area_inputs'>
- <div class='export_boxy'>
+ <div class='export_boxy border border-grey rounded'>
<%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
<div class="clearfix">
<%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control") %>
<% end %>
</div>
- <div id="contributorTerms" class="legale">
+ <div id="contributorTerms" class="legale border border-grey rounded">
<%= render :partial => "terms" %>
</div>
way: лінія
relation: дачыненне
start_rjs:
- feature_warning: Неабходна загрузіць %{num_features} аб'ектаў, што можа запаволіць
- ваш браўзэр. Вы ўпэўнены, што жадаеце праглядзець гэтыя дадзеныя?
+ feature_warning: Неабходна загрузіць %{num_features} аб’ектаў, што можа запаволіць
+ ваш браўзер. Вы ўпэўнены, што жадаеце праглядзець гэтыя даныя?
load_data: Сцягнуць дадзеныя
loading: Загрузка...
tag_details:
user_page_link: старонка карыстальніка
anon_edits_link_text: Даведацца ў чым справа.
id_not_configured: iD не быў настроены
- no_iframe_support: Ваш браўзэр не падтрымлівае HTML iframe, якія неабходныя
+ no_iframe_support: Ваш браўзер не падтрымлівае рамкі HTML, якія з’яўляюцца неабходнымі
для гэтай функцыі.
export:
title: Экспарт
no_authorization_code: Kein Autorisierungscode
unknown_signature_algorithm: Unbekannter Signaturalgorithmus
invalid_scope: Ungültiger Bereich
+ unknown_error: Authentifizierung fehlgeschlagen
auth_association:
heading: Deine ID ist noch nicht mit einem OpenStreetMap-Konto verknüpft.
option_1: |-
title: "OpenStreetMap diary entries"
description: "Recent diary entries from users of OpenStreetMap"
comments:
- has_commented_on: "%{display_name} has commented on the following diary entries"
+ title: "Diary Comments added by %{user}"
+ heading: "%{user}'s Diary Comments"
+ subheading_html: "Diary Comments added by %{user}"
no_comments: "No diary comments"
post: Post
when: When
<strong>Austria</strong>: Contiene datos de
<a href="https://data.wien.gv.at/">Stadt Wien</a> (bajo
<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y Land Tirol (bajo licencia <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT con modificaciones</a>).
- contributors_au_html: '<strong>Australia</strong>: Contiene datos procedentes
- de <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
- Australia Limite </a> con licencia de Commonwealth of Australia bajo <a
- href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'
+ contributors_au_html: '<strong>Australia</strong>: Contiene o se ha desarrollado
+ usando límites administrativos de © <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">Geoscape
+ Australia</a> con licencia de la Commonwealth de Australia bajo <a href="https://creativecommons.org/licenses/by/4.0/">licencia
+ Creative Commons Atribución 4.0 Internacional (CC BY 4.0)</a>.'
contributors_ca_html: '<strong>Canadá</strong>: contiene datos de GeoBase®,
GeoGratis (© Department of Natural Resources Canada), CanVec (©
Department of Natural Resources Canada) y StatCan (Geography Division, Statistics
no_authorization_code: Aucun code d’autorisation
unknown_signature_algorithm: Algorithme de signature inconnu
invalid_scope: Étendue non valide
+ unknown_error: Échec d’authentification
auth_association:
heading: Votre ID n’est pas encore associé à un compte OpenStreetMap.
option_1: Si vous êtes nouveau sur OpenStreetMap, veuillez créer un nouveau
diary_entry:
create: Publisearje
update: Bywurkje
+ issue_comment:
+ create: Reäksje taheakje
message:
create: Ferstjoere
client_application:
update: Bywurkje
doorkeeper_application:
update: Bywurkje
+ redaction:
+ create: Redigearring oanmeitsje
+ update: Redigearring bewarje
trace:
create: Oplade
update: Feroarings bewarje
way_tag: Linelebel
attributes:
diary_comment:
- body: Tekst
+ body: Ynhâld
diary_entry:
user: Meidogger
title: Underwerp
report:
category: Selektearje in reden foar jo melding
user:
+ auth_provider: Autentifikaasje-oanbieder
+ auth_uid: Autentifikaasje-UID
email: E-mail
email_confirmation: Befêstiging e-mail
new_email: Nij e-mailadres
pass_crypt: Wachtwurd
pass_crypt_confirmation: Wachtwurd befêstigje
help:
+ trace:
+ tagstring: skaat mei komma's
user:
email_confirmation: Jo adres wurdt net publikelik toand; sjoch ús <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
title="Privacybelied fan OSMF mei in stik oer e-mailadressen">Privacybelied</a>
note: notysje
timeout:
title: Tiid ferrûn
- sorry: Spitich, it opfreegjen fan 'e data foar %{type}-ID %{id} duorre te lang.
+ sorry: Spitich, it opheljen fan 'e data foar %{type}-ID %{id} duorre te lang.
type:
node: punt
way: line
note: notysje
redacted:
redaction: Redigearring %{id}
- message_html: '%{type}-ferzje %{version} kin nei redaksje net werjûn wurde.
- Sjoch %{redaction_link} foar ynformaasje.'
+ message_html: Ferzje %{version} fan %{type} kin nei redaksje net werjûn wurde.
+ Sjoch %{redaction_link} foar ynformaasje.
type:
- node: Punt
- way: Line
- relation: Relaasje
+ node: punt
+ way: line
+ relation: relaasje
start_rjs:
feature_warning: '%{num_features} skaaimerken wurde laden, wat jo webblêder
traach meitsje kin of dat er net mear reägearret. Wolle jo wier dy data werjaan?'
loading: Laden ...
tag_details:
tags: Lebels
+ wiki_link:
+ key: De wiki-beskriuwingsside foar it lebel %{key}
+ tag: De wiki-beskriuwingsside foar it lebel %{key}=%{value}
+ wikidata_link: It item %{page} op Wikidata
+ wikipedia_link: It artikel %{page} op 'e Wikipedy
+ wikimedia_commons_link: It bestân %{page} op Wikimedia Commons
+ telephone_link: '%{phone_number} skilje'
+ colour_preview: Proefbyld kleur %{colour_value}
note:
title: 'Notysje: %{id}'
new_note: Nije notysje
no_more_area: Gjin wizigingssets mear yn dizze krite.
no_more_user: Gjin wizigingssets mear fan dizze meidogger.
load_more: Mear lade
+ timeout:
+ sorry: Spitich, it opheljen fan 'e list wizigingssets dy't jo fregen duorre
+ te lang.
+ changeset_comments:
+ comment:
+ comment: 'Nije reäksje op wizigingsset #%{changeset_id} fan %{author}'
+ commented_at_by_html: Bywurke %{when} troch %{user}
+ comments:
+ comment: 'Nije reäksje op wizigingsset #%{changeset_id} fan %{author}'
+ index:
+ title_all: Oerlis oer OpenStreetMap-wizigingsset
+ title_particular: 'Oerlis oer OpenStreetMap-wizigingsset #%{changeset_id}'
+ timeout:
+ sorry: Spitich, it opheljen fan 'e list wizigingssetreäksjes dy't jo fregen
+ duorre te lang.
dashboards:
contact:
km away: '%{count}km fuort'
new_title: In nij stik yn myn meidoggerdeiboek skriuwe
my_diary: Myn deiboek
no_entries: Gjin deiboekstikken
+ recent_entries: Deiboekstikken fan koartby
older_entries: Aldere stikken
newer_entries: Nijere stikken
edit:
login: Meld jo oan
no_such_entry:
title: Deiboekstik ûnbekend
+ heading: 'Gjin stik mei ID: %{id}'
diary_entry:
posted_by_html: Pleatst troch %{link_user} op %{created} yn it %{language_link}.
updated_at_html: Lêst bywurke op %{updated}.
make_friend:
heading: '%{user} as freon tafoegje?'
button: As freon tafoegje
- success: '%{name} is no jo freon!'
+ success: '%{name} is no jo freon(dinne)!'
failed: Spitich, %{name} as freon tafoegjen mislearre.
already_a_friend: Jo binne al freonen mei %{name}.
remove_friend:
station: Kabelbaanstasjon
aeroway:
aerodrome: Fleanfjild
+ airstrip: Lâningsstripe
apron: Platfoarm
gate: Gate
+ hangar: Hangaar
helipad: Helyhaven
+ holding_position: Wachtposysje
+ navigationaid: Grûnljochten loftfeart
+ parking_position: Parkearposysje
runway: Start-/lâningsbaan
+ taxilane: Taksystripe
taxiway: Taksybaan
- terminal: Terminal
+ terminal: Passazjiershal
+ windsock: Wynsek
amenity:
animal_boarding: Bistepinsjon
animal_shelter: Biste-asyl
railway: Histoaryske spoarwei
roman_road: Romeinske wei
ruins: Ruïne
+ rune_stone: Runestien
stone: Stien
tomb: Tombe
tower: Toer
+ wayside_chapel: Weikapel
+ wayside_cross: Weikrús
+ wayside_shrine: Weiskryn
wreck: Wrak
+ junction:
+ "yes": Krusing
landuse:
allotments: Folkstunen
basin: Wetterbekken
estate_agent: Makelder
lawyer: Jurist
ngo: Kantoar NGO
+ telecommunication: Tillekommunikaasjekantoar
travel_agent: Reisburo
"yes": Kantoar
place:
square: Plein
state: Steat
subdivision: Dielgebiet
- suburb: Foarstêd
+ suburb: Stedsdiel
town: Stêd
village: Doarp
"yes": Plak
level7: Gemeentegrins
level8: Stedsgrins
level9: Doarpsgrins
+ level10: Stedsdielgrins
level11: Buertgrins
types:
cities: Grutte stêden
home: Nei jo fêste lokaasje
logout: Ofmelde
log_in: Oanmelde
+ log_in_tooltip: Oanmelde mei in besteand akkount
sign_up: Ynskriuwe
start_mapping: Set útein
+ sign_up_tooltip: In akkount foar bewurkjen oanmeitsje
edit: Bewurkje
history: Skiednis
export: Eksportearje
no_such_message:
title: Berjocht ûnbekend
heading: Berjocht ûnbekend
+ body: Spitich, der is gjin berjocht mei dy ID.
outbox:
title: Utfek
my_inbox: Myn ynfek
destroyed: Berjocht wiske
passwords:
lost_password:
+ title: Wachtwurd kwyt
+ heading: Wachtwurd fergetten?
email address: 'E-mailadres:'
+ new password button: Nij wachtwurd
+ help_text: Folje it e-mailadres yn dat jo by it ynskriuwen brûkt hawwe. Wy stjoere
+ der dan in keppeling hinne dy't jo brûke kinne en stel jo wachtwurd op 'e
+ nij yn.
+ notice email on way: Spitich dat jo 'm kwyt binne :-( mar in e-mail is ûnderweis,
+ dat jo kinne gau in nijenien ynstelle.
+ notice email cannot find: Koe dat e-mailadres net fine, spitich.
reset_password:
+ title: Nij wachtwurd
+ heading: Wachtwurd op 'e nij ynstelle foar %{user}
+ reset: Nij wachtwurd
flash changed: Jo wachtwurd is feroare.
+ flash token bad: Haw dat bewiisteken net fûn, de URL efkes neisjen?
preferences:
show:
title: Myn foarkarren
- -taksybaan
apron:
- Lofthavenplatfoarm
- - -terminal
+ - -passazjiershal
admin: Bestjoerlike grins
forest: Bosk
wood: Wâld
identifiable: Identifisearber (werjûn yn 'e trajektelist en as identifisearbere,
oardere punten mei tiidstimpels)
new:
+ upload_trace: GPS-trajekt oplade
+ visibility_help: wat betsjut dat?
+ visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
help: Help
+ help_url: https://wiki.openstreetmap.org/wiki/Upload
+ create:
+ upload_trace: GPS-trajekt oplade
edit:
cancel: Annulearje
+ visibility_help: wat betsjut dat?
+ visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
update:
updated: Trajekt bywurke
trace_optionals:
edits: Bewurkings
traces: Trajekten
notes: Kaartnotysjes
- remove as friend: Freon ôffiere
+ remove as friend: Freon ôf
add as friend: Freon tafoegje
mapper since: 'Kaartmakker sûnt:'
ct status: 'Bydragersbetingsten:'
heading: Bydragersbetingsten
agreed: Jo binne akkoart gien mei de nije Bydragersbetingsten.
not yet agreed: Jo binne noch net akkoart gien mei de nije Bydragersbetingsten.
+ link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
link text: wat is dit?
save changes button: Feroarings bewarje
index:
show:
description: 'Beskriuwing:'
user: 'Auteur:'
+ validations:
+ leading_whitespace: begjint mei wytromte
+ trailing_whitespace: einiget mei wytromte
+ invalid_characters: befettet ûnjildige tekens
+ url_characters: befettet spesjale URL-tekens (%{characters})
...
no_authorization_code: 인증 코드가 없습니다.
unknown_signature_algorithm: 알려지지 않은 인증 알고리즘
invalid_scope: 잘못된 범위
+ unknown_error: 인증 실패
auth_association:
heading: 당신의 ID는 아직 OpenStreetMap 계정에 등록되지 않았습니다.
option_1: 만약 당신이 OpenStreetMap에 처음이시면, 아래 양식을 사용해 새 계정을 만들어 주세요.
no_authorization_code: Нема код за овластување
unknown_signature_algorithm: Непознат алгоритам на потпис
invalid_scope: Неважечки делокруг
+ unknown_error: Заверката не успеа
auth_association:
heading: Вашата назнака сè уште не е здружена со сметка на OpenStreetMap.
option_1: Доколку сте нови на OpenStreetMap, направете сметка користејќи го
public editing:
enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
+ auth_failure:
+ unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
...
queryfeature_disabled_tooltip: Przybliż mapę, aby obejrzeć dane obiektów
changesets:
show:
- comment: Komentować
+ comment: Komentarz
subscribe: Obserwuj
unsubscribe: Nie obserwuj
hide_comment: ukryj
resolve: Oznacz jako rozwiązaną
reactivate: Ponownie aktywuj
comment_and_resolve: Skomentuj i rozwiąż
- comment: Komentować
+ comment: Dodaj komentarz
edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie
kliknąć tutaj.
directions:
loading_dock: Загрузочный док
love_hotel: Отель любви
marketplace: Рынок
+ mobile_money_agent: Агент мобильных денег
monastery: Монастырь
money_transfer: Перевод денег
motorcycle_parking: Парковка для мотоциклов
electrician: Электрик
electronics_repair: Ремонт электроники
gardener: Садовник
+ glaziery: Стекольщик
+ handicraft: Ремесло
painter: Художник
photographer: Фотограф
plumber: Сантехник
client_application:
create: ᱧᱩᱛᱩᱢ ᱚᱞ
update: ᱦᱟᱹᱞᱤᱭᱟᱹᱜ
+ doorkeeper_application:
+ update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ
trace:
create: ᱞᱟᱫᱮ
update: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱱᱪᱟᱣ ᱢᱮ
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_1_html: 'Kartrutorna i “standardstilen” på www.openstreetmap.org
+ credit_3_1_html: Kartrutorna i “standardstilen” på www.openstreetmap.org
är ett producerat verk av OpenStreetMap Foundation med hjälp av OpenStreetMap-data
- under licensen Open Database. Använder du dessa rutor, vänligen använd följande
- erkännande: “Baskarta och data från OpenStreetMap och OpenStreetMap
- Foundation”.'
+ under licensen Open Database. När du använder denna kartstil krävs samma
+ erkännande som för kartdata.
credit_4_html: |-
För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.
Till exempel:
confirm_delete: Radera den här applikationen?
client_id: Klient-ID
client_secret: Klienthemlighet
+ client_secret_warning: Se till att spara denna hemlighet - den kommer inte vara
+ tillgänglig igen
permissions: Behörigheter
redirect_uris: Omdirigerings-URI:er
not_found:
no_authorization_code: Ingen behörighetskod
unknown_signature_algorithm: Okänd signaturalgoritm
invalid_scope: Ogiltiga omfattning
+ unknown_error: Autentisering misslyckades
auth_association:
heading: Ditt ID är inte associerat med ett OpenStreetMap-konto ännu.
option_1: |-
no_authorization_code: Немає коду авторизації
unknown_signature_algorithm: Невідомий алгоритм підпису
invalid_scope: Недійсна область
+ unknown_error: Помилка автентифікації
auth_association:
heading: Ваш ID ще не пов'язаний з обліковим записом OpenStreetMap.
option_1: Якщо ви вперше в OpenStreetMap – створіть новий обліковий запис, використовуючи
waterway:
artificial: ხელუანური წყაროლინი
canal: არხი
+ users:
+ auth_failure:
+ unknown_error: ავთენტიფიკაციაქ ვეგშართჷ
user_blocks:
show:
created: 'გიჭყჷ:'
assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
end
assert_select "div#content", :count => 1 do
- assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+ assert_select "h2", :text => /#{new_title}/, :count => 1
# This next line won't work if the text has been run through the htmlize function
# due to formatting that could be introduced
assert_select "p", :text => /#{new_body}/, :count => 1
assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
end
assert_select "div#content", :count => 1 do
- assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+ assert_select "h2", :text => /#{new_title}/, :count => 1
# This next line won't work if the text has been run through the htmlize function
# due to formatting that could be introduced
assert_select "p", :text => /#{new_body}/, :count => 1
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_image(user)
- assert_match %r{^<img class="user_image" .* src="/images/avatar_large.png" />$}, image
+ assert_match %r{^<img class="user_image border border-grey" .* src="/images/avatar_large.png" />$}, image
image = user_image(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_large.png" />$}, image
image = user_image(gravatar_user)
- assert_match %r{^<img class="user_image" .* src="http://www.gravatar.com/avatar/.*" />$}, image
+ assert_match %r{^<img class="user_image border border-grey" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_image(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail(user)
- assert_match %r{^<img class="user_thumbnail" .* src="/images/avatar_small.png" />$}, image
+ assert_match %r{^<img class="user_thumbnail border border-grey" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail(gravatar_user)
- assert_match %r{^<img class="user_thumbnail" .* src="http://www.gravatar.com/avatar/.*" />$}, image
+ assert_match %r{^<img class="user_thumbnail border border-grey" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_thumbnail(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail_tiny(user)
- assert_match %r{^<img class="user_thumbnail_tiny" .* src="/images/avatar_small.png" />$}, image
+ assert_match %r{^<img class="user_thumbnail_tiny border border-grey" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail_tiny(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail_tiny(gravatar_user)
- assert_match %r{^<img class="user_thumbnail_tiny" .* src="http://www.gravatar.com/avatar/.*" />$}, image
+ assert_match %r{^<img class="user_thumbnail_tiny border border-grey" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_thumbnail_tiny(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image
projects / rails.git / commitdiff