Merge branch 'master' into terms

This commit is contained in:
Tom Hughes 2010-04-27 11:22:25 +01:00
commit 6729272444
72 changed files with 2347 additions and 579 deletions

View file

@ -15,4 +15,65 @@ module BrowseHelper
end
return name
end
def format_key(key)
if url = wiki_link("key", key)
link_to h(key), url, :title => t('browse.tag_details.wiki_link.key', :key => key)
else
h(key)
end
end
def format_value(key, value)
if wp = wikipedia_link(key, value)
link_to h(wp[:title]), wp[:url], :title => t('browse.tag_details.wikipedia_link', :page => wp[:title])
elsif url = wiki_link("tag", "#{key}=#{value}")
link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)
else
linkify h(value)
end
end
private
def wiki_link(type, lookup)
locale = I18n.locale.to_s
if page = WIKI_PAGES[locale][type][lookup] rescue nil
url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
end
return url
end
def wikipedia_link(key, value)
if key == "wikipedia"
# This regex should match Wikipedia language codes, everything
# from de to zh-classical
if value =~ /^([a-z-]{2,12}):(.+)$/
# Value is <lang>:<title> so split it up
lang = $1
value = $2
else
# Value is <title> so default to English Wikipedia
lang = 'en'
end
elsif key =~ /^wikipedia:(\S+)$/
# Language is in the key, so assume value is a simple title
lang = $1
else
# Not a wikipedia key!
return nil
end
# Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
return nil if value =~ /^http:\/\//
return {
:url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
:title => value
}
end
end

View file

@ -1,22 +1,20 @@
<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
<%= javascript_include_tag 'map.js' %>
<td>
<div style="width: 250px; margin: auto; text-align: right"">
<% if map.instance_of? Changeset or map.visible %>
<div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
</div>
<span id="loading"><%= t 'browse.map.loading' %></span>
<a id="area_larger_map" href=""></a>
<% unless map.instance_of? Changeset %>
<br />
<a id="object_larger_map" href=""></a>
<% end %>
<% else %>
<%= t 'browse.map.deleted' %>
<% end %>
<div id="browse_map">
<% if map.instance_of? Changeset or map.visible %>
<div id="small_map">
</div>
</td>
<span id="loading"><%= t 'browse.map.loading' %></span>
<a id="area_larger_map" href=""></a>
<% unless map.instance_of? Changeset %>
<br />
<a id="object_larger_map" href=""></a>
<% end %>
<% else %>
<%= t 'browse.map.deleted' %>
<% end %>
</div>
<% if map.instance_of? Changeset or map.visible %>
<script type="text/javascript">
OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");

View file

@ -1,40 +1,42 @@
<div style="float:right; text-align:center; width: 100%;">
<% type = (@next || @prev).class.name.downcase %>
<% margin = @next_by_user || @prev_by_user ? 9 : 18 %>
<div id="browse_navigation" style="margin-top: <%= margin %>px">
<% if @next_by_user or @prev_by_user %>
<span class="nowrap">
<% if @prev_by_user %>
<%= link_to t('browse.changeset_navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
<%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
{ :id => @prev_by_user.id },
{ :title => t('browse.changeset_navigation.user.prev_tooltip', :user => @prev_by_user.user.display_name) } %>
{ :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %>
|
<% end %>
<%=
user = (@prev_by_user || @next_by_user).user.display_name
link_to h(user),
{ :controller => "changeset", :action => "list", :display_name => user },
{ :title => t('browse.changeset_navigation.user.name_tooltip', :user => h(user)) }
{ :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) }
%>
<% if @next_by_user %>
|
<%= link_to t('browse.changeset_navigation.paging.user.next', :id => @next_by_user.id.to_s),
<%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s),
{ :id => @next_by_user.id },
{ :title => t('browse.changeset_navigation.user.next_tooltip', :user => @next_by_user.user.display_name) } %>
{ :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %>
<% end %>
</span>
<br/>
<% end %>
<span class="nowrap">
<% if @prev %>
<%= link_to t('browse.changeset_navigation.paging.all.prev', :id => @prev.id.to_s),
<%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s),
{ :id => @prev.id },
{ :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
{ :title => t("browse.navigation.all.prev_#{type}_tooltip") } %>
<% end %>
<% if @prev and @next %>
|
<% end %>
<% if @next %>
<%= link_to t('browse.changeset_navigation.paging.all.next', :id => @next.id.to_s),
<%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
{ :id => @next.id },
{ :title => t('browse.changeset_navigation.all.next_tooltip') } %>
{ :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
<% end %>
</span>
</div>

View file

@ -1,3 +1,3 @@
<tr>
<td><%= h(tag[0]) %> = <%= linkify(h(tag[1])) %></td>
<td><%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %></td>
</tr>

View file

@ -1,21 +1,9 @@
<table width="100%">
<tr>
<td>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "changeset_details", :object => @changeset %>
<hr />
<%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"),
:osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
</td>
<% if @changeset.has_valid_bbox? %>
<%= render :partial => "map", :object => @changeset %>
<% end %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
<% if @changeset.has_valid_bbox? %>
<%= render :partial => "map", :object => @changeset %>
<% end %>
<%= render :partial => "changeset_details", :object => @changeset %>
<hr />
<%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"),
:osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

View file

@ -2,24 +2,12 @@
@name = printable_name @node
@title = t('browse.node.node') + ' | ' + @name
%>
<table width="100%">
<tr>
<td>
<h2><%= t'browse.node.node_title', :node_name => h(@name) %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "node_details", :object => @node %>
<hr />
<%= t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "node", :action => "read"),
:view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"),
:edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id)
%>
</td>
<%= render :partial => "map", :object => @node %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t'browse.node.node_title', :node_name => h(@name) %></h2>
<%= render :partial => "map", :object => @node %>
<%= render :partial => "node_details", :object => @node %>
<hr />
<%= t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "node", :action => "read"),
:view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"),
:edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id)
%>

View file

@ -3,17 +3,10 @@
@title = t('browse.node_history.node_history') + ' | ' + @name
%>
<h2><%= t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
<table width="100%">
<tr valign="top">
<td>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<hr />
<% end %>
<%= t 'browse.node_history.download', :download_xml_link => link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history"),
:view_details_link => link_to(t('browse.node_history.view_details'), :action => "node") %>
</td>
<%= render :partial => "map", :object => @node %>
</tr>
</table>
<%= render :partial => "map", :object => @node %>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<hr />
<% end %>
<%= t 'browse.node_history.download', :download_xml_link => link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history"),
:view_details_link => link_to(t('browse.node_history.view_details'), :action => "node") %>

View file

@ -2,22 +2,10 @@
@name = printable_name @relation
@title = t('browse.relation.relation') + ' | ' + @name
%>
<table width="100%">
<tr>
<td>
<h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "relation_details", :object => @relation %>
<hr />
<%= t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
:view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>
</td>
<%= render :partial => "map", :object => @relation %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>
<%= render :partial => "map", :object => @relation %>
<%= render :partial => "relation_details", :object => @relation %>
<hr />
<%= t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
:view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>

View file

@ -3,17 +3,10 @@
@title = t('browse.relation_history.relation_history') + ' | ' + @name
%>
<h2><%= t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
<table width="100%">
<tr valign="top">
<td>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<hr />
<% end %>
<%= t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"),
:view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %>
</td>
<%= render :partial => "map", :object => @relation %>
</tr>
</table>
<%= render :partial => "map", :object => @relation %>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<hr />
<% end %>
<%= t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"),
:view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %>

View file

@ -2,25 +2,13 @@
@name = printable_name @way
@title = t('browse.way.way') + ' | ' + @name
%>
<table width="100%">
<tr>
<td>
<h2><%= t'browse.way.way_title', :way_name => h(@name) %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "way_details", :object => @way %>
<hr />
<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
| <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
<% unless @midnode.nil? %>
| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %>
<% end %>
</td>
<%= render :partial => "map", :object => @way %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t'browse.way.way_title', :way_name => h(@name) %></h2>
<%= render :partial => "map", :object => @way %>
<%= render :partial => "way_details", :object => @way %>
<hr />
<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
| <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
<% unless @midnode.nil? %>
| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %>
<% end %>

