merge 19601:19888 of rails_port into the openID branch

This commit is contained in:
Kai Krueger 2010-02-06 13:13:52 +00:00
commit 17a7c69e8d
40 changed files with 2121 additions and 68 deletions

View file

@ -187,7 +187,7 @@ class AmfController < ApplicationController
# close previous changeset and add comment
if closeid
cs = Changeset.find(closeid)
cs = Changeset.find(closeid.to_i)
cs.set_closed_time_now
if cs.user_id!=user.id
raise OSM::APIUserChangesetMismatchError.new

View file

@ -107,7 +107,7 @@ class ApiController < ApplicationController
trkseg << point.to_xml_node(timestamps)
end
response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
response.headers["Content-Disposition"] = "attachment; filename=\"tracks.gpx\""
render :text => doc.to_s, :content_type => "text/xml"
end

View file

@ -187,7 +187,7 @@ class DiaryEntryController < ApplicationController
def hidecomment
comment = DiaryComment.find(params[:comment])
comment.update_attributes(:visible => false)
redirect_to :action => "view", :id => comment.diary_entry.id
redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id
end
private
##

View file

@ -21,7 +21,7 @@ private
when record.is_a?(DiaryComment): entry = record.diary_entry
end
expire_action(:controller => 'diary_entry', :action => 'view', :id => entry.id)
expire_action(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id)
expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => nil)
expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil)

View file

@ -17,7 +17,7 @@ private
old_record.visible != new_record.visible or
old_record.display_name != new_record.display_name)
old_record.diary_entries.each do |entry|
expire_action(:controller => 'diary_entry', :action => 'view', :id => entry.id)
expire_action(:controller => 'diary_entry', :action => 'view', :display_name => old_record.display_name, :id => entry.id)
expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil)
expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
end

View file

