From: Thomas Wood
Date: Fri, 19 Jun 2009 22:53:16 +0000 (+0000)
Subject: merge 15807:16012 from rails_port
X-Git-Tag: live~7919^2~17
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ff03138a978406b431da71aba64941d87b509098?hp=3828fa6f9f6140f25a02589fad7aa9604a7b091c
merge 15807:16012 from rails_port
---
diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index d3af27217..8124d4a33 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -30,6 +30,9 @@ class BrowseController < ApplicationController
@way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members])
@next = Way.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @way.id }] )
@prev = Way.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @way.id }] )
+
+ # Used for edit link, takes approx middle node of way
+ @midnode = @way.nodes[@way.nodes.length/2]
rescue ActiveRecord::RecordNotFound
@type = "way"
render :action => "not_found", :status => :not_found
diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 165f41306..d3601d47b 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -68,6 +68,12 @@ class DiaryEntryController < ApplicationController
render :action => 'no_such_user', :status => :not_found
end
+ elsif params[:language]
+ @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
+ @entry_pages, @entries = paginate(:diary_entries, :include => :user,
+ :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
+ :order => 'created_at DESC',
+ :per_page => 20)
else
@title = t 'diary_entry.list.title'
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
@@ -93,10 +99,10 @@ class DiaryEntryController < ApplicationController
end
elsif params[:language]
@entries = DiaryEntry.find(:all, :include => :user,
- :conditions => ["users.visible = ? AND diary_entries.language = ?", true, params[:language]],
+ :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
:order => 'created_at DESC', :limit => 20)
- @title = "OpenStreetMap diary entries in #{params[:language]}"
- @description = "Recent diary entries from users of OpenStreetMap"
+ @title = "OpenStreetMap diary entries in #{Language.find(params[:language]).english_name}"
+ @description = "Recent diary entries from users of OpenStreetMap in #{Language.find(params[:language]).english_name}"
@link = "http://#{SERVER_URL}/diary/#{params[:language]}"
else
@entries = DiaryEntry.find(:all, :include => :user,
diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index b4cc6bfa8..2e5e09b45 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -10,27 +10,29 @@ class MessageController < ApplicationController
# Allow the user to write a new message to another user. This action also
# deals with the sending of that message to the other user when the user
# clicks send.
- # The user_id param is the id of the user that the message is being sent to.
+ # The display_name param is the display name of the user that the message is being sent to.
def new
@title = t 'message.new.title'
- @to_user = User.find(params[:user_id])
- if params[:message]
- @message = Message.new(params[:message])
- @message.to_user_id = @to_user.id
- @message.from_user_id = @user.id
- @message.sent_on = Time.now.getutc
-
- if @message.save
- flash[:notice] = t 'message.new.message_sent'
- Notifier::deliver_message_notification(@message)
- redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+ @to_user = User.find_by_display_name(params[:display_name])
+ if @to_user
+ if params[:message]
+ @message = Message.new(params[:message])
+ @message.to_user_id = @to_user.id
+ @message.from_user_id = @user.id
+ @message.sent_on = Time.now.getutc
+
+ if @message.save
+ flash[:notice] = t 'message.new.message_sent'
+ Notifier::deliver_message_notification(@message)
+ redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+ end
+ else
+ @title = params[:title]
end
else
- @title = params[:title]
+ @title = t'message.no_such_user.title'
+ render :action => 'no_such_user', :status => :not_found
end
- rescue ActiveRecord::RecordNotFound
- @title = t'message.no_such_user.title'
- render :action => 'no_such_user', :status => :not_found
end
# Allow the user to reply to another message.
diff --git a/app/models/node.rb b/app/models/node.rb
index 6ef1b9e6f..dd8d96d12 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -82,7 +82,7 @@ class Node < ActiveRecord::Base
raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
node.lat = pt['lat'].to_f
node.lon = pt['lon'].to_f
- raise OSM::APIBadXMLError.new("node", pt, "changeset id missing") if pt['changeset'].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil?
node.changeset_id = pt['changeset'].to_i
raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
@@ -93,17 +93,20 @@ class Node < ActiveRecord::Base
unless create
raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil?
- if pt['id'] != '0'
- node.id = pt['id'].to_i
- end
+ node.id = pt['id'].to_i
+ # .to_i will return 0 if there is no number that can be parsed.
+ # We want to make sure that there is no id with zero anyway
+ raise OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id == 0
end
# We don't care about the time, as it is explicitly set on create/update/delete
# We don't care about the visibility as it is implicit based on the action
-
- tags = []
+ # and set manually before the actual delete
+ node.visible = true
pt.find('tag').each do |tag|
+ raise OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag['k'].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag['v'].nil?
node.add_tag_key_val(tag['k'],tag['v'])
end
diff --git a/app/models/relation.rb b/app/models/relation.rb
index fda5e5677..76cd86729 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -41,27 +41,27 @@ class Relation < ActiveRecord::Base
def self.from_xml_node(pt, create=false)
relation = Relation.new
- if !create and pt['id'] != '0'
- relation.id = pt['id'].to_i
- end
-
- raise OSM::APIBadXMLError.new("relation", pt, "You are missing the required changeset in the relation") if pt['changeset'].nil?
+ raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create or not pt['version'].nil?
+ relation.version = pt['version']
+ raise OSM::APIBadXMLError.new("relation", pt, "Changeset id is missing") if pt['changeset'].nil?
relation.changeset_id = pt['changeset']
-
- # The follow block does not need to be executed because they are dealt with
- # in create_with_history, update_from and delete_with_history
- if create
- relation.timestamp = Time.now.getutc
- relation.visible = true
- relation.version = 0
- else
- if pt['timestamp']
- relation.timestamp = Time.parse(pt['timestamp'])
- end
- relation.version = pt['version']
+
+ unless create
+ raise OSM::APIBadXMLError.new("relation", pt, "ID is required when updating") if pt['id'].nil?
+ relation.id = pt['id'].to_i
+ # .to_i will return 0 if there is no number that can be parsed.
+ # We want to make sure that there is no id with zero anyway
+ raise OSM::APIBadUserInput.new("ID of relation cannot be zero when updating.") if relation.id == 0
end
+
+ # We don't care about the timestamp nor the visibility as these are either
+ # set explicitly or implicit in the action. The visibility is set to true,
+ # and manually set to false before the actual delete.
+ relation.visible = true
pt.find('tag').each do |tag|
+ raise OSM::APIBadXMLError.new("relation", pt, "tag is missing key") if tag['k'].nil?
+ raise OSM::APIBadXMLError.new("relation", pt, "tag is missing value") if tag['v'].nil?
relation.add_tag_keyval(tag['k'], tag['v'])
end
diff --git a/app/models/way.rb b/app/models/way.rb
index 4f988dc9d..8788bd671 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -25,6 +25,7 @@ class Way < ActiveRecord::Base
validates_numericality_of :id, :on => :update, :integer_only => true
validates_associated :changeset
+ # Read in xml as text and return it's Way object representation
def self.from_xml(xml, create=false)
begin
p = XML::Parser.string(xml)
@@ -41,27 +42,27 @@ class Way < ActiveRecord::Base
def self.from_xml_node(pt, create=false)
way = Way.new
- if !create and pt['id'] != '0'
- way.id = pt['id'].to_i
- end
-
+ raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create or not pt['version'].nil?
way.version = pt['version']
- raise OSM::APIBadXMLError.new("node", pt, "Changeset is required") if pt['changeset'].nil?
+ raise OSM::APIBadXMLError.new("way", pt, "Changeset id is missing") if pt['changeset'].nil?
way.changeset_id = pt['changeset']
- # This next section isn't required for the create, update, or delete of ways
- if create
- way.timestamp = Time.now.getutc
- way.visible = true
- else
- if pt['timestamp']
- way.timestamp = Time.parse(pt['timestamp'])
- end
- # if visible isn't present then it defaults to true
- way.visible = (pt['visible'] or true)
+ unless create
+ raise OSM::APIBadXMLError.new("way", pt, "ID is required when updating") if pt['id'].nil?
+ way.id = pt['id'].to_i
+ # .to_i will return 0 if there is no number that can be parsed.
+ # We want to make sure that there is no id with zero anyway
+ raise OSM::APIBadUserInput.new("ID of way cannot be zero when updating.") if way.id == 0
end
+ # We don't care about the timestamp nor the visibility as these are either
+ # set explicitly or implicit in the action. The visibility is set to true,
+ # and manually set to false before the actual delete.
+ way.visible = true
+
pt.find('tag').each do |tag|
+ raise OSM::APIBadXMLError.new("way", pt, "tag is missing key") if tag['k'].nil?
+ raise OSM::APIBadXMLError.new("way", pt, "tag is missing value") if tag['v'].nil?
way.add_tag_keyval(tag['k'], tag['v'])
end
diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index 19aeb7dca..14e8aa503 100644
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -16,7 +16,9 @@
<%= render :partial => "node_details", :object => @node %>
<%= 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") %>
+ :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)
+ %>
<%= render :partial => "map", :object => @node %>
diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 79c913a07..f6a3b2308 100644
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -16,7 +16,9 @@
<%= render :partial => "way_details", :object => @way %>
<%= t'browse.way.download', :download_xml_link => link_to(t('browse.way.download_xml'), :controller => "way", :action => "read"),
- :view_history_link => link_to(t('browse.way.view_history'), :action => "way_history") %>
+ :view_history_link => link_to(t('browse.way.view_history'), :action => "way_history"),
+ :edit_link => link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16)
+ %>
<%= render :partial => "map", :object => @way %>
diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 314510eb8..f8f00addb 100644
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -41,7 +41,7 @@
'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%>
<% if changeset.area > 1500000000000 %>
- <% t'changeset.changeset.big_area' %>
+ <%= t'changeset.changeset.big_area' %>
<%
end
end
diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index a855d7158..c69d26f8a 100644
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -3,7 +3,7 @@
<% if diary_entry.latitude and diary_entry.longitude %>
<%= t 'map.coordinates' %> <%= diary_entry.latitude %>; <%= diary_entry.longitude %>
(<%=link_to (t 'map.view'), :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to (t 'map.edit'), :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)
<% end %>
-<%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language => diary_entry.language.name %>
+<%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :language => diary_entry.language_code) %>
<% if params[:action] == 'list' %>
<%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 00937d89e..68c8c1266 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -25,15 +25,15 @@
<%= render :partial => 'diary_entry', :collection => @entries %>
- <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next } if @entry_pages.current.next %>
+ <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
<% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
- <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
+ <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
<% end %>
-<%= rss_link_to :action => 'rss' %>
+<%= rss_link_to :action => 'rss', :language => params[:language] %>
<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, :action => 'rss' %>
+<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
<% end %>
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 37d2b1962..241bf1817 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -81,7 +81,7 @@
<%= t 'layouts.intro_1' %>
- <%= t 'layouts.intro_2' %>.
+ <%= t 'layouts.intro_2' %>
<%= t 'layouts.intro_3',
@@ -93,11 +93,12 @@
<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
- <%= t 'layouts.offline' %>
+ <%= t 'layouts.osm_offline' %>
<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
- <%= t 'layouts.read_only' %>
+ <%= t 'layouts.osm_read_only' %>
+
<% end %>
<% if false %>
diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index a356692c8..f771f619b 100644
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -2,7 +2,7 @@
<%= error_messages_for 'message' %>
-<% form_for :message, :url => { :action => "new", :user_id => @to_user.id } do |f| %>
+<% form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %>
<%= t'message.new.subject' %> |
diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index 9d91dec2e..fceaf0147 100644
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -11,7 +11,7 @@
<%= t'trace.edit.uploaded_at' %> |
- <%= @trace.timestamp %> |
+ <%= l @trace.timestamp %> |
<% if @trace.inserted? %>
diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 381a2fc97..65957b45d 100644
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -13,7 +13,7 @@
<%= t'trace.view.uploaded' %> |
- <%= @trace.timestamp %> |
+ <%= l @trace.timestamp %> |
<% if @trace.inserted? %>
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 6e54fbebb..0dbc09dd3 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -9,7 +9,7 @@
| <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
<% else %>
-<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
| <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
| <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
diff --git a/config/locales/be.yml b/config/locales/be.yml
index e328761f2..2b1516e5d 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -248,7 +248,7 @@ be:
no_such_user:
body: "ÐÑабаÑÑе, не ÑÑнÑе каÑÑÑÑалÑнÑка {{user}}. ÐÑавеÑÑе Ñвой пÑавапÑÑ, ÑÑ, магÑÑма, вам Ð´Ð°Ð»Ñ Ð½ÑпÑавÑлÑнÑÑ ÑпаÑÑлкÑ."
diary_entry:
- posted_by: "ÐапÑÑана {{link_user}} Ñ {{created}} на {{language}}"
+ posted_by: "ÐапÑÑана {{link_user}} Ñ {{created}} на {{language_link}}"
comment_link: ÐаменÑаваÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
reply_link: ÐдказаÑÑ Ð½Ð° гÑÑÑ Ð·Ð°Ð¿ÑÑ
comment_count:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
new file mode 100644
index 000000000..084a869cf
--- /dev/null
+++ b/config/locales/ca.yml
@@ -0,0 +1,158 @@
+ca:
+ html:
+ dir: "ltr"
+ activerecord:
+ models:
+ acl: "Llista de control d'accés"
+ changeset: "Conjunt de canvis"
+ changeset_tag: "Etiqueta del conjunt de canvis"
+ country: "PaÃs"
+ diary_comment: "Commentari del diari"
+ diary_entry: "Entrada al diari"
+ friend: "Amic"
+ language: "Idioma"
+ message: "Missatge"
+ node: "Node"
+ node_tag: "Etiqueta del node"
+ notifier: "Notificador"
+ old_node: "Node antic"
+ old_node_tag: "Etiqueta del node antic"
+ old_relation: "Relació antiga"
+ old_relation_member: "Membre de la relació antiga"
+ old_relation_tag: "Etiqueta de relació antiga"
+ old_way: "Camà antic"
+ old_way_node: "Node del camà antic"
+ old_way_tag: "Etiqueta del camà antic"
+ relation: "Relació"
+ relation_member: "Membre de la relació"
+ relation_tag: "Etiqueta de la relació"
+ session: "Sessió"
+ trace: "Traç"
+ tracepoint: "Punt de traç"
+ tracetag: "Etiqueta del traç"
+ user: "Usuari"
+ user_preference: "Preferències d'usuari"
+ user_token: ""
+ way: "CamÃ"
+ way_node: "Node del camÃ"
+ way_tag: "Etiqueta del camÃ"
+ attributes:
+ diary_comment:
+ body: "Cos"
+ diary_entry:
+ user: "Usuari"
+ title: "TÃtol"
+ latitude: "Latitud"
+ longitude: "Longitud"
+ language: "Idioma"
+ friend:
+ user: "Usuari"
+ friend: "Amic"
+ trace:
+ user: "Usuari"
+ visible: "Visible"
+ name: "Nom"
+ size: "Mida"
+ latitude: "Latitud"
+ longitude: "Longitud"
+ public: "Públic"
+ description: "Descripció"
+ message:
+ sender: "Remitent"
+ title: "TÃtol"
+ body: "Cos"
+ recipient: "Destinatari"
+ user:
+ email: "E-mail"
+ active: "Actiu"
+ display_name: "Nom en pantalla"
+ description: "Descripció"
+ languages: "Idiomes"
+ pass_crypt: "Contrasenya"
+ map:
+ view: "Veure"
+ edit: "Edita"
+ coordinates: "Coordenades:"
+ browse:
+ changeset:
+ title: "Conjunt de canvis"
+ changeset: "Conjunt de canvis"
+ download: "Baixa {{changeset_xml_link}} o {{osmchange_xml_link}}"
+ changesetxml: "XML del conjunt de canvis"
+ osmchangexml: "XML en format osmChange"
+ changeset_details:
+ created_at: "Creat el:"
+ closed_at: "Tancat el:"
+ belongs_to: "Pertany a:"
+ show_area_box: "Mostra caixa de l'Ã rea"
+ box: "caixa"
+ has_nodes: "Té els següents {{count}} nodes:"
+ has_ways: "Té els següents {{count}} camins:"
+ has_relations: "Té les següents {{count}} relacions:"
+ common_details:
+ edited_at: "Editat:"
+ edited_by: "Editat per:"
+ version: "Versió"
+ in_changeset: "Al conjunt de canvis:"
+ containing_relation:
+ relation: "Relació {{relation_name}}"
+ relation_as: "(com a {{relation_role}})"
+ map:
+ loading: "Carregant..."
+ deleted: "Esborrat"
+ view_larger_map: "Veure el mapa més gran"
+ node_details:
+ coordinates: "Coordenades:"
+ part_of: "Part de:"
+ node_history:
+ node_history: "Historial del node"
+ download: "{{download_xml_link}} o {{view_details_link}}"
+ download_xml: "Baixa l'XML"
+ view_details: "veure detalls"
+ node:
+ node: "Node"
+ node_title: "Node: {{node_name}}"
+ download: "{{download_xml_link}} o {{view_history_link}}"
+ download_xml: "Baixa l'XML"
+ view_history: "visualitza l'historial"
+ not_found:
+ sorry: "Ho sentim, no s'ha trobat el {{type}} amb l'id {{id}}."
+ type:
+ node: "node"
+ way: "camÃ"
+ relation: "relació"
+ paging_nav:
+ showing_page: "Mostrant pà gina"
+ of: "de"
+ relation_details:
+ members: "Membres:"
+ part_of: "Part de:"
+ relation_history:
+ relation_history: "Historial de la relació"
+ relation_history_title: "Historial de la relació: {{relation_name}}"
+ relation_member:
+ as: "com a"
+ relation:
+ relation: "Relació"
+ relation_title: "Relació: {{relation_name}}"
+ download: "{{download_xml_link}} oo {{view_history_link}}"
+ download_xml: "Baixa l'XML"
+ view_history: "visualitza l'historial"
+ start:
+ view_data: "Visualitza la informació per a la vista del mapa actual"
+ manually_select: "Sel·lecciona una altra à rea manualment"
+ start_rjs:
+ data_layer_name: "Informació"
+ data_frame_title: "Informació"
+ object_list:
+ type:
+ way: "CamÃ"
+ selected:
+ type:
+ way: "Camà [[id]]"
+ way:
+ way: "CamÃ"
+ diary_entry:
+ edit:
+ language: "Idioma"
+
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 982ec4e66..6c8743e53 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -117,9 +117,10 @@ de:
node:
node: "Knoten"
node_title: "Knoten: {{node_name}}"
- download: "{{download_xml_link}} oder {{view_history_link}}"
+ download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
download_xml: "XML herunterladen"
view_history: "Chronik anzeigen"
+ edit: "Bearbeiten"
not_found:
sorry: "Wir konnten den {{type}} mit der Nummer {{id}} leider nicht finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt."
type:
@@ -147,6 +148,7 @@ de:
view_data: "Daten des aktuellen Kartenausschnitts anzeigen"
manually_select: "Einen anderen Kartenausschnitt manuell auswählen"
start_rjs:
+ data_layer_name: "Daten"
data_frame_title: "Daten"
zoom_or_select: "Karte vergrössern oder einen Bereich auf der Karte auswählen"
drag_a_box: "Einen Rahmen über die Karte aufziehen, um einen Bereich auszuwählen"
@@ -197,9 +199,10 @@ de:
way:
way: "Weg"
way_title: "Weg: {{way_name}}"
- download: "{{download_xml_link}} oder {{view_history_link}}"
+ download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
download_xml: "Download als XML"
view_history: "Chronik anzeigen"
+ edit: "Bearbeiten"
changeset:
changeset_paging_nav:
showing_page: "Seite"
@@ -246,6 +249,7 @@ de:
list:
title: "Blogs"
user_title: "{{user}}s Blog"
+ in_language_title: "Blogeintrag in {{language}}"
new: Selbst Bloggen
new_title: Blogeintrag erstellen
no_entries: Dieser Benutzer hat noch kein Blog
@@ -278,7 +282,7 @@ de:
heading: "Der Benutzer {{user}} existiert nicht"
body: "Wir konnten leider keinen Benutzer mit dem Namen {{user}} finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt."
diary_entry:
- posted_by: "Verfasst von {{link_user}} am {{created}} in {{language}}"
+ posted_by: "Verfasst von {{link_user}} am {{created}} in {{language_link}}"
comment_link: Kommentar zu diesem Eintrag
reply_link: Auf diesen Eintrag antworten
comment_count:
@@ -374,7 +378,7 @@ de:
news_blog: "News-Blog"
news_blog_tooltip: "News-Blog über OpenStreetMap, freie geographische Daten, etc."
shop: Shop
- shop_tooltip: Shop with branded OpenStreetMap
+ shop_tooltip: Shop für Artikel mit OpenStreetMap-Logo
shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
sotm: 'Besuche die OpenStreetMap-Konferenz, The State of the Map 2009, am 10.-12. Juli in Amsterdam!'
alt_donation: Spenden
@@ -399,30 +403,30 @@ de:
had_added_you: "{{user}} hat dich als Freund hinzugefügt."
see_their_profile: "Sein Profil ist hier {{userurl}} zu finden, dort kannst du ihn ebenfalls als Freund hinzufügen."
gpx_notification:
- greeting: "Hi,"
- your_gpx_file: "It looks like your GPX file"
- with_description: "with the description"
- and_the_tags: "and the following tags:"
- and_no_tags: "and no tags."
+ greeting: "Hallo,"
+ your_gpx_file: "Deine GPX-Datei"
+ with_description: "mit der Beschreibung"
+ and_the_tags: "und folgenden Tags:"
+ and_no_tags: "und ohne Tags."
failure:
- subject: "[OpenStreetMap] GPX Import failure"
- failed_to_import: "failed to import. Here's the error:"
- more_info_1: "More information about GPX import failures and how to avoid"
- more_info_2: "them can be found at:"
+ subject: "[OpenStreetMap] GPX-Import Fehler"
+ failed_to_import: "konnte nicht importiert werden. Fehlermeldung:"
+ more_info_1: "Mehr Informationen über GPX-Import Fehler und wie diese vermieden werden können"
+ more_info_2: "finden sich hier:"
import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
success:
- subject: "[OpenStreetMap] GPX Import success"
+ subject: "[OpenStreetMap] GPX-Import erfolgreich"
loaded_successfully: |
- loaded successfully with {{trace_points}} out of a possible
- {{possible_points}} points.
+ {{trace_points}} von
+ {{possible_points}} möglichen Punkten wurden erfolgreich importiert.
signup_confirm:
subject: "[OpenStreetMap] Deine E-Mail-Adresse bestätigen"
signup_confirm_plain:
greeting: "Hallo!"
hopefully_you: "Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für"
# next two translations run-on : please word wrap appropriately
- click_the_link_1: "Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den Link unten um dein"
- click_the_link_2: "Benutzerkonto zu bestätigen. Lies weiter, denn es folgen mehr Informationen über OSM."
+ click_the_link_1: "Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile, um dein"
+ click_the_link_2: "Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM."
introductory_video: "Ein Einführungsvideo zu OpenStreetMap kannst du dir hier anschauen:"
more_videos: "Weitere Videos gibt es hier:"
the_wiki: "Weitere Informationen über OSM findest du in unserem Wiki:"
@@ -438,14 +442,14 @@ de:
signup_confirm_html:
greeting: "Hallo!"
hopefully_you: "Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für"
- click_the_link: "Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den Link unten um dein Benutzerkonto zu bestätigen. Lies weiter, denn es folgen mehr Informationen über OSM."
- introductory_video: "Du kannst dir das {{introductory_video_link}} anschaun."
+ click_the_link: "Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile um dein Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM."
+ introductory_video: "Du kannst dir das {{introductory_video_link}} anschauen."
video_to_openstreetmap: "Einführungsvideo zu OpenStreetMap"
more_videos: "Darüber hinaus gibt es noch viele weitere {{more_videos_link}}."
more_videos_here: "Videos über OpenStreetMap"
get_reading: 'Weitere Informationen über OSM findest du in unserem Wiki
OpenGeoData.org ist das OpenStreetMap Blog; dort gibt es auch einen Podcast.'
wiki_signup: 'Im Wiki von OpenStreetMap kannst du dich ebenfalls registrieren.'
- user_wiki_page: 'Es ist notwendig, dass du eine Wiki-Benutzerseite erstellst. Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel [[Category:Users_in_München]].'
+ user_wiki_page: 'Es wird begrüÃt, wenn du eine Wiki-Benutzerseite erstellst. Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel [[Category:Users_in_München]].'
current_user: 'Ebenso ist eine Liste mit allen Benutzern in einer Kategorie, die anzeigt wo diese auf der Welt sind, verfügbar.'
email_confirm:
subject: "[OpenStreetMap] Deine E-Mail-Adresse bestätigen"
@@ -562,11 +566,11 @@ de:
search_help: "Beispiele: 'München', 'HeinestraÃe, Würzburg', 'CB2 5AQ', oder 'post offices near Lünen' mehr Beispiele..."
key:
map_key: "Legende"
- map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
+ map_key_tooltip: "Legende für die Mapnik-Karte bei diesem Zoom-Level"
trace:
create:
upload_trace: "Lade einen GPS-Track hoch"
- trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+ trace_uploaded: "Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme in die Datenbank. Dies geschieht normalerweise innerhalb einer halben Stunde, anschlieÃend wird dir eine Bestätigungs-E-Mail gesendet."
edit:
filename: "Dateiname:"
uploaded_at: "Hochgeladen am:"
@@ -669,7 +673,7 @@ de:
no_auto_account_create: "Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht möglich."
contact_webmaster: 'Bitte kontaktiere den Webmaster um ein Benutzerkonto erstellt zu bekommen - wir werden die Anfrage so schnell wie möglich bearbeiten. '
fill_form: "Fülle das Formular aus und dir wird eine kurze E-Mail zur Aktivierung deines Benutzerkontos geschickt."
- license_agreement: 'Mit der Erstellung des Benutzerkontos stimmst du zu, dass alle Daten, die du zu openstreetmap.org hochlädst und alle Daten, die du mit irgendeinem externem Programm, dass sich mit openstreetmap.org verbindet, erstellst, (nicht exklusiv) unter dieser Creative Commons Lizenz (by-sa) lizenziert werden.'
+ license_agreement: 'Mit der Erstellung des Benutzerkontos stimmst du zu, dass alle Daten, die du zum OpenStreetMap-Projekt beiträgst, (nicht exklusiv) unter dieser Creative Commons Lizenz (by-sa) lizenziert werden.'
email address: "E-Mail-Adresse: "
confirm email address: "Bestätige deine E-Mail-Adresse: "
not displayed publicly: 'Nicht öffentlich sichtbar (Datenschutzrichtlinie)'
@@ -677,7 +681,7 @@ de:
password: "Passwort: "
confirm password: "Passwort bestätigen: "
signup: Registrieren
- flash create success message: "Benutzerkonto wurde erfolgreich erstellt. Ein Bestätigungscode wurde dir per E-Mail zugesendet, bitte bestätige diesen und du kannst mit dem Mappen beginnen.
Du kannst dich nicht einloggen bevor du deine E-Mail-Adresse mit dem Bestätigungscode bestätigt hast.
Falls du einen Spam-Blocker nutzt, der Bestätigungsanfragen sendet, dann setze bitte webmaster@openstreetmap.org auf deine Whitelist, weil wir auf keine Bestätigungsanfrage antworten können."
+ flash create success message: "Benutzerkonto wurde erfolgreich erstellt. Ein Bestätigungslink wurde dir per E-Mail zugesendet, bitte bestätige diesen und du kannst mit dem Mappen beginnen.
Du kannst dich nicht einloggen bevor du deine E-Mail-Adresse mit dem Bestätigungslink bestätigt hast.
Falls du einen Spam-Blocker nutzt, der Bestätigungsanfragen sendet, dann setze bitte webmaster@openstreetmap.org auf deine Whitelist, weil wir auf keine Bestätigungsanfrage antworten können."
no_such_user:
title: "Benutzer nicht gefunden"
heading: "Der Benutzer {{user}} existiert nicht"
@@ -742,13 +746,13 @@ de:
press confirm button: "Benutzerkonto aktivieren, indem du auf den Bestätigungsbutton klickst."
button: Bestätigen
success: "Dein Benutzeraccount wurde bestätigt, danke fürs Registrieren!"
- failure: "Ein Benutzeraccount wurde beretis mit diesem Kürzel bestätigt."
+ failure: "Ein Benutzeraccount wurde bereits mit diesem Link bestätigt."
confirm_email:
heading: Ãnderung der E-Mail-Adresse bestätigen
press confirm button: "Neue E-Mail-Adresse bestätigen, indem du auf den Bestätigungsbutton klickst."
button: Bestätigen
success: "Deine E-Mail-Adresse wurde bestätigt, danke fürs Registrieren!"
- failure: "Eine E-Mail-Adresse wurde bereits mit diesem Kürzel bestätigt."
+ failure: "Eine E-Mail-Adresse wurde bereits mit diesem Link bestätigt."
set_home:
flash success: "Standort erfolgreich gespeichert"
go_public:
diff --git a/config/locales/el.yml b/config/locales/el.yml
new file mode 100644
index 000000000..b3d3d862d
--- /dev/null
+++ b/config/locales/el.yml
@@ -0,0 +1,315 @@
+el:
+ html:
+ dir: ltr
+ activerecord:
+ # Translates all the model names, which is used in error handling on the web site
+ models:
+ acl: "Î ÏÏÏβαÏη ÏÏη λίÏÏα ελÎγÏοÏ
"
+ changeset: "Îλλαγή ÏÏ
λλογήÏ"
+ changeset_tag: "ÎÏικÎÏα Î±Î»Î»Î±Î³Î®Ï ÏÏ
λλογήÏ"
+ country: "ΧÏÏα"
+ diary_comment: "ΣÏÏλιο ÏÏο blog"
+ diary_entry: "ÎαÏαÏÏÏηÏη blog"
+ friend: "ΦίλοÏ"
+ language: "ÎλÏÏÏα"
+ message: "ÎήνÏ
μα"
+ node: "Σημείο"
+ node_tag: "Σημείο εÏικÎÏα"
+ notifier: "ÎιδοÏοιηÏήÏ"
+ old_node: "Î Î±Î»Î¹Ï Ïημείο"
+ old_node_tag: "Î Î±Î»Î¹Ï Ïημείο εÏικÎÏα"
+ old_relation: "Παλιά ÏÏÎÏη"
+ old_relation_member: "Î Î±Î»Î¹Ï Î¼ÎÎ»Î¿Ï ÏÎ·Ï ÏÏÎÏηÏ"
+ old_relation_tag: "Παλιά εÏικÎÏα ÏÎ·Ï ÏÏÎÏηÏ"
+ old_way: "Παλία καÏεÏθÏ
νÏη"
+ old_way_node: "Σημείο ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏεÏθÏ
νÏηÏ"
+ old_way_tag: "ÎÏικÎÏα ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏεÏθÏ
νÏηÏ"
+ relation: "ΣÏÎÏη"
+ relation_member: "ÎÎÎ»Î¿Ï ÏÎ·Ï ÏÏÎÏηÏ"
+ relation_tag: "ÎÏικÎÏα ÏÏÎÏηÏ"
+ session: "ΣÏ
νεδÏία"
+ trace: "ÎÏνοÏ"
+ tracepoint: "Σημείο ίÏνοÏ
Ï"
+ tracetag: "ÎÏικÎÏα ίÏνοÏ
Ï"
+ user: "ΧÏήÏÏηÏ"
+ user_preference: "Î ÏοÏιμήÏÎµÎ¹Ï ÏÏήÏÏη"
+ user_token: "ΤεκμήÏιο ÏÏήÏÏη"
+ way: "ÎαÏεÏθÏ
νÏη"
+ way_node: "ÎαÏεÏθÏ
νÏη ÏημείοÏ
"
+ way_tag: "ÎÏικÎÏα καÏεÏθÏ
νÏηÏ"
+ # Translates all the model attributes, which is used in error handling on the web site
+ # Only the ones that are used on the web site are translated at the moment
+ attributes:
+ diary_comment:
+ body: "ΣÏμα"
+ diary_entry:
+ user: "ΧÏήÏÏηÏ"
+ title: "ΤίÏλοÏ"
+ latitude: "ÎεÏγÏαÏÎ¹ÎºÏ ÏλάÏοÏ"
+ longitude: "ÎεÏγÏαÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï"
+ language: "ÎλÏÏÏα"
+ friend:
+ user: "ΧÏήÏÏηÏ"
+ friend: "ΦίλοÏ"
+ trace:
+ user: "ΧÏήÏÏηÏ"
+ visible: "ÎÏαÏÏ"
+ name: "Îνομα"
+ size: "ÎÎγεθοÏ"
+ latitude: "ÎεÏγÏαÏÎ¹ÎºÏ ÏλάÏοÏ"
+ longitude: "ÎεÏγÏαÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï"
+ public: "ÎοινÏ"
+ description: "ΠεÏιγÏαÏή"
+ message:
+ sender: "ÎÏοÏÏολÎαÏ"
+ title: "ΤίÏλοÏ"
+ body: "ΣÏμα"
+ recipient: "ÎήÏÏηÏ"
+ user:
+ email: "Email"
+ active: "ÎνεÏγÏ"
+ display_name: "Îνομα"
+ description: "ΠεÏιγÏαÏή"
+ languages: "ÎλÏÏÏεÏ"
+ pass_crypt: "Password"
+ map:
+ view: "ÎξÎÏαÏε"
+ edit: "Îλλαξε"
+ coordinates: "ΣÏ
νÏεÏαγμÎνεÏ:"
+ browse:
+ changeset:
+ title: "Îλλαγή ÏÏ
λλογηÏ"
+ changeset: "Îλλαγή ÏÏ
λλογηÏ:"
+# download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+ changesetxml: "Îλλαγή ÏÏ
Î»Î»Î¿Î³Î·Ï XML"
+ osmchangexml: "osmαλλαγή XML"
+ changeset_details:
+ created_at: "ÎημοιοÏ
Ïγήθηκε ÏÏιÏ:"
+ closed_at: "ÎκλειÏε ÏÏιÏ:"
+ belongs_to: "Îνήκει ÏÏον/ÏÏην:"
+# bounding_box: "Bounding box:"
+# no_bounding_box: "No bounding box has been stored for this changeset."
+ show_area_box: "Îείξε κοÏÏι ÏεÏιοÏήÏ"
+ box: "κοÏ
Ïι"
+ has_nodes: "ÎÏει Ïα εÏÏμενα {{count}} Ïημεία:"
+ has_ways: "ÎÏει ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ {{count}} καÏεÏ
θήνÏειÏ:"
+ has_relations: "ÎÏει ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ {{count}} ÏÏÎÏειÏ:"
+ common_details:
+ edited_at: "Îλλάξε ÏÏιÏ:"
+ edited_by: "Îλλαγή Îγινε αÏÏ:"
+ version: "ÎκδοÏή:"
+ in_changeset: "ΣÏην αλλαγή ÏÏ
λλογηÏ:"
+ containing_relation:
+ relation: "ΣÏÎÏη {{relation_name}}"
+# relation_as: "(as {{relation_role}})"
+ map:
+ loading: "ΦÏÏÏÏÏη..."
+ deleted: "ÎιαγÏαÏή"
+ view_larger_map: "ÎÎµÏ Î¼ÎµÎ³Î±Î»ÏÏεÏο ÏάÏÏη"
+ node_details:
+ coordinates: "ΣÏ
νÏεÏαγμÎνεÏ: "
+ part_of: "ÎομμάÏι ÏοÏ
:"
+ node_history:
+ node_history: "ÎÏÏοÏία ÏημείοÏ
"
+ download: "{{download_xml_link}} ή {{view_details_link}}"
+# download_xml: "Download XML"
+ view_details: "ÎÎµÏ Î»ÎµÏÏομÎÏειεÏ"
+ node:
+ node: "Σήμεο"
+ node_title: "Σήμεο: {{node_name}}"
+ download: "{{download_xml_link}} ή {{view_history_link}}"
+# download_xml: "Download XML"
+ view_history: "ÎÎµÏ Î¹ÏÏοÏία"
+ not_found:
+ sorry: "ΣÏ
γγνÏμη, η {{type}} με Ïην ÏαÏ
ÏÏÏηÏα {{id}}, δε μÏοÏεί να βÏεθεί."
+ type:
+ node: "Σημείο"
+ way: "ÎαÏεÏθηνÏη"
+ relation: "ÏÏÎÏη"
+ paging_nav:
+ showing_page: "ÎείÏνει Ïελίδα"
+ of: "ÏοÏ
"
+ relation_details:
+ members: "ÎÎλη:"
+ part_of: "ÎομμάÏι ÏοÏ
:"
+ relation_history:
+ relation_history: "ÎÏÏοÏια ÏÏÎÏηÏ"
+ relation_history_title: "ÎÏÏοÏια ÏÏÎÏηÏ: {{relation_name}}"
+ relation_member:
+ as: "as"
+ relation:
+ relation: "ΣÏÎÏη"
+ relation_title: "ΣÏÎÏη: {{relation_name}}"
+ download: "{{download_xml_link}} ή {{view_history_link}}"
+# download_xml: "Download XML"
+ view_history: "Î´ÎµÏ Î¹ÏÏοÏία"
+ start:
+ view_data: "ÎÎµÏ ÏÏοιÏεία για αÏ
Ïο Ïο ÏάÏÏη"
+ manually_select: "Îιάλεξε διαÏοÏεÏική ÏεÏιοÏή δια ÏειÏÏÏ"
+ start_rjs:
+ data_layer_name: "ΣÏοιÏεία"
+ data_frame_title: "ΣÏοιÏεία"
+ zoom_or_select: "ÎÏÏίαÏε ή διάλεξε ÏεÏιοÏή αÏο Ïο ÏάÏÏη"
+ drag_a_box: "ΤÏάβα Ïο κοθÏί ÏÏο ÏάÏÏη για να Î´Î¹Î±Î»ÎµÎ¾ÎµÎ¯Ï ÏεÏιοÏή"
+ manually_select: "Îιάλεξε διαÏοÏεÏική ÏεÏιοÏή δια ÏειÏÏÏ"
+ loaded_an_area_with_num_features: "¨ÎÏÎµÎ¹Ï ÏοÏÏÏÏει μια ÏεÏιοÏή ÏοÏ
εÏει [[num_features]] ÏαÏακÏηÏιÏÏικά. Îενικά, μεÏικοί browsers μÏοÏεί να μην ανÏÎÏοÏ
ν να δείξοÏ
ν ÏÏÏα Ïολλά ÏÏοίÏεια. Îενικά, οι browsers δοÏ
λεÏοÏ
ν καλÏÏεÏα δείÏνÏνÏÎ±Ï Î»Î¹Î³ÏÏεÏα αÏÏ 100 ÏαÏακÏηÏιÏÏικά Ïη ÏοÏά: με οÏιδήÏοÏε άλλο ο browser μÏοÏεί να γίνει αÏγÏÏ Î® να μην ανÏιδÏά. Îν είÏαι ÏίγοÏ
ÏÎ¿Ï Î¿Ïι Î¸ÎµÏ Î½Î± Î´ÎµÎ¹Ï Î±Ï
Ïά Ïα ÏÏοιÏεία, κάνε κλικ ÏÏο εÏÏμενο κοÏ
μÏί."
+ load_data: "ΦÏÏÏÏÏε ÏÏοιÏεία"
+ unable_to_load_size: "Îεν μÏοÏεί να ÏοÏÏÏÏει: Το μÎÎ³ÎµÎ¸Î¿Ï ÏοÏ
bounding box [[bbox_size]] είναι ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (ÏÏÎÏει να είναι μικÏÏÏεÏο αÏο {{max_bbox_size}})"
+ loading: "ΦÏÏÏÏÏη..."
+ show_history: "Îείξε ιÏÏοÏία"
+ wait: "Îναμονή..."
+ history_for_feature: "ÎÏÏοÏία ÏοÏ
[[feature]]"
+ details: "ÎεÏÏομÎÏειεÏ"
+ private_user: "ιδιÏÏικÏÏ ÏÏήÏÏηÏ"
+ edited_by_user_at_timestamp: "Îλλαγή Îγινε αÏÏ [[user]] ÏÏÎ¹Ï [[timestamp]]"
+ object_list:
+ heading: "ÎίÏÏα ανÏικειμÎνÏν"
+ back: "Îείξε λίÏÏα ανÏικειμÎνÏν"
+ type:
+ node: "Σημείο"
+ way: "ÎαÏεÏθηνÏη"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ api: "ÎÏανάκÏηÏη ÏεÏιοÏÎ®Ï Î±ÏÏ Ïο API"
+ details: "ÎεÏÏομÎÏειεÏ"
+ selected:
+ type:
+ node: "Σημείο [[id]]"
+ way: "ÎαÏεÏθηνÏη [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ history:
+ type:
+ node: "Σημείο [[id]]"
+ way: "ÎαÏεÏθηνÏη [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ tag_details:
+ tags: "ÎÏικÎÏεÏ:"
+ way_details:
+ nodes: "Σημεία:"
+ part_of: "ÎομμάÏι ÏοÏ
"
+ also_part_of:
+ one: "εÏίÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬Ïι καÏεÏθηνÏÎ·Ï {{related_ways}}"
+ other: "εÏίÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬Ïι καÏεÏθηνÏεÏν {{related_ways}}"
+ way_history:
+ way_history: "ÎÏÏοÏία καÏεÏθηνÏηÏ"
+ way_history_title: "ÎÏÏοÏία καÏεÏθηνÏηÏ: {{way_name}}"
+ download: "{{download_xml_link}} ή {{view_details_link}}"
+# download_xml: "Download XML"
+ view_details: "Î´ÎµÏ Î»ÎµÏÏομÎÏειεÏ"
+ way:
+ way: "ÎαÏεÏθηνÏη"
+ way_title: "ÎαÏεÏθηνÏη: {{way_name}}"
+ download: "{{download_xml_link}} ή {{view_history_link}}"
+# download_xml: "Download XML"
+ view_history: "Î´ÎµÏ Î¹ÏÏοÏία"
+ changeset:
+ changeset_paging_nav:
+ showing_page: "EμÏάνιÏη ÏελίδαÏ"
+# of: "of"
+ changeset:
+# still_editing: "(still editing)"
+ anonymous: "ÎνÏνÏ
μοÏ"
+# no_comment: "(none)"
+# no_edits: "(no edits)"
+ show_area_box: "δείξε ÏεÏιοÏή κοÏ
ÏιοÏ"
+# big_area: "(big)"
+ view_changeset_details: "ÎÎµÏ Î±Î»Î»Î±Î³Î® ÏÏ
Î»Î»Î¿Î³Î®Ï Î»ÎµÏÏομεÏειÏν"
+# more: "more"
+ changesets:
+ id: "ID"
+ saved_at: "ÎÏοθήκεÏ
Ïη ÏÏιÏ"
+ user: "ΧÏήÏÏηÏ"
+ comment: "ΣÏÏλιο"
+ area: "ΠεÏιοÏή"
+ list_bbox:
+ history: "ÎÏÏοÏία"
+ changesets_within_the_area: "Îλλαγή ÏÏ
Î»Î»Î¿Î³Î®Ï ÏÏην ÏεÏιοÏή:"
+ show_area_box: "δείξε ÏεÏιοÏή κοÏ
ÏιοÏ"
+ no_changesets: "Îαμία αλλαγή ÏÏ
λλογήÏ"
+ all_changes_everywhere: "Îια αλλαγÎÏ Î±Î»Î»Î¿Ï Î´ÎµÏ {{recent_changes_link}}"
+ recent_changes: "Î ÏÏÏÏαÏÎµÏ ÎλλαγÎÏ"
+ no_area_specified: "ΠεÏιοÏή δεν ÎÏει καθοÏιÏÏεί"
+ first_use_view: "Î ÏÏÏα ÏÏηÏημοÏοίηÏε Ïο {{view_tab_link}} για να αÏοδÏÏÎµÎ¹Ï ÎºÎ±Î¹ να εÏÏιάÏειÏ, μεÏά κάνε κλικ ÏÏο tab ιÏÏοÏίαÏ."
+ view_the_map: "Î´ÎµÏ Ïο ÏάÏÏη"
+ view_tab: "Î´ÎµÏ Ïο tab"
+ alternatively_view: "¨Î, Î´ÎµÏ Ïλα {{recent_changes_link}}"
+ list:
+ recent_changes: "Î ÏÏÏÏαÏÎµÏ Î±Î»Î»Î±Î³ÎÏ"
+ recently_edited_changesets: "Î ÏÏÏÏαÏÎµÏ Î±Î»Î»Î±Î³ÎÏ ÏÏ
λλογήÏ:"
+ for_more_changesets: "Îια αλλαγÎÏ ÏÏ
λλογήÏ, διάλεξε ÏÏήÏÏη και Î´ÎµÏ ÏÎ¹Ï Î±Î»Î»Î±Î³ÎÏ ÏοÏ
ή Î´ÎµÏ Ïην ιÏÏοÏία αλλαγÏν ÏÏ
γγεκÏιμÎÎ½Î·Ï ÏεÏιοÏήÏ."
+ list_user:
+ edits_by_username: "ÎλλαγÎÏ Î±ÏÏ {{username_link}}"
+ no_visible_edits_by: "Îαμία οÏαÏή αλλαγή αÏÏ {{name}}."
+ for_all_changes: "Îια αλλαγÎÏ ÏλÏν ÏÏν ÏÏηÏÏÏν, Î´ÎµÏ {{recent_changes_link}}"
+ recent_changes: "Î ÏÏÏÏαÏÎµÏ Î±Î»Î»Î±Î³ÎÏ"
+ diary_entry:
+ new:
+ title: "ÎαινοÏÏγια καÏαÏÏÏηÏη blog"
+ list:
+ title: "Blog ÏÏηÏÏÏν"
+ user_title: "Blog {{user}}"
+ new: "ÎαινοÏÏγια καÏαÏÏÏηÏη blog"
+ new_title: "ΣÏνθεÏη καινοÏÏγια καÏαÏÏÏηÏη ÏÏο blog ÏÏήÏÏη"
+ no_entries: "Îαμία καÏαÏÏÏηÏη blog"
+ recent_entries: "Î ÏÏÏοÏαÏÎµÏ ÎºÎ±ÏαÏÏÏήÏÎµÎ¹Ï blog: "
+ older_entries: "Î Î±Î»Î¯ÎµÏ ÎαÏαÏÏÏήÏειÏ"
+ newer_entries: "Î ÏÏÏÏαÏÎµÏ ÎαÏαÏÏÏήÏειÏ"
+ edit:
+ title: "Îλλαγη καÏαÏÏÏηÏη blog"
+ subject: "ÎÎμα: "
+ body: "ΣÏμα: "
+ language: "ÎλÏÏÏα: "
+ location: "ΤοÏοθεÏία: "
+ latitude: "ÎεÏγÏαÏÎ¹ÎºÏ ÏλάÏοÏ"
+ longitude: "ÎεÏγÏαÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï"
+ use_map_link: "ÏÏηÏημοÏοίηÏε Ïο ÏάÏÏη"
+ save_button: "ÎÏοθήκεÏ
Ïη"
+ marker_text: "ΤοÏοθεÏία καÏαÏÏÏηÏÎ·Ï blog"
+ view:
+ title: "Blog ÏÏηÏÏÏν | {{user}}"
+ user_title: "Blog {{user}}"
+ leave_a_comment: "ÎγγÏαÏή ÏÏÏλιοÏ
"
+ login_to_leave_a_comment: "{{login_link}} για εγγÏαÏή ÏÏÏλιοÏ
"
+# login: "Login"
+ save_button: "ÎÏοθήκεÏ
Ïη"
+ no_such_entry:
+ heading: "Îαμία καÏαÏÏÏηÏη με Ïη ÏαÏ
ÏÏÏηÏα: {{id}}"
+ body: "ΣÏ
γγνÏμη, δεν Ï
ÏάÏÏει καÏαÏÏÏηÏη blog ή ÏÏÏλιο με Ïη ÏαÏ
ÏÏÏηÏα {{id}}. Îίναι ÏÎ¹Î¸Î±Î½Ï Î½Î± Ï
ÏάÏÏοÏ
ν οÏθογÏαÏικά λάθη ή να είναι Î»Î¬Î¸Î¿Ï Ïο link."
+ no_such_user:
+ title: "ÎγνÏÏÏÎ¿Ï ÏÏήÏÏηÏr"
+ heading: "Î ÏÏήÏÏÎ·Ï {{user}} δεν Ï
ÏάÏÏει"
+ body: "ΣÏ
γγνÏμη, δεν Ï
ÏάÏÏει ÏÏήÏÏÎ·Ï Î¼Îµ Ïο Ïνομα {{user}}. Îίναι ÏÎ¹Î¸Î±Î½Ï Î½Î± Ï
ÏάÏÏοÏ
ν οÏθογÏαÏικά λάθη ή να είναι Î»Î¬Î¸Î¿Ï Ïο link."
+ diary_entry:
+ posted_by: "ÎÏάÏÏηκε αÏο Ïο ÏÏήÏÏη {{link_user}} ÏÏÎ¹Ï {{created}} ÏÏα {{language_link}}"
+ comment_link: "ΣÏÏλια για Ïη καÏαÏÏÏηÏη"
+ reply_link: "ÎÏάνÏηÏη ÏÏη καÏαÏÏÏηÏη"
+ comment_count:
+ one: "1 ÏÏÏλιο"
+ other: "{{count}} ÏÏÏλια"
+ edit_link: "Îλλαγή καÏαÏÏÏηÏηÏ"
+ diary_comment:
+ comment_from: "ΣÏÏλιο αÏο Ïον {{link_user}} ÏÏÎ¹Ï {{comment_created_at}}"
+ export:
+ start:
+ area_to_export: "ÎξαγÏγή ÏεÏιοÏήÏ"
+ manually_select: "Îιάλεξε καινοÏÏγια ÏεÏιοÏή δια ÏειÏÏÏ"
+ format_to_export: "ÎξαγÏγή ÏÏÏÏοÏ
ÏαÏοÏ
ÏίαÏηÏ"
+ osm_xml_data: "OpenStreetMap XML ÏÏοιÏεία"
+ mapnik_image: "Mapnik εικÏνα"
+ osmarender_image: "Osmarender εικÏνα"
+# embeddable_html: "Embeddable HTML"
+ licence: "Îδεια"
+ export_details: 'OpenStreetMap data are licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
+ options: "ÎÏιλογÎÏ"
+ format: "ΤÏÏÏÎ¿Ï ÏαÏοÏ
ÏίαÏηÏ"
+ scale: "Îλίμακα"
+ max: "max"
+ image_size: "ÎÎÎ³ÎµÎ¸Î¿Ï ÎµÎ¹ÎºÏναÏ"
+ zoom: "ÎÏÏίαÏη"
+ add_marker: "Î ÏÏÏθεÏη markerÏÏο ÏάÏÏη"
+ latitude: "Î. Î .:"
+ longitude: "Î. Î.:"
+ output: "ÎÏÏδοÏη"
+# paste_html: "Paste HTML to embed in website"
+ export_button: "ÎξαγÏγή"
+ start_rjs:
+ export: "ÎξαγÏγή"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fe5f0f926..9581d83b7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -117,9 +117,10 @@ en:
node:
node: "Node"
node_title: "Node: {{node_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
+ download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
download_xml: "Download XML"
view_history: "view history"
+ edit: "edit"
not_found:
sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
type:
@@ -198,9 +199,10 @@ en:
way:
way: "Way"
way_title: "Way: {{way_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
+ download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
download_xml: "Download XML"
view_history: "view history"
+ edit: "edit"
changeset:
changeset_paging_nav:
showing_page: "Showing page"
@@ -232,6 +234,7 @@ en:
list:
title: "Users' diaries"
user_title: "{{user}}'s diary"
+ in_language_title: "Diary Entries in {{language}}"
new: New Diary Entry
new_title: Compose a new entry in your user diary
no_entries: No diary entries
@@ -264,7 +267,7 @@ en:
heading: "The user {{user}} does not exist"
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
diary_entry:
- posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+ posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
comment_link: Comment on this entry
reply_link: Reply to this entry
comment_count:
@@ -360,7 +363,7 @@ en:
news_blog: "News blog"
news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
shop: Shop
- shop_tooltip: Shop with branded OpenStreetMap
+ shop_tooltip: Shop with branded OpenStreetMap merchandise
shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
alt_donation: Make a Donation
@@ -655,7 +658,7 @@ en:
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
fill_form: "Fill in the form and we'll send you a quick email to activate your account."
- license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
+ license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
email address: "Email Address: "
confirm email address: "Confirm Email Address: "
not displayed publicly: 'Not displayed publicly (see privacy policy)'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f293e7243..d0a1d28d1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,6 +1,681 @@
es:
+ html:
+ dir: "ltr"
+ activerecord:
+ models:
+ acl: "Lista de control de acceso"
+ changeset: "Conjunto de cambios"
+ changeset_tag: "Etiqueta del conjunto de cambios"
+ country: "PaÃs"
+ diary_comment: "Comentario al diario"
+ diary_entry: "Entada del diario"
+ friend: "Amigo"
+ language: "Idioma"
+ message: "Mensaje"
+ node: "Nodo"
+ node_tag: "Etiqueta del nodo"
+ old_node: "Nodo antiguo"
+ old_node_tag: "Etiqueta del nodo antiguo"
+ old_relation: "Relación antigua"
+ old_relation_member: "Miembro de la relación antiguo"
+ old_relation_tag: "Etiqueta de la relación antigua"
+ old_way: "VÃa antigua"
+ old_way_node: "Nodo de la vÃa antiguo"
+ old_way_tag: "Etiqueta de la vÃa antigua"
+ relation: "Relación"
+ relation_member: "Miembro de Relación"
+ relation_tag: "Etiqueta de la relación"
+ session: "Sesión"
+ trace: "Traza "
+ tracepoint: "Punto de la traza"
+ tracetag: "Etiqueta de la traza"
+ user: "Usuario"
+ user_preference: "Preferencias de usuario"
+ user_token: "Token del usuario"
+ way: "VÃa"
+ way_node: "Nodo de la vÃa"
+ way_tag: "Etiqueta de vÃa"
+ attributes:
+ diary_comment:
+ body: "Cuerpo"
+ diary_entry:
+ user: "Usuario"
+ title: "TÃtulo"
+ latitude: "Latitud"
+ longitude: "Longitud"
+ language: "Idioma"
+ friend:
+ user: "Usuario"
+ friend: "Amigo"
+ trace:
+ user: "Usuario"
+ visible: "Visible"
+ name: "Nombre"
+ size: "Tamaño"
+ latitude: "Latitud"
+ longitude: "Longitud"
+ public: "Pública"
+ description: "Descripción"
+ message:
+ sender: "Remitente"
+ title: "TÃtulo"
+ body: "Cuerpo"
+ recipient: "Destinatario"
+ user:
+ email: "Correo"
+ active: "Activo"
+ display_name: "Nombre en pantalla"
+ description: "Descripción"
+ languages: "Idiomas"
+ pass_crypt: "Contraseña"
+ map:
+ view: "Ver"
+ edit: "Editar"
+ coordinates: "Coordinadas"
+ browse:
+ changeset:
+ title: "Conjunto de cambios"
+ changeset: "Conjunto de cambios"
+ download: "Descargar {{changeset_xml_link}} o {{osmchange_xml_link}}"
+ changesetxml: "XML del conjunto de cambios"
+ osmchangexml: "XML en formato osmChange"
+ changeset_details:
+ created_at: "Creado en:"
+ closed_at: "Cerrado en:"
+ belongs_to: "Pertenece a"
+ bounding_box: "Envoltura"
+ no_bounding_box: "No se ha guardado una envoltura para este conjunto de cambios"
+ show_area_box: "Mostrar caja del área"
+ box: "Caja"
+ has_nodes: "Tiene {{count}} nodos:"
+ has_ways: "Tiene {{count}} vÃas:"
+ has_relations: "Tiene {{count}} relaciones:"
+ common_details:
+ edited_at: "Editado en"
+ edited_by: "Editado por:"
+ version: "Versión:"
+ in_changeset: "En el conjunto de cambios:"
+ containing_relation:
+ relation: "Relación {{relation_name}}"
+ relation_as: "(como {{relacion_role}})"
+ map:
+ loading: "Cargando..."
+ deleted: "Borrado"
+ view_larger_map: "Ver mapa más grande"
+ node_details:
+ coordinates: "Coordenadas"
+ part_of: "Parte de:"
+ node_history:
+ node_history: "Historial del nodo"
+ download: "{{download_xml_link}} o {{view_details_link}}"
+ download_xml: "Descargar XML"
+ view_details: "ver detalles"
+ node:
+ node: "Nodo"
+ node_title: "Nodo: {{node_name}}"
+ download: "{{download_xml_link}} o {{view_history_link}}"
+ download_xml: "Descargar XML"
+ view_history: "ver historial"
+ not_found:
+ sorry: "Lo sentimos, {{type}} con ID {{id}} no fue encontrado"
+ type:
+ node: "el nodo"
+ way: "la vÃa"
+ relation: "la relación"
+ paging_nav:
+ showing_page: "Mostrando página"
+ of: "de"
+ relation_details:
+ members: "Miembros"
+ part_of: "Parte de"
+ relation_history:
+ relation_history: "Historial de la relación"
+ relation_history_title: "Historial de la relación {{relation_name}}:"
+ relation_member:
+ as: "como"
+ relation:
+ relation: "Relación"
+ relation_title: "Relación {{relation_name}}:"
+ download: "{{download_xml_link}} o {{view_history_link}}"
+ download_xml: "Descargar XML"
+ view_history: "ver historial"
+ start:
+ view_data: "Ver datos para el encuadre actual"
+ manually_select: "Seleccionar manualmente un área diferente"
+ start_rjs:
+ data_layer_name: "Datos"
+ data_frame_title: "Datos"
+ zoom_or_select: "Para ver los datos, haga más zoom o seleccione un área del mapa"
+ drag_a_box: "Arrastre en el mapa para dibujar un área de encuadre"
+ manually_select: "Seleccionar manualmente un área diferente"
+ loaded_an_area_with_num_features: "Ha cargado un área que contiene [[num_features]] objetos. Por lo general, algunos navegadores web no aguantan bien el mostrar esta candidad de información vectorial. Generalmente, el funcionamiento óptimo se da cuando se muestran menos de 100 objetos al mismo tiempo; de otra manera, su navegador puede volverse lento o no responder. Si está seguro de que quiere mostrar todos estos datos, puede hacerlo pulsando el botón que aparece debajo."
+ load_data: "Cargar datos"
+ unable_to_load_size: "Imposible cargar: El tamaño de la envoltura ([[bbox_size]] es demasiado grande (debe ser menor que {{max_bbox_size}})"
+ loading: "Cargando..."
+ show_history: "Mostrar historial"
+ wait: "Espere..."
+ history_for_feature: "Historial de [[feature]]"
+ details: "Detalles"
+ private_user: "usuario privado"
+ edited_by_user_at_timestamp: "Editado por [[user]] en [[timestamp]]"
+ object_list:
+ heading: "Lista de objetos"
+ back: "Mostrar lista de objetos"
+ type:
+ node: "Nodo"
+ way: "VÃa"
+ api: "Descargar este área a través de la API"
+ details: "Detalles"
+ selected:
+ type:
+ node: "Nodo [[id]]"
+ way: "VÃa [[id]]"
+ history:
+ node: "Nodo [[id]]"
+ way: "VÃa [[id]]"
+ tag_details:
+ tags: "Etiquetas"
+ way_details:
+ nodes: "Nodos"
+ part_of: "Parte de"
+ also_part_of:
+ one: "también parte de la vÃa {{related_ways}}"
+ other: "también parte de las vÃas {{related_ways}}"
+ way_history:
+ way_history: "Historial de la vÃa"
+ way_history_title: "Historial del camino {{way_name}}:"
+ download: "{{download_xml_link}} o {{view_details_link}}"
+ download_xml: "Descargar XML"
+ view_details: "ver detalles"
+ way:
+ way: "VÃa"
+ way_title: "VÃa {{way_name}}:"
+ download: "{{download_xml_link}} o {{view_history_link}}"
+ download_xml: "Descargar XML"
+ view_history: "ver historial"
+ changeset:
+ changeset_paging_nav:
+ showing_page: "Mostrando página"
+ of: "de"
+ changeset:
+ still_editing: "(todavÃa en edición)"
+ anonymous: "Anónimo"
+ no_comment: "(ninguno)"
+ no_edits: "(sin ediciones)"
+ show_area_box: "mostrar caja"
+ big_area: "(grande)"
+ view_changeset_details: "Ver detalles del conjunto de cambios"
+ more: "más"
+ changesets:
+ id: "ID"
+ saved_at: "Guardado en"
+ user: "Usuario"
+ comment: "Comentario"
+ area: "Ãrea"
+ list_bbox:
+ history: "Historial"
+ changesets_within_the_area: "Conjuntos de cambios en el área:"
+ show_area_box: "mostrar caja"
+ no_changesets: "Sin conjuntos de cambios"
+ all_changes_everywhere: "Para todos los cambios en cualquier lugar véase {{recent_changes_link}}"
+ recent_changes: "Cambios Recientes"
+ no_area_specified: "No se especificó un área"
+ first_use_view: "Primero usa la {{view_tab_link}} para desplazarte y hacer zoom sobre el área de interés, entonces haz clic en la pestaña de historial."
+ view_the_map: "ver el mapa"
+ view_tab: "pestaña vista"
+ alternatively_view: "Alternativamente, vea todos los {{recent_changes_link}}"
+ list:
+ recent_changes: "Cambios recientes"
+ recently_edited_changesets: "Conjunto de cambios editados recientemente"
+ for_more_changesets: "Para más conjuntos de cambios, seleccione un usuario y vea sus ediciones, o vea el historial de ediciones de un área especÃfica"
+ list_user:
+ edits_by_username: "Ediciones hechas por {{username_link}}"
+ no_visible_edits_by: "{{name}} no ha hecho ediciones visibles."
+ for_all_changes: "Para los cambios de todos los usuarios vea {{recent_changes_link}}"
+ recent_changes: "Cambios Recientes"
+ diary_entry:
+ new:
+ title: "Nueva entrada en el diario"
+ list:
+ title: "Diarios de usuarios"
+ user_title: "Diario de {{user}}"
+ new: "Nueva entrada en el diario"
+ new_title: "Redactar una nueva entrada en tu diario de usuario"
+ no_entries: "No hay entradas en el diario"
+ recent_entries: "Entradas recientes en el diario:"
+ older_entries: "Entradas más antiguas"
+ newer_entries: "Entradas más modernas"
+ edit:
+ title: "Editar entrada del diario"
+ subject: "Asunto: "
+ body: "Cuerpo: "
+ language: "Idioma: "
+ location: "Lugar:"
+ latitude: "Latitud"
+ longitude: "Longitud"
+ use_map_link: "Usar mapa"
+ save_button: "Guardar"
+ marker_text: "Lugar de la entrada del diario"
+ view:
+ title: "Diarios de usuarios | {{user}}"
+ user_title: "Diario de {{user}}"
+ leave_a_comment: "Dejar un comentario"
+ login_to_leave_a_comment: "{{login_link}} para dejar un comentario"
+ login: "IdentifÃquese"
+ save_button: "Guardar"
+ no_such_entry:
+ heading: "No hay entrada con la ID {{id}}"
+ body: "Lo sentimos, no hay ninguna entrada del diario para la ID {{id}}. Por favor, comprueba que la dirección está correctamente escrita."
+ no_such_user:
+ title: "No existe ese usuario"
+ heading: "El usuario {{user}} no existe"
+ body: "Lo sentimos, no hay ningún usuario llamado {{user}}. Por favor, comprueba que la dirección es correcta."
+ diary_entry:
+ posted_by: "Posteado por {{link_user}} en {{created}} en {{language_link}}"
+ comment_link: "Comentar esta entrada"
+ reply_link: "Responder a la entrada"
+ comment_count:
+ one: "1 comentario"
+ other: "{{count}} comentarios"
+ edit_link: "Editar entrada"
+ diary_comment:
+ comment_from: "Comentario de {{link_user}} de {{comment_created_at}}"
+ export:
+ start:
+ area_to_export: "Area a exportar"
+ manually_select: "Seleccionar a mano otra area"
+ format_to_export: "Formato de exportación"
+ osm_xml_data: "Datos formato OpenStreetMap XML"
+ mapnik_image: "Imagen de Mapnik"
+ osmarender_image: "Imagen de Osmarender"
+ embeddable_html: "HTML para pegar"
+ licence: "Licencia"
+ export_details: "Los datos de OpenStreetMap se encuentran bajo una licencia Creative Commons Atribución-Compartir Igual 2.0."
+ options: "Opciones"
+ format: "Formato"
+ scale: "Escala"
+ max: "max"
+ image_size: "Tamaño de la imagen"
+ zoom: "Zoom"
+ add_marker: "Añadir chinche en el mapa"
+ latitude: "Lat:"
+ longitude: "Lon:"
+ output: "Resultado"
+ paste_html: "HTML para empotrar en otro sitio web"
+ export_button: "Exportat"
+ start_rjs:
+ export: "Exportar"
+ drag_a_box: "Arrastre una caja en el mapa para seleccionar un área"
+ manually_select: "Seleccionar manualmente un área distinta"
+ click_add_marker: "Pinche en el mapa para añadir un marcador"
+ change_marker: "Cambiar posición del marcador"
+ add_marker: "Añadir un marcador al mapa"
+ view_larger_map: "Ver mapa más grande"
+ geocoder:
+ results:
+ results: "Resultados"
+ type_from_source: "{{type}} en {{source_link}}"
+ no_results: "No se han encontrado resultados"
+ layouts:
+ project_name:
+ title: "OpenStreetMap"
+ h1: "OpenStreetMap"
+ logo:
+ alt_text: "Logo de OpenStreetMap"
+ welcome_user: "Bienvenido, {{user_link}}"
+ welcome_user_link_tooltip: "Tu página de usuario"
+ home: "inicio"
+ home_tooltip: "Ir a la página inicial"
+ inbox: "bandeja de entrada ({{count}})"
+ inbox_tooltip:
+ zero: "Tu bandeja de entrada no tiene mensajes sin leer"
+ one: "Tu bandeja de entrada contiene un mensaje sin leer"
+ other: "Tu bandeja de entrada contiene {{count}} mensajes sin leer"
+ logout: "Salir"
+ logout_tooltip: "Salir"
+ log_in: "identificarse"
+ log_in_tooltip: "Identificarse con una cuenta existente"
+ sign_up: "registrarse"
+ sign_up_tooltip: "Cree una cuenta para editar"
+ view: "Ver"
+ view_tooltip: "Ver mapas"
+ edit: "Editar"
+ edit_tooltip: "Editar mapas"
+ history: "Historial"
+ history_tooltip: "Historial de conjuntos de cambios"
+ export: "Exportar"
+ export_tooltip: "Exportar datos del mapa"
+ gps_traces: "Trazas GPS"
+ gps_traces_tooltip: "Gestionar trazas"
+ user_diaries: "Diarios de usuario"
+ user_diaries_tooltip: "Ver diarios de usuario"
+ tag_line: "El WikiMapaMundi libre"
+ intro_1: "OpenStreetMap es un mapa libremente editable de todo el mundo. Está hecho por personas como usted."
+ intro_2: "OpenStreetMap te permite ver, editar y usar información geográfica de manera colaborativa desde cualquier lugar del mundo."
+ intro_3: "Agradecimientos al {{ucl}} y {{bytemark}} por apoyar el hospedaje de los servidores de OpenStreetMap."
+ intro_3_ucl: "UCL VR Centre"
+ intro_3_bytemark: "bytemark"
+ osm_offline: "La base de datos de OpenStreetMap no está disponible en estos momentos debido a trabajos de mantenimiento."
+ osm_read_only: "La base de datos de OpenStreetMap se encuentra en modo de sólo lectura debido a trabajos de mantenimiento."
+ donate: "Apoye a OpenStreetMap {{link}} al Fondo de Actualización de Hardware."
+ donate_link_text: "donando"
+ help_wiki: "Ayuda y Wiki"
+ help_wiki_tooltip: "Ayuda y sitio Wiki del proyecto"
+ help_wiki_url: "http://wiki.openstreetmap.org/wiki/ES:Main_Page"
+ news_blog: "Blog y noticias"
+ news_blog_tooltip: "Blog de noticias sobre OpenStreetMap, información grográfica libre, etc."
+ shop: "Tienda"
+ shop_tooltip: "Tienda con productos de OpenStreetMap"
+ shop_url: "http://wiki.openstreetmap.org/wiki/Merchandise"
+ sotm: "¡Venga a las conferencias de OpenStreetMap, el State of the Map 2009, del 10 al 12 de julio en Ãmsterdam!"
+ alt_donation: "Hacer una donación"
notifier:
diary_comment_notification:
- banner1: "* Por favor, no responda a este mensaje. *"
- banner2: "* Utilice el OpenStreetMap sitio web para responder. *"
+ subject: "[OpenStreetMap] {{user}} ha comentado en tu entrada de diario"
+ banner1: "* Por favor no responda a este correo. *"
+ banner2: "* Use el sitio web de OpenStreetMap para responder. *"
+ hi: "Hola {{to_user}},"
+ header: "{{from_user}} ha comentado sobre tu reciente entrada en el diario con el asunto {{subject}}:"
+ footer: "También puede leer el comentario en {{readurl}} y puedes comentar en {{commenturl}} o responder en {{replyurl}}"
+ message_notification:
+ subject: "[OpenStreetMap] {{user}} te ha enviado un nuevo mensaje"
+ banner1: "* Por favor no responda a este correo. *"
+ banner2: "* Use el sitio web de OpenStreetMap para responder. *"
+ hi: "Hola {{to_user}},"
+ header: "{{from_user}} te ha enviado un mensaje a través de OpenStreetMap con el asunto {{subject}}:"
+ footer1: "También puedes leer el mensaje en {{readurl}}"
+ footer2: "y puedes responder en {{replyurl}}"
+ friend_notification:
+ subject: "[OpenStreetMap] {{user}} te ha añadido como amigo"
+ had_added_you: "{{user}} te ha añadido como amigo en OpenStreetMap"
+ see_their_profile: "Puede ver su perfil en {{userurl}} y añadirle como amigo también, si asà lo desea"
+ gpx_notification:
+ greeting: "Hola,"
+ your_gpx_file: "Parece que su fichero GPX"
+ with_description: "con la descripción"
+ and_the_tags: "y con las siguientes etiquetas:"
+ and_no_tags: "y sin etiquetas"
+ failure:
+ subject: "[OpenStreetMap] Fallo al importar GPX"
+ failed_to_import: "no ha podido ser importado. El mensaje de error es:"
+ more_info_1: "Puede encontrar más información sobre fallos de importación "
+ more_info_2: "de GPX y cómo evitarlos en:"
+ import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+ success:
+ subject: "[OpenStreetMap] Ãxito al importar GPX"
+ loaded_successfully: "ha sido cargada con éxito"
+ signup_confirm:
+ subject: "[OpenStreetMap] Confirme su dirección de correo electrónico"
+ signup_confirm_plain:
+ greeting: "¡Hola!"
+ hopefully_you: "Alguien (probablemente usted) ha creado una cuenta en"
+ click_the_link_1: "Si este es usted, ¡Bienvenido! Por favot, pulse en el enlace más abajo para "
+ click_the_link_2: "confirmar su cuenta y leer más información sobre OpenStreetMap."
+ introductory_video: "Puede ver un vÃdeo introductorio sobre OpenStreetMap aquÃ:"
+ more_videos: "Hay más vÃdeos aquÃ:"
+ the_wiki: "Lea más sobre OpenStreetMap en el wiki:"
+ the_wiki_url: "http://wiki.openstreetmap.org/wiki/ES:Beginners_Guide"
+ opengeodata: "OpenGeoData.org es el blog de OpenStreetMap, y también tiene podcasts:"
+ wiki_signup: "Puede que también quiera registrarse en el Wiki de OpenStreetMap en:"
+ wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&returnto=ES:Main_Page"
+ user_wiki_1: "Recomendamos que cree una página de usuario en el wiki, que incluya"
+ user_wiki_2: "etiquetas de categorÃa pasa saber de dónde es (por ejemplo [[Category:Users_in_Madrid]])"
+ current_user_1: "Una lista de todos los usuarios por categorÃas, basado en su procedencia,"
+ current_user_2: "está disponible en:"
+ signup_confirm_html:
+ greeting: "¡Hola!"
+ hopefully_you: "Alguien (probablemente usted) ha creado una cuenta en"
+ click_the_link: "Si este es usted, ¡Bienvenido! Por favot, pulse en el enlace más abajo para confirmar su cuenta y leer más información sobre OpenStreetMap."
+ introductory_video: "Puede ver un {{introductory_video_link}}"
+ video_to_openstreetmap: "vÃdeo introductorio a OpenStreetMap."
+ more_videos: "Hay más {{more_videos_link}}"
+ more_videos_here: "vÃdeos aquÃ"
+ email_confirm:
+ subject: "[OpenStreetMap] Confirme su dirección de correo"
+ email_confirm_plain:
+ greeting: "Hola,"
+ hopefully_you_1: "Alguien (posiblemente usted) quiere cambiar la dirección de correo en"
+ hopefully_you_2: "{{server_url}} a {{new_address}}."
+ click_the_link: "Si es usted, por favor pulse el enlace inferior para confirmar el cambio"
+ email_confirm_html:
+ greeting: "Hola,"
+ hopefully_you: "Alguien (posiblemente usted) quiere cambiar la dirección de correo en {{server_url}} a {{new_address}}."
+ click_the_link: "Si es usted, por favor pulse el enlace inferior para confirmar el cambio"
+ lost_password:
+ subject: "[OpenStreetMap] Petición para resetear la contraseña"
+ lost_password_plain:
+ greeting: "Hola,"
+ click_the_link: "Si es usted, por favor pulse el enlace inferior para resetear la contraseña."
+ lost_password_html:
+ greeting: "Hola,"
+ click_the_link: "Si es usted, por favor pulse el enlace inferior para resetear la contraseña."
+ reset_password:
+ subject: "[OpenStreetMap] Reset de contraseña"
+ reset_password_plain:
+ greeting: "Hola,"
+ reset_password_html:
+ greeting: "Hola,"
+ message:
+ inbox:
+ title: "Buzón de entrada"
+ my_inbox: "Mi buzón de entrada"
+ outbox: "bandeja de salida"
+ you_have: "tienes {{new_count}} mensajes nuevos y {{old_count}} mensajes viejos"
+ from: "De"
+ subject: "Asunto"
+ date: "Fecha"
+ people_mapping_nearby: "gente cercana mapeando"
+ message_summary:
+ unread_button: "Marcar como sin leer"
+ read_button: "Marcar como leÃdo"
+ reply_button: "Responder"
+ new:
+ title: "Enviar mensaje"
+ send_message_to: "Enviar un mensaje nuevo a {{name}}"
+ subject: "Asunto"
+ body: "Cuerpo"
+ send_button: "Enviar"
+ message_sent: "Mensaje enviado"
+ outbox:
+ title: "Salida"
+ my_inbox: "Mi {{inbox_link}}"
+ inbox: "entrada"
+ outbox: "salida"
+ to: "A"
+ subject: "Asunto"
+ date: "Fecha"
+ people_mapping_nearby: "gente cercana mapeando"
+ read:
+ title: "Leer mensaje"
+ from: "Desde"
+ subject: "Asunto"
+ date: "Fecha"
+ reply_button: "Responder"
+ unread_button: "Marcar como no leido"
+ to: "A"
+ mark:
+ as_read: "Mensaje marcado como leido"
+ as_unread: "Mensaje marcado como sin leer"
+ site:
+ index:
+ js_1: "Está usando un navegador que no soporta javascript, o lo tiene desactivado"
+ js_2: "OpenStreetMap utiliza javascript para mostrar su mapa"
+ permalink: "Enlace permanente"
+ license:
+ license_name: "Creative Commons Attribution-Share Alike 2.0"
+ license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+ project_name: "Proyecto OpenStreetMap"
+ project_url: "http://openstreetmap.org"
+ edit:
+ user_page_link: "página de usuario"
+ anon_edits: "({{link}})"
+ anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ sidebar:
+ search_results: "Resultados de la búsqueda"
+ close: "Cerrar"
+ search:
+ search: "Buscar"
+ where_am_i: "¿Dónde estoy?"
+ submit_text: "Ir"
+ searching: "Buscando..."
+ trace:
+ edit:
+ points: "Puntos:"
+ edit: "editar"
+ owner: "Propietario"
+ description: "Descripción"
+ tags: "Etiquetas"
+ save_button: "Guardar cambios"
+ trace_form:
+ description: "Descripción"
+ tags: "Etiquetas"
+ public: "¿Público?"
+ upload_button: "Subir"
+ help: "Ayuda"
+ trace_header:
+ see_all_traces: "Ver todas las trazas"
+ see_your_traces: "Ver todas tus trazas"
+ trace_optionals:
+ tags: "Etiquetas"
+ view:
+ pending: "PENDIENTE"
+ download: "descargar"
+ points: "Puntos:"
+ start_coordinates: "Coordenada de inicio:"
+ map: "Mapa"
+ edit: "Editor"
+ owner: "Propietario"
+ description: "Descripción:"
+ tags: "Etiquetas"
+ none: "Ninguna"
+ make_public: "Hacer esta traza pública de forma permanente"
+ edit_track: "Editar esta traza"
+ delete_track: "Borrar esta traza"
+ viewing_trace: "Viendo traza {{name}}"
+ trace_not_found: "¡No se ha encontrado la traza!"
+ trace_paging_nav:
+ showing: "Mostrando página"
+ of: "de"
+ trace:
+ pending: "PENDIENTE"
+ count_points: "{{count}} puntos"
+ ago: "hace {{time_in_words_ago}}"
+ more: "más"
+ trace_details: "Ver detalle de la traza"
+ view_map: "Ver mapa"
+ edit: "editar"
+ edit_map: "Editar mapa"
+ public: "PÃBLICO"
+ private: "PRIVADO"
+ by: "por"
+ in: "en"
+ map: "mapa"
+ list:
+ public_traces: "Trazas GPS públicas"
+ your_traces: "Tus trazas GPS"
+ tagged_with: "etiquetado con {{tags}}"
+ user:
+ login:
+ create_account: "crear una cuenta"
+ email or username: "Dirección de correo o nombre de usuario"
+ password: "Contraseña"
+ lost password link: "¿ha perdido su contraseña?"
+ lost_password:
+ title: "contraseña perdida"
+ heading: "¿Contraseña olvidada?"
+ email address: "Dirección de correo:"
+ new password button: "Enviarme la nueva contraseña"
+ notice email cannot find: "Lo siento, no se pudo encontrar la dirección de correo electrónico."
+ reset_password:
+ title: "restablecer contraseña"
+ new:
+ title: "Crear cuenta"
+ heading: "Crear una cuenta de usuario"
+ email address: "Dirección de correo"
+ confirm email address: "Confirmar la dirección de correo"
+ display name: "Nombre en pantalla:"
+ password: "Contraseña: "
+ confirm password: "Confirmar contraseña: "
+ signup: "Registro"
+ no_such_user:
+ title: "Este usuario no existe"
+ heading: "El usuario {{user}} no existe"
+ view:
+ my diary: "mi diario"
+ new diary entry: "nueva entrada de diario"
+ my edits: "mis ediciones"
+ my traces: "mis trazas"
+ my settings: "mis preferencias"
+ send message: "enviar mensaje"
+ diary: "diario"
+ edits: "ediciones"
+ traces: "trazas"
+ remove as friend: "eliminar como amigo"
+ add as friend: "añadir como amigo"
+ mapper since: "Mapeador más próximo"
+ ago: "(hace {{time_in_words_ago}})"
+ user image heading: "Imagen del usuario"
+ delete image: "Borrar imagen"
+ upload an image: "Subir una imagen"
+ add image: "Añadir imagen"
+ description: "Descripción"
+ user location: "Localización del usuario"
+ no home location: "No se ha fijado ninguna localización."
+ if set location: "Si ha configurado su lugar de origen, verá un mapa debajo. Puede configurar su lugar de origen en la página de {{settings_link}}."
+ settings_link_text: "preferencias"
+ your friends: "Tus amigos"
+ no friends: "No has añadido ningún amigo aún."
+ km away: "{{count}} km de distancia"
+ nearby users: "Usuarios cercanos: "
+ no nearby users: "TodavÃa no hay usuarios que reconozcan el estar mapeando cerca."
+ change your settings: "cambiar tu configuración"
+ friend_map:
+ your location: "Tu lugar de origen:"
+ nearby mapper: "Mapeadores cercanos:"
+ account:
+ title: "Editar cuenta"
+ my settings: "Mis preferencias"
+ email never displayed publicly: "(nunca es mostrado públicamente)"
+ public editing:
+ heading: "Ediciones públicas:"
+ enabled: "Activadas. No es anónimo y puede editar datos."
+ enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ enabled link text: "¿qué es esto?"
+ disabled: "Desactivadas y no puede editar datos; todas las ediciones anteriores son anónimas."
+ disabled link text: "¿por qué no puedo editar?"
+ profile description: "Descripción del perfil:"
+ preferred languages: "Idiomas preferidos:"
+ home location: "Lugar de origen:"
+ no home location: "No has introducido tu lugar de origen."
+ latitude: "Latitud:"
+ longitude: "Longitud:"
+ update home location on click: "¿Actualizar tu lugar de origen cuando pulses sobre el mapa?"
+ save changes button: "Guardar cambios"
+ make edits public button: "Hacer que todas mis ediciones sean públicas"
+ return to profile: "Regresar al perfil"
+ flash update success confirm needed: "La información del usuario se ha actualizado correctamente. Compruebe su correo electrónico para ver una nota sobre cómo confirmar su nueva dirección de correo electrónico."
+ flash update success: "La información del usuario se ha actualizado correctamente."
+ confirm:
+ heading: "Confirmar la cuenta de usuario"
+ press confirm button: "Pulse botón de confirmación de debajo para activar su cuenta."
+ button: "Confirmar"
+ success: "¡Confirmada su cuenta, gracias por registrarse!"
+ failure: "Una cuenta de usuario con esta misma credencial de autentificación ya ha sido confirmada"
+ confirm_email:
+ heading: "Confirmar el cambio de dirección de correo electrónico"
+ press confirm button: "Pulse botón de confirmación de debajo para confirmar su nueva dirección de correo"
+ button: "Confirmar"
+ success: "Dirección de correo electrónico confirmada. ¡Gracias por registrarse!"
+ failure: "La dirección de correo electrónico ha sido confirmada mediante esta credencial de autentificación"
+ set_home:
+ flash success: "Localización guardada con éxito"
+ go_public:
+ flash success: ""
+ make_friend:
+ success: "{{name}} es ahora tu amigo"
+ failed: "Lo sentimos, no se ha podido añadir {{name}} como un amigo."
+ already_a_friend: "Ya sois amigos"
+ remove_friend:
+ success: "Has quitado a {{name}} de tus amigos."
+ not_a_friend: "{{name}} no es uno de tus amigos."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a1c3c63aa..4ad6cf3a5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -100,7 +100,7 @@ fr:
no_such_user:
body: "Desolé, il n'y pas d'utilisateur avec le nom {{user}}. Veuillez vérifier l'orthographe, ou le lien que vous avez cliqué n'est pas valide."
diary_entry:
- posted_by: "Posté par {{link_user}} à {{created}} en {{language}}"
+ posted_by: "Posté par {{link_user}} à {{created}} en {{language_link}}"
comment_link: "Commenter cette entrée"
reply_link: "Répondre a cette entrée"
comment_count:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0626e4025..57e238396 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1,636 +1,636 @@
-he:
- activerecord:
- # Translates all the model names, which is used in error handling on the web site
- models:
- acl: "Access Control List"
- changeset: "Changeset"
- changeset_tag: "Changeset Tag"
- country: "×רץ"
- diary_comment: "Diary Comment"
- diary_entry: "Diary Entry"
- friend: "Friend"
- language: "שפ×"
- message: "Message"
- node: "Node"
- node_tag: "Node Tag"
- notifier: "Notifier"
- old_node: "Old Node"
- old_node_tag: "Old Node Tag"
- old_relation: "Old Relation"
- old_relation_member: "Old Relation Member"
- old_relation_tag: "Old Relation Tag"
- old_way: "Old Way"
- old_way_node: "Old Way Node"
- old_way_tag: "Old Way Tag"
- relation: "Relation"
- relation_member: "Relation Member"
- relation_tag: "Relation Tag"
- session: "Session"
- trace: "Trace"
- tracepoint: "Trace Point"
- tracetag: "Trace Tag"
- user: "×שת×ש"
- user_preference: "User Preference"
- user_token: "User Token"
- way: "Way"
- way_node: "Way Node"
- way_tag: "Way Tag"
- # Translates all the model attributes, which is used in error handling on the web site
- # Only the ones that are used on the web site are translated at the moment
- attributes:
- diary_comment:
- body: "Body"
- diary_entry:
- user: "×שת×ש"
- title: "××תרת"
- latitude: "×§× ×¨×××"
- longitude: "×§× ××ר×"
- language: "שפ×"
- friend:
- user: "×שת×ש"
- friend: "××ר"
- trace:
- user: "×שת×ש"
- visible: "Visible"
- name: "Name"
- size: "Size"
- latitude: "×§× ×¨×××"
- longitude: "×§× ××ר×"
- public: "Public"
- description: "ת××ר"
- message:
- sender: "ש×××ת"
- title: "××תרת"
- body: "×××£"
- recipient: "× ××¢×"
- user:
- email: "Email"
- active: "פע××"
- display_name: "Display Name"
- description: "ת××ר"
- languages: "שפ×ת"
- pass_crypt: "ס×ס××"
- map:
- view: "תצ×××"
- edit: "ער×××"
- coordinates: "Coordinates:"
- browse:
- changeset:
- title: "Changeset"
- changeset: "Changeset:"
- download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
- changesetxml: "Changeset XML"
- osmchangexml: "osmChange XML"
- changeset_details:
- created_at: "Created at:"
- closed_at: "Closed at:"
- belongs_to: "Belongs to:"
- bounding_box: "Bounding box:"
- no_bounding_box: "No bounding box has been stored for this changeset."
- show_area_box: "Show Area Box"
- box: "box"
- has_nodes: "Has the following {{count}} nodes:"
- has_ways: "Has the following {{count}} ways:"
- has_relations: "Has the following {{count}} relations:"
- common_details:
- edited_at: "Edited at:"
- edited_by: "Edited by:"
- version: "Version:"
- in_changeset: "In changeset:"
- containing_relation:
- relation: "Relation {{relation_name}}"
- relation_as: "(as {{relation_role}})"
- map:
- loading: "Loading..."
- deleted: "Deleted"
- view_larger_map: "View Larger Map"
- node_details:
- coordinates: "Coordinates: "
- part_of: "Part of:"
- node_history:
- node_history: "Node History"
- download: "{{download_xml_link}} or {{view_details_link}}"
- download_xml: "Download XML"
- view_details: "view details"
- node:
- node: "Node"
- node_title: "Node: {{node_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
- download_xml: "Download XML"
- view_history: "view history"
- not_found:
- sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
- paging_nav:
- showing_page: "Showing page"
- of: "of"
- relation_details:
- members: "Members:"
- part_of: "Part of:"
- relation_history:
- relation_history: "Relation History"
- relation_history_title: "Relation History: {{relation_name}}"
- relation_member:
- as: "as"
- relation:
- relation: "Relation"
- relation_title: "Relation: {{relation_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
- download_xml: "Download XML"
- view_history: "view history"
- start:
- view_data: "View data for current map view"
- manually_select: "Manually select a different area"
- start_rjs:
- data_frame_title: "Data"
- zoom_or_select: "Zoom in or select an area of the map to view"
- drag_a_box: "Drag a box on the map to select an area"
- manually_select: "Manually select a different area"
- loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
- load_data: "Load Data"
- unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
- loading: "Loading..."
- show_history: "Show History"
- wait: "Wait..."
- history_for_feature: "History for [[feature]]"
- details: "Details"
- private_user: "private user"
- edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
- tag_details:
- tags: "Tags:"
- way_details:
- nodes: "Nodes:"
- part_of: "Part of:"
- also_part_of:
- one: "also part of way {{related_ways}}"
- other: "also part of ways {{related_ways}}"
- way_history:
- way_history: "Way History"
- way_history_title: "Way History: {{way_name}}"
- download: "{{download_xml_link}} or {{view_details_link}}"
- download_xml: "Download XML"
- view_details: "view details"
- way:
- way: "Way"
- way_title: "Way: {{way_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
- download_xml: "Download XML"
- view_history: "view history"
- changeset:
- changeset_paging_nav:
- showing_page: "Showing page"
- of: "of"
- changeset:
- still_editing: "(still editing)"
- anonymous: "Anonymous"
- no_comment: "(none)"
- no_edits: "(no edits)"
- show_area_box: "show area box"
- big_area: "(big)"
- view_changeset_details: "View changeset details"
- more: "more"
- changesets:
- id: "ID"
- saved_at: "Saved at"
- user: "×שת×ש"
- comment: "Comment"
- area: "Area"
- list_bbox:
- history: "History"
- changesets_within_the_area: "Changesets within the area:"
- show_area_box: "show area box"
- no_changesets: "No changesets"
- all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
- recent_changes: "Recent Changes"
- no_area_specified: "No area specified"
- first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
- view_the_map: "view the map"
- view_tab: "view tab"
- alternatively_view: "Alternatively, view all {{recent_changes_link}}"
- list:
- recent_changes: "Recent Changes"
- recently_edited_changesets: "Recently edited changesets:"
- for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
- list_user:
- edits_by_username: "Edits by {{username_link}}"
- no_visible_edits_by: "No visible edits by {{name}}."
- for_all_changes: "For changes by all users see {{recent_changes_link}}"
- recent_changes: "Recent Changes"
- diary_entry:
- new:
- title: New Diary Entry
- list:
- title: "Users' diaries"
- user_title: "{{user}}'s diary"
- new: New Diary Entry
- new_title: Compose a new entry in your user diary
- no_entries: No diary entries
- recent_entries: "Recent diary entries: "
- older_entries: Older Entries
- newer_entries: Newer Entries
- edit:
- title: "Edit diary entry"
- subject: "Subject: "
- body: "Body: "
- language: ":שפ×"
- location: "Location: "
- latitude: ":×§× ×¨×××"
- longitude: ":×§× ××ר×"
- use_map_link: "use map"
- save_button: "Save"
- marker_text: Diary entry location
- view:
- title: "Users' diaries | {{user}}"
- user_title: "{{user}}'s diary"
- leave_a_comment: "Leave a comment"
- save_button: "Save"
- no_such_entry:
- heading: "No entry with the id: {{id}}"
- body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
- no_such_user:
- body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
- diary_entry:
- posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
- comment_link: Comment on this entry
- reply_link: Reply to this entry
- comment_count:
- one: 1 comment
- other: "{{count}} comments"
- edit_link: Edit this entry
- diary_comment:
- comment_from: "Comment from {{link_user}} at {{comment_created_at}}"
- export:
- start:
- area_to_export: "Area to Export"
- manually_select: "Manually select a different area"
- format_to_export: "Format to Export"
- osm_xml_data: "OpenStreetMap XML Data"
- mapnik_image: "Mapnik Image"
- osmarender_image: "Osmarender Image"
- embeddable_html: "Embeddable HTML"
- licence: "Licence"
- export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
- options: "Options"
- format: "Format"
- scale: "Scale"
- max: "max"
- image_size: "Image Size"
- zoom: "Zoom"
- add_marker: "Add a marker to the map"
- latitude: "Lat:"
- longitude: "Lon:"
- output: "Output"
- paste_html: "Paste HTML to embed in website"
- export_button: "Export"
- start_rjs:
- export: "Export"
- drag_a_box: "Drag a box on the map to select an area"
- manually_select: "Manually select a different area"
- click_add_marker: "Click on the map to add a marker"
- change_marker: "Change marker position"
- add_marker: "Add a marker to the map"
- view_larger_map: "View Larger Map"
- geocoder:
- results:
- results: "Results"
- type_from_source: "{{type}} from {{source_link}}"
- no_results: "No results found"
- layouts:
- welcome_user: "Welcome, {{user_link}}"
- home: "home"
- inbox: "inbox ({{count}})"
- logout: logout
- log_in: log in
- sign_up: sign up
- view: "תצ×××"
- edit: "ער×××"
- history: "××ס××ר××"
- export: "×צ××"
- gps_traces: GPS Traces
- user_diaries: "×××× × ×שת×ש××"
- tag_line: The Free Wiki World Map
- intro_1: ".××× ××¤× ×××× × ×©× ×× ××¢×××, ×××פש×ת ×ער×××. ××צר×× ×××ª× ×× ×©×× ×××× OpenStreetMap"
- intro_2: ".××פשרת ×× ×ר××ת, ×ער×× ×××שת×ש ×× ×ª×× ×× ×××××רפ××× ×צ××¨× ×©×ת×פ×ת ××× ××§×× ××¢××× OpenStreetMap"
- intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
- osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
- osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
- donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
- donate_link_text: donating
- help_wiki: "Help & Wiki"
- news_blog: "News blog"
- shop: Shop
- sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
- alt_donation: Make a Donation
- notifier:
- diary_comment_notification:
- banner1: "* Please do not reply to this email. *"
- banner2: "* Use the OpenStreetMap web site to reply. *"
- hi: "Hi {{to_user}},"
- header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
- footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
- friend_notification:
- had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
- see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
- signup_confirm_plain:
- greeting: "Hi there!"
- hopefully_you: "Someone (hopefully you) would like to create an account over at"
- # next two translations run-on : please word wrap appropriately
- click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
- click_the_link_2: "account and read on for more information about OpenStreetMap."
- introductory_video: "You can watch an introductory video to OpenStreetMap here:"
- more_videos: "There are more videos here:"
- the_wiki: "Get reading about OpenStreetMap on the wiki:"
- opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
- wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
- # next four translations are in pairs : please word wrap appropriately
- user_wiki_1: "It is recommended that you create a user wiki page, which includes"
- user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
- current_user_1: "A list of current users in categories, based on where in the world"
- current_user_2: "they are, is available from:"
- signup_confirm_html:
- greeting: "Hi there!"
- hopefully_you: "Someone (hopefully you) would like to create an account over at"
- click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
- introductory_video: "You can watch an {{introductory_video_link}}."
- video_to_openstreetmap: "introductory video to OpenStreetMap"
- more_videos: "There are {{more_videos_link}}."
- more_videos_here: "more videos here"
- get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!'
- wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.'
- user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].'
- current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.'
- message:
- inbox:
- title: "Inbox"
- my_inbox: "My inbox"
- outbox: "outbox"
- you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
- from: "From"
- subject: "Subject"
- date: "Date"
- no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
- people_mapping_nearby: "people mapping nearby"
- message_summary:
- unread_button: "Mark as unread"
- read_button: "Mark as read"
- reply_button: "Reply"
- new:
- title: "Send message"
- send_message_to: "Send a new message to {{name}}"
- subject: "Subject"
- body: "Body"
- send_button: "Send"
- back_to_inbox: "Back to inbox"
- message_sent: "Message sent"
- no_such_user:
- heading: "No such user or message"
- body: "Sorry there is no user or message with that name or id"
- outbox:
- title: "Outbox"
- my_inbox: "My {{inbox_link}}"
- inbox: "inbox"
- outbox: "outbox"
- you_have_sent_messages: "You have {{sent_count}} sent messages"
- to: "To"
- subject: "Subject"
- date: "Date"
- no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
- people_mapping_nearby: "people mapping nearby"
- read:
- title: "Read message"
- reading_your_messages: "Reading your messages"
- from: "From"
- subject: "Subject"
- date: "Date"
- reply_button: "Reply"
- unread_button: "Mark as unread"
- back_to_inbox: "Back to inbox"
- reading_your_sent_messages: "Reading your sent messages"
- to: "To"
- back_to_outbox: "Back to outbox"
- mark:
- as_read: "Message marked as read"
- as_unread: "Message marked as unread"
- site:
- index:
- js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
- js_2: "OpenStreetMap uses javascript for its slippy map."
- js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.'
- permalink: Permalink
- license:
- notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
- license_name: "Creative Commons Attribution-Share Alike 2.0"
- license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
- project_name: "OpenStreetMap project"
- project_url: "http://openstreetmap.org"
- edit:
- not_public: "You haven't set your edits to be public."
- not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
- user_page_link: user page
- anon_edits: "({{link}})"
- anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
- anon_edits_link_text: "Find out why this is the case."
- flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.'
- potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
- sidebar:
- search_results: Search Results
- close: Close
- search:
- search: Search
- where_am_i: "Where am I?"
- submit_text: "Go"
- searching: "Searching..."
- search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
- key:
- map_key: "Map key"
- trace:
- create:
- upload_trace: "Upload GPS Trace"
- trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
- edit:
- filename: "Filename:"
- uploaded_at: "Uploaded at:"
- points: "Points:"
- start_coord: "Start coordinate:"
- edit: "ער×××"
- owner: "Owner:"
- description: ":ת××ר"
- tags: "Tags:"
- save_button: "Save Changes"
- no_such_user:
- body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
- trace_form:
- upload_gpx: "Upload GPX File"
- description: "ת××ר"
- tags: "Tags"
- public: "Public?"
- upload_button: "Upload"
- help: "Help"
- trace_header:
- see_just_your_traces: "See just your traces, or upload a trace"
- see_all_traces: "See all traces"
- see_your_traces: "See all your traces"
- traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
- trace_optionals:
- tags: "Tags"
- view:
- pending: "PENDING"
- filename: "Filename:"
- download: "download"
- uploaded: "Uploaded at:"
- points: "Points:"
- start_coordinates: "Start coordinate:"
- map: "map"
- edit: "ער×××"
- owner: "Owner:"
- description: ":ת××ר"
- tags: "Tags"
- none: "None"
- make_public: "Make this track public permanently"
- edit_track: "Edit this track"
- delete_track: "Delete this track"
- viewing_trace: "Viewing trace {{name}}"
- trace_not_found: "Trace not found!"
- trace_paging_nav:
- showing: "Showing page"
- of: "of"
- trace:
- pending: "PENDING"
- count_points: "{{count}} points"
- ago: "{{time_in_words_ago}} ago"
- more: "more"
- trace_details: "View Trace Details"
- view_map: "View Map"
- edit: "ער×××"
- edit_map: "Edit Map"
- public: "PUBLIC"
- private: "PRIVATE"
- by: "by"
- in: "in"
- map: "map"
- list:
- public_traces: "Public GPS traces"
- your_traces: "Your GPS traces"
- public_traces_from: "Public GPS traces from {{user}}"
- tagged_with: " tagged with {{tags}}"
- delete:
- scheduled_for_deletion: "Track scheduled for deletion"
- make_public:
- made_public: "Track made public"
- user:
- login:
- title: "Login"
- heading: "Login"
- please login: "Please login or {{create_user_link}}."
- create_account: "create an account"
- email or username: "Email Address or Username: "
- password: "Password: "
- lost password link: "Lost your password?"
- login_button: "Login"
- account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account."
- auth failure: "Sorry, couldn't log in with those details."
- lost_password:
- title: "lost password"
- heading: "Forgotten Password?"
- email address: "Email Address:"
- new password button: "Send me a new password"
- notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
- notice email cannot find: "Couldn't find that email address, sorry."
- reset_password:
- title: "reset password"
- flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
- flash token bad: "Didn't find that token, check the URL maybe?"
- new:
- title: "Create account"
- heading: "Create a User Account"
- no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
- contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
- fill_form: "Fill in the form and we'll send you a quick email to activate your account."
- license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
- email address: "Email Address: "
- confirm email address: "Confirm Email Address: "
- not displayed publicly: 'Not displayed publicly (see privacy policy)'
- display name: "Display Name: "
- password: "Password: "
- confirm password: "Confirm Password: "
- signup: Signup
- flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)
Please note that you won't be able to login until you've received and confirmed your email address.
If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
- no_such_user:
- body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
- view:
- my diary: my diary
- new diary entry: new diary entry
- my edits: my edits
- my traces: my traces
- my settings: my settings
- send message: send message
- diary: diary
- edits: edits
- traces: traces
- remove as friend: remove as friend
- add as friend: add as friend
- mapper since: "Mapper since: "
- ago: "({{time_in_words_ago}} ago)"
- user image heading: User image
- delete image: Delete Image
- upload an image: Upload an image
- add image: Add Image
- description: "ת××ר"
- user location: User location
- no home location: "No home location has been set."
- if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
- settings_link_text: settings
- your friends: Your friends
- no friends: You have not added any friends yet.
- km away: "{{count}}km away"
- nearby users: "Nearby users: "
- no nearby users: "There are no users who admit to mapping nearby yet."
- change your settings: change your settings
- friend_map:
- your location: Your location
- nearby mapper: "Nearby mapper: "
- account:
- title: "Edit account"
- my settings: My settings
- email never displayed publicly: "(never displayed publicly)"
- public editing:
- heading: "Public editing: "
- enabled: "Enabled. Not anonymous and can edit data."
- enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
- enabled link text: "what's this?"
- disabled: "Disabled and cannot edit data, all previous edits are anonymous."
- disabled link text: "why can't I edit?"
- profile description: "Profile Description: "
- preferred languages: "Preferred Languages: "
- home location: "Home Location: "
- no home location: "You have not entered your home location."
- latitude: ":×§× ×¨×××"
- longitude: ":×§× ××ר×"
- update home location on click: "Update home location when I click on the map?"
- save changes button: Save Changes
- make edits public button: Make all my edits public
- return to profile: Return to profile
- flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
- flash update success: "User information updated successfully."
- confirm:
- heading: Confirm a user account
- press confirm button: "Press the confirm button below to activate your account."
- button: Confirm
- success: "Confirmed your account, thanks for signing up!"
- failure: "A user account with this token has already been confirmed."
- confirm_email:
- heading: Confirm a change of email address
- press confirm button: "Press the confirm button below to confirm your new email address."
- button: Confirm
- success: "Confirmed your email address, thanks for signing up!"
- failure: "An email address has already been confirmed with this token."
- set_home:
- flash success: "Home location saved successfully"
- go_public:
- flash success: "All your edits are now public, and you are now allowed to edit."
- make_friend:
- success: "{{name}} is now your friend."
- failed: "Sorry, failed to add {{name}} as a friend."
- already_a_friend: "You are already friends with {{name}}."
- remove_friend:
- success: "{{name}} was removed from your friends."
- not_a_friend: "{{name}} is not one of your friends."
+he:
+ activerecord:
+ # Translates all the model names, which is used in error handling on the web site
+ models:
+ acl: "Access Control List"
+ changeset: "Changeset"
+ changeset_tag: "Changeset Tag"
+ country: "×רץ"
+ diary_comment: "ת×××× ×××××"
+ diary_entry: "רש××× ××××× "
+ friend: "Friend"
+ language: "שפ×"
+ message: "×סר"
+ node: "Node"
+ node_tag: "Node Tag"
+ notifier: "Notifier"
+ old_node: "Old Node"
+ old_node_tag: "Old Node Tag"
+ old_relation: "Old Relation"
+ old_relation_member: "Old Relation Member"
+ old_relation_tag: "Old Relation Tag"
+ old_way: "Old Way"
+ old_way_node: "Old Way Node"
+ old_way_tag: "Old Way Tag"
+ relation: "Relation"
+ relation_member: "Relation Member"
+ relation_tag: "Relation Tag"
+ session: "Session"
+ trace: "Trace"
+ tracepoint: "Trace Point"
+ tracetag: "Trace Tag"
+ user: "×שת×ש"
+ user_preference: "User Preference"
+ user_token: "User Token"
+ way: "Way"
+ way_node: "Way Node"
+ way_tag: "Way Tag"
+ # Translates all the model attributes, which is used in error handling on the web site
+ # Only the ones that are used on the web site are translated at the moment
+ attributes:
+ diary_comment:
+ body: "Body"
+ diary_entry:
+ user: "×שת×ש"
+ title: "××תרת"
+ latitude: "×§× ×¨×××"
+ longitude: "×§× ××ר×"
+ language: "שפ×"
+ friend:
+ user: "×שת×ש"
+ friend: "××ר"
+ trace:
+ user: "×שת×ש"
+ visible: "Visible"
+ name: "Name"
+ size: "Size"
+ latitude: "×§× ×¨×××"
+ longitude: "×§× ××ר×"
+ public: "Public"
+ description: "ת××ר"
+ message:
+ sender: "ש×××ת"
+ title: "××תרת"
+ body: "×××£"
+ recipient: "× ××¢×"
+ user:
+ email: "Email"
+ active: "פע××"
+ display_name: "Display Name"
+ description: "ת××ר"
+ languages: "שפ×ת"
+ pass_crypt: "ס×ס××"
+ map:
+ view: "תצ×××"
+ edit: "ער×××"
+ coordinates: "Coordinates:"
+ browse:
+ changeset:
+ title: "Changeset"
+ changeset: "Changeset:"
+ download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+ changesetxml: "Changeset XML"
+ osmchangexml: "osmChange XML"
+ changeset_details:
+ created_at: "Created at:"
+ closed_at: "Closed at:"
+ belongs_to: "Belongs to:"
+ bounding_box: "Bounding box:"
+ no_bounding_box: "No bounding box has been stored for this changeset."
+ show_area_box: "Show Area Box"
+ box: "box"
+ has_nodes: "Has the following {{count}} nodes:"
+ has_ways: "Has the following {{count}} ways:"
+ has_relations: "Has the following {{count}} relations:"
+ common_details:
+ edited_at: "Edited at:"
+ edited_by: "Edited by:"
+ version: "Version:"
+ in_changeset: "In changeset:"
+ containing_relation:
+ relation: "Relation {{relation_name}}"
+ relation_as: "(as {{relation_role}})"
+ map:
+ loading: "Loading..."
+ deleted: "Deleted"
+ view_larger_map: "View Larger Map"
+ node_details:
+ coordinates: "Coordinates: "
+ part_of: "Part of:"
+ node_history:
+ node_history: "Node History"
+ download: "{{download_xml_link}} or {{view_details_link}}"
+ download_xml: "Download XML"
+ view_details: "view details"
+ node:
+ node: "Node"
+ node_title: "Node: {{node_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "Download XML"
+ view_history: "view history"
+ not_found:
+ sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
+ paging_nav:
+ showing_page: "Showing page"
+ of: "of"
+ relation_details:
+ members: "Members:"
+ part_of: "Part of:"
+ relation_history:
+ relation_history: "Relation History"
+ relation_history_title: "Relation History: {{relation_name}}"
+ relation_member:
+ as: "as"
+ relation:
+ relation: "Relation"
+ relation_title: "Relation: {{relation_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "Download XML"
+ view_history: "view history"
+ start:
+ view_data: "View data for current map view"
+ manually_select: "Manually select a different area"
+ start_rjs:
+ data_frame_title: "Data"
+ zoom_or_select: "Zoom in or select an area of the map to view"
+ drag_a_box: "Drag a box on the map to select an area"
+ manually_select: "Manually select a different area"
+ loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+ load_data: "Load Data"
+ unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
+ loading: "Loading..."
+ show_history: "Show History"
+ wait: "Wait..."
+ history_for_feature: "History for [[feature]]"
+ details: "Details"
+ private_user: "private user"
+ edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+ tag_details:
+ tags: "Tags:"
+ way_details:
+ nodes: "Nodes:"
+ part_of: "Part of:"
+ also_part_of:
+ one: "also part of way {{related_ways}}"
+ other: "also part of ways {{related_ways}}"
+ way_history:
+ way_history: "Way History"
+ way_history_title: "Way History: {{way_name}}"
+ download: "{{download_xml_link}} or {{view_details_link}}"
+ download_xml: "Download XML"
+ view_details: "view details"
+ way:
+ way: "Way"
+ way_title: "Way: {{way_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "Download XML"
+ view_history: "view history"
+ changeset:
+ changeset_paging_nav:
+ showing_page: "Showing page"
+ of: "of"
+ changeset:
+ still_editing: "(still editing)"
+ anonymous: "Anonymous"
+ no_comment: "(none)"
+ no_edits: "(no edits)"
+ show_area_box: "show area box"
+ big_area: "(big)"
+ view_changeset_details: "View changeset details"
+ more: "more"
+ changesets:
+ id: "ID"
+ saved_at: "Saved at"
+ user: "×שת×ש"
+ comment: "Comment"
+ area: "Area"
+ list_bbox:
+ history: "History"
+ changesets_within_the_area: "Changesets within the area:"
+ show_area_box: "show area box"
+ no_changesets: "No changesets"
+ all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+ recent_changes: "Recent Changes"
+ no_area_specified: "No area specified"
+ first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
+ view_the_map: "view the map"
+ view_tab: "view tab"
+ alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+ list:
+ recent_changes: "Recent Changes"
+ recently_edited_changesets: "Recently edited changesets:"
+ for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+ list_user:
+ edits_by_username: "Edits by {{username_link}}"
+ no_visible_edits_by: "No visible edits by {{name}}."
+ for_all_changes: "For changes by all users see {{recent_changes_link}}"
+ recent_changes: "Recent Changes"
+ diary_entry:
+ new:
+ title: New Diary Entry
+ list:
+ title: "Users' diaries"
+ user_title: "{{user}}'s diary"
+ new: New Diary Entry
+ new_title: Compose a new entry in your user diary
+ no_entries: No diary entries
+ recent_entries: "Recent diary entries: "
+ older_entries: Older Entries
+ newer_entries: Newer Entries
+ edit:
+ title: "Edit diary entry"
+ subject: "Subject: "
+ body: "Body: "
+ language: ":שפ×"
+ location: "Location: "
+ latitude: ":×§× ×¨×××"
+ longitude: ":×§× ××ר×"
+ use_map_link: "use map"
+ save_button: "Save"
+ marker_text: Diary entry location
+ view:
+ title: "Users' diaries | {{user}}"
+ user_title: "{{user}}'s diary"
+ leave_a_comment: "Leave a comment"
+ save_button: "Save"
+ no_such_entry:
+ heading: "No entry with the id: {{id}}"
+ body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+ no_such_user:
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ diary_entry:
+ posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
+ comment_link: Comment on this entry
+ reply_link: Reply to this entry
+ comment_count:
+ one: "ת×××× 1"
+ other: "{{count}} ת××××ת"
+ edit_link: "ער××ת רש×××"
+ diary_comment:
+ comment_from: "{{comment_created_at}}× {{link_user}}ת×××× ×"
+ export:
+ start:
+ area_to_export: "Area to Export"
+ manually_select: "Manually select a different area"
+ format_to_export: "Format to Export"
+ osm_xml_data: "OpenStreetMap XML Data"
+ mapnik_image: "Mapnik Image"
+ osmarender_image: "Osmarender Image"
+ embeddable_html: "Embeddable HTML"
+ licence: "Licence"
+ export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
+ options: "Options"
+ format: "Format"
+ scale: "Scale"
+ max: "max"
+ image_size: "Image Size"
+ zoom: "Zoom"
+ add_marker: "Add a marker to the map"
+ latitude: "Lat:"
+ longitude: "Lon:"
+ output: "Output"
+ paste_html: "Paste HTML to embed in website"
+ export_button: "Export"
+ start_rjs:
+ export: "Export"
+ drag_a_box: "Drag a box on the map to select an area"
+ manually_select: "Manually select a different area"
+ click_add_marker: "Click on the map to add a marker"
+ change_marker: "Change marker position"
+ add_marker: "Add a marker to the map"
+ view_larger_map: "View Larger Map"
+ geocoder:
+ results:
+ results: "Results"
+ type_from_source: "{{type}} from {{source_link}}"
+ no_results: "No results found"
+ layouts:
+ welcome_user: "{{user_link}}×ר×× ×××"
+ home: "×××ת×"
+ inbox: "inbox ({{count}})"
+ logout: "×צ××× ×××ש×××"
+ log_in: "×× ××¡× ××ש×××"
+ sign_up: "×רש××"
+ view: "תצ×××"
+ edit: "ער×××"
+ history: "××ס××ר××"
+ export: "×צ××"
+ gps_traces: GPS Traces
+ user_diaries: "×××× × ×שת×ש××"
+ tag_line: "×××§× ×××¤×©× ×©× ×פת ××¢×××"
+ intro_1: ".××× ××¤× ×××× × ×©× ×× ××¢×××, ×××פש×ת ×ער×××. ××צר×× ×××ª× ×× ×©×× ×××× OpenStreetMap"
+ intro_2: ".××פשרת ×× ×ר××ת, ×ער×× ×××שת×ש ×× ×ª×× ×× ×××××רפ××× ×צ××¨× ×©×ת×פ×ת ××× ××§×× ××¢××× OpenStreetMap"
+ intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+ osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
+ osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
+ donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
+ donate_link_text: donating
+ help_wiki: "Help & Wiki"
+ news_blog: "News blog"
+ shop: Shop
+ sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+ alt_donation: Make a Donation
+ notifier:
+ diary_comment_notification:
+ banner1: "* Please do not reply to this email. *"
+ banner2: "* Use the OpenStreetMap web site to reply. *"
+ hi: "Hi {{to_user}},"
+ header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
+ footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+ friend_notification:
+ had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+ see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+ signup_confirm_plain:
+ greeting: "Hi there!"
+ hopefully_you: "Someone (hopefully you) would like to create an account over at"
+ # next two translations run-on : please word wrap appropriately
+ click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
+ click_the_link_2: "account and read on for more information about OpenStreetMap."
+ introductory_video: "You can watch an introductory video to OpenStreetMap here:"
+ more_videos: "There are more videos here:"
+ the_wiki: "Get reading about OpenStreetMap on the wiki:"
+ opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+ wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+ # next four translations are in pairs : please word wrap appropriately
+ user_wiki_1: "It is recommended that you create a user wiki page, which includes"
+ user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+ current_user_1: "A list of current users in categories, based on where in the world"
+ current_user_2: "they are, is available from:"
+ signup_confirm_html:
+ greeting: "Hi there!"
+ hopefully_you: "Someone (hopefully you) would like to create an account over at"
+ click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
+ introductory_video: "You can watch an {{introductory_video_link}}."
+ video_to_openstreetmap: "introductory video to OpenStreetMap"
+ more_videos: "There are {{more_videos_link}}."
+ more_videos_here: "more videos here"
+ get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!'
+ wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.'
+ user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].'
+ current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.'
+ message:
+ inbox:
+ title: "Inbox"
+ my_inbox: "My inbox"
+ outbox: "outbox"
+ you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
+ from: "From"
+ subject: "Subject"
+ date: "Date"
+ no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+ people_mapping_nearby: "people mapping nearby"
+ message_summary:
+ unread_button: "Mark as unread"
+ read_button: "Mark as read"
+ reply_button: "Reply"
+ new:
+ title: "Send message"
+ send_message_to: "Send a new message to {{name}}"
+ subject: "Subject"
+ body: "Body"
+ send_button: "Send"
+ back_to_inbox: "Back to inbox"
+ message_sent: "Message sent"
+ no_such_user:
+ heading: "No such user or message"
+ body: "Sorry there is no user or message with that name or id"
+ outbox:
+ title: "Outbox"
+ my_inbox: "My {{inbox_link}}"
+ inbox: "inbox"
+ outbox: "outbox"
+ you_have_sent_messages: "You have {{sent_count}} sent messages"
+ to: "To"
+ subject: "Subject"
+ date: "Date"
+ no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+ people_mapping_nearby: "people mapping nearby"
+ read:
+ title: "Read message"
+ reading_your_messages: "Reading your messages"
+ from: "From"
+ subject: "Subject"
+ date: "Date"
+ reply_button: "Reply"
+ unread_button: "Mark as unread"
+ back_to_inbox: "Back to inbox"
+ reading_your_sent_messages: "Reading your sent messages"
+ to: "To"
+ back_to_outbox: "Back to outbox"
+ mark:
+ as_read: "Message marked as read"
+ as_unread: "Message marked as unread"
+ site:
+ index:
+ js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
+ js_2: "OpenStreetMap uses javascript for its slippy map."
+ js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.'
+ permalink: Permalink
+ license:
+ notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+ license_name: "Creative Commons Attribution-Share Alike 2.0"
+ license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+ project_name: "OpenStreetMap project"
+ project_url: "http://openstreetmap.org"
+ edit:
+ not_public: "You haven't set your edits to be public."
+ not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+ user_page_link: user page
+ anon_edits: "({{link}})"
+ anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ anon_edits_link_text: "Find out why this is the case."
+ flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.'
+ potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+ sidebar:
+ search_results: Search Results
+ close: Close
+ search:
+ search: Search
+ where_am_i: "Where am I?"
+ submit_text: "Go"
+ searching: "Searching..."
+ search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
+ key:
+ map_key: "Map key"
+ trace:
+ create:
+ upload_trace: "Upload GPS Trace"
+ trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+ edit:
+ filename: "Filename:"
+ uploaded_at: "Uploaded at:"
+ points: "Points:"
+ start_coord: "Start coordinate:"
+ edit: "ער×××"
+ owner: "Owner:"
+ description: ":ת××ר"
+ tags: "Tags:"
+ save_button: "Save Changes"
+ no_such_user:
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ trace_form:
+ upload_gpx: "Upload GPX File"
+ description: "ת××ר"
+ tags: "Tags"
+ public: "Public?"
+ upload_button: "Upload"
+ help: "Help"
+ trace_header:
+ see_just_your_traces: "See just your traces, or upload a trace"
+ see_all_traces: "See all traces"
+ see_your_traces: "See all your traces"
+ traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+ trace_optionals:
+ tags: "Tags"
+ view:
+ pending: "PENDING"
+ filename: "Filename:"
+ download: "download"
+ uploaded: "Uploaded at:"
+ points: "Points:"
+ start_coordinates: "Start coordinate:"
+ map: "map"
+ edit: "ער×××"
+ owner: "Owner:"
+ description: ":ת××ר"
+ tags: "Tags"
+ none: "None"
+ make_public: "Make this track public permanently"
+ edit_track: "Edit this track"
+ delete_track: "Delete this track"
+ viewing_trace: "Viewing trace {{name}}"
+ trace_not_found: "Trace not found!"
+ trace_paging_nav:
+ showing: "Showing page"
+ of: "of"
+ trace:
+ pending: "PENDING"
+ count_points: "{{count}} points"
+ ago: "{{time_in_words_ago}} ago"
+ more: "more"
+ trace_details: "View Trace Details"
+ view_map: "View Map"
+ edit: "ער×××"
+ edit_map: "Edit Map"
+ public: "PUBLIC"
+ private: "PRIVATE"
+ by: "by"
+ in: "in"
+ map: "map"
+ list:
+ public_traces: "Public GPS traces"
+ your_traces: "Your GPS traces"
+ public_traces_from: "Public GPS traces from {{user}}"
+ tagged_with: " tagged with {{tags}}"
+ delete:
+ scheduled_for_deletion: "Track scheduled for deletion"
+ make_public:
+ made_public: "Track made public"
+ user:
+ login:
+ title: "Login"
+ heading: "Login"
+ please login: "Please login or {{create_user_link}}."
+ create_account: "create an account"
+ email or username: "Email Address or Username: "
+ password: "Password: "
+ lost password link: "Lost your password?"
+ login_button: "Login"
+ account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account."
+ auth failure: "Sorry, couldn't log in with those details."
+ lost_password:
+ title: "lost password"
+ heading: "Forgotten Password?"
+ email address: "Email Address:"
+ new password button: "Send me a new password"
+ notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+ notice email cannot find: "Couldn't find that email address, sorry."
+ reset_password:
+ title: "reset password"
+ flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+ flash token bad: "Didn't find that token, check the URL maybe?"
+ new:
+ title: "Create account"
+ heading: "Create a User Account"
+ no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
+ contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
+ fill_form: "Fill in the form and we'll send you a quick email to activate your account."
+ license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
+ email address: "Email Address: "
+ confirm email address: "Confirm Email Address: "
+ not displayed publicly: 'Not displayed publicly (see privacy policy)'
+ display name: "Display Name: "
+ password: "Password: "
+ confirm password: "Confirm Password: "
+ signup: Signup
+ flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)
Please note that you won't be able to login until you've received and confirmed your email address.
If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+ no_such_user:
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ view:
+ my diary: my diary
+ new diary entry: new diary entry
+ my edits: my edits
+ my traces: my traces
+ my settings: my settings
+ send message: send message
+ diary: diary
+ edits: edits
+ traces: traces
+ remove as friend: remove as friend
+ add as friend: add as friend
+ mapper since: "Mapper since: "
+ ago: "({{time_in_words_ago}} ago)"
+ user image heading: User image
+ delete image: Delete Image
+ upload an image: Upload an image
+ add image: Add Image
+ description: "ת××ר"
+ user location: User location
+ no home location: "No home location has been set."
+ if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
+ settings_link_text: settings
+ your friends: Your friends
+ no friends: You have not added any friends yet.
+ km away: "{{count}}km away"
+ nearby users: "Nearby users: "
+ no nearby users: "There are no users who admit to mapping nearby yet."
+ change your settings: change your settings
+ friend_map:
+ your location: Your location
+ nearby mapper: "Nearby mapper: "
+ account:
+ title: "Edit account"
+ my settings: My settings
+ email never displayed publicly: "(never displayed publicly)"
+ public editing:
+ heading: "Public editing: "
+ enabled: "Enabled. Not anonymous and can edit data."
+ enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ enabled link text: "what's this?"
+ disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+ disabled link text: "why can't I edit?"
+ profile description: "Profile Description: "
+ preferred languages: "Preferred Languages: "
+ home location: "Home Location: "
+ no home location: "You have not entered your home location."
+ latitude: ":×§× ×¨×××"
+ longitude: ":×§× ××ר×"
+ update home location on click: "Update home location when I click on the map?"
+ save changes button: Save Changes
+ make edits public button: Make all my edits public
+ return to profile: Return to profile
+ flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
+ flash update success: "User information updated successfully."
+ confirm:
+ heading: Confirm a user account
+ press confirm button: "Press the confirm button below to activate your account."
+ button: Confirm
+ success: "Confirmed your account, thanks for signing up!"
+ failure: "A user account with this token has already been confirmed."
+ confirm_email:
+ heading: Confirm a change of email address
+ press confirm button: "Press the confirm button below to confirm your new email address."
+ button: Confirm
+ success: "Confirmed your email address, thanks for signing up!"
+ failure: "An email address has already been confirmed with this token."
+ set_home:
+ flash success: "Home location saved successfully"
+ go_public:
+ flash success: "All your edits are now public, and you are now allowed to edit."
+ make_friend:
+ success: "{{name}} is now your friend."
+ failed: "Sorry, failed to add {{name}} as a friend."
+ already_a_friend: "You are already friends with {{name}}."
+ remove_friend:
+ success: "{{name}} was removed from your friends."
+ not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 1d7bf6ea7..93b565892 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -20,18 +20,18 @@ hi:
old_relation_member: "पà¥à¤°à¤¾à¤¨à¥ सà¤à¤¬à¤à¤§ à¤à¤¾ सदसà¥à¤¯"
old_relation_tag: "पà¥à¤°à¤¾à¤¨à¥ सà¤à¤¬à¤à¤§ à¤à¤¾ à¤
à¤à¤à¤¿à¤¤à¤"
old_way: "पà¥à¤°à¤¾à¤¨à¤¾ रसà¥à¤¤à¤¾"
- old_way_node: "Old Way Node"
- old_way_tag: "Old Way Tag"
- relation: "Relation"
- relation_member: "Relation Member"
- relation_tag: "Relation Tag"
+ old_way_node: "पà¥à¤°à¤¾à¤¨à¤¾ रसà¥à¤¤à¤¾ à¤à¤¾ à¤à¤¸à¤à¤§à¤¿"
+ old_way_tag: "पà¥à¤°à¤¾à¤¨à¤¾ रसà¥à¤¤à¤¾ à¤à¤¾ à¤
à¤à¤à¤¿à¤¤à¤"
+ relation: "सà¤à¤¬à¤à¤§"
+ relation_member: "सà¤à¤¬à¤à¤§ à¤à¤¾ सदसà¥à¤¯"
+ relation_tag: "सà¤à¤¬à¤à¤§ à¤à¤¾ à¤
à¤à¤à¤¿à¤¤à¤"
session: "Session"
trace: "Trace"
tracepoint: "Trace Point"
tracetag: "Trace Tag"
user: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾"
- user_preference: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ वरà¥à¤¯à¤¤à¤¾"
- user_token: "User Token"
+ user_preference: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥ वरà¥à¤¯à¤¤à¤¾"
+ user_token: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥ à¤
à¤à¤à¤¿à¤¤à¤"
way: "रसà¥à¤¤à¤¾"
way_node: "रसà¥à¤¤à¤¾ à¤à¤¾ à¤à¤¸à¤à¤§à¤¿"
way_tag: "रसà¥à¤¤à¤¾ à¤à¤¾ à¤
à¤à¤à¤¿à¤¤à¤"
@@ -96,7 +96,7 @@ hi:
edited_at: "समय, à¤à¤¿à¤¸ पर सà¤à¤ªà¤¾à¤¦à¤¿à¤¤:"
edited_by: "सà¤à¤ªà¤¾à¤¦à¤:"
version: "सà¤à¤¸à¥à¤à¤°à¤£:"
- in_changeset: "In changeset:"
+ in_changeset: "à¤à¤¸ changeset à¤à¤¾ à¤
à¤à¤:"
containing_relation:
relation: "सà¤à¤¬à¤à¤§ {{relation_name}}"
relation_as: "(as {{relation_role}})"
@@ -125,8 +125,8 @@ hi:
way: "रासà¥à¤¤à¤¾"
relation: "सà¤à¤¬à¤à¤§"
paging_nav:
- showing_page: "Showing page:"
- of: "of"
+ showing_page: "à¤à¤¸ पà¥à¤·à¥à¤ à¤à¤¾ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨:"
+ of: "पà¥à¤·à¥à¤ à¤à¤¿à¤¨à¤¤à¥:"
relation_details:
members: "सदसà¥à¤¯:"
part_of: "à¤à¤¨ सà¤à¤¬à¤à¤§à¥ à¤à¤¾ हिसà¥à¤¸à¤¾:"
@@ -134,7 +134,7 @@ hi:
relation_history: "सà¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸"
relation_history_title: "à¤à¤¸ सà¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸: {{relation_name}}"
relation_member:
- as: "as"
+ as: "à¤à¥à¤¸à¥"
relation:
relation: "सà¤à¤¬à¤à¤§"
relation_title: "सà¤à¤¬à¤à¤§: {{relation_name}}"
@@ -145,120 +145,138 @@ hi:
view_data: "à¤à¤¸ मानà¤à¤¿à¤¤à¥à¤° à¤à¥ तथà¥à¤¯à¥à¤ दà¥à¤à¥à¤"
manually_select: "à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤
लठà¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¥à¤"
start_rjs:
+ data_layer_name: "तथà¥à¤¯"
data_frame_title: "तथà¥à¤¯"
zoom_or_select: "à¤à¥à¤ªà¤¯à¤¾ à¤à¤¼à¥à¤® à¤à¤°à¥ या नà¤à¥à¤¶à¥ à¤à¥ à¤à¤ à¤à¥à¤·à¥à¤¤à¥à¤° दà¥à¤à¤¨à¥ à¤à¥ लिठà¤à¥à¤¨à¥à¤"
drag_a_box: "मानà¤à¤¿à¤¤à¥à¤° पर à¤à¤ बà¥à¤à¥à¤¸ à¤à¥à¤à¤à¥à¤ à¤à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¤¾ à¤à¤¯à¤¨ à¤à¤°à¤¨à¥ à¤à¥ लिà¤"
- manually_select: "à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤
लठà¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¥à¤"
- loaded_an_area: "मानà¤à¤¿à¤¤à¥à¤° à¤à¥ à¤à¤¸ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¤°à¤¾ मà¥à¤ हà¥"
- browsers: "features. सामानà¥à¤¯ तà¥à¤° पर, à¤à¥à¤ बà¥à¤°à¤¾à¤à¤à¤¼à¤°à¥à¤ à¤à¤¸ मातà¥à¤°à¤¾ à¤à¥ तथà¥à¤¯à¥à¤ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¥ मà¥à¤ सà¤à¥à¤·à¤® नहà¥à¤ हॠसà¤à¤¤à¤¾ हà¥| वॠसबसॠà¤
à¤à¥à¤à¤¾ à¤à¤¾à¤® à¤à¤°à¤¤à¥ हॠà¤à¤¬ à¤à¤ बार मà¥à¤ १०० सॠà¤à¤® सà¥à¤µà¤¿à¤§à¤¾à¤à¤ à¤à¥ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤à¤°à¤¤à¥ हà¥: à¤à¥à¤ à¤à¤° à¤à¤°à¤¨à¥ पर à¤à¤ªà¤à¥ बà¥à¤°à¤¾à¤à¤à¤° à¤à¤® तà¥à¤à¤¼ हॠसà¤à¤¤à¥ हà¥| यदि à¤à¤ª à¤à¤¸ तथà¥à¤¯à¥à¤ à¤à¥ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ हà¥à¤, तॠà¤à¤ª नà¥à¤à¥ दिठà¤à¤ बà¤à¤¨ पर à¤à¥à¤²à¤¿à¤ à¤à¤°à¥|"
+ manually_select: "à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤
लठà¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¤¿à¤"
+ loaded_an_area_with_num_features: "à¤à¤¸ à¤à¥à¤·à¥à¤¤à¥à¤° मà¥à¤ [[num_features]] विशà¥à¤·à¤¤à¤¾à¤à¤ शामिल हà¥| सामानà¥à¤¯ तà¥à¤° पर, à¤à¥à¤ बà¥à¤°à¤¾à¤à¤à¤¼à¤°à¥à¤ à¤à¤¸ मातà¥à¤°à¤¾ à¤à¥ तथà¥à¤¯à¥à¤ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¥ मà¥à¤ सà¤à¥à¤·à¤® नहà¥à¤ हॠसà¤à¤¤à¤¾ हà¥| वॠसबसॠà¤
à¤à¥à¤à¤¾ à¤à¤¾à¤® à¤à¤°à¤¤à¥ हॠà¤à¤¬ à¤à¤ बार मà¥à¤ १०० सॠà¤à¤® सà¥à¤µà¤¿à¤§à¤¾à¤à¤ à¤à¥ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤à¤°à¤¤à¥ हà¥: à¤à¥à¤ à¤à¤° à¤à¤°à¤¨à¥ पर à¤à¤ªà¤à¥ बà¥à¤°à¤¾à¤à¤à¤° à¤à¤® तà¥à¤à¤¼ हॠसà¤à¤¤à¥ हà¥| यदि à¤à¤ª à¤à¤¸ तथà¥à¤¯à¥à¤ à¤à¥ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ हà¥à¤, तॠà¤à¤ª नà¥à¤à¥ दिठà¤à¤ बà¤à¤¨ पर à¤à¥à¤²à¤¿à¤ à¤à¤°à¥|"
load_data: "Load Data"
- unable_to_load: "Unable to load: Bounding box size of"
- must_be_smaller: "is too large (must be smaller than 0.25)"
+ unable_to_load_size: "à¤à¤°à¤£ à¤à¤°à¤¨à¥ मà¥à¤ à¤
समरà¥à¤¥: à¤à¤¸ à¤à¤à¤¾à¤° [[bbox_size]] à¤à¥ बà¥à¤à¥à¤¸ बहà¥à¤¤ बड़ॠहà¥:"
+ must_be_smaller: "बहà¥à¤¤ बड़ॠहॠ(0.२५ सॠà¤à¥à¤à¥ हà¥à¤¨à¥ à¤à¤¾à¤¹à¤¿à¤)"
loading: "Loading..."
- show_history: "Show History"
- wait: "Wait..."
+ show_history: "à¤à¤¤à¤¹à¤¾à¤¸ दिà¤à¤¾à¤à¤"
+ wait: "à¤à¥à¤ªà¤¯à¤¾ पà¥à¤°à¤¤à¥à¤à¥à¤·à¤¾ à¤à¤°à¥à¤..."
history_for: "History for"
- details: "Details"
- private_user: "private user"
- edited_by: "Edited by"
- at_timestamp: "at"
+ details: "विवरण:"
+ private_user: "à¤
सारà¥à¤µà¤à¤¨à¤¿à¤ à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾"
+ edited_by_user_at_timestamp: "[[user]] दà¥à¤µà¤¾à¤°à¤¾ [[timestamp]] पर सà¤à¤ªà¤¾à¤¦à¤¿à¤¤"
+ object_list:
+ heading: "Object list"
+ back: "Display object list"
+ type:
+ node: "à¤à¤¸à¤à¤§à¤¿"
+ way: "रसà¥à¤¤à¤¾"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ api: "Retrieve this area from the API"
+ details: "विवरण"
+ selected:
+ type:
+ node: "à¤à¤¸à¤à¤§à¤¿ [[id]]"
+ way: "रसà¥à¤¤à¤¾ [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ history:
+ type:
+ node: "à¤à¤¸à¤à¤§à¤¿ [[id]]"
+ way: "रसà¥à¤¤à¤¾ [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
tag_details:
- tags: "Tags:"
+ tags: "à¤
à¤à¤à¤¿à¤¤à¤:"
way_details:
- nodes: "Nodes:"
- part_of: "Part of:"
+ nodes: "à¤à¤¸à¤à¤§à¤¿:"
+ part_of: "à¤à¤¨à¤à¤¾ हिसà¥à¤¸à¤¾:"
also_part_of:
one: "also part of way {{related_ways}}"
other: "also part of ways {{related_ways}}"
way_history:
- way_history: "Way History"
- way_history_title: "Way History: {{way_name}}"
- download: "{{download_xml_link}} or {{view_details_link}}"
+ way_history: "रासà¥à¤¤à¥ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸"
+ way_history_title: "à¤à¤¸ रासà¥à¤¤à¤¾ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸: {{way_name}}"
+ download: "{{download_xml_link}} या {{view_details_link}}"
download_xml: "Download XML"
- view_details: "view details"
+ view_details: "विवरण दà¥à¤à¥à¤"
way:
- way: "Way"
- way_title: "Way: {{way_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
+ way: "रसà¥à¤¤à¤¾"
+ way_title: "रासà¥à¤¤à¥ à¤à¤¾ नाम: {{way_name}}"
+ download: "{{download_xml_link}} या {{view_history_link}}"
download_xml: "Download XML"
- view_history: "view history"
+ view_history: "à¤à¤¤à¤¿à¤¹à¤¾à¤¸ दà¥à¤à¥à¤"
changeset:
changeset_paging_nav:
- showing_page: "Showing page"
- of: "of"
+ showing_page: "à¤à¤¸ पà¥à¤·à¥à¤ à¤à¤¾ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨:"
+ of: "पà¥à¤·à¥à¤ à¤à¤¿à¤¨à¤¤à¥:"
changeset:
- still_editing: "(still editing)"
- anonymous: "Anonymous"
- no_comment: "(none)"
- no_edits: "(no edits)"
+ still_editing: "(सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ रहा हà¥)"
+ anonymous: "à¤
नाम"
+ no_comment: "(à¤à¥à¤ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ नहà¥à¤ हà¥)"
+ no_edits: "(à¤à¥à¤ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ नहà¥à¤ हà¥)"
show_area_box: "show area box"
- big_area: "(big)"
- view_changeset_details: "View changeset details"
- more: "more"
+ big_area: "(बड़ा à¤à¥à¤·à¥à¤¤à¥à¤°)"
+ view_changeset_details: "à¤à¤¸ changeset à¤à¥ विवरण दà¥à¤à¥"
+ more: "à¤à¤° दिà¤à¤¾à¤"
changesets:
- id: "ID"
- saved_at: "Saved at"
- user: "User"
- comment: "Comment"
- area: "Area"
+ id: "à¤à¤à¤¡à¥"
+ saved_at: "समय à¤à¤¬ सà¥à¤°à¤à¥à¤·à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾"
+ user: "à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾"
+ comment: "à¤à¤¿à¤ªà¥à¤ªà¤£à¥"
+ area: "à¤à¥à¤·à¥à¤¤à¥à¤°"
list_bbox:
- history: "History"
- changesets_within_the_area: "Changesets within the area:"
+ history: "à¤à¤¤à¤¿à¤¹à¤¾à¤¸"
+ changesets_within_the_area: "à¤à¤¸ à¤à¥à¤·à¥à¤¤à¥à¤° मà¥à¤ निमà¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ changesets हà¥à¤:"
show_area_box: "show area box"
- no_changesets: "No changesets"
- all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
- recent_changes: "Recent Changes"
- no_area_specified: "No area specified"
+ no_changesets: "à¤à¥à¤ changesets नहà¥à¤ हà¥"
+ all_changes_everywhere: "हर à¤à¤à¤¹ à¤à¥ परिवरà¥à¤¤à¤¨à¥à¤ à¤à¥ दà¥à¤à¤¨à¥ à¤à¥ लिया यहाठदà¥à¤à¤¿à¤¯à¥ {{recent_changes_link}}"
+ recent_changes: "नयॠपरिवरà¥à¤¤à¤¨"
+ no_area_specified: "à¤à¥à¤ à¤à¥à¤·à¥à¤¤à¥à¤°"
first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
- view_the_map: "view the map"
+ view_the_map: "मानà¤à¤¿à¤¤à¥à¤° दà¥à¤à¤¿à¤¯à¥"
view_tab: "view tab"
- alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+ alternatively_view: "à¤
थवा, सब दà¥à¤à¤¿à¤¯à¥ {{recent_changes_link}}"
list:
- recent_changes: "Recent Changes"
- recently_edited_changesets: "Recently edited changesets:"
- for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+ recent_changes: "नयॠपरिवरà¥à¤¤à¤¨"
+ recently_edited_changesets: "नयॠसà¤à¤ªà¤¾à¤¦à¤¿à¤¤ changesets:"
+ for_more_changesets: "à¤
धिठchangesets à¤à¥ लिया, à¤à¤ à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾ à¤à¥ à¤à¥à¤¨à¥ à¤à¤° à¤à¤¨à¤à¥ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¥ दà¥à¤à¤¿à¤¯à¥, या à¤à¤ विशिषà¥à¤ à¤à¥à¤·à¤¤à¥à¤° à¤à¤¾ see the editing 'history' of a specific area."
list_user:
- edits_by_username: "Edits by {{username_link}}"
- no_visible_edits_by: "No visible edits by {{name}}."
- for_all_changes: "For changes by all users see {{recent_changes_link}}"
- recent_changes: "Recent Changes"
+ edits_by_username: "à¤à¤¸ à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾ {{username_link}} à¤à¥ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤à¥ "
+ no_visible_edits_by: "à¤à¤¸ à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾ {{name}} à¤à¥ à¤à¥à¤ पà¥à¤°à¤à¤ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ नहà¥à¤ हà¥."
+ for_all_changes: "सारॠà¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¥ à¤à¥ सà¤à¥ परिवरà¥à¤¤à¤¨à¥à¤ à¤à¥ दà¥à¤à¤¨à¥ à¤à¥ लिया यहाठदà¥à¤à¤¿à¤¯à¥ {{recent_changes_link}}"
+ recent_changes: "नयॠपरिवरà¥à¤¤à¤¨"
diary_entry:
new:
- title: New Diary Entry
+ title: "नठदà¥à¤¨à¤¿à¤à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿"
list:
- title: "Users' diaries"
- user_title: "{{user}}'s diary"
- new: New Diary Entry
- new_title: Compose a new entry in your user diary
- no_entries: No diary entries
- recent_entries: "Recent diary entries: "
- older_entries: Older Entries
+ title: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾à¤à¤ à¤à¥ दà¥à¤¨à¤¿à¤à¥"
+ user_title: "{{user}}' à¤à¥ दà¥à¤¨à¤¿à¤à¥"
+ new: "नठदà¥à¤¨à¤¿à¤à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿"
+ new_title: "à¤
पनॠदà¥à¤¨à¤¿à¤à¥ मà¥à¤, à¤à¤ नठपà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ लिà¤à¥à¤"
+ no_entries: "à¤à¥à¤ दà¥à¤¨à¤¿à¤à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤ नहà¥à¤ हà¥"
+ recent_entries: "नठदà¥à¤¨à¤¿à¤à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤: "
+ older_entries: "पà¥à¤°à¤¾à¤¨à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤"
newer_entries: Newer Entries
edit:
- title: "Edit diary entry"
- subject: "Subject: "
- body: "Body: "
- language: "Language: "
- location: "Location: "
- latitude: "Latitude: "
- longitude: "Longitude: "
- use_map_link: "use map"
- save_button: "Save"
- marker_text: Diary entry location
+ title: "दà¥à¤¨à¤¿à¤à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤"
+ subject: "विषय: "
+ body: "दà¥à¤¨à¤¿à¤à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤à¤¾ शारà¥à¤°: "
+ language: "à¤à¤¾à¤·à¤¾: "
+ location: "सà¥à¤¥à¤¾à¤¨: "
+ latitude: "à¤
à¤à¥à¤·à¤¾à¤à¤¶"
+ longitude: "दà¥à¤¶à¤¾à¤à¤¤à¤°"
+ use_map_link: "नà¤à¥à¤¶à¤¾ à¤à¤¾ à¤à¤¸à¥à¤¤à¥à¤®à¤¾à¤²"
+ save_button: "सहà¥à¤à¤¨à¥"
+ marker_text: "दà¥à¤¨à¤¿à¤à¥ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤à¥ सà¥à¤¥à¤¾à¤¨"
view:
- title: "Users' diaries | {{user}}"
- user_title: "{{user}}'s diary"
- leave_a_comment: "Leave a comment"
- login_to_leave_a_comment: "{{login_link}} to leave a comment"
- login: "Login"
- save_button: "Save"
+ title: "à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾à¤ à¤à¥ दà¥à¤¨à¤¿à¤à¥ | {{user}}"
+ user_title: "{{user}}'s à¤à¥ दà¥à¤¨à¤¿à¤à¥à¤"
+ leave_a_comment: "à¤à¤¿à¤ªà¥à¤ªà¤£à¥ लिà¤à¤¿à¤"
+ login_to_leave_a_comment: "सतà¥à¤°à¤¾à¤°à¤à¤ यहाठ{{login_link}}, à¤à¤ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ लिà¤à¤¿à¤¨à¥ à¤à¥ लिà¤"
+ login: "सतà¥à¤°à¤¾à¤°à¤à¤"
+ save_button: "सहà¥à¤à¤¨à¥"
no_such_entry:
- heading: "No entry with the id: {{id}}"
- body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+ heading: "à¤à¤¸ à¤à¤à¤¡à¥ {{id}} à¤à¥ लिया à¤à¥à¤ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ नहà¥à¤ हॠ"
+ body: "à¤à¥à¤·à¤®à¤¾ à¤à¤°à¥à¤, à¤à¤¸ à¤à¤à¤¡à¥ {{id}} à¤à¥ लिया à¤à¥à¤ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ या à¤à¤¿à¤ªà¥à¤ªà¤£à¥ नहà¥à¤ हà¥| à¤à¥à¤ªà¤¯à¤¾ à¤
पनॠवरà¥à¤¤à¤¨à¥ à¤à¥ à¤à¤¾à¤à¤ à¤à¤°à¥à¤, or maybe the link you clicked is wrong|"
no_such_user:
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
diary_entry:
- posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+ posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
comment_link: Comment on this entry
reply_link: Reply to this entry
comment_count:
@@ -269,12 +287,12 @@ hi:
comment_from: "Comment from {{link_user}} at {{comment_created_at}}"
export:
start:
- area_to_export: "Area to Export"
- manually_select: "Manually select a different area"
- format_to_export: "Format to Export"
+ area_to_export: "à¤à¥à¤·à¥à¤¤à¥à¤° निरà¥à¤¯à¤¾à¤¤ à¤à¤°à¤¨à¥ à¤à¥ लिà¤"
+ manually_select: "à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤
लठà¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¤¿à¤"
+ format_to_export: "सà¥à¤µà¤°à¥à¤ª निरà¥à¤¯à¤¾à¤¤ à¤à¤°à¤¨à¥ à¤à¥ लिà¤"
osm_xml_data: "OpenStreetMap XML Data"
- mapnik_image: "Mapnik Image"
- osmarender_image: "Osmarender Image"
+ mapnik_image: "Mapnik à¤à¤µà¤¿"
+ osmarender_image: "Osmarender à¤à¤µà¤¿"
embeddable_html: "Embeddable HTML"
licence: "Licence"
export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
@@ -591,7 +609,7 @@ hi:
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
fill_form: "Fill in the form and we'll send you a quick email to activate your account."
- license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
+ license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
email address: "Email Address: "
confirm email address: "Confirm Email Address: "
not displayed publicly: 'Not displayed publicly (see privacy policy)'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 62f4ed8cd..2b6a2127c 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1,4 +1,6 @@
is:
+ html:
+ dir: ltr
activerecord:
# Translates all the model names, which is used in error handling on the web site
models:
@@ -89,8 +91,12 @@ is:
no_bounding_box: "Engin svæðismörk voru vistuð ásamt þessu breytingarsetti."
show_area_box: "Sýna svæðismörk á aðalkorti"
box: "svæðismörk"
- has_nodes: "Inniheldur {{count}} hnúta:"
- has_ways: "Inniheldur {{count}} vegi:"
+ has_nodes:
+ one: "Inniheldur {{count}} hnút:"
+ other: "Inniheldur {{count}} hnúta:"
+ has_ways:
+ one: "Inniheldur {{count}} veg:"
+ other: "Inniheldur {{count}} vegi:"
has_relations: "Inniheldur {{count}} vensl:"
common_details:
edited_at: "Breytt:"
@@ -115,9 +121,10 @@ is:
node:
node: "Hnútur"
node_title: "Hnútur: {{node_name}}"
- download: "{{download_xml_link}} eða {{view_history_link}}"
+ download: "{{download_xml_link}} eða {{view_history_link}} eða {{edit_link}}"
download_xml: "Hala niður á XML sniði"
view_history: "sýna breytingarsögu"
+ edit: "breyta"
not_found:
sorry: "Ãvà miður {{type}} með kennitöluna {{id}}."
type:
@@ -195,9 +202,10 @@ is:
way:
way: "Veginum"
way_title: "Vegur: {{way_name}}"
- download: "{{download_xml_link}} eða {{view_history_link}}"
+ download: "{{download_xml_link}} eða {{view_history_link}} eða {{edit_link}}"
download_xml: "Hala niður á XML sniði"
view_history: "sýna breytingarsögu"
+ edit: "breyta"
changeset:
changeset_paging_nav:
showing_page: "Sýni sÃðu"
@@ -245,6 +253,7 @@ is:
title: "Blogg notenda"
user_title: "Blogg {{user}}"
new: "Ný bloggfærsla"
+ in_language_title: "Bloggfærslur á {{language}}"
new_title: "Semja nýja færslu á bloggið þitt"
no_entries: "Engar bloggfærslur"
recent_entries: "Nýlegar færslur: "
@@ -260,7 +269,7 @@ is:
longitude: "Breiddargráða: "
use_map_link: "finna á korti"
save_button: "Vista"
- marker_text: Diary entry location
+ marker_text: "Staðsetning bloggfærslu"
view:
title: "Blogg | {{user}}"
user_title: "Blogg {{user}}"
@@ -276,7 +285,7 @@ is:
heading: "Notandinn {{user}} er ekki til"
body: "Ãað er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli."
diary_entry:
- posted_by: "Sett inn af {{link_user}} klukkan {{created}} á {{language}}"
+ posted_by: "Sett inn af {{link_user}} klukkan {{created}} á {{language_link}}"
comment_link: "Bæta við athugasemd"
reply_link: "Senda höfund skilaboð"
comment_count:
@@ -322,12 +331,28 @@ is:
type_from_source: "{{type}} frá {{source_link}}"
no_results: "Ekkert fannst"
layouts:
+ project_name:
+ # in
+ title: OpenStreetMap
+ # in
+ h1: OpenStreetMap
+ logo:
+ alt_text: OpenStreetMap merkið
welcome_user: "Hæ {{user_link}}"
+ welcome_user_link_tooltip: NotandasÃðan þÃn
home: "heim"
+ home_tooltip: "Færa kortasýnina á þÃna staðsetningu"
inbox: "innhólf ({{count}})"
+ inbox_tooltip:
+ zero: Ãað eru engin skilaboð à innhólfinu þÃnu
+ one: Ãað eru ein skilaboð à innhólfinu þÃnu
+ other: Ãað eru {{count}} skilaboð à innhólfinu þÃnu
logout: "útskrá"
+ logout_tooltip: "Ãtskrá"
log_in: "innskrá"
+ log_in_tooltip: Skráðu þig inn með aðgangi sem er þegar til
sign_up: "búa til aðgang"
+ sign_up_tooltip: "Búaðu til aðgang til að geta breytt kortinu"
view: "Kort"
view_tooltip: "Kortasýn"
edit: "Breyta"
@@ -344,15 +369,22 @@ is:
intro_1: "OpenStreetMap er frjálst heimskort sem hver sem er getur breytt. LÃka þú!"
intro_2: "OpenStreetMap gerir þér kleift að skoða, breyta og nota kortagögn à samvinnu við aðra."
intro_3: "HýsÃng verkefnisins er studd af {{ucl}} og {{bytemark}}."
- osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
- osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
+ intro_3_ucl: "UCL VR Centre"
+ intro_3_bytemark: "bytemark"
+ osm_offline: "OpenStreetMap gagnagrunnurinn er niðri vegna viðhalds."
+ osm_read_only: "Ekki er hægt að skrifa à OpenStreetMap gagnagrunninn à augnablikinu vegna viðhalds."
donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
donate_link_text: donating
help_wiki: "Hjálp & Wiki"
+ help_wiki_tooltip: "Hjálpar og wiki-sÃða fyrir verkefnið"
+ help_wiki_url: "http://wiki.openstreetmap.org"
news_blog: "Fréttablogg"
+ news_blog_tooltip: "Blogg um OpenStreetMap, frjáls kortagögn o.fl."
shop: "Verslun"
+ shop_tooltip: Verslun með vörum tengdum OpenStreetMap
+ shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
- alt_donation: Make a Donation
+ alt_donation: "FjárframlagssÃða"
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] {{user}} bætti við athugasemd á bloggfærslu þÃna"
@@ -373,6 +405,23 @@ is:
subject: "[OpenStreetMap] {{user}} bætti þér við sem vin"
had_added_you: "Notandinn {{user}} hefur bætt þér við sem vini á OpenStreetMap."
see_their_profile: "Ãú getur séð notandasÃðu notandans á {{userurl}} og jafnvel bætt honum við sem vini lÃka."
+ gpx_notification:
+ greeting: "Hi,"
+ your_gpx_file: "It looks like your GPX file"
+ with_description: "with the description"
+ and_the_tags: "and the following tags:"
+ and_no_tags: "and no tags."
+ failure:
+ subject: "[OpenStreetMap] GPX Import failure"
+ failed_to_import: "failed to import. Here's the error:"
+ more_info_1: "More information about GPX import failures and how to avoid"
+ more_info_2: "them can be found at:"
+ import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+ success:
+ subject: "[OpenStreetMap] GPX Import success"
+ loaded_successfully: |
+ loaded successfully with {{trace_points}} out of a possible
+ {{possible_points}} points.
signup_confirm:
subject: "[OpenStreetMap] Staðfestu tölvupóstfangið þitt"
signup_confirm_plain:
@@ -384,8 +433,10 @@ is:
introductory_video: "You can watch an introductory video to OpenStreetMap here:"
more_videos: "There are more videos here:"
the_wiki: "Get reading about OpenStreetMap on the wiki:"
+ the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+ wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
# next four translations are in pairs : please word wrap appropriately
user_wiki_1: "It is recommended that you create a user wiki page, which includes"
user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
@@ -495,7 +546,9 @@ is:
license:
notice: "Gefið út undir {{license_name}} leyfinu af þáttakendum à {{project_name}}."
license_name: "Creative Commons Attribution-Share Alike 2.0"
+ license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
project_name: "OpenStreetMap verkefninu"
+ project_url: "http://openstreetmap.org"
edit:
not_public: "You haven't set your edits to be public."
not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -516,6 +569,7 @@ is:
search_help: "dæmi: âAkureyriâ, âLaugavegur, ReykjavÃkâ eða âpost offices near Lünenâ. Sjá einnig leitarhjálpina."
key:
map_key: "Kortaskýringar"
+ map_key_tooltip: "Kortaútskýringar fyrir mapnik útgáfuna af kortinu á þessu þys-stigi"
trace:
create:
upload_trace: "Upphala GPS feril"
@@ -541,6 +595,7 @@ is:
public: "Sjáanleg öðrum?"
upload_button: "Upphala"
help: "Hjálp"
+ help_url: "http://wiki.openstreetmap.org/wiki/Upload"
trace_header:
see_just_your_traces: "Sýna aðeins þÃna ferla, eða hlaða upp feril"
see_all_traces: "Sjá alla ferla"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 39400ccbc..869d467be 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -249,7 +249,7 @@ it:
no_such_user:
body: "Spiacenti, non c'è alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato."
diary_entry:
- posted_by: "Inviato da {{link_user}} il {{created}} in {{language}}"
+ posted_by: "Inviato da {{link_user}} il {{created}} in {{language_link}}"
comment_link: Commento su questa voce
reply_link: Rispondi a questa voce
comment_count:
@@ -437,7 +437,7 @@ it:
where_am_i: "Dove sono?"
submit_text: "Vai"
searching: "Ricerca in corso..."
- search_help: "esempi: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', oppure 'post offices near Lünen' altri esempi..."
+ search_help: "esempi: 'Trieste', 'Via Dante Alighieri, Trieste', 'CB2 5AQ', oppure 'post offices near Trieste' altri esempi..."
key:
map_key: "Legenda"
trace:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
new file mode 100644
index 000000000..332804274
--- /dev/null
+++ b/config/locales/ko.yml
@@ -0,0 +1,764 @@
+ko:
+ html:
+ dir: ltr
+ activerecord:
+ # Translates all the model names, which is used in error handling on the web site
+ models:
+ acl: "ì ê·¼ ì¡°ì 목ë¡"
+ changeset: "ë³ê²½ì¸í¸"
+ changeset_tag: "ë³ê²½ì¸í¸ íê·¸"
+ country: "êµê°"
+ diary_comment: "ì¼ì§ ëê¸"
+ diary_entry: "ì¼ì§ í목"
+ friend: "ì¹êµ¬"
+ language: "ì¸ì´"
+ message: "쪽ì§"
+ node: "ë
¸ë"
+ node_tag: "ë
¸ë íê·¸"
+ notifier: "ì림ì"
+ old_node: "Old Node"
+ old_node_tag: "Old Node Tag"
+ old_relation: "Old Relation"
+ old_relation_member: "Old Relation Member"
+ old_relation_tag: "Old Relation Tag"
+ old_way: "Old Way"
+ old_way_node: "Old Way Node"
+ old_way_tag: "Old Way Tag"
+ relation: "ê´ê³"
+ relation_member: "Relation Member"
+ relation_tag: "ê´ê³ íê·¸"
+ session: "ì¸ì
"
+ trace: "ë°ìì·¨"
+ tracepoint: "Trace Point"
+ tracetag: "ë°ìì·¨ íê·¸"
+ user: "ì¬ì©ì"
+ user_preference: "ì¬ì©ì íê²½"
+ user_token: "ì¬ì©ì í í°"
+ way: "길"
+ way_node: "길ë
¸ë"
+ way_tag: "길íê·¸"
+ # Translates all the model attributes, which is used in error handling on the web site
+ # Only the ones that are used on the web site are translated at the moment
+ attributes:
+ diary_comment:
+ body: "ë´ì©"
+ diary_entry:
+ user: "ì¬ì©ì"
+ title: "ì 목"
+ latitude: "ìë"
+ longitude: "ê²½ë"
+ language: "ì¸ì´"
+ friend:
+ user: "ì¬ì©ì"
+ friend: "ì¹êµ¬"
+ trace:
+ user: "ì¬ì©ì"
+ visible: "Visible"
+ name: "ì´ë¦"
+ size: "í¬ê¸°"
+ latitude: "ìë"
+ longitude: "ê²½ë"
+ public: "ê³µê°"
+ description: "ì¤ëª
"
+ message:
+ sender: "ë³´ë¸ ì¬ë"
+ title: "ì 목"
+ body: "ë´ì©"
+ recipient: "ë°ë ì¬ë"
+ user:
+ email: "Email"
+ active: "Active"
+ display_name: "íì ì´ë¦"
+ description: "ì¤ëª
"
+ languages: "ì¸ì´"
+ pass_crypt: "ìí¸"
+ map:
+ view: 보기
+ edit: í¸ì§
+ coordinates: "ì¢í:"
+ browse:
+ changeset:
+ title: "ë³ê²½ì
"
+ changeset: "ë³ê²½ì
:"
+ download: "ë´ë ¤ë°ê¸° {{changeset_xml_link}} í¹ì {{osmchange_xml_link}}"
+ changesetxml: "ë³ê²½ì
XML"
+ osmchangexml: "osmChange XML"
+ changeset_details:
+ created_at: "ìì±ì¼:"
+ closed_at: "ì¢
ë£ì¼:"
+ belongs_to: "ìì:"
+ bounding_box: "ê²½ê³:"
+ no_bounding_box: "ì´ ë³ê²½ì
ì ìí´ ì ì¥ë ê²½ê³ê° ììµëë¤."
+ show_area_box: "ìì íì"
+ box: "box"
+ has_nodes: "Has the following {{count}} nodes:"
+ has_ways: "Has the following {{count}} ways:"
+ has_relations: "Has the following {{count}} relations:"
+ common_details:
+ edited_at: "í¸ì§ì¼:"
+ edited_by: "í¸ì§ì:"
+ version: "ë²ì ¼:"
+ in_changeset: "In changeset:"
+ containing_relation:
+ relation: "ê´ê³ {{relation_name}}"
+ relation_as: "(as {{relation_role}})"
+ map:
+ loading: "ë¶ë¬ ì¤ë ì¤..."
+ deleted: "ìì ë¨"
+ view_larger_map: "í° ì§ë 보기"
+ node_details:
+ coordinates: "ì¢í: "
+ part_of: "Part of:"
+ node_history:
+ node_history: "ë
¸ë ì´ë ¥"
+ download: "{{download_xml_link}} or {{view_details_link}}"
+ download_xml: "XML ë´ë ¤ë°ê¸°"
+ view_details: "ì¸ë¶ ì¬í íì"
+ node:
+ node: "ë
¸ë"
+ node_title: "ë
¸ë: {{node_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "XML ë´ë ¤ë°ê¸°"
+ view_history: "ì´ë ¥ 보기"
+ not_found:
+ sorry: "ì£ì¡í©ëë¤. {{id}}ì¸ {{type}}를 ë°ê²¬íì§ ëª» íìµëë¤."
+ type:
+ node: ë
¸ë
+ way: 길
+ relation: ê´ê³
+ paging_nav:
+ showing_page: "Showing page"
+ of: "of"
+ relation_details:
+ members: "Members:"
+ part_of: "Part of:"
+ relation_history:
+ relation_history: "ê´ê³ ì´ë ¥"
+ relation_history_title: "ê´ê³ ì´ë ¥: {{relation_name}}"
+ relation_member:
+ as: "as"
+ relation:
+ relation: "ê´ê³"
+ relation_title: "ê´ê³: {{relation_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "XML ë´ë ¤ë°ê¸°"
+ view_history: "ì´ë ¥ 보기"
+ start:
+ view_data: "íì¬ ì§ë íê¸°ë¡ ì ë³´ 보기"
+ manually_select: "ë¤ë¥¸ ì§ì ìë ì í"
+ start_rjs:
+ data_layer_name: "Data"
+ data_frame_title: "Data"
+ zoom_or_select: "íë ëë ë³´ê³ ì¶ì ì§ëì ì§ìì ì ííì¸ì"
+ drag_a_box: "ì§ìì 보기 ìí´ ì§ëë¡ ëì´ ëì¼ì¸ì."
+ manually_select: "ë¤ë¥¸ ì§ì ì í"
+ loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+ load_data: "ì ë³´ ë¶ë¬ ì¤ê¸°"
+ unable_to_load_size: "ë¶ë¬ ì¤ê¸° ì¤í¨: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
+ loading: "ë¶ë¬ ì¤ë ì¤..."
+ show_history: "ì´ë ¥ 보기"
+ wait: "ì ìë§ ê¸°ë¤ë ¤ 주ì¸ì..."
+ history_for_feature: "[[feature]]ì ì´ë ¥"
+ details: "ì¸ë¶ ì¬í"
+ private_user: "private user"
+ edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+ object_list:
+ heading: "Object list"
+ back: "Display object list"
+ type:
+ node: "ë
¸ë"
+ way: "길"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ api: "Retrieve this area from the API"
+ details: "Details"
+ selected:
+ type:
+ node: "ë
¸ë [[id]]"
+ way: "길 [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ history:
+ type:
+ node: "ë
¸ë [[id]]"
+ way: "길 [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ tag_details:
+ tags: "Tags:"
+ way_details:
+ nodes: "ë
¸ë:"
+ part_of: "Part of:"
+ also_part_of:
+ one: "also part of way {{related_ways}}"
+ other: "also part of ways {{related_ways}}"
+ way_history:
+ way_history: "길 ì´ë ¥"
+ way_history_title: "길 ì´ë ¥: {{way_name}}"
+ download: "{{download_xml_link}} or {{view_details_link}}"
+ download_xml: "XML ë´ë ¤ë°ê¸°"
+ view_details: "ì¸ë¶ ì¬í íì"
+ way:
+ way: "길"
+ way_title: "길ì´ë ¥: {{way_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "XML ë´ë ¤ë°ê¸°"
+ view_history: "ì´ë ¥ 보기"
+ changeset:
+ changeset_paging_nav:
+ showing_page: "Showing page"
+ of: "of"
+ changeset:
+ still_editing: "(still editing)"
+ anonymous: "Anonymous"
+ no_comment: "(none)"
+ no_edits: "(no edits)"
+ show_area_box: "show area box"
+ big_area: "(big)"
+ view_changeset_details: "ë³ê²½ì
ì¸ë¶ ì¬í 보기"
+ more: "more"
+ changesets:
+ id: "ID"
+ saved_at: "ì ì¥ ìì¹"
+ user: "ì¬ì©ì"
+ comment: "ì¤ëª
"
+ area: "ì§ì"
+ list_bbox:
+ history: "ì´ë ¥"
+ changesets_within_the_area: "ì´ ì§ì ë´ì ë³ê²½ì
:"
+ show_area_box: "show area box"
+ no_changesets: "ë³ê²½ì
ìì"
+ all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+ recent_changes: "ìµê·¼ ë³ê²½ ì¬í"
+ no_area_specified: "ì§ì ì¤ì ì ë¨"
+ first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
+ view_the_map: "ì§ë 보기"
+ view_tab: "í 보기"
+ alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+ list:
+ recent_changes: "ìµê·¼ ë³ê²½ ì¬í"
+ recently_edited_changesets: "ìµê·¼ ìì ë ë³ê²½ì
:"
+ for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+ list_user:
+ edits_by_username: "Edits by {{username_link}}"
+ no_visible_edits_by: "No visible edits by {{name}}."
+ for_all_changes: "For changes by all users see {{recent_changes_link}}"
+ recent_changes: "ìµê·¼ ë³ê²½ ì¬í"
+ diary_entry:
+ new:
+ title: ì ì¼ì§ í목
+ list:
+ title: "ì¬ì©ì ì¼ì§"
+ user_title: "{{user}} ì¼ì§"
+ in_language_title: "{{language}} ì¼ì§ í목"
+ new: ì ì¼ì§ í목
+ new_title: Compose a new entry in your user diary
+ no_entries: No diary entries
+ recent_entries: "Recent diary entries: "
+ older_entries: ì´ì í목ë¤
+ newer_entries: ë¤ì í목ë¤
+ edit:
+ title: "ì¼ì§ í목 ìì "
+ subject: "ì 목: "
+ body: "ë´ì©: "
+ language: "ì¸ì´: "
+ location: "ìì¹: "
+ latitude: "ìë: "
+ longitude: "ê²½ë: "
+ use_map_link: "ì§ë ì¬ì©"
+ save_button: "ì ì¥"
+ marker_text: ì¼ì§ í목 ìì¹
+ view:
+ title: "ì¬ì©ì ì¼ì§ | {{user}}"
+ user_title: "{{user}} ì¼ì§"
+ leave_a_comment: "ëë¤ ë¨ê¸°ê¸°"
+ login_to_leave_a_comment: "ëê¸ì ë¨ê¸°ë ¤ë©´ ë¡ê·¸ì¸í´ì¼ í©ëë¤. {{login_link}}"
+ login: "ë¡ê·¸ì¸"
+ save_button: "ì ì¥"
+ no_such_entry:
+ heading: "No entry with the id: {{id}}"
+ body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+ no_such_user:
+ title: "No such user"
+ heading: "The user {{user}} does not exist"
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ diary_entry:
+ posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+ comment_link: ì´ í목ì ëê¸ ë¨ê¸°ê¸°
+ reply_link: ì´ í목ì ëµë³í기
+ comment_count:
+ one: ëê¸ í ê°
+ other: "ëê¸ {{count}} ê°"
+ edit_link: ì´ í목 ìì
+ diary_comment:
+ comment_from: "Comment from {{link_user}} at {{comment_created_at}}"
+ export:
+ start:
+ area_to_export: "ì§ì ì¶ì¶"
+ manually_select: "ë¤ë¥¸ ì§ì ì í"
+ format_to_export: "ì¶ì¶ í¬ë§·"
+ osm_xml_data: "OpenStreetMap XML Data"
+ mapnik_image: "Mapnik Image"
+ osmarender_image: "Osmarender Image"
+ embeddable_html: "Embeddable HTML"
+ licence: "ë¼ì´ì¼ì¤"
+ export_details: 'OpenStreetMapì ì ë³´ë Creative Commons Attribution-ShareAlike 2.0 license ì ìê±°í©ëë¤..'
+ options: "ì íì¬í"
+ format: "í¬ë§·"
+ scale: "ì¶ì²"
+ max: "ìµë"
+ image_size: "ì´ë¯¸ì§ í¬ê¸°"
+ zoom: "ì¤"
+ add_marker: "Add a marker to the map"
+ latitude: "ìë:"
+ longitude: "ê²½ë:"
+ output: "ì¶ë ¥"
+ paste_html: "Paste HTML to embed in website"
+ export_button: "ì¶ì¶"
+ start_rjs:
+ export: "ì¶ì¶"
+ drag_a_box: "Drag a box on the map to select an area"
+ manually_select: "ë¤ë¥¸ ì§ì ì í"
+ click_add_marker: "Click on the map to add a marker"
+ change_marker: "Change marker position"
+ add_marker: "Add a marker to the map"
+ view_larger_map: "í° ì§ë 보기"
+ geocoder:
+ results:
+ results: "Results"
+ type_from_source: "{{type}} from {{source_link}}"
+ no_results: "No results found"
+ layouts:
+ project_name:
+ # in
+ title: OpenStreetMap
+ # in
+ h1: OpenStreetMap
+ logo:
+ alt_text: OpenStreetMap logo
+ welcome_user: "{{user_link}}ë íìí©ëë¤."
+ welcome_user_link_tooltip: Your user page
+ home: home
+ home_tooltip: Go to home location
+ inbox: "ë°ì 쪽ì§í¨ ({{count}})"
+ inbox_tooltip:
+ zero: ì½ì§ ìì 쪽ì§ê° ììµëë¤
+ one: í ê°ì ì½ì§ ìì 쪽ì§ê° ììµëë¤.
+ other: "{{count}} ê°ì ì½ì§ ìì 쪽ì§ê° ììµëë¤."
+ logout: ë¡ê·¸ ìì
+ logout_tooltip: "ë¡ê·¸ ìì"
+ log_in: ë¡ê·¸ì¸
+ log_in_tooltip: 기존 ê³ì ì¼ë¡ ë¡ê·¸ì¸
+ sign_up: ê°ì
í기
+ sign_up_tooltip: ìì ê°ë¥í ê³ì¢ ì ê· ë±ë¡
+ view: 보기
+ view_tooltip: ì§ë 보기
+ edit: í¸ì§
+ edit_tooltip: ì§ë í¸ì§
+ history: ì´ë ¥
+ history_tooltip: ë³ê²½ì
ì´ë ¥
+ export: ì¶ì¶
+ export_tooltip: ë§µ ì ë³´ ì¶ì¶
+ gps_traces: GPS ì¶ì
+ gps_traces_tooltip: ì¶ì ì¤ì
+ user_diaries: ì¬ì©ì ì¼ì§
+ user_diaries_tooltip: ì¬ì©ì ì¼ì§ 보기
+ tag_line: The Free Wiki World Map
+ intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
+ intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
+ intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+ intro_3_ucl: "UCL VR Centre"
+ intro_3_bytemark: "bytemark"
+ osm_offline: "ë°ì´í°ë² ì´ì¤ ì ê²ì ìí´ OpenStreetMap ì ë°ì´í°ê° íì¬ ì¤íë¼ì¸ì
ëë¤."
+ osm_read_only: "ë°ì´í°ë² ì´ì¤ ì ê²ì ìí´ OpenStreetMap ì ë°ì´í°ê° íì¬ ì½ê¸° ì ì©ì
ëë¤."
+ donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
+ donate_link_text: 기ë¶
+ help_wiki: "ëìë§ & ìí¤"
+ help_wiki_tooltip: "íë¡ì í¸ ëìë§ & ìí¤"
+ help_wiki_url: "http://wiki.openstreetmap.org"
+ news_blog: "ììì¤ ë¸ë¡ê·¸"
+ news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
+ shop: Shop
+ shop_tooltip: Shop with branded OpenStreetMap
+ shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
+ sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+ alt_donation: 기ë¶í기
+ notifier:
+ diary_comment_notification:
+ subject: "[OpenStreetMap] {{user}} ëì´ ë¹ì ì ì¼ì§ í목ì ëê¸ì ë¨ê²¼ìµëë¤."
+ banner1: "* ì´ emailì ëµì¥íì§ ë§ì¸ì. *"
+ banner2: "* ëµì¥ì ìí´ìë OpenStreetMap ì¹ì¬ì´í¸ë¥¼ ì´ì©í´ 주ì¸ì. *"
+ hi: "{{to_user}}ë ìë
íì¸ì."
+ header: "{{from_user}} ëì´ {{subject}} ì 목ì OpenStreetMap ì¼ì§ í목ì ëê¸ì ë¨ê²¼ìµëë¤.:"
+ footer: "{{readurl}}ììë ëê¸ì íì¸í ì ììµëë¤. {{commenturl}}ìì ëê¸ì ë¨ê¸°ê±°ë {{replyurl}}ìì ëµê¸ì ë¨ê¸¸ ì ììµëë¤."
+ message_notification:
+ subject: "[OpenStreetMap] {{user}}ì´ ì 쪽ì§ë¥¼ ë³´ëìµëë¤."
+ banner1: "* ì´ emailì ëµì¥íì§ ë§ì¸ì. *"
+ banner2: "* ëµì¥ì ìí´ìë OpenStreetMap ì¹ì¬ì´í¸ë¥¼ ì´ì©í´ 주ì¸ì. *"
+ hi: "{{to_user}}ë ìë
íì¸ì."
+ header: "{{from_user}} ëì´ OpenStreetMapì íµí´ {{subject}} 쪽ì§ë¥¼ ë³´ëìµëë¤."
+ footer1: "{{readurl}} ììë 쪽ì§ë¥¼ íì¸í ì ììµëë¤."
+ footer2: "{{replyurl}} ìì ëµì¥íì¤ ì ììµëë¤."
+ friend_notification:
+ subject: "[OpenStreetMap] {{user}} ëì´ ë¹ì ì ì¹êµ¬ë¡ ì¶ê°íììµëë¤."
+ had_added_you: "{{user}} ëì´ ë¹ì ì OpenStreetMap ì¹êµ¬ë¡ ì¶ê°íììµëë¤."
+ see_their_profile: "{{userurl}} ìì íë¡íì íì¸íê³ ìíë©´ ì¹êµ¬ë¡ ë±ë¡í ì ììµëë¤."
+ gpx_notification:
+ greeting: "Hi,"
+ your_gpx_file: "It looks like your GPX file"
+ with_description: "with the description"
+ and_the_tags: "and the following tags:"
+ and_no_tags: "and no tags."
+ failure:
+ subject: "[OpenStreetMap] GPX Import failure"
+ failed_to_import: "failed to import. Here's the error:"
+ more_info_1: "More information about GPX import failures and how to avoid"
+ more_info_2: "them can be found at:"
+ import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+ success:
+ subject: "[OpenStreetMap] GPX Import success"
+ loaded_successfully: |
+ loaded successfully with {{trace_points}} out of a possible
+ {{possible_points}} points.
+ signup_confirm:
+ subject: "[OpenStreetMap] Confirm your email address"
+ signup_confirm_plain:
+ greeting: "Hi there!"
+ hopefully_you: "Someone (hopefully you) would like to create an account over at"
+ # next two translations run-on : please word wrap appropriately
+ click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
+ click_the_link_2: "account and read on for more information about OpenStreetMap."
+ introductory_video: "You can watch an introductory video to OpenStreetMap here:"
+ more_videos: "There are more videos here:"
+ the_wiki: "Get reading about OpenStreetMap on the wiki:"
+ the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
+ opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+ wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+ wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
+ # next four translations are in pairs : please word wrap appropriately
+ user_wiki_1: "It is recommended that you create a user wiki page, which includes"
+ user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+ current_user_1: "A list of current users in categories, based on where in the world"
+ current_user_2: "they are, is available from:"
+ signup_confirm_html:
+ greeting: "Hi there!"
+ hopefully_you: "Someone (hopefully you) would like to create an account over at"
+ click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
+ introductory_video: "You can watch an {{introductory_video_link}}."
+ video_to_openstreetmap: "introductory video to OpenStreetMap"
+ more_videos: "There are {{more_videos_link}}."
+ more_videos_here: "more videos here"
+ get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!'
+ wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.'
+ user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].'
+ current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.'
+ email_confirm:
+ subject: "[OpenStreetMap] Confirm your email address"
+ email_confirm_plain:
+ greeting: "Hi,"
+ hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
+ hopefully_you_2: "{{server_url}} to {{new_address}}."
+ click_the_link: "If this is you, please click the link below to confirm the change."
+ email_confirm_html:
+ greeting: "Hi,"
+ hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
+ click_the_link: "If this is you, please click the link below to confirm the change."
+ lost_password:
+ subject: "[OpenStreetMap] Password reset request"
+ lost_password_plain:
+ greeting: "Hi,"
+ hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
+ hopefully_you_2: "email addresses openstreetmap.org account."
+ click_the_link: "If this is you, please click the link below to reset your password."
+ lost_password_html:
+ greeting: "Hi,"
+ hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
+ click_the_link: "If this is you, please click the link below to reset your password."
+ reset_password:
+ subject: "[OpenStreetMap] Password reset"
+ reset_password_plain:
+ greeting: "Hi,"
+ reset: "Your password has been reset to {{new_password}}"
+ reset_password_html:
+ greeting: "Hi,"
+ reset: "Your password has been reset to {{new_password}}"
+ message:
+ inbox:
+ title: "ë°ì 쪽ì§í¨"
+ my_inbox: "ë´ ìª½ì§í¨"
+ outbox: "ë³´ë¸ ìª½ì§í¨"
+ you_have: "{{new_count}} ê°ì ì 쪽ì§ì {{old_count}} ê°ì ì½ì 쪽ì§ê° ììµëë¤."
+ from: "From"
+ subject: "ì 목"
+ date: "ë ì§"
+ no_messages_yet: "ë°ì 쪽ì§ê° ììµëë¤. {{people_mapping_nearby_link}}ìì ì¹êµ¬ë¥¼ ì°¾ìë³´ì¸ì."
+ people_mapping_nearby: "ê·¼ì²ë¥¼ ì§ë ì
ë ¥í ì¬ëë¤"
+ message_summary:
+ unread_button: "ì½ì§ ììì¼ë¡ íì"
+ read_button: "ì½ìì¼ë¡ íì"
+ reply_button: "ëµì¥"
+ new:
+ title: "ì 쪽ì§"
+ send_message_to: "{{name}}ìê² ì ìª½ì§ ë³´ë´ê¸°"
+ subject: "ì 목"
+ body: "ë´ì©"
+ send_button: "ë³´ë´ê¸°"
+ back_to_inbox: "쪽ì§í¨ì¼ë¡ ëìê°ê¸°"
+ message_sent: "쪽ì§ê° ì ì¡ëììµëë¤."
+ no_such_user:
+ title: "ì¬ì©ì ëë 쪽ì§ë¥¼ ì°¾ì ì ììµëë¤"
+ heading: "ì¬ì©ì ëë 쪽ì§ë¥¼ ì°¾ì ì ììµëë¤"
+ body: "ì£ì¡í©ëë¤. ê·¸ë° ìì´ë ëë ì´ë¦ì ì¬ì©ìê° ìª½ì§ë¥¼ ì°¾ì ì ììµëë¤."
+ outbox:
+ title: "ë³´ë¸ ìª½ì§í¨"
+ my_inbox: "My {{inbox_link}}"
+ inbox: "ë°ì í¸ì§í¨"
+ outbox: "ë³´ë¸ í¸ì§í¨"
+ you_have_sent_messages: "{{sent_count}} ê°ì 쪽ì§ë¥¼ ë³´ëìµëë¤."
+ to: "To"
+ subject: "ì 목"
+ date: "ë ì§"
+ no_sent_messages: "ë°ì 쪽ì§ê° ììµëë¤. {{people_mapping_nearby_link}}ìì ì¹êµ¬ë¥¼ ì°¾ìë³´ì¸ì."
+ people_mapping_nearby: "ê·¼ì²ë¥¼ ì§ë ì
ë ¥í ì¬ëë¤"
+ read:
+ title: "Read message"
+ reading_your_messages: "Reading your messages"
+ from: "From"
+ subject: "Subject"
+ date: "Date"
+ reply_button: "Reply"
+ unread_button: "Mark as unread"
+ back_to_inbox: "Back to inbox"
+ reading_your_sent_messages: "Reading your sent messages"
+ to: "To"
+ back_to_outbox: "Back to outbox"
+ mark:
+ as_read: "Message marked as read"
+ as_unread: "Message marked as unread"
+ site:
+ index:
+ js_1: "ìë°ì¤í¬ë¦½í¸ë¥¼ ì§ìíì§ ìë ë¸ë¼ì°ì ì´ê±°ë, ìë°ì¤í¬ë¦½í¸ê° íì±í ëì´ ìì§ ììµëë¤."
+ js_2: "OpenStreetMap uses javascript for its slippy map."
+ js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.'
+ permalink: Permalink
+ license:
+ notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+ license_name: "Creative Commons Attribution-Share Alike 2.0"
+ license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+ project_name: "OpenStreetMap project"
+ project_url: "http://openstreetmap.org"
+ edit:
+ not_public: "You haven't set your edits to be public."
+ not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+ user_page_link: user page
+ anon_edits: "({{link}})"
+ anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ anon_edits_link_text: "Find out why this is the case."
+ flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.'
+ potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+ sidebar:
+ search_results: Search Results
+ close: Close
+ search:
+ search: Search
+ where_am_i: "Where am I?"
+ submit_text: "Go"
+ searching: "Searching..."
+ search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lì²´nen' more examples..."
+ key:
+ map_key: "Map key"
+ map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
+ trace:
+ create:
+ upload_trace: "Upload GPS Trace"
+ trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+ edit:
+ filename: "Filename:"
+ uploaded_at: "Uploaded at:"
+ points: "Points:"
+ start_coord: "Start coordinate:"
+ edit: "edit"
+ owner: "Owner:"
+ description: "Description:"
+ tags: "Tags:"
+ save_button: "Save Changes"
+ no_such_user:
+ title: "No such user"
+ heading: "The user {{user}} does not exist"
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ trace_form:
+ upload_gpx: "Upload GPX File"
+ description: "Description"
+ tags: "Tags"
+ public: "Public?"
+ upload_button: "Upload"
+ help: "Help"
+ help_url: "http://wiki.openstreetmap.org/wiki/Upload"
+ trace_header:
+ see_just_your_traces: "See just your traces, or upload a trace"
+ see_all_traces: "See all traces"
+ see_your_traces: "See all your traces"
+ traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+ trace_optionals:
+ tags: "Tags"
+ view:
+ pending: "PENDING"
+ filename: "Filename:"
+ download: "download"
+ uploaded: "Uploaded at:"
+ points: "Points:"
+ start_coordinates: "Start coordinate:"
+ map: "map"
+ edit: "edit"
+ owner: "Owner:"
+ description: "Description:"
+ tags: "Tags"
+ none: "None"
+ make_public: "Make this track public permanently"
+ edit_track: "Edit this track"
+ delete_track: "Delete this track"
+ viewing_trace: "Viewing trace {{name}}"
+ trace_not_found: "Trace not found!"
+ trace_paging_nav:
+ showing: "Showing page"
+ of: "of"
+ trace:
+ pending: "PENDING"
+ count_points: "{{count}} points"
+ ago: "{{time_in_words_ago}} ago"
+ more: "more"
+ trace_details: "View Trace Details"
+ view_map: "View Map"
+ edit: "edit"
+ edit_map: "Edit Map"
+ public: "PUBLIC"
+ private: "PRIVATE"
+ by: "by"
+ in: "in"
+ map: "map"
+ list:
+ public_traces: "Public GPS traces"
+ your_traces: "Your GPS traces"
+ public_traces_from: "Public GPS traces from {{user}}"
+ tagged_with: " tagged with {{tags}}"
+ delete:
+ scheduled_for_deletion: "Track scheduled for deletion"
+ make_public:
+ made_public: "Track made public"
+ user:
+ login:
+ title: "Login"
+ heading: "Login"
+ please login: "Please login or {{create_user_link}}."
+ create_account: "create an account"
+ email or username: "Email Address or Username: "
+ password: "Password: "
+ lost password link: "Lost your password?"
+ login_button: "Login"
+ account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account."
+ auth failure: "Sorry, couldn't log in with those details."
+ lost_password:
+ title: "lost password"
+ heading: "Forgotten Password?"
+ email address: "Email Address:"
+ new password button: "Send me a new password"
+ notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+ notice email cannot find: "Couldn't find that email address, sorry."
+ reset_password:
+ title: "reset password"
+ flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+ flash token bad: "Didn't find that token, check the URL maybe?"
+ new:
+ title: "Create account"
+ heading: "Create a User Account"
+ no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
+ contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
+ fill_form: "Fill in the form and we'll send you a quick email to activate your account."
+ license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
+ email address: "Email Address: "
+ confirm email address: "Confirm Email Address: "
+ not displayed publicly: 'Not displayed publicly (see privacy policy)'
+ display name: "Display Name: "
+ password: "Password: "
+ confirm password: "Confirm Password: "
+ signup: Signup
+ flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)
Please note that you won't be able to login until you've received and confirmed your email address.
If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+ no_such_user:
+ title: "No such user"
+ heading: "The user {{user}} does not exist"
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ view:
+ my diary: my diary
+ new diary entry: new diary entry
+ my edits: my edits
+ my traces: my traces
+ my settings: my settings
+ send message: send message
+ diary: diary
+ edits: edits
+ traces: traces
+ remove as friend: remove as friend
+ add as friend: add as friend
+ mapper since: "Mapper since: "
+ ago: "({{time_in_words_ago}} ago)"
+ user image heading: User image
+ delete image: Delete Image
+ upload an image: Upload an image
+ add image: Add Image
+ description: Description
+ user location: User location
+ no home location: "No home location has been set."
+ if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
+ settings_link_text: settings
+ your friends: Your friends
+ no friends: You have not added any friends yet.
+ km away: "{{count}}km away"
+ nearby users: "Nearby users: "
+ no nearby users: "There are no users who admit to mapping nearby yet."
+ change your settings: change your settings
+ friend_map:
+ your location: Your location
+ nearby mapper: "Nearby mapper: "
+ account:
+ title: "Edit account"
+ my settings: My settings
+ email never displayed publicly: "(never displayed publicly)"
+ public editing:
+ heading: "Public editing: "
+ enabled: "Enabled. Not anonymous and can edit data."
+ enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ enabled link text: "what's this?"
+ disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+ disabled link text: "why can't I edit?"
+ profile description: "Profile Description: "
+ preferred languages: "Preferred Languages: "
+ home location: "Home Location: "
+ no home location: "You have not entered your home location."
+ latitude: "Latitude: "
+ longitude: "Longitude: "
+ update home location on click: "Update home location when I click on the map?"
+ save changes button: Save Changes
+ make edits public button: Make all my edits public
+ return to profile: Return to profile
+ flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
+ flash update success: "User information updated successfully."
+ confirm:
+ heading: Confirm a user account
+ press confirm button: "Press the confirm button below to activate your account."
+ button: Confirm
+ success: "Confirmed your account, thanks for signing up!"
+ failure: "A user account with this token has already been confirmed."
+ confirm_email:
+ heading: Confirm a change of email address
+ press confirm button: "Press the confirm button below to confirm your new email address."
+ button: Confirm
+ success: "Confirmed your email address, thanks for signing up!"
+ failure: "An email address has already been confirmed with this token."
+ set_home:
+ flash success: "Home location saved successfully"
+ go_public:
+ flash success: "All your edits are now public, and you are now allowed to edit."
+ make_friend:
+ success: "{{name}} is now your friend."
+ failed: "Sorry, failed to add {{name}} as a friend."
+ already_a_friend: "You are already friends with {{name}}."
+ remove_friend:
+ success: "{{name}} was removed from your friends."
+ not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9a2008b1c..90fdc0e09 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -249,7 +249,7 @@ nl:
no_such_user:
body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je geklikt hebt verkeerd."
diary_entry:
- posted_by: "Geplaatst door {{link_user}} op {{created}} in het {{language}}"
+ posted_by: "Geplaatst door {{link_user}} op {{created}} in het {{language_link}}"
comment_link: Opmerking over dit artikel plaatsen
reply_link: Antwoorden op dit artikel
comment_count:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 0766284a0..8ca69e7d7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -247,9 +247,10 @@ pl:
heading: "Brak wpisu o id: {{id}}"
body: "Niestety nie znaleziono wpisu dziennika / komentarza o id {{id}}, sprawdź pisowniÄ. Byc może użyÅeÅ(aÅ) linku który byÅ niepoprawny."
no_such_user:
+ title: "Nie znaleziono użytkownika"
body: "Niestety nie znaleziono użytkownika o nazwie {{user}}, sprawdź pisowniÄ. ByÄ może użyÅeÅ(aÅ) linku który byÅ niepoprawny."
diary_entry:
- posted_by: "Wpis od {{link_user}} z {{created}} w jÄzyku {{language}}"
+ posted_by: "Wpis od {{link_user}} z {{created}} w jÄzyku {{language_link}}"
comment_link: Skomentuj ten wpis
reply_link: Odpowiedz na ten wpis
comment_count:
@@ -299,17 +300,27 @@ pl:
no_results: "Nie znaleziono"
layouts:
welcome_user: "Witaj, {{user_link}}"
+ welcome_user_link_tooltip: "Strona użytkownika"
home: "gÅówna"
+ home_tooltip: "Przejdź do strony gÅównej"
inbox: "skrzynka ({{count}})"
+ inbox_tooltip:
+ zero: "Brak nowych wiadomoÅci"
+ one: "Twoja skrzynka zawiera jednÄ
nowÄ
wiadomoÅÄ"
+ other: "Twoja skrzynka zawiera {{count}} nowych wiadomoÅci"
logout: wyloguj
+ logout_tooltip: "Wyloguj"
log_in: zaloguj siÄ
+ log_in_tooltip: "Zaloguj siÄ"
sign_up: zarejestruj
view: Mapa
edit: Edycja
history: Zmiany
export: Eksport
gps_traces: Ålady GPS
+ gps_traces_tooltip: "ZarzÄ
dzaj Åladami"
user_diaries: Dzienniczki
+ user_diaries_tooltip: "PrzeglÄ
daj dzienniczki użytkownika"
tag_line: Swobodna Wiki-Mapa Åwiata
intro_1: "OpenStreetMap to mapa caÅego Åwiata którÄ
możesz swobodnie edytowaÄ. Tworzona przez ludzi takich jak Ty."
intro_2: "OpenStreetMap pozwala oglÄ
daÄ, korzystaÄ, i kolaboratywnie tworzyÄ dane geograficzne z dowolnego miejsca na Ziemi."
@@ -505,7 +516,7 @@ pl:
edit_map: "Edytuj MapÄ"
public: "PUBLICZNY"
private: "PRYWATNY"
- by: "użytkownika"
+ by: "utworzony przez użytkownika"
in: "w"
map: "mapa"
list:
@@ -556,6 +567,8 @@ pl:
signup: Gotowe
flash create success message: "Nowy użytkownik zostaÅ dodany. Sprawdź czy już przyszedÅ mail potwierdzajÄ
cy, a już za moment bÄdziesz mapowaÅ(a) :-)
Zauważ, że nie można zalogowaÄ siÄ przed otrzymaniem tego maila i potwierdzeniem adresu.
JeÅli korzystasz z rozwiÄ
zania antyspamowego które prosi nowych nadawców o potwierdzenia, bÄdziesz musiaÅ(a) dodaÄ adres webmaster@openstreetmap.org do znanych adresów bo nie jesteÅmy w stanie odpowiadaÄ na zapytania takich systemów."
no_such_user:
+ title: "Nie znaleziono użytkownika"
+ heading: "Użytkownik{{user}} nie istnieje"
body: "Niestety nie znaleziono użytkownika o nazwie {{user}}, sprawdź pisowniÄ. ByÄ może użyÅeÅ(aÅ) linku który byÅ niepoprawny."
view:
my diary: mój dziennik
@@ -582,8 +595,8 @@ pl:
settings_link_text: stronie ustawieÅ
your friends: Twoi znajomi
no friends: Nie dodaÅeÅ/aÅ jeszcze żadnych znajomych.
- km away: "{{count}}km z tÄ
d"
- nearby users: "Najbliźsi użytkownicy: "
+ km away: "{{count}}km stÄ
d"
+ nearby users: "Najbliżsi użytkownicy: "
no nearby users: "Nikt nie przyznaÅ siÄ jeszcze do mapowania w tej okolicy."
change your settings: zmieÅ swoje ustawienia
friend_map:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
new file mode 100644
index 000000000..1e9d64dbf
--- /dev/null
+++ b/config/locales/pt-BR.yml
@@ -0,0 +1,764 @@
+pt-BR:
+ html:
+ dir: ltr
+ activerecord:
+ # Translates all the model names, which is used in error handling on the web site
+ models:
+ acl: "Lista de Controle de acesso"
+ changeset: "Alterações"
+ changeset_tag: "Etiqueta do Conjunto de Alterações"
+ country: "PaÃs"
+ diary_comment: "Comentário"
+ diary_entry: "Entrada do Diário"
+ friend: "Amigo"
+ language: "LÃngua"
+ message: "Mensagem"
+ node: "Ponto"
+ node_tag: "Etiqueta do Ponto"
+ notifier: "Notificador"
+ old_node: "Ponto Antigo"
+ old_node_tag: "Etiqueta do Ponto Antigo"
+ old_relation: "Relação Antiga"
+ old_relation_member: "Membro da Relação Antiga"
+ old_relation_tag: "Etiqueta da Relação Antiga"
+ old_way: "Caminho Antigo"
+ old_way_node: "Ponto do Caminho Antigo"
+ old_way_tag: "Etiqueta do Caminho Antigo"
+ relation: "Relação"
+ relation_member: "Membro da Relação"
+ relation_tag: "Etiqueta da Relação"
+ session: "Sessão"
+ trace: "Trilha"
+ tracepoint: "Ponto da Trilha"
+ tracetag: "Etiqueta da Trilha"
+ user: "Usuário"
+ user_preference: "Preferências do Usuário"
+ user_token: "Token do Usuário"
+ way: "Caminho"
+ way_node: "Ponto do Caminho"
+ way_tag: "Etiqueta do Caminho"
+ # Translates all the model attributes, which is used in error handling on the web site
+ # Only the ones that are used on the web site are translated at the moment
+ attributes:
+ diary_comment:
+ body: "Corpo"
+ diary_entry:
+ user: "Usuário"
+ title: "TÃtulo"
+ latitude: "Latitude"
+ longitude: "Longitude"
+ language: "LÃngua"
+ friend:
+ user: "Usuário"
+ friend: "Amigo"
+ trace:
+ user: "Usuário"
+ visible: "VisÃvel"
+ name: "Nome"
+ size: "Tamanho"
+ latitude: "Latitude"
+ longitude: "Longitude"
+ public: "Público"
+ description: "Descrição"
+ message:
+ sender: "Remetente"
+ title: "TÃtulo"
+ body: "Corpo"
+ recipient: "Destinatário"
+ user:
+ email: "Email"
+ active: "Ativo"
+ display_name: "Nome para Exibição"
+ description: "Descrição"
+ languages: "LÃnguas"
+ pass_crypt: "Senha"
+ map:
+ view: "Ver"
+ edit: "Editar"
+ coordinates: "Coordenadas:"
+ browse:
+ changeset:
+ title: "Alterações"
+ changeset: "Alterações:"
+ download: "Baixar {{changeset_xml_link}} ou {{osmchange_xml_link}}"
+ changesetxml: "XML do conjunto de alterações"
+ osmchangexml: "osmChange XML"
+ changeset_details:
+ created_at: "Criado em:"
+ closed_at: "Fechado em:"
+ belongs_to: "Pertence a:"
+ bounding_box: "Limites da área:"
+ no_bounding_box: "Nenhum limite de área foi armazenado para estas alterações."
+ show_area_box: "Ãrea de exibição"
+ box: "Ãrea"
+ has_nodes: "Tem os seguintes {{node_count}} pontos:"
+ has_ways: "Tem os seguintes {{way_count}} caminhos:"
+ has_relations: "tem as seguintes {{relation_count}} relações:"
+ common_details:
+ edited_at: "Editado em:"
+ edited_by: "Editado por:"
+ version: "Versão:"
+ in_changeset: "No conjunto de modificações:"
+ containing_relation:
+ relation: "Relação {{relation_name}}"
+ relation_as: "(como {{relation_role}})"
+ map:
+ loading: "Carregando..."
+ deleted: "Apagado"
+ view_larger_map: "Ver mapa maior"
+ node_details:
+ coordinates: "Coordenadas: "
+ part_of: "Parte de:"
+ node_history:
+ node_history: "Histórico do ponto"
+ download: "{{download_xml_link}} ou {{view_details_link}}"
+ download_xml: "Baixar XML"
+ view_details: "ver detalhes"
+ node:
+ node: "Ponto"
+ node_title: "Ponto: {{node_name}}"
+ download: "{{download_xml_link}} ou {{view_history_link}}"
+ download_xml: "Baixar XML"
+ view_history: "ver histórico"
+ not_found:
+ sorry: "Desculpe, o {{type}} com o ID {{id}}, não pode ser encontrado."
+ type:
+ node: "ponto"
+ way: "caminho"
+ relation: "relação"
+ paging_nav:
+ showing_page: "Exibindo página"
+ of: "de"
+ relation_details:
+ members: "Membros:"
+ part_of: "Parte de:"
+ relation_history:
+ relation_history: "Histórico de Relação"
+ relation_history_title: "Histórico da Relação: {{relation_name}}"
+ relation_member:
+ as: "como"
+ relation:
+ relation: "Relação"
+ relation_title: "Relação: {{relation_name}}"
+ download: "{{download_xml_link}} ou {{view_history_link}}"
+ download_xml: "Baixar XML"
+ view_history: "ver histórico"
+ start:
+ view_data: "Ver dados para do mapa em visualização atual"
+ manually_select: "Selecione uma área diferente manualmente"
+ start_rjs:
+ data_layer_name: "Dados"
+ data_frame_title: "Dados"
+ zoom_or_select: "Aproxime ou selecione uma área diferente para visualizar"
+ drag_a_box: "Clique e arraste para selecionar uma área no mapa"
+ manually_select: "Selecione uma área diferente manualmente"
+ loaded_an_area_with_num_features: "Você carregou uma área que contém [[num_features]] pontos com caracterÃsticas. Alguns navegadores podem não conseguir exibir todos estes dados. Geralmente, navegadores trabalham melhor exibindo um conjunto de menos de 100 caracterÃsticas por vez, ultrapassar isso pode deixá-lo lento ou travá-lo. Se você tem certeza que deseja exibir estes dados, clique no botão abaixo."
+ load_data: "Carregar dados"
+ unable_to_load_size: "ImpossÃvel carregar dados: tamanho da área de [[bbox_size]] é muito grande (precisa ser menor que {{max_bbox_size}})"
+ loading: "Carregando..."
+ show_history: "Exibir histórico"
+ wait: "Aguarde..."
+ history_for_feature: "Histórico para [[feature]]"
+ details: "Detalhes"
+ private_user: "usuário privado"
+ edited_by_user_at_timestamp: "Editado por [[user]] at [[timestamp]]"
+ object_list:
+ heading: "Lista de Objetos"
+ back: "Exibir lista de objetos"
+ type:
+ node: "Ponto"
+ way: "Caminho"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ api: "Obter esta área através da API"
+ details: "Detalhes"
+ selected:
+ type:
+ node: "Ponto [[id]]"
+ way: "Caminho [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ history:
+ type:
+ node: "Ponto [[id]]"
+ way: "Caminho [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ tag_details:
+ tags: "Etiquetas:"
+ way_details:
+ nodes: "Pontos:"
+ part_of: "Parte de:"
+ also_part_of:
+ one: "também parte do caminho {{related_ways}}"
+ other: "também parte dos caminhos {{related_ways}}"
+ way_history:
+ way_history: "Histórico de caminho"
+ way_history_title: "Histórico do caminho: {{way_name}}"
+ download: "{{download_xml_link}} ou {{view_details_link}}"
+ download_xml: "Baixar XML"
+ view_details: "ver detalhes"
+ way:
+ way: "Caminho"
+ way_title: "Caminho: {{way_name}}"
+ download: "{{download_xml_link}} ou {{view_history_link}}"
+ download_xml: "Baixar XML"
+ view_history: "ver histórico"
+ changeset:
+ changeset_paging_nav:
+ showing_page: "Exibindo página"
+ of: "de"
+ changeset:
+ still_editing: "(ainda editando)"
+ anonymous: "Anônimo"
+ no_comment: "(nenhum)"
+ no_edits: "(sem alterações)"
+ show_area_box: "exibir limite da área"
+ big_area: "(grande)"
+ view_changeset_details: "Ver detalhes das alterações"
+ more: "mais"
+ changesets:
+ id: "ID"
+ saved_at: "Salvo em"
+ user: "Usuário"
+ comment: "Comentário"
+ area: "Ãrea"
+ list_bbox:
+ history: "Histórico"
+ changesets_within_the_area: "Alterações na área:"
+ show_area_box: "exibir limites da área"
+ no_changesets: "Sem alterações"
+ all_changes_everywhere: "Para todas as alterações, de qualquer localidade, ver {{recent_changes_link}}"
+ recent_changes: "Alterações Recentes"
+ no_area_specified: "Ãrea não especificada"
+ first_use_view: "Primeiro use o {{view_tab_link}} para mover ou ampliar para uma área de interesse, e então clique na aba de histórico."
+ view_the_map: "ver o mapa"
+ view_tab: "ver aba"
+ alternatively_view: "Alternativamente, ver tudo {{recent_changes_link}}"
+ list:
+ recent_changes: "Alterações Recentes"
+ recently_edited_changesets: "Conjunto de alterações recentes:"
+ for_more_changesets: "Para mais conjuntos de alterações, selecione um usuário e veja suas edições, ou veja o 'histórico' de edições de uma área especÃfica."
+ list_user:
+ edits_by_username: "Edições de {{username_link}}"
+ no_visible_edits_by: "Sem edições visÃveis de {{name}}."
+ for_all_changes: "Para alterações feitas por todos usuários veja {{recent_changes_link}}"
+ recent_changes: "Alterações Recentes"
+ diary_entry:
+ new:
+ title: "Nova Entrada de Diário"
+ list:
+ title: "Diários dos Usuários"
+ user_title: "Diário de {{user}}"
+ in_language_title: "Entradas do Diário em {{language}}"
+ new: "Nova Entrada no Diário"
+ new_title: "Escrever nova entrada em seu Diário"
+ no_entries: "Sem entradas no Diário"
+ recent_entries: "Entradas recentes no Diário: "
+ older_entries: "Entradas antigas"
+ newer_entries: "Entradas novas"
+ edit:
+ title: "Editar entrada do diário"
+ subject: "Assunto: "
+ body: "Texto: "
+ language: "Idioma: "
+ location: "Localização: "
+ latitude: "Latitude: "
+ longitude: "Longitude: "
+ use_map_link: "usar mapa"
+ save_button: "Salvar"
+ marker_text: "Localização da entrada no diário"
+ view:
+ title: "Diários dos usuários | {{user}}"
+ user_title: "Diário de {{user}}"
+ leave_a_comment: "Deixe um comentário"
+ login_to_leave_a_comment: "{{login_link}} para deixar um comentário"
+ login: "Entrar"
+ save_button: "Salvar"
+ no_such_entry:
+ heading: "Não há entrada no diário com o id: {{id}}"
+ body: "Desculpe, não há entrada no diário ou comentário com o id {{id}}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado."
+ no_such_user:
+ title: "Usuário inexistente"
+ heading: "O usuário {{user}} não existe"
+ body: "Desculpe, não há usuário com o nome {{user}}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado."
+ diary_entry:
+ posted_by: "Postado por {{link_user}} em {{created}} em {{language}}"
+ comment_link: "Comentar nesta entrada"
+ reply_link: "Responder esta entrada"
+ comment_count:
+ one: "1 comentário"
+ other: "{{count}} comentários"
+ edit_link: "Editar esta entrada"
+ diary_comment:
+ comment_from: "Comentário de {{link_user}} em {{comment_created_at}}"
+ export:
+ start:
+ area_to_export: "Ãrea a exportar"
+ manually_select: "Selecior área diferente manualmente"
+ format_to_export: "Formato a Exportar"
+ osm_xml_data: "Dados XML OpenStreetMap"
+ mapnik_image: "Imagem Mapnik"
+ osmarender_image: "Imagem Osmarender"
+ embeddable_html: "HTML para embutir"
+ licence: "Licença"
+ export_details: 'Os dados do OpenStreetMap estão licenciados sob a Creative Commons Atribuição - Compartilhamento pela mesma Licença 2.0 Genérica (CC-BYSA-2.0).'
+ options: "Opções"
+ format: "Formato"
+ scale: "Escala"
+ max: "max"
+ image_size: "Tamanho da Imagem"
+ zoom: "Zoom"
+ add_marker: "Adicionar um marcador ao mapa"
+ latitude: "Lat:"
+ longitude: "Lon:"
+ output: "SaÃda"
+ paste_html: "Cole o HTML para publicar no site"
+ export_button: "Exportar"
+ start_rjs:
+ export: "Exportar"
+ drag_a_box: "Marque uma caixa no mapa para selecionar uma área"
+ manually_select: "Selecionar manualmente uma área diferente"
+ click_add_marker: "Clique no mapa para adicionar um marcador"
+ change_marker: "Mudar posição do marcador"
+ add_marker: "Adicionar um marcador ao mapa"
+ view_larger_map: "Ver Mapa Ampliado"
+ geocoder:
+ results:
+ results: "Resultados"
+ type_from_source: "{{type}} de {{source_link}}"
+ no_results: "Não foram encontrados resultados"
+ layouts:
+ project_name:
+ # in
+ title: OpenStreetMap
+ # in
+ h1: OpenStreetMap
+ logo:
+ alt_text: OpenStreetMap logo
+ welcome_user: "Bem vindo, {{user_link}}"
+ welcome_user_link_tooltip: "Sua Página de usuário"
+ home: "inÃcio"
+ home_tooltip: "Ir para a sua localização"
+ inbox: "caixa de entrada ({{count}})"
+ inbox_tooltip:
+ zero: "Sem novas mensagens na sua caixa de entrada"
+ one: "1 Nova mensagem na sua caixa de entrada"
+ other: "Sua caixa de entrada tem {{count}} mensagens não lidas"
+ logout: "sair"
+ logout_tooltip: "Sair"
+ log_in: "entrar"
+ log_in_tooltip: "Entrar com uma conta existente"
+ sign_up: "registrar"
+ sign_up_tooltip: "Criar uma conta para editar"
+ view: "Ver"
+ view_tooltip: "Ver mapas"
+ edit: "Editar"
+ edit_tooltip: "Editar mapas"
+ history: "Histórico"
+ history_tooltip: "Histórico de alterações"
+ export: "Exportar"
+ export_tooltip: "Exportar dados do mapa"
+ gps_traces: "Trilhas GPS"
+ gps_traces_tooltip: "Gerenciar trilhas"
+ user_diaries: "Diários de Usuário"
+ user_diaries_tooltip: "Ver os diários dos usuários"
+ tag_line: "O Wiki de Mapas Livres do Mundo"
+ intro_1: "OpenStreetMap é um mapa livre e editável do mundo. Ele é feito por pessoas como você."
+ intro_2: "OpenStreetMap te permite ver, editar e usar dados geográficos de maneira colaborativa de qualquer lugar do mundo."
+ intro_3: "A hospedagem dos dados do OpenStreetMap é cedida gentilmente por {{ucl}} e {{bytemark}}."
+ intro_3_ucl: "UCL VR Centre"
+ intro_3_bytemark: "bytemark"
+ osm_offline: "A base de dados do OpenStreetMap está off-line devido a operações de manutenção."
+ osm_read_only: "A base de dados do OpenStreetMap está em modo somente leitura devido a operações de manutenção."
+ donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: {{link}}."
+ donate_link_text: "doando"
+ help_wiki: "Ajuda & Wiki"
+ help_wiki_tooltip: "Ajuda & Wiki do projeto"
+ help_wiki_url: "http://wiki.openstreetmap.org"
+ news_blog: "Blog de notÃcias"
+ news_blog_tooltip: "Blog de notÃcias sobre o OpenStreetMap, dados geográficos livres, etc."
+ shop: "Compras"
+ shop_tooltip: "Compre produtos com a marca OpenStreetMap"
+ shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
+ sotm: 'Venha para a OpenStreetMap Conference 2009 (The State of the Map) de 10 a 12 de julho em Amsterdam!'
+ alt_donation: "Faça uma doação"
+ notifier:
+ diary_comment_notification:
+ subject: "[OpenStreetMap] {{user}} comentou uma entrada de seu diário"
+ banner1: "* Por favor não responda este e-mail. *"
+ banner2: "* Use o Site do OpenStreetMap para respondê-lo. *"
+ hi: "Olá {{to_user}},"
+ header: "{{from_user}} comentou a sua entrada de diário do OpenStreetMap com o assunto {{subject}}:"
+ footer: "Você pode ler o comentário em {{readurl}}, pode comentá-lo em {{commenturl}} ou respondê-lo em {{replyurl}}"
+ message_notification:
+ subject: "[OpenStreetMap] {{user}} enviou uma mensagem para você"
+ banner1: "* Por favor não responda este e-mail. *"
+ banner2: "* Use o site do OpenStreetMap para respondê-lo. *"
+ hi: "Olá {{to_user}},"
+ header: "{{from_user}} enviou uma mensagem pelo OpenStreetMap para você com o assunto {{subject}}:"
+ footer1: "Você pode ser a mensagem em {{readurl}}"
+ footer2: "e pode respondê-la em {{replyurl}}"
+ friend_notification:
+ subject: "[OpenStreetMap] {{user}} adicionou você como amigo"
+ had_added_you: "{{user}} adicionou você como amigo no OpenStreetMap."
+ see_their_profile: "Você pode ver seu perfil em {{userurl}} e adicioná-lo também se desejar."
+ gpx_notification:
+ greeting: "Olá,"
+ your_gpx_file: "Este parece ser um arquivo GPX seu"
+ with_description: "com a descrição"
+ and_the_tags: "e as seguintes etiquetas:"
+ and_no_tags: "e sem etiquetas."
+ failure:
+ subject: "[OpenStreetMap] Importação de arquivo GPX falhou"
+ failed_to_import: "falha ao importar. Veja a mensagem de erro:"
+ more_info_1: "Mais informações sobre erros de importação de arquivos GPX e como evitá-los"
+ more_info_2: "podem ser encontradas em:"
+ import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+ success:
+ subject: "[OpenStreetMap] Arquivo GPX importado com sucesso"
+ loaded_successfully: "|
+ carregado com sucesso com {{trace_points}} pontos além dos
+ {{possible_points}} pontos possÃveis."
+ signup_confirm:
+ subject: "[OpenStreetMap] Confirme seu endereço de e-mail"
+ signup_confirm_plain:
+ greeting: "Olá!"
+ hopefully_you: "Alguém (esperamos que você) quer criar uma conta em "
+ # next two translations run-on : please word wrap appropriately
+ click_the_link_1: "Se esta pessoa é você, bem-vindo! Clique abaixo para confirmar sua"
+ click_the_link_2: "conta e ler mais informações sobre o OpenStreetMap."
+ introductory_video: "Você pode assistir um vÃdeo introdutório (em inglês) sobre o OpenStreetMap aqui:"
+ more_videos: "Existem mais vÃdeos aqui:"
+ the_wiki: "Continue lendo sobre o OpenStreetMap no wiki:"
+ opengeodata: "OpenGeoData.org é o blog do OpenStreetMap, que também dispõe
+de podcasts:"
+ wiki_signup: "Você também pode querer registrar-se no wiki do
+OpenStreetMap em:"
+ # next four translations are in pairs : please word wrap appropriately
+ user_wiki_1: "à recomendável que você crie sua página no wiki, incluindo tags de "
+ user_wiki_2: "categorias marcando onde você está, como [[Category:Users_in_Brazil]]."
+ current_user_1: "Uma lista atualizada de usuários em categorias, baseada em onde eles "
+ current_user_2: "estão, está disponÃvel aqui:"
+ signup_confirm_html:
+ greeting: "Olá!"
+ hopefully_you: "Alguém (esperamos que você) quer criar uma conta em "
+ click_the_link: "Se esta pessoa é você, bem-vindo! Por favor, clique no link abaixo para confirmar sua inscrição e ler mais informações sobre o OpenStreetMap."
+ introductory_video: "Você pode ver um vÃdeo introdutório (em inglês) em {{introductory_video_link}}."
+ video_to_openstreetmap: "vÃdeo introdutório ao OpenStreetMap"
+ more_videos: "Há também {{more_videos_link}}."
+ more_videos_here: "mais vÃdeos aqui"
+ get_reading: 'Continue lendo sobre o OpenStreetMap no wiki ou no blog OpenGeoData que tem podcasts para baixar!'
+ wiki_signup: 'Você pode querer também se registrar no wiki do OpenStreetMap.'
+ user_wiki_page: 'à recomendável que você crie sua página no wiki, incluindo etiquetas sobre sua localização, como em [[Category:Users_in_Rio_de_Janeiro]].'
+ current_user: 'A lista de usuários, baseada em suas localizações no mundo, está disponÃvel em Category:Users_by_geographical_region.'
+ email_confirm:
+ subject: "[OpenStreetMap] Confirmação de endereço de e-mail"
+ email_confirm_plain:
+ greeting: "Olá,"
+ hopefully_you_1: "Alguém (esperamos que você) quer alterar seu endereço de e-mail de "
+ hopefully_you_2: "{{server_url}} para {{new_address}}."
+ click_the_link: "Se esta pessoa é você, por favor clique no link abaixo para confirmar a alteração."
+ email_confirm_html:
+ greeting: "Olá,"
+ hopefully_you: "Alguém (esperamos que você) quer alterar seu endereço de e-mail de {{server_url}} para {{new_address}}."
+ click_the_link: "Se esta pessoa é você, por favor clique no link abaixo para confirmar a alteração."
+ lost_password:
+ subject: "[OpenStreetMap] Solicitação de nova senha"
+ lost_password_plain:
+ greeting: "Olá,"
+ hopefully_you_1: "Alguém (possivelmente você) pediu uma nova senha"
+ hopefully_you_2: "para a conta no openstreetmap.org ligada a este e-mail."
+ click_the_link: "Se esta pessoa é você, por favor clique no link abaixo para receber uma nova senha."
+ lost_password_html:
+ greeting: "Olá,"
+ hopefully_you: "Alguém (possivelmente você) pediu uma nova senha para a conta no openstreetmap.org ligada a este e-mail."
+ click_the_link: "Se esta pessoa é você, por favor clique no link abaixo para receber uma nova senha."
+ reset_password:
+ subject: "[OpenStreetMap] Nova senha"
+ reset_password_plain:
+ greeting: "Olá,"
+ reset: "Sua nova senha é {{new_password}}"
+ reset_password_html:
+ greeting: "Olá,"
+ reset: "Sua nova senha é {{new_password}}"
+ message:
+ inbox:
+ title: "Caixa de Entrada"
+ my_inbox: "Minha caixa de entrada"
+ outbox: "caixa de saÃda"
+ you_have: "Você tem {{new_count}} mensagens novas e {{old_count}} mensagens antigas"
+ from: "De"
+ subject: "Assunto"
+ date: "Data"
+ no_messages_yet: "Você ainda não tem mensagens. Por que não entrar em contato com {{people_mapping_nearby_link}}?"
+ people_mapping_nearby: "alguém mapeando por perto"
+ message_summary:
+ unread_button: "Marcar como não lida"
+ read_button: "Marcar como lida"
+ reply_button: "Responder"
+ new:
+ title: "Enviar mensagem"
+ send_message_to: "Enviar uma nova mensagem para {{name}}"
+ subject: "Assunto"
+ body: "Mensagem"
+ send_button: "Enviar"
+ back_to_inbox: "Voltar para a caixa de entrada"
+ message_sent: "Mensage enviada"
+ no_such_user:
+ title: "Não existe usuário ou mensagem"
+ no_such_user: "Usuário ou mensagem não encontrada"
+ sorry: "Desculpe, não existe usuário ou mensagem com esse nome ou id"
+ outbox:
+ title: "Caixa de SaÃda"
+ my_inbox: "Minha {{inbox_link}}"
+ inbox: "caixa de entrada"
+ outbox: "caixa de saÃda"
+ you_have_sent_messages: "Você tem {{sent_count}} mensagens enviadas"
+ to: "Para"
+ subject: "Assunto"
+ date: "Data"
+ no_sent_messages: "Você ainda não enviou nenhuma mensagem. Porque não entrar em contato com {{people_mapping_nearby_link}}?"
+ people_mapping_nearby: "alguém mapeando por perto"
+ read:
+ title: "Ler Mensagem"
+ reading_your_messages: "Lendo suas mensagens"
+ from: "De"
+ subject: "Assunto"
+ date: "Data"
+ reply_button: "Responder"
+ unread_button: "Marcar como não lida"
+ back_to_inbox: "Voltar para a caixa de entrada"
+ reading_your_sent_messages: "Lendo suas mensagens enviadas"
+ to: "Para"
+ back_to_outbox: "Voltar para a caixa de saÃda"
+ mark:
+ as_read: "Mensagem marcada como lida"
+ as_unread: "Mensagem marcada como não lida"
+ site:
+ index:
+ js_1: "Você está usando um navegador sem suporte a javascript, ou está com o javascript desativado."
+ js_2: "O OpenStreetMap usa javascript para a navegação dos mapas."
+ js_3: 'Você pode tentar o navegador estático Tiles@Home se não for possÃvel ativar o javascript.'
+ permalink: "Link Permanente"
+ license:
+ notice: "Licenciado sob a {{license_name}} para o {{project_name}} e seus contribuidores."
+ license_name: "Creative Commons de Atribuição-Compartilhamento pela Mesma Licença 2.0"
+ license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+ project_name: "projeto OpenStreetMap"
+ project_url: "http://openstreetmap.org"
+ edit:
+ not_public: "Você não configurou suas edições para serem públicas."
+ not_public_description: "Você não pode editar o mapa até que você configure suas edições para serem públicas, o que pode fazer na sua {{user_page}}."
+ user_page_link: "página de usuário"
+ anon_edits: "({{link}})"
+ anon_edits_link: "http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits"
+ anon_edits_link_text: "Descubra se é esse o seu caso."
+ flash_player_required: 'Você precisa de um tocador Flash para usar o Potlatch, o editor Flash do OpenStreetMap. Você pode baixar o Flash Player da Adobe.com. Outras opções estão disponÃveis para editar o OpenStreetMap.'
+ potlatch_unsaved_changes: "Você tem alterações não salvas. (Para salvar no Potlatch, você deve deselecionar a linha ou ponto atual, se editando no modo de edição ao vivo, ou clicar em salvar se estiver editando offline."
+ sidebar:
+ search_results: "Resultados da Busca"
+ close: "Fechar"
+ search:
+ search: "Buscar"
+ where_am_i: "Onde estou?"
+ submit_text: "Ir"
+ searching: "Buscando..."
+ search_help: "exemplos: 'Belo Horizonte', 'Av. Paulista, São Paulo', 'CB2 5AQ', or 'post offices near Porto Alegre' mais exemplos..."
+ key:
+ map_key: "Map key"
+ map_key_tooltip: "Map key para a renderização do mapnik neste nÃvel de zoom"
+ trace:
+ create:
+ upload: "Enviar Trilha GPS"
+ trace_uploaded: "Seu arquivo GPX foi enviado e está aguardando para ser inserido no banco de dados. Isso normalmente leva meia hora, e um e-mail será enviado para você quando ocorrer."
+ edit:
+ filename: "Nome do arquivo:"
+ uploaded_at: "Subido em:"
+ points: "Pontos:"
+ start_coord: "Coordenada de inÃcio:"
+ edit: "editar"
+ owner: "Dono:"
+ description: "Descrição:"
+ tags: "Tags:"
+ save_button: "Salvar Mudanças"
+ no_such_user:
+ title: "Usuário não encontrado"
+ heading: "O usuário {{user}} não existe"
+ no_such_user: "Desculpe, não existe usuário de nome {{name}}. Verifique a digitação, ou talvez o link que você tenha clicado esteja errado."
+ trace_form:
+ upload_gpx: "Enviar Arquivo GPX"
+ description: "Descrição"
+ tags: "Etiquetas"
+ public: "Público?"
+ upload_button: "Enviar"
+ help: "Ajuda"
+ help_url: "http://wiki.openstreetmap.org/wiki/Upload"
+ trace_header:
+ see_just_your_traces: "Ver somente suas trilhas, ou subir uma trilha"
+ see_all_traces: "Ver todas as trilhas"
+ see_your_traces: "Ver todas as suas trilhas"
+ traces_waiting: "Você tem {{count}} trilhas esperando para subir. Por favor considere esperar que elas terminem antes de subir mais, para não bloquear a fila para outros usuários."
+ trace_optionals:
+ tags: "Etiquetas"
+ view:
+ pending: "PENDENTE"
+ filename: "Nome do arquivo:"
+ download: "baixar"
+ uploaded: "Enviado em:"
+ points: "Pontos:"
+ start_coordinates: "Coordenada de inÃcio:"
+ map: "mapa"
+ edit: "editar"
+ owner: "Dono:"
+ description: "Descrição:"
+ tags: "Etiquetas"
+ none: "Nenhum"
+ make_public: "Torne esta trilha permanentemente pública"
+ edit_track: "Edite esta trilha"
+ delete_track: "Apague esta trilha"
+ viewing_trace: "Visualizando trilha {{name}}"
+ trace_not_found: "Trilha não encontrada!"
+ trace_paging_nav:
+ showing: "Mostrando página"
+ of: "de"
+ trace:
+ pending: "PENDENTE"
+ count_points: "{{count}} pontos"
+ ago: "{{time_in_words_ago}} atrás"
+ more: "mais"
+ trace_details: "Ver detalhes da trilha"
+ view_map: "Ver Mapa"
+ edit: "editar"
+ edit_map: "Editar Mapa"
+ public: "PUBLICO"
+ private: "PRIVADO"
+ by: "por"
+ in: "em"
+ map: "mapa"
+ list:
+ public_traces: "Trilhas Públicas de GPS"
+ your_traces: "Suas Trilhas de GPS"
+ public_traces_from: "Trilhas de GPS públicas de {{user}}"
+ tagged_with: " etiquetadas com {{tags}}"
+ delete:
+ scheduled_for_deletion: "Trilha marcada para ser apagada"
+ make_public:
+ made_public: "Trilha foi feita pública"
+ user:
+ login:
+ title: "Entrar"
+ heading: "Entrar"
+ please login: "Por favor entre ou {{create_user_link}}."
+ create_account: "crie uma nova conta"
+ email or username: "Endereço de Email ou Nome de Usuário: "
+ password: "Senha: "
+ lost password link: "Esqueceu sua senha?"
+ login_button: "Entrar"
+ account not active: "Desculpe, sua conta não está mais ativa.
Por favor clique no link no e-mail de confirmação recebido, para ativar sua conta."
+ auth failure: "Desculpe, impossÃvel entrar com estas informações."
+ lost_password:
+ title: "Senha esquecida"
+ heading: "Esqueceu sua senha?"
+ email address: "Endereço de Email:"
+ new password button: "Me envie uma nova senha"
+ notice email on way: "Um email foi enviado para que você possa escolher outra senha."
+ notice email cannot find: "Desculpe, não foi possÃvel encontrar esse endereço de email."
+ reset_password:
+ title: "Redefinir Senha"
+ flash changed check mail: "Sua senha foi alterada e está a caminho para sua caixa de entrada :-)"
+ flash token bad: "O código não confere, verifique a URL."
+ new:
+ title: "Criar Conta"
+ heading: "Criar uma nova conta de usuário"
+ no_auto_account_create: "Infelizmente não foi possÃvel criar uma conta para você automaticamente."
+ contact_webmaster: 'Por favor contate o webmaster (em inglês) para que uma conta seja criada - nós a criaremos o mais rápido possÃvel. '
+ fill_form: "Preencha o formulário e lhe enviaremos um email rapidamente para ativar sua conta."
+ license_agreement: 'Ao criar uma conta, você aceita que todos os dados enviados para o openstreetmap.org serão licenciados (não-exclusivamente) sob a licença Creative Commons (Atribuição-Compartilhamento pela mesma Licença).'
+ email address: "Endereço de Email: "
+ confirm email address: "Confirme o Endereço de Email: "
+ not displayed publicly: 'Não exibir publicamente (veja a polÃtica de privacidade)'
+ display name: "Nome a ser exibido: "
+ password: "Senha: "
+ confirm password: "Confirme a Senha: "
+ signup: "Registrar"
+ flash create success message: "Usuário criado com sucesso. Verifique seu email para uma nota de confirmação, e você estará mapeando logo logo :-)
Por favor note que você não poderá entrar no sistema até ter recebido e confirmado seu endereço de email.
Se você utiliza algum sistema de antispam que envia mensagens de confirmação, tenha certeza de incluir webmaster@openstreetmap.org na lista de remetentes confiáveis (whitelist) pois não poderemos responder pedidos de confirmação."
+ no_such_user:
+ title: "Usuário não existe"
+ heading: "O usuário {{user}} não existe"
+ body: "Desculpe, não há nenhum usuário com o nome {{user}}. Por favor verifique se você digitou corretamente, ou talvez o link que você tenha clicado esteja errado."
+ view:
+ my diary: "meu diário"
+ new diary entry: "nova entrada de diário"
+ my edits: "minhas edições"
+ my traces: "minhas trilhas"
+ my settings: "minhas configurações"
+ send message: "enviar mensagem"
+ diary: "diário"
+ edits: "edições"
+ traces: "trilhas"
+ remove as friend: "remover da lista de amigos"
+ add as friend: "adicionar como amigos"
+ mapper since: "Mapeador desde: "
+ ago: "({{time_in_words_ago}} atrás)"
+ user image heading: "Imagem do usuário"
+ delete image: "Apagar Imagem"
+ upload an image: "Enviar uma Imagem"
+ add image: "Adicionar Imagem"
+ description: "Descrição"
+ user location: "Local do usuário"
+ no home location: "Nenhuma localização de casa foi definida."
+ if set location: "Se você definir a sua localização, um mapa bonito vai aparecer abaixo. Você pode definir sua localização na página de {{settings_link}}."
+ settings_link_text: "configurações"
+ your friends: "Seus amigos"
+ no friends: "Você ainda não adicionou amigos."
+ km away: "{{distance}} km de distância"
+ nearby users: "Usuários próximos: "
+ no nearby users: "Não existem usuários mapeando por perto."
+ change your settings: "mudar suas configurações"
+ friend_map:
+ your location: "Sua localização"
+ nearby mapper: "Mapeador próximo: "
+ account:
+ title: "Editar conta"
+ my settings: "Minhas configurações"
+ email never displayed publicly: "(nunca mostrado publicamente)"
+ public editing:
+ heading: "Edição pública: "
+ enabled: "Ativado. Não é permitido edição anônima."
+ enabled link: "http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits"
+ enabled link text: "o que é isso?"
+ disabled: "Desativado e não pode editar dados, todas as edições anteriores são anônimas."
+ disabled link text: "porque não posso editar?"
+ profile description: "Descrição do Perfil: "
+ preferred languages: "Preferência de Idioma: "
+ home location: "Localização: "
+ no home location: "Você ainda não entrou a sua localização."
+ latitude: "Latitude: "
+ longitude: "Longitude: "
+ update home location on click: "Atualizar localização ao clicar no mapa?"
+ save changes button: "Salvar Mudanças"
+ make edits public button: "Tornar todas as minhas edições públicas"
+ return to profile: "Retornar para o perfil"
+ flash update success confirm needed: "Informação de usuário atualizada com sucesso. Verifique sua caixa de entrada do email para confirmar seu novo endereço."
+ flash update success: "Informação de usuário atualizada com sucesso."
+ confirm:
+ heading: "Confirmar uma conta de usuário"
+ press confirm button: "Pressione o botão de confirmação abaixo para ativar sua conta."
+ button: "Confirmar"
+ success: "Conta ativada, obrigado!"
+ failure: "A Conta de usuário já foi confirmada anteriormente."
+ confirm email:
+ heading: "Confirmar uma mudança de endereço de email"
+ press confirm button: "Pressione o botão de confirmação abaixo para confirmar seu novo endereço de email."
+ button: "Confirmar"
+ success: "Conta ativada, obrigado!"
+ failure: "Este endereço de e-mail já está em uso em outra conta."
+ set_home:
+ flash success: "Localização salva com sucesso"
+ go_public:
+ flash success: "Todas as suas edições agora são públicas, e você está com permissão para edição."
+ make_friend:
+ success: "{{name}} agora é seu amigo."
+ failed: "Desculpe, erro ao adicionar {{name}} como seu amigo."
+ already_a_friend: "Você já é amigo de {{name}}."
+ remove_friend:
+ success: "{{name}} foi removido de seus amigos."
+ not_a_friend: "{{name}} não é um de seus amigos."
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f25c8f47f..544a1d187 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -19,9 +19,9 @@ ru:
old_relation: "СÑаÑое ÐÑноÑение"
old_relation_member: "СÑаÑÑй ÑÑаÑÑник оÑноÑениÑ"
old_relation_tag: "СÑаÑÑй Ñег оÑноÑениÑ"
- old_way: "СÑаÑÑй пÑÑÑ"
- old_way_node: "Узел ÑÑаÑого пÑÑи"
- old_way_tag: "Тег ÑÑаÑого пÑÑи"
+ old_way: "СÑаÑÐ°Ñ Ð»Ð¸Ð½Ð¸Ñ"
+ old_way_node: "Узел ÑÑаÑой линии"
+ old_way_tag: "Тег ÑÑаÑой линии"
relation: "ÐÑноÑение"
relation_member: "УÑаÑÑник оÑноÑениÑ"
relation_tag: "Тег оÑноÑениÑ"
@@ -147,7 +147,7 @@ ru:
manually_select: "ÐÑделиÑÑ Ð´ÑÑгÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ"
loaded_an_area_with_num_features: "ÐÑ Ð·Ð°Ð³ÑÑзили облаÑÑÑ, коÑоÑÐ°Ñ ÑодеÑÐ¶Ð¸Ñ [[num_features]] обÑекÑов. ÐекоÑоÑÑе бÑаÑзеÑÑ Ð¼Ð¾Ð³ÑÑ Ð½Ðµ ÑпÑавиÑÑÑÑ Ñ Ð¾ÑобÑажением Ñакого колиÑеÑÑва даннÑÑ
. ÐбÑÑно бÑаÑзеÑÑ Ð»ÑÑÑего вÑего обÑабаÑÑваÑÑ Ð´Ð¾ 100 обÑекÑов одновÑеменно. ÐагÑÑзка болÑÑего ÑиÑла Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¼ÐµÐ´Ð»Ð¸ÑÑ Ð²Ð°Ñ Ð±ÑаÑÐ·ÐµÑ Ð¸Ð»Ð¸ пÑивеÑÑи к завиÑаниÑ. ÐÑли Ð²Ñ Ð²Ñе Ñавно Ñ
оÑиÑе оÑобÑазиÑÑ ÑÑи даннÑе, нажмиÑе на ÐºÐ½Ð¾Ð¿ÐºÑ Ð½Ð¸Ð¶Ðµ."
load_data: "ÐагÑÑзиÑÑ Ð´Ð°Ð½Ð½Ñе"
- unable_to_load_size: "ÐагÑÑзка невозможна: ÑÐ°Ð·Ð¼ÐµÑ ÐºÐ²Ð°Ð´ÑаÑа [[bbox_size]] â ÑлиÑком болÑÑой (должен бÑÑÑ Ð¼ÐµÐ½ÑÑе {{max_bbox_size}})"
+ unable_to_load_size: "ÐагÑÑзка невозможна: ÑÐ°Ð·Ð¼ÐµÑ ÐºÐ²Ð°Ð´ÑаÑа [[bbox_size]] ÑлиÑком болÑÑой (должен бÑÑÑ Ð¼ÐµÐ½ÑÑе {{max_bbox_size}})"
loading: "ÐагÑÑзка..."
show_history: "ÐоказаÑÑ Ð¸ÑÑоÑиÑ"
wait: "ÐодождиÑе..."
@@ -161,8 +161,8 @@ ru:
nodes: "УзлÑ:"
part_of: "ЯвлÑеÑÑÑ ÑаÑÑÑÑ:"
also_part_of:
- one: "ÑвлÑеÑÑÑ Ñакже ÑаÑÑÑÑ Ð¿ÑÑи {{related_ways}}"
- other: "ÑвлÑеÑÑÑ Ñакже ÑаÑÑÑÑ Ð¿ÑÑей {{related_ways}}"
+ one: "ÑвлÑеÑÑÑ Ñакже ÑаÑÑÑÑ Ð»Ð¸Ð½Ð¸Ð¸ {{related_ways}}"
+ other: "ÑвлÑеÑÑÑ Ñакже ÑаÑÑÑÑ Ð»Ð¸Ð½ÐµÐ¹ {{related_ways}}"
way_history:
way_history: "ÐÑÑоÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ линии"
way_history_title: "ÐÑÑоÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ линии: {{way_name}}"
@@ -249,7 +249,7 @@ ru:
no_such_user:
body: "Ð ÑожалениÑ, полÑзоваÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}} не найден. ÐÑовеÑÑÑе пÑавилÑноÑÑÑ Ð²Ð²Ð¾Ð´Ð°. Ðозможно ÑÑÑлка, по коÑоÑой Ð²Ñ Ð¿ÐµÑеÑли, невеÑна."
diary_entry:
- posted_by: "ÐпÑбликовано полÑзоваÑелем {{link_user}} в {{created}}, ÑзÑк запиÑи â {{language}}"
+ posted_by: "ÐпÑбликовано полÑзоваÑелем {{link_user}} в {{created}}, ÑзÑк запиÑи â {{language_link}}"
comment_link: ÐомменÑиÑоваÑÑ
reply_link: ÐÑвеÑиÑÑ
comment_count:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 95438cc1f..9c09d0b0c 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -5,13 +5,13 @@ sl:
# Translates all the model names, which is used in error handling on the web site
models:
acl: "Access Control List"
- changeset: "Changeset"
+ changeset: "Paket sprememb"
changeset_tag: "Changeset Tag"
- country: "Country"
- diary_comment: "Diary Comment"
- diary_entry: "Diary Entry"
- friend: "Friend"
- language: "Language"
+ country: "Država"
+ diary_comment: "Komentar v dnevniku"
+ diary_entry: "Vpis v dnevnik"
+ friend: "Prijatelj"
+ language: "Jezik"
message: "Message"
node: "Node"
node_tag: "Node Tag"
@@ -24,14 +24,14 @@ sl:
old_way: "Old Way"
old_way_node: "Old Way Node"
old_way_tag: "Old Way Tag"
- relation: "Relation"
+ relation: "Relacija"
relation_member: "Relation Member"
relation_tag: "Relation Tag"
session: "Session"
- trace: "Trace"
- tracepoint: "Trace Point"
- tracetag: "Trace Tag"
- user: "User"
+ trace: "Sled"
+ tracepoint: "ToÄka sledi"
+ tracetag: "Oznaka sledi"
+ user: "Uporabnik"
user_preference: "User Preference"
user_token: "User Token"
way: "Way"
@@ -41,37 +41,37 @@ sl:
# Only the ones that are used on the web site are translated at the moment
attributes:
diary_comment:
- body: "Body"
+ body: "Besedilo"
diary_entry:
- user: "User"
- title: "Title"
- latitude: "Latitude"
- longitude: "Longitude"
- language: "Language"
+ user: "Uporabnik"
+ title: "Naslov"
+ latitude: "Zemljepisna širina"
+ longitude: "Zemljepisna dolžina"
+ language: "Jezik"
friend:
- user: "User"
- friend: "Friend"
+ user: "Uporabnik"
+ friend: "Prijatelj"
trace:
- user: "User"
- visible: "Visible"
- name: "Name"
- size: "Size"
- latitude: "Latitude"
- longitude: "Longitude"
- public: "Public"
- description: "Description"
+ user: "Uporabnik"
+ visible: "Vidnost sledi"
+ name: "Ime"
+ size: "Velikost"
+ latitude: "Zemljepisna širina"
+ longitude: "Zemljepisna dolžina"
+ public: "Javnost sledi"
+ description: "Opis"
message:
- sender: "Sender"
- title: "Title"
- body: "Body"
- recipient: "Recipient"
+ sender: "Pošiljatelj"
+ title: "Naslov"
+ body: "Besedilo"
+ recipient: "Prejemnik"
user:
- email: "Email"
+ email: "Naslov e-pošte"
active: "Active"
- display_name: "Display Name"
- description: "Description"
- languages: "Languages"
- pass_crypt: "Password"
+ display_name: "Prikazno ime"
+ description: "Opis"
+ languages: "Jeziki"
+ pass_crypt: "Geslo"
map:
view: Zemljevid
edit: Urejanje
@@ -234,7 +234,7 @@ sl:
list:
recent_changes: "Nedavne spremembe"
recently_edited_changesets: "Nedavno urejeni paketi sprememb:"
- for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+ for_more_changesets: "Za veÄ sprememb izberite uporabnika in poglejte njegove spremembe ali pa med ogledom zemljevida nekega podroÄja preklopite na zavihek 'zgodovina'."
list_user:
edits_by_username: "Spremembe uporabnika {{username_link}}"
no_visible_edits_by: "Ni vidnih sprememb uporabnika {{name}}."
@@ -245,7 +245,8 @@ sl:
title: Nov zapis v dnevnik uporabnikov
list:
title: "Dnevniki uporabnikov"
- user_title: "Dnavnik uporabnika {{user}}"
+ user_title: "Dnevnik uporabnika {{user}}"
+ in_language_title: "Dnevniki v jeziku {{language}}"
new: Nov zapis v dnevnik uporabnikov
new_title: Napišite nov zapis v vaš uporabniški dnevnik
no_entries: Ni zapisov v dnevnik
@@ -265,7 +266,7 @@ sl:
marker_text: Lokacija, na katero se nanaša zapis
view:
title: "Dnevnik uporabnika {{user}}"
- user_title: "Dnavnik uporabnika {{user}}"
+ user_title: "Dnevnik uporabnika {{user}}"
leave_a_comment: "Napiši komentar"
login_to_leave_a_comment: "{{login_link}} za vpis komentarja"
login: "Prijavite se"
@@ -278,7 +279,7 @@ sl:
heading: "Uporabnik {{user}} ne obstaja"
body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili."
diary_entry:
- posted_by: "Objavil {{link_user}} ob {{created}} v jeziku {{language}}"
+ posted_by: "Objavil {{link_user}} ob {{created}} v jeziku {{language_link}}"
comment_link: Komentiraj ta vnos
reply_link: Odgovori na ta vnos
comment_count:
@@ -619,7 +620,7 @@ sl:
delete:
scheduled_for_deletion: "Sled bo izbrisana"
make_public:
- made_public: "Sled je postala javno"
+ made_public: "Sled je postala javna"
user:
login:
title: "Prijava"
@@ -657,7 +658,7 @@ sl:
password: "Geslo: "
confirm password: "Potrdite geslo: "
signup: "Želim se vpisati"
- flash create success message: "UporabniÅ¡ki raÄun narejen. Preverite vaÅ¡ poÅ¡tni predal s sporoÄilom za potrditev, and you\'ll be mapping in no time :-)
Please note that you won't be able to login until you've received and confirmed your email address.
If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+ flash create success message: "UporabniÅ¡ki raÄun narejen. Preverite vaÅ¡ poÅ¡tni predal s sporoÄilom za potrditev in že boste lahko kartirali :-)
Prosimo, upoÅ¡tevajte, da prijava v sistem ne bo mogoÄa dokler ne potrdite svojega e-poÅ¡tnega naslova.
V kolikor vaÅ¡ filter neželene poÅ¡te (anti spam filter) pred sprejemom sporoÄil neznanih poÅ¡iljateljev zahteva potrditev vas prosimo, da poÅ¡iljatelja webmaster@openstreetmap.org uvrstite na seznam dovoljenih poÅ¡iljateljev. Sistem paÄ ne zmore dovolj inteligentno odgovarjati na vse take zahtevke."
no_such_user:
title: "Ni tega uporabnika"
heading: "Uporabnik {{user}} ne obstaja"
@@ -675,7 +676,7 @@ sl:
remove as friend: odstrani izmed prijateljev
add as friend: dodaj med prijatelje
mapper since: "Kartograf od: "
- ago: "(pred {{time_in_words_ago}})"
+ ago: "({{time_in_words_ago}} nazaj)"
user image heading: Slika uporabnika
delete image: Izbriši sliko
upload an image: Objavite sliko
diff --git a/config/locales/yo.yml b/config/locales/yo.yml
new file mode 100644
index 000000000..e55c44e96
--- /dev/null
+++ b/config/locales/yo.yml
@@ -0,0 +1,765 @@
+yo:
+ html:
+ dir: ltr
+ activerecord:
+ # Translates all the model names, which is used in error handling on the web site
+ models:
+ acl: "Access Control List"
+ changeset: "Changeset"
+ changeset_tag: "Changeset Tag"
+ country: "Orile Ede"
+ diary_comment: "Diary Comment"
+ diary_entry: "Diary Entry"
+ friend: "Ore"
+ language: "Ede"
+ message: "ihinoroiye riran"
+ node: "Node"
+ node_tag: "Node Tag"
+ notifier: "Notifier"
+ old_node: "Old Node"
+ old_node_tag: "Old Node Tag"
+ old_relation: "ìsötà n agba"
+ old_relation_member: "aráìbátançbÃiyèkan agba"
+ old_relation_tag: "Old Relation Tag"
+ old_way: "Old Way"
+ old_way_node: "Old Way Node"
+ old_way_tag: "Old Way Tag"
+ relation: "ìsötà n"
+ relation_member: "aráìbátançbÃiyèkan"
+ relation_tag: "Relation Tag"
+ session: "ìjokòó à wñn onÃdà ájô"
+ trace: "Trace"
+ tracepoint: "Trace Point"
+ tracetag: "Trace Tag"
+ user: "Oniti nlo nykan"
+ user_preference: "User Preference"
+ user_token: "User Token"
+ way: "Way"
+ way_node: "Way Node"
+ way_tag: "Way Tag"
+ # Translates all the model attributes, which is used in error handling on the web site
+ # Only the ones that are used on the web site are translated at the moment
+ attributes:
+ diary_comment:
+ body: "Ara"
+ diary_entry:
+ user: "User"
+ title: "oyéorúkôà mì ìdá nkan sötõorÃkì"
+ latitude: "Latitude"
+ longitude: "Longitude"
+ language: "Ede"
+ friend:
+ user: "User"
+ friend: "Ore"
+ trace:
+ user: "User"
+ visible: "Visible"
+ name: "Name"
+ size: "Size"
+ latitude: "Latitude"
+ longitude: "Longitude"
+ public: "Public"
+ description: "Description"
+ message:
+ sender: "Sender"
+ title: "Title"
+ body: "Body"
+ recipient: "Recipient"
+ user:
+ email: "Email"
+ active: "Active"
+ display_name: "Display Name"
+ description: "Description"
+ languages: "Ede"
+ pass_crypt: "Password"
+ map:
+ view: View
+ edit: Edit
+ coordinates: "Coordinates:"
+ browse:
+ changeset:
+ title: "Changeset"
+ changeset: "Changeset:"
+ download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+ changesetxml: "Changeset XML"
+ osmchangexml: "osmChange XML"
+ changeset_details:
+ created_at: "Created at:"
+ closed_at: "Closed at:"
+ belongs_to: "Belongs to:"
+ bounding_box: "Bounding box:"
+ no_bounding_box: "No bounding box has been stored for this changeset."
+ show_area_box: "Show Area Box"
+ box: "box"
+ has_nodes: "Has the following {{count}} nodes:"
+ has_ways: "Has the following {{count}} ways:"
+ has_relations: "Has the following {{count}} relations:"
+ common_details:
+ edited_at: "Edited at:"
+ edited_by: "Edited by:"
+ version: "Version:"
+ in_changeset: "In changeset:"
+ containing_relation:
+ relation: "Relation {{relation_name}}"
+ relation_as: "(as {{relation_role}})"
+ map:
+ loading: "Loading..."
+ deleted: "Deleted"
+ view_larger_map: "View Larger Map"
+ node_details:
+ coordinates: "Coordinates: "
+ part_of: "Part of:"
+ node_history:
+ node_history: "Node History"
+ download: "{{download_xml_link}} or {{view_details_link}}"
+ download_xml: "Download XML"
+ view_details: "view details"
+ node:
+ node: "Node"
+ node_title: "Node: {{node_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "Download XML"
+ view_history: "view history"
+ not_found:
+ sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
+ type:
+ node: node
+ way: way
+ relation: relation
+ paging_nav:
+ showing_page: "Showing page"
+ of: "of"
+ relation_details:
+ members: "Members:"
+ part_of: "Part of:"
+ relation_history:
+ relation_history: "Relation History"
+ relation_history_title: "Relation History: {{relation_name}}"
+ relation_member:
+ as: "as"
+ relation:
+ relation: "Relation"
+ relation_title: "Relation: {{relation_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "Download XML"
+ view_history: "view history"
+ start:
+ view_data: "View data for current map view"
+ manually_select: "Manually select a different area"
+ start_rjs:
+ data_layer_name: "Data"
+ data_frame_title: "Data"
+ zoom_or_select: "Zoom in or select an area of the map to view"
+ drag_a_box: "Drag a box on the map to select an area"
+ manually_select: "Manually select a different area"
+ loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+ load_data: "Load Data"
+ unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
+ loading: "Loading..."
+ show_history: "Show History"
+ wait: "Wait..."
+ history_for_feature: "History for [[feature]]"
+ details: "Details"
+ private_user: "private user"
+ edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+ object_list:
+ heading: "Object list"
+ back: "Display object list"
+ type:
+ node: "Node"
+ way: "Way"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ api: "Retrieve this area from the API"
+ details: "Details"
+ selected:
+ type:
+ node: "Node [[id]]"
+ way: "Way [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ history:
+ type:
+ node: "Node [[id]]"
+ way: "Way [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ tag_details:
+ tags: "Tags:"
+ way_details:
+ nodes: "Nodes:"
+ part_of: "Part of:"
+ also_part_of:
+ one: "also part of way {{related_ways}}"
+ other: "also part of ways {{related_ways}}"
+ way_history:
+ way_history: "Way History"
+ way_history_title: "Way History: {{way_name}}"
+ download: "{{download_xml_link}} or {{view_details_link}}"
+ download_xml: "Download XML"
+ view_details: "view details"
+ way:
+ way: "Way"
+ way_title: "Way: {{way_name}}"
+ download: "{{download_xml_link}} or {{view_history_link}}"
+ download_xml: "Download XML"
+ view_history: "view history"
+ changeset:
+ changeset_paging_nav:
+ showing_page: "Showing page"
+ of: "of"
+ changeset:
+ still_editing: "(still editing)"
+ anonymous: "Anonymous"
+ no_comment: "(none)"
+ no_edits: "(no edits)"
+ show_area_box: "show area box"
+ big_area: "(big)"
+ view_changeset_details: "View changeset details"
+ more: "more"
+ changesets:
+ id: "ID"
+ saved_at: "Saved at"
+ user: "User"
+ comment: "Comment"
+ area: "Area"
+ list_bbox:
+ history: "History"
+ changesets_within_the_area: "Changesets within the area:"
+ show_area_box: "show area box"
+ no_changesets: "No changesets"
+ all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+ recent_changes: "Recent Changes"
+ no_area_specified: "No area specified"
+ first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
+ view_the_map: "view the map"
+ view_tab: "view tab"
+ alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+ list:
+ recent_changes: "Recent Changes"
+ recently_edited_changesets: "Recently edited changesets:"
+ for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+ list_user:
+ edits_by_username: "Edits by {{username_link}}"
+ no_visible_edits_by: "No visible edits by {{name}}."
+ for_all_changes: "For changes by all users see {{recent_changes_link}}"
+ recent_changes: "Recent Changes"
+ diary_entry:
+ new:
+ title: New Diary Entry
+ list:
+ title: "Users' diaries"
+ user_title: "{{user}}'s diary"
+ in_language_title: "Diary Entries in {{language}}"
+ new: New Diary Entry
+ new_title: Compose a new entry in your user diary
+ no_entries: No diary entries
+ recent_entries: "Recent diary entries: "
+ older_entries: Older Entries
+ newer_entries: Newer Entries
+ edit:
+ title: "Edit diary entry"
+ subject: "Subject: "
+ body: "Body: "
+ language: "Language: "
+ location: "Location: "
+ latitude: "Latitude: "
+ longitude: "Longitude: "
+ use_map_link: "use map"
+ save_button: "Save"
+ marker_text: Diary entry location
+ view:
+ title: "Users' diaries | {{user}}"
+ user_title: "{{user}}'s diary"
+ leave_a_comment: "Leave a comment"
+ login_to_leave_a_comment: "{{login_link}} to leave a comment"
+ login: "Login"
+ save_button: "Save"
+ no_such_entry:
+ heading: "No entry with the id: {{id}}"
+ body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+ no_such_user:
+ title: "No such user"
+ heading: "The user {{user}} does not exist"
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ diary_entry:
+ posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
+ comment_link: Comment on this entry
+ reply_link: Reply to this entry
+ comment_count:
+ one: 1 comment
+ other: "{{count}} comments"
+ edit_link: Edit this entry
+ diary_comment:
+ comment_from: "Comment from {{link_user}} at {{comment_created_at}}"
+ export:
+ start:
+ area_to_export: "Area to Export"
+ manually_select: "Manually select a different area"
+ format_to_export: "Format to Export"
+ osm_xml_data: "OpenStreetMap XML Data"
+ mapnik_image: "Mapnik Image"
+ osmarender_image: "Osmarender Image"
+ embeddable_html: "Embeddable HTML"
+ licence: "Licence"
+ export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
+ options: "Options"
+ format: "Format"
+ scale: "Scale"
+ max: "max"
+ image_size: "Image Size"
+ zoom: "Zoom"
+ add_marker: "Add a marker to the map"
+ latitude: "Lat:"
+ longitude: "Lon:"
+ output: "Output"
+ paste_html: "Paste HTML to embed in website"
+ export_button: "Export"
+ start_rjs:
+ export: "Export"
+ drag_a_box: "Drag a box on the map to select an area"
+ manually_select: "Manually select a different area"
+ click_add_marker: "Click on the map to add a marker"
+ change_marker: "Change marker position"
+ add_marker: "Add a marker to the map"
+ view_larger_map: "View Larger Map"
+ geocoder:
+ results:
+ results: "Results"
+ type_from_source: "{{type}} from {{source_link}}"
+ no_results: "No results found"
+ layouts:
+ project_name:
+ # in
+ title: OpenStreetMap
+ # in
+ h1: OpenStreetMap
+ logo:
+ alt_text: OpenStreetMap logo
+ welcome_user: "Welcome, {{user_link}}"
+ welcome_user_link_tooltip: Your user page
+ home: home
+ home_tooltip: Go to home location
+ inbox: "inbox ({{count}})"
+ inbox_tooltip:
+ zero: Your inbox contains no unread messages
+ one: Your inbox contians 1 unread message
+ other: Your inbox contains {{count}} unread messages
+ logout: logout
+ logout_tooltip: "Log out"
+ log_in: log in
+ log_in_tooltip: Log in with an existing account
+ sign_up: sign up
+ sign_up_tooltip: Create an account for editing
+ view: View
+ view_tooltip: View maps
+ edit: Edit
+ edit_tooltip: Edit maps
+ history: History
+ history_tooltip: Changeset history
+ export: Export
+ export_tooltip: Export map data
+ gps_traces: GPS Traces
+ gps_traces_tooltip: Manage traces
+ user_diaries: User Diaries
+ user_diaries_tooltip: View user diaries
+ tag_line: The Free Wiki World Map
+ intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
+ intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
+ intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+ intro_3_ucl: "UCL VR Centre"
+ intro_3_bytemark: "bytemark"
+ osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
+ osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
+ donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
+ donate_link_text: donating
+ help_wiki: "Help & Wiki"
+ help_wiki_tooltip: "Help & Wiki site for the project"
+ help_wiki_url: "http://wiki.openstreetmap.org"
+ news_blog: "News blog"
+ news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
+ shop: Shop
+ shop_tooltip: Shop with branded OpenStreetMap
+ shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
+ sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+ alt_donation: Make a Donation
+ notifier:
+ diary_comment_notification:
+ subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+ banner1: "* Please do not reply to this email. *"
+ banner2: "* Use the OpenStreetMap web site to reply. *"
+ hi: "Hi {{to_user}},"
+ header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
+ footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+ message_notification:
+ subject: "[OpenStreetMap] {{user}} sent you a new message"
+ banner1: "* Please do not reply to this email. *"
+ banner2: "* Use the OpenStreetMap web site to reply. *"
+ hi: "Hi {{to_user}},"
+ header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
+ footer1: "You can also read the message at {{readurl}}"
+ footer2: "and you can reply at {{replyurl}}"
+ friend_notification:
+ subject: "[OpenStreetMap] {{user}} added you as a friend"
+ had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+ see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+ gpx_notification:
+ greeting: "Hi,"
+ your_gpx_file: "It looks like your GPX file"
+ with_description: "with the description"
+ and_the_tags: "and the following tags:"
+ and_no_tags: "and no tags."
+ failure:
+ subject: "[OpenStreetMap] GPX Import failure"
+ failed_to_import: "failed to import. Here's the error:"
+ more_info_1: "More information about GPX import failures and how to avoid"
+ more_info_2: "them can be found at:"
+ import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+ success:
+ subject: "[OpenStreetMap] GPX Import success"
+ loaded_successfully: |
+ loaded successfully with {{trace_points}} out of a possible
+ {{possible_points}} points.
+ signup_confirm:
+ subject: "[OpenStreetMap] Confirm your email address"
+ signup_confirm_plain:
+ greeting: "Hi there!"
+ hopefully_you: "Someone (hopefully you) would like to create an account over at"
+ # next two translations run-on : please word wrap appropriately
+ click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
+ click_the_link_2: "account and read on for more information about OpenStreetMap."
+ introductory_video: "You can watch an introductory video to OpenStreetMap here:"
+ more_videos: "There are more videos here:"
+ the_wiki: "Get reading about OpenStreetMap on the wiki:"
+ the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
+ opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+ wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+ wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
+ # next four translations are in pairs : please word wrap appropriately
+ user_wiki_1: "It is recommended that you create a user wiki page, which includes"
+ user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+ current_user_1: "A list of current users in categories, based on where in the world"
+ current_user_2: "they are, is available from:"
+ signup_confirm_html:
+ greeting: "Hi there!"
+ hopefully_you: "Someone (hopefully you) would like to create an account over at"
+ click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
+ introductory_video: "You can watch an {{introductory_video_link}}."
+ video_to_openstreetmap: "introductory video to OpenStreetMap"
+ more_videos: "There are {{more_videos_link}}."
+ more_videos_here: "more videos here"
+ get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!'
+ wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.'
+ user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].'
+ current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.'
+ email_confirm:
+ subject: "[OpenStreetMap] Confirm your email address"
+ email_confirm_plain:
+ greeting: "Hi,"
+ hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
+ hopefully_you_2: "{{server_url}} to {{new_address}}."
+ click_the_link: "If this is you, please click the link below to confirm the change."
+ email_confirm_html:
+ greeting: "Hi,"
+ hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
+ click_the_link: "If this is you, please click the link below to confirm the change."
+ lost_password:
+ subject: "[OpenStreetMap] Password reset request"
+ lost_password_plain:
+ greeting: "Hi,"
+ hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
+ hopefully_you_2: "email addresses openstreetmap.org account."
+ click_the_link: "If this is you, please click the link below to reset your password."
+ lost_password_html:
+ greeting: "Hi,"
+ hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
+ click_the_link: "If this is you, please click the link below to reset your password."
+ reset_password:
+ subject: "[OpenStreetMap] Password reset"
+ reset_password_plain:
+ greeting: "Hi,"
+ reset: "Your password has been reset to {{new_password}}"
+ reset_password_html:
+ greeting: "Hi,"
+ reset: "Your password has been reset to {{new_password}}"
+ message:
+ inbox:
+ title: "Inbox"
+ my_inbox: "My inbox"
+ outbox: "outbox"
+ you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
+ from: "From"
+ subject: "Subject"
+ date: "Date"
+ no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+ people_mapping_nearby: "people mapping nearby"
+ message_summary:
+ unread_button: "Mark as unread"
+ read_button: "Mark as read"
+ reply_button: "Reply"
+ new:
+ title: "Send message"
+ send_message_to: "Send a new message to {{name}}"
+ subject: "Subject"
+ body: "Body"
+ send_button: "Send"
+ back_to_inbox: "Back to inbox"
+ message_sent: "Message sent"
+ no_such_user:
+ title: "No such user or message"
+ heading: "No such user or message"
+ body: "Sorry there is no user or message with that name or id"
+ outbox:
+ title: "Outbox"
+ my_inbox: "My {{inbox_link}}"
+ inbox: "inbox"
+ outbox: "outbox"
+ you_have_sent_messages: "You have {{sent_count}} sent messages"
+ to: "To"
+ subject: "Subject"
+ date: "Date"
+ no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+ people_mapping_nearby: "people mapping nearby"
+ read:
+ title: "Read message"
+ reading_your_messages: "Reading your messages"
+ from: "From"
+ subject: "Subject"
+ date: "Date"
+ reply_button: "Reply"
+ unread_button: "Mark as unread"
+ back_to_inbox: "Back to inbox"
+ reading_your_sent_messages: "Reading your sent messages"
+ to: "To"
+ back_to_outbox: "Back to outbox"
+ mark:
+ as_read: "Message marked as read"
+ as_unread: "Message marked as unread"
+ site:
+ index:
+ js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
+ js_2: "OpenStreetMap uses javascript for its slippy map."
+ js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.'
+ permalink: Permalink
+ license:
+ notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+ license_name: "Creative Commons Attribution-Share Alike 2.0"
+ license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+ project_name: "OpenStreetMap project"
+ project_url: "http://openstreetmap.org"
+ edit:
+ not_public: "You haven't set your edits to be public."
+ not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+ user_page_link: user page
+ anon_edits: "({{link}})"
+ anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ anon_edits_link_text: "Find out why this is the case."
+ flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.'
+ potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+ sidebar:
+ search_results: Search Results
+ close: Close
+ search:
+ search: Search
+ where_am_i: "Where am I?"
+ submit_text: "Go"
+ searching: "Searching..."
+ search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
+ key:
+ map_key: "Map key"
+ map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
+ trace:
+ create:
+ upload_trace: "Upload GPS Trace"
+ trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+ edit:
+ filename: "Filename:"
+ uploaded_at: "Uploaded at:"
+ points: "Points:"
+ start_coord: "Start coordinate:"
+ edit: "edit"
+ owner: "Owner:"
+ description: "Description:"
+ tags: "Tags:"
+ save_button: "Save Changes"
+ no_such_user:
+ title: "No such user"
+ heading: "The user {{user}} does not exist"
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ trace_form:
+ upload_gpx: "Upload GPX File"
+ description: "Description"
+ tags: "Tags"
+ public: "Public?"
+ upload_button: "Upload"
+ help: "Help"
+ help_url: "http://wiki.openstreetmap.org/wiki/Upload"
+ trace_header:
+ see_just_your_traces: "See just your traces, or upload a trace"
+ see_all_traces: "See all traces"
+ see_your_traces: "See all your traces"
+ traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+ trace_optionals:
+ tags: "Tags"
+ view:
+ pending: "PENDING"
+ filename: "Filename:"
+ download: "download"
+ uploaded: "Uploaded at:"
+ points: "Points:"
+ start_coordinates: "Start coordinate:"
+ map: "map"
+ edit: "edit"
+ owner: "Owner:"
+ description: "Description:"
+ tags: "Tags"
+ none: "None"
+ make_public: "Make this track public permanently"
+ edit_track: "Edit this track"
+ delete_track: "Delete this track"
+ viewing_trace: "Viewing trace {{name}}"
+ trace_not_found: "Trace not found!"
+ trace_paging_nav:
+ showing: "Showing page"
+ of: "of"
+ trace:
+ pending: "PENDING"
+ count_points: "{{count}} points"
+ ago: "{{time_in_words_ago}} ago"
+ more: "more"
+ trace_details: "View Trace Details"
+ view_map: "View Map"
+ edit: "edit"
+ edit_map: "Edit Map"
+ public: "PUBLIC"
+ private: "PRIVATE"
+ by: "by"
+ in: "in"
+ map: "map"
+ list:
+ public_traces: "Public GPS traces"
+ your_traces: "Your GPS traces"
+ public_traces_from: "Public GPS traces from {{user}}"
+ tagged_with: " tagged with {{tags}}"
+ delete:
+ scheduled_for_deletion: "Track scheduled for deletion"
+ make_public:
+ made_public: "Track made public"
+ user:
+ login:
+ title: "Login"
+ heading: "Login"
+ please login: "Please login or {{create_user_link}}."
+ create_account: "create an account"
+ email or username: "Email Address or Username: "
+ password: "Password: "
+ lost password link: "Lost your password?"
+ login_button: "Login"
+ account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account."
+ auth failure: "Sorry, couldn't log in with those details."
+ lost_password:
+ title: "lost password"
+ heading: "Forgotten Password?"
+ email address: "Email Address:"
+ new password button: "Send me a new password"
+ notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+ notice email cannot find: "Couldn't find that email address, sorry."
+ reset_password:
+ title: "reset password"
+ flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+ flash token bad: "Didn't find that token, check the URL maybe?"
+ new:
+ title: "Create account"
+ heading: "Create a User Account"
+ no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
+ contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
+ fill_form: "Fill in the form and we'll send you a quick email to activate your account."
+ license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
+ email address: "Email Address: "
+ confirm email address: "Confirm Email Address: "
+ not displayed publicly: 'Not displayed publicly (see privacy policy)'
+ display name: "Display Name: "
+ password: "Password: "
+ confirm password: "Confirm Password: "
+ signup: Signup
+ flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)
Please note that you won't be able to login until you've received and confirmed your email address.
If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+ no_such_user:
+ title: "No such user"
+ heading: "The user {{user}} does not exist"
+ body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+ view:
+ my diary: my diary
+ new diary entry: new diary entry
+ my edits: my edits
+ my traces: my traces
+ my settings: my settings
+ send message: send message
+ diary: diary
+ edits: edits
+ traces: traces
+ remove as friend: remove as friend
+ add as friend: add as friend
+ mapper since: "Mapper since: "
+ ago: "({{time_in_words_ago}} ago)"
+ user image heading: User image
+ delete image: Delete Image
+ upload an image: Upload an image
+ add image: Add Image
+ description: Description
+ user location: User location
+ no home location: "No home location has been set."
+ if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
+ settings_link_text: settings
+ your friends: Your friends
+ no friends: You have not added any friends yet.
+ km away: "{{count}}km away"
+ nearby users: "Nearby users: "
+ no nearby users: "There are no users who admit to mapping nearby yet."
+ change your settings: change your settings
+ friend_map:
+ your location: Your location
+ nearby mapper: "Nearby mapper: "
+ account:
+ title: "Edit account"
+ my settings: My settings
+ email never displayed publicly: "(never displayed publicly)"
+ public editing:
+ heading: "Public editing: "
+ enabled: "Enabled. Not anonymous and can edit data."
+ enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ enabled link text: "what's this?"
+ disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+ disabled link text: "why can't I edit?"
+ profile description: "Profile Description: "
+ preferred languages: "Preferred Languages: "
+ home location: "Home Location: "
+ no home location: "You have not entered your home location."
+ latitude: "Latitude: "
+ longitude: "Longitude: "
+ update home location on click: "Update home location when I click on the map?"
+ save changes button: Save Changes
+ make edits public button: Make all my edits public
+ return to profile: Return to profile
+ flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
+ flash update success: "User information updated successfully."
+ confirm:
+ heading: Confirm a user account
+ press confirm button: "Press the confirm button below to activate your account."
+ button: Confirm
+ success: "Confirmed your account, thanks for signing up!"
+ failure: "A user account with this token has already been confirmed."
+ confirm_email:
+ heading: Confirm a change of email address
+ press confirm button: "Press the confirm button below to confirm your new email address."
+ button: Confirm
+ success: "Confirmed your email address, thanks for signing up!"
+ failure: "An email address has already been confirmed with this token."
+ set_home:
+ flash success: "Home location saved successfully"
+ go_public:
+ flash success: "All your edits are now public, and you are now allowed to edit."
+ make_friend:
+ success: "{{name}} is now your friend."
+ failed: "Sorry, failed to add {{name}} as a friend."
+ already_a_friend: "You are already friends with {{name}}."
+ remove_friend:
+ success: "{{name}} was removed from your friends."
+ not_a_friend: "{{name}} is not one of your friends."
+
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d9a32c642..f82200561 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -19,9 +19,9 @@ zh-CN:
old_relation: "æ§å
³ç³»"
old_relation_member: "æ§å
³ç³»å¯¹è±¡"
old_relation_tag: "æ§å
³ç³»æ ç¾"
- old_way: ""
- old_way_node: "æ§è·¯ç»ç»ç¹"
- old_way_tag: "æ§è·¯ç»æ ç¾"
+ old_way: "æ§è·¯å¾"
+ old_way_node: "æ§è·¯å¾ç»ç¹"
+ old_way_tag: "æ§è·¯å¾æ ç¾"
relation: "å
³ç³»"
relation_member: "å
³ç³»å¯¹è±¡"
relation_tag: "å
³ç³»æ ç¾"
@@ -71,8 +71,8 @@ zh-CN:
languages: "è¯è¨"
pass_crypt: "å¯ç "
map:
- view: View
- edit: Edit
+ view: "æ¥ç"
+ edit: "ç¼è¾"
coordinates: "åæ :"
browse:
changeset:
@@ -120,6 +120,10 @@ zh-CN:
view_history: "æ¥çåå²"
not_found:
sorry: "æ±æ, æ æ³æ¾å°id为{{id}}çç±»å{{type}}ã"
+ type:
+ node: "ç»ç¹"
+ way: "è·¯å¾"
+ relation: "å
³ç³»"
paging_nav:
showing_page: "æ¾ç¤ºç½é¡µ"
of: "of"
@@ -245,9 +249,11 @@ zh-CN:
heading: "å
³äºæ¤id: {{id}}æ²¡ææ¡ç®"
body: "æ±æï¼ æ²¡æå
³äºæ¤id {{id}}çæ¥è®°æ¡ç®æè
è¯è®ºãè¯·æ£æ¥æ¼åï¼æè
æ¨ç¹å»ç龿¥æè¯¯ã"
no_such_user:
+ title: "没æè¿ä¸ªç¨æ·"
+ heading: "æ¤ç¨æ·{{user}}ä¸åå¨"
body: "æ±æï¼æ²¡æåå«{{user}}çç¨æ·ãè¯·æ£æ¥æ¼åï¼æè
æ¨ç¹å»ç龿¥æè¯¯ã"
diary_entry:
- posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+ posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
comment_link: å
³äºæ¤ç¯è¯è®º
reply_link: 对æ¤ç¯è¿è¡åå¤
comment_count:
@@ -294,17 +300,32 @@ zh-CN:
no_results: "没æåç°ç»æ"
layouts:
welcome_user: "欢è¿, {{user_link}}"
- home: "home"
- inbox: "inbox ({{count}})"
+ welcome_user_link_tooltip: "æ¨çç¨æ·é¡µé¢"
+ home: "主页"
+ home_tooltip: "åå°ä¸»é¡µä½ç½®"
+ inbox: "æ¶ä»¶ç®± ({{count}})"
+ inbox_tooltip:
+ zero: "æ¨çæ¶ä»¶ç®±æ²¡ææªè¯»æ¶æ¯"
+ one: "æ¨çæ¶ä»¶ç®±æ1å°æªè¯»æ¶æ¯"
+ other: "æ¨çæ¶ä»¶ç®±æ{{count}}å°æªè¯»æ¶æ¯"
logout: éåº
+ logout_tooltip: "éåº"
log_in: ç»é
+ log_in_tooltip: "ç¨å·²åå¨è´¦æ·ç»é"
sign_up: 注å
+ sign_up_tooltip: "å建ä¸ä¸ªå¯ç¼è¾è´¦æ·"
view: æ¥ç
+ view_tooltip: "æ¥çå°å¾"
edit: ç¼è¾
+ edit_tooltip: "ç¼è¾å°å¾"
history: åå²
+ history_tooltip: "Changesetåå²"
export: è¾åº
+ export_tooltip: "è¾åºå°å¾æ°æ®"
gps_traces: GPS 追踪
+ gps_traces_tooltip: "管ç追踪"
user_diaries: ç¨æ·æ¥å¿
+ user_diaries_tooltip: "æ¥çç¨æ·æ¥å¿"
tag_line: å
费维åºä¸çå°å¾
intro_1: "OpenStreetMapæ¯ä¸ä¸ªå¯ä¾èªç±ç¼è¾çä¸çå°å¾ï¼å®æ¯ç±åæ¨è¿æ ·çç¨æ·åé ç"
intro_2: "OpenStreetMapå
è®¸æ¨æ¥çï¼ç¼è¾æè
使ç¨ä¸çåå°çå°çæ°æ®æ¥å¸®å©æ¨ã"
@@ -315,6 +336,7 @@ zh-CN:
donate_link_text: ææ¬¾
help_wiki: "å¸®å© & Wiki"
news_blog: "æ°é»å客"
+ news_blog_tooltip: "å
³äºOpenStreetMapçæ°é»å客ï¼å
è´¹å°çæ°æ®ççã"
shop: Shop
sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
alt_donation: ææ¬¾
@@ -325,9 +347,20 @@ zh-CN:
hi: "æ¨å¥½ {{to_user}},"
header: "{{from_user}}éè¿æ é¢{{subject}}å¯¹æ¨æè¿çOpenStreetMapæ¥å¿æ¡ç®è¿è¡è¯è®ºã"
footer: "æ¨ä¹å¯ä»¥éè¿{{readurl}}æ¥è¯»åè¯è®ºï¼å¹¶ä¸å¨{{commenturl}}æ¥æ°åè¯è®ºæè
éè¿{{replyurl}}åå¤"
+ message_notification:
+ subject: "[OpenStreetMap] {{user}}ç»æ¨åéæ°æ¶æ¯"
+ banner1: "*请å¿å夿¤é®ä»¶ã*"
+ banner2: "* 使ç¨OpenStreetMapç½ç«åå¤ã*"
+ hi: "æ¨å¥½{{to_user}},"
+ header: "{{from_user}}å·²ç»éè¿OpenStreetMap忍åéæ é¢ä¸º{{subject}}çæ¶æ¯:"
+ footer1: "æ¨å¯ä»¥å¨{{replyurl}}é
è¯»è¿æ¡æ¶æ¯"
+ footer2: "并䏿¨å¯ä»¥å¨{{replyurl}}åå¤"
friend_notification:
+ subject: "[OpenStreetMap] {{user}}å·²å æ¨ä¸ºå¥½å"
had_added_you: "{{user}}å·²ç»å¨Openstreetmapä¸å æ¨ä¸ºå¥½åã"
see_their_profile: "æ¨å¯ä»¥å¨{{userurl}}䏿¥çä»ä»¬ç个人信æ¯ï¼å¹¶ä¸å¦ææ¨æ¿æï¼å¯ä»¥å°ä»ä»¬å 为æ¨ç好åã"
+ gpx_notification:
+ greeting: "æ¨å¥½ï¼"
signup_confirm_plain:
greeting: "æ¨å¥½!"
hopefully_you: "æäººï¼æ¨ï¼å¸æå建ä¸ä¸ªè´¦å·"
@@ -508,6 +541,7 @@ zh-CN:
made_public: "å
¬å¼åè·¯å¾"
user:
login:
+ title: "ç»é"
heading: "ç»é"
please login: "请ç»éæ{{create_user_link}}."
create_account: "å建ä¸ä¸ªè´¦æ·"
@@ -515,6 +549,8 @@ zh-CN:
password: "å¯ç : "
lost password link: "æ¾åå¯ç ?"
login_button: "ç»é"
+ account not active: "æ±æï¼æ¨çè´¦æ·å°æªæ¿æ´»ã
请ç¹å»å¨è´¦æ·ç¡®è®¤é®ä»¶ä¸ç龿¥æ¥æ¿æ´»æ¨çè´¦æ·ã"
+ auth failure: "æ±æï¼åè¿äºä¿¡æ¯æ¨æ æ³ç»éã"
lost_password:
title: "丢失å¯ç "
heading: "å¿è®°å¯ç ?"
@@ -541,6 +577,8 @@ zh-CN:
signup: 注å
flash create success message: "æååå»ºç¨æ·ãæ¥ç确认é®ä»¶ï¼Check your email for a confirmation note, and you\'ll be mapping in no time :-)
è¯·æ³¨ææ¨å°ä¸è½ç»éç´å°æ¨æ¶å°å¹¶ç¡®è®¤æ¨çé®ç®±å°åã
妿æ¨ä½¿ç¨ååå¾ç³»ç»åé确认请æ±ï¼è¯·ä¿è¯å°webmaster@openstreetmap.orgåå
¥å好ååï¼å 为æä»¬ä¸è½åå¤ä»»ä½ç¡®è®¤è¯·æ±ã"
no_such_user:
+ title: "æ²¡ææ¤ç¨æ·"
+ heading: "è¿ä¸ªç¨æ·{{user}} ä¸åå¨"
body: "对ä¸èµ·ï¼æ²¡ææ¤å{{user}}æå¯¹åºçç¨æ·ãè¯·æ£æ¥æ¨çæ¼åï¼æè
å¯è½æ¨ç¹å»äºéè¯¯é¾æ¥ã"
view:
my diary: æçæ¥å¿
@@ -575,6 +613,7 @@ zh-CN:
your location: æ¨çä½ç½®
nearby mapper: "éè¿ç¨æ·: "
account:
+ title: "ç¼è¾è´¦æ·"
my settings: æç设置
email never displayed publicly: "(ä»ä¸å
¬å¼æ¾ç¤º)"
public editing:
@@ -600,12 +639,25 @@ zh-CN:
heading: ç¡®è®¤ç¨æ·å¸æ·
press confirm button: "æä¸é¢çç¡®è®¤é®æ¿æ´»æ¨ç叿·ã"
button: 确认
+ success: "确认æ¨çè´¦å·ï¼æè°¢æ¨ç注åï¼"
confirm email:
- heading: 确认é®ç®±å°åçåæ´
- press confirm button: "æä¸é¢ç¡®è®¤é®ç¡®è®¤æ¨çæ°é®ç®±å°åã"
- button: 确认
+ heading: "确认é®ç®±ä¿®æ¹"
+ press confirm button: "ç¹å»ä¸é¢ç确认é®ç¡®è®¤æ¨çæ°é®ç®±å°å"
+ button: "确认"
+ success: "确认æ¨çé®ç®±å°åï¼æè°¢æ¨ç注åï¼"
set_home:
flash success: "æåä¿åæ¨æå¨ä½ç½®"
go_public:
flash success: "æ¨çææç¼è¾ç°å¨åå·²å
¬å¼ï¼ç°å¨å
许æ¨å¼å§ç¼è¾ã"
+ make_friend:
+ success: "{{name}}ç°å¨æ¯æ¨çæå"
+ failed: "对ä¸èµ·ï¼å {{name}} 为好å失败ã"
+ already_a_friend: "æ¨å·²ç»æ¯æåäº"
+ remove_friend:
+ success: "{{name}} 仿¨çæåä¸å é¤ã"
+ not_a_friend: "{{name}}䏿¯æ¨çæåã"
+ confirm email:
+ heading: 确认é®ç®±å°åçåæ´
+ press confirm button: "æä¸é¢ç¡®è®¤é®ç¡®è®¤æ¨çæ°é®ç®±å°åã"
+ button: 确认
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
new file mode 100644
index 000000000..c93f5e0eb
--- /dev/null
+++ b/config/locales/zh-TW.yml
@@ -0,0 +1,764 @@
+zh-TW:
+ html:
+ dir: ltr
+ activerecord:
+ # Translates all the model names, which is used in error handling on the web site
+ models:
+ acl: "ååæ§å¶æ¸
å®"
+ changeset: "è®æ´çµå"
+ changeset_tag: "è®æ´çµåæ¨ç±¤"
+ country: "åå®¶"
+ diary_comment: "æ¥è¨è¨»è§£"
+ diary_entry: "æ¥è¨é
ç®"
+ friend: "æå"
+ language: "èªè¨"
+ message: "è¨æ¯"
+ node: "ç¯é»"
+ node_tag: "ç¯é»æ¨ç±¤"
+ notifier: "Notifier"
+ old_node: "èçç¯é»"
+ old_node_tag: "èçç¯é»æ¨ç±¤"
+ old_relation: "èçéä¿"
+ old_relation_member: "èçéä¿æå¡"
+ old_relation_tag: "èçéä¿æ¨ç±¤"
+ old_way: "èçè·¯å¾"
+ old_way_node: "èçè·¯å¾ç¯é»"
+ old_way_tag: "èçè·¯å¾æ¨ç±¤"
+ relation: "éä¿"
+ relation_member: "éä¿æå¡"
+ relation_tag: "éä¿æ¨ç±¤"
+ session: "使¥é段"
+ trace: "追蹤"
+ tracepoint: "追蹤é»"
+ tracetag: "追蹤æ¨ç±¤"
+ user: "使ç¨è
"
+ user_preference: "使ç¨è
å好è¨å®"
+ user_token: "使ç¨è
è¨è"
+ way: "è·¯å¾"
+ way_node: "è·¯å¾ç¯é»"
+ way_tag: "è·¯å¾æ¨ç±¤"
+ # Translates all the model attributes, which is used in error handling on the web site
+ # Only the ones that are used on the web site are translated at the moment
+ attributes:
+ diary_comment:
+ body: "å
§æ"
+ diary_entry:
+ user: "使ç¨è
"
+ title: "æ¨é¡"
+ latitude: "緯度"
+ longitude: "ç¶åº¦"
+ language: "èªè¨"
+ friend:
+ user: "使ç¨è
"
+ friend: "æå"
+ trace:
+ user: "使ç¨è
"
+ visible: "å¯è¦æ§"
+ name: "å稱"
+ size: "大å°"
+ latitude: "緯度"
+ longitude: "ç¶åº¦"
+ public: "å
Ž"
+ description: "æè¿°"
+ message:
+ sender: "å¯ä»¶è
"
+ title: "æ¨é¡"
+ body: "å
§æ"
+ recipient: "æ¶ä»¶è
"
+ user:
+ email: "Email"
+ active: "åç¨"
+ display_name: "顯示å稱"
+ description: "æè¿°"
+ languages: "èªè¨"
+ pass_crypt: "å¯ç¢¼"
+ map:
+ view: "檢è¦"
+ edit: "編輯"
+ coordinates: "忍ï¼"
+ browse:
+ changeset:
+ title: "è®æ´çµå"
+ changeset: "è®æ´çµåï¼"
+ download: "ä¸è¼ {{changeset_xml_link}} æ {{osmchange_xml_link}}"
+ changesetxml: "Changeset XML"
+ osmchangexml: "osmChange XML"
+ changeset_details:
+ created_at: "å»ºç«æ¼ï¼"
+ closed_at: "ééæ¼ï¼"
+ belongs_to: "屬æ¼ï¼"
+ bounding_box: "ç¶å®æ¹å¡ï¼"
+ no_bounding_box: "éåè®æ´çµåæ²æå²åç¶å®æ¹å¡ã"
+ show_area_box: "顯示ååæ¹å¡"
+ box: "æ¹å¡"
+ has_nodes: "æä¸å {{count}} ç¯é»ï¼"
+ has_ways: "æä¸å {{count}} è·¯å¾ï¼"
+ has_relations: "æä¸å {{count}} éä¿ï¼"
+ common_details:
+ edited_at: "編輯æ¼ï¼"
+ edited_by: "編輯è
ï¼"
+ version: "çæ¬ï¼"
+ in_changeset: "æ¼è®æ´çµåï¼"
+ containing_relation:
+ relation: "éä¿ {{relation_name}}"
+ relation_as: "(as {{relation_role}})"
+ map:
+ loading: "æ£å¨è¼å
¥..."
+ deleted: "å·²åªé¤"
+ view_larger_map: "檢è¦è¼å¤§çå°å"
+ node_details:
+ coordinates: "忍ï¼"
+ part_of: "é¨åï¼"
+ node_history:
+ node_history: "ç¯é»æ·å²ç´é"
+ download: "{{download_xml_link}} æ {{view_details_link}}"
+ download_xml: "ä¸è¼ XML"
+ view_details: "檢è¦è©³ç´°è³è¨"
+ node:
+ node: "ç¯é»"
+ node_title: "ç¯é»ï¼ {{node_name}}"
+ download: "{{download_xml_link}} æ {{view_history_link}}"
+ download_xml: "ä¸è¼ XML"
+ view_history: "æª¢è¦æ·å²ç´é"
+ not_found:
+ sorry: "æ±æï¼æ¾ä¸å° id {{id}} ç {{type}}ã"
+ type:
+ node: "ç¯é»"
+ way: "è·¯å¾"
+ relation: "éä¿"
+ paging_nav:
+ showing_page: "æ£å¨é¡¯ç¤ºé é¢"
+ of: "ï¼"
+ relation_details:
+ members: "æå¡ï¼"
+ part_of: "é¨åï¼"
+ relation_history:
+ relation_history: "éä¿æ·å²ç´é"
+ relation_history_title: "éä¿æ·å²ç´éï¼ {{relation_name}}"
+ relation_member:
+ as: "çº"
+ relation:
+ relation: "éä¿"
+ relation_title: "éä¿ï¼ {{relation_name}}"
+ download: "{{download_xml_link}} æ {{view_history_link}}"
+ download_xml: "ä¸è¼ XML"
+ view_history: "æª¢è¦æ·å²ç´é"
+ start:
+ view_data: "ç®åå°å檢è¦ç檢è¦è³æ"
+ manually_select: "æå鏿ä¸åçåå"
+ start_rjs:
+ data_layer_name: "è³æ"
+ data_frame_title: "è³æ"
+ zoom_or_select: "æ¾å¤§æé¸æè¦æª¢è¦çå°ååå"
+ drag_a_box: "å¨å°å䏿æ³åºä¸åæ¹å¡ä¾é¸æä¸ååå"
+ manually_select: "æå鏿ä¸åçåå"
+ loaded_an_area_with_num_features: "æ¨å·²ç¶è¼å
¥äºå
å« [[num_features]] é
åè½çååãéå¸¸ï¼æäºç覽å¨ç¡æ³æ£å¸¸é¡¯ç¤ºé忏éçè³æãä¸è¬èè¨ï¼ç覽å¨å¨ä¸æ¬¡é¡¯ç¤º 100 å以ä¸çåè½ææé©ç¶ï¼è¶
éé忏éæä½¿æ¨çç覽å¨è®æ
¢/忢åæãå¦æç¢ºå®è¦é¡¯ç¤ºéåè³æï¼è«æä¸é¢çæéã"
+ load_data: "è¼å
¥è³æ"
+ unable_to_load_size: "ç¡æ³è¼å
¥ï¼ç¶å®æ¹å¡çå¤§å° [[bbox_size]] 太é巨大 (å¿
é å°æ¼ {{max_bbox_size}})"
+ loading: "æ£å¨è¼å
¥..."
+ show_history: "顯示æ·å²ç´é"
+ wait: "Wait..."
+ history_for_feature: "[[feature]] çæ·å²ç´é"
+ details: "詳細è³è¨"
+ private_user: "å人使ç¨è
"
+ edited_by_user_at_timestamp: "ç± [[user]] æ¼ [[timestamp]] 編輯"
+ object_list:
+ heading: "ç©ä»¶æ¸
å®"
+ back: "顯示ç©ä»¶æ¸
å®"
+ type:
+ node: "ç¯é»"
+ way: "è·¯å¾"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ api: "å¾ API ååéååå"
+ details: "詳細è³è¨"
+ selected:
+ type:
+ node: "ç¯é» [[id]]"
+ way: "è·¯å¾ [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ history:
+ type:
+ node: "ç¯é» [[id]]"
+ way: "è·¯å¾ [[id]]"
+ # There's no 'relation' type because it isn't represented in OpenLayers
+ tag_details:
+ tags: "æ¨ç±¤ï¼"
+ way_details:
+ nodes: "ç¯é»ï¼"
+ part_of: "é¨åï¼"
+ also_part_of:
+ one: "乿¯è·¯å¾ {{related_ways}} çä¸é¨å"
+ other: "乿¯è·¯å¾ {{related_ways}} çä¸é¨å"
+ way_history:
+ way_history: "è·¯å¾æ·å²ç´é"
+ way_history_title: "è·¯å¾æ·å²ç´éï¼ {{way_name}}"
+ download: "{{download_xml_link}} æ {{view_details_link}}"
+ download_xml: "ä¸è¼ XML"
+ view_details: "檢è¦è©³ç´°è³è¨"
+ way:
+ way: "è·¯å¾"
+ way_title: "è·¯å¾ï¼ {{way_name}}"
+ download: "{{download_xml_link}} æ {{view_history_link}}"
+ download_xml: "ä¸è¼ XML"
+ view_history: "æª¢è¦æ·å²ç´é"
+ changeset:
+ changeset_paging_nav:
+ showing_page: "æ£å¨é¡¯ç¤ºé é¢"
+ of: "ï¼"
+ changeset:
+ still_editing: "(å°å¨ç·¨è¼¯)"
+ anonymous: "å¿å"
+ no_comment: "(æ²æ)"
+ no_edits: "(æ²æç·¨è¼¯)"
+ show_area_box: "顯示ååæ¹å¡"
+ big_area: "(big)"
+ view_changeset_details: "檢è¦è®æ´çµå詳細è³è¨"
+ more: "æ´å¤"
+ changesets:
+ id: "ID"
+ saved_at: "å²åæ¼"
+ user: "使ç¨è
"
+ comment: "註解"
+ area: "åå"
+ list_bbox:
+ history: "æ·å²ç´é"
+ changesets_within_the_area: "è®æ´çµå使¼æ¤ååï¼"
+ show_area_box: "顯示ååæ¹å¡"
+ no_changesets: "æ²æè®æ´çµå"
+ all_changes_everywhere: "è¦äºè§£æ¯åå°æ¹çææè®æ´è«åé± {{recent_changes_link}}"
+ recent_changes: "æè¿çè®æ´"
+ no_area_specified: "æ²ææå®åå"
+ first_use_view: "é¦å
ä½¿ç¨ {{view_tab_link}} æå®ä¸¦ç¸®æ¾æèè¶£çååï¼ç¶å¾æä¸æ·å²ç´éåé ã"
+ view_the_map: "æª¢è¦æ¤å°å"
+ view_tab: "檢è¦åé "
+ alternatively_view: "æè
ï¼æª¢è¦ææç {{recent_changes_link}}"
+ list:
+ recent_changes: "æè¿çè®æ´"
+ recently_edited_changesets: "æè¿ç·¨è¼¯çè®æ´çµåï¼"
+ for_more_changesets: "è¦çæ´å¤è®æ´çµåï¼é¸æä¸ä½ä½¿ç¨è
並檢è¦ä»åçç·¨è¼¯ï¼ææ¯ççç¹å®ååçç·¨è¼¯ãæ·å²ç´éãã"
+ list_user:
+ edits_by_username: "ç± {{username_link}} 編輯"
+ no_visible_edits_by: "æ²æ {{name}} å¯è¦ç編輯ã"
+ for_all_changes: "è¦äºè§£ææä½¿ç¨è
çè®æ´è«åé± {{recent_changes_link}}"
+ recent_changes: "æè¿çè®æ´"
+ diary_entry:
+ new:
+ title: "æ°æ¥è¨é
ç®"
+ list:
+ title: "使ç¨è
æ¥è¨"
+ user_title: "{{user}} çæ¥è¨"
+ in_language_title: "æ¥è¨é
ç®ä½¿ç¨èªè¨çº {{language}}"
+ new: "æ°å¢æ¥è¨é
ç®"
+ new_title: "卿¨ç使ç¨è
æ¥è¨ä¸æ°å¯«æ°çé
ç®"
+ no_entries: "æ²ææ¥è¨é
ç®"
+ recent_entries: "æè¿çæ¥è¨é
ç®ï¼"
+ older_entries: "è¼èçé
ç®"
+ newer_entries: "è¼æ°çé
ç®"
+ edit:
+ title: "編輯æ¥è¨é
ç®"
+ subject: "主æ¨ï¼"
+ body: "å
§æï¼"
+ language: "èªè¨ï¼"
+ location: "ä½ç½®ï¼"
+ latitude: "緯度ï¼"
+ longitude: "ç¶åº¦ï¼"
+ use_map_link: "使ç¨å°å"
+ save_button: "å²å"
+ marker_text: "æ¥è¨é
ç®ä½ç½®"
+ view:
+ title: "使ç¨è
çæ¥è¨ | {{user}}"
+ user_title: "{{user}}çæ¥è¨"
+ leave_a_comment: "çä¸è©è«"
+ login_to_leave_a_comment: "{{login_link}} 以çä¸è©è«"
+ login: "ç»å
¥"
+ save_button: "å²å"
+ no_such_entry:
+ heading: "æ²æé
ç®ç id çºï¼ {{id}}"
+ body: "æ±æï¼æ²ææ¥è¨é
ç®æè©è«ç id æ¯ {{id}}ãè«æª¢æ¥æ¨çæ¼åï¼æè
å¯è½æ¯æå°é¯èª¤çé£çµã"
+ no_such_user:
+ title: "æ²æéå使ç¨è
"
+ heading: "使ç¨è
{{user}} ä¸åå¨"
+ body: "æ±æï¼æ²æåçº {{user}} ç使ç¨è
ãè«æª¢æ¥æ¨çæ¼åï¼æè
å¯è½æ¯æå°é¯èª¤çé£çµã"
+ diary_entry:
+ posted_by: "ç± {{link_user}} æ¼ {{created}} 以 {{language_link}} 張貼"
+ comment_link: "å°éåé
ç®çè©è«"
+ reply_link: "åè¦éåé
ç®"
+ comment_count:
+ one: "1 åè©è«"
+ other: "{{count}} åè©è«"
+ edit_link: "編輯éåé
ç®"
+ diary_comment:
+ comment_from: "ç± {{link_user}} æ¼ {{comment_created_at}} ç¼è¡¨è©è«"
+ export:
+ start:
+ area_to_export: "è¦å¯åºçåå"
+ manually_select: "æå鏿ä¸åçåå"
+ format_to_export: "è¦å¯åºçæ ¼å¼"
+ osm_xml_data: "OpenStreetMap XML è³æ"
+ mapnik_image: "Mapnik Image"
+ osmarender_image: "Osmarender Image"
+ embeddable_html: "å
§åµå¼ HTML"
+ licence: "ææ¬"
+ export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
+ options: "é¸é
"
+ format: "æ ¼å¼"
+ scale: "æ¯ä¾"
+ max: "æå¤§"
+ image_size: "åç大å°"
+ zoom: "è®ç¦"
+ add_marker: "å¨å°åå 䏿¨è¨"
+ latitude: "緯度ï¼"
+ longitude: "ç¶åº¦ï¼"
+ output: "輸åº"
+ paste_html: "è²¼ä¸ HTML å
§åµæ¼ç¶²ç«"
+ export_button: "å¯åº"
+ start_rjs:
+ export: "å¯åº"
+ drag_a_box: "å¨å°å䏿æ³åºä¸åæ¹å¡ä»¥é¸æåå"
+ manually_select: "æå鏿ä¸åçåå"
+ click_add_marker: "å¨å°åä¸é»é¸ä»¥å 䏿¨è¨"
+ change_marker: "æ¹è®æ¨è¨å°é»"
+ add_marker: "å å
¥æ¨è¨è³å°å"
+ view_larger_map: "檢è¦è¼å¤§çå°å"
+ geocoder:
+ results:
+ results: "çµæ"
+ type_from_source: "{{type}} å¾ {{source_link}}"
+ no_results: "æ¾ä¸å°ä»»ä½çµæ"
+ layouts:
+ project_name:
+ # in
+ title: OpenStreetMap
+ # in
+ h1: OpenStreetMap
+ logo:
+ alt_text: OpenStreetMap logo
+ welcome_user: "æ¡è¿ï¼ {{user_link}}"
+ welcome_user_link_tooltip: "æ¨ç使ç¨è
é é¢"
+ home: "å®¶"
+ home_tooltip: "ç§»è³å®¶ä½ç½®"
+ inbox: "æ¶ä»¶å£ ({{count}})"
+ inbox_tooltip:
+ zero: "æ¨çæ¶ä»¶å£æ²ææªé±è®çè¨æ¯"
+ one: "æ¨çæ¶ä»¶å£æ 1 åæªé±è®çè¨æ¯"
+ other: "æ¨çæ¶ä»¶å£æ {{count}} åæªé±è®çè¨æ¯"
+ logout: "ç»åº"
+ logout_tooltip: "ç»åº"
+ log_in: "ç»å
¥"
+ log_in_tooltip: "以è¨å®å¥½ç帳èç»å
¥"
+ sign_up: "註å"
+ sign_up_tooltip: "建ç«ä¸å帳è以便è½ç·¨è¼¯"
+ view: "檢è¦"
+ view_tooltip: "檢è¦å°å"
+ edit: "編輯"
+ edit_tooltip: "編輯å°å"
+ history: "æ·å²ç´é"
+ history_tooltip: "è®æ´çµåæ·å²ç´é"
+ export: "å¯åº"
+ export_tooltip: "å¯åºå°åè³æ"
+ gps_traces: "GPS 追蹤"
+ gps_traces_tooltip: "管ç追蹤"
+ user_diaries: "使ç¨è
æ¥è¨"
+ user_diaries_tooltip: "檢è¦ä½¿ç¨è
æ¥è¨"
+ tag_line: "èªç±ç Wiki ä¸çå°å"
+ intro_1: "OpenStreetMap æ¯ä¸åèªç±ãå¯ç·¨è¼¯çå
¨ä¸çå°åã宿¯ç±åæ¨é樣ç人æè£½ä½çã"
+ intro_2: "OpenStreetMap è®æ¨å¯ä»¥å¾å°çä¸çä»»ä½å°æ¹ä»¥åä½çæ¹å¼æª¢è¦ã編輯è使ç¨å°åè³æã"
+ intro_3: "OpenStreetMap çä¸»æ©æ¯ç± {{ucl}} å {{bytemark}} å¾å¤§æ¹çæä¾çã"
+ intro_3_ucl: "UCL VR Centre"
+ intro_3_bytemark: "bytemark"
+ osm_offline: "OpenStreetMap è³æåº«ç®åé¢ç·ä¸ï¼ç´å°å¿
è¦çè³æåº«ç¶è·å·¥ä½å®æçºæ¢ã"
+ osm_read_only: "OpenStreetMap è³æåº«ç®åæ¯å¯è®æ¨¡å¼ï¼ç´å°å¿
è¦çè³æåº«ç¶è·å·¥ä½å®æçºæ¢ã"
+ donate: "以 {{link}} 給硬é«åç´åºé便¯æ´ OpenStreetMapã"
+ donate_link_text: "æç»"
+ help_wiki: "æ±å© & Wiki"
+ help_wiki_tooltip: "æ¬è¨ç«çæ±å© & Wiki ç¶²ç«"
+ help_wiki_url: "http://wiki.openstreetmap.org"
+ news_blog: "æ°èé¨è½æ ¼"
+ news_blog_tooltip: "éæ¼ OpenStreetMapãèªç±å°åè³æççæ°èé¨è½æ ¼"
+ shop: "購買"
+ shop_tooltip: "購買 OpenStreetMap ç¸éå» åçç¢å"
+ shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
+ sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+ alt_donation: "é²è¡ææ¬¾"
+ notifier:
+ diary_comment_notification:
+ subject: "[OpenStreetMap] {{user}} 卿¨çæ¥è¨é
ç®çä¸è©è«"
+ banner1: "* è«å¿åè¦éå°é»åéµä»¶ã *"
+ banner2: "* ä½¿ç¨ OpenStreetMap ç¶²ç«åè¦ã *"
+ hi: "{{to_user}}æ¨å¥½ï¼"
+ header: "{{from_user}} 卿¨æè¿ OpenStreetMap 主æ¨çº {{subject}} çæ¥è¨é
ç®çä¸è©è«ï¼"
+ footer: "æ¨ä¹å¯ä»¥å¨ {{readurl}} é±è®è©è«ï¼ä¸¦ä¸å¨ {{commenturl}} çä¸è©è«æå¨ {{replyurl}} åè¦"
+ message_notification:
+ subject: "[OpenStreetMap] {{user}} å¯çµ¦æ¨æ°çè¨æ¯"
+ banner1: "* è«å¿åè¦éå°é»åéµä»¶ã *"
+ banner2: "* ä½¿ç¨ OpenStreetMap ç¶²ç«åè¦ã *"
+ hi: "{{to_user}}æ¨å¥½ï¼"
+ header: "{{from_user}} éé OpenStreetMap å¯çµ¦æ¨ä¸»æ¨çº {{subject}} çè¨æ¯ï¼"
+ footer1: "æ¨ä¹å¯ä»¥å¨ {{readurl}} é±è®è¨æ¯ï¼"
+ footer2: "ä¸¦å¨ {{replyurl}} åè¦"
+ friend_notification:
+ subject: "[OpenStreetMap] {{user}} å°æ¨å å
¥æå"
+ had_added_you: "{{user}} å·²å¨ OpenStreetMap å°æ¨å å
¥çºæåã"
+ see_their_profile: "æ¨å¯ä»¥å¨ {{userurl}} æ¥çä»çè³æï¼é¡æç話ä¹å¯ä»¥æä»åå å
¥æåã"
+ gpx_notification:
+ greeting: "æ¨å¥½ï¼"
+ your_gpx_file: "æ¨ç GPX æªæ¡"
+ with_description: "æè¿°çº"
+ and_the_tags: "䏿¨ç±¤çºï¼"
+ and_no_tags: "䏿²ææ¨ç±¤ã"
+ failure:
+ subject: "[OpenStreetMap] GPX å¯å
¥å¤±æ"
+ failed_to_import: "å¯å
¥å¤±æãé裡æ¯é¯èª¤è¨æ¯ï¼"
+ more_info_1: "æ´å¤éæ¼ GPX å¯å
¥å¤±æèå¦ä½é¿å
å®åç"
+ more_info_2: "è³è¨å¯å¨é裡æ¾å°ï¼"
+ import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+ success:
+ subject: "[OpenStreetMap] GPX å¯å
¥æå"
+ loaded_successfully: |
+ æåçè¼å
¥ {{trace_points}} åé»ï¼å
¨é¨å¯è½æ
+ {{possible_points}} åé»ã
+ signup_confirm:
+ subject: "[OpenStreetMap] ç¢ºèªæ¨çé»åéµä»¶"
+ signup_confirm_plain:
+ greeting: "æ¨å¥½ï¼"
+ hopefully_you: "æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸åæ°å¸³èå°"
+ # next two translations run-on : please word wrap appropriately
+ click_the_link_1: "妿鿝æ¨ï¼æ¡è¿ï¼è«æä¸åé£çµä¾ç¢ºèªæ¨ç"
+ click_the_link_2: "帳è並äºè§£æ´å¤ OpenStreetMap çè³è¨ã"
+ introductory_video: "æ¨å¯ä»¥å¨é裡è§ç OpenStreetMap çå°è¦½å½±çï¼"
+ more_videos: "éè£¡éææ´å¤å½±çï¼"
+ the_wiki: "å¨ wiki ä¸é±è®æ´å¤ OpenStreetMap è¨æ¯ï¼"
+ the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
+ opengeodata: "OpenGeoData.org æ¯ OpenStreetMap çé¨è½æ ¼ï¼å®ä¹æ podcastsï¼"
+ wiki_signup: "æ¨å¯è½ä¹æ³å¨ OpenStreetMap wiki 註åï¼"
+ wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
+ # next four translations are in pairs : please word wrap appropriately
+ user_wiki_1: "å»ºè°æ¨å»ºç«ä¸å使ç¨è
wiki é é¢ï¼å
¶ä¸å
å«"
+ user_wiki_2: "è¨»è¨æ¨ä½åªè£¡çå顿¨ç±¤ï¼å¦ [[Category:Users_in_London]]ã"
+ current_user_1: "ä¸ä»½ç®å使ç¨è
çæ¸
å®ï¼ä»¥ä»åå¨ä¸çä¸ä½èçºåºç¤"
+ current_user_2: "çåé¡ï¼å¯å¨é裡åå¾ï¼"
+ signup_confirm_html:
+ greeting: "æ¨å¥½ï¼"
+ hopefully_you: "æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸åæ°å¸³èå°"
+ click_the_link: "妿鿝æ¨ï¼æ¡è¿ï¼è«æä¸åé£çµä¾ç¢ºèªæ¨ç帳è並äºè§£æ´å¤ OpenStreetMap çè³è¨ã"
+ introductory_video: "æ¨å¯ä»¥å¨ {{introductory_video_link}}ã"
+ video_to_openstreetmap: "è§ç OpenStreetMap çå°è¦½å½±ç"
+ more_videos: "éè£¡éææ´å¤ {{more_videos_link}}ã"
+ more_videos_here: "å½±ç"
+ get_reading: 'å¨ wiki ä¸é±è®æ´å¤ æ opengeodata é¨è½æ ¼ï¼ å
¶ä¸ä¹æ podcasts å¯ä»¥è½ï¼'
+ wiki_signup: 'æ¨å¯è½ä¹æ³å¨ OpenStreetMap wiki 註åã'
+ user_wiki_page: 'å»ºè°æ¨å»ºç«ä¸å使ç¨è
wiki é é¢ï¼å
¶ä¸å
å«è¨»è¨æ¨ä½åªè£¡çå顿¨ç±¤ï¼å¦ [[Category:Users_in_London]]ã'
+ current_user: 'ä¸ä»½ç®å使ç¨è
çæ¸
å®ï¼ä»¥ä»åå¨ä¸çä¸ä½èçºåºç¤çåé¡ï¼å¯å¨é裡åå¾ï¼Category:Users_by_geographical_regionã'
+ email_confirm:
+ subject: "[OpenStreetMap] ç¢ºèªæ¨çé»åéµä»¶ä½å"
+ email_confirm_plain:
+ greeting: "æ¨å¥½ï¼"
+ hopefully_you_1: "æäºº (å¸ææ¯æ¨) æ³è¦æ¹è®ä»çé»åéµä»¶ä½å"
+ hopefully_you_2: "{{server_url}} çº {{new_address}}ã"
+ click_the_link: "妿鿝æ¨ï¼è«æä¸åé£çµç¢ºèªæ¤è®æ´ã"
+ email_confirm_html:
+ greeting: "æ¨å¥½ï¼"
+ hopefully_you: "æäºº (å¸ææ¯æ¨) æ³è¦æ¹è®ä»çé»åéµä»¶ä½å {{server_url}} çº {{new_address}}ã"
+ click_the_link: "妿鿝æ¨ï¼è«æä¸åé£çµç¢ºèªæ¤è®æ´ã"
+ lost_password:
+ subject: "[OpenStreetMap] å¯ç¢¼éè¨è¦æ±"
+ lost_password_plain:
+ greeting: "æ¨å¥½ï¼"
+ hopefully_you_1: "æäºº (å¸ææ¯æ¨) è¦æ±éè¨éåé»åéµä»¶ä½å"
+ hopefully_you_2: "ç openstreetmap.org 帳èå¯ç¢¼ã"
+ click_the_link: "妿鿝æ¨ï¼è«æä¸åé£çµéè¨æ¨çå¯ç¢¼ã"
+ lost_password_html:
+ greeting: "æ¨å¥½ï¼"
+ hopefully_you: "æäºº (å¸ææ¯æ¨) è¦æ±éè¨éåé»åéµä»¶ä½åç openstreetmap.org 帳èå¯ç¢¼ã"
+ click_the_link: "妿鿝æ¨ï¼è«æä¸åé£çµéè¨æ¨çå¯ç¢¼ã"
+ reset_password:
+ subject: "[OpenStreetMap] å¯ç¢¼éè¨"
+ reset_password_plain:
+ greeting: "æ¨å¥½ï¼"
+ reset: "æ¨çå¯ç¢¼å·²éè¨çº {{new_password}}"
+ reset_password_html:
+ greeting: "æ¨å¥½ï¼"
+ reset: "æ¨çå¯ç¢¼å·²éè¨çº {{new_password}}"
+ message:
+ inbox:
+ title: "æ¶ä»¶å£"
+ my_inbox: "æçæ¶ä»¶å£"
+ outbox: "å¯ä»¶å£"
+ you_have: "æ¨æ {{new_count}} åæ°è¨æ¯å {{old_count}} åèè¨æ¯"
+ from: "å¯ä»¶è
"
+ subject: "主æ¨"
+ date: "æ¥æ"
+ no_messages_yet: "æ¨éæ²æè¨æ¯ãä½ä¸è· {{people_mapping_nearby_link}} çäººåæ¥è§¸ççï¼"
+ people_mapping_nearby: "éè¿è£½ä½å°å"
+ message_summary:
+ unread_button: "æ¨è¨çºæªè®"
+ read_button: "æ¨è¨çºå·²è®"
+ reply_button: "åè¦"
+ new:
+ title: "å¯åºè¨æ¯"
+ send_message_to: "å¯åºæ°è¨æ¯çµ¦ {{name}}"
+ subject: "主æ¨"
+ body: "å
§æ"
+ send_button: "å¯åº"
+ back_to_inbox: "åå°æ¶ä»¶å£"
+ message_sent: "è¨æ¯å·²å¯åº"
+ no_such_user:
+ title: "æ²æéå使ç¨è
æè¨æ¯"
+ heading: "æ²æéå使ç¨è
æè¨æ¯"
+ body: "æ±ææ²æéåååç使ç¨è
ææ¤ id çè¨æ¯"
+ outbox:
+ title: "å¯ä»¶å£"
+ my_inbox: "æç{{inbox_link}}"
+ inbox: "æ¶ä»¶å£"
+ outbox: "å¯ä»¶å£"
+ you_have_sent_messages: "æ¨æ {{sent_count}} åå¯éçè¨æ¯"
+ to: "æ¶ä»¶è
"
+ subject: "主æ¨"
+ date: "æ¥æ"
+ no_sent_messages: "æ¨éæ²æå¯åºè¨æ¯ãä½ä¸è· {{people_mapping_nearby_link}} çäººåæ¥è§¸ççï¼"
+ people_mapping_nearby: "éè¿è£½ä½å°å"
+ read:
+ title: "é±è®è¨æ¯"
+ reading_your_messages: "é±è®æ¨çè¨æ¯"
+ from: "å¯ä»¶è
"
+ subject: "主æ¨"
+ date: "æ¥æ"
+ reply_button: "åè¦"
+ unread_button: "æ¨è¨çºæªè®"
+ back_to_inbox: "åå°æ¶ä»¶å£"
+ reading_your_sent_messages: "é±è®æ¨å¯åºçè¨æ¯"
+ to: "æ¶ä»¶è
"
+ back_to_outbox: "åå°å¯ä»¶å£"
+ mark:
+ as_read: "è¨æ¯æ¨è¨çºå·²è®"
+ as_unread: "è¨æ¯æ¨è¨çºæªè®"
+ site:
+ index:
+ js_1: "æ¨ä½¿ç¨ä¸æ¯æ´ javascript çç覽å¨ï¼æè
åç¨äº javascriptã"
+ js_2: "OpenStreetMap ä½¿ç¨ javascript è®å°åæ´å¹³é ã"
+ js_3: '妿æ¨ç¡æ³åç¨ javascriptï¼å¯ä»¥è©¦è©¦ Tiles@Home éæ
æ¼è²¼ç覽å¨ã'
+ permalink: "éæ
é£çµ"
+ license:
+ notice: "ç± {{project_name}} åå®çè²¢ç»è
ä¾ {{license_name}} æ¢æ¬¾ææ¬ã"
+ license_name: "Creative Commons Attribution-Share Alike 2.0"
+ license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+ project_name: "OpenStreetMap project"
+ project_url: "http://openstreetmap.org"
+ edit:
+ not_public: "æ¨å°æªå°æ¨çç·¨è¼¯éæ¾è³å
¬é åã"
+ not_public_description: "卿¨é麼åä¹åå°ç¡æ³å編輯å°åãæ¨å¯ä»¥å¨æ¨ç{{user_page}}å°èªå·±ç編輯è¨å®çºå
¬é åã"
+ user_page_link: "使ç¨è
é é¢"
+ anon_edits: "({{link}})"
+ anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ anon_edits_link_text: "äºè§£çºä»éº¼éå¾éè¦ã"
+ flash_player_required: 'æ¨éè¦ Flash player æè½ä½¿ç¨ Potlatchï¼OpenStreetMap Flash 編輯å¨ãæ¨å¯ä»¥å¨ Adobe.com ä¸è¼ Flash Playerãéæå
¶ä»è¨±å¤é¸æä¹å¯ä»¥ç·¨è¼¯ OpenStreetMapã'
+ potlatch_unsaved_changes: "æ¨éææªå²åçè®æ´ã (è¦å¨ Potlatch ä¸å²åï¼æ¨æè©²åæ¶é¸æç®åçè·¯å¾æç¯é»(妿æ¯å¨æ¸
宿¨¡å¼ç·¨è¼¯)ï¼ææ¯é»é¸å²å(妿æå²åæé)ã)"
+ sidebar:
+ search_results: "æå°çµæ"
+ close: "éé"
+ search:
+ search: "æå°"
+ where_am_i: "æå¨åªè£¡ï¼"
+ submit_text: "èµ°"
+ searching: "æå°ä¸..."
+ search_help: "ç¯ä¾ï¼ 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', æ 'post offices near Lç¾¹nen' æ´å¤ç¯ä¾..."
+ key:
+ map_key: "åä¾"
+ map_key_tooltip: "å¨éå縮æ¾çç´æé¡¯ç¤ºçåä¾"
+ trace:
+ create:
+ upload_trace: "ä¸å³ GPS 追蹤"
+ trace_uploaded: "æ¨ç GPX æªæ¡å·²ç¶ä¸å³ä¸¦ä¸å¨çåé²å
¥è³æåº«ä¸ãéé叏䏿è¶
éåå°æï¼å®æææä»¥é»åéµä»¶éç¥æ¨ã"
+ edit:
+ filename: "æªæ¡å稱ï¼"
+ uploaded_at: "ä¸å³æ¼ï¼"
+ points: "黿¸ï¼"
+ start_coord: "éå§åæ¨ï¼"
+ edit: "編輯"
+ owner: "ææè
ï¼"
+ description: "æè¿°ï¼"
+ tags: "æ¨ç±¤ï¼"
+ save_button: "å²åè®æ´"
+ no_such_user:
+ title: "æ²æéå使ç¨è
"
+ heading: "使ç¨è
{{user}} ä¸åå¨"
+ body: "æ±æï¼æ²æåçº {{user}} ç使ç¨è
ãè«æª¢æ¥æ¨çæ¼åï¼æè
å¯è½æ¯æå°é¯èª¤çé£çµã"
+ trace_form:
+ upload_gpx: "ä¸å³ GPX æªæ¡"
+ description: "æè¿°"
+ tags: "æ¨ç±¤"
+ public: "æ¯å¦å
¬éï¼"
+ upload_button: "ä¸å³"
+ help: "æ±å©"
+ help_url: "http://wiki.openstreetmap.org/wiki/Upload"
+ trace_header:
+ see_just_your_traces: "åªæ¥çæ¨çè¿½è¹¤ï¼ææ¯ä¸å³ä¸å追蹤"
+ see_all_traces: "æ¥çææç追蹤"
+ see_your_traces: "æ¥çæ¨ææç追蹤"
+ traces_waiting: "æ¨æ {{count}} å追蹤çå¾
ä¸å³ãè«å
çå¾
éäºçµæå¾æåé²ä¸æ¥çä¸å³ï¼å¦æ¤æä¸æé»æå
¶ä»ä½¿ç¨è
çæç¨ã"
+ trace_optionals:
+ tags: "æ¨ç±¤"
+ view:
+ pending: "çå"
+ filename: "æªæ¡å稱ï¼"
+ download: "ä¸è¼"
+ uploaded: "ä¸å³æ¼ï¼"
+ points: "黿¸ï¼"
+ start_coordinates: "éå§åæ¨ï¼"
+ map: "å°å"
+ edit: "編輯"
+ owner: "ææè
ï¼"
+ description: "æè¿°ï¼"
+ tags: "æ¨ç±¤"
+ none: "æ²æ"
+ make_public: "å°éåè¿½è¹¤æ°¸é æ¨è¨çºå
Ž"
+ edit_track: "編輯éå追蹤"
+ delete_track: "åªé¤éå追蹤"
+ viewing_trace: "æ£å¨æª¢è¦è¿½è¹¤ {{name}}"
+ trace_not_found: "æ¾ä¸å°è¿½è¹¤ï¼"
+ trace_paging_nav:
+ showing: "æ£å¨é¡¯ç¤ºé é¢"
+ of: "ï¼"
+ trace:
+ pending: "çå"
+ count_points: "{{count}} åé»"
+ ago: "{{time_in_words_ago}} ä¹å"
+ more: "æ´å¤"
+ trace_details: "檢è¦è¿½è¹¤è©³ç´°è³è¨"
+ view_map: "檢è¦å°å"
+ edit: "編輯"
+ edit_map: "編輯å°å"
+ public: "å
Ž"
+ private: "ç§äºº"
+ by: "ç±"
+ in: "æ¼"
+ map: "å°å"
+ list:
+ public_traces: "å
¬é GPS 追蹤"
+ your_traces: "æ¨ç GPS 追蹤"
+ public_traces_from: "{{user}} çå
¬é GPS 追蹤"
+ tagged_with: " æ¨ç±¤çº {{tags}}"
+ delete:
+ scheduled_for_deletion: "追蹤已é å®åªé¤"
+ make_public:
+ made_public: "追蹤æ¨è¨çºå
Ž"
+ user:
+ login:
+ title: "ç»å
¥"
+ heading: "ç»å
¥"
+ please login: "è«ç»å
¥æ{{create_user_link}}ã"
+ create_account: "建ç«ä¸å帳è"
+ email or username: "é»åéµä»¶ä½åæä½¿ç¨è
å稱ï¼"
+ password: "å¯ç¢¼ï¼"
+ lost password link: "å¿è¨æ¨çå¯ç¢¼ï¼"
+ login_button: "ç»å
¥"
+ account not active: "æ±æï¼æ¨ç帳èå°æªåç¨ã
è«é»é¸å¸³è確èªé»åéµä»¶ä¸çé£çµä¾åç¨æ¨ç帳èã"
+ auth failure: "æ±æï¼ç¡æ³ä»¥éäºè³æç»å
¥ã"
+ lost_password:
+ title: "éºå¤±å¯ç¢¼"
+ heading: "å¿è¨å¯ç¢¼ï¼"
+ email address: "é»åéµä»¶ä½åï¼"
+ new password button: "å³éçµ¦ææ°çå¯ç¢¼"
+ notice email on way: "å¾éºæ¾æ¨å¿äºå® :-( 使¯ä¸å°è®æ¨å¯ä»¥éè¨å®çéµä»¶å·²ç¶å¯åºã"
+ notice email cannot find: "æ¾ä¸å°è©²é»åéµä»¶ä½åï¼æ±æã"
+ reset_password:
+ title: "éè¨å¯ç¢¼"
+ flash changed check mail: "æ¨çå¯ç¢¼å·²ç¶è®æ´ï¼ä¸¦ä¸å·²ç¶å¯å°æ¨çä¿¡ç®± :-)"
+ flash token bad: "æ¾ä¸å°è©²è¨èï¼å¯è½è¦æª¢æ¥ä¸ä¸ URLï¼"
+ new:
+ title: "建ç«å¸³è"
+ heading: "建ç«ä½¿ç¨è
帳è"
+ no_auto_account_create: "å¾ä¸å¹¸çæåç¾å¨ç¡æ³èªåçºæ¨å»ºç«å¸³èã"
+ contact_webmaster: 'è«é£çµ¡ ç¶²ç«ç®¡çè
宿è¦å»ºç«ç帳èï¼æåæåå¿«å試並èçéåè¦æ±ã'
+ fill_form: "填好ä¸å表å®ï¼æåæå¯çµ¦æ¨ä¸å°é»åéµä»¶ä¾åç¨æ¨ç帳èã"
+ license_agreement: 'èç±å»ºç«å¸³èï¼æ¨åæææä¸å³å° openstreetmap.org çææåä»»ä½ä½¿ç¨é£ç·å° openstreetmap.org çå·¥å
·æå»ºç«çè³æé½ä»¥ (éæé¤) éååµç¨ CC ææ¬ (by-sa)便æ¬ã'
+ email address: "é»åéµä»¶ä½åï¼"
+ confirm email address: "確èªé»åéµä»¶ä½åï¼"
+ not displayed publicly: 'ä¸è¦å
¬é顯示 (è«ç é±ç§æ¬æ¿ç)'
+ display name: "顯示å稱ï¼"
+ password: "å¯ç¢¼ï¼"
+ confirm password: "確èªå¯ç¢¼ï¼"
+ signup: "註å"
+ flash create success message: "使ç¨è
å·²æå建ç«ãæª¢æ¥æ¨çé»åéµä»¶ææ²æç¢ºèªä¿¡ï¼æ¥èå°±è¦å¿è製ä½å°åäº :-)
è«æ³¨æå¨æ¶å°ä¸¦ç¢ºèªæ¨çé»åéµä»¶ä½ååæ¯ç¡æ³ç»å
¥çã
妿æ¨ä½¿ç¨æéåºç¢ºèªè¦æ±çé²åå¾ä¿¡ç³»çµ±ï¼è«ç¢ºå®æ¨å° webmaster@openstreetmap.org å å
¥ç½åå®ä¸ï¼å çºæåç¡æ³åè¦ä»»ä½ç¢ºèªè¦æ±ã"
+ no_such_user:
+ title: "æ²æéå使ç¨è
"
+ heading: "使ç¨è
{{user}} ä¸åå¨"
+ body: "æ±æï¼æ²æåçº {{user}} ç使ç¨è
ãè«æª¢æ¥æ¨çæ¼åï¼æè
å¯è½æ¯æå°é¯èª¤çé£çµã"
+ view:
+ my diary: "æçæ¥è¨"
+ new diary entry: "æ°æ¥è¨é
ç®"
+ my edits: "æç編輯"
+ my traces: "æç追蹤"
+ my settings: "æçè¨å®å¼"
+ send message: "å³éè¨æ¯"
+ diary: "æ¥è¨"
+ edits: "å編輯"
+ traces: "å追蹤"
+ remove as friend: "ç§»é¤æå"
+ add as friend: "å å
¥æå"
+ mapper since: "æçºè£½åè
æ¼ï¼"
+ ago: "({{time_in_words_ago}} ä¹å)"
+ user image heading: "使ç¨è
åç"
+ delete image: "åªé¤åç"
+ upload an image: "ä¸å³ä¸å¼µåç"
+ add image: "å å
¥åç"
+ description: "æè¿°"
+ user location: "使ç¨è
ä½ç½®"
+ no home location: "å°æªè¨å®å®¶çä½ç½®ã"
+ if set location: "妿æ¨è¨å®äºä½ç½®ï¼ä¸å¼µæ¼äº®çå°ååå°æ±è¥¿æåºç¾å¨ä¸é¢ãæ¨å¯ä»¥å¨{{settings_link}}é é¢è¨å®æ¨çå®¶ä½ç½®ã"
+ settings_link_text: "è¨å®å¼"
+ your friends: "æ¨çæå"
+ no friends: "æ¨å°æªå å
¥ä»»ä½æåã"
+ km away: "{{count}}å
¬éé "
+ nearby users: "éè¿ç使ç¨è
ï¼"
+ no nearby users: "éè¿æ²æå¨é²è¡è£½åç使ç¨è
ã"
+ change your settings: "æ¹è®æ¨çè¨å®å¼"
+ friend_map:
+ your location: "æ¨çä½ç½®"
+ nearby mapper: "éè¿ç製åè
ï¼"
+ account:
+ title: "編輯帳è"
+ my settings: "æçè¨å®å¼"
+ email never displayed publicly: "(æ°¸é ä¸å
¬é顯示)"
+ public editing:
+ heading: "å
¬é編輯ï¼"
+ enabled: "å·²åç¨ãéå¿åä¸å¯ä»¥ç·¨è¼¯è³æã"
+ enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ enabled link text: "鿝ä»éº¼ï¼"
+ disabled: "å·²åç¨ä¸ä¸è½ç·¨è¼¯è³æï¼ææå
åçç·¨è¼¯é½ææçºå¿åçã"
+ disabled link text: "çºä»éº¼æä¸è½ç·¨è¼¯ï¼"
+ profile description: "è¨å®æªæè¿°ï¼"
+ preferred languages: "å好çèªè¨ï¼"
+ home location: "å®¶çä½ç½®ï¼"
+ no home location: "æ¨å°æªè¼¸å
¥å®¶çä½ç½®ã"
+ latitude: "緯度ï¼"
+ longitude: "ç¶åº¦ï¼"
+ update home location on click: "ç¶æé»é¸å°åææ´æ°å®¶çä½ç½®ï¼"
+ save changes button: "å²åè®æ´"
+ make edits public button: "å°æææç編輯è¨çºå
Ž"
+ return to profile: "åå°è¨å®æª"
+ flash update success confirm needed: "使ç¨è
è³è¨æåçæ´æ°ãè«æª¢æ¥æ¨çé»åéµä»¶æ¯å¦æ¶å°ç¢ºèªæ°é»åéµä»¶ä½åçéç¥ã"
+ flash update success: "使ç¨è
è³è¨æåçæ´æ°ã"
+ confirm:
+ heading: "確èªä½¿ç¨è
帳è"
+ press confirm button: "æä¸ç¢ºèªæé以åç¨æ¨ç帳èã"
+ button: "確èª"
+ success: "å·²ç¢ºèªæ¨ç帳èï¼æè¬æ¨ç註åï¼"
+ failure: "å
·ææ¤è¨èç使ç¨è
帳èå·²ç¶ç¢ºèªéäºã"
+ confirm_email:
+ heading: "確èªé»åéµä»¶ä½åçè®æ´"
+ press confirm button: "æä¸ç¢ºèªæéä»¥ç¢ºèªæ¨çæ°é»åéµä»¶ä½åã"
+ button: 確èª
+ success: "å·²ç¢ºèªæ¨çé»åéµä»¶ä½åï¼æè¬æ¨ç註åï¼"
+ failure: "å
·ææ¤è¨èçé»åéµä»¶ä½åå·²ç¶ç¢ºèªéäºã"
+ set_home:
+ flash success: "å®¶çä½ç½®æåçå²å"
+ go_public:
+ flash success: "ç¾å¨æ¨ææçç·¨è¼¯é½æ¯å
¬éçï¼å æ¤æ¨å·²æç·¨è¼¯çæ¬å©ã"
+ make_friend:
+ success: "{{name}} ç¾å¨æçºæ¨çæåã"
+ failed: "æ±æï¼ç¡æ³å° {{name}} å å
¥çºæåã"
+ already_a_friend: "æ¨å·²ç¶æ¯ {{name}} çæåäºã"
+ remove_friend:
+ success: "{{name}} 已徿¨çæåä¸ç§»é¤ã"
+ not_a_friend: "{{name}} 並ä¸å¨æ¨çæå裡ã"
diff --git a/config/routes.rb b/config/routes.rb
index 6656d0cd5..afaec0403 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,7 +178,7 @@ ActionController::Routing::Routes.draw do |map|
map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox'
- map.connect '/message/new/:user_id', :controller => 'message', :action => 'new'
+ map.connect '/message/new/:display_name', :controller => 'message', :action => 'new'
map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
diff --git a/db/README b/db/README
index 39ce18023..db4f5c20e 100644
--- a/db/README
+++ b/db/README
@@ -32,6 +32,11 @@ Run this command in the db/functions directory:
$ make libmyosm.so
+You might also need to install:
+- mysql client development libraries: $ sudo apt-get install libmysqlclient16-dev
+- ruby development libraries: $ sudo apt-get install ruby1.8-dev
+for build to succeed.
+
Make sure the db/functions directory is on the MySQL server's library
path and restart the MySQL server.
@@ -56,6 +61,11 @@ Run this command in the db/functions directory:
$ make libpgosm.so
+You might also need to install:
+- postgresql development libraries: $ sudo apt-get install postgresql-server-dev-8.3
+- ruby development libraries: $ sudo apt-get install ruby1.8-dev
+for build to succeed.
+
Now create the function as follows:
$ psql openstreetmap
@@ -73,3 +83,7 @@ Run this command from the root of your rails directory:
$ rake db:migrate
This will create the db for you
+
+You will need to make sure the database connection is configured in database.yml in config directory
+You might start with example configuration provided:
+$ cp config/mysql.example.database.yml config/database.yml
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
index dc6dbad6f..1e76e610b 100644
--- a/doc/README_FOR_APP
+++ b/doc/README_FOR_APP
@@ -11,6 +11,9 @@ http://wiki.openstreetmap.org/wiki/Rails
* Make your db (see db/README)
* Install ruby libxml bindings:
sudo apt-get install libxml-ruby1.8 libxml-parser-ruby1.8
+* Install ImageMagick libraries & ruby gem:
+ sudo apt-get install libmagickcore-dev
+ sudo gem install rmagick
* Install primary keys plugin for active record (minimum version 0.9.1)
sudo gem install composite_primary_keys
* Make sure you have a MTA listening on localhost:25 if you want mail
diff --git a/public/google7f093eeaceb75319.html b/public/google7f093eeaceb75319.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 73b7a8f17..4296d3adc 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ
diff --git a/script/process/inspector b/script/process/inspector
index bf25ad86d..35c1bae9d 100755
--- a/script/process/inspector
+++ b/script/process/inspector
@@ -1,3 +1,4 @@
#!/usr/bin/env ruby
require File.dirname(__FILE__) + '/../../config/boot'
+$:.unshift "#{RAILS_ROOT}/vendor/plugins/irs_process_scripts/lib"
require 'commands/process/inspector'
diff --git a/script/process/reaper b/script/process/reaper
index c77f04535..1ee7dfe12 100755
--- a/script/process/reaper
+++ b/script/process/reaper
@@ -1,3 +1,4 @@
#!/usr/bin/env ruby
require File.dirname(__FILE__) + '/../../config/boot'
+$:.unshift "#{RAILS_ROOT}/vendor/plugins/irs_process_scripts/lib"
require 'commands/process/reaper'
diff --git a/script/process/spawner b/script/process/spawner
index 7118f3983..2d27c1b81 100755
--- a/script/process/spawner
+++ b/script/process/spawner
@@ -1,3 +1,4 @@
#!/usr/bin/env ruby
require File.dirname(__FILE__) + '/../../config/boot'
+$:.unshift "#{RAILS_ROOT}/vendor/plugins/irs_process_scripts/lib"
require 'commands/process/spawner'
diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 10762f48d..19b3617fc 100644
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -433,10 +433,10 @@ class RelationControllerTest < ActionController::TestCase
assert_response :bad_request
# try to delete without specifying a changeset
- content ""
+ content ""
delete :delete, :id => current_relations(:visible_relation).id
assert_response :bad_request
- assert_match(/You are missing the required changeset in the relation/, @response.body)
+ assert_match(/Changeset id is missing/, @response.body)
# try to delete with an invalid (closed) changeset
content update_changeset(current_relations(:visible_relation).to_xml,
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 21a62cc5f..dd907f0f4 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -214,11 +214,11 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) {
Node.from_xml(nocs, true)
}
- assert_match /changeset id missing/, message_create.message
+ assert_match /Changeset id is missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
Node.from_xml(nocs, false)
}
- assert_match /changeset id missing/, message_update.message
+ assert_match /Changeset id is missing/, message_update.message
end
def test_from_xml_no_version
@@ -244,6 +244,20 @@ class NodeTest < ActiveSupport::TestCase
assert_match /Fatal error: Attribute lat redefined at/, message_update.message
end
+ def test_from_xml_id_zero
+ id_list = ["", "0", "00", "0.0", "a"]
+ id_list.each do |id|
+ zero_id = ""
+ assert_nothing_raised(OSM::APIBadUserInput) {
+ Node.from_xml(zero_id, true)
+ }
+ message_update = assert_raise(OSM::APIBadUserInput) {
+ Node.from_xml(zero_id, false)
+ }
+ assert_match /ID of node cannot be zero when updating/, message_update.message
+ end
+ end
+
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) {
@@ -253,6 +267,42 @@ class NodeTest < ActiveSupport::TestCase
message_update = assert_raise(OSM::APIBadXMLError) {
Node.from_xml(no_text, false)
}
- assert_match /Must specify a string with one or more characters/, message_create.message
+ assert_match /Must specify a string with one or more characters/, message_update.message
+ end
+
+ def test_from_xml_no_k_v
+ nokv = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, true)
+ }
+ assert_match /tag is missing key/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, false)
+ }
+ assert_match /tag is missing key/, message_update.message
+ end
+
+ def test_from_xml_no_v
+ no_v = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, true)
+ }
+ assert_match /tag is missing value/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, false)
+ }
+ assert_match /tag is missing value/, message_update.message
+ end
+
+ def test_from_xml_duplicate_k
+ dupk = ""
+ message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, true)
+ }
+ assert_equal "Element node/ has duplicate tags with key dup", message_create.message
+ message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, false)
+ }
+ assert_equal "Element node/23 has duplicate tags with key dup", message_update.message
end
end
diff --git a/test/unit/relation_test.rb b/test/unit/relation_test.rb
index 6b2363025..b1fbc0fcd 100644
--- a/test/unit/relation_test.rb
+++ b/test/unit/relation_test.rb
@@ -7,4 +7,99 @@ class RelationTest < ActiveSupport::TestCase
assert_equal 6, Relation.count
end
+ def test_from_xml_no_id
+ noid = ""
+ assert_nothing_raised(OSM::APIBadXMLError) {
+ Relation.from_xml(noid, true)
+ }
+ message = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(noid, false)
+ }
+ assert_match /ID is required when updating/, message.message
+ end
+
+ def test_from_xml_no_changeset_id
+ nocs = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(nocs, true)
+ }
+ assert_match /Changeset id is missing/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(nocs, false)
+ }
+ assert_match /Changeset id is missing/, message_update.message
+ end
+
+ def test_from_xml_no_version
+ no_version = ""
+ assert_nothing_raised(OSM::APIBadXMLError) {
+ Relation.from_xml(no_version, true)
+ }
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(no_version, false)
+ }
+ assert_match /Version is required when updating/, message_update.message
+ end
+
+ def test_from_xml_id_zero
+ id_list = ["", "0", "00", "0.0", "a"]
+ id_list.each do |id|
+ zero_id = ""
+ assert_nothing_raised(OSM::APIBadUserInput) {
+ Relation.from_xml(zero_id, true)
+ }
+ message_update = assert_raise(OSM::APIBadUserInput) {
+ Relation.from_xml(zero_id, false)
+ }
+ assert_match /ID of relation cannot be zero when updating/, message_update.message
+ end
+ end
+
+ def test_from_xml_no_text
+ no_text = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(no_text, true)
+ }
+ assert_match /Must specify a string with one or more characters/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(no_text, false)
+ }
+ assert_match /Must specify a string with one or more characters/, message_update.message
+ end
+
+ def test_from_xml_no_k_v
+ nokv = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(nokv, true)
+ }
+ assert_match /tag is missing key/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(nokv, false)
+ }
+ assert_match /tag is missing key/, message_update.message
+ end
+
+ def test_from_xml_no_v
+ no_v = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(no_v, true)
+ }
+ assert_match /tag is missing value/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Relation.from_xml(no_v, false)
+ }
+ assert_match /tag is missing value/, message_update.message
+ end
+
+ def test_from_xml_duplicate_k
+ dupk = ""
+ message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ Relation.from_xml(dupk, true)
+ }
+ assert_equal "Element relation/ has duplicate tags with key dup", message_create.message
+ message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ Relation.from_xml(dupk, false)
+ }
+ assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
+ end
end
diff --git a/test/unit/way_test.rb b/test/unit/way_test.rb
index c173454e4..c13c9755f 100644
--- a/test/unit/way_test.rb
+++ b/test/unit/way_test.rb
@@ -26,7 +26,7 @@ class WayTest < ActiveSupport::TestCase
way = Way.find(current_ways(:visible_way).id)
assert way.valid?
# it already has 1 node
- 1.upto((APP_CONFIG['max_number_of_way_nodes'])/2) {
+ 1.upto((APP_CONFIG['max_number_of_way_nodes']) / 2) {
way.add_nd_num(current_nodes(:used_node_1).id)
way.add_nd_num(current_nodes(:used_node_2).id)
}
@@ -36,4 +36,100 @@ class WayTest < ActiveSupport::TestCase
way.add_nd_num(current_nodes(:visible_node).id)
assert way.valid?
end
+
+ def test_from_xml_no_id
+ noid = ""
+ assert_nothing_raised(OSM::APIBadXMLError) {
+ Way.from_xml(noid, true)
+ }
+ message = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(noid, false)
+ }
+ assert_match /ID is required when updating/, message.message
+ end
+
+ def test_from_xml_no_changeset_id
+ nocs = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(nocs, true)
+ }
+ assert_match /Changeset id is missing/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(nocs, false)
+ }
+ assert_match /Changeset id is missing/, message_update.message
+ end
+
+ def test_from_xml_no_version
+ no_version = ""
+ assert_nothing_raised(OSM::APIBadXMLError) {
+ Way.from_xml(no_version, true)
+ }
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(no_version, false)
+ }
+ assert_match /Version is required when updating/, message_update.message
+ end
+
+ def test_from_xml_id_zero
+ id_list = ["", "0", "00", "0.0", "a"]
+ id_list.each do |id|
+ zero_id = ""
+ assert_nothing_raised(OSM::APIBadUserInput) {
+ Way.from_xml(zero_id, true)
+ }
+ message_update = assert_raise(OSM::APIBadUserInput) {
+ Way.from_xml(zero_id, false)
+ }
+ assert_match /ID of way cannot be zero when updating/, message_update.message
+ end
+ end
+
+ def test_from_xml_no_text
+ no_text = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(no_text, true)
+ }
+ assert_match /Must specify a string with one or more characters/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(no_text, false)
+ }
+ assert_match /Must specify a string with one or more characters/, message_update.message
+ end
+
+ def test_from_xml_no_k_v
+ nokv = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(nokv, true)
+ }
+ assert_match /tag is missing key/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(nokv, false)
+ }
+ assert_match /tag is missing key/, message_update.message
+ end
+
+ def test_from_xml_no_v
+ no_v = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(no_v, true)
+ }
+ assert_match /tag is missing value/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(no_v, false)
+ }
+ assert_match /tag is missing value/, message_update.message
+ end
+
+ def test_from_xml_duplicate_k
+ dupk = ""
+ message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ Way.from_xml(dupk, true)
+ }
+ assert_equal "Element way/ has duplicate tags with key dup", message_create.message
+ message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ Way.from_xml(dupk, false)
+ }
+ assert_equal "Element way/23 has duplicate tags with key dup", message_update.message
+ end
end
diff --git a/vendor/plugins/irs_process_scripts/MIT-LICENSE b/vendor/plugins/irs_process_scripts/MIT-LICENSE
new file mode 100644
index 000000000..df660347b
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2009 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/plugins/irs_process_scripts/README b/vendor/plugins/irs_process_scripts/README
new file mode 100644
index 000000000..39d3f3a8b
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/README
@@ -0,0 +1,11 @@
+IrsProcessScripts
+=================
+
+Contains the deprecated process control scripts from Rails 2.2 that were removed in Rails 2.3. They are:
+
+* Inspector
+* Spawner
+* Reaper
+
+
+Copyright (c) 2009 David Heinemeier Hansson, released under the MIT license
diff --git a/vendor/plugins/irs_process_scripts/Rakefile b/vendor/plugins/irs_process_scripts/Rakefile
new file mode 100644
index 000000000..aa8bd792d
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/Rakefile
@@ -0,0 +1,23 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the irs_process_scripts plugin.'
+Rake::TestTask.new(:test) do |t|
+ t.libs << 'lib'
+ t.libs << 'test'
+ t.pattern = 'test/**/*_test.rb'
+ t.verbose = true
+end
+
+desc 'Generate documentation for the irs_process_scripts plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+ rdoc.rdoc_dir = 'rdoc'
+ rdoc.title = 'IrsProcessScripts'
+ rdoc.options << '--line-numbers' << '--inline-source'
+ rdoc.rdoc_files.include('README')
+ rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff --git a/vendor/plugins/irs_process_scripts/install.rb b/vendor/plugins/irs_process_scripts/install.rb
new file mode 100644
index 000000000..f922ef895
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/install.rb
@@ -0,0 +1,9 @@
+# Install hook code here
+unless defined?(RAILS_ROOT)
+ $stderr.puts "$0 must be run from RAILS_ROOT with -rconfig/boot"
+ exit
+end
+
+require 'fileutils'
+FileUtils.rm_rf(RAILS_ROOT + '/script/process') # remove the old stubs first
+FileUtils.cp_r(RAILS_ROOT + '/vendor/plugins/irs_process_scripts/script', RAILS_ROOT + '/script/process')
diff --git a/vendor/plugins/irs_process_scripts/lib/commands/process/inspector.rb b/vendor/plugins/irs_process_scripts/lib/commands/process/inspector.rb
new file mode 100644
index 000000000..8a6437e71
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/lib/commands/process/inspector.rb
@@ -0,0 +1,68 @@
+require 'optparse'
+
+if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Inspector is only for Unix") end
+
+OPTIONS = {
+ :pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
+ :pattern => "dispatch.*.pid",
+ :ps => "ps -o pid,state,user,start,time,pcpu,vsz,majflt,command -p %s"
+}
+
+class Inspector
+ def self.inspect(pid_path, pattern)
+ new(pid_path, pattern).inspect
+ end
+
+ def initialize(pid_path, pattern)
+ @pid_path, @pattern = pid_path, pattern
+ end
+
+ def inspect
+ header = `#{OPTIONS[:ps] % 1}`.split("\n")[0] + "\n"
+ lines = pids.collect { |pid| `#{OPTIONS[:ps] % pid}`.split("\n")[1] }
+
+ puts(header + lines.join("\n"))
+ end
+
+ private
+ def pids
+ pid_files.collect do |pid_file|
+ File.read(pid_file).to_i
+ end
+ end
+
+ def pid_files
+ Dir.glob(@pid_path + "/" + @pattern)
+ end
+end
+
+
+ARGV.options do |opts|
+ opts.banner = "Usage: inspector [options]"
+
+ opts.separator ""
+
+ opts.on <<-EOF
+ Description:
+ Displays system information about Rails dispatchers (or other processes that use pid files) through
+ the ps command.
+
+ Examples:
+ inspector # default ps on all tmp/pids/dispatch.*.pid files
+ inspector -s 'ps -o user,start,majflt,pcpu,vsz -p %s' # custom ps, %s is where the pid is interleaved
+ EOF
+
+ opts.on(" Options:")
+
+ opts.on("-s", "--ps=command", "default: #{OPTIONS[:ps]}", String) { |v| OPTIONS[:ps] = v }
+ opts.on("-p", "--pidpath=path", "default: #{OPTIONS[:pid_path]}", String) { |v| OPTIONS[:pid_path] = v }
+ opts.on("-r", "--pattern=pattern", "default: #{OPTIONS[:pattern]}", String) { |v| OPTIONS[:pattern] = v }
+
+ opts.separator ""
+
+ opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
+
+ opts.parse!
+end
+
+Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])
diff --git a/vendor/plugins/irs_process_scripts/lib/commands/process/reaper.rb b/vendor/plugins/irs_process_scripts/lib/commands/process/reaper.rb
new file mode 100644
index 000000000..95175d41e
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/lib/commands/process/reaper.rb
@@ -0,0 +1,149 @@
+require 'optparse'
+require 'net/http'
+require 'uri'
+
+if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Reaper is only for Unix") end
+
+class Killer
+ class << self
+ # Searches for all processes matching the given keywords, and then invokes
+ # a specific action on each of them. This is useful for (e.g.) reloading a
+ # set of processes:
+ #
+ # Killer.process(:reload, "/tmp/pids", "dispatcher.*.pid")
+ def process(action, pid_path, pattern, keyword)
+ new(pid_path, pattern, keyword).process(action)
+ end
+
+ # Forces the (rails) application to reload by sending a +HUP+ signal to the
+ # process.
+ def reload(pid)
+ `kill -s HUP #{pid}`
+ end
+
+ # Force the (rails) application to restart by sending a +USR2+ signal to the
+ # process.
+ def restart(pid)
+ `kill -s USR2 #{pid}`
+ end
+
+ # Forces the (rails) application to gracefully terminate by sending a
+ # +TERM+ signal to the process.
+ def graceful(pid)
+ `kill -s TERM #{pid}`
+ end
+
+ # Forces the (rails) application to terminate immediately by sending a -9
+ # signal to the process.
+ def kill(pid)
+ `kill -9 #{pid}`
+ end
+
+ # Send a +USR1+ signal to the process.
+ def usr1(pid)
+ `kill -s USR1 #{pid}`
+ end
+ end
+
+ def initialize(pid_path, pattern, keyword=nil)
+ @pid_path, @pattern, @keyword = pid_path, pattern, keyword
+ end
+
+ def process(action)
+ pids = find_processes
+
+ if pids.empty?
+ warn "Couldn't find any pid file in '#{@pid_path}' matching '#{@pattern}'"
+ warn "(also looked for processes matching #{@keyword.inspect})" if @keyword
+ else
+ pids.each do |pid|
+ puts "#{action.capitalize}ing #{pid}"
+ self.class.send(action, pid)
+ end
+
+ delete_pid_files if terminating?(action)
+ end
+ end
+
+ private
+ def terminating?(action)
+ [ "kill", "graceful" ].include?(action)
+ end
+
+ def find_processes
+ files = pid_files
+ if files.empty?
+ find_processes_via_grep
+ else
+ files.collect { |pid_file| File.read(pid_file).to_i }
+ end
+ end
+
+ def find_processes_via_grep
+ lines = `ps axww -o 'pid command' | grep #{@keyword}`.split(/\n/).
+ reject { |line| line =~ /inq|ps axww|grep|spawn-fcgi|spawner|reaper/ }
+ lines.map { |line| line[/^\s*(\d+)/, 1].to_i }
+ end
+
+ def delete_pid_files
+ pid_files.each { |pid_file| File.delete(pid_file) }
+ end
+
+ def pid_files
+ Dir.glob(@pid_path + "/" + @pattern)
+ end
+end
+
+
+OPTIONS = {
+ :action => "restart",
+ :pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
+ :pattern => "dispatch.[0-9]*.pid",
+ :dispatcher => File.expand_path("#{RAILS_ROOT}/public/dispatch.fcgi")
+}
+
+ARGV.options do |opts|
+ opts.banner = "Usage: reaper [options]"
+
+ opts.separator ""
+
+ opts.on <<-EOF
+ Description:
+ The reaper is used to restart, reload, gracefully exit, and forcefully exit processes
+ running a Rails Dispatcher (or any other process responding to the same signals). This
+ is commonly done when a new version of the application is available, so the existing
+ processes can be updated to use the latest code.
+
+ It uses pid files to work on the processes and by default assume them to be located
+ in RAILS_ROOT/tmp/pids.
+
+ The reaper actions are:
+
+ * restart : Restarts the application by reloading both application and framework code
+ * reload : Only reloads the application, but not the framework (like the development environment)
+ * graceful: Marks all of the processes for exit after the next request
+ * kill : Forcefully exists all processes regardless of whether they're currently serving a request
+
+ Restart is the most common and default action.
+
+ Examples:
+ reaper # restarts the default dispatchers
+ reaper -a reload # reload the default dispatchers
+ reaper -a kill -r *.pid # kill all processes that keep pids in tmp/pids
+ EOF
+
+ opts.on(" Options:")
+
+ opts.on("-a", "--action=name", "reload|graceful|kill (default: #{OPTIONS[:action]})", String) { |v| OPTIONS[:action] = v }
+ opts.on("-p", "--pidpath=path", "default: #{OPTIONS[:pid_path]}", String) { |v| OPTIONS[:pid_path] = v }
+ opts.on("-r", "--pattern=pattern", "default: #{OPTIONS[:pattern]}", String) { |v| OPTIONS[:pattern] = v }
+ opts.on("-d", "--dispatcher=path", "DEPRECATED. default: #{OPTIONS[:dispatcher]}", String) { |v| OPTIONS[:dispatcher] = v }
+
+ opts.separator ""
+
+ opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
+
+ opts.parse!
+end
+
+Killer.process(OPTIONS[:action], OPTIONS[:pid_path], OPTIONS[:pattern], OPTIONS[:dispatcher])
diff --git a/vendor/plugins/irs_process_scripts/lib/commands/process/spawner.rb b/vendor/plugins/irs_process_scripts/lib/commands/process/spawner.rb
new file mode 100644
index 000000000..169072c41
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/lib/commands/process/spawner.rb
@@ -0,0 +1,219 @@
+require 'active_support'
+require 'optparse'
+require 'socket'
+require 'fileutils'
+
+def daemonize #:nodoc:
+ exit if fork # Parent exits, child continues.
+ Process.setsid # Become session leader.
+ exit if fork # Zap session leader. See [1].
+# Dir.chdir "/" # Release old working directory.
+ File.umask 0000 # Ensure sensible umask. Adjust as needed.
+ STDIN.reopen "/dev/null" # Free file descriptors and
+ STDOUT.reopen "/dev/null", "a" # point them somewhere sensible.
+ STDERR.reopen STDOUT # STDOUT/ERR should better go to a logfile.
+end
+
+class Spawner
+ def self.record_pid(name = "#{OPTIONS[:process]}.spawner", id = Process.pid)
+ FileUtils.mkdir_p(OPTIONS[:pids])
+ File.open(File.expand_path(OPTIONS[:pids] + "/#{name}.pid"), "w+") { |f| f.write(id) }
+ end
+
+ def self.spawn_all
+ OPTIONS[:instances].times do |i|
+ port = OPTIONS[:port] + i
+ print "Checking if something is already running on #{OPTIONS[:address]}:#{port}..."
+
+ begin
+ srv = TCPServer.new(OPTIONS[:address], port)
+ srv.close
+ srv = nil
+
+ puts "NO"
+ puts "Starting dispatcher on port: #{OPTIONS[:address]}:#{port}"
+
+ FileUtils.mkdir_p(OPTIONS[:pids])
+ spawn(port)
+ rescue
+ puts "YES"
+ end
+ end
+ end
+end
+
+class FcgiSpawner < Spawner
+ def self.spawn(port)
+ cmd = "#{OPTIONS[:spawner]} -f #{OPTIONS[:dispatcher]} -p #{port} -P #{OPTIONS[:pids]}/#{OPTIONS[:process]}.#{port}.pid"
+ cmd << " -a #{OPTIONS[:address]}" if can_bind_to_custom_address?
+ system(cmd)
+ end
+
+ def self.can_bind_to_custom_address?
+ @@can_bind_to_custom_address ||= /^\s-a\s/.match `#{OPTIONS[:spawner]} -h`
+ end
+end
+
+class MongrelSpawner < Spawner
+ def self.spawn(port)
+ cmd =
+ "mongrel_rails start -d " +
+ "-a #{OPTIONS[:address]} " +
+ "-p #{port} " +
+ "-P #{OPTIONS[:pids]}/#{OPTIONS[:process]}.#{port}.pid " +
+ "-e #{OPTIONS[:environment]} " +
+ "-c #{OPTIONS[:rails_root]} " +
+ "-l #{OPTIONS[:rails_root]}/log/mongrel.log"
+
+ # Add prefix functionality to spawner's call to mongrel_rails
+ # Digging through mongrel's project subversion server, the earliest
+ # Tag that has prefix implemented in the bin/mongrel_rails file
+ # is 0.3.15 which also happens to be the earliest tag listed.
+ # References: http://mongrel.rubyforge.org/svn/tags
+ if Mongrel::Const::MONGREL_VERSION.to_f >=0.3 && !OPTIONS[:prefix].nil?
+ cmd = cmd + " --prefix #{OPTIONS[:prefix]}"
+ end
+ system(cmd)
+ end
+
+ def self.can_bind_to_custom_address?
+ true
+ end
+end
+
+
+begin
+ require_library_or_gem 'fcgi'
+rescue Exception
+ # FCGI not available
+end
+
+begin
+ require_library_or_gem 'mongrel'
+rescue Exception
+ # Mongrel not available
+end
+
+server = case ARGV.first
+ when "fcgi", "mongrel"
+ ARGV.shift
+ else
+ if defined?(Mongrel)
+ "mongrel"
+ elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
+ "fcgi"
+ end
+end
+
+case server
+ when "fcgi"
+ puts "=> Starting FCGI dispatchers"
+ spawner_class = FcgiSpawner
+ when "mongrel"
+ puts "=> Starting mongrel dispatchers"
+ spawner_class = MongrelSpawner
+ else
+ puts "Neither FCGI (spawn-fcgi) nor Mongrel was installed and available!"
+ exit(0)
+end
+
+
+
+OPTIONS = {
+ :environment => "production",
+ :spawner => '/usr/bin/env spawn-fcgi',
+ :dispatcher => File.expand_path(RELATIVE_RAILS_ROOT + '/public/dispatch.fcgi'),
+ :pids => File.expand_path(RELATIVE_RAILS_ROOT + "/tmp/pids"),
+ :rails_root => File.expand_path(RELATIVE_RAILS_ROOT),
+ :process => "dispatch",
+ :port => 8000,
+ :address => '0.0.0.0',
+ :instances => 3,
+ :repeat => nil,
+ :prefix => nil
+}
+
+ARGV.options do |opts|
+ opts.banner = "Usage: spawner [platform] [options]"
+
+ opts.separator ""
+
+ opts.on <<-EOF
+ Description:
+ The spawner is a wrapper for spawn-fcgi and mongrel that makes it
+ easier to start multiple processes running the Rails dispatcher. The
+ spawn-fcgi command is included with the lighttpd web server, but can
+ be used with both Apache and lighttpd (and any other web server
+ supporting externally managed FCGI processes). Mongrel automatically
+ ships with with mongrel_rails for starting dispatchers.
+
+ The first choice you need to make is whether to spawn the Rails
+ dispatchers as FCGI or Mongrel. By default, this spawner will prefer
+ Mongrel, so if that's installed, and no platform choice is made,
+ Mongrel is used.
+
+ Then decide a starting port (default is 8000) and the number of FCGI
+ process instances you'd like to run. So if you pick 9100 and 3
+ instances, you'll start processes on 9100, 9101, and 9102.
+
+ By setting the repeat option, you get a protection loop, which will
+ attempt to restart any FCGI processes that might have been exited or
+ outright crashed.
+
+ You can select bind address for started processes. By default these
+ listen on every interface. For single machine installations you would
+ probably want to use 127.0.0.1, hiding them form the outside world.
+
+ Examples:
+ spawner # starts instances on 8000, 8001, and 8002
+ # using Mongrel if available.
+ spawner fcgi # starts instances on 8000, 8001, and 8002
+ # using FCGI.
+ spawner mongrel -i 5 # starts instances on 8000, 8001, 8002,
+ # 8003, and 8004 using Mongrel.
+ spawner -p 9100 -i 10 # starts 10 instances counting from 9100 to
+ # 9109 using Mongrel if available.
+ spawner -p 9100 -r 5 # starts 3 instances counting from 9100 to
+ # 9102 and attempts start them every 5
+ # seconds.
+ spawner -a 127.0.0.1 # starts 3 instances binding to localhost
+ EOF
+
+ opts.on(" Options:")
+
+ opts.on("-p", "--port=number", Integer, "Starting port number (default: #{OPTIONS[:port]})") { |v| OPTIONS[:port] = v }
+
+ if spawner_class.can_bind_to_custom_address?
+ opts.on("-a", "--address=ip", String, "Bind to IP address (default: #{OPTIONS[:address]})") { |v| OPTIONS[:address] = v }
+ end
+
+ opts.on("-p", "--port=number", Integer, "Starting port number (default: #{OPTIONS[:port]})") { |v| OPTIONS[:port] = v }
+ opts.on("-i", "--instances=number", Integer, "Number of instances (default: #{OPTIONS[:instances]})") { |v| OPTIONS[:instances] = v }
+ opts.on("-r", "--repeat=seconds", Integer, "Repeat spawn attempts every n seconds (default: off)") { |v| OPTIONS[:repeat] = v }
+ opts.on("-e", "--environment=name", String, "test|development|production (default: #{OPTIONS[:environment]})") { |v| OPTIONS[:environment] = v }
+ opts.on("-P", "--prefix=path", String, "URL prefix for Rails app. [Used only with Mongrel > v0.3.15]: (default: #{OPTIONS[:prefix]})") { |v| OPTIONS[:prefix] = v }
+ opts.on("-n", "--process=name", String, "default: #{OPTIONS[:process]}") { |v| OPTIONS[:process] = v }
+ opts.on("-s", "--spawner=path", String, "default: #{OPTIONS[:spawner]}") { |v| OPTIONS[:spawner] = v }
+ opts.on("-d", "--dispatcher=path", String, "default: #{OPTIONS[:dispatcher]}") { |dispatcher| OPTIONS[:dispatcher] = File.expand_path(dispatcher) }
+
+ opts.separator ""
+
+ opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
+
+ opts.parse!
+end
+
+ENV["RAILS_ENV"] = OPTIONS[:environment]
+
+if OPTIONS[:repeat]
+ daemonize
+ trap("TERM") { exit }
+ spawner_class.record_pid
+
+ loop do
+ spawner_class.spawn_all
+ sleep(OPTIONS[:repeat])
+ end
+else
+ spawner_class.spawn_all
+end
diff --git a/vendor/plugins/irs_process_scripts/script/inspector b/vendor/plugins/irs_process_scripts/script/inspector
new file mode 100755
index 000000000..35c1bae9d
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/script/inspector
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+$:.unshift "#{RAILS_ROOT}/vendor/plugins/irs_process_scripts/lib"
+require 'commands/process/inspector'
diff --git a/vendor/plugins/irs_process_scripts/script/reaper b/vendor/plugins/irs_process_scripts/script/reaper
new file mode 100755
index 000000000..1ee7dfe12
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/script/reaper
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+$:.unshift "#{RAILS_ROOT}/vendor/plugins/irs_process_scripts/lib"
+require 'commands/process/reaper'
diff --git a/vendor/plugins/irs_process_scripts/script/spawner b/vendor/plugins/irs_process_scripts/script/spawner
new file mode 100755
index 000000000..2d27c1b81
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/script/spawner
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+$:.unshift "#{RAILS_ROOT}/vendor/plugins/irs_process_scripts/lib"
+require 'commands/process/spawner'
diff --git a/vendor/plugins/irs_process_scripts/uninstall.rb b/vendor/plugins/irs_process_scripts/uninstall.rb
new file mode 100644
index 000000000..97196a914
--- /dev/null
+++ b/vendor/plugins/irs_process_scripts/uninstall.rb
@@ -0,0 +1,8 @@
+# Install hook code here
+unless defined?(RAILS_ROOT)
+ $stderr.puts "$0 must be run from RAILS_ROOT with -rconfig/boot"
+ exit
+end
+
+require 'fileutils'
+FileUtils.rm_rf(RAILS_ROOT + '/script/process')
\ No newline at end of file
diff --git a/vendor/plugins/rails-i18n/locale/sl.rb b/vendor/plugins/rails-i18n/locale/sl.rb
new file mode 100644
index 000000000..d32740f2c
--- /dev/null
+++ b/vendor/plugins/rails-i18n/locale/sl.rb
@@ -0,0 +1,191 @@
+# Slovenian translations for Ruby on Rails
+# by Å tefan Baebler (stefan@baebler.net)
+
+{ :'sl' => {
+
+ # ActiveSupport
+ :support => {
+ :array => {
+ :words_connector => ', ',
+ :two_words_connector => ' in ',
+ :last_word_connector => ' in ',
+ :sentence_connector => 'in',
+ :skip_last_comma => true }
+ },
+
+ # Date
+ :date => {
+ :formats => {
+ :default => "%d. %m. %Y",
+ :short => "%d %b",
+ :long => "%d. %B %Y",
+ },
+ :day_names => %w{nedelja ponedeljek torek sreda Äetrtek petek sobota},
+ :abbr_day_names => %w{ned pon tor sre Äet pet sob},
+ :month_names => %w{~ januar februar marec april maj junij julj avgust september oktober november december},
+ :abbr_month_names => %w{~ jan feb mar apr maj jun jul avg sep okt nov dec},
+ :order => [:day, :month, :year]
+ },
+
+ # Time
+ :time => {
+ :formats => {
+ :default => "%a %d. %B %Y %H:%M %z",
+ :short => "%d. %m. %H:%M",
+ :long => "%A %d. %B %Y %H:%M",
+ :time => "%H:%M"
+
+ },
+ :am => 'dopoldne',
+ :pm => 'popoldne'
+ },
+
+ # Numbers
+ :number => {
+ :format => {
+ :precision => 3,
+ :separator => '.',
+ :delimiter => ','
+ },
+ :currency => {
+ :format => {
+ :unit => 'â¬',
+ :precision => 2,
+ :format => '%n %u',
+ :separator => ",",
+ :delimiter => " ",
+ }
+ },
+ :human => {
+ :format => {
+ :precision => 1,
+ :delimiter => ''
+ },
+ :storage_units => {
+ :format => "%n %u",
+ :units => {
+ :byte => "B",
+ :kb => "kB",
+ :mb => "MB",
+ :gb => "GB",
+ :tb => "TB",
+ }
+ }
+ },
+ :percentage => {
+ :format => {
+ :delimiter => ''
+ }
+ },
+ :precision => {
+ :format => {
+ :delimiter => ''
+ }
+ }
+ },
+
+ # Distance of time ... helper
+ # TODO: Needs proper pluralization formula: (n%100==1 ? one : n%100==2 ? two : n%100==3 || n%100==4 ? few : other)
+ # NOTE: focused on "time ago" as in "2 minuti nazaj", "3 tedne nazaj" which can be used also in other time distances
+ # ("pred 2 minutama" isn't as universally usable.)
+ :datetime => {
+ :distance_in_words => {
+ :half_a_minute => 'pol minute',
+ :less_than_x_seconds => {
+ :one => 'manj kot sekunda',
+ :two => 'manj kot dve sekundi',
+ :few => 'manj kot {{count}} sekunde',
+ :other => 'manj kot {{count}} sekund'
+ },
+ :x_seconds => {
+ :one => 'sekunda',
+ :two => 'dve sekundi',
+ :few => '{{count}} sekunde',
+ :other => '{{count}} sekund'
+ },
+ :less_than_x_minutes => {
+ :one => 'manj kot minuta',
+ :two => 'manj kot dve minuti',
+ :few => 'manj kot {{count}} minute',
+ :other => 'manj kot {{count}} minut'
+ },
+ :x_minutes => {
+ :one => 'minuta',
+ :two => 'dve minuti',
+ :few => '{{count}} minute',
+ :other => '{{count}} minut'
+ },
+ :about_x_hours => {
+ :one => 'približno ena ura',
+ :two => 'približno dve uri',
+ :few => 'približno {{count}} ure',
+ :other => 'približno {{count}} ur'
+ },
+ :x_days => {
+ :one => 'en dan',
+ :two => 'dva dni',
+ :few => '{{count}} dni',
+ :other => '{{count}} dni'
+ },
+ :about_x_months => {
+ :one => 'približno en mesec',
+ :two => 'približno dva meseca',
+ :few => 'približno {{count}} mesece',
+ :other => 'približno {{count}} mesecev'
+ },
+ :x_months => {
+ :one => 'en mesec',
+ :two => 'dva meseca',
+ :few => '{{count}} meseci',
+ :other => '{{count}} mesecev'
+ },
+ :about_x_years => {
+ :one => 'približno {{count}} leto',
+ :two => 'približno {{count}} leti',
+ :few => 'približno {{count}} leta',
+ :other => 'približno {{count}} let'
+ },
+ :over_x_years => {
+ :one => 'veÄ kot {{count}} leto',
+ :two => 'veÄ kot {{count}} leti',
+ :few => 'veÄ kot {{count}} leta',
+ :other => 'veÄ kot {{count}} let'
+ }
+ }
+ },
+
+ # ActiveRecord validation messages
+ :activerecord => {
+ :errors => {
+ :messages => {
+ :inclusion => "ni v seznamu",
+ :exclusion => "ni dostopno",
+ :invalid => "ni veljavno",
+ :confirmation => "ni skladno s potrditvijo",
+ :accepted => "mora biti potrjeno",
+ :empty => "ne sme biti prazno",
+ :blank => "je obezno", # alternate formulation: "is required"
+ :too_long => "je predolgo (najveÄ {{count}} znakov)",
+ :too_short => "je prekratko (vsaj {{count}} znakov)",
+ :wrong_length => "ni pravilne dolžine (natanko {{count}} znakov)",
+ :taken => "že obstaja v bazi",
+ :not_a_number => "ni številka",
+ :greater_than => "mora biti veÄje od {{count}}",
+ :greater_than_or_equal_to => "mora biti veÄje ali enako {{count}}",
+ :equal_to => "mora biti enako {{count}}",
+ :less_than => "mora biti manjše od {{count}}",
+ :less_than_or_equal_to => "mora biti manjše ali enako {{count}}",
+ :odd => "mora biti liho",
+ :even => "mora biti sodo"
+ },
+ :template => {
+ :header => {
+ :one => "Pri shranjevanju predmeta {{model}} je prišlo do {{count}} napake",
+ :other => "Pri shranjevanju predmeta {{model}} je prišlo do {{count}} napak"
+ },
+ :body => "Prosim, popravite naslednje napake posameznih polj:"
+ }
+ }
+ }
+ }
+}