View file

@ -3,17 +3,10 @@
@title = t('browse.way_history.way_history') + ' | ' + @name
%>
<h2><%= t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
<table width="100%">
<tr valign="top">
<td>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<hr />
<% end %>
<%= t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"),
:view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %>
</td>
<%= render :partial => "map", :object => @way %>
</tr>
</table>
<%= render :partial => "map", :object => @way %>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<hr />
<% end %>
<%= t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"),
:view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %>

View file

@ -117,6 +117,7 @@
<div id="left_menu" class="left_menu">
<a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
<%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %><br />
<a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
<a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
<%= yield :left_menu %>
@ -128,18 +129,6 @@
<div class="donate">
<a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
</div>
<div id="cclogo" style="width: 88px">
<%= link_to(
image_tag("cc_button.png",
:alt => t('layouts.license.alt'),
:border => 0,
:width => 88,
:height => 31,
:title => t('layouts.license.title')),
"http://creativecommons.org/licenses/by-sa/2.0/",
{ :rel => "license" }) %>
</div>
</center>
</div>
</body>

View file

@ -0,0 +1,49 @@
<p style="float: right"><a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a></p>
<h2>Copyright and License</h2>
<p>OpenStreetMap is <i>open data</i>, licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).</p>
<p>You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our maps or data, you may distribute the result only under the same or similar licence. The full <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code</a> explains your rights and responsibilities.</p>
<h3>How to credit OpenStreetMap</h3>
<p>If you are using OpenStreetMap map images, we request that your credit reads at least &ldquo;&copy; OpenStreetMap contributors, CC-BY-SA&rdquo;. If you are using map data only, we request &ldquo;Map data &copy; OpenStreetMap contributors, CC-BY-SA&rdquo;.</p>
<p>Where possible, OpenStreetMap should be hyperlinked to <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>. If you are using a medium where links are not possible (e.g. a printed work), we suggest you direct your readers to www.openstreetmap.org (perhaps by expanding &lsquo;OpenStreetMap&rsquo; to this full address) and to www.creativecommons.org.</p>
<h3>Finding out more</h3>
<p>Read more about using our data at the <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>.
<p>OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders.</p>
<p>Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a> and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
<h3>Our contributors</h3>
<p>Our CC-BY-SA licence requires you to &ldquo;give the Original Author credit reasonable to the medium or means You are utilising&rdquo;. Individual OSM mappers do not request a credit over and above that to &ldquo;OpenStreetMap contributors&rdquo;, but where data from a national mapping agency or other major source has been included in OpenStreetMap, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page.</p>
<!--
Information for page editors
The following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data.
Any additions here must be discussed with OSM sysadmins first.
-->
<ul id="contributors">
<li><strong>Australia</strong>: Contains suburb data based on Australian Bureau of Statistics data.
<li><strong>Canada</strong>: Contains data from GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy; Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada).
<li><strong>New Zealand</strong>: Contains data sourced from Land Information New Zealand. Crown Copyright reserved.
<li><strong>United Kingdom</strong>: Contains Ordnance Survey data &copy; Crown copyright and database right 2010.
</ul>
<p>Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability.</p>

View file

@ -20,7 +20,7 @@
<%= render :partial => 'search' %>
<%
session[:token] = @user.tokens.create.token unless session[:token]
session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
# Decide on a lat lon to initialise potlatch with. Various ways of doing this
if params['lon'] and params['lat']

View file

@ -1,2 +1,2 @@
<h2><%= t 'user.no_such_user.heading', :user => @not_found_user %></h2>
<p><%= t 'user.no_such_user.body', :user => @not_found_user %></p>
<h2><%= t 'user.no_such_user.heading', :user => h(@not_found_user) %></h2>
<p><%= t 'user.no_such_user.body', :user => h(@not_found_user) %></p>

View file

@ -0,0 +1 @@
WIKI_PAGES = YAML.load_file("#{RAILS_ROOT}/config/wiki_pages.yml")

View file

@ -67,14 +67,14 @@ af:
one: "Het die volgende node:"
other: "Het die volgende {{count}} nodes:"
show_area_box: Wys gebied
changeset_navigation:
navigation:
all:
next_tooltip: Volgende stel wysigings
prev_tooltip: Vorige stel wysigings
next_changeset_tooltip: Volgende stel wysigings
prev_changeset_tooltip: Vorige stel wysigings
user:
name_tooltip: Wys wysigings deur {{user}}
next_tooltip: Volgende wysiging deur {{user}}
prev_tooltip: Vorige wysiging deur {{user}}
name_changeset_tooltip: Wys wysigings deur {{user}}
next_changeset_tooltip: Volgende wysiging deur {{user}}
prev_changeset_tooltip: Vorige wysiging deur {{user}}
common_details:
changeset_comment: "Opmerking:"
edited_at: "Gewysig op:"

View file

@ -112,14 +112,14 @@ ar:
two: "فيه الطريقين التاليين:"
no_bounding_box: لم يتم تخزين مربع الإحاطة لحزمة التغييرات هذه.
show_area_box: اعرض مربع المنطقة
changeset_navigation:
navigation:
all:
next_tooltip: حزمة التغييرات التالية
prev_tooltip: حزمة التغييرات السابقة
next_changeset_tooltip: حزمة التغييرات التالية
prev_changeset_tooltip: حزمة التغييرات السابقة
user:
name_tooltip: اعرض تعديلات {{user}}
next_tooltip: التعديل التالي بواسطة {{user}}
prev_tooltip: عُدّل سابقًا بواسطة {{user}}
name_changeset_tooltip: اعرض تعديلات {{user}}
next_changeset_tooltip: التعديل التالي بواسطة {{user}}
prev_changeset_tooltip: عُدّل سابقًا بواسطة {{user}}
common_details:
changeset_comment: "التعليق:"
edited_at: "عُدّل في:"

View file

@ -108,14 +108,14 @@ arz:
two: "فيه الطريقين التاليين:"
no_bounding_box: لم يتم تخزين مربع الإحاطه لحزمه التغييرات هذه.
show_area_box: اعرض مربع المنطقة
changeset_navigation:
navigation:
all:
next_tooltip: حزمه التغييرات التالية
prev_tooltip: حزمه التغييرات السابقة
next_changeset_tooltip: حزمه التغييرات التالية
prev_changeset_tooltip: حزمه التغييرات السابقة
user:
name_tooltip: اعرض تعديلات {{user}}
next_tooltip: التعديل التالى بواسطه {{user}}
prev_tooltip: عُدّل سابقًا بواسطه {{user}}
name_changeset_tooltip: اعرض تعديلات {{user}}
next_changeset_tooltip: التعديل التالى بواسطه {{user}}
prev_changeset_tooltip: عُدّل سابقًا بواسطه {{user}}
common_details:
changeset_comment: "التعليق:"
edited_at: "عُدّل في:"

View file

@ -105,14 +105,14 @@ br:
other: "Zo gantañ an {{count}} hent-mañ :"
no_bounding_box: N'eus bet stoket boest bevenniñ ebet evit ar strollad kemmoù-mañ.
show_area_box: Diskouez boest an takad
changeset_navigation:
navigation:
all:
next_tooltip: Strollad kemmoù da-heul
prev_tooltip: Strollad kemmoù kent
next_changeset_tooltip: Strollad kemmoù da-heul
prev_changeset_tooltip: Strollad kemmoù kent
user:
name_tooltip: Gwelet an aozadennoù gant {{user}}
next_tooltip: Aozadenn da-heul gant {{user}}
prev_tooltip: Aozadenn gent gant {{user}}
name_changeset_tooltip: Gwelet an aozadennoù gant {{user}}
next_changeset_tooltip: Aozadenn da-heul gant {{user}}
prev_changeset_tooltip: Aozadenn gent gant {{user}}
common_details:
changeset_comment: "Addispleg :"
edited_at: "Aozet d'an :"

View file