@ -2,7 +2,6 @@ page.replace_html :sidebar_title, t('browse.start_rjs.data_frame_title')
page.replace_html :sidebar_content, :partial => 'start'
page << <<EOJ
var browseBoxControl;
var browseActive;
var browseMode = "auto";
var browseBounds;
var browseFeatureList;
@ -15,7 +14,7 @@ page << <<EOJ
OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
function startBrowse() {
browseActive = true;
map.dataLayer.active = true;
openSidebar({ onclose: stopBrowse });
@ -47,8 +46,8 @@ page << <<EOJ
}
function stopBrowse() {
if (browseActive) {
browseActive = false;
if (map.dataLayer.active) {
map.dataLayer.active = false;
if (browseSelectControl) {
browseSelectControl.destroy();
@ -154,7 +153,7 @@ page << <<EOJ
}
function customDataLoader(request) {
if (browseActive) {
if (this.map.dataLayer.active) {
var doc = request.responseXML;
if (!doc || !doc.documentElement) {
@ -238,9 +237,9 @@ page << <<EOJ
}
function dataLoaded() {
if (browseActive) {
if (this.map.dataLayer.active) {
clearStatus();
browseObjectList = document.createElement("div")
var heading = document.createElement("p");

View file

@ -7,11 +7,11 @@
<% if @this_user %>
<% if @user == @this_user %>
<%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
<%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
<% end %>
<% else %>
<% if @user %>
<%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
<%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
<% end %>
<% end %>

View file

@ -98,7 +98,8 @@
<p>
<%= t 'layouts.intro_3',
:ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
:bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %>
:bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"),
:partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %>
</p>
</div>
<% end %>

View file

@ -182,7 +182,7 @@ end
function toggleData() {
if (map.dataLayer.visibility) {
<%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
} else {
} else if (map.dataLayer.active) {
closeSidebar();
}
}

View file

@ -173,6 +173,10 @@ af:
zoom_or_select: Zoom in of kies 'n gebied op die kaart om te besigtig
tag_details:
tags: "Etikette:"
timeout:
sorry: Jammer, dit het te lank geneem om data vir die {{type}} met die id {{id}} op te soek.
type:
node: node
way:
download: "{{download_xml_link}}, {{view_history_link}} of {{edit_link}}"
download_xml: Laai XML af
@ -327,6 +331,7 @@ af:
other: ongeveer {{count}}km
zero: minder as 1km
results:
more_results: Meer resultate
no_results: Geen resultate gevind nie
search:
title:
@ -339,6 +344,381 @@ af:
search_osm_namefinder:
suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
suffix_place: ", {{distance}} {{direction}} van {{placename}}"
search_osm_nominatim:
prefix:
amenity:
airport: Lughawe
arts_centre: Kunssentrum
atm: OTM
auditorium: Ouditorium
bank: Bank
bar: Kroeg
bicycle_parking: Fietsparkering
bicycle_rental: Fietsverhuring
brothel: Bordeel
bureau_de_change: Wisselkantoor
bus_station: Bushalte
cafe: Kafee
car_rental: Motorverhuring
car_wash: Karwas
casino: Casino
cinema: Bioskoop
clinic: Kliniek
club: Klub
college: Kollege
community_centre: Gemeenskap-sentrum
crematorium: Krematorium
dentist: Tandarts
doctors: Dokters
dormitory: Studentehuis
drinking_water: Drinkwater
driving_school: Bestuurskool
embassy: Ambassade
emergency_phone: Noodtelefoon
fast_food: Wegneemetes
ferry_terminal: Veerterminaal
fire_hydrant: Brandkraan
fire_station: Brandweerstasie
fountain: Fontein
fuel: Brandstof
grave_yard: Begraafplaas
health_centre: Gesondheidsentrum
hospital: Hospitaal
hotel: Hotel
hunting_stand: Jagtoring
ice_cream: Roomys
kindergarten: Kleuterskool
library: Biblioteek
market: Mark
marketplace: Markplein
nightclub: Nagklub
nursing_home: Verpleeghuis
office: Kantoor
park: Park
parking: Parkade
pharmacy: Apteek
place_of_worship: Plek van aanbidding
police: Polisie
post_box: Posbus
post_office: Poskantoor
preschool: Kleuterskool
prison: Tronk
pub: Kroeg
public_building: Openbare gebou
public_market: Openbare mark
reception_area: Ontvangsarea
restaurant: Restaurant
retirement_home: Ouetehuis
sauna: Sauna
school: Skool
shelter: Skuiling
shop: Winkel
social_club: Sosiale klub
studio: Studio
supermarket: Supermark
taxi: Taxi
telephone: Openbare telefoon
theatre: Teater
toilets: Toilette
townhall: Stadsaal
university: Universiteit
veterinary: Veearts
waste_basket: Asblik
wifi: WiFi-toegang
youth_centre: Jeugsentrum
boundary:
administrative: Administratiewe grens
building:
apartments: Woonstelblok
block: Boublok
bunker: Bunker
chapel: Kapel
church: Kerk
commercial: Kommersiële-gebou
dormitory: Studentehuis
entrance: Ingang
faculty: Fakulteit-gebou
farm: Plaasgebou
flats: Woonstelle
garage: Garage
hospital: Hospitaal-gebou
hotel: Hotel
house: Huis
industrial: Industriële gebou
office: Kantoorgebou
public: Openbare gebou
residential: Residensiële gebou
retail: Kleinhandel-gebou
school: Skoolgebou
shop: Winkel
stadium: Stadion
store: Winkel
terrace: Terras
tower: Toring
train_station: Spoorwegstasie
university: Universiteitsgebou
"yes": Gebou
highway:
bridleway: Ruiterpad
bus_stop: Bushalte
construction: Snelweg in aanbou
cycleway: Fietspad
distance_marker: Afstandsmerker
emergency_access_point: Noodtoeganspunt
footway: Voetpad
gate: Hek
motorway: Snelweg
motorway_junction: Snelwegknooppunt
path: Pad
pedestrian: Voetpad
platform: Platform
primary: Primêre pad
primary_link: Primêre pad
road: Pad
secondary: Sekondêre pad
secondary_link: Sekondêre pad
service: Dienspad
services: Snelweg Dienste
steps: Trappe
tertiary: Tersiêre pad
track: Spoor
trail: Wandelpad
trunk: Trokpad
trunk_link: Trokpad
unclassified: Ongeklassifiseerde pad
unsurfaced: Grondpad
historic:
archaeological_site: Argeologiese vindplaas
battlefield: Slagveld
building: Gebou
castle: Kasteel
church: Kerk
house: Huis
icon: Ikoon
manor: Landgoed
memorial: Herdenkingsmonument
mine: Myn
monument: Monument
museum: Museum
ruins: Ruïnes
tower: Toring
wayside_cross: Kruis langs die pad
wayside_shrine: Altaar langs die pad
wreck: Wrak
landuse:
cemetery: Begraafplaas
commercial: Kommersiële gebied
construction: Konstruksie
farm: Plaas
farmland: Plaasgrond
farmyard: Plaaswerf
forest: Woud
grass: Gras
industrial: Industriële gebied
landfill: Stortingsterrein
military: Militêre gebied
mine: Myn
mountain: Berg
nature_reserve: Natuurreservaat
park: Park
plaza: Plein
quarry: Steengroewe
railway: Spoor
reservoir: Reservoir
residential: Woongebied
retail: Kleinhandel
vineyard: Wingerd
wetland: Vleiland
wood: Bos
leisure:
beach_resort: Strandoort
fishing: Visvangarea
garden: Tuin
golf_course: Gholfbaan
ice_rink: Ysbaan
marina: Marina
miniature_golf: Minigolf
nature_reserve: Natuurreservaat
park: Park
pitch: Sportveld
playground: Speelgrond
sports_centre: Sport-sentrum
stadium: Stadion
swimming_pool: Swembad
track: Atletiekbaan
water_park: Waterspeelpark
natural:
bay: Baai
beach: Strand
cape: Kaap
cave_entrance: Grotingang
channel: Kanaal
cliff: Kloof
coastline: Kuslyn
crater: Krater
feature: Besienswaardigheid
geyser: Geiser
glacier: Gletser
hill: Heuwel
island: Eiland
land: Land
marsh: Moeras
mud: Modder
peak: Piek
point: Punt
reef: Rif
ridge: Bergkam
river: Rivier
rock: Rotse
scrub: Struikgewas
shoal: Sandbank
spring: Bron
strait: Seestraat
tree: Boom
valley: Vallei
volcano: Vulkaan
water: Water
wetland: Moeras
wetlands: Moeras
wood: Bos
place:
airport: Lughawe
city: Stad
country: Land
county: Distrik
farm: Plaas
house: Huis
houses: Huise
island: Eiland
islet: Eilandjie
municipality: Munisipaliteit
postcode: Poskode
region: Streek
sea: See
state: Staat
subdivision: Deelgebied
suburb: Voorstad
town: Dorp
unincorporated_area: Geïnkorporeerde Ruimte
village: Dorp
railway:
construction: Spoor in aanbou
disused_station: Ongebruikte spoorwegstasie
funicular: Kabelspoorweg
halt: Treinhalte
historic_station: Historiese spoorwegstasie
junction: Spoorwegkruising
level_crossing: Gelykvloerse kruising
monorail: Monorail
narrow_gauge: Smalspoor
platform: Spoorweg-platform
preserved: Historiese spoor
station: Spoorwegstasie
subway: Metrostasie
subway_entrance: Metroingang
switch: Spoogwegpunte
tram_stop: Tramhalte
shop:
apparel: Kledingwinkel
art: Kunswinkel
bakery: Bakkery
beauty: Skoonheidssalon
bicycle: Fietswinkel
books: Boekwinkel
butcher: Slagter
car: Motorwinkel
car_dealer: Motorhandelaar
car_parts: Motoronderdele
car_repair: Motorherstel
carpet: Mat-/tapytwinkel
charity: Liefdadigheidswinkel
chemist: Apteek
clothes: Klerewinkel
computer: Rekenaarwinkel
convenience: Gemakswinkel
copyshop: Fotokopie-winkel
cosmetics: Kosmetiesewinkel
discount: Afslagwinkel
doityourself: Doen-dit-self-winkel
drugstore: Apteek
dry_cleaning: Droogskoonmaker
electronics: Elektronikawinkel
farm: Plaaswinkel
fashion: Modewinkel
fish: Viswinkel
florist: Bloemiste
food: Koswinkel
funeral_directors: Begrafnisondernemer
furniture: Meubels
gallery: Galery
garden_centre: Kwekery/Tuinsentrum
general: Algemene winkel
gift: Geskenkwinkel
grocery: Kruideniersware-winkel
hairdresser: Haarkapper
hardware: Hardwarewinkel
hifi: Hi-fi
insurance: Versekering
jewelry: Juwelierswinkel
kiosk: Kioskwinkel
laundry: Wassery
market: Mark
mobile_phone: Selfoonwinkel
motorcycle: Motorfietswinkel
music: Musiekwinkel
newsagent: Nuusagent
optician: Oogkundige
organic: Organiese koswinkel
outdoor: Buitelug-winkel
pet: Dierewinkel
photo: Fotowinkel
salon: Skoonheidssalon
shoes: Skoenwinkel
shopping_centre: Winkelsentrum
sports: Sportwinkel
stationery: Skryfbehoeftes-winkel
supermarket: Supermark
toys: Speelgoedwinkel
travel_agency: Reisburo
video: Video-winkel
tourism:
alpine_hut: Berghut
artwork: Kunswerk
attraction: Attraksie
bed_and_breakfast: Bed en Ontbyt
cabin: Hut
camp_site: Kampterrein
caravan_site: Karavaanpark
chalet: Chalet
guest_house: Gastehuis
hostel: Hotel
hotel: Hotel
information: Inligting
lean_to: Leer om
motel: Motel
museum: Museum
picnic_site: Piekniekplek
theme_park: Pretpark
valley: Vallei
viewpoint: Uitkykpunt
zoo: Dieretuin
waterway:
boatyard: Skeepswerf
canal: Kanaal
connector: Waterverbinding
dam: Dam
ditch: Sloot
dock: Dokke
drain: Afvoerkanaal
lock: Sluis
lock_gate: Sluisdeur
mineral_spring: Minerale bron
rapids: Stroomversnelling
river: Rivier
riverbank: Rivierbedding
stream: Stroom
water_point: Waterpunt
waterfall: Waterval
javascripts:
map:
base:
@ -482,7 +862,10 @@ af:
lost_password_html:
greeting: Hallo,
lost_password_plain:
click_the_link: As dit u is, kliek op die onderstaande skakel om die wagwoord te herstel.
greeting: Hallo,
hopefully_you_1: Iemand (waarskynlik u) het gevra om die wagwoord te herstel vir
hopefully_you_2: die gebruiker met die e-posadresse op openstreetmap.org.
message_notification:
footer1: U kan ook die boodskap by {{readurl}} lees
footer2: en u kan antwoord by {{replyurl}}
@ -503,6 +886,7 @@ af:
current_user_2: "is beskikbaar op:"
greeting: Hallo daar!
more_videos: "Daar is meer videos hier:"
the_wiki: "Lees meer oor OpenStreetMap op die wiki:"
user_wiki_1: Ons beveel aan dat u 'n gebruikersblad op die wiki skep met onder andere
user_wiki_2: kategorie-etikette wat aandui waar u woon, soos [[Category:Users_in_Pretoria]].
wiki_signup: "U kan ook op die OpenStreetMap-wiki registreer by:"
@ -530,6 +914,7 @@ af:
my_apps: My kliënt-applikasies
register_new: Registreer u applikasie
revoke: Herroep!
title: My OAuth-details
new:
submit: Registreer
title: Registreer 'n nuwe applikasie
@ -558,13 +943,17 @@ af:
table:
entry:
admin: Administratiewe grens
allotments: Volkstuine
apron:
- Lughaweplatform
- terminaal
bridge: Brug
bridleway: Ruiterpad
brownfield: Braakliggende terrein
building: Belangrike gebou
cable:
- Kabelkar
- stoelhyser
cemetery: Begraafplaas
centre: Sport-sentrum
commercial: Kommersiële gebied
@ -610,6 +999,7 @@ af:
track: Spoor
tram:
- Ligte spoor
- tram
trunk: Trokpad
tunnel: Tonnel
unclassified: Ongeklassifiseerde pad
@ -662,6 +1052,7 @@ af:
count_points: "{{count}} punte"
edit: wysig
edit_map: Kaart bewysig
identifiable: IDENTIFISEERBAAR
in: in
map: kaart
more: meer
@ -685,6 +1076,10 @@ af:
see_your_traces: Sien al u spore
trace_optionals:
tags: Etikette
trace_paging_nav:
next: Volgende &raquo;
previous: "&raquo; Vorige"
showing_page: Bladsy {{page}}
view:
delete_track: Verwyder hierdie spoor
description: "Beskrywing:"
@ -785,18 +1180,29 @@ af:
set_home:
flash success: U tuisligging is suksesvol gebêre
view:
activate_user: aktiveer hierdie gebruiker
add as friend: voeg by as vriend
add image: Voeg prent by
ago: ({{time_in_words_ago}} gelede)
block_history: wys blokkades ontvang
blocks by me: blokkades deur my
blocks on me: blokkades op my
change your settings: verander u voorkeure
confirm: Bevestig
create_block: blokkeer die gebruiker
deactivate_user: deaktiveer hierdie gebruiker
delete image: Verwyder prent
delete_user: skrap die gebruiker
description: Beskrywing
diary: dagboek
edits: wysigings
email address: "E-posadres:"
hide_user: versteek hierdie gebruiker
if set location: As u u ligging stel, sal 'n pragtige kaart en ander inligting hieronder verskyn. U kan u ligging stel in u {{settings_link}}.
km away: "{{count}}km vêr"
m away: "{{count}}m vêr"
mapper since: "Karteer sedert:"
moderator_history: wys blokkades uitgedeel
my diary: my dagboek
my edits: my wysigings
my settings: my voorkeure
@ -808,36 +1214,99 @@ af:
no home location: Geen tuisligging verskaf nie.
no nearby users: Daar is nog geen nabygeleë gebruikers wat erken dat hulle karterinswerk doen nie.
remove as friend: verwyder as vriend
role:
administrator: Hierdie gebruiker is 'n administrateur
grant:
administrator: Trek adminregte terug
moderator: Ken moderatorregte toe
moderator: Hierdie gebruiker is 'n moderator
revoke:
administrator: Trek adminregte terug
moderator: Trek moderatorregte terug
send message: stuur boodskap
settings_link_text: voorkeure
traces: spore
unhide_user: maak die gebruiker weer sigbaar
upload an image: Laai 'n prent op
user image heading: Foto van gebruiker
user location: Ligging van gebruiker
your friends: U vriende
user_block:
blocks_by:
empty: "{{name}} het nog geen blokkades uitgevoer nie."
heading: Lys van blokkades deur {{name}}
title: Blokkades deur {{name}}
blocks_on:
empty: "{{name}} is nog nooit geblokkeer nie."
heading: Lys van blokkades teen {{name}}
title: Blokkades vir {{name}}
create:
flash: Het gebruiker {{name}} geblokkeer.
try_contacting: Kontak asseblief die gebruiker en gee hom 'n redelike tyd om te reageer alvorens u hom blokkeer.
try_waiting: Gee die gebruikers asseblief 'n redelike tyd om te reageer voordat u 'n blokkade instel.
edit:
back: Wys alle blokkades
heading: Wysig blokkade op {{name}}
show: Wys hierdie blokkade
submit: Opdateer blokkade
title: Wysig blokkade op {{name}}
filter:
not_a_moderator: U moet 'n moderator wees om die aksie te kan uitvoer.
helper:
time_future: Verval oor {{time}}.
time_past: Het {{time}} gelede verval.
until_login: Aktief totdat die gebruiker inteken.
index:
empty: Daar is nog geen blokkades ingestel nie.
heading: Lys van gebruikersblokkades
title: Gebruikersblokkades
new:
back: Wys alle blokkades
heading: Skep blokkade op {{naam}}
submit: Skep blokkade
not_found:
back: Terug na die indeks
sorry: Jammer, die gebruiker met ID {{id}} kon nie gevind word nie.
partial:
confirm: Is u seker?
creator_name: Skepper
display_name: Geblokkeerde gebruiker
edit: Wysig
not_revoked: (nie herroep nie)
reason: Rede vir blokkade
revoke: Terugtrek
revoker_name: Teruggetrek deur
show: Wys
status: Status
period:
one: 1 uur
other: "{{count}} ure"
revoke:
confirm: Is u seker u wil hierdie blokkade terugtrek?
flash: Hierdie blokkade is teruggetrek.
revoke: Terugtrek
show:
back: Wys alle blokkades
confirm: Is u seker?
edit: Wysig
heading: "{{block_on}} geblokkeer deur {{block_by}}"
needs_view: Die gebruiker moet aanteken alvorens hierdie blokkade verwyder sal word.
reason: "Rede vir blokkade:"
revoke: Terugtrek
revoker: "Teruggetrek deur:"
show: Wys
status: Status
time_future: Verval oor {{time}}
time_past: Het {{time}} gelede verval
title: "{{block_on}} geblokkeer deur {{block_by}}"
update:
success: Die blokkade is opgedateer.
user_role:
grant:
confirm: Bevestig
heading: Bevestig toekenning van rol
title: Bevestig toekenning van rol
revoke:
confirm: Bevestig
heading: Bevestig herroeping van rol
title: Bevestig herroeping van rol

660
config/locales/ca.yml Normal file
View file

@ -0,0 +1,660 @@
# Messages for Catalan (Català)
# Exported from translatewiki.net
# Export driver: syck
# Author: Jmontane
# Author: PerroVerd
# Author: SMP
# Author: Ssola
# Author: Toniher
ca:
activerecord:
attributes:
diary_comment:
body: Cos
diary_entry:
language: Idioma
latitude: Latitud
longitude: Longitud
title: Títol
user: Usuari
friend:
friend: Amic
user: Usuari
message:
body: Cos
recipient: Destinatari
sender: Remitent
title: Títol
trace:
description: Descripció
latitude: Latitud
longitude: Longitud
name: Nom
public: Públic
size: Mida
user: Usuari
visible: Visible
user:
active: Actiu
description: Descripció
display_name: Nom en pantalla
email: E-mail
languages: Idiomes
pass_crypt: Contrasenya
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
way: Camí
way_node: Node del camí
way_tag: Etiqueta del camí
browse:
changeset:
changeset: Conjunt de canvis {{id}}
changesetxml: XML del conjunt de canvis
download: Baixa {{changeset_xml_link}} o {{osmchange_xml_link}}
feed:
title: Conjunt de canvis {{id}}
title_comment: Conjunt de canvis {{id}} - {{comment}}
osmchangexml: XML en format osmChange
title: Conjunt de canvis
changeset_details:
belongs_to: "Pertany a:"
box: caixa
closed_at: "Tancat el:"
created_at: "Creat el:"
has_nodes: "Té els següents {{count}} nodes:"
has_relations: "Té les següents {{count}} relacions:"
has_ways:
one: "Té la següent via:"
other: "Té les següents {{count}} vies:"
show_area_box: Mostra caixa de l'àrea
changeset_navigation:
all:
next_tooltip: Conjunt de canvis següent
prev_tooltip: Conjunt de canvis anterior
user:
name_tooltip: Visualitza les edicions feter per {{user}}
common_details:
changeset_comment: "Comentari:"
edited_at: "Editat:"
edited_by: "Editat per:"
in_changeset: "Al conjunt de canvis:"
version: Versió
containing_relation:
entry: Relació {{relation_name}}
entry_role: Relació {{relation_name}} (com a {{relation_role}})
map:
deleted: Esborrat
larger:
area: Visualitza l'àrea en un mapa més gran
node: Visualitza el node en un mapa més gran
relation: Visualitza la relació en un mapa més gran
way: Visualitza la via en un mapa més gran
loading: S'està carregant...
node:
download: "{{download_xml_link}} o {{view_history_link}}"
download_xml: Baixa l'XML
edit: modificació
node: Node
node_title: "Node: {{node_name}}"
view_history: visualitza l'historial
node_details:
coordinates: "Coordenades:"
part_of: "Part de:"
node_history:
download: "{{download_xml_link}} o {{view_details_link}}"
download_xml: Baixa l'XML
node_history: Historial del node
node_history_title: "Historial del node: {{node_name}}"
view_details: visualitza els detalls
not_found:
sorry: Ho sentim, no s'ha trobat el {{type}} amb l'id {{id}}.
type:
changeset: conjunt de canvis
node: node
relation: relació
way: via
paging_nav:
of: de
showing_page: S'està mostrant pàgina
relation:
download: "{{download_xml_link}} oo {{view_history_link}}"
download_xml: Baixa l'XML
relation: Relació
relation_title: "Relació: {{relation_name}}"
view_history: visualitza l'historial
relation_details:
members: "Membres:"
part_of: "Part de:"
relation_history:
download: "{{download_xml_link}} o {{view_details_link}}"
download_xml: Descarrega XML
relation_history: Historial de la relació
relation_history_title: "Historial de la relació: {{relation_name}}"
view_details: visualitza els detalls
relation_member:
entry_role: "{{type}} {{name}} com {{role}}"
type:
node: Node
relation: Relació
way: Via
start:
manually_select: Sel·leccioneu una altra àrea manualment
view_data: Visualitza la informació per a la vista del mapa actual
start_rjs:
data_frame_title: Informació
data_layer_name: Informació
details: Detalls
drag_a_box: Marqueu un rectangle al mapa per a seleccionar una àrea
edited_by_user_at_timestamp: Editat per [[user]] el [[timestamp]]
history_for_feature: Historial per a [[feature]]
load_data: Carrega dades
loading: S'està carregant...
object_list:
back: Mostra llista d'objectes
details: Detalls
heading: Llista d'objectes
history:
type:
node: Node [[id]]
way: Via [[id]]
selected:
type:
node: Node [[id]]
way: Via [[id]]
type:
node: Node
way: Camí
private_user: usuari privat
show_history: Mostra l'historial
wait: Espereu...
tag_details:
tags: "Etiquetes:"
timeout:
sorry: Hem trigat massa en obtenir les dades pel tipus {{type}} amb identificador {{id}}.
type:
changeset: conjunt de canvis
node: node
relation: relació
way: via
way:
download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
download_xml: Descarrega XML
edit: modificació
view_history: visualitza l'històric
way: Via
way_title: "Via: {{way_name}}"
way_details:
also_part_of:
one: també part de la via {{related_ways}}
other: també part de les vies {{related_ways}}
nodes: "Nodes:"
part_of: "Part de:"
way_history:
download: "{{download_xml_link}} o {{view_details_link}}"
download_xml: Descarrega XML
view_details: visualitza els detalls
way_history: Historial de la via
way_history_title: "Historial de la via: {{way_name}}"
changeset:
changeset:
anonymous: Anònim
big_area: (gran)
no_comment: (cap)
changesets:
area: Àrea
comment: Comentari
id: ID
user: Usuari
list:
description: Canvis recents
heading: Conjunt de canvis
heading_bbox: Conjunt de canvis
heading_user: Conjunt de canvis
heading_user_bbox: Conjunt de canvis
title: Conjunt de canvis
diary_entry:
diary_comment:
confirm: Confirmar
diary_entry:
confirm: Confirmar
edit:
language: Idioma
longitude: "Longitud:"
save_button: Guardar
view:
login: Accés
save_button: Desa
export:
start:
export_button: Exporta
export_details: Les dades l'OpenStreetMap són publicades sota el termes de la <a href="http://creativecommons.org/licenses/by-sa/2.0/">llicència Creative Commons Attribution-ShareAlike 2.0</a>.
format: Format
latitude: "Lat:"
licence: Llicència
longitude: "Lon:"
mapnik_image: Imatge de Mapnik
max: màx
options: Opcions
output: Sortida
scale: Escala
zoom: Zoom
start_rjs:
export: Exporta
geocoder:
description:
types:
cities: Ciutats
description_osm_namefinder:
prefix: "{{distance}} {{direction}} de {{type}}"
direction:
east: est
north: nord
north_east: nord-est
north_west: nord-oest
south: sud
south_east: sud-est
south_west: sud-oest
west: oest
search_osm_namefinder:
suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
suffix_place: ", {{distance}} {{direction}} de {{placename}}"
search_osm_nominatim:
prefix:
amenity:
airport: Aeroport
auditorium: Auditori
bank: Banc
bar: Bar
bureau_de_change: Oficina de canvi
bus_station: Estació d'autobusos
cafe: Cafè
cinema: Cinema
club: Club
courthouse: Jutjat
crematorium: Crematori
dentist: Dentista
drinking_water: Aigua potable
driving_school: Autoescola
embassy: Ambaixada
fire_station: Parc de bombers
grave_yard: Cementiri
hospital: Hospital
hotel: Hotel
ice_cream: Gelat
library: Biblioteca
market: Mercat
nightclub: Club nocturn
park: Parc
parking: Pàrquing
pharmacy: Farmàcia
place_of_worship: Lloc de culte
post_office: Oficina de correus
prison: Presó
restaurant: Restaurant
sauna: Sauna
shop: Botiga
social_club: Club social
supermarket: Supermercat
taxi: Taxi
telephone: Telèfon públic
theatre: Teatre
townhall: Ajuntament
university: Universitat
wifi: Accés a internet WiFi
youth_centre: Centre juvenil
building:
church: Església
hotel: Hotel
stadium: Estadi
tower: Torre
highway:
gate: Porta
historic:
battlefield: Camp de batalla
castle: Castell
church: Església
house: Casa
icon: Icona
monument: Monument
ruins: Ruïnes
tower: Torre
landuse:
farm: Granja
forest: Bosc
mine: Mina
mountain: Muntanya
park: Parc
residential: Àrea residencial
leisure:
fishing: Àrea de pesca
garden: Jardí
ice_rink: Pista de patinatge sobre gel
marina: Port esportiu
miniature_golf: Minigolf
nature_reserve: Reserva natural
park: Parc
sports_centre: Centre esportiu
stadium: Estadi
swimming_pool: Piscina
natural:
bay: Badia
beach: Platja
cape: Cap
crater: Cràter
fjord: Fiord
geyser: Guèiser
glacier: Glacera
island: Illa
point: Punt
river: Riu
tree: Arbre
valley: Vall
volcano: Volcà
water: Aigua
place:
airport: Aeroport
city: Ciutat
country: País
county: Comtat
farm: Granja
house: Casa
houses: Cases
island: Illa
municipality: Municipi
postcode: Codi postal
region: Regió
sea: Mar
state: Estat o província
subdivision: Subdivisió
suburb: Suburbi
town: Poble
shop:
bakery: Fleca
books: Llibreria
butcher: Carnisseria
chemist: Farmàcia
fish: Peixateria
hairdresser: Perruqueria o barberia
jewelry: Joieria
market: Mercat
shoes: Sabateria
supermarket: Supermercat
travel_agency: Agència de viatges
tourism:
artwork: Il·lustració
attraction: Atracció
bed_and_breakfast: Llist i esmorzar (B&B)
chalet: Xalet
guest_house: Alberg
hotel: Hotel
information: Informació
motel: Motel
museum: Museu
picnic_site: Àrea de pícnic
theme_park: Parc temàtic
valley: Vall
viewpoint: Mirador
zoo: Zoològic
waterway:
river: Riu
javascripts:
map:
base:
cycle_map: Cycle Map
noname: NoName
layouts:
edit: Modificació
export: Exporta
gps_traces: Traces de GPS
history: Historial
logo:
alt_text: logotip de l'OpenStreetMap
shop: Botiga
user_diaries: DIaris de usuari
view: Veure
view_tooltip: Visualitza els mapes
map:
coordinates: "Coordenades:"
edit: Modifica
view: Visualitza
message:
inbox:
date: Data
message_summary:
delete_button: Suprimeix
new:
send_button: Envia
subject: Assumpte
outbox:
date: Data
my_inbox: El meu {{inbox_link}}
to: A
read:
date: Data
from: De
reply_button: Respon
to: Per a
notifier:
diary_comment_notification:
hi: Hola {{to_user}},
email_confirm:
subject: "[OpenStreetMap] Confirmeu l'adreça de correu"
email_confirm_html:
greeting: Hi,
email_confirm_plain:
greeting: Hola,
gpx_notification:
greeting: Hola,
lost_password_html:
greeting: Hola,
lost_password_plain:
greeting: Hola,
message_notification:
hi: Hola {{to_user}},
oauth_clients:
edit:
submit: Modificació
form:
name: Nom
site:
edit:
user_page_link: pàgina d'usuari
key:
table:
entry:
cemetery: Cementiri
centre: Centre esportiu
farm: Granja
lake:
- Llac
military: Àrea militar
reserve: Reserva natural
school:
- Escola
search:
search: Cerca
where_am_i: On sóc?
sidebar:
close: Tanca
trace:
create:
upload_trace: Pujar traça de GPS
edit:
description: "Descripció:"
download: descàrrega
edit: modificació
filename: "Nom del fitxer:"
map: mapa
owner: "Propietari:"
points: "Punts:"
save_button: Guardar canvis
start_coord: "Coordenada d'inici:"
tags: "Etiquetes:"
tags_help: separat per comas
title: Editant traça {{name}}
uploaded_at: "Pujat a:"
visibility: "Visibilitat:"
list:
tagged_with: " etiquetat amb {{tags}}"
your_traces: Les teves traces GPS
no_such_user:
heading: No existeix l'usuari {{user}}
trace:
ago: fa {{time_in_words_ago}}
by: en
count_points: "{{count}} punts"
edit: modificació
edit_map: Edita el mapa
identifiable: IDENTIFICABLE
in: a
map: mapa
more: mes
pending: PENDENT
private: PRIVAT
public: PUBLIC
trace_details: Veure detalls de la traça
view_map: Visualitza el mapa
trace_form:
description: Descripció
help: Ajuda
tags: Etiquetes
upload_button: Pujar
visibility: Visibilitat
visibility_help: què significa això?
trace_header:
see_all_traces: Veure totes les traces
see_your_traces: Veure totes les teves traces
trace_optionals:
tags: Etiquetes
trace_paging_nav:
next: Següent &raquo;
previous: "&laquo; Previ"
view:
description: "Descripció:"
download: baixada
edit: modificació
edit_track: Edita aquesta traça
filename: "Nom del fitxer:"
map: mapa
none: Ningú
owner: "Propietari:"
pending: PENDENT
points: "Punts:"
tags: "Etiquetes:"
uploaded: "Pujat el:"
visibility: "Visibilitat:"
user:
account:
email never displayed publicly: (no es mostrarà mai en públic)
latitude: "Latitud:"
longitude: "Longitud:"
preferred languages: "Llengües preferents:"
public editing:
enabled link text: què és això?
return to profile: Torna al perfil
save changes button: Desa els canvis
title: Edita el compte
confirm:
button: Confirmar
confirm_email:
button: Confirmar
friend_map:
your location: La teva situació
login:
create_account: crea un compte
email or username: "Adreça de correu o usuari:"
heading: Accés
login_button: Accés
lost password link: Heu perdut la contrasenya?
password: "Contrasenya:"
please login: Si us plau, inicieu la sessió o {{create_user_link}}.
title: Accés
lost_password:
email address: "Adreça de correu electrònic:"
heading: Heu oblidat la contrasenya?
make_friend:
success: "{{name}} ara és el vostre amic."
new:
confirm password: "Confirmeu la contrasenya:"
email address: "Adreça de correu:"
heading: Crea un compte d'usuari
password: "Contrasenya:"
signup: Registre
reset_password:
confirm password: "Confirmeu la contrasenya:"
flash changed: S'ha canviat la contrasenya.
password: "Contrasenya:"
title: Reinicialitza la contrasenya
view:
add image: Afegeix una imatge
confirm: Confirmeu
create_block: boca aquest usuari
deactivate_user: desactiva aquest usuari
delete image: Suprimeix la imatge
delete_user: Suprimeix aquest usuari
description: Descripció
diary: diari
edits: modificacions
email address: "Adreça de correu:"
my diary: el meu diari
my edits: les meves edicions
my traces: les meves traces
nearby users: "Usuaris propers:"
role:
administrator: Aquest usuari és administrador
moderator: Aquest usuari és moderador
settings_link_text: preferències
traces: traces
user image heading: Imatge d'usuari
your friends: Els vostres amics
user_block:
partial:
confirm: N'esteu segur?
creator_name: Creador
edit: Edició
show: Mostra
status: Estatus
period:
one: 1 hora
other: "{{count}} hores"
show:
confirm: N'esteu segur?
edit: Edició
show: Mostra
user_role:
filter:
doesnt_have_role: L'usuari no té el rol {{role}}.
grant:
confirm: Confirmar
revoke:
confirm: Confirmar
heading: Confirmar revocació de rol
title: Confirmar revocació de rol

View file

@ -603,7 +603,7 @@ cs:
heading: Uživatel {{user}} neexistuje
trace:
ago: před {{time_in_words_ago}}
count_points: "{{count}} body"
count_points: "{{count}} bodů"
edit: upravit
edit_map: Upravit mapu
in: v

View file

@ -182,6 +182,12 @@ da:
zoom_or_select: Zoom ind eller vælg et område af kortet for visning
tag_details:
tags: "Egenskaber:"
timeout:
type:
changeset: ændringssæt
node: punkt
relation: relation
way: vej
way:
download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
download_xml: Hent XML
@ -214,9 +220,22 @@ da:
previous: "&laquo; Forrige"
showing_page: Viser side {{page}}
changesets:
area: Område
comment: Kommentar
user: Bruger
list:
description: Seneste ændringer
description_bbox: Ændringssæt inden for {{bbox}
description_user: Ændringssæt af {{user}}
description_user_bbox: Ændringssæt af {{user}} inden for {{bbox}}
heading: Ændringssæt
heading_bbox: Ændringssæt
heading_user: Ændringssæt
heading_user_bbox: Ændringssæt
title: Ændringssæt
title_bbox: Ændringssæt inden for {{bbox}}
title_user: Ændringssæt af {{user}}
title_user_bbox: Ændringssæt af {{user}} inden for {{bbox}}
diary_entry:
diary_comment:
confirm: Bekræft
@ -258,6 +277,13 @@ da:
manually_select: Vælg et andet område manuelt
view_larger_map: Vis større kort
geocoder:
description:
title:
osm_namefinder: "{{types}} fra <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
types:
cities: Storbyer
places: Steder
towns: Byer
description_osm_namefinder:
prefix: "{{distance}} {{direction}} for {{type}}"
direction:
@ -274,6 +300,7 @@ da:
other: omkring {{count}}km
zero: mindre end 1 km
results:
more_results: Flere resultater
no_results: Ingen resultater fundet
search:
title:
@ -544,7 +571,7 @@ da:
please login: Log på eller {{create_user_link}}.
title: Log på
lost_password:
email address: "E-mailadresse:"
email address: "E-mail-adresse:"
heading: Glemt adgangskode?
new password button: Nulstil adgangskode
notice email cannot find: Kunne ikke finde din e-mail. Beklager.
@ -554,7 +581,13 @@ da:
failed: Desværre, kunne ikke tilføje {{name}} som din ven.
success: "{{name}} er nu din ven."
new:
confirm email address: "Bekræft e-mail-adresse:"
confirm password: "Bekræft adgangskode:"
email address: "E-mail-adresse:"
heading: Opret konto
no_auto_account_create: Vi kan desværre ikke oprette en konto automatisk for dig pt.
password: "Adgangskode:"
signup: Tilmeld
title: Opret konto
no_such_user:
body: Der findes desværre ingen bruger ved navn {{user}}. Tjek venligst stavningen, ellers kan linket du trykkede på være forkert.
@ -562,8 +595,11 @@ da:
title: Ingen sådan bruger
reset_password:
confirm password: "Bekræft adgangskode:"
flash changed: Din adgangskode er ændret.
heading: Nulstil adgangskode for {{user}}
password: "Adgangskode:"
reset: Nulstil adgangskode
title: Nulstil adgangskode
set_home:
flash success: Hjemmeposition gemt
view:
@ -576,18 +612,27 @@ da:
delete_user: slet denne bruger
description: Beskrivelse
diary: dagbog
edits: redigeringer
email address: "E-mail-adresse:"
hide_user: skjul denne bruger
km away: "{{count}}km væk"
m away: "{{count}} m væk"
my diary: min dagbog
my edits: mine redigeringer
my settings: mine indstillinger
my traces: mine GPS-spor
nearby users: "Brugere nær dig:"
new diary entry: ny dagbogsoptegnelse
no home location: Ingen hjemmeposition sat.
remove as friend: fjern som ven
role:
administrator: Denne bruger er en administrator
send message: send besked
settings_link_text: indstillinger
traces: GPS-spor
unhide_user: stop med at skjule denne bruger
upload an image: Send et billede
user image heading: Brugerbillede
user location: Brugereposition
your friends: Dine venner
user_block:

View file

@ -226,6 +226,13 @@ de:
zoom_or_select: Karte vergrössern oder einen Bereich auf der Karte auswählen
tag_details:
tags: "Tags:"
timeout:
sorry: Entschuldigung, es dauerte zu lange die Daten für den/die {{type}} mit der ID {{id}} abzurufen.
type:
changeset: Änderungssatz
node: Knoten
relation: Relation
way: Weg
way:
download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
download_xml: Als XML herunterladen
@ -397,6 +404,7 @@ de:
other: ca. {{count}} km
zero: weniger als 1 km
results:
more_results: Mehr Treffer
no_results: Keine Ergebnisse
search:
title:
@ -1287,6 +1295,10 @@ de:
traces_waiting: "{{count}} deiner Tracks sind momentan in der Warteschlange. Bitte warte bis diese fertig sind, um die Verarbeitung nicht für andere Nutzer zu blockieren."
trace_optionals:
tags: Tags
trace_paging_nav:
next: nächste
previous: vorherige
showing_page: Seite {{page}}
view:
delete_track: Diesen Track löschen
description: "Beschreibung:"

View file

@ -898,9 +898,11 @@ en:
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: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}. Other supporters of the project are listed in the {{partners}}."
intro_3_ucl: "UCL VR Centre"
intro_3_bytemark: "bytemark"
intro_3_partners: "wiki"
intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
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."

View file

@ -495,6 +495,7 @@ es:
university: Universidad
vending_machine: Máquina expendedora
veterinary: Clínica veterinaria
village_hall: Sala del pueblo
waste_basket: Cesto de basura
wifi: Acceso a Internet inalámbrico
youth_centre: Centro juvenil
@ -547,6 +548,7 @@ es:
living_street: Calle residencial
motorway: Autovía
motorway_junction: Cruce de autovías
motorway_link: Enlace de autovía
path: Camino
pedestrian: Vía peatonal
platform: Plataforma
@ -721,6 +723,7 @@ es:
station: Estación de trenes
subway: Estación de metro
subway_entrance: Entrada al metro
switch: Aguja de ferrocarril
tram: Ruta de tranvía
tram_stop: Parada de tranvía
yard: Estación de clasificación
@ -819,7 +822,9 @@ es:
waterway:
boatyard: Astillero
canal: Canal
connector: Esclusa
dam: Presa
derelict_canal: Canal abandonado
ditch: Acequia
dock: Muelle
drain: Desagüe

View file

@ -1231,7 +1231,7 @@ fr:
save_button: Enregistrer les modifications
start_coord: "Coordonnées de départ :"
tags: "Balises :"
tags_help: séparé par des virgules
tags_help: séparées par des virgules
title: Modifier la trace {{name}}
uploaded_at: "Envoyé le :"
visibility: "Visibilité :"
@ -1272,7 +1272,7 @@ fr:
description: Description
help: Aide
tags: Balises
tags_help: séparé par des virgules
tags_help: séparées par des virgules
upload_button: Envoyer
upload_gpx: Envoyer un fichier GPX
visibility: Visibilité

View file

@ -3,7 +3,6 @@
# Export driver: syck
# Author: Mnalis
# Author: Mvrban
# Author: Suradnik13
hr:
activerecord:
attributes:
@ -478,6 +477,7 @@ hr:
prison: Zatvor
pub: Pub
public_building: Ustanova
public_market: Javna tržnica
reception_area: Recepcija
recycling: Reciklažna točka
restaurant: Restoran
@ -498,12 +498,15 @@ hr:
university: Sveučilište
vending_machine: Automat
veterinary: Veterinar
village_hall: Seoski Dom
waste_basket: Kanta za otpatke
wifi: WiFi pristupna točka
youth_centre: Centar za mladež
boundary:
administrative: Administrativna granica
building:
apartments: Stambeni blok
block: Blok zgrada
bunker: Bunker
chapel: Kapelica
church: Crkva
@ -512,14 +515,18 @@ hr:
dormitory: Studentski dom
entrance: Ulaz
faculty: Zgrada fakulteta
farm: Farma (zgrada)
flats: Stanovi
garage: Garaža
hall: Dvorana
hospital: Bolnica
hotel: Hotel
house: Kuća
industrial: Industrijska zgrada
office: Uredska zgrada
public: Javna zgrada
residential: Stambena zgrada
retail: Maloprodajna zgrada
school: Školska zgrada
shop: Trgovina
stadium: Stadion
@ -575,6 +582,7 @@ hr:
castle: Dvorac
church: Crkva
house: Kuća
icon: Ikona
manor: Zamak
memorial: Spomen dom
mine: Rudnik
@ -582,18 +590,23 @@ hr:
museum: Muzej
ruins: Ruševine
tower: Toranj
wayside_cross: Krajputaš
wayside_shrine: Usputno svetište
wreck: Olupina
landuse:
allotments: Vrtovi
basin: Bazen
brownfield: Zemljište za prenamjenu
cemetery: Groblje
commercial: Poslovno područje
conservation: Zaštićeno područje
construction: Gradilište
farm: Farma
farmland: Polje
farmyard: Farma
forest: Šuma
grass: Trava
greenfield: Greenfield zemljište
industrial: Industrijsko područje
landfill: Deponija
meadow: Livada
@ -610,6 +623,7 @@ hr:
reservoir: Rezervoar
residential: Stambeno područje
retail: Trgovina
village_green: Seoski travnjak
vineyard: Vinograd
wetland: Močvara
wood: Šuma
@ -696,23 +710,31 @@ hr:
unincorporated_area: Slobodna zemlja
village: Selo
railway:
abandoned: Napuštena pruga
construction: Pruga u izgradnji
disused: Napuštena pruga
disused_station: Željeznička stanica (nije u upotrebi)
funicular: Uspinjača
halt: Željeznička stanica
historic_station: Povijesna željeznička stanica
junction: Željeznički čvor
level_crossing: Pružni prijelaz
light_rail: Laka željeznica
monorail: Jednotračna pruga
narrow_gauge: Uskotračna pruga
platform: Željeznička platforma
preserved: Sačuvana pruga
spur: Pruga
station: Željeznički kolodvor
subway: Podzemna - stanica
subway_entrance: Podzemna - ulaz
switch: Skretnica
tram: Tramvaj
tram_stop: Tramvajska stanica
yard: Ranžirni kolodvor
shop:
alcohol: Trgovina pićem
apparel: Trgovina odjećom
art: Atelje
bakery: Pekara
beauty: Parfumerija
@ -725,6 +747,7 @@ hr:
car_parts: Autodijelovi
car_repair: Autoservis
carpet: Trgovina tepisima
charity: Dobrotvorna trgovina
chemist: Ljekarna
clothes: Butik
computer: Computer Shop
@ -740,6 +763,7 @@ hr:
electronics: Trgovina elektronikom
estate_agent: Agencija za nekretnine
farm: Poljo-apoteka
fashion: Modna trgovina
fish: Ribarnica
florist: Cvjećarnica
food: Trgovina prehranom
@ -747,6 +771,7 @@ hr:
furniture: Namještaj
gallery: Galerija
garden_centre: Vrtni centar
general: Trgovina mješovitom robom
gift: Poklon trgovina
greengrocer: Voćarna
grocery: Trgovina prehranom
@ -759,9 +784,12 @@ hr:
laundry: Praonica rublja
mall: Trgovački centar
market: Tržnica
mobile_phone: Trgovina mobitelima
motorcycle: Moto Shop
music: Trgovina glazbom
newsagent: Novinar
optician: Optičar
organic: Trgovina zdrave hrane
outdoor: Trgovina za slobodno vrijeme
pet: Trgovina za kućne ljubimce
photo: Fotograf
@ -797,15 +825,26 @@ hr:
viewpoint: Vidikovac
zoo: Zoo
waterway:
boatyard: Brodogradilište
canal: Kanal
connector: Spoj vodnih puteva
dam: Brana
derelict_canal: Zanemaren kanal
ditch: Jarak
dock: Dok
drain: Odvod
lock: Ustava
lock_gate: Ustava
mineral_spring: Mineralni izvor
mooring: Sidrište
rapids: Brzaci
river: Rijeka
riverbank: Riječna obala
stream: Potok
wadi: Suho korito rijeke
water_point: Točka vodotoka
waterfall: Vodopad
weir: Brana
javascripts:
map:
base:

View file

@ -215,6 +215,13 @@ hu:
zoom_or_select: Közelíts rá vagy jelölj ki egy területet a térképen a megtekintéshez
tag_details:
tags: "Címkék:"
timeout:
sorry: Sajnálom, a(z) {{type}} típusú {{id}} azonosítójú adatok kinyerése túl sokáig tartott.
type:
changeset: módosításcsomag
node: pont
relation: kapcsolat
way: vonal
way:
download: "{{download_xml_link}}, {{view_history_link}} vagy {{edit_link}}"
download_xml: XML letöltése
@ -386,6 +393,7 @@ hu:
other: kb. {{count}} km
zero: kevesebb mint 1 km
results:
more_results: További eredmények
no_results: Nem találhatók eredmények
search:
title:
@ -405,110 +413,438 @@ hu:
prefix:
amenity:
airport: Repülőtér
atm: Bankjegykiadó automata
arts_centre: Művészeti központ
atm: Bankautomata
auditorium: Auditórium
bank: Bank
bar: Bár
bench: Pad
bicycle_parking: Kerékpártároló
bicycle_rental: Kerékpárkölcsönző
bus_station: Buszállomás
brothel: Bordélyház
bureau_de_change: Pénzváltó
bus_station: Autóbusz-állomás
cafe: Kávézó
car_rental: Autókölcsönző
car_sharing: Autómegosztás
car_wash: Autómosó
casino: Kaszinó
cinema: Mozi
clinic: Klinika
club: Klub
college: Fõiskola
community_centre: Művelődési központ
courthouse: Bíróság
crematorium: Krematórium
dentist: Fogorvos
doctors: Orvosi rendelő
dormitory: Kollégium
drinking_water: Ivóvíz
driving_school: Autósiskola
embassy: Nagykövetség
emergency_phone: Segélyhívó
fast_food: Gyorsétterem
ferry_terminal: Kompkikötő
fire_hydrant: Tűzcsap
fire_station: Tűzoltóság
fuel: Üzemanyag
fountain: Szökőkút
fuel: Benzinkút
grave_yard: Kis temető
gym: Fitness- / Tornaterem
hall: Csarnok
health_centre: Egészségügyi központ
hospital: Kórház
hotel: Szálloda
hunting_stand: Magasles
ice_cream: Jégkrém
kindergarten: Óvoda
library: Könyvtár
market: Piac
marketplace: Vásártér
mountain_rescue: Hegyimentők
nightclub: Éjszakai bár
nursery: Óvoda
nursing_home: Idősek otthona
office: Iroda
park: Park
parking: Parkoló
pharmacy: Gyógyszertár
place_of_worship: Vallási hely
police: Rendőrség
post_box: Postaláda
post_office: Posta
preschool: Óvoda
prison: Börtön
pub: Kocsma
public_building: Középület
public_market: Piac
reception_area: Recepció
recycling: Szelektív hulladékgyűjtő
restaurant: Étterem
retirement_home: Nyugdíjasotthon
sauna: Szauna
school: Iskola
shelter: Esőház
shop: Bolt
shopping: Bevásárlás
social_club: Társasági klub
studio: Stúdió
supermarket: Szupermarket
taxi: Taxi
telephone: Nyilvános telefon
theatre: Színház
toilets: WC
townhall: Városháza
university: Egyetem
vending_machine: Árusító automata
veterinary: Állatorvosi rendelő
village_hall: Községháza
waste_basket: Szemétgyűjtő kosár
wifi: WiFi hozzáférés
youth_centre: Ifjúsági központ
boundary:
administrative: Közigazgatási határ
building:
apartments: Társasház
block: Háztömb
bunker: Bunker
chapel: Kápolna
church: Templom
city_hall: Városháza
commercial: Kereskedelmi épület
dormitory: Kollégium
entrance: Épületbejárat
faculty: Egyetemi épület
farm: Tanyaépület
flats: Lakások
garage: Garázs
hall: Csarnok
hospital: Kórházépület
hotel: Szálloda
house: Ház
industrial: Ipari épület
public: Nyilvános épület
office: Irodaház
public: Középület
residential: Lakóház
retail: Kereskedelmi épület
school: Iskolaépület
university: Egyetemi épület
highway:
bus_stop: Buszmegálló
construction: Építés alatt álló autópálya
footway: Gyalogút
steps: Lépcső
leisure:
garden: Kert
park: Park
shop: Bolt
stadium: Stadion
swimming_pool: Úszómedence
store: Áruház
terrace: Sorház
tower: Torony
train_station: Vasútállomás
university: Egyetemi épület
"yes": Épület
highway:
bridleway: Lovaglóút
bus_guideway: Buszsín
bus_stop: Buszmegálló
byway: Kiépítetlen ösvény
construction: Építés alatt álló közút
cycleway: Kerékpárút
distance_marker: Távolságjelölő
emergency_access_point: Vészhelyzeti hozzáférési pont
footway: Gyalogút
ford: Gázló
gate: Kapu
living_street: Pihenőút
minor: Alárendelt út
motorway: Autópálya
motorway_junction: Autópálya-csomópont
motorway_link: Autópálya
path: Ösvény
pedestrian: Sétálóutca
platform: Peron
primary: Főút
primary_link: Főút
raceway: Versenypálya
residential: Lakóövezeti út
road: Út
secondary: Összekötő út
secondary_link: Összekötő út
service: Szervizút
services: Autópálya-pihenőhely
steps: Lépcső
stile: Lépcsős átjáró
tertiary: Bekötőút
track: Földút
trail: Túraút
trunk: Autóút
trunk_link: Autóút
unclassified: Egyéb út
unsurfaced: Burkolatlan út
historic:
archaeological_site: Régészeti lelőhely
battlefield: Csatamező
boundary_stone: Határkő
building: Épület
castle: Vár
church: Templom
house: Ház
icon: Ikon
manor: Majorság
memorial: Emlékmű
mine: Bánya
monument: Műemlék
museum: Múzeum
ruins: Rom
tower: Torony
wayside_cross: Útszéli kereszt
wayside_shrine: Útszéli kegyhely
wreck: Hajóroncs
landuse:
allotments: Kert
basin: Medence
brownfield: Barnamező
cemetery: Temető
commercial: Irodaterület
conservation: Védelmi terület
construction: Építési terület
farm: Tanya
farmland: Mezőgazdasági terület
farmyard: Tanya épületei
forest: Erdő
grass: Füves terület
greenfield: Zöldmező
industrial: Ipari terület
landfill: Hulladéklerakó
meadow: Rét
military: Katonai terület
mine: Bánya
mountain: Hegy
nature_reserve: Természetvédelmi terület
park: Park
piste: Sípálya
plaza: Tér
quarry: Kőfejtő
railway: Vasúti terület
recreation_ground: Szabadidőpark
reservoir: Víztározó
residential: Lakóövezet
retail: Kereskedelmi terület
village_green: Közös mező
vineyard: Szőlős
wetland: Láp
wood: Erdő
leisure:
beach_resort: Tengerparti üdülőhely
common: Közös terület
fishing: Horgászterület
garden: Kert
golf_course: Golfpálya
ice_rink: Műjégpálya
marina: Kishajókikötő
miniature_golf: Minigolfpálya
nature_reserve: Természetvédelmi terület
park: Park
pitch: Labdarúgópálya
playground: Játszótér
recreation_ground: Szabadidőpark
slipway: Sólya
sports_centre: Sportközpont
stadium: Stadion
swimming_pool: Uszoda
track: Futópálya
water_park: Vízipark
natural:
bay: Öböl
beach: Part
cape: Partfok
cave_entrance: Barlangbejárat
channel: Csatorna
cliff: Szikla
coastline: Tengerpart
crater: Kráter
feature: Tereptárgy
fell: Kopár
fjord: Fjord
geyser: Gejzír
glacier: Gleccser
heath: Puszta
hill: Domb
island: Sziget
land: Szárazföld
marsh: Mocsár
moor: Mocsár
mud: Iszap
peak: Hegycsúcs
point: Pont
reef: Zátony
ridge: Hegygerinc
river: Folyó
rock: Szikla
scree: Sziklatörmelék
scrub: Cserjés
shoal: Zátony
spring: Forrás
strait: Tengerszoros
tree: Fa
valley: Völgy
volcano: Vulkán
water:
wetland: Láp
wetlands: Láp
wood: Erdő
place:
airport: Repülőtér
city: Város
farm: Farm
city: Nagyváros
country: Ország
county: Megye
farm: Tanya
hamlet: Község
house: Ház
houses: Házak
island: Sziget
islet: Kis sziget
locality: Hely
moor: Mocsár
municipality: Település
postcode: Irányítószám
region: Régió
sea: Tenger
state: Állam
subdivision: Településrész
suburb: Városrész
town: Város
village: Falu
unincorporated_area: Jogi személyiséggel nem rendelkező terület
village: Nagyközség
railway:
abandoned: Felhagyott vasút
construction: Építés alatt álló vasút
disused: Használaton kívüli vasút
disused_station: Használaton kívüli vasútállomás
funicular: Siklóvasút
halt: Vasúti megállóhely
historic_station: Történelmi vasútállomás
junction: Vasúti csomópont
level_crossing: Vasúti átjáró
light_rail: HÉV
monorail: Egysínű vasút
narrow_gauge: Keskeny nyomközű vasút
platform: Vasúti peron
preserved: Megőrzött vasút
spur: Vasúti szárnyvonal
station: Vasútállomás
subway: Metróállomás
subway_entrance: Metrókijárat
switch: Vasúti váltó
tram: Villamos
tram_stop: Villamosmegálló
yard: Rendező-pályaudvar
shop:
bicycle: Kerékpárüzlet
alcohol: Alkoholos italbolt
apparel: Ruházati bolt
art: Művészeti bolt
bakery: Pékség
beauty: Szépészeti bolt
beverages: Italbolt
bicycle: Kerékpárbolt
books: Könyvesbolt
car_parts: Autóalkatrész
butcher: Hentesbolt
car: Autókereskedés
car_dealer: Autókereskedés
car_parts: Autóalkatrészbolt
car_repair: Autószerviz
carpet: Szőnyegbolt
charity: Adománybolt
chemist: Vegyipari bolt
clothes: Ruházati bolt
computer: Számítástechnikai bolt
confectionery: Cukrászda
convenience: Kisbolt
copyshop: Fénymásoló bolt
cosmetics: Kozmetikai bolt
department_store: Áruház
discount: Diszkontárubolt
doityourself: Barkácsbolt
drugstore: Illatszerbolt
dry_cleaning: Ruhatisztító
electronics: Elektronikai bolt
estate_agent: Ingatlankereskedés
farm: Kertészbolt
fashion: Divatbolt
fish: Halbolt
furniture: Bútor
florist: Virágárus
food: Élelmiszerbolt
funeral_directors: Temetkezési vállalkozó
furniture: Bútorbolt
gallery: Galéria
garden_centre: Cserepes virágbolt
general: Vegyeskereskedés
gift: Ajándékbolt
hifi: Hi-Fi
greengrocer: Zöldséges
grocery: Fűszerbolt
hairdresser: Fodrászat
hardware: Szerelési bolt
hifi: Hi-Fi bolt
insurance: Biztosító
jewelry: Ékszerbolt
kiosk: Trafik
laundry: Mosoda
mall: Üzletház
market: Piac
mobile_phone: Mobiltelefonbolt
motorcycle: Motorbolt
music: Zenebolt
newsagent: Újságárus
optician: Látszerész
organic: Bioélelmiszerbolt
outdoor: Túrabolt
pet: Állatkereskedés
photo: Fotóbolt
salon: Szalon
shoes: Cipőbolt
shopping_centre: Bevásárlóközpont
sports: Sportbolt
stationery: Írószerbolt
supermarket: Szupermarket
toys: Játékbolt
travel_agency: Utazási iroda
video: Videókölcsönző
wine: Borárusító italbolt
tourism:
alpine_hut: Alpesi kunyhó
artwork: Műalkotás
attraction: Látnivaló
bed_and_breakfast: Vendégház
cabin: Kunyhó
camp_site: Kemping
caravan_site: Lakókocsitábor
chalet: Nyaralóház
guest_house: Vendégház
hostel: Turistaszálló
hotel: Szálloda
information: Információ
lean_to: Kunyhó
motel: Motel
museum: Múzeum
picnic_site: Piknikezőhely
theme_park: Vidámpark
valley: Völgy
viewpoint: Kilátó
zoo: Állatkert
waterway:
boatyard: Hajóhangár
canal: Csatorna
connector: Vízi csatlakozó
dam: Gát
derelict_canal: Felhagyott csatorna
ditch: Árok
dock: Kikötõ
drain: Árok
lock: Zsilip
lock_gate: Zsilip
mineral_spring: Ásványos patak
mooring: Kikötő
rapids: Zuhatag
river: Folyó
riverbank: Folyópart
stream: Patak
wadi: Vádi
water_point: Vízi fordítópont
waterfall: Vízesés
weir: Bukógát
javascripts:
map:
base:
@ -824,7 +1160,7 @@ hu:
- függőszékes felvonó
cemetery: Temető
centre: Sportközpont
commercial: Irodaterület
commercial: Kereskedelmi terület
common:
- Füves terület
- rét
@ -917,12 +1253,18 @@ hu:
body: Sajnálom, nincs {{user}} nevű felhasználó. Ellenőrizd a helyességét, vagy lehet, hogy a link, amire kattintottál, rossz.
heading: "{{user}} felhasználó nem létezik"
title: Nincs ilyen felhasználó
offline:
heading: A GPX-tároló offline
message: A GPX-fájltároló és -feltöltő rendszer jelenleg nem érhető el.
offline_warning:
message: A GPX-fájlfeltöltő rendszer jelenleg nem érhető el
trace:
ago: "ennyivel ezelőtt: {{time_in_words_ago}}"
by: "készítette:"
count_points: "{{count}} pont"
edit: szerkesztés
edit_map: Térkép szerkesztése
identifiable: AZONOSÍTHATÓ
in: "itt:"
map: térkép
more: tovább
@ -930,6 +1272,7 @@ hu:
private: NEM NYILVÁNOS
public: NYILVÁNOS
trace_details: Nyomvonal részleteinek megtekintése
trackable: NYOMKÖVETHETŐ
view_map: Térkép megtekintése
trace_form:
description: Leírás
@ -947,6 +1290,10 @@ hu:
traces_waiting: "{{count}} nyomvonalad várakozik feltöltésre. Kérlek fontold meg, hogy megvárod, amíg ezek befejeződnek mielőtt feltöltesz továbbiakat, hogy így ne tartsd fel a többi felhasználót a sorban."
trace_optionals:
tags: Címkék
trace_paging_nav:
next: Következő &raquo;
previous: "&laquo; Előző"
showing_page: "Jelenlegi oldal: {{page}}"
view:
delete_track: Ezen nyomvonal törlése
description: "Leírás:"

View file

@ -1048,7 +1048,7 @@ mk:
oauthorize:
allow_read_gpx: ви ги чита вашите приватни GPS траги.
allow_read_prefs: ви ги чита корисничките прилагодувања.
allow_to: "Дозволи ѝ на клиентската апликација да:"
allow_to: "Дозволи му на клиентскиот програм да:"
allow_write_api: ја менува картата.
allow_write_diary: создава ставки во дневникот, пишува коментари и да се спријателува.
allow_write_gpx: подига GPS траги.
@ -1060,7 +1060,7 @@ mk:
create:
flash: Информациите се успешно регистрирани
destroy:
flash: Уништена е пријавната регистрација за клиентската апликација.
flash: Уништена е пријавната регистрација за клиентскиот програм.
edit:
submit: Уреди
title: Уредете ја апликацијата

View file

@ -282,7 +282,7 @@ nl:
comment_count:
one: 1 reactie
other: "{{count}} reacties"
comment_link: Reageren op dit bericht
comment_link: Reactie plaatsen bij dit bericht
confirm: Bevestigen
edit_link: Dit bericht bewerken
hide_link: Bericht verbergen

View file

@ -5,6 +5,7 @@
# Author: Luckas Blade
# Author: McDutchie
# Author: Nighto
# Author: Rodrigo Avila
pt-BR:
activerecord:
attributes:
@ -216,6 +217,13 @@ pt-BR:
zoom_or_select: Aproxime ou selecione uma área diferente para visualizar
tag_details:
tags: "Etiquetas:"
timeout:
sorry: Desculpe, mas os dados para {{type}} com id {{id}} estão demorando muito para chegar.
type:
changeset: conjunto de mudanças
node:
relation: relação
way: caminho
way:
download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
download_xml: Baixar XML
@ -246,7 +254,9 @@ pt-BR:
still_editing: (ainda editando)
view_changeset_details: Ver detalhes das alterações
changeset_paging_nav:
showing_page: Exibindo página
next: Seguinte &raquo;
previous: "&laquo; Anterior"
showing_page: Exibindo página {{page}}
changesets:
area: Área
comment: Comentário
@ -269,12 +279,16 @@ pt-BR:
diary_entry:
diary_comment:
comment_from: Comentário de {{link_user}} em {{comment_created_at}}
confirm: Confirmar
hide_link: Ocultar esse comentário
diary_entry:
comment_count:
one: 1 comentário
other: "{{count}} comentários"
comment_link: Comentar nesta entrada
confirm: Confirmar
edit_link: Editar esta entrada
hide_link: Ocultar essa entrada
posted_by: Postado por {{link_user}} em {{created}} em {{language_link}}
reply_link: Responder esta entrada
edit:
@ -361,6 +375,7 @@ pt-BR:
title:
geonames: Localização do <a href="http://www.geonames.org/">GeoNames</a>
osm_namefinder: "{{types}} de <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
osm_nominatim: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
types:
cities: Cidades
places: Lugares
@ -381,6 +396,7 @@ pt-BR:
other: a cerca de {{count}}km
zero: a menos de 1km
results:
more_results: Mais resultados
no_results: Nenhum resultado encontrado
search:
title:
@ -400,66 +416,190 @@ pt-BR:
prefix:
amenity:
airport: Aeroporto
arts_centre: Centro de Arte
atm: Caixa automático
auditorium: Auditório
bank: Banco
bar: Bar
bench: Banco (de praça)
bicycle_parking: Estacionamento de bicicletas
bicycle_rental: Aluguel de bicicletas
brothel: Bordel
bureau_de_change: Casa de câmbio
bus_station: Estação de Ônibus/Rodoviária
cafe: Café
car_rental: Aluguel de veículos
car_sharing: Aluguel de Carro
car_wash: Lava-Carros
casino: Cassino
cinema: Cinema
clinic: Clínica
club: Clube
college: Faculdade
community_centre: Centro comunitário
courthouse: Fórum
crematorium: Crematório
dentist: Dentista
doctors: Consultórios
dormitory: Dormitório
drinking_water: Água potável
driving_school: Autoescola
embassy: Embaixada
emergency_phone: Telefone de emergência
fast_food: Fast Food
ferry_terminal: Terminal de barca
fire_hydrant: Hidrante
fire_station: Corpo de bombeiros
fountain: Fonte
fuel: Combustível
grave_yard: Cemitério
gym: Ginásio
health_centre: Centro de saúde
hospital: Hospital
hotel: Hotel
hunting_stand: Stand de caça
ice_cream: Sorveteria
kindergarten: Jardim de infância
library: Biblioteca
market: Mercado
marketplace: Mercado público / feira
mountain_rescue: Abrigo de montanha
nightclub: Casa noturna/Boate
office: Escritório
park: Parque
parking: Estacionamento
pharmacy: Farmácia
place_of_worship: Lugar de Adoração
police: Polícia
post_box: Caixa de correio
post_office: Agência de Correios
preschool: Pré-escola/Jardim de Infância
prison: Prisão
pub: Pub
public_building: Edifício público
public_market: Mercado público
recycling: Posto de Reciclagem
restaurant: Restaurante
retirement_home: Asilo
sauna: Sauna
school: Escola
shelter: Refúgio
shop: Loja
shopping: Shopping
social_club: Clube social
studio: Estúdio
supermarket: Supermercado
taxi: Táxi
telephone: Telefone público
theatre: Teatro
toilets: Banheiros
townhall: Prefeitura
university: Universidade
vending_machine: Máquina de venda automática
veterinary: Clínica veterinária
waste_basket: Lata de lixo
wifi: Ponto de Acesso WiFi
youth_centre: Centro juvenil
boundary:
administrative: Limite Administrativo
building:
apartments: Bloco de apartamentos
bunker: Bunker
chapel: Capela
church: Igreja
city_hall: Prefeitura
commercial: Edifício comercial
dormitory: Dormitório
entrance: Entrada de edifício
garage: Garagem
hospital: Hospital
hotel: Hotel
house: Casa
industrial: Edifício industrial
office: Edifício de escritórios
public: Edifício público
residential: Edifício residencial
school: Edifício escolar
shop: Loja
stadium: Estádio
store: Loja
terrace: Terraço
tower: Torre
train_station: Estação de Trem
university: Edifício Universitário
"yes": Edifício
highway:
bridleway: Pista para cavalos
bus_stop: Ponto de ônibus
construction: Estrada em construção
cycleway: Ciclovia
distance_marker: Marcador de quilometragem
emergency_access_point: Acesso de emergência
gate: Portão
living_street: Rua residencial
motorway: Rodovia expressa
path: Caminho
pedestrian: Rua de pedestres
primary: Via Primária
primary_link: Via Primária
raceway: Pista de corrida
residential: Residencial
road: Estrada
secondary: Via Secundária
secondary_link: Via Secundária
service: Rua de serviço
steps: Degraus
tertiary: Via terciária
track: Trilha
trail: Trilha
trunk: Via de entroncamento
unclassified: Via não classificada
unsurfaced: Rua não pavimentada
historic:
archaeological_site: Sítio arqueológico
battlefield: Campo de batalha
building: Edifício
castle: Castelo
church: Igreja
house: Casa histórica
icon: Ícone
memorial: Memorial
mine: Mina histórica
monument: Monumento
museum: Museu
ruins: Ruínas
tower: Torre histórica
landuse:
cemetery: Cemitério
commercial: Área comercial
construction: Construção
farm: Fazenda
forest: Floresta
grass: Gramado
industrial: Área industrial
landfill: Aterro sanitário
military: Área militar
mine: Mina
mountain: Montanha
nature_reserve: Reserva Natural
park: Parque
plaza: Praça
quarry: Pedreira
railway: Terreno de ferrovia
reservoir: Represa ou Reservatório de Água
residential: Área residencial
vineyard: Vinhedo
wetland: Pântano / Mangue
leisure:
fishing: Área de pesca
garden: Jardim
golf_course: Campo de Golf
ice_rink: Rinque de patinação no gelo
marina: Marina
miniature_golf: Mini Golfe
nature_reserve: Reserva Ambiental
park: Parque
sports_centre: Centro Esportivo
stadium: Estádio
swimming_pool: Piscina
water_park: Parque aquático
@ -467,50 +607,141 @@ pt-BR:
bay: Baía
beach: Praia
cape: Cabo
cave_entrance: Entrada de Gruta
channel: Canal
cliff: Penhasco
coastline: Litoral
crater: Cratera
fjord: Fiorde
geyser: Gêiser
glacier: Geleira
heath: Charneca
hill: Colina/Morro
island: Ilha
marsh: Pântano
mud: Lama
peak: Pico
reef: Recife
ridge: Cordilheira
river: Rio
rock: Rocha
shoal: Barra
strait: Estreito
tree: Árvore
valley: Vale
volcano: Vulcão
water: Água
wetland: Pântano / Mangue
wood: Madeira
place:
airport: Aeroporto
city: Cidade
country: País
farm: Fazenda
hamlet: Aldeia
house: Casa
houses: Casas
island: Ilha
islet: Ilhota
locality: Localidade
municipality: Municipalidade
postcode: CEP
region: Região
sea: Mar
state: Estado
subdivision: Subdivisão
suburb: Subúrbio
village: Vila
railway:
abandoned: Trilhos abandonados
disused: Ferrovia em desuso
historic_station: Estação de trem histórica
level_crossing: Passagem em nível
monorail: Monotrilho
preserved: Ferrovia preservada
station: Estação de Trem
subway: Estação de metrô
subway_entrance: Entrada do metrô
tram: Rota de bonde
tram_stop: Parada de bonde
shop:
alcohol: Loja de bebidas alcoolicas
art: Loja de artigos de arte
bakery: Padaria
beauty: Salão de Beleza
beverages: Loja/depósito de bebidas
bicycle: Loja de bicicletas
books: Livraria
butcher: Açougue
car: Loja de carros
car_dealer: Concessionária de automóveis
car_parts: Autopeças
car_repair: Oficina mecânica
carpet: Loja de tapetes
clothes: Loja de roupas
computer: Loja de computação
convenience: Loja de conveniência
copyshop: Gráfica/copiadora
cosmetics: Loja de cosméticos
department_store: Loja de departamentos
doityourself: Faça você mesmo
drugstore: Drogaria
dry_cleaning: Lavagem a seco
electronics: Loja de Eletrônicos
fish: Peixaria
florist: Florista
food: Loja de alimentação
furniture: Móveis
gallery: Galeria
general: Loja de artigos gerais
gift: Loja de presentes
greengrocer: Sacolão/Hortifrutti
grocery: Loja de alimentos
hairdresser: Cabelereiro
hardware: Material/Equipamentos de construção
insurance: Seguradora
jewelry: Joalheria
laundry: Lavanderia
mall: Shopping Center
market: Mercado
mobile_phone: Loja de celulares
motorcycle: Loja de motocicletas
music: Loja de música
optician: Ótica / Oculista
organic: Loja de alimentos orgânicos
pet: Pet Shop
photo: Loja fotográfica
salon: Salão de beleza
shoes: Sapataria
shopping_centre: Shopping Center
sports: Loja de artigos esportivos
stationery: Papelaria
supermarket: Supermercado
toys: Loja de brinquedos
travel_agency: Agência de viagens
wine: Loja de vinhos
tourism:
artwork: Ilustração
attraction: Atração
bed_and_breakfast: Cama e café da manhã
camp_site: Acampamento
chalet: Chalé
guest_house: Albergue
hostel: Abrigo
hotel: Hotel
information: Informações
motel: Motel
museum: Museu
picnic_site: Área de Piquenique
theme_park: Parque temático
valley: Vale
viewpoint: Mirador
zoo: Zoológico
waterway:
canal: Canal
dam: Represa
dock: Doca
mineral_spring: Fonte mineral
river: Rio
riverbank: Margem de rio
stream: Córrego
@ -612,6 +843,7 @@ pt-BR:
new:
back_to_inbox: Voltar para a caixa de entrada
body: Mensagem
limit_exceeded: Você enviou muitas mensagens recentemente. Por favor espere um momento antes de tentar enviar mais.
message_sent: Mensage enviada
send_button: Enviar
send_message_to: Enviar uma nova mensagem para {{name}}
@ -937,12 +1169,18 @@ pt-BR:
body: Perdão, não há usuário com o nome {{user}}. Por favor, cheque sua ortografia, ou talvez o link que você clicou está errado.
heading: O usuário {{user}} não existe
title: Usuário não encontrado
offline:
heading: O armazenamento de GPX está offline
message: O sistema de armazenamento e envio de arquivos GPX está atualmente indisponível.
offline_warning:
message: O sistema de envio de arquivos GPX não está disponível no momento
trace:
ago: "{{time_in_words_ago}} atrás"
by: por
count_points: "{{count}} pontos"
edit: editar
edit_map: Editar Mapa
identifiable: IDENTIFICÁVEL
in: em
map: mapa
more: mais
@ -950,6 +1188,7 @@ pt-BR:
private: PRIVADO
public: PUBLICO
trace_details: Ver detalhes da trilha
trackable: RASTREÁVEL
view_map: Ver Mapa
trace_form:
description: Descrição
@ -969,6 +1208,10 @@ pt-BR:
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
trace_paging_nav:
next: Seguinte »
previous: « Anterior
showing_page: Mostrando página {{page}}
view:
delete_track: Apague esta trilha
description: "Descrição:"
@ -1013,6 +1256,9 @@ pt-BR:
enabled link: http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits
enabled link text: o que é isso?
heading: "Edição pública:"
public editing note:
heading: Edição pública
text: Atualmente suas edições são anônimas e ninguém pode lhe enviar mensagens ou saber sua localização. Para mostrar o que você editou e permitir que pessoas entrem em contato através do website, clique no botão abaixo. <b>Desde as mudanças na API 0.6, apenas usuários públicos podem editar o mapa</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Veja por quê</a>).<ul><li>O seu endereço de e-mail não será revelado para o público.</li><li>Esta ação não pode ser desfeita e todos os novos usuários são agora públicos por padrão.</li></ul>
return to profile: Retornar para o perfil
save changes button: Salvar Mudanças
title: Editar conta

View file

@ -187,6 +187,7 @@ sk:
tag_details:
tags: "Tagy:"
timeout:
sorry: Prepáčte, ale načítanie dát {{type}} číslo {{id}} trvalo príliš dlho
type:
node: uzol
way:
@ -231,6 +232,8 @@ sk:
other: "{{count}} komentárov"
edit:
language: "Jazyk:"
latitude: "Zemepisná šírka:"
longitude: "Zemepisná dĺžka:"
save_button: Uložiť
subject: "Predmet:"
use_map_link: použiť mapu
@ -683,6 +686,7 @@ sk:
inbox:
date: Dátum
from: Od
subject: Predmet
you_have: Máte {{new_count}} nových a {{old_count}} starých správ
mark:
as_read: Správa označená ako prečítaná
@ -802,6 +806,7 @@ sk:
owner: "Vlastník:"
points: "Body:"
save_button: Uložiť zmeny
start_coord: "Súradnice začiatku:"
tags: "Tagy:"
title: Úprava stopy {{name}}
uploaded_at: "Nahrať na:"
@ -1023,9 +1028,12 @@ sk:
your friends: Vaši priatelia
user_block:
partial:
confirm: Ste si istí?
edit: Upraviť
show: Zobraziť
status: Stav
show:
edit: Upraviť
user_role:
filter:
already_has_role: Užívateľ už má úlohu {{role}}.

View file

@ -253,7 +253,12 @@ sr-EC:
few: "{{count}} напомене"
one: Једна напомена
other: "{{count}} напомена"
comment_link: Коментариши унос
comment_link: Коментаришите унос
confirm: Потврди
edit_link: Измените овај унос
hide_link: Сакријте овај унос
posted_by: Поставио {{link_user}} у {{created}} на {{language_link}}
reply_link: Одговорите на овај унос
edit:
body: "Тело:"
language: "Језик:"
@ -267,6 +272,7 @@ sr-EC:
new: Нови дневнички унос
newer_entries: Новији уноси
older_entries: Старији уноси
recent_entries: "Скорашњи дневнички уноси:"
title: Кориснички дневници
user_title: Дневник корисника {{user}}
new:
@ -281,12 +287,15 @@ sr-EC:
export:
start:
add_marker: Додајте маркер на мапу
area_to_export: Област за извоз
export_button: Извези
format: Формат
format_to_export: Формат за извоз
image_size: Величина слике
latitude: "ГШ:"
licence: Лиценца
longitude: "ГД:"
manually_select: Ручно изабери другу област
mapnik_image: Мапник слика
max: максимално
options: Подешавања
@ -294,8 +303,11 @@ sr-EC:
scale: Размера
zoom: Увећање
start_rjs:
add_marker: Додајте маркер на мапу
change_marker: Промените положај маркера
click_add_marker: Кликните на мапу како бирте додали маркер
export: Извези
view_larger_map: Погледајте већу мапу
geocoder:
description:
title:
@ -318,43 +330,105 @@ sr-EC:
other: око {{count}}km
zero: мање од километра
results:
more_results: Још резултата
no_results: Нема резултата претраге
search_osm_nominatim:
prefix:
amenity:
airport: Аеродром
atm: Банкомат
bank: Банка
brothel: Бордел
cafe: Кафе
car_wash: Ауто-перионица
casino: Казино
cinema: Биоскоп
clinic: Клиника
club: Клуб
college: Факултет
crematorium: Крематоријум
dentist: Зубар
embassy: Амбасада
fast_food: Брза храна
fire_hydrant: Хидрант
fire_station: Ватрогасна станица
fountain: Фонтана
grave_yard: Гробље
gym: Фитнес центар / Теретана
health_centre: Дом здравља
kindergarten: Обданиште
library: Библиотека
nightclub: Ноћни клуб
park: Парк
parking: Паркинг
pharmacy: Апотека
police: Полиција
prison: Затвор
sauna: Сауна
school: Школа
studio: Сттудио
supermarket: Супермаркет
taxi: Такси
telephone: Јавна говорница
theatre: Позориште
university: Универзитет
building:
bunker: Бункер
chapel: Капела
church: Црква
garage: Гаража
hospital: Болница
hotel: Хотел
school: Школа
shop: Продавница
stadium: Стадион
tower: Торањ
"yes": Зграда
highway:
bus_stop: Аутобуска станица
emergency_access_point: Излаз за случај опасности
footway: Стаза
gate: Капија
motorway: Аутопут
path: Стаза
platform: Платформа
primary_link: Главни пут
road: Пут
steps: Степенице
trail: Стаза
trunk_link: Магистрални пут
historic:
archaeological_site: Археолошко налазиште
building: Зграда
castle: Дворац
church: Црква
house: Кућа
mine: Рудник
monument: Споменик
museum: Музеј
ruins: Рушевине
tower: Торањ
landuse:
cemetery: Гробље
construction: Градилиште
farm: Фарма
industrial: Индустријска зона
mine: Рудник
park: Парк
reservoir: Резервоар
residential: Стамбена област
leisure:
garden: Башта
golf_course: Голф терен
ice_rink: Клизалиште
miniature_golf: Мини голф
park: Парк
pitch: Спортско игралиште
playground: Игралиште
sports_centre: Спортски центар
stadium: Стадион
track: Стаза за трчање
water_park: Аква-парк
natural:
beach: Плажа
cape: Рт
@ -365,6 +439,7 @@ sr-EC:
geyser: Гејзир
glacier: Глечер
hill: Брдо
island: Острво
mud: Блато
reef: Гребен
river: Река
@ -378,10 +453,13 @@ sr-EC:
airport: Аеродром
country: Држава
farm: Фарма
house: Кућа
houses: Куће
island: Острво
locality: Локалитет
moor: Соба
municipality: Општина
postcode: Поштански код
region: Регион
sea: Море
suburb: Предграђе
@ -393,6 +471,8 @@ sr-EC:
books: Књижара
butcher: Месара
car_repair: Ауто-сервис
clothes: Бутик
copyshop: Копирница
drugstore: Апотека
dry_cleaning: Хемијско чишћење
estate_agent: Агент за некретнине
@ -401,16 +481,22 @@ sr-EC:
gift: Сувенирница
grocery: Бакалница
hairdresser: Фризерски салон
insurance: Осигурање
jewelry: Јувелирница
kiosk: Киоск
market: Маркет
optician: Оптичар
salon: Салон
shopping_centre: Тржни центар
supermarket: Супермаркет
travel_agency: Туристичка агенција
tourism:
artwork: Галерија
attraction: Атракција
bed_and_breakfast: Полупансион
hostel: Хостел
hotel: Хотел
information: Информације
motel: Мотел
museum: Музеј
picnic_site: Место за пикник
@ -439,7 +525,7 @@ sr-EC:
intro_3: Одржавање OpenStreetMap је подржано од стране {{ucl}} и {{bytemark}}.
license:
title: Подаци OpenStreetMap сајта су лиценцирани под Creative Commons Attribution-Share Alike 2.0 општом лиценцом
log_in: пријави се
log_in: пријавите се
log_in_tooltip: Пријавите се са постојећим налогом
logo:
alt_text: OpenStreetMap лого
@ -450,7 +536,7 @@ sr-EC:
title: Подржите OpenStreetMap новчаним прилогом
news_blog: Вест на блогу
shop: Продавница
sign_up: региструј се
sign_up: региструјте се
sign_up_tooltip: Направите налог како бисте уређивали мапе
user_diaries: Кориснички дневници
user_diaries_tooltip: Погледајте дневнике корисника
@ -520,8 +606,10 @@ sr-EC:
hi: Поздрав {{to_user}},
oauth:
oauthorize:
allow_read_gpx: учитајте ваше GPS путање.
allow_write_api: измени мапу.
allow_write_gpx: учитај GPS трагове.
allow_write_prefs: измените ваша корисничка подешавања.
oauth_clients:
edit:
submit: Уреди
@ -536,24 +624,41 @@ sr-EC:
table:
entry:
admin: Административна граница
apron:
1: терминал
cemetery: Гробље
centre: Спортски центар
commercial: Пословна област
common:
1: ливада
construction: Путеви у изградњи
cycleway: Бициклистичка стаза
farm: Фарма
footway: Пешачка стаза
forest: Шума
golf: Голф терен
industrial: Индустријска област
lake:
- Језеро
- резервоар
military: Војна област
motorway: Аутопут
park: Парк
primary: Главни пут
rail: Железничка пруга
reserve: Парк природе
resident: Стамбена област
runway:
- Аеродромска писта
school:
- Школа
- универзитет
station: Железничка станица
subway: Подземна железница
tourist: Туристичка атракција
track: Стаза
trunk: Магистрални пут
unsurfaced: Подземни пут
heading: Легенда за увећање {{zoom_level}}
search:
search: Претрага
@ -561,6 +666,7 @@ sr-EC:
where_am_i: Где сам?
sidebar:
close: Затвори
search_results: Резултати претраге
trace:
create:
trace_uploaded: Ваш GPX фајл је послат и чека на унос у базу. Он обично траје око пола сата, и добићете поруку е-поштом кад се заврши.
@ -613,6 +719,10 @@ sr-EC:
see_your_traces: Види све твоје трагове
trace_optionals:
tags: Ознаке
trace_paging_nav:
next: Следећи &raquo;
previous: "&laquo; Претходни"
showing_page: Приказ стране {{page}}
view:
description: "Опис:"
download: преузми
@ -621,6 +731,7 @@ sr-EC:
filename: "Име фајла:"
map: мапа
owner: "Власник:"
pending: НАЕКАЊУ
points: "Тачке:"
start_coordinates: "Почетне координате:"
tags: "Ознаке:"
@ -629,10 +740,14 @@ sr-EC:
visibility: "Видљивост:"
user:
account:
email never displayed publicly: (не приказуј јавно)
home location: "Моја локација:"
latitude: "Географска ширина:"
longitude: "Географска дужина:"
make edits public button: Нека све моје измене буду јавне
my settings: Моја подешавања
no home location: Нисте унели ваше место становања.
preferred languages: "Подразумевани језици:"
profile description: "Опис профила:"
public editing:
disabled link text: зашто не могу да уређујем?
@ -651,16 +766,19 @@ sr-EC:
friend_map:
your location: Ваша локација
login:
create_account: направи налог
create_account: направите налог
email or username: "Адреса е-поште или корисничко име:"
heading: Пријављивање
login_button: Пријави се
login_button: Пријавите се
lost password link: Изгубили сте лозинку?
password: "Лозинка:"
please login: Молимо пријавите се или {{create_user_link}}.
title: Пријављивање
lost_password:
email address: "Адреса е-поште:"
heading: Заборављена лозинка?
help_text: Унесите адресу е-поште коју сте користили за пријављивање, и на њу ћемо вам послати везу коју можете кликнути како бисте ресетовали лозинку.
new password button: Обнови лозинку
title: Изгубљена лозинка
new:
confirm email address: "Потврдите е-мејл адресу:"
@ -720,6 +838,7 @@ sr-EC:
confirm: Јесте ли сигурни?
edit: Уреди
reason: "Разлози блокирања:"
status: Статус
user_role:
filter:
doesnt_have_role: Корисник нема улогу {{role}}.

View file

@ -132,6 +132,7 @@ de:
option_layer_ooc_25k: Historische UK Karten 1:25k
option_layer_ooc_7th: "UK historic: 7th"
option_layer_ooc_npe: "UK historic: NPE"
option_layer_streets_haiti: "Haiti: Straßenname"
option_layer_tip: Hintergrund auswählen
option_limitways: Warnung wenn große Datenmenge geladen wird
option_microblog_id: "Microblog Name:"
@ -149,6 +150,7 @@ de:
preset_icon_cafe: Café
preset_icon_cinema: Kino
preset_icon_convenience: Nachbarschaftsladen
preset_icon_disaster: Haiti Gebäude
preset_icon_fast_food: Schnellimbiss
preset_icon_ferry_terminal: Fähre
preset_icon_fire_station: Feuerwehr

View file

@ -124,10 +124,10 @@ en:
option_external: "External launch:"
option_fadebackground: Fade background
option_layer_cycle_map: OSM - cycle map
option_layer_streets_haiti: "Haiti: street names"
option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye Jan 13"
option_layer_geoeye_nypl_haiti: "Haiti: GeoEye Jan 13+"
option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe"
option_layer_streets_haiti: "Haiti: street names"
option_layer_maplint: OSM - Maplint (errors)
option_layer_mapnik: OSM - Mapnik
option_layer_nearmap: "Australia: NearMap"

View file

@ -4,6 +4,7 @@
# Author: Crt
# Author: Nike
# Author: Ramilehti
# Author: Silvonen
# Author: Usp
fi:
a_poi: $1 POI
@ -25,6 +26,8 @@ fi:
advanced: Aputoiminnot
advanced_close: Sulje muutoskokoelma
advanced_inspector: Tietotyökalu
advanced_maximise: Suurenna ikkuna
advanced_minimise: Pienennä ikkuna
advanced_parallel: Rinnakkainen polku
advanced_tooltip: Lisätoimintoja
advanced_undelete: Palauta
@ -71,6 +74,7 @@ fi:
login_uid: "Käyttäjätunnus:"
more: Lisää
newchangeset: "Yritä uudelleen: Potlatch avaa uuden muutoskokoelman"
"no": Ei
nobackground: Ei taustaa
norelations: Nykyisellä alueella ei ole relaatioita
ok: OK
@ -83,12 +87,22 @@ fi:
option_thinlines: Käytä aina ohuita viivoja
option_warnings: Näytä siirtymisvaroitukset
point: Piste
preset_icon_airport: Lentokenttä
preset_icon_bar: Baari
preset_icon_cafe: Kahvila
preset_icon_cinema: Elokuvateatteri
preset_icon_ferry_terminal: Lautta
preset_icon_fire_station: Paloasema
preset_icon_hospital: Sairaala
preset_icon_hotel: Hotelli
preset_icon_museum: Museo
preset_icon_parking: Pysäköinti
preset_icon_pharmacy: Apteekki
preset_icon_restaurant: Ravintola
preset_icon_school: Koulu
preset_icon_station: Rautatieasema
preset_icon_telephone: Puhelin
preset_icon_theatre: Teatteri
prompt_addtorelation: Lisää $1 relaatioon
prompt_changesetcomment: "Anna kuvaus muutoksillesi:"
prompt_closechangeset: Sulje muutoskokoelma $1
@ -120,4 +134,6 @@ fi:
tip_splitway: Katkaise tie valitusta kohdasta (X)
tip_undo: Kumoa $1 (Z)
uploading: Lähetetään...
warning: Varoitus!
way: Tie
"yes": Kyllä

View file

@ -132,6 +132,7 @@ fr:
option_layer_ooc_25k: Historique UK au 1:25k
option_layer_ooc_7th: Historique UK 7e
option_layer_ooc_npe: Historique UK NPE
option_layer_streets_haiti: "Haïti: noms des rues"
option_layer_tip: Choisir l'arrière-plan à afficher
option_limitways: Avertir lors du chargement d'une grande quantité de données
option_microblog_id: "Nom de microblogging :"
@ -149,7 +150,7 @@ fr:
preset_icon_cafe: Café
preset_icon_cinema: Cinéma
preset_icon_convenience: Épicerie
preset_icon_disaster: Bâtiment à Haiti
preset_icon_disaster: Dégâts Haïti
preset_icon_fast_food: Restauration rapide
preset_icon_ferry_terminal: Terminal de ferry
preset_icon_fire_station: Caserne de pompiers

View file

@ -126,6 +126,7 @@ hr:
option_layer_ooc_25k: UK povijesni 1:25k
option_layer_ooc_7th: "UK povijesni: 7th"
option_layer_ooc_npe: "UK povijesni: NPE"
option_layer_streets_haiti: "Haiti: imena ulica"
option_layer_tip: Izaberite pozadinu za prikaz
option_limitways: Upozori kada se učitava puno podataka
option_microblog_id: "Naziv Microbloga:"

View file

@ -65,6 +65,7 @@ hu:
emailauthor: \n\nKérlek, jelentsd a hibát (angolul) a richard\@systemeD.net e-mail címre, és írd le, hogy mit csináltál akkor, amikor a hiba történt.
error_anonymous: Névtelen szerkesztővel nem tudsz kapcsolatba lépni.
error_connectionfailed: Sajnálom - az OpenStreetMap szerverhez való kapcsolódás sikertelen. A legutóbbi módosítások nem lettek elmentve.\n\nSzeretnéd megpróbálni újra?
error_microblog_long: "Küldés a(z) $1 helyre sikertelen:\nHTTP kód: $2\nHibaüzenet: $3\n$1 hiba: $4"
error_nopoi: A POI nem található (talán már eltávolítottad?), így nem vonható vissza.
error_nosharedpoint: A(z) $1 és a(z) $2 vonalaknak már nincs közös pontja, így nem vonható vissza a kettévágás.
error_noway: A(z) $1 nem található (talán már eltávolítottad?), így nem vonható vissza.
@ -127,6 +128,7 @@ hu:
option_layer_ooc_25k: "UK történelmi: 1:25k"
option_layer_ooc_7th: "UK történelmi: 7th"
option_layer_ooc_npe: "UK történelmi: NPE"
option_layer_streets_haiti: "Haiti: utcanevek"
option_layer_tip: Válaszd ki a megjelenítendő hátteret
option_limitways: Figyelmeztetés sok adat betöltése előtt
option_microblog_id: "Mikroblog neve:"
@ -144,6 +146,7 @@ hu:
preset_icon_cafe: Kávézó
preset_icon_cinema: Mozi
preset_icon_convenience: Élelmiszerbolt
preset_icon_disaster: Haiti épület
preset_icon_fast_food: Gyorsétterem
preset_icon_ferry_terminal: Komp
preset_icon_fire_station: Tűzoltóság
@ -175,6 +178,7 @@ hu:
prompt_launch: Külső URL indítása
prompt_live: Élő módban minden elem, amit megváltoztatsz, azonnal el lesz mentve az OpenStreetMap adatbázisába ez kezdőknek nem ajánlott. Biztos vagy benne?
prompt_manyways: Ez a terület nagyon részletes, és sokáig fog tartani a betöltése. Szeretnél ráközelíteni?
prompt_microblog: "Küldés ide: $1 ($2 van hátra)"
prompt_revertversion: "Korábbi mentett változat visszaállítása:"
prompt_savechanges: Módosítások mentése
prompt_taggedpoints: Ezen a vonalon van néhány címkézett pont. Biztosan törlöd?

View file

@ -126,6 +126,7 @@ is:
option_layer_ooc_25k: "Bretland: 1:25k kort"
option_layer_ooc_7th: "Bretland: 7th kort"
option_layer_ooc_npe: "Bretland: NPE kort"
option_layer_streets_haiti: "Haítí: Götunöfn"
option_layer_tip: Veldu bakgrunnin til að sýna á kortinu
option_limitways: Aðvörun er náð er í mikil gögn
option_microblog_id: "Örbloggsnafn:"
@ -143,6 +144,7 @@ is:
preset_icon_cafe: Kaffihús
preset_icon_cinema: Bíóhús
preset_icon_convenience: Kjörbúð
preset_icon_disaster: Bygging á Haítí
preset_icon_fast_food: Skyndibiti
preset_icon_ferry_terminal: Ferjuhöfn
preset_icon_fire_station: Slökkvistöð

View file

@ -128,6 +128,7 @@ pl:
option_layer_ooc_25k: "Mapa historyczna Wielkiej Brytanii: 1:25k"
option_layer_ooc_7th: "Mapa historyczna Wielkiej Brytanii: 7th"
option_layer_ooc_npe: "Mapa historyczna Wielkiej Brytanii: NPE"
option_layer_streets_haiti: "Haiti: nazwy ulic"
option_layer_tip: Wybierz tło
option_limitways: Ostrzegaj, gdy wczytuje się dużo danych
option_microblog_id: "Nazwa Microbloga:"
@ -145,6 +146,7 @@ pl:
preset_icon_cafe: Kawiarnia
preset_icon_cinema: Kino
preset_icon_convenience: Sklepik spożywczoprzemysłowy
preset_icon_disaster: Budynek haitaiński
preset_icon_fast_food: Fast food
preset_icon_ferry_terminal: Prom
preset_icon_fire_station: Remiza strażacka

File diff suppressed because one or more lines are too long

View file

@ -126,6 +126,9 @@ ru:
option_external: "Внешний запуск:"
option_fadebackground: Светлый фон
option_layer_cycle_map: OSM - для велосипедистов
option_layer_digitalglobe_haiti: "Гаити: DigitalGlobe"
option_layer_geoeye_gravitystorm_haiti: "Гаити: GeoEye янв 13"
option_layer_geoeye_nypl_haiti: "Гаити: GeoEye янв 13+"
option_layer_maplint: OSM - Maplint (ошибки)
option_layer_mapnik: OSM - Mapnik
option_layer_nearmap: "Австралия: NearMap"

View file

@ -142,7 +142,7 @@ sr-EC:
preset_icon_restaurant: Ресторан
preset_icon_school: Школа
preset_icon_station: Железничка станица
preset_icon_supermarket: Самопослуга
preset_icon_supermarket: Супермаркет
preset_icon_taxi: Такси станица
preset_icon_telephone: Телефон
preset_icon_theatre: Позориште

View file

@ -74,9 +74,9 @@ sv:
existingrelation: Lägg till existerande relation
findrelation: Sök efter relation innehållande
gpxpleasewait: GPX-loggen bearbetas, var god vänta.
heading_drawing: Ritar
heading_drawing: Att rita
heading_introduction: Introduktion
heading_pois: Startar
heading_pois: Komma igång
heading_quickref: Snabbreferens
heading_surveying: Kartläggning
heading_tagging: Taggning
@ -136,7 +136,7 @@ sv:
point: Nod (punkt)
preset_icon_airport: Flygplats
preset_icon_bar: Bar
preset_icon_bus_stop: Bussstation
preset_icon_bus_stop: Busshållplats
preset_icon_cafe: Kafé
preset_icon_cinema: Biograf
preset_icon_convenience: Närköp
@ -144,7 +144,7 @@ sv:
preset_icon_ferry_terminal: Färja
preset_icon_fire_station: Brandstation
preset_icon_hospital: Sjukhus
preset_icon_hotel: Hotel
preset_icon_hotel: Hotell
preset_icon_museum: Museum
preset_icon_parking: Parkering
preset_icon_pharmacy: Apotek

View file

@ -154,7 +154,6 @@ ActionController::Routing::Routes.draw do |map|
map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'view', :id => /\d+/
map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/
map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss'
map.connect '/user/:display_name/diary/new', :controller => 'diary_entry', :action => 'new'
map.connect '/user/:display_name/diary/:id/edit', :controller => 'diary_entry', :action => 'edit', :id => /\d+/
map.connect '/user/:display_name/diary/:id/hide', :controller => 'diary_entry', :action => 'hide', :id => /\d+/
map.connect '/user/:display_name/diary/:id/hidecomment/:comment', :controller => 'diary_entry', :action => 'hidecomment', :id => /\d+/, :comment => /\d+/
@ -165,11 +164,12 @@ ActionController::Routing::Routes.draw do |map|
map.connect '/user/:display_name/hide', :controller => 'user', :action => 'hide'
map.connect '/user/:display_name/unhide', :controller => 'user', :action => 'unhide'
map.connect '/user/:display_name/delete', :controller => 'user', :action => 'delete'
map.connect '/diary/new', :controller => 'diary_entry', :action => 'new'
map.connect '/diary', :controller => 'diary_entry', :action => 'list'
map.connect '/diary/rss', :controller => 'diary_entry', :action => 'rss'
map.connect '/diary/:language', :controller => 'diary_entry', :action => 'list'
map.connect '/diary/:language/rss', :controller => 'diary_entry', :action => 'rss'
# test pages
map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate'

Binary file not shown.

View file

@ -6,7 +6,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
def test_showing_new_diary_entry
get :new
assert_response :redirect
assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/new"
assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new"
# Now pretend to login by using the session hash, with the
# id of the person we want to login as through session(:user)=user.id
get(:new, nil, {'user' => users(:normal_user).id})
@ -23,7 +23,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
assert_select "h1", "New Diary Entry", :count => 1
# We don't care about the layout, we just care about the form fields
# that are available
assert_select "form[action='/diary_entry/new']", :count => 1 do
assert_select "form[action='/diary/new']", :count => 1 do
assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1
assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1
assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1

View file

@ -6,19 +6,19 @@ class UserDiariesTest < ActionController::IntegrationTest
# Test the creation of a diary entry, making sure that you are redirected to
# login page when not logged in
def test_showing_create_diary_entry
get_via_redirect '/user/test/diary/new'
get_via_redirect '/diary/new'
# We should now be at the login page
assert_response :success
assert_template 'user/login'
# We can now login
post '/login', {'user[email]' => "test@openstreetmap.org", 'user[password]' => "test", :referer => '/user/test/diary/new'}
post '/login', {'user[email]' => "test@openstreetmap.org", 'user[password]' => "test", :referer => '/diary/new'}
assert_response :redirect
#print @response.body
# Check that there is some payload alerting the user to the redirect
# and allowing them to get to the page they are being directed to
assert_select "html:root" do
assert_select "body" do
assert_select "a[href='http://www.example.com/user/test/diary/new']"
assert_select "a[href='http://www.example.com/diary/new']"
end
end
# Required due to a bug in the rails testing framework
@ -40,7 +40,7 @@ class UserDiariesTest < ActionController::IntegrationTest
assert_select "body" do
assert_select "div#content" do
assert_select "h1", "New Diary Entry"
assert_select "form[action='/user/#{users(:normal_user).display_name}/diary/new']" do
assert_select "form[action='/diary/new']" do
assert_select "input[id=diary_entry_title]"
end
end