@ -96,13 +96,13 @@ ca:
one: "Té la següent via:"
other: "Té les següents {{count}} vies:"
show_area_box: Mostra caixa de l'àrea
changeset_navigation:
navigation:
all:
next_tooltip: Conjunt de canvis següent
prev_tooltip: Conjunt de canvis anterior
next_changeset_tooltip: Conjunt de canvis següent
prev_changeset_tooltip: Conjunt de canvis anterior
user:
name_tooltip: Visualitza les edicions feter per {{user}}
prev_tooltip: Edició anterior per l'usuari {{user}}
name_changeset_tooltip: Visualitza les edicions feter per {{user}}
prev_changeset_tooltip: Edició anterior per l'usuari {{user}}
common_details:
changeset_comment: "Comentari:"
edited_at: "Editat:"

View file

@ -86,14 +86,14 @@ cs:
other: "Obsahuje následujících {{count}} cest:"
no_bounding_box: K této sadě změn nebyl uložen rozsah.
show_area_box: Zobrazit ohraničení oblasti
changeset_navigation:
navigation:
all:
next_tooltip: Další sada změn
prev_tooltip: Předchozí sada změn
next_changeset_tooltip: Další sada změn
prev_changeset_tooltip: Předchozí sada změn
user:
name_tooltip: Zobrazit úpravy od {{user}}
next_tooltip: Další úprava od {{user}}
prev_tooltip: Předešlá úprava od {{user}}
name_changeset_tooltip: Zobrazit úpravy od {{user}}
next_changeset_tooltip: Další úprava od {{user}}
prev_changeset_tooltip: Předešlá úprava od {{user}}
common_details:
changeset_comment: "Komentář:"
edited_at: "Upraveno v:"

View file

@ -73,14 +73,14 @@ da:
other: "Har følgende {{count}} veje:"
no_bounding_box: Ingen grænse er lagret for dette ændringssæt.
show_area_box: Vis kasse på et stort kort
changeset_navigation:
navigation:
all:
next_tooltip: Næste ændringssæt
prev_tooltip: Forrige ændringssæt
next_changeset_tooltip: Næste ændringssæt
prev_changeset_tooltip: Forrige ændringssæt
user:
name_tooltip: Vis redigeringer af {{user}}
next_tooltip: Næste redigering af {{user}}
prev_tooltip: Forrige redigering af {{user}}
name_changeset_tooltip: Vis redigeringer af {{user}}
next_changeset_tooltip: Næste redigering af {{user}}
prev_changeset_tooltip: Forrige redigering af {{user}}
common_details:
changeset_comment: "Kommentar:"
edited_at: "Redigeret:"

View file

@ -117,14 +117,14 @@ de:
other: "Enthält folgende {{count}} Wege:"
no_bounding_box: Für dieses Changeset wurde kein Bereich gespeichert.
show_area_box: Bereichsgrenze anzeigen
changeset_navigation:
navigation:
all:
next_tooltip: Nächstes Changeset
prev_tooltip: Vorheriges Changeset
next_changeset_tooltip: Nächstes Changeset
prev_changeset_tooltip: Vorheriges Changeset
user:
name_tooltip: Änderungen von {{user}} anzeigen
next_tooltip: Nächste Änderung von {{user}}
prev_tooltip: Vorherige Änderung von {{user}}
name_changeset_tooltip: Änderungen von {{user}} anzeigen
next_changeset_tooltip: Nächste Änderung von {{user}}
prev_changeset_tooltip: Vorherige Änderung von {{user}}
common_details:
changeset_comment: "Kommentar:"
edited_at: "Bearbeitet am:"

View file

@ -109,14 +109,14 @@ dsb:
two: "Ma slědujucej {{count}} puśa:"
no_bounding_box: Za toś tu sajźbu změnow njejo se žeden wobłuk składł.
show_area_box: Wobłukowy kašćik pokazaś
changeset_navigation:
navigation:
all:
next_tooltip: Pśiduca sajźba změnow
prev_tooltip: Pjerwjejšna sajźba změnow
next_changeset_tooltip: Pśiduca sajźba změnow
prev_changeset_tooltip: Pjerwjejšna sajźba změnow
user:
name_tooltip: Změny wužywarja {{user}} pokazaś
next_tooltip: Pśiduca změna wót {{user}}
prev_tooltip: Pjerwjejšna změna wót {{user}}
name_changeset_tooltip: Změny wužywarja {{user}} pokazaś
next_changeset_tooltip: Pśiduca změna wót {{user}}
prev_changeset_tooltip: Pjerwjejšna změna wót {{user}}
common_details:
changeset_comment: "Komentar:"
edited_at: "Wobźěłany:"

View file

@ -89,7 +89,7 @@ en:
feed:
title: "Changeset {{id}}"
title_comment: "Changeset {{id}} - {{comment}}"
changeset_navigation:
navigation:
paging:
user:
prev: "&laquo; {{id}}"
@ -98,12 +98,18 @@ en:
prev: "&laquo; {{id}}"
next: "{{id}} &raquo;"
user:
name_tooltip: "View edits by {{user}}"
prev_tooltip: "Previous edit by {{user}}"
next_tooltip: "Next edit by {{user}}"
name_changeset_tooltip: "View edits by {{user}}"
prev_changeset_tooltip: "Previous edit by {{user}}"
next_changeset_tooltip: "Next edit by {{user}}"
all:
prev_tooltip: "Previous changeset"
next_tooltip: "Next changeset"
prev_node_tooltip: "Previous node"
next_node_tooltip: "Next node"
prev_way_tooltip: "Previous way"
next_way_tooltip: "Next way"
prev_relation_tooltip: "Previous relation"
next_relation_tooltip: "Next relation"
prev_changeset_tooltip: "Previous changeset"
next_changeset_tooltip: "Next changeset"
changeset_details:
created_at: "Created at:"
closed_at: "Closed at:"
@ -233,6 +239,10 @@ en:
# There is no 'relation' type because it is not represented in OpenLayers
tag_details:
tags: "Tags:"
wiki_link:
key: "The wiki description page for the {{key}} tag"
tag: "The wiki description page for the {{key}}={{value}} tag"
wikipedia_link: "The {{page}} article on Wikipedia"
way_details:
nodes: "Nodes:"
part_of: "Part of:"
@ -914,6 +924,7 @@ en:
help_wiki: "Help &amp; Wiki"
help_wiki_tooltip: "Help &amp; Wiki site for the project"
help_wiki_url: "http://wiki.openstreetmap.org"
copyright: "Copyright &amp; License"
news_blog: "News blog"
news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
shop: Shop

View file

@ -88,14 +88,14 @@ eo:
other: "havas tiujn {{count}} vojojn:"
no_bounding_box: Neniu limskatolo estis registrita por tiu ŝanĝaro.
show_area_box: Montri la skatolon de la areo
changeset_navigation:
navigation:
all:
next_tooltip: Sekvanta ŝanĝaro
prev_tooltip: Antaŭa ŝanĝaro
next_changeset_tooltip: Sekvanta ŝanĝaro
prev_changeset_tooltip: Antaŭa ŝanĝaro
user:
name_tooltip: Vidi redaktojn el {{user}}
next_tooltip: Sekvanta redakto de {{user}}
prev_tooltip: Antaŭa redakto de {{user}}
name_changeset_tooltip: Vidi redaktojn el {{user}}
next_changeset_tooltip: Sekvanta redakto de {{user}}
prev_changeset_tooltip: Antaŭa redakto de {{user}}
common_details:
changeset_comment: "Komento:"
edited_at: "Redaktita je:"

View file

@ -106,14 +106,14 @@ es:
has_ways: "Tiene {{count}} vías:"
no_bounding_box: No se ha guardado una envoltura para este conjunto de cambios
show_area_box: Mostrar caja del Área
changeset_navigation:
navigation:
all:
next_tooltip: Siguiente conjunto de cambios
prev_tooltip: Conjunto de cambios anterior
next_changeset_tooltip: Siguiente conjunto de cambios
prev_changeset_tooltip: Conjunto de cambios anterior
user:
name_tooltip: Ver ediciones hechas por {{user}}
next_tooltip: Próxima edición por {{user}}
prev_tooltip: Ediciones previas hechas por {{user}}
name_changeset_tooltip: Ver ediciones hechas por {{user}}
next_changeset_tooltip: Próxima edición por {{user}}
prev_changeset_tooltip: Ediciones previas hechas por {{user}}
common_details:
changeset_comment: "Comentario:"
edited_at: Editado en

View file

@ -99,14 +99,14 @@ fi:
other: "Sisältää seuraavat {{count}} polkua:"
no_bounding_box: Tässä muutoskokoelmassa ei ole rajattua aluetta.
show_area_box: Näytä rajattu alue
changeset_navigation:
navigation:
all:
next_tooltip: Seuraava muutoskokoelma
prev_tooltip: Edellinen muutoskokoelma
next_changeset_tooltip: Seuraava muutoskokoelma
prev_changeset_tooltip: Edellinen muutoskokoelma
user:
name_tooltip: Näytä käyttäjän {{user}} muutokset
next_tooltip: Käyttäjän {{user}} seuraava muutos
prev_tooltip: Käyttäjän {{user}} edellinen muutos
name_changeset_tooltip: Näytä käyttäjän {{user}} muutokset
next_changeset_tooltip: Käyttäjän {{user}} seuraava muutos
prev_changeset_tooltip: Käyttäjän {{user}} edellinen muutos
common_details:
changeset_comment: "Kommentti:"
edited_at: "Muokattu:"

View file

@ -109,14 +109,14 @@ fr:
has_ways: "Concerne les {{count}} chemins suivants :"
no_bounding_box: Aucun cadre de délimitation n'a été stocké pour ce groupe de modifications.
show_area_box: Montrer le cadre de la zone
changeset_navigation:
navigation:
all:
next_tooltip: Groupe de modifications suivant
prev_tooltip: Groupe de modifications précédent
next_changeset_tooltip: Groupe de modifications suivant
prev_changeset_tooltip: Groupe de modifications précédent
user:
name_tooltip: Voir les modifications par {{user}}
next_tooltip: Modifications suivantes par {{user}}
prev_tooltip: Modifications précédentes par {{user}}
name_changeset_tooltip: Voir les modifications par {{user}}
next_changeset_tooltip: Modifications suivantes par {{user}}
prev_changeset_tooltip: Modifications précédentes par {{user}}
common_details:
changeset_comment: "Commentaire :"
edited_at: "Modifié le :"

View file

@ -67,14 +67,14 @@ fur:
has_relations:
one: "Al à la {{count}} relazion ca sot:"
other: "Al à lis {{count}} relazions ca sot:"
changeset_navigation:
navigation:
all:
next_tooltip: Grup di cambiaments sucessîf
prev_tooltip: Grup di cambiaments precedent
next_changeset_tooltip: Grup di cambiaments sucessîf
prev_changeset_tooltip: Grup di cambiaments precedent
user:
name_tooltip: Vîot i cambiaments di {{user}}
next_tooltip: Cambiament sucessîf di {{user}}
prev_tooltip: Cambiament precedent di {{user}}
name_changeset_tooltip: Vîot i cambiaments di {{user}}
next_changeset_tooltip: Cambiament sucessîf di {{user}}
prev_changeset_tooltip: Cambiament precedent di {{user}}
common_details:
changeset_comment: "Coment:"
edited_at: "Cambiât ai:"

View file

@ -81,14 +81,14 @@ gl:
other: "Ten os seguintes {{count}} camiños:"
no_bounding_box: Non se seleccionou ningunha caixa de envoltura para este conxunto de cambios.
show_area_box: Amosar a caixa de zona
changeset_navigation:
navigation:
all:
next_tooltip: Seguinte conxunto de cambios
prev_tooltip: Conxunto de cambios anterior
next_changeset_tooltip: Seguinte conxunto de cambios
prev_changeset_tooltip: Conxunto de cambios anterior
user:
name_tooltip: Ver as edicións de {{user}}
next_tooltip: Seguinte edición de {{user}}
prev_tooltip: Edición anterior de {{user}}
name_changeset_tooltip: Ver as edicións de {{user}}
next_changeset_tooltip: Seguinte edición de {{user}}
prev_changeset_tooltip: Edición anterior de {{user}}
common_details:
changeset_comment: "Comentario:"
edited_at: "Editado o:"

View file

@ -30,14 +30,14 @@ gsw:
other: "Het die {{count}} Wäg:"
no_bounding_box: Fir des Changeset isch kei Beryych gspycheret.
show_area_box: Beryychsgränzen aazeige
changeset_navigation:
navigation:
all:
next_tooltip: Negscht Changeset
prev_tooltip: Vorig Changeset
next_changeset_tooltip: Negscht Changeset
prev_changeset_tooltip: Vorig Changeset
user:
name_tooltip: Änderige vu {{user}} aazeige
next_tooltip: Negschti Änderig vu {{user}}
prev_tooltip: Vorigi Änderig vu {{user}}
name_changeset_tooltip: Änderige vu {{user}} aazeige
next_changeset_tooltip: Negschti Änderig vu {{user}}
prev_changeset_tooltip: Vorigi Änderig vu {{user}}
common_details:
changeset_comment: "Kommentar:"
edited_at: "Bearbeitet am:"

View file

@ -45,11 +45,11 @@ he:
box: תיבה
created_at: "נוצר בתאריך:"
show_area_box: הצגת תיבת תחום
changeset_navigation:
navigation:
user:
name_tooltip: צפייה בעריכות של {{user}}
next_tooltip: העריכה הבאה ע"י {{user}}
prev_tooltip: העריכה הקודמת ע"י {{user}}
name_changeset_tooltip: צפייה בעריכות של {{user}}
next_changeset_tooltip: העריכה הבאה ע"י {{user}}
prev_changeset_tooltip: העריכה הקודמת ע"י {{user}}
common_details:
changeset_comment: "הערה:"
containing_relation:

View file

@ -68,9 +68,9 @@ hi:
has_nodes: "निम्नलिखित {{count}} आसंधि है:"
has_relations: "निम्नलिखित {{count}} संबंध है:"
has_ways: "निम्नलिखित {{count}} रस्ते है:"
changeset_navigation:
navigation:
user:
prev_tooltip: "{{user}} द्वारा पूर्व संपादित"
prev_changeset_tooltip: "{{user}} द्वारा पूर्व संपादित"
common_details:
changeset_comment: "टिप्पणी:"
edited_at: "समय, जिस पर संपादित:"

View file

@ -108,14 +108,14 @@ hr:
other: "Sadrži slijedećih {{count}} puteva:"
no_bounding_box: Granični okvir nije pohranjen za ovaj set promjena.
show_area_box: Prikaži granični okvir
changeset_navigation:
navigation:
all:
next_tooltip: Slijedeći changeset
prev_tooltip: Prethodni changeset
next_changeset_tooltip: Slijedeći changeset
prev_changeset_tooltip: Prethodni changeset
user:
name_tooltip: "Prikaži promjene korisnika: {{user}}"
next_tooltip: Slijedeća promjena od {{user}}
prev_tooltip: Prethodno uredio {{user}}
name_changeset_tooltip: "Prikaži promjene korisnika: {{user}}"
next_changeset_tooltip: Slijedeća promjena od {{user}}
prev_changeset_tooltip: Prethodno uredio {{user}}
common_details:
changeset_comment: "Komentar:"
edited_at: "Uređeno:"

View file

@ -109,14 +109,14 @@ hsb:
two: "Ma slědowacej {{count}} pućej:"
no_bounding_box: Za tutu sadźbu změnow njeje so wuběranski wobłuk składował.
show_area_box: Wobłukowy kašćik pokazać
changeset_navigation:
navigation:
all:
next_tooltip: Přichodna sadźba změnow
prev_tooltip: Předchadna sadźba změnow
next_changeset_tooltip: Přichodna sadźba změnow
prev_changeset_tooltip: Předchadna sadźba změnow
user:
name_tooltip: Změny wot wužiwarja {{user}} pokazać
next_tooltip: Přichodna změna wot wužiwarja {{user}}
prev_tooltip: Předchadna změna wot wužiwarja {{user}}
name_changeset_tooltip: Změny wot wužiwarja {{user}} pokazać
next_changeset_tooltip: Přichodna změna wot wužiwarja {{user}}
prev_changeset_tooltip: Předchadna změna wot wužiwarja {{user}}
common_details:
changeset_comment: "Komentar:"
edited_at: "Wobdźěłany:"

View file

@ -106,14 +106,14 @@ hu:
other: "A következő {{count}} vonalat tartalmazza:"
no_bounding_box: Nincs eltárolva határoló ehhez a módosításcsomaghoz.
show_area_box: Területhatároló megtekintése
changeset_navigation:
navigation:
all:
next_tooltip: Következő módosításcsomag
prev_tooltip: Előző módosításcsomag
next_changeset_tooltip: Következő módosításcsomag
prev_changeset_tooltip: Előző módosításcsomag
user:
name_tooltip: "{{user}} szerkesztéseinek megtekintése"
next_tooltip: "{{user}} következő szerkesztése"
prev_tooltip: "{{user}} előző szerkesztése"
name_changeset_tooltip: "{{user}} szerkesztéseinek megtekintése"
next_changeset_tooltip: "{{user}} következő szerkesztése"
prev_changeset_tooltip: "{{user}} előző szerkesztése"
common_details:
changeset_comment: "Megjegyzés:"
edited_at: "Szerkesztve:"

View file

@ -103,14 +103,14 @@ ia:
other: "Ha le sequente {{count}} vias:"
no_bounding_box: Nulle quadro de delimitation ha essite memorisate pro iste gruppo de modificationes.
show_area_box: Monstrar quadro del area
changeset_navigation:
navigation:
all:
next_tooltip: Gruppo de modificationes sequente
prev_tooltip: Gruppo de modificationes precedente
next_changeset_tooltip: Gruppo de modificationes sequente
prev_changeset_tooltip: Gruppo de modificationes precedente
user:
name_tooltip: Vider modifications per {{user}}
next_tooltip: Modification sequente per {{user}}
prev_tooltip: Modification precedente per {{user}}
name_changeset_tooltip: Vider modifications per {{user}}
next_changeset_tooltip: Modification sequente per {{user}}
prev_changeset_tooltip: Modification precedente per {{user}}
common_details:
changeset_comment: "Commento:"
edited_at: "Modificate le:"

View file

@ -103,14 +103,14 @@ is:
other: "Inniheldur {{count}} vegi:"
no_bounding_box: Engin svæðismörk voru vistuð ásamt þessu breytingarsetti.
show_area_box: Sýna svæðismörk á aðalkorti
changeset_navigation:
navigation:
all:
next_tooltip: Næsta breytingarsett
prev_tooltip: Fyrra breytingarsett
next_changeset_tooltip: Næsta breytingarsett
prev_changeset_tooltip: Fyrra breytingarsett
user:
name_tooltip: Skoða breytingarsett eftir {{user}}
next_tooltip: Næsta breytingarsett eftir {{user}}
prev_tooltip: Fyrri breytingarsett eftir {{user}}
name_changeset_tooltip: Skoða breytingarsett eftir {{user}}
next_changeset_tooltip: Næsta breytingarsett eftir {{user}}
prev_changeset_tooltip: Fyrri breytingarsett eftir {{user}}
common_details:
changeset_comment: "Athugasemd:"
edited_at: "Breytt:"

View file

@ -94,14 +94,14 @@ it:
has_ways: "Possiede i seguenti {{count}} percorsi:"
no_bounding_box: Per questo gruppo di modifiche non è stato memorizzato alcun riquadro di selezione.
show_area_box: Mostra il riquadro dell'area
changeset_navigation:
navigation:
all:
next_tooltip: Gruppo di modifiche successivo
prev_tooltip: Gruppo di modifiche precedente
next_changeset_tooltip: Gruppo di modifiche successivo
prev_changeset_tooltip: Gruppo di modifiche precedente
user:
name_tooltip: Visualizza le modifiche di {{user}}
next_tooltip: Modifica successiva di {{user}}
prev_tooltip: Modifica precedente di {{user}}
name_changeset_tooltip: Visualizza le modifiche di {{user}}
next_changeset_tooltip: Modifica successiva di {{user}}
prev_changeset_tooltip: Modifica precedente di {{user}}
common_details:
changeset_comment: "Commento:"
edited_at: "Modificato il:"

View file

@ -95,14 +95,14 @@ ja:
has_ways: "次の {{count}} ウェイを持ちます:"
no_bounding_box: この変更セットを格納する境界囲みは存在しません。
show_area_box: 領域範囲表示
changeset_navigation:
navigation:
all:
next_tooltip: 次の変更セット
prev_tooltip: 一つ前の変更セット
next_changeset_tooltip: 次の変更セット
prev_changeset_tooltip: 一つ前の変更セット
user:
name_tooltip: "{{user}}による編集を表示"
next_tooltip: 次の編集({{user}}による)
prev_tooltip: 前の編集({{user}}による)
name_changeset_tooltip: "{{user}}による編集を表示"
next_changeset_tooltip: 次の編集({{user}}による)
prev_changeset_tooltip: 前の編集({{user}}による)
common_details:
changeset_comment: "コメント:"
edited_at: "編集日:"

View file

@ -57,14 +57,14 @@ km:
title: សំនុំ​បំលាស់ប្តូរ​ {{id}}
title_comment: សំនុំ​បំលាស់ប្តូរ​ {{id}} - {{comment}}
title: សំនុំ​បំលាស់ប្តូរ​
changeset_navigation:
navigation:
all:
next_tooltip: សំនុំ​បំលាស់ប្តូរ​បន្ទាប់
prev_tooltip: សំនុំ​បំលាស់ប្តូរ​មុន​
next_changeset_tooltip: សំនុំ​បំលាស់ប្តូរ​បន្ទាប់
prev_changeset_tooltip: សំនុំ​បំលាស់ប្តូរ​មុន​
user:
name_tooltip: មើលកំណែប្រែ​ដោយ {{user}}
next_tooltip: កំណែប្រែ​បន្ទាប់ ដោយ {{user}}
prev_tooltip: កំណែប្រែ​មុខ ដោយ {{user}}
name_changeset_tooltip: មើលកំណែប្រែ​ដោយ {{user}}
next_changeset_tooltip: កំណែប្រែ​បន្ទាប់ ដោយ {{user}}
prev_changeset_tooltip: កំណែប្រែ​មុខ ដោយ {{user}}
common_details:
changeset_comment: មតិយោបល់​៖
edited_at: បានកែប្រែនៅ​៖

View file

@ -103,14 +103,14 @@ mk:
other: "Ги има следниве {{count}} патишта:"
no_bounding_box: Нема зачувано рамка за овие измени.
show_area_box: Прикажи рамка
changeset_navigation:
navigation:
all:
next_tooltip: "Следни измени:"
prev_tooltip: "Претходни измени:"
next_changeset_tooltip: "Следни измени:"
prev_changeset_tooltip: "Претходни измени:"
user:
name_tooltip: Погледај уредувања на {{user}}
next_tooltip: Следно уредување на {{user}}
prev_tooltip: Претходно уредување на {{user}}
name_changeset_tooltip: Погледај уредувања на {{user}}
next_changeset_tooltip: Следно уредување на {{user}}
prev_changeset_tooltip: Претходно уредување на {{user}}
common_details:
changeset_comment: "Коментар:"
edited_at: "Уредено во:"

View file

@ -47,11 +47,11 @@ nds:
belongs_to: "Höört to:"
closed_at: "Slaten ann:"
created_at: "Opstellt ann:"
changeset_navigation:
navigation:
user:
name_tooltip: Ännern von {{user}} ankieken
next_tooltip: Tokamen Ännern von {{user}}
prev_tooltip: Vörig Ännern von {{user}}
name_changeset_tooltip: Ännern von {{user}} ankieken
next_changeset_tooltip: Tokamen Ännern von {{user}}
prev_changeset_tooltip: Vörig Ännern von {{user}}
common_details:
changeset_comment: "Kommentar:"
edited_at: "Ännert ann:"

View file

@ -18,14 +18,14 @@ ne:
closed_at: "बन्द गरिएको:"
created_at: "श्रृजना गरिएको:"
show_area_box: क्षेत्र बाकस देखाउने
changeset_navigation:
navigation:
all:
next_tooltip: पछिल्लो चेन्जसेट
prev_tooltip: अघिल्लो चेन्जसेट
next_changeset_tooltip: पछिल्लो चेन्जसेट
prev_changeset_tooltip: अघिल्लो चेन्जसेट
user:
name_tooltip: " {{user}}को सम्पादन हेर्ने"
next_tooltip: पछिल्लो सम्पादन {{user}}
prev_tooltip: पहिलो सम्पादन {{user}}
name_changeset_tooltip: " {{user}}को सम्पादन हेर्ने"
next_changeset_tooltip: पछिल्लो सम्पादन {{user}}
prev_changeset_tooltip: पहिलो सम्पादन {{user}}
common_details:
changeset_comment: "टिप्पणी:"
edited_at: "समपादित :"

View file

@ -106,14 +106,14 @@ nl:
has_ways: "Bevat de volgende {{count}} ways:"
no_bounding_box: Er is geen selectiekader opgeslagen voor deze set wijzigingen.
show_area_box: Gebied weergeven
changeset_navigation:
navigation:
all:
next_tooltip: Volgende set wijzigingen
prev_tooltip: Vorige set wijzigingen
next_changeset_tooltip: Volgende set wijzigingen
prev_changeset_tooltip: Vorige set wijzigingen
user:
name_tooltip: Bewerkingen van {{user}} bekijken
next_tooltip: Volgende beweking door {{user}}
prev_tooltip: Vorige bewerking door {{user}}
name_changeset_tooltip: Bewerkingen van {{user}} bekijken
next_changeset_tooltip: Volgende beweking door {{user}}
prev_changeset_tooltip: Vorige bewerking door {{user}}
common_details:
changeset_comment: "Opmerking:"
edited_at: "Bewerkt op:"

View file

@ -107,14 +107,14 @@
other: "Har følgende {{count}} veier:"
no_bounding_box: Ingen bounding box er lagret for dette endringssettet.
show_area_box: Vis boks for område
changeset_navigation:
navigation:
all:
next_tooltip: Neste endringssett
prev_tooltip: Forrige endringssett
next_changeset_tooltip: Neste endringssett
prev_changeset_tooltip: Forrige endringssett
user:
name_tooltip: Vis redigeringer av {{user}}
next_tooltip: Neste redigering av {{user}}
prev_tooltip: Forrige redigering av {{user}}
name_changeset_tooltip: Vis redigeringer av {{user}}
next_changeset_tooltip: Neste redigering av {{user}}
prev_changeset_tooltip: Forrige redigering av {{user}}
common_details:
changeset_comment: "Kommentar:"
edited_at: "Redigert:"

View file

@ -110,14 +110,14 @@ pl:
other: "Zawiera następujących {{count}} dróg:"
no_bounding_box: Ten zestaw zmian został zapisany bez obszaru edycji.
show_area_box: Pokaż obszar prostokątu
changeset_navigation:
navigation:
all:
next_tooltip: Następny zestaw zmian
prev_tooltip: Poprzedni zestaw zmian
next_changeset_tooltip: Następny zestaw zmian
prev_changeset_tooltip: Poprzedni zestaw zmian
user:
name_tooltip: Zobacz edycje wykonane przez użytkownika {{user}}
next_tooltip: Następna edycja wykonana przez użytkownika {{user}}
prev_tooltip: Poprzednia edycja wykonana przez użytkownika {{user}}
name_changeset_tooltip: Zobacz edycje wykonane przez użytkownika {{user}}
next_changeset_tooltip: Następna edycja wykonana przez użytkownika {{user}}
prev_changeset_tooltip: Poprzednia edycja wykonana przez użytkownika {{user}}
common_details:
changeset_comment: "Komentarz:"
edited_at: "Edytowano:"

View file

@ -107,10 +107,10 @@ pt-BR:
other: "Tem os seguintes {{count}} caminhos:"
no_bounding_box: Nenhum limite de área foi armazenado para estas alterações.
show_area_box: Área de exibição
changeset_navigation:
navigation:
all:
next_tooltip: Próximo conjunto de alterações
prev_tooltip: Conjunto de alterações anterior
next_changeset_tooltip: Próximo conjunto de alterações
prev_changeset_tooltip: Conjunto de alterações anterior
paging:
all:
next: "{{id}} &raquo;"
@ -119,9 +119,9 @@ pt-BR:
next: "{{id}} &raquo;"
prev: "&laquo; {{id}}"
user:
name_tooltip: Ver edições de {{user}}
next_tooltip: Editado posteriormente por {{user}}
prev_tooltip: Editado anteriormente por {{user}}
name_changeset_tooltip: Ver edições de {{user}}
next_changeset_tooltip: Editado posteriormente por {{user}}
prev_changeset_tooltip: Editado anteriormente por {{user}}
common_details:
changeset_comment: "Comentário:"
edited_at: "Editado em:"

View file

@ -10,11 +10,11 @@ pt:
belongs_to: "Pertence a:"
closed_at: "Fechado em:"
created_at: "Criado em:"
changeset_navigation:
navigation:
user:
name_tooltip: Ver edições de {{user}}
next_tooltip: Próxima edição por {{user}}
prev_tooltip: Edição anterior por {{user}}
name_changeset_tooltip: Ver edições de {{user}}
next_changeset_tooltip: Próxima edição por {{user}}
prev_changeset_tooltip: Edição anterior por {{user}}
common_details:
changeset_comment: "Comentário:"
edited_at: "Editado em:"

View file

@ -84,11 +84,11 @@ ro:
has_ways: "Are următoarele {{count}} căi:"
no_bounding_box: Nicio cutie împrejmuitoare nu a fost salvată pentru acest set de modificări.
show_area_box: Afișează cutia zonei
changeset_navigation:
navigation:
user:
name_tooltip: Vezi editările lui {{user}}
next_tooltip: Următoarea editare de {{user}}
prev_tooltip: Editarea precedentă de {{user}}
name_changeset_tooltip: Vezi editările lui {{user}}
next_changeset_tooltip: Următoarea editare de {{user}}
prev_changeset_tooltip: Editarea precedentă de {{user}}
common_details:
changeset_comment: "Comentariu:"
edited_at: "Editat la:"

View file

@ -109,14 +109,14 @@ ru:
has_ways: "Содержит {{count}} линий:"
no_bounding_box: Для этого пакета правок границы не установлены.
show_area_box: Показать выделенную область
changeset_navigation:
navigation:
all:
next_tooltip: Следующий пакет правок
prev_tooltip: Предыдущий пакет правок
next_changeset_tooltip: Следующий пакет правок
prev_changeset_tooltip: Предыдущий пакет правок
user:
name_tooltip: Просмотр правок {{user}}
next_tooltip: Следующая правка {{user}}
prev_tooltip: Предыдущая правка {{user}}
name_changeset_tooltip: Просмотр правок {{user}}
next_changeset_tooltip: Следующая правка {{user}}
prev_changeset_tooltip: Предыдущая правка {{user}}
common_details:
changeset_comment: "Комментарий:"
edited_at: "Изменено:"

View file

@ -99,14 +99,14 @@ sk:
other: "Obsahuje nasledujúce {{count}} cesty:"
no_bounding_box: Pre tento počet zmien nie je uložený žiadny rozsah.
show_area_box: Zobraziť Rám Oblasti
changeset_navigation:
navigation:
all:
next_tooltip: Nasledujúci súbor zmien
prev_tooltip: Predchádzajúci súbor zmien
next_changeset_tooltip: Nasledujúci súbor zmien
prev_changeset_tooltip: Predchádzajúci súbor zmien
user:
name_tooltip: Zobraziť úpravy od {{user}}
next_tooltip: Ďalšia úprava od {{user}}
prev_tooltip: Predošlá úprava od {{user}}
name_changeset_tooltip: Zobraziť úpravy od {{user}}
next_changeset_tooltip: Ďalšia úprava od {{user}}
prev_changeset_tooltip: Predošlá úprava od {{user}}
common_details:
changeset_comment: "Komentár:"
edited_at: "Upravené o:"

View file

@ -81,14 +81,14 @@ sl:
other: "Vsebuje naslednjih {{count}} poti:"
no_bounding_box: Ta paket nima določenega pravokotnega področja.
show_area_box: Prikaži pravokotno področje
changeset_navigation:
navigation:
all:
next_tooltip: Naslednji paket sprememb
prev_tooltip: Prejšnji paket sprememb
next_changeset_tooltip: Naslednji paket sprememb
prev_changeset_tooltip: Prejšnji paket sprememb
user:
name_tooltip: Prikaz prispevkov uporabnika {{user}}
next_tooltip: Naslednji prispevek uporabnika {{user}}
prev_tooltip: Prejšnji prispevek uporabnika {{user}}
name_changeset_tooltip: Prikaz prispevkov uporabnika {{user}}
next_changeset_tooltip: Naslednji prispevek uporabnika {{user}}
prev_changeset_tooltip: Prejšnji prispevek uporabnika {{user}}
common_details:
edited_at: "Urejeno ob:"
edited_by: "Uredil:"

View file

@ -101,14 +101,14 @@ sr-EC:
few: "Има следеће {{count}} путање:"
one: "Има следећу путању:"
other: "Има следећих {{count}} путања:"
changeset_navigation:
navigation:
all:
next_tooltip: Следећи скуп измена
prev_tooltip: Претходни скуп измена
next_changeset_tooltip: Следећи скуп измена
prev_changeset_tooltip: Претходни скуп измена
user:
name_tooltip: Види измене корисника {{user}}
next_tooltip: Следећа измена корисника {{user}}
prev_tooltip: Претходна измена корисника {{user}}
name_changeset_tooltip: Види измене корисника {{user}}
next_changeset_tooltip: Следећа измена корисника {{user}}
prev_changeset_tooltip: Претходна измена корисника {{user}}
common_details:
changeset_comment: "Напомена:"
edited_at: "Измењено:"

View file

@ -100,14 +100,14 @@ sv:
other: "Innehåller följande {{count}} sträckor:"
no_bounding_box: Inga yttre gränser (bounding box) lagrades för detta changeset.
show_area_box: Visa boxarea
changeset_navigation:
navigation:
all:
next_tooltip: Nästa ändringsset
prev_tooltip: Föregående ändringsset
next_changeset_tooltip: Nästa ändringsset
prev_changeset_tooltip: Föregående ändringsset
user:
name_tooltip: Se redigeringar av {{user}}
next_tooltip: Nästa redigering av {{user}}
prev_tooltip: Föregående redigering av {{user}}
name_changeset_tooltip: Se redigeringar av {{user}}
next_changeset_tooltip: Nästa redigering av {{user}}
prev_changeset_tooltip: Föregående redigering av {{user}}
common_details:
changeset_comment: "Kommentar:"
edited_at: "Redigerad:"

View file

@ -41,9 +41,9 @@ te:
relation: సంబంధం
user: వాడుకరి
browse:
changeset_navigation:
navigation:
user:
name_tooltip: "{{user}} యొక్క మార్పులను చూడండి"
name_changeset_tooltip: "{{user}} యొక్క మార్పులను చూడండి"
common_details:
changeset_comment: "వ్యాఖ్య:"
edited_by: "మార్చినది:"

View file

@ -109,14 +109,14 @@ uk:
other: "містить {{count}} ліній:"
no_bounding_box: Для цього набору змін межі не встановлено.
show_area_box: Показати виділену ділянку
changeset_navigation:
navigation:
all:
next_tooltip: Наступний набір змін
prev_tooltip: Попередній набір змін
next_changeset_tooltip: Наступний набір змін
prev_changeset_tooltip: Попередній набір змін
user:
name_tooltip: Переглянути правки {{user}}
next_tooltip: Наступні зміни {{user}}
prev_tooltip: Попередні зміни {{user}}
name_changeset_tooltip: Переглянути правки {{user}}
next_changeset_tooltip: Наступні зміни {{user}}
prev_changeset_tooltip: Попередні зміни {{user}}
common_details:
changeset_comment: "Коментар:"
edited_at: "Змінено:"

View file

@ -103,14 +103,14 @@ vi:
other: "Có {{count}} lối sau:"
no_bounding_box: Không lưu hộp bao của bộ thay đổi này.
show_area_box: Hiện Hộp vùng
changeset_navigation:
navigation:
all:
next_tooltip: Bộ thay đổi sau
prev_tooltip: Bộ thay đổi trước
next_changeset_tooltip: Bộ thay đổi sau
prev_changeset_tooltip: Bộ thay đổi trước
user:
name_tooltip: Xem các đóng góp của {{user}}
next_tooltip: Đóng góp sau của {{user}}
prev_tooltip: Đóng góp trước của {{user}}
name_changeset_tooltip: Xem các đóng góp của {{user}}
next_changeset_tooltip: Đóng góp sau của {{user}}
prev_changeset_tooltip: Đóng góp trước của {{user}}
common_details:
changeset_comment: "Miêu tả:"
edited_at: "Lúc Sửa đổi:"

View file

@ -93,14 +93,14 @@ zh-TW:
other: 有下列 {{count}} 個路徑:
no_bounding_box: 這個變更組合沒有儲存綁定方塊。
show_area_box: 顯示區域方塊
changeset_navigation:
navigation:
all:
next_tooltip: 下一個變更組合
prev_tooltip: 上一個變更組合
next_changeset_tooltip: 下一個變更組合
prev_changeset_tooltip: 上一個變更組合
user:
name_tooltip: 檢視由 {{user}} 進行的編輯
next_tooltip: 下一個 {{user}} 的編輯
prev_tooltip: 上一個 {{user}} 的編輯
name_changeset_tooltip: 檢視由 {{user}} 進行的編輯
next_changeset_tooltip: 下一個 {{user}} 的編輯
prev_changeset_tooltip: 上一個 {{user}} 的編輯
common_details:
edited_at: 編輯於:
edited_by: 編輯者:

View file

@ -44,14 +44,42 @@ OpenLayers/Popup/FramedCloud.js
OpenLayers/Projection.js
OpenLayers/Console.js
OpenLayers/Lang.js
OpenLayers/Lang/ar.js
OpenLayers/Lang/be-tarask.js
OpenLayers/Lang/bg.js
OpenLayers/Lang/br.js
OpenLayers/Lang/ca.js
OpenLayers/Lang/cs-CZ.js
OpenLayers/Lang/da-DK.js
OpenLayers/Lang/de.js
OpenLayers/Lang/el.js
OpenLayers/Lang/en.js
OpenLayers/Lang/es.js
OpenLayers/Lang/fi.js
OpenLayers/Lang/fr.js
OpenLayers/Lang/fur.js
OpenLayers/Lang/gl.js
OpenLayers/Lang/gsw.js
OpenLayers/Lang/hr.js
OpenLayers/Lang/hsb.js
OpenLayers/Lang/hu.js
OpenLayers/Lang/ia.js
OpenLayers/Lang/is.js
OpenLayers/Lang/it.js
OpenLayers/Lang/ja.js
OpenLayers/Lang/km.js
OpenLayers/Lang/ksh.js
OpenLayers/Lang/nb.js
OpenLayers/Lang/nds.js
OpenLayers/Lang/nl.js
OpenLayers/Lang/nn.js
OpenLayers/Lang/pt.js
OpenLayers/Lang/pt-BR.js
OpenLayers/Lang/ru.js
OpenLayers/Lang/sk.js
OpenLayers/Lang/sv-SE.js
OpenLayers/Lang/te.js
OpenLayers/Lang/vi.js
OpenLayers/Lang/zh-CN.js
OpenLayers/Lang/zh-TW.js

View file

@ -88,6 +88,7 @@ ActionController::Routing::Routes.draw do |map|
map.root :controller => 'site', :action => 'index'
map.connect '/', :controller => 'site', :action => 'index'
map.connect '/edit', :controller => 'site', :action => 'edit'
map.connect '/copyright', :controller => 'site', :action => 'copyright'
map.connect '/history', :controller => 'changeset', :action => 'list'
map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom
map.connect '/export', :controller => 'site', :action => 'export'

1433
config/wiki_pages.yml Normal file

File diff suppressed because it is too large Load diff

1
db/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*_structure.sql

2
db/functions/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*.o
*.so

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,7 @@
.olLayerGoogleCopyright {
right: 3px;
bottom: 2px;
bottom: 2px;
left: auto;
}
.olLayerGooglePoweredBy {
left: 2px;

View file

@ -1,5 +1,5 @@
div.olMap {
z-index: 0;
z-index: 0;
padding: 0px!important;
margin: 0px!important;
cursor: default;
@ -36,6 +36,8 @@ div.olLayerDiv {
font-size: smaller;
}
.olControlScaleLine {
display: block;
position: absolute;
left: 10px;
bottom: 15px;
font-size: xx-small;
@ -214,12 +216,12 @@ div.olControlMousePosition {
.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive {
background-position: -26px -23px ;
}
.olControlSaveFeaturesItemActive {
div.olControlSaveFeaturesItemActive {
background-image: url(img/save_features_on.png);
background-repeat: no-repeat;
background-position: 0px 1px;
}
.olControlSaveFeaturesItemInactive {
div.olControlSaveFeaturesItemInactive {
background-image: url(img/save_features_off.png);
background-repeat: no-repeat;
background-position: 0px 1px;
@ -322,6 +324,12 @@ div.olControlMousePosition {
-moz-user-select: none;
}
.olImageLoadError {
background-color: pink;
opacity: 0.5;
filter: alpha(opacity=50); /* IE */
}
/**
* Cursor styles
*/
@ -341,3 +349,49 @@ div.olControlMousePosition {
.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown {
cursor: -moz-grabbing;
}
/**
* Layer switcher
*/
.olControlLayerSwitcher {
position: absolute;
top: 25px;
right: 0px;
width: 20em;
font-family: sans-serif;
font-weight: bold;
margin-top: 3px;
margin-left: 3px;
margin-bottom: 3px;
font-size: smaller;
color: white;
background-color: transparent;
}
.olControlLayerSwitcher .layersDiv {
padding-top: 5px;
padding-left: 10px;
padding-bottom: 5px;
padding-right: 75px;
background-color: darkblue;
width: 100%;
height: 100%;
}
.olControlLayerSwitcher .layersDiv .baseLbl,
.olControlLayerSwitcher .layersDiv .dataLbl {
margin-top: 3px;
margin-left: 3px;
margin-bottom: 3px;
}
.olControlLayerSwitcher .layersDiv .baseLayersDiv,
.olControlLayerSwitcher .layersDiv .dataLayersDiv {
padding-left: 10px;
}
.olControlLayerSwitcher .maximizeDiv,
.olControlLayerSwitcher .minimizeDiv {
top: 5px;
right: 0px;
}

View file

@ -22,7 +22,7 @@ Disallow: /*relation=
User-agent: Slurp
Disallow: /user/*/traces/
Disallow: /user/*/edits/
Disallow: /user/*/edits
Disallow: /user/*/diary/
Allow: /user/
Disallow: /traces/tag/
@ -48,7 +48,7 @@ Disallow: /*relation=
User-agent: Googlebot
Disallow: /user/*/traces/
Disallow: /user/*/edits/
Disallow: /user/*/edits
Disallow: /user/*/diary/
Allow: /user/
Disallow: /traces/tag/

View file

@ -526,6 +526,28 @@ hr {
font-weight: bold;
}
/* Rules for the data browser */
#browse_navigation {
float: right;
width: 250px;
text-align: center;
margin-left: 10px;
}
#browse_map {
float: right;
width: 250px;
text-align: right;
margin-left: 10px;
}
#browse_map #small_map {
width: 250px;
height: 300px;
border: solid 1px black;
}
/* Rules for the trace list shown by the traces tab etc */
#trace_list {

View file

@ -0,0 +1,149 @@
#!/usr/bin/env perl
use 5.010;
use strict;
use warnings;
use Pod::Usage ();
use Getopt::Long ();
BEGIN {
eval "require MediaWiki::API; require YAML::XS;" or do {
print "You have to install some modules via CPAN to run this:\n";
print " sudo cpanp MediaWiki::API YAML::XS\n";
exit 1;
};
}
use MediaWiki::API;
use YAML::XS qw(Dump);
use Test::More 'no_plan';
=head1 NAME
update-wiki-pages - Scrape the wiki for key/value wiki description pages
=head1 SYNOPSIS
perl script/misc/update-wiki-pages config/wiki_pages.yml
Or with prove(1):
prove -e 'perl script/misc/update-wiki-pages' config/wiki_pages.yml
=cut
# Get the command-line options
Getopt::Long::Parser->new(
config => [ qw< bundling no_ignore_case no_require_order pass_through > ],
)->getoptions(
'h|help' => \my $help,
) or help();
# On --help
help() if $help;
help() unless $ARGV[0];
# Get a API interface
my $mw = MediaWiki::API->new();
ok($mw, "Got a MediaWiki API");
$mw->{config}->{api_url} = 'http://wiki.openstreetmap.org/w/api.php';
# All our goodies
my (%feature, %count);
# This is what you get on:
## http://wiki.openstreetmap.org/w/index.php?search=Template:KeyDescription&fulltext=Search&fulltext=Search
for my $lang ('', map { "${_}:" } qw[ Pt Fi De It HU Cz Fr RU Pl ]) {
ok(1, " Templates for language '$lang'");
# Key pages
ok(1, " Getting key pages");
my $cnt = stick_content_in_hash("key", "Template:${lang}KeyDescription", \%feature);
ok(1, " Got $cnt key pages");
$count{key} += $cnt;
# Value pages
ok(1, " Getting value pages");
$cnt = stick_content_in_hash("tag", "Template:${lang}ValueDescription", \%feature);
ok(1, " Got $cnt value pages");
$count{value} += $cnt;
}
ok(1, "Got a total of $count{$_} ${_}s") for qw[ key value ];
# Dump to .yml file
open my $out, ">", $ARGV[0] or die "Can't open file '$ARGV[0]' supplied on the command line";
say $out "# THIS FILE IS AUTOGENERATED WITH THE script/misc/update-wiki-pages";
say $out "# PROGRAM DO NOT MANUALLY EDIT IT";
say $out "";
say $out Dump(\%feature);
close $out;
exit 0;
sub stick_content_in_hash
{
my ($key, $title, $hash) = @_;
my $ukey = ucfirst $key;
my $space_to_underscore = sub {
my $txt = shift;
$txt =~ s/ /_/g;
$txt;
};
my $count = 0;
get_embeddedin(
$title,
sub {
my ($links) = @_;
my (@links) = @$links;
ok(1, " ... got " . scalar(@links) . " more links");
for my $link (@links) {
$count++;
my $title = $link->{title};
if ($title =~ /^$ukey:(?<key_name>.*?)$/) {
# English by default
$hash->{en}->{$key}->{ $space_to_underscore->($+{key_name}) } = $title;
} elsif ($title =~ /^(?<lang>[^:]+):$ukey:(?<key_name>.*?)$/) {
$hash->{lc $+{lang}}->{$key}->{ $space_to_underscore->($+{key_name}) } = $title;
}
}
}
);
return $count;
}
sub get_embeddedin
{
my ($title, $callback) = @_;
my $articles = $mw->list(
{
action => 'query',
list => 'embeddedin',
eititle => $title,
eifilterredir => 'nonredirects',
# Doesn't work for De:* and anything non-en. Odd.
# einamespace => '0|8',
eilimit => '200',
},
{
max => '0',
hook => $callback,
skip_encoding => 1,
}
) || die $mw->{error}->{code} . ': ' . $mw->{error}->{details};
}
sub help
{
my %arg = @_;
Pod::Usage::pod2usage(
-verbose => $arg{ verbose },
-exitval => $arg{ exitval } || 0,
);
}