source 'http://rubygems.org'
# Require rails
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.11'
# Require things which have moved to gems in ruby 1.9
gem 'bigdecimal', :platforms => :ruby_19
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
- gem 'therubyracer'
+ gem 'therubyracer', '~> 0.10.2'
gem 'ejs'
end
remote: http://rubygems.org/
specs:
SystemTimer (1.2.3)
- actionmailer (3.2.9)
- actionpack (= 3.2.9)
+ actionmailer (3.2.11)
+ actionpack (= 3.2.11)
mail (~> 2.4.4)
- actionpack (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.9)
- activesupport (= 3.2.9)
+ activemodel (3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
+ activerecord (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
- activesupport (3.2.9)
+ activeresource (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
bigdecimal (1.1.0)
builder (3.0.4)
- cocaine (0.4.2)
+ climate_control (0.0.3)
+ activesupport (>= 3.0)
+ cocaine (0.5.1)
+ climate_control (>= 0.0.3, < 1.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
htmlentities (4.3.1)
http_accept_language (1.0.2)
httpauth (0.2.0)
- httpclient (2.3.0.1)
+ httpclient (2.3.2)
i18n (0.6.1)
i18n-js (3.0.0.rc3)
i18n
iconv (0.1)
journey (1.0.4)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
- json (1.7.5)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.7.6)
jsonify (0.3.1)
multi_json (~> 1.0)
jsonify-rails (0.3.2)
jwt (0.1.5)
multi_json (>= 1.0)
libv8 (3.3.10.4)
- libxml-ruby (2.3.3)
+ libxml-ruby (2.4.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- memcached (1.4.6)
+ memcached (1.5.0)
mime-types (1.19)
- minitest (4.3.0)
- multi_json (1.3.7)
+ minitest (4.4.0)
+ multi_json (1.5.0)
multipart-post (1.1.5)
- nokogiri (1.5.5)
+ nokogiri (1.5.6)
oauth (0.4.7)
oauth-plugin (0.4.1)
multi_json
pg (0.14.1)
polyglot (0.3.3)
r2 (0.0.3)
- rack (1.4.1)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-cors (0.2.7)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.9)
- actionmailer (= 3.2.9)
- actionpack (= 3.2.9)
- activerecord (= 3.2.9)
- activeresource (= 3.2.9)
- activesupport (= 3.2.9)
+ rails (3.2.11)
+ actionmailer (= 3.2.11)
+ actionpack (= 3.2.11)
+ activerecord (= 3.2.11)
+ activeresource (= 3.2.11)
+ activesupport (= 3.2.11)
bundler (~> 1.0)
- railties (= 3.2.9)
- rails-i18n (0.7.0)
+ railties (= 3.2.11)
+ rails-i18n (0.7.2)
i18n (~> 0.5)
- railties (3.2.9)
- actionpack (= 3.2.9)
- activesupport (= 3.2.9)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.2)
+ rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
redcarpet (2.2.2)
ruby-openid (2.2.2)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
- sass (3.2.3)
- sass-rails (3.2.5)
+ sass (3.2.5)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- sprockets (2.2.1)
+ sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
libv8 (~> 3.3.10)
thor (0.16.0)
tilt (1.3.3)
- timecop (0.5.3)
+ timecop (0.5.9)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
pg
r2
rack-cors
- rails (= 3.2.9)
+ rails (= 3.2.11)
rails-i18n (>= 0.6.3)
redcarpet
rinku (>= 1.2.2)
ruby-openid (>= 2.2.0)
sanitize
sass-rails (~> 3.2.3)
- therubyracer
+ therubyracer (~> 0.10.2)
timecop
uglifier (>= 1.0.3)
validates_email_format_of (>= 1.5.1)
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg7082"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="16"
+ height="16"
+ sodipodi:docname="RSS.svg"
+ inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/RSS.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata7088">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs7086" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1182"
+ inkscape:window-height="873"
+ id="namedview7084"
+ showgrid="false"
+ inkscape:zoom="16"
+ inkscape:cx="7.6632237"
+ inkscape:cy="8.8893528"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg7082"
+ inkscape:snap-nodes="true"
+ inkscape:object-paths="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid7111"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ spacingx="0.5px"
+ spacingy="0.5px" />
+ </sodipodi:namedview>
+ <g
+ id="g8341"
+ transform="translate(31,0)">
+ <path
+ style="color:#000000;fill:#f69e42;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 2 0 C 0.892 0 0 0.892 0 2 L 0 14 C 0 15.108 0.892 16 2 16 L 14 16 C 15.108 16 16 15.108 16 14 L 16 2 C 16 0.892 15.108 0 14 0 L 2 0 z M 4 3 L 4.5 3 C 9.5 3 13 6.5 13 11.5 L 12.96875 12 L 11 12 L 11 11.5 C 11 8 8 5 4.5 5 L 4 5 L 4 3.5 L 4 3 z M 4 6.5 L 4.5 6.5 C 7 6.5 9.5 9 9.5 11.5 L 9.5 12 L 7.5 12 L 7.5 11.5 C 7.5 10 6 8.5 4.5 8.5 L 4 8.5 L 4 6.5 z M 4.5 10 C 5.328428 10 6 10.671573 6 11.5 C 6 12.328428 5.328428 13 4.5 13 C 3.671572 13 3 12.328428 3 11.5 C 3 10.671573 3.671572 10 4.5 10 z "
+ transform="translate(-31,0)"
+ id="rect7131" />
+ </g>
+ <path
+ style="color:#000000;fill:#f69e42;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m -18,-60 c -1.108,0 -2,0.892 -2,2 l 0,12 c 0,1.108 0.892,2 2,2 l 12,0 c 1.108,0 2,-0.892 2,-2 l 0,-12 c 0,-1.108 -0.892,-2 -2,-2 l -12,0 z m 3.75,2.1875 c 4.10919,0.731197 7.331303,3.953309 8.0625,8.0625 l -1.90625,0.4375 c -0.554215,-3.370687 -3.223063,-6.039535 -6.59375,-6.59375 l 0.4375,-1.90625 z m -0.875,3.875 c 2.621108,0.378627 4.683873,2.441391 5.0625,5.0625 l -2,0.4375 c -0.203763,-1.856557 -1.643443,-3.296237 -3.5,-3.5 l 0.4375,-2 z M -15.5,-50 c 0.828427,0 1.5,0.671573 1.5,1.5 0,0.828427 -0.671573,1.5 -1.5,1.5 -0.828427,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.671573,-1.5 1.5,-1.5 z"
+ id="rect7131-9"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g8281"
+ transform="translate(0.5,-0.5)" />
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg5480"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="color-palette.svg">
+ <defs
+ id="defs5482" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2"
+ inkscape:cx="157.80341"
+ inkscape:cy="934.71289"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="980"
+ inkscape:window-height="661"
+ inkscape:window-x="806"
+ inkscape:window-y="270"
+ inkscape:window-maximized="0"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5488" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5485">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect5490"
+ width="90"
+ height="90"
+ x="20"
+ y="42.362183"
+ rx="0"
+ ry="0" />
+ <rect
+ style="color:#000000;fill:#1313ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3924"
+ width="40"
+ height="40"
+ x="120"
+ y="42.362183"
+ rx="0"
+ ry="0" />
+ <rect
+ ry="0"
+ rx="0"
+ y="42.362183"
+ x="170"
+ height="40"
+ width="40"
+ id="rect5510"
+ style="color:#000000;fill:#9ed485;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#cbeea7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect6020"
+ width="40"
+ height="40"
+ x="220"
+ y="42.362183"
+ rx="0"
+ ry="0" />
+ <rect
+ style="color:#000000;fill:#faba75;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect6060"
+ width="40"
+ height="40"
+ x="220"
+ y="92.362183"
+ rx="0"
+ ry="0" />
+ <rect
+ ry="0"
+ rx="0"
+ y="142.36218"
+ x="170"
+ height="40"
+ width="40"
+ id="rect6062"
+ style="color:#000000;fill:#ff7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ ry="0"
+ rx="0"
+ y="142.86218"
+ x="20.500002"
+ height="89"
+ width="89"
+ id="rect6068"
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ ry="0"
+ rx="0"
+ y="92.362183"
+ x="170"
+ height="40"
+ width="40"
+ id="rect7710"
+ style="color:#000000;fill:#f69e42;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ ry="0"
+ rx="0"
+ y="92.362183"
+ x="120"
+ height="40"
+ width="40"
+ id="rect6617"
+ style="color:#000000;fill:#d7d7ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#f4f4ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect7127"
+ width="40"
+ height="40"
+ x="120"
+ y="142.36218"
+ rx="0"
+ ry="0" />
+ </g>
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg3864"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="16"
+ height="16"
+ sodipodi:docname="new.svg"
+ inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/new.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata3870">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs3868" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1405"
+ inkscape:window-height="1009"
+ id="namedview3866"
+ showgrid="false"
+ inkscape:zoom="1"
+ inkscape:cx="11.60995"
+ inkscape:cy="5.4274399"
+ inkscape:window-x="190"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3864"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3920"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <path
+ style="color:#000000;fill:#1313ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 2,0 C 0.892,0 0,0.892 0,2 l 0,12 c 0,1.108 0.892,2 2,2 l 12,0 c 1.108,0 2,-0.892 2,-2 L 16,2 C 16,0.892 15.108,0 14,0 z M 9,4 9,7 12,7 12,9 9,9 9,12 7,12 7,9 4,9 4,7 7,7 7,4 z"
+ id="rect3924"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssssssccccccccccccc" />
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg3864"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="16"
+ height="16"
+ sodipodi:docname="notice.svg"
+ inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/notice.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata3870">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs3868" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1405"
+ inkscape:window-height="1009"
+ id="namedview3866"
+ showgrid="false"
+ inkscape:zoom="21.536424"
+ inkscape:cx="15.375"
+ inkscape:cy="1.125"
+ inkscape:window-x="326"
+ inkscape:window-y="43"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3864"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:snap-bbox="true"
+ inkscape:snap-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3920"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <path
+ style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 2 0 C 0.892 0 0 0.892 0 2 L 0 14 C 0 15.108 0.892 16 2 16 L 14 16 C 15.108 16 16 15.108 16 14 L 16 2 C 16 0.892 15.108 0 14 0 L 2 0 z M 7 3 L 9 3 L 9 8 L 7 8 L 7 3 z M 7 10 L 9 10 L 9 12 L 7 12 L 7 10 z "
+ id="rect7131" />
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg5873"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="20"
+ height="20"
+ sodipodi:docname="administrator.svg"
+ inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/roles/administrator.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata5879">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5877" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="640"
+ inkscape:window-height="480"
+ id="namedview5875"
+ showgrid="false"
+ inkscape:zoom="5.6568542"
+ inkscape:cx="37.573963"
+ inkscape:cy="0.44974747"
+ inkscape:window-x="733"
+ inkscape:window-y="118"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg5873" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:#f69e42;fill-opacity:1;fill-rule:nonzero;stroke:#f69e42;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 10,2 8.125,8 2,8 6.96875,11.71875 5,18 10,14 15,18 13.03125,11.71875 18,8 11.875,8 10,2 z"
+ id="path4709" />
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg5539"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="20"
+ height="20"
+ sodipodi:docname="blank_administrator.svg"
+ inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/roles/blank_administrator.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata5545">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5543" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1031"
+ inkscape:window-height="802"
+ id="namedview5541"
+ showgrid="false"
+ inkscape:zoom="8"
+ inkscape:cx="10.953608"
+ inkscape:cy="15.654921"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg5539">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5688" />
+ </sodipodi:namedview>
+ <image
+ width="20"
+ height="20"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABHNCSVQICAgIfAhkiAAAArVJREFU
+OI2tlU1IVFEUx3/3vZm5fszoNGX5kR8ZWaEYubAE+1LJoCCZRdSiHMqoyI0QLgxauigIgqlNtKhF
+WW6SaqNlrQosKHLScWxS+rBEsJJsSn3vtvAp0+hkUmd3eef8OPd//uc+oZTif4a2mGRhxT8Bw2Hf
+kfCbw2eEEDbABSQKIeLW2RYCOuTKPZrmlEAKkAWMAZ+An4vuMPCqzC4deYUJcm1RVZWnAMgHVgAy
+3tX/CJQyryY1tTLf7a7MrvWVHgYygCWAjFczByiiQso8r5SrdF1PISdn3SZgKZBsAbXYfIjS0BJd
+AjogsrKksNtyN8x8z8wszPZ47O7R0UkX08MZF0IYUb2YQogJ0Rfy1gnhaHY6t0YMw9RNQ4kZa6an
+e5dLmWkDMIyvhPqvfNE1zbA79ClNoAARiTyVfaGh1pq9D84BH1FK0RvcV/H2XXO3YXxXfxumOaEC
+gebhxsaSy8BupgeWgFIKpRTXbxR5enqP3/v2LRBZCDY+/maqveNQuKAg6TSwC1gFJAJiFmitoN7V
+daDp/YerH+LBBgZbxvz+ikeaJmqBEmtQtllGNNCCit7gsbZ4wPYOXxioA4qBpNj6ObbpDmwWzuTV
+a+L5LCe7eGlamgOmN+bHgj40zbRKt7si3zoRCvm/BPvOjyg1CUBunjeloWHjNqt27rbEthwMnmxR
+ylA/J4bNx09ODFRXZ9Rv375s5/MX9c8ikcEppZR60Hn0JbAesM+RLEY/+8Dg2Z6Rkfax223eTpdL
+3wFkAolOl76k8+H+K0NDrZ/7X18YTk93lM6n4W+HjvtVO4J9vk9+/5Ymq4NUQJsZFuC8eKn8YE9v
+3dDNWztPAU5AzAsExJ27VesbG3PXAh5AzucAIKHWl5F79Vp5GeCIzREq6hdgLbg2La0y40066oFV
+KhoA/AI4idurnYfhgQAAAABJRU5ErkJggg==
+"
+ id="image5547"
+ x="-70"
+ y="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#f69e42;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 10 2 L 8.125 8 L 2 8 L 6.96875 11.71875 L 5 18 L 10 14 L 15 18 L 13.03125 11.71875 L 18 8 L 11.875 8 L 10 2 z "
+ id="path4709" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 10 2 L 8.125 8 L 2 8 L 6.96875 11.71875 L 5 18 L 10 14 L 15 18 L 13.03125 11.71875 L 18 8 L 11.875 8 L 10 2 z "
+ id="path5684" />
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg6042"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="20"
+ height="20"
+ sodipodi:docname="blank_moderator.svg"
+ inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/roles/blank_moderator.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata6048">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6046" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1264"
+ inkscape:window-height="776"
+ id="namedview6044"
+ showgrid="false"
+ inkscape:zoom="1"
+ inkscape:cx="10"
+ inkscape:cy="10"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg6042" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:#1313ff;fill-opacity:1;fill-rule:nonzero;stroke:#1313ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 10,2 8.125,8 2,8 6.96875,11.71875 5,18 10,14 15,18 13.03125,11.71875 18,8 11.875,8 10,2 z"
+ id="path4709" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 10,2 8.125,8 2,8 6.96875,11.71875 5,18 10,14 15,18 13.03125,11.71875 18,8 11.875,8 10,2 z"
+ id="path5684" />
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg4678"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="20"
+ height="20"
+ sodipodi:docname="moderator.svg"
+ inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/roles/moderator.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata4684">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4682" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1574"
+ inkscape:window-height="831"
+ id="namedview4680"
+ showgrid="false"
+ inkscape:zoom="1"
+ inkscape:cx="9.1260993"
+ inkscape:cy="11.531765"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4678">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4707" />
+ </sodipodi:namedview>
+ <path
+ style="color:#000000;fill:#0606ff;fill-opacity:1;fill-rule:nonzero;stroke:#0606ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 10,2 5,16 -5,-4 -5,4 z"
+ id="path4709"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="color:#000000;fill:#0606ff;fill-opacity:1;fill-rule:nonzero;stroke:#0606ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 2,8 16,0 -8,6 z"
+ id="path5479"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg54671"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ width="99.999969"
+ height="155"
+ sodipodi:docname="new-user-icon.svg">
+ <metadata
+ id="metadata54677">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs54675">
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath55579">
+ <rect
+ y="701"
+ x="157"
+ height="23.000002"
+ width="49.999985"
+ id="rect55581"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </clipPath>
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="756"
+ id="namedview54673"
+ showgrid="true"
+ inkscape:zoom="4.3320463"
+ inkscape:cx="28.49301"
+ inkscape:cy="111.46394"
+ inkscape:window-x="11"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg54671"
+ inkscape:object-nodes="true"
+ inkscape:object-paths="true"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid54700"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="1000,117.39694"
+ id="guide54708" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="830,101"
+ id="guide55315" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="815,99.000004"
+ id="guide55317" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="845,99.000004"
+ id="guide55319" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="832,88.000004"
+ id="guide55321" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="805,67.000004"
+ id="guide55323" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="855,73.000004"
+ id="guide55325" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="990,95.000004"
+ id="guide55476" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="1020,73.000004"
+ id="guide55478" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="970,74.000004"
+ id="guide55480" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="1030,76.000004"
+ id="guide55482" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="978,45.000004"
+ id="guide55484" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="960,64.000004"
+ id="guide55486" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="1040,63.000004"
+ id="guide55488" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="980,81.000004"
+ id="guide55490" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="1010,92.518344"
+ id="guide55492" />
+ </sodipodi:namedview>
+ <g
+ id="g55329"
+ transform="translate(-785,-42)">
+ <rect
+ y="42"
+ x="785"
+ height="100.00001"
+ width="99.999969"
+ id="rect54702"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="sssscssccsscssss"
+ inkscape:connector-curvature="0"
+ id="path54704"
+ d="m 834.99998,53.000004 c -8,0 -12,5 -14,9 -2,4 -2,13 -1,19 0.98639,5.918364 3.9723,8.164584 5,12 0,0 0,3 0,4 l -14,2.999996 c -9.47814,2.03103 -13.23303,8.02944 -14,18 l -1,13 78,0 -1,-13 c -0.76697,-9.97056 -4.40411,-16.62916 -14,-18 L 845,97 l -2e-5,-3.999996 c -2e-5,-4.000002 4.01361,-6.081636 5,-12 1,-6 1,-15 -1,-19 -2.0728,-4.145608 -6,-9 -14,-9 z"
+ style="color:#000000;fill:#dadaff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </g>
+ <g
+ id="g3048"
+ transform="translate(-157,-258)">
+ <g
+ transform="matrix(0.5,0,0,0.5,-236.5,342)"
+ id="g55329-6">
+ <rect
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect54702-3"
+ width="99.999969"
+ height="100.00001"
+ x="787"
+ y="42" />
+ </g>
+ <path
+ style="color:#000000;fill:#dadaff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 181.99999,368.5 c -4,0 -6.5,2.5 -7.5,4.5 -1,2 -1,7 -0.5,10 0.4932,2.95918 2,3.43845 2,5.5 0,0.5 0,1 0,1.5 0,0.4714 -1,1 -1,1 l -5,1.5 c -4.64225,1.39267 -6.58477,4.01726 -7,9 l -0.5,6 39,0 -0.5,-6 c -0.41523,-4.98274 -2.35775,-7.60733 -7,-9 l -5,-1.5 c 0,0 -1,-0.5286 -1,-1 0,-0.5 0,-1 0,-1.5 0,-2 1.5068,-2.54082 2,-5.5 0.5,-3 0.5,-8 -0.5,-10 -1.0364,-2.07281 -3.5,-4.5 -7.5,-4.5 z"
+ id="path54704-4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssscssccsscsssss" />
+ </g>
+</svg>
function highlightChangeset(id) {
rects[id].setStyle({fillOpacity: 0.5});
- $("#tr-changeset-" + id).addClass("selected");
+ $("#changeset_" + id).addClass("selected");
}
function unHighlightChangeset(id) {
rects[id].setStyle({fillOpacity: 0});
- $("#tr-changeset-" + id).removeClass("selected");
+ $("#changeset_" + id).removeClass("selected");
}
group.on({
if ($("#query").val()) {
$("#search_form").submit();
}
+
+ // Focus the search field for browsers that don't support
+ // the HTML5 'autofocus' attribute
+ if (!("autofocus" in document.createElement("input"))) {
+ $("#query").focus();
+ }
});
-<div style="text-align: center; margin-bottom: 20px;">
- <a href="#" class="browse_show_list"><%- I18n.t('browse.start_rjs.object_list.back') %></a>
-</div>
-<table width="100%" class="browse_heading">
- <tr>
- <td><%- name %></td>
- <td align="right">
- <a href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.details') %></a>
- </td>
- </tr>
-</table>
<div class="browse_details">
- <ul>
+
+ <h4><%- name %></h4>
+ <a class='more-details' href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.details') %></a>
+
+ <ul class="inner12">
<% for (var key in attributes) { %>
<li><b><%- key %></b>: <%- attributes[key] %></li>
<% } %>
+ <li> <a href="<%- url %>/history" class="browse_show_history"><%- I18n.t('browse.start_rjs.show_history') %></a></li>
</ul>
- <a href="<%- url %>/history" class="browse_show_history"><%- I18n.t('browse.start_rjs.show_history') %></a>
+
</div>
+
+<a href="#" class="browse_show_list button"><%- I18n.t('browse.start_rjs.object_list.back') %></a>
\ No newline at end of file
-<table width="100%" class="browse_heading">
- <tr>
- <td><%- I18n.t("browse.start_rjs.history_for_feature", {feature: name}) %></td>
- <td align="right">
- <a href="<%- url %>/history"><%- I18n.t('browse.start_rjs.details') %></a>
- </td>
- </tr>
-</table>
<div class="browse_details">
- <ul>
+ <h4><%- I18n.t("browse.start_rjs.history_for_feature", {feature: name}) %></h4>
+ <a class='more-details' href="<%- url %>/history"><%- I18n.t('browse.start_rjs.details') %></a>
+
+ <ul class="inner12">
<% for (var i = 0; i < history.length; i++) { %>
<li><%- I18n.t("browse.start_rjs.edited_by_user_at_timestamp", history[i]) %></li>
<% } %>
<div>
- <p class="browse_heading"><%- I18n.t('browse.start_rjs.object_list.heading') %></p>
- <ul>
- <% for (var i = 0; i < features.length; i++) { %>
- <li><%- features[i].typeName %> <a href="<%- features[i].url %>" data-feature-id="<%- features[i].id %>"><%- features[i].name %></a></li>
- <% } %>
- </ul>
- <a href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.api') %></a>
+ <h4 class="browse_heading"><%- I18n.t('browse.start_rjs.object_list.heading') %></h4>
+ <div class='inner12'>
+ <ul>
+ <% for (var i = 0; i < features.length; i++) { %>
+ <li><%- features[i].typeName %> <a href="<%- features[i].url %>" data-feature-id="<%- features[i].id %>"><%- features[i].name %></a></li>
+ <% } %>
+ </ul>
+ </div>
+
+ <div class='inner12'><a href="<%- url %>" class='button'><%- I18n.t('browse.start_rjs.object_list.api') %></a></div>
+
</div>
/* Styles common to large and small screens */
+/* Minimal CSS reset */
+
+html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size:100%;
+}
+
+fieldset,img { border: 0; }
+
+legend { color: #000; }
+
+sup { vertical-align: text-top; }
+
+sub { vertical-align: text-bottom; }
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+li { list-style: none; }
+
+input,
+select,
+textarea,
+body { font: 14px/20px "Helvetica Neue",Arial,sans-serif; }
+
+abbr, acronym {
+ border-bottom: .1em dotted;
+ cursor: help;
+}
+
+/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
+
+.clearfix:before,
+.clearfix:after {
+ content: " ";
+ display: table;
+}
+
+.clearfix:after {
+ clear: both;
+}
+
/* Default rules for the body of every page */
body {
font-family: 'Helvetica Neue',Arial,sans-serif;
font-size: 14px;
- line-height: 20px;
+ line-height: 1.6666;
color: #222;
background-color: #fff;
margin: 0px;
background-color: #f0f0f0;
}
+h1, h2, h3 {
+ margin-top: 10px;
+ margin-bottom: 20px;
+ font-weight: bold;
+ line-height: 1.2;
+}
+
+h1, h2 {
+ font-size: 32px;
+}
+
+#content h2 {
+ font-size: 24px;
+}
+
+h3 {
+ font-size: 21px;
+ margin-top: 10px;
+ margin-bottom: 20px;
+}
+
+h4,h5,h6 {
+ font-size: 14px;
+ margin-top: 10px;
+ margin-bottom: 20px;
+ font-weight: bold;
+ line-height: 1.5;
+}
+
+p, ul {
+ margin-bottom: 20px;
+}
+
+p > img {
+ width: auto;
+ max-width: 100%;
+}
+
+small, aside {
+ font-size: 12px;
+}
+
+h1:first-child,
+h2:first-child,
+h3:first-child,
+h4:first-child,
+h5:first-child,
+h6:first-child {
+ margin-top: 0;
+}
+
+.column-1 {
+ width: 50%;
+ margin-bottom: 20px;
+}
+
+.small_icon {
+ vertical-align: middle;
+ margin-right: 5px;
+}
+
/* Rules for links */
a {
color: #00f;
text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
+ &:hover {
+ text-decoration: underline;
+ }
}
/* Rules for horizontal lines */
height: 1px;
}
-/* Default rules for headings */
+/* General styles for tables */
-h2 {
- margin: 5px 0;
- font-size: 25px;
- line-height: 30px;
+table {
+ width: 100%;
+ margin-bottom: 20px;
+ th, td {
+ text-align: left;
+ padding: 5px;
+ line-height: 20px;
+ }
+ th {
+ font-weight: bold;
+ vertical-align: top;
+ }
+ td {
+ vertical-align: middle;
+ }
}
/* Rules for the whole left sidebar, including the logo */
#left {
position: absolute;
- top: 30px;
- bottom: 0;
+ height: 100%;
width: 185px;
font-size: 11px;
line-height: 12px;
+ z-index: 100;
border-right: 1px solid #ccc;
}
display: block;
width: 170px;
min-width: 170px;
- padding: 5px;
+ padding: 20px 5px;
text-align: center;
margin: auto;
}
-#logo img {
- border: 0px;
-}
-
#logo h1 {
font-size: 18px;
line-height: 20px;
display: none;
}
-#small-title img {
- border: 0px;
-}
-
/* Rules for the introductory text displayed in the left sidebar to new users */
.sidebar-copy {
*/
.sidebar-alert {
- padding: 4px 5px 4px 5px;
+ padding: 5px;
border-top: 1px solid #ccc;
margin-top: 4px;
margin-bottom: -4px;
background: #e00;
- font-size: 13px;
+ font-size: 12px;
font-weight: bold;
- line-height: 17px;
-
p {
margin: 5px;
}
*/
.sidebar-notice {
- padding: 4px 5px 4px 5px;
+ padding: 5px;
border-top: 1px solid #ccc;
margin-top: 4px;
margin-bottom: -4px;
background: #ea0;
- font-size: 13px;
- line-height: 17px;
-
+ font-size: 12px;
p {
margin: 5px;
}
border-top: 1px solid #ccc;
}
+.left_menu img {
+ margin: 10px 0px;
+}
+
.left_menu ul {
padding: 0;
margin: 0;
text-align: left;
}
-.optionalbox h1 {
- font-size: 14px;
- font-weight: bold;
- line-height: 20px;
- margin: 0px;
- vertical-align: bottom;
-}
-
/* Rules for the search box */
-.whereami {
-}
-
#search_field form {
width: 165px;
- margin: 0px;
- padding: 0px;
}
#search_field {
#search_field input[type="text"] {
width: 165px;
+ padding: 3px;
font-size: 14px;
line-height: 15px;
height: 25px;
}
#search_field input[type="submit"] {
+ border: 0;
+ margin: 0;
+ padding: 0;
width: 15px;
height: 15px;
- border: 0px;
text-indent: -1000px;
overflow: hidden;
- text-transform: capitalize;
- padding-left: 0px;
- padding-right: 0px;
- background: image-url("sprite.png");
+ background: image-url("sprite.png") 0 0 no-repeat;
position: absolute;
top: 5px;
- right: 4px;
+ right: 5px;
cursor: pointer;
}
margin: 5px 0 0 0;
}
+/* Utility for de-emphasizing content */
+
.deemphasize {
color: #999;
-}
-
-.deemphasize a {
- color: #7092FF;
+ a {
+ color: #7092FF;
+ }
}
/* Rules for donation request box */
display: block;
position: relative;
width: 153px;
- margin: 10px 10px 0px 10px;
padding: 5px;
border: 1px solid #AED1A0;
background: #cbeea7;
border-radius: 2px;
-moz-border-radius: 2px;
color: #222;
+ margin: 10px 10px 0px 10px;
}
.donate:hover {
width: 15px;
height: 15px;
border: 0px;
- padding-left: 0px;
- padding-right: 0px;
background: image-url("sprite.png") 0 -30px no-repeat;
position: absolute;
top: 8px;
/* Rules for Creative Commons logo button */
#cclogo {
- margin-top: 10px;
- margin-bottom: 10px;
+ margin: 10px 0;
+ float: right;
}
/* Rules for tabbed navigation bar */
#top-bar {
- position: absolute;
- z-index: 10000;
- top: 0;
- left: 185px;
- right: 0;
+ position: relative;
+ margin-left: 185px;
height: 29px;
border-bottom: 1px solid #ccc;
background: white;
+ z-index: 100;
+}
+
+.site-edit #top-bar,
+.site-index #top-bar,
+.site-export #top-bar {
+ position: fixed;
+ left: 0;
+ right: 0;
}
#tabnav {
- padding: 0;
- margin: 0;
- overflow:hidden;
+ height: 29px;
+ margin-bottom:0;
+ overflow: hidden;
}
#tabnav li {
- margin: 0px;
- padding: 0px;
display: inline;
- list-style-type: none;
}
#tabnav a, #tabnav a:link, #tabnav a:visited {
float: left;
background: #fff;
- font-size: 14px;
- line-height: 19px;
font-weight: bold;
- padding: 5px 10px;
- margin-right: 1px;
+ padding: 3px 10px;
text-decoration: none;
color: #333;
+ float: left;
+ margin-right: 1px;
-webkit-transition: color 200ms ease-in;
- -moz-transition: color 200ms ease-in;
- -o-transition: color 200ms ease-in;
- transition: color 200ms ease-in;
+ -moz-transition: color 200ms ease-in;
+ -o-transition: color 200ms ease-in;
+ transition: color 200ms ease-in;
}
-body.site-index #tabnav a#viewanchor,
-body.site-edit #tabnav a#editanchor,
-body.changeset-list #tabnav a#historyanchor,
-body.site-export #tabnav a#exportanchor {
+.site-index #tabnav a#viewanchor,
+.site-edit #tabnav a#editanchor,
+.changeset_list #tabnav a#historyanchor,
+.site-export #tabnav a#exportanchor {
border-bottom: 1px solid #aaa;
background: #9ed485;
color: #000;
}
#tabnav a:link:hover, #tabnav a:visited:hover {
- text-decoration:underline;
+ text-decoration: underline;
}
#tabnav a:link.disabled,
text-decoration: none;
}
+/* Utility for styling notification numbers */
+
.count-number {
padding: 2px 5px;
border-radius: 3px;
- background: #eee;
+ background: #d7d7ff;
margin: 0 2px;
font-size: 11px;
color: #333;
#greeting {
float: right;
- height: 28px;
- margin: 0px;
- padding-right: 10px;
- font-size: 13px;
- line-height: 28px;
+ padding-top: 3px;
}
.greeting-bar-unread {
/* Rules for Leaflet maps */
-#map {
- margin: 0px;
- border: 0px;
- padding: 0px;
-}
-
#permalink {
z-index: 10000;
position: absolute;
right: 0px;
padding: 5px;
background:#fff;
- text-align: right;
- font-size: 12px;
-}
-
-#permalink a {
- padding: 5px;
}
.leaflet-control-attribution a.disabled {
.site-index .leaflet-top,
.site-export .leaflet-top {
- top: 40px !important;
-
+ top: 10px !important;
.leaflet-control {
margin-top: 0px !important;
}
/* Rules for edit menu */
.menuicon {
- padding: 5px;
-
+ padding: 0 5px;
+ font-weight: normal;
+ display: inline-block;
&:hover {
- background: #eee;
text-decoration: none !important;
}
}
.menu ul {
margin: 0px;
- padding: 0px;
}
.menu li {
padding: 2px 5px;
- margin: 0px;
- list-style-type: none;
border-top: 1px solid #eee;
white-space: nowrap;
}
display: none;
}
-.attribution_license {
+.attribution_license,
+.attribution_project {
text-align: left;
}
text-align: center;
}
-.attribution_project {
- text-align: right;
-}
-
/* Rules for the popout map sidebar */
#sidebar {
display: none;
position: absolute;
- margin: 30px 0px 0px 0px;
- padding: 0px;
- border-right: 1px solid #ccc;
- width: 30%;
+ overflow: auto;
top: 0px;
bottom: 0px;
left: 0px;
+ border-right: 1px solid #ccc;
+ width: 33.3333%;
+ .sidebar_heading {
+ position: relative;
+ padding: 10px 20px;
+ z-index: 9999;
+ background: #F4F4FF;
+ border-bottom: 1px solid #ccc;
+ }
+ h4 {
+ margin: 0;
+ }
+ ul {
+ margin-bottom: 0;
+ li {
+ margin-bottom: 5px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ }
}
-#sidebar #sidebar_content {
- overflow: auto;
+#sidebar_close {
position: absolute;
- font-size: 13px;
- line-height: 15px;
- top: 29px;
- bottom: 0px;
- left: 0px;
- right: 0px;
-}
-
-#sidebar .sidebar_title {
- margin: 0px;
- padding: 3px 6px 4px 6px;
- height: 29px;
- font-size: 14px;
- line-height: 15px;
- background: #ccc;
-}
-
-#sidebar #sidebar_title {
- text-align: left;
+ height: 20px;
+ top: 0px;
+ bottom: 0;
+ right: 20px;
+ margin: auto;
}
-#sidebar #sidebar_close {
- text-align: right;
+#sidebar_content {
+ position: relative;
+ bottom: 0;
+ width: 100%;
+ h4 {
+ padding: 0 20px 10px 20px;
+ margin-top: 10px;
+ margin-bottom: 0;
+ border-bottom: 1px solid #ddd;
+ }
}
/* Rules for the map key which appears in the popout sidebar */
-#mapkey h3 {
- font-size: 110%;
- font-weight: normal;
- text-align: center;
-}
-
-#mapkey .mapkey-table {
- padding-left: 5px;
- padding-right: 5px;
+#mapkey {
+ padding: 20px;
}
#mapkey .mapkey-table-key img {
margin-right: auto;
}
-#mapkey .mapkey-table-value {
- font-size: 90%;
+#mapkey td {
+ padding: 0 5px 5px 5px;
}
/* Rules for search results which appear in the popout sidebar */
margin-bottom: 5px;
}
-.search_results_heading {
- margin: 0px;
- padding: 2px 5px;
- border-bottom: 1px solid #ccc;
- font-weight: bold;
+.search_results_entry {
+ margin-bottom: 0 ;
}
-.search_results_entry {
- margin: 0px;
- padding: 2px 5px;
+.search_results_entry .search_searching {
+ text-align: center;
+ margin: 20px auto;
+ width: 20px;
+ display: block;
}
+ul.results-list li { border-bottom: 1px solid #ccc; }
+
.search_results_error {
- margin: 0px;
- padding: 2px 6px 0px;
color: #f00;
}
/* Rules for data browser information which appears in the popout sidebar */
-.browse_heading {
- margin: 0px;
- padding: 3px 6px;
- border: 1px solid #ccc;
- background: #ddd;
+#browse_content {
+ position: relative;
+ .browse_show_list.button {
+ position: absolute;
+ left: 20px;
+ right: 20px;
+ bottom: -40px;
+ margin-bottom: 0;
+ }
+ a.more-details {
+ position: absolute;
+ top: 0;
+ right: 20px;
+ }
+ ul li {
+ margin-bottom: 0;
+ }
}
.browse_details {
- margin: 0px;
- padding: 0px 6px;
+ position: relative;
}
-/* Rules for export information which appears in the popout sidebar */
-
-.export_heading {
- margin: 0px;
- padding: 2px 5px;
- border-bottom: 1px solid #ccc;
- font-weight: bold;
+.browse_status {
+ display: none;
}
+/* Rules for export information which appears in the popout sidebar */
+
.export_bounds {
- width: 100%;
text-align: center;
}
-.export_bound {
- margin: 5px;
+.export_area_inputs {
+ margin-bottom: 10px;
}
-.export_details {
- padding: 2px 6px;
+.export_bound {
+ margin: 5px;
}
-#export_osm {
- display: none;
+.export_details input[type="text"]#export_html_text {
+ width: 100%;
}
-#export_mapnik {
- display: none;
+#sidebar #marker_inputs li:last-child {
+ margin-bottom: 10px;
}
+#export_osm,
+#export_mapnik,
#export_osmarender {
display: none;
}
-.export_hint {
- padding: 0px 12px;
- font-style: italic;
-}
-
.export_buttons {
width: 100%;
text-align: center;
#content {
padding: 20px;
- margin: 30px 0px 0px 185px;
- border-left: 1px solid #ccc;
- text-align: left;
+ position: relative;
}
.site-edit #content,
.site-index #content,
.site-export #content {
position: fixed;
- margin-top: 0px;
- left: 0px;
- right: 0px;
- top: 0px;
- bottom: 0px;
- padding: 0px;
+ padding: 0;
+ top: 30px; bottom: 0;
+ left: 185px; right: 0;
+ border-left: 1px solid #ccc;
+}
+
+.wrapper {
+ margin-left: 185px;
+ border-left: 1px solid #ccc;
+ text-align: left;
}
.site-edit #content {
margin: 10px;
position: absolute;
top: 0px;
+ margin-right: 5px;
}
#slim_header img {
margin-right: 5px;
}
-/* Rules for text content pages */
-
-.wide-table {
- width: 100%;
-}
+.content-heading {
+ position: relative;
+ padding: 20px;
+ background: #F4F4FF;
+ h1, h2 {
+ margin-bottom: 10px;
+ line-height: 100%;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ p {
+ margin-top: 10px;
+ margin-bottom: 0px;
+ }
+}
-/* Rules for the home page */
+/* Rules for small maps in content areas */
-.site-index #map {
- position: absolute;
- top: 0px;
- bottom: 0px;
- left: 0px;
- right: 0px;
+.content_map {
+ position: relative;
+ width: 45%;
+ height: 398px;
+ border: 1px solid #ccc;
+ margin-bottom: 20px;
+ float: right;
+}
+
+.content_map #small_map {
+ height: 100%;
+ width: 100%;
+ margin-bottom: 20px;
}
-.site-export #map {
+/* Rules for the home page */
+
+.site-export #map,
+.site-index #map {
position: absolute;
top: 0px;
bottom: 0px;
/* Rules for the changeset list shown by the history tab etc */
-#changeset_list_container {
- position: relative;
-}
-
#changeset_list {
- width: 50%;
- font-size: small;
- border-collapse: collapse;
- border-width: 0px;
- margin-top: 1px;
- margin-bottom: 1px;
- text-align: left;
-}
-
-#changeset_list td {
- vertical-align: top;
- padding: 3px;
-}
-
-#changeset_list .date {
- white-space: nowrap;
+ width: 100%;
+ ul {
+ padding: 10px 0;
+ margin-bottom: 0px;
+ border-top: 1px solid #ccc;
+ &:last-child {
+ border-bottom: 1px solid #ccc;
+ }
+ }
+ .selected {
+ background-color: rgb(255, 255, 160);
+ }
+ .date,
+ .user {
+ border-left: 1px solid #ccc;
+ padding-left: 5px;
+ margin-right: 5px;
+ }
}
-#changeset_list .user {
- white-space: nowrap;
+#changeset_list_map {
+ position: absolute;
+ bottom: 20px;
+ top: 20px;
+ right: 20px;
+ width: 45%;
+ min-height: 398px;
+ max-height: 598px;
+ border: 1px solid #ccc;
}
-#changeset_list .area {
- white-space: nowrap;
-}
+/* Rules for the data browser */
-#changeset_list .selected {
- background-color: rgb(255, 255, 160);
- background-color: rgba(255, 255, 85, 0.5);
+.browse-section {
+ border-top: 1px solid #ccc;
+ margin-top: 10px;
+ padding-top: 10px;
+ &:first-child {
+ margin-top: 0;
+ }
+ h4, p {
+ margin-bottom: 5px;
+ }
+ p, ul, .bbox {
+ margin-left: 33.3333%;
+ }
+ h4 {
+ width: 33.3333%;
+ float: left;
+ }
}
-#changeset_list_map {
- position: absolute;
- float: right;
- top: 0px;
- bottom: 0px;
- right: 0px;
- width: 49%;
- min-height: 400px;
- border: solid 1px black;
+.bbox {
+ div {
+ width: 33.3333%;
+ text-align: center;
+ padding: 5px 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ float: left;
+ }
+ .max_lat,
+ .min_lat {
+ margin-left: auto;
+ margin-right: auto;
+ width: 100%;
+ }
}
-/* Rules for the data browser */
-
-#browse_navigation {
- float: right;
- width: 250px;
- margin-left: 10px;
- text-align: center;
+#browse_map .geolink {
+ display: none;
}
-table.browse_details th {
- white-space: nowrap;
+#browse_map .secondary-actions {
+ margin-bottom: 10px;
}
td.browse_comments {
}
}
-#browse_map {
- float: right;
- width: 250px;
- text-align: right;
- margin-left: 10px;
-}
-
-#browse_map #small_map {
- width: 250px;
- height: 300px;
- border: solid 1px black;
-}
-
-#browse_map .geolink {
- display: none;
-}
-
/* Rules for the trace list shown by the traces tab etc */
#trace_list {
- font-size: small;
- border-collapse: collapse;
+ font-size: 10px;
border-width: 0px;
text-align: right;
}
color: red;
}
-/* Rules for the user list */
+/* Rules for the user profile page */
-#user_list {
+#userinformation {
+ min-height: 100px;
+ .userinformation-inner {
+ float: left;
+ }
+ h2 {
+ margin-top: 0;
+ }
+ .user-description {
+ width: 100%;
+ clear: both;
+ }
+ .deemphasize {
+ margin: 0;
+ }
+}
+
+.admin-user-info small {
+ margin-bottom: 10px;
+ display: inline;
+ margin-right: 20px;
+}
+
+.activity-block {
+ border-bottom: 1px solid #ccc;
+ padding-bottom: 20px;
+ float: left;
+ h3 {
+ margin-bottom: 10px;
+ }
+}
+
+.contact-activity {
+ margin-top: 20px;
width: 100%;
- font-size: small;
}
-#user_list tr {
- vertical-align: middle;
+.activity-details p {
+ margin-left: 72px;
+ margin-bottom: 0;
}
-#user_list p {
+#friends-container .contact-activity ul {
+ margin-left: 72px;
+ }
+
+.user-view p#no_home_location {
+ margin: 20px;
+}
+
+.user-view .user_thumbnail {
+ margin-top: 5px;
+ float: left;
+}
+
+/* Rules for the user map */
+
+.content_map .leaflet-popup-content {
+ margin: 10px 15px;
+ min-height: 62px;
+}
+
+.content_map .leaflet-popup-content-wrapper {
+-webkit-border-radius: 4px;
+ border-radius: 4px;
+}
+
+/* Rules for user popups on maps */
+
+.user_popup {
+ min-width: 200px;
+}
+
+.user_popup p {
+ padding-top: 3px;
+ padding-bottom: 3px;
margin-top: 0px;
margin-bottom: 0px;
+ margin-left: 55px;
+ margin-right: 2px;
}
-#user_list_actions {
- float: right;
- margin-top: 10px;
+.user_popup img.user_thumbnail {
+ float: left;
+ margin-right: 10px;
}
-/* Rules for the diary list */
+/* Rules for user popups on maps */
-.diary_entry-list img.user_image {
- float: right;
+.user_popup p {
+ margin-bottom: 0;
+ margin-left: 60px;
+ font-size: 12px;
}
-.diary_entry-list img.user_thumbnail {
- float: right;
+/* Rules for the user list */
+
+#user_list {
+ font-size: 10px;
+ width: 100%;
}
-/* Rules for the diary entry view */
+#user_list tr {
+ vertical-align: middle;
+}
-.diary_entry-view img.user_image {
- float: right;
+#user_list p {
+ margin-top: 0px;
+ margin-bottom: 0px;
}
-.diary_entry-view img.user_thumbnail {
+#user_list_actions {
float: right;
+ margin-top: 10px;
}
-/* Rules for the new diary entry page */
+/* Rules for the diary list page */
-.diary_entry div#map {
- position: relative;
- width: 90%;
- height: 400px;
- border: 1px solid #ccc;
- display: none;
+.diary_entry-list img.user_thumbnail {
+ float: left;
}
-/* Rules for the login page */
+.diary_post {
+ position: relative;
+ margin-top: 20px;
+ padding-top: 20px;
+ border-top: 1px solid #ccc;
-#login_wrapper div {
- margin: 5px;
- padding: 15px;
- border-radius: 15px;
- -moz-border-radius: 15px;
+ &:first-child {
+ margin-top: 0;
+ border-top: 0;
+ padding-top: 0;
+ }
+ h1, h2 {
+ font-size: 21px;
+ line-height: 21px;
+ }
+ small.deemphasize {
+ display: block;
+ }
+ ul,
+ ol {
+ margin-bottom: 20px;
+ font-style: italic;
+ margin-left: 20px;
+ }
+ ul li {
+ list-style: disc;
+ }
+ ol li {
+ list-style: decimal;
+ }
+ ul.secondary-actions { display: inline-block;}
}
-#login_login {
- background-color: #f5f5ff;
- border: 1px solid #f3f3ff;
- border-radius: 15px;
- -moz-border-radius: 15px;
+.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
+ display: inline;
}
-#login_login h1 {
- margin-top: 5px;
+.post_heading {
+ margin-bottom: 20px;
+ h2 {
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: 24px;
+ float: left;
+ line-height: 32px;
+ }
}
-table#login_openid_buttons {
- padding-bottom: 10px;
-}
+/* Rules for the diary entry page */
-#login_openid_buttons td {
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
+.diary_entry {
+ #map {
+ position: relative;
+ width: 90%;
+ height: 398px;
+ border: 1px solid #ccc;
+ display: none;
+ margin-bottom: 20px;
+ }
+ #newcomment {
+ border-top: 1px solid #ccc;
+ padding-top: 20px;
+ margin-top: 10px;
+ }
+ .diary-comment {
+ margin-top: 10px;
+ &:first-child {
+ margin-top: 20px;
+ padding-top: 20px;
+ border-top: 1px solid #ccc;
+ }
+ p {
+ margin-bottom: 10px;
+ margin-left: 70px;
+ }
+ .comment-heading {
+ margin-bottom: 0;
+ margin-top: 0;
+ }
+ }
}
-#login_openid_buttons img {
- border: 0;
+.diary_entry-view img.user_thumbnail {
+ float: left;
}
-#login_signup form.button-to div {
- margin: 0px;
- padding: 0px;
+/* Rules for the login page */
+
+#login_openid_buttons li {
+ float: left;
+ padding: 5px 10px;
}
/* Rules for the account confirmation page */
div#contributorTerms {
- border: 1px solid black;
- padding: 4px;
+ border: 1px solid #ccc;
+ padding: 20px;
+ margin-bottom: 20px;
overflow: auto;
- width: 95%;
- height: 400px;
-}
-
-div#slim_content div#contributorTerms {
- width: auto;
-}
-
-div#contributorTerms p#first {
- margin-top: 0px;
+ height: 398px;
}
div#contributorTerms p#last {
div#contributorTerms img {
display: block;
- margin-left: auto;
- margin-right: auto;
- margin-top: 10%;
-}
-
-form#termsForm {
- width: 95%;
- margin-bottom: 3em;
+ margin: 20px auto inherit auto;
}
form#termsForm div#buttons {
}
form#termsForm input#agree {
- margin-left: 50px;
+ margin-left: 40px;
}
div#slim_content form#termsForm {
}
p#contributorGuidance {
- background-color: #f5f5ff;
- border: 1px solid #f3f3ff;
- border-radius: 15px;
- -moz-border-radius: 15px;
+ background-color: #f4f4ff;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ margin-top: 20px;
padding: 10px;
}
#accountForm .user_map {
position: relative;
- width: 500px;
- height: 400px;
+ width: 498px;
+ height: 398px;
border: 1px solid #ccc;
}
-#accountForm td.accountImage {
- img {
- vertical-align: top;
- margin-top: 3px;
- }
-
- table {
- display: inline-block;
-
- td {
- padding-bottom: 0px;
- }
- }
+.accountImage-options {
+ width: 50%;
+ display: inline-block;
}
.nohome .location {
margin-top: 15px;
}
-/* Rules for the user view */
-
-.user-view img.user_image {
- float: right;
-}
-
-.user-view .user_map {
- float: right;
- position: relative;
- width: 400px;
- height: 400px;
- border: 1px solid #ccc;
-}
-
-.user-view .user_map p#no_home_location {
- position: absolute;
- top: 0px;
- bottom: 0px;
- width: 90%;
- height: 30%;
- margin: auto 5%
-}
-
-/* Rules for the user map */
-
-.user_map .leaflet-control-pan,
-.user_map .leaflet-control-zoomslider {
- display: none;
-}
-
-.user_map .leaflet-control-zoom {
- display: block;
-}
-
-/* Rules for user popups on maps */
-
-.user_popup {
- min-width: 200px;
-}
-
-.user_popup p {
- padding-top: 3px;
- padding-bottom: 3px;
- margin-top: 0px;
- margin-bottom: 0px;
- margin-left: 55px;
- margin-right: 2px;
-}
-
-.user_popup img.user_thumbnail {
- float: left;
+.content_map.settings_map {
+ float: none;
+ width: 50%;
}
/* Rules for message in/out box page */
.messages {
width: 100%;
- border-collapse: collapse;
- border-spacing: 0px;
- border-width: 0px;
+ border: 1px solid #ddd;
}
.messages tbody tr {
}
.messages .inbox-row {
- background: #eee;
+ background: #f8f8ff;
+}
+
+.messages .inbox-row-unread {
+ background:#CBEEA7;
+}
+
+.right {
+ float: right;
}
.messages tr td,
.messages tr th {
- padding: 0px 5px;
+ padding: 5px;
}
.inbox-row .inbox-mark-read {
}
.info-line {
- border-bottom: 1px solid #ccc;
+ margin-bottom: 20px;
padding: 5px 0px 4px 0px;
+ border-bottom: 1px solid #ccc;
}
.info-line form,
vertical-align: middle;
}
-.right {
- float: right;
-}
-
.inbox-row-unread .inbox-mark-unread {
display: none;
}
/* Rules for "flash" notice boxes shown at the top of the content area */
-#error {
- border: 1px solid red;
- padding: 7px;
- background-color: #fff0f0;
- margin-bottom: 20px;
- border-radius: 5px;
- -moz-border-radius: 5px;
-}
-
-#warning {
- border: 1px solid orange;
- padding: 7px;
- background-color: #fff6f0;
- margin-bottom: 20px;
- border-radius: 5px;
- -moz-border-radius: 5px;
-}
-
-#notice {
- border: 1px solid green;
- padding: 7px;
- background-color: #f0fff0;
- margin-bottom: 20px;
- border-radius: 5px;
- -moz-border-radius: 5px;
+.flash {
+ padding: 20px;
+ &#error {
+ background-color: #ff7070;
+ }
+ &#warning {
+ background-color: #fff6f0;
+ }
+ &#notice {
+ background-color: #CBEEA7;
+ }
}
/* Rules for highlighting fields with rails validation errors */
.field_with_errors {
padding: 2px;
- background-color: red;
+ background-color: #ff7070;
display: table;
}
#errorExplanation {
width: 400px;
- border: 2px solid red;
- padding: 7px;
- padding-bottom: 12px;
+ border: 2px solid #ff7070;
+ padding: 10px;
margin-bottom: 20px;
background-color: #f0f0f0;
}
#errorExplanation h2 {
+ margin: -10px;
+ padding: 5px 5px 5px 15px;
font-weight: bold;
font-size: 12px;
- padding: 5px 5px 5px 15px;
- margin: -7px;
background-color: #c00;
color: #fff;
text-align: left;
#errorExplanation ul li {
font-size: 12px;
- list-style: square;
+ list-style: disc;
}
/* Rules for forms */
+.submitButton {
+ text-align: center;
+}
+
.fieldName {
vertical-align: top;
font-weight: bold;
}
.minorNote {
- font-size: 0.8em;
+ font-size: 12px;
}
input[type="text"],
border: 1px solid #ccc;
}
-input.openid_url {
- background: image-url('openid_input.png') repeat-y left white;
- padding-left: 16px;
-}
-
/* Rules for user images */
img.user_image {
- max-width: 100px;
- max-height: 100px;
+ width: 100px;
+ height: 100px;
border: 1px solid #ccc;
+ margin-bottom: 20px;
+ float: left;
+ margin-right: 20px;
}
img.user_thumbnail {
- max-width: 50px;
- max-height: 100px;
+ width: 50px;
+ height: 50px;
border: 1px solid #ccc;
+ margin-right: 20px;
}
img.user_thumbnail_tiny {
- max-width: 25px;
- max-height: 25px;
+ max-width: 24px;
+ max-height: 24px;
border: 1px solid #ccc;
}
top: 4px;
}
+/* General styles for action lists / subnavs / pager navs */
+
+ul.secondary-actions {
+ font-style: normal;
+ margin-bottom: 0;
+ margin-left: 0;
+ &.pager {
+ display: inline-block;
+ margin-bottom: 20px;
+ margin-right: 60px;
+ }
+ li {
+ display: block;
+ float: left;
+ list-style: none;
+ border-left: 1px solid #ccc;
+ padding-left: 5px;
+ margin-right: 5px;
+ &:first-child {
+ border-left: 0;
+ padding-left: 0;
+ }
+ }
+ .hidden li,
+ .hide_unless_logged_in li,
+ .hide_unless_administrator li {
+ border-left: 1px solid #ccc;
+ padding-left: 5px;
+ }
+ .hidden:first-child li,
+ .hide_unless_logged_in:first-child li,
+ .hide_unless_administrator:first-child li {
+ border-left: 0;
+ padding-left: 0;
+ }
+}
+
+/* Utility for managing inner content areas */
+
+.inner22 { padding: 20px;}
+
+.inner12 { padding: 10px 20px;}
+
+.inner02 { padding: 0 20px;}
+
+/* Utility for general button styles */
+
+a.button {
+ display: block;
+ padding: 5px;
+ min-width: 120px;
+ margin-bottom: 10px;
+ color: white;
+ background: #7092FF;
+ text-align: center;
+ border-radius: 2px;
+ -moz-border-radius: 2px;
+ &:hover {
+ background: blue;
+ text-decoration: none;
+ }
+ &:last-child {
+ margin-bottom: 0;
+ }
+}
+
+a.button.submit {
+ background-color: #cbeea7;
+ &:hover {
+ background-color: #9ed485;
+ }
+}
/* Rules for doing distinct colour of alternate table rows */
-.table0 {
- background: #f6f6f6;
+.table0,
+.item0 {
+ background: #F4F4FF;
}
-.table1 {
+.table1,
+.item1 {
background: #fff;
}
.richtext_container {
white-space: nowrap;
-
.richtext_content {
display: inline-block;
vertical-align: top;
-
.richtext_preview {
display: inline-block;
- margin-top: 1px;
- margin-bottom: 1px;
- border: 4px solid #eee;
- background-color: #eee;
+ padding: 20px;
+ background-color: #f4f4ff;
white-space: normal;
-
&.loading {
background-image: image-url("loading.gif");
background-repeat: no-repeat;
background-position: center;
}
-
> :first-child {
margin-top: 0px;
}
}
}
-
.richtext_help {
display: inline-block;
vertical-align: top;
- background-color: #ddd;
margin-left: 15px;
- padding: 5px 10px 10px 10px;
- font-size: 12px;
-
+ background-color: #f8f8ff;
+ padding: 20px;
p {
margin: 0px;
}
-
th {
vertical-align: top;
text-align: left;
padding: 0px 15px 0px 0px !important;
}
-
+ table > thead th {
+ font-weight: bold;
+ }
td {
- text-align: left;
font-family: fixed;
line-height: 16px;
+ text-align: left;
padding: 0px !important;
}
-
input.richtext_doedit {
margin-top: 5px !important;
margin-right: 10px !important;
}
-
input.richtext_dopreview {
margin-top: 5px !important;
margin-left: 10px !important;
/* Styles specific to large screens */
-/* Rules for greeting bar in the top right corner */
-
-#small-greeting {
- display: none;
-}
-
/* Rules for OpenLayers maps */
.leaflet-control-zoom {
/*
*= require rtl/common
*= require rtl/small
- */
+ */
\ No newline at end of file
}
h1 {
+ font-size: 16px;
+}
+
+h2, h3, h4 {
font-size: 14px;
}
+.wrapper {
+ margin: 0;
+}
+
+.site-edit #content,
+.site-index #content,
+.site-export #content {
+ left: 0;
+}
+
+.site-edit #top-bar,
+.site-index #top-bar,
+.site-export #top-bar {
+ position: relative;
+}
+
+.column-1 {
+ width: 100%;
+}
+
/* Rules for the whole left sidebar, including the logo */
#left {
#top-bar {
left: 0;
margin: 0px;
- height: 39px;
- padding: 0;
+ height: 24px;
+ position: static;
}
#tabnav {
- height: 14px;
+ height: 19px;
margin: 0px;
padding-top: 5px;
- margin-top: 20px;
+ margin-top: 26px;
font-size: 10px;
line-height: 10px;
}
#tabnav a, #tabnav a:link, #tabnav a:visited {
font-size: 10px;
line-height: 10px;
- padding: 2px 5px;
+ padding: 5px;
margin-right: 1px;
}
+.menuicon { line-height: 10px;}
+
/* Rules for the site name - shown when left sidebar is hidden */
#small-title {
left: 5px;
top: 5px;
padding: 2px;
- width: 110px; /* TODO: find better fix for overlap */
+ width: 110px;
background-color: #fff;
z-index: 100;
}
#small-title h1 {
position: absolute;
- left: 18px;
font-size: 12px;
+ line-height: 18px;
margin: 0;
+ left: 22px;
}
/* Rules for greeting bar in the top right corner */
#greeting {
position: absolute;
- right: 5px;
- top: 5px;
- height: 14px;
- font-size: 12px;
- line-height: 12px;
- white-space: nowrap;
+ right: 0;
+ top: 0;
background: none;
}
-#full-greeting {
- display: none;
+#browse_map ul.secondary-actions {
+ float: right;
}
-#small-greeting {
- display: inline;
+#map {
+ border: 0;
}
-/* Rules for OpenLayers maps */
+.content_map {
+ width: 100%;
+ border: none;
+ float: none;
+ height: 200px;
+ max-height: none;
+ min-height: auto;
+}
-#map {
- border: 0;
+.content_map #small_map {
+ height: 300px;
+ border: 1px solid #ccc;
}
.leaflet-control-pan, .leaflet-control-zoomslider {
border-right: 0px;
}
+.site-export #content,
+.site-edit #content,
+.site-index #content {
+ margin-top: 21px;
+}
+
/* Rules for search sidebar when shown */
#sidebar {
border: 0px;
- border-right: 1px solid #ccccdd;
margin: 0px;
+ width: 50%;
+ border-right: 1px solid #ccccdd;
}
.sidebar_title, #sidebar_content {
}
#login_openid_buttons td {
- padding-left: 2px;
- padding-right: 2px;
- padding-top: 2px;
- padding-bottom: 2px;
+ padding: 2px;
}
-/* Rules for the profile page */
+/* Rules for the user view */
.user_map {
width: 100% !important;
height: 300px !important;
}
+#userinformation .deemphasize {
+ position: relative;
+ right: auto; left: auto;
+ margin-top: 10px;
+ top: auto;
+}
+
/* Rules for the user settings page */
#user_new_email {
/* Rules for the browse pages */
-#browse_navigation {
- width: 100% !important;
- margin-top: 0 !important;
-}
-
-#small_map, #browse_map {
- width: 100% !important;
+.browse-section.common div{
+ clear: both;
}
-#changeset_list tr {
- display: block;
- clear: left;
+#changeset_list_map {
+ position: relative;
width: 100%;
-}
-
-#changeset_list th {
- display: none;
-}
-
-#changeset_list td {
- display: block;
- float: left;
- padding-right: 10px;
-}
-
-#changeset_list td.comment, #changeset_list td.area {
- width: 96%;
- clear: left;
+ right: 0;
+ left: 0;
+ top: 0px;
+ margin-bottom: 20px;
+ float: none;
+ height: 300px !important;
+ max-height: auto;
+ min-height: auto;
}
/* Rules for the diary entries pages */
end
##
- # Return XML giving the basic info about the changeset. Does not
+ # Return XML giving the basic info about the changeset. Does not
# return anything about the nodes, ways and relations in the changeset.
def read
changeset = Changeset.find(params[:id])
render :text => changeset.to_xml.to_s, :content_type => "text/xml"
end
-
+
##
# marks a changeset as closed. this may be called multiple times
# on the same changeset, so is idempotent.
- def close
+ def close
assert_method :put
-
- changeset = Changeset.find(params[:id])
+
+ changeset = Changeset.find(params[:id])
check_changeset_consistency(changeset, @user)
# to close the changeset, we'll just set its closed_at time to
- # now. this might not be enough if there are concurrency issues,
+ # now. this might not be enough if there are concurrency issues,
# but we'll have to wait and see.
changeset.set_closed_time_now
cs = Changeset.find(params[:id])
check_changeset_consistency(cs, @user)
-
+
# keep an array of lons and lats
lon = Array.new
lat = Array.new
-
+
# the request is in pseudo-osm format... this is kind-of an
# abuse, maybe should change to some other format?
doc = XML::Parser.string(request.raw_post).parse
lon << n['lon'].to_f * GeoRecord::SCALE
lat << n['lat'].to_f * GeoRecord::SCALE
end
-
+
# add the existing bounding box to the lon-lat array
lon << cs.min_lon unless cs.min_lon.nil?
lat << cs.min_lat unless cs.min_lat.nil?
lon << cs.max_lon unless cs.max_lon.nil?
lat << cs.max_lat unless cs.max_lat.nil?
-
+
# collapse the arrays to minimum and maximum
- cs.min_lon, cs.min_lat, cs.max_lon, cs.max_lat =
+ cs.min_lon, cs.min_lat, cs.max_lon, cs.max_lat =
lon.min, lat.min, lon.max, lat.max
-
+
# save the larger bounding box and return the changeset, which
# will include the bigger bounding box.
cs.save!
# Furthermore, each element in the diff can only reference the current
# changeset.
#
- # Returns: a diffResult document, as described in
+ # Returns: a diffResult document, as described in
# http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6
def upload
# only allow POST requests, as the upload method is most definitely
changeset = Changeset.find(params[:id])
check_changeset_consistency(changeset, @user)
-
+
diff_reader = DiffReader.new(request.raw_post, changeset)
Changeset.transaction do
result = diff_reader.commit
# download the changeset as an osmChange document.
#
# to make it easier to revert diffs it would be better if the osmChange
- # format were reversible, i.e: contained both old and new versions of
+ # format were reversible, i.e: contained both old and new versions of
# modified elements. but it doesn't at the moment...
#
# this method cannot order the database changes fully (i.e: timestamp and
# version number may be too coarse) so the resulting diff may not apply
- # to a different database. however since changesets are not atomic this
+ # to a different database. however since changesets are not atomic this
# behaviour cannot be guaranteed anyway and is the result of a design
# choice.
def download
changeset = Changeset.find(params[:id])
-
+
# get all the elements in the changeset which haven't been redacted
# and stick them in a big array.
- elements = [changeset.old_nodes.unredacted,
- changeset.old_ways.unredacted,
+ elements = [changeset.old_nodes.unredacted,
+ changeset.old_ways.unredacted,
changeset.old_relations.unredacted].flatten
-
- # sort the elements by timestamp and version number, as this is the
- # almost sensible ordering available. this would be much nicer if
- # global (SVN-style) versioning were used - then that would be
+
+ # sort the elements by timestamp and version number, as this is the
+ # almost sensible ordering available. this would be much nicer if
+ # global (SVN-style) versioning were used - then that would be
# unambiguous.
- elements.sort! do |a, b|
+ elements.sort! do |a, b|
if (a.timestamp == b.timestamp)
a.version <=> b.version
else
- a.timestamp <=> b.timestamp
+ a.timestamp <=> b.timestamp
end
end
-
+
# create an osmChange document for the output
result = OSM::API.new.get_xml_doc
result.root.name = "osmChange"
# generate an output element for each operation. note: we avoid looking
- # at the history because it is simpler - but it would be more correct to
+ # at the history because it is simpler - but it would be more correct to
# check these assertions.
elements.each do |elt|
result.root <<
- if (elt.version == 1)
+ if (elt.version == 1)
# first version, so it must be newly-created.
created = XML::Node.new "create"
created << elt.to_xml_node
render :text => results.to_s, :content_type => "text/xml"
end
-
+
##
# updates a changeset's tags. none of the changeset's attributes are
# user-modifiable, so they will be ignored.
changeset.update_from(new_changeset, @user)
render :text => changeset.to_xml, :mime_type => "text/xml"
else
-
+
render :nothing => true, :status => :bad_request
end
end
if params[:display_name]
user = User.find_by_display_name(params[:display_name])
-
+
if user and user.active?
if user.data_public? or user == @user
changesets = changesets.where(:user_id => user.id)
return
end
end
-
+
if params[:friends]
if @user
changesets = changesets.where(:user_id => @user.friend_users.public)
changesets = conditions_bbox(changesets, bbox)
bbox_link = render_to_string :partial => "bbox", :object => bbox
end
-
+
if user
user_link = render_to_string :partial => "user", :object => user
end
-
+
if params[:friends] and @user
@title = t 'changeset.list.title_friend'
@heading = t 'changeset.list.heading_friend'
private
#------------------------------------------------------------
# utility functions below.
- #------------------------------------------------------------
+ #------------------------------------------------------------
##
# if a bounding box was specified do some sanity checks.
# make sure we found a user
raise OSM::APINotFoundError.new if u.nil?
- # should be able to get changesets of public users only, or
+ # should be able to get changesets of public users only, or
# our own changesets regardless of public-ness.
unless u.data_public?
# get optional user auth stuff so that users can see their own
# changesets if they're non-public
setup_user_auth
-
+
raise OSM::APINotFoundError if @user.nil? or @user.id != u.id
end
return changesets.where(:user_id => u.id)
##
# restrict changes to those closed during a particular time period
- def conditions_time(changesets, time)
+ def conditions_time(changesets, time)
unless time.nil?
- # if there is a range, i.e: comma separated, then the first is
+ # if there is a range, i.e: comma separated, then the first is
# low, second is high - same as with bounding boxes.
if time.count(',') == 1
# check that we actually have 2 elements in the array
times = time.split(/,/)
- raise OSM::APIBadUserInput.new("bad time range") if times.size != 2
+ raise OSM::APIBadUserInput.new("bad time range") if times.size != 2
from, to = times.collect { |t| DateTime.parse(t) }
return changesets.where("closed_at >= ? and created_at <= ?", from, to)
if open.nil?
return changesets
else
- return changesets.where("closed_at >= ? and num_changes <= ?",
+ return changesets.where("closed_at >= ? and num_changes <= ?",
Time.now.getutc, Changeset::MAX_ELEMENTS)
end
end
-
+
##
# query changesets which are closed
# ('closed at' time has passed or changes limit is hit)
if closed.nil?
return changesets
else
- return changesets.where("closed_at < ? or num_changes > ?",
+ return changesets.where("closed_at < ? or num_changes > ?",
Time.now.getutc, Changeset::MAX_ELEMENTS)
end
end
def conditions_nonempty(changesets)
return changesets.where("num_changes > 0")
end
-
+
end
before_filter :check_database_writable, :only => [:new, :edit]
before_filter :require_administrator, :only => [:hide, :hidecomment]
- caches_action :list, :layout => false, :unless => :user_specific_list?
+# caches_action :list, :layout => false, :unless => :user_specific_list?
caches_action :rss, :layout => true
- caches_action :view, :layout => false
+# caches_action :view, :layout => false
cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment]
def new
else
@user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
end
- redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name
+ redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name
else
render :action => 'edit'
end
if @this_user
@title = t 'diary_entry.list.user_title', :user => @this_user.display_name
@entry_pages, @entries = paginate(:diary_entries,
- :conditions => {
+ :conditions => {
:user_id => @this_user.id,
- :visible => true
+ :visible => true
},
:order => 'created_at DESC',
:per_page => 20)
:per_page => 20)
else
require_user
- return
+ return
end
elsif params[:nearby]
if @user
:visible => true
},
:order => 'created_at DESC',
- :per_page => 20)
+ :per_page => 20)
else
require_user
- return
- end
+ return
+ end
else
@title = t 'diary_entry.list.title'
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
def comments
@comment_pages, @comments = paginate(:diary_comments,
- :conditions => {
+ :conditions => {
:user_id => @this_user,
:visible => true
},
:order => 'created_at DESC',
:per_page => 20)
@page = (params[:page] || 1).to_i
- end
+ end
private
##
# require that the user is a administrator, or fill out a helpful error message
before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data]
around_filter :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
- caches_action :list, :unless => :logged_in?, :layout => false
- caches_action :view, :layout => false
+# caches_action :list, :unless => :logged_in?, :layout => false
+# caches_action :view, :layout => false
caches_action :georss, :layout => true
cache_sweeper :trace_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
end
def rss_link_to(*args)
- return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+ return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
end
def atom_link_to(*args)
- return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+ return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
end
def style_rules
-<table>
+<div class='column-1'>
+
+ <div class='browse-section common'>
+ <div>
+ <h4><%= t 'browse.changeset_details.created_at' %></h4>
+ <p><%= l changeset_details.created_at %></p>
+ </div>
+
+ <div>
+ <h4><%= t 'browse.changeset_details.closed_at' %></h4>
+ <p><%= l changeset_details.closed_at %></p>
+ </div>
+
+ <% if changeset_details.user.data_public? %>
+ <div>
+ <h4><%= t 'browse.changeset_details.belongs_to' %></h4>
+ <p><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></p>
+ </div>
+ <% end %>
+ </div>
- <tr>
- <th><%= t 'browse.changeset_details.created_at' %></th>
- <td><%= l changeset_details.created_at %></td>
- </tr>
-
- <tr>
- <th><%= t 'browse.changeset_details.closed_at' %></th>
- <td><%= l changeset_details.closed_at %></td>
- </tr>
-
- <% if changeset_details.user.data_public? %>
- <tr>
- <th><%= t 'browse.changeset_details.belongs_to' %></th>
- <td><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></td>
- </tr>
- <% end %>
-
<%= render :partial => "tag_details", :object => changeset_details %>
- <tr>
- <th><%= t 'browse.changeset_details.bounding_box' %></th>
+ <div class='browse-section clearfix'>
+ <h4><%= t 'browse.changeset_details.bounding_box' %></h4>
<% unless changeset_details.has_valid_bbox? %>
- <td><%= t 'browse.changeset_details.no_bounding_box' %></td>
- <% else
- bbox = changeset_details.bbox.to_unscaled
- %>
- <td>
- <table>
- <tr>
- <td colspan="3" style="text-align:center"><%=bbox.max_lat -%></td>
- </tr>
- <tr>
- <td><%=bbox.min_lon -%></td>
- <td>(<%= link_to t('browse.changeset_details.box'), root_path(:minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => 'yes'), :title => t('browse.changeset_details.show_area_box') %>)</td>
- <td><%=bbox.max_lon -%></td>
- </tr>
- <tr>
- <td colspan="3" style="text-align:center"><%= bbox.min_lat -%></td>
- </tr>
- </table>
- </td>
+ <p><%= t 'browse.changeset_details.no_bounding_box' %></p>
+ <% else bbox = changeset_details.bbox.to_unscaled %>
+ <div class='bbox'>
+ <div class='max_lat'><%=bbox.max_lat -%></div>
+ <div class='min_lon'><%=bbox.min_lon -%></div>
+ <div class='box'>(<%= link_to t('browse.changeset_details.box'), root_path(:minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => 'yes'), :title => t('browse.changeset_details.show_area_box') %>)</div>
+ <div class='max_lon'><%=bbox.max_lon -%></div>
+ <div class='min_lat'><%= bbox.min_lat -%></div>
+ </div>
<% end %>
- </tr>
+ </div>
<% unless @nodes.empty? %>
- <tr valign="top">
- <th><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></th>
- <td>
- <table cellpadding="0">
+ <div class='browse-section'>
+ <h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
+ <ul>
<% @nodes.each do |node| %>
- <tr><td><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></td></tr>
+ <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
- </table>
- </td>
- </tr>
+ </ul>
+ </div>
<%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
<% end %>
-
+
<% unless @ways.empty? %>
- <tr valign="top">
- <th><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></th>
- <td>
- <table cellpadding="0">
+ <div class='browse-section'>
+ <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
+ <ul>
<% @ways.each do |way| %>
- <tr><td><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></td></tr>
+ <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
<%=
- #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members
+ #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members
%>
- </table>
- </td>
- </tr>
+ </ul>
+ </div>
<%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
<% end %>
-
+
<% unless @relations.empty? %>
- <tr valign="top">
- <th><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></th>
- <td>
- <table cellpadding="0">
+ <div class='browse-section'>
+ <h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
+ <ul>
<% @relations.each do |relation| %>
- <tr><td><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></td></tr>
+ <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<% end %>
- </table>
- </td>
- </tr>
+ </ul>
+ </div>
<%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
<% end %>
-</table>
+</div>
\ No newline at end of file
-<tr>
- <% if common_details.visible? %>
- <th><%= t 'browse.common_details.edited_at' %></th>
- <% else %>
- <th><%= t 'browse.common_details.deleted_at' %></th>
- <% end %>
- <td><%= l common_details.timestamp %></td>
-</tr>
-
-<% if common_details.changeset.user.data_public? %>
- <tr>
+<div class='browse-section common'>
+ <div>
<% if common_details.visible? %>
- <th><%= t 'browse.common_details.edited_by' %></th>
+ <h4><%= t 'browse.common_details.edited_at' %></h4>
<% else %>
- <th><%= t 'browse.common_details.deleted_by' %></th>
+ <h4><%= t 'browse.common_details.deleted_at' %></h4>
<% end %>
- <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
- </tr>
-<% end %>
+ <p><%= l common_details.timestamp %></p>
+ </div>
-<tr>
- <th><%= t 'browse.common_details.version' %></th>
- <td><%= h(common_details.version) %></td>
-</tr>
+ <% if common_details.changeset.user.data_public? %>
+ <div>
+ <% if common_details.visible? %>
+ <h4><%= t 'browse.common_details.edited_by' %></h4>
+ <% else %>
+ <h4><%= t 'browse.common_details.deleted_by' %></h4>
+ <% end %>
+ <p><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></p>
+ </div>
+ <% end %>
-<tr>
- <th><%= t 'browse.common_details.in_changeset' %></th>
- <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td>
-</tr>
+ <div>
+ <h4><%= t 'browse.common_details.version' %></h4>
+ <p><%= h(common_details.version) %></p>
+ </div>
-<% if common_details.changeset.tags['comment'] %>
- <tr>
- <th><%= t 'browse.common_details.changeset_comment' %></th>
- <td><%= linkify(h(common_details.changeset.tags['comment'])) %></td>
- </tr>
-<% end %>
+ <div>
+ <h4><%= t 'browse.common_details.in_changeset' %></h4>
+ <p><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></p>
+ </div>
+ <% if common_details.changeset.tags['comment'] %>
+ <div>
+ <h4><%= t 'browse.common_details.changeset_comment' %></h4>
+ <p><%= linkify(h(common_details.changeset.tags['comment'])) %></p>
+ </div>
+ <% end %>
+</div>
<%= render :partial => "tag_details", :object => common_details %>
-<tr>
- <td><%=
- linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
-
- if containing_relation.member_role.blank?
- raw t 'browse.containing_relation.entry', :relation_name => linked_name
- else
- raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
- end
- %></td>
-</tr>
+<li><%=
+ linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
+ if containing_relation.member_role.blank?
+ raw t 'browse.containing_relation.entry', :relation_name => linked_name
+ else
+ raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+ end
+%></li>
\ No newline at end of file
<iframe id="linkloader" style="display: none">
</iframe>
-<div id="browse_map">
+<div id="browse_map" class='clearfix content_map'>
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
<% content_for :head do %>
<%= content_tag "div", "", :id => "small_map", :data => data %>
<span id="loading"><%= t 'browse.map.loading' %></span>
- <% if map.instance_of? Note -%>
- <%= link_to t("browse.map.larger.area"),
- root_path(:notes => "yes"),
- :id => "area_larger_map",
- :class => "geolink bbox" %>
- <% else -%>
- <%= link_to t("browse.map.larger.area"),
- root_path(:box => "yes"),
- :id => "area_larger_map",
+<ul class='secondary-actions clearfix'>
+ <li>
+ <% if map.instance_of? Note -%>
+ <%= link_to t("browse.map.larger.area"),
+ root_path(:notes => "yes"),
+ :id => "area_larger_map",
+ :class => "geolink bbox" %>
+ <% else -%>
+ <%= link_to t("browse.map.larger.area"),
+ root_path(:box => "yes"),
+ :id => "area_larger_map",
+ :class => "geolink bbox" %>
+ <% end -%>
+ </li>
+ <li>
+ <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"),
+ edit_path,
+ :id => "area_edit",
+ :data => { :editor => preferred_editor },
:class => "geolink bbox" %>
- <% end -%>
- <br />
- <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"),
- edit_path,
- :id => "area_edit",
- :data => { :editor => preferred_editor },
- :class => "geolink bbox" %>
+ </li>
+</ul>
<% unless map.instance_of? Changeset or map.instance_of? Note %>
- <br />
- <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
- root_path,
- :id => "object_larger_map",
- :class => "geolink object" %>
- <br />
- <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"),
- edit_path,
- :id => "object_edit",
- :data => { :editor => preferred_editor },
- :class => "geolink object" %>
+ <ul class='secondary-actions clearfix'>
+ <li>
+ <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
+ root_path,
+ :id => "object_larger_map",
+ :class => "geolink object" %>
+ </li>
+ <li>
+ <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"),
+ edit_path,
+ :id => "object_edit",
+ :data => { :editor => preferred_editor },
+ :class => "geolink object" %>
+ </li>
+ </ul>
<% end %>
<% else %>
<% type = (@next || @prev).class.name.downcase %>
-<% margin = @next_by_user || @prev_by_user ? 9 : 18 %>
-<div id="browse_navigation" style="margin-top: <%= margin %>px">
- <% if @next_by_user or @prev_by_user %>
- <span class="nowrap">
- <% if @prev_by_user %>
- <%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
- { :id => @prev_by_user.id },
- { :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %>
- |
- <% end %>
- <%=
- user = (@prev_by_user || @next_by_user).user.display_name
- link_to h(user),
- { :controller => "changeset", :action => "list", :display_name => user },
- { :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) }
- %>
- <% if @next_by_user %>
- |
- <%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s),
- { :id => @next_by_user.id },
- { :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %>
- <% end %>
- </span>
- <br/>
- <% end %>
- <span class="nowrap">
+ <ul class='secondary-actions clearfix pager'>
<% if @prev %>
+ <li>
<%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s),
{ :id => @prev.id },
{ :title => t("browse.navigation.all.prev_#{type}_tooltip") } %>
- <% end %>
- <% if @prev and @next %>
- |
+ </li>
<% end %>
<% if @next %>
- <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
- { :id => @next.id },
- { :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
+ <li>
+ <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
+ { :id => @next.id },
+ { :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
+ </li>
<% end %>
- </span>
-</div>
+ </ul>
+ <% if @next_by_user or @prev_by_user %>
+ <ul class='secondary-actions pager clearfix'>
+ <% if @prev_by_user %>
+ <li>
+ <%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
+ { :id => @prev_by_user.id },
+ { :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %>
+ </li>
+ <% end %>
+ <li>
+ <%=
+ user = (@prev_by_user || @next_by_user).user.display_name
+ link_to h(user),
+ { :controller => "changeset", :action => "list", :display_name => user },
+ { :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) }
+ %>
+ </li>
+ <% if @next_by_user %>
+ <li>
+ <%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s),
+ { :id => @next_by_user.id },
+ { :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %>
+ </li>
+ <% end %>
+ </ul>
+ <% end %>
<% if node_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %></p>
<% else %>
-<table class="browse_details" id="<%= node_details.version %>">
+<div class="browse_details" id="<%= node_details.version %>">
<%= render :partial => "common_details", :object => node_details %>
<% if node_details.visible -%>
- <tr>
- <th><%= t 'browse.node_details.coordinates' %></th>
- <td><div class="geo"><%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %></div></td>
- </tr>
+ <div class='browse-section'>
+ <h4><%= t 'browse.node_details.coordinates' %></h4>
+ <div class="geo"><%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %></div>
+ </div>
<% end -%>
<% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
- <tr valign="top">
- <th><%= t 'browse.node_details.part_of' %></th>
- <td>
- <table cellpadding="0">
+ <div class='browse-section'>
+ <h4><%= t 'browse.node_details.part_of' %></h4>
+ <ul>
<% node_details.ways.each do |way| %>
- <tr><td><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></td></tr>
+ <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
<%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>
- </table>
- </td>
- </tr>
+ </ul>
+ </div>
<% end %>
-</table>
+</div>
<% end %>
-<tr><td colspan='2'>
+<div>
<% current_page = pages.current_page %>
-<%= t'browse.paging_nav.showing_page' %>
-<%= current_page.number %> (<%= current_page.first_item %><%
-if (current_page.first_item < current_page.last_item) # if more than 1 trace on page
- %>-<%= current_page.last_item %><%
+<%= t'browse.paging_nav.showing_page' %>
+<%= current_page.number %> (<%= current_page.first_item %><%
+if (current_page.first_item < current_page.last_item) # if more than 1 trace on page
+ %>-<%= current_page.last_item %><%
end %>
<%= t'browse.paging_nav.of'%> <%= pages.item_count %>)
<% if pages.page_count > 1 %>
| <%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %>
<% end %>
-</td>
-</tr>
+</div>
\ No newline at end of file
<% if relation_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p>
<% else %>
-<table class="browse_details" id="<%= relation_details.version %>">
+<div class="browse_details" id="<%= relation_details.version %>">
<%= render :partial => "common_details", :object => relation_details %>
<% unless relation_details.relation_members.empty? %>
- <tr valign="top">
- <th><%= t'browse.relation_details.members' %></th>
- <td>
- <table cellpadding="0">
- <%= render :partial => "relation_member", :collection => relation_details.relation_members %>
- </table>
- </td>
- </tr>
+ <div class='browse-section'>
+ <h4><%= t'browse.relation_details.members' %></h4>
+ <ul><%= render :partial => "relation_member", :collection => relation_details.relation_members %></ul>
+ </div>
<% end %>
<% unless relation_details.containing_relation_members.empty? %>
- <tr valign="top">
- <th><%= t'browse.relation_details.part_of' %></th>
- <td>
- <table cellpadding="0">
- <%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %>
- </table>
- </td>
- </tr>
+ <div class='browse-section'>
+ <h4><%= t'browse.relation_details.part_of' %></h4>
+ <ul><%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %></ul>
+ </div>
<% end %>
-</table>
+</div>
<% end %>
<%
member_class = link_class(relation_member.member_type.downcase, relation_member.member)
linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member)
- type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
+ type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
%>
-<tr>
- <td class="<%= member_class %>"><%=
+ <li class="<%= member_class %>"><%=
if relation_member.member_role.blank?
raw t'browse.relation_member.entry', :type => type_str, :name => linked_name
else
raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
end
- %></td>
-</tr>
+ %></li>
\ No newline at end of file
-<tr>
- <td><%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %></td>
-</tr>
+ <li><%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %></li>
\ No newline at end of file
<% unless tag_details.tags.empty? %>
- <tr valign="top">
- <th><%= t'browse.tag_details.tags' %></th>
- <td>
- <table cellpadding="0">
- <%= render :partial => "tag", :collection => tag_details.tags.sort %>
- </table>
- </td>
- </tr>
-<% end %>
+ <div class='browse-section'>
+ <h4><%= t'browse.tag_details.tags' %></h4>
+ <ul><%= render :partial => "tag", :collection => tag_details.tags.sort %></ul>
+ </div>
+<% end %>
\ No newline at end of file
<% if way_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p>
<% else %>
-<table class="browse_details" id="<%= way_details.version %>">
+
+<div class="browse_details" id="<%= way_details.version %>">
<%= render :partial => "common_details", :object => way_details %>
<% unless way_details.way_nodes.empty? %>
- <tr valign="top">
- <th><%= t'browse.way_details.nodes' %></th>
- <td>
- <table cellpadding="0">
+ <div class='browse-section'>
+ <h4><%= t'browse.way_details.nodes' %></h4>
+ <ul>
<% way_details.way_nodes.each do |wn| %>
- <tr><td>
+ <li>
<%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %>
<% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
<% if related_ways.size > 0 then %>
(<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
<% end %>
- </td></tr>
+ </li>
<% end %>
- </table>
- </td>
- </tr>
+ </ul>
+ </div>
<% end %>
<% unless way_details.containing_relation_members.empty? %>
- <tr valign="top">
- <th><%= t'browse.way_details.part_of' %></th>
- <td>
- <table cellpadding="0">
+ <div class='browse-section'>
+ <h4><%= t'browse.way_details.part_of' %></h4>
+ <ul>
<%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
- </table>
- </td>
- </tr>
+ </ul>
<% end %>
-</table>
+</div>
<% end %>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<% end %>
+
+<% content_for :heading do %>
+ <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %></li>
+ <li><%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></li>
+ </ul>
+<% end %>
+
<%= render :partial => "navigation" %>
-<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
+
<% if @changeset.has_valid_bbox? %>
<%= render :partial => "map", :object => @changeset %>
<% end %>
-<%= render :partial => "changeset_details", :object => @changeset %>
-<hr />
-<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
-| <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+<%= render :partial => "changeset_details", :object => @changeset %>
\ No newline at end of file
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<% end %>
+
+<% content_for :heading do %>
+ <h2><%= t'browse.node.node_title', :node_name => @name %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %></li>
+ <li><%= link_to(t('browse.node.view_history'), :action => "node_history") %></li>
+ <% if @node.visible -%>
+ <li><%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %></li>
+ <% end -%>
+ </ul>
+<% end %>
<%= render :partial => "navigation" %>
-<h2><%= t'browse.node.node_title', :node_name => @name %></h2>
+
<% if @node.visible -%>
<%= render :partial => "map", :object => @node %>
<% end -%>
-<%= render :partial => "node_details", :object => @node %>
-<hr />
-<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
-| <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
-<% if @node.visible -%>
-| <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %>
-<% end -%>
+
+<div class='column-1'>
+ <%= render :partial => "node_details", :object => @node %>
+</div>
\ No newline at end of file
@name = printable_name @node
@title = t('browse.node_history.node_history') + ' | ' + @name
%>
-<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
+<% content_for :heading do %>
+ <h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %></li>
+ <li><%= link_to(t('browse.node_history.view_details'), :action => "node") %></li>
+ </ul>
+<% end %>
+
<% if @node.visible -%>
-<%= render :partial => "map", :object => @node %>
+ <%= render :partial => "map", :object => @node %>
<% end -%>
-<% @node.old_nodes.reverse.each do |node| %>
- <%= render :partial => "node_details", :object => node %>
- <hr />
-<% end %>
-<%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %>
-| <%= link_to(t('browse.node_history.view_details'), :action => "node") %>
+
+<div class='column-1'>
+ <% @node.old_nodes.reverse.each do |node| %>
+ <%= render :partial => "node_details", :object => node %>
+ <% end %>
+</div>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<% end %>
+
+<% content_for :heading do %>
+ <h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %></li>
+ <li><%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></li>
+ </ul>
+<% end %>
<%= render :partial => "navigation" %>
-<h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
<%= render :partial => "map", :object => @relation %>
-<%= render :partial => "relation_details", :object => @relation %>
-<hr />
-<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
-| <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>
+
+<div class='column-1'>
+ <%= render :partial => "relation_details", :object => @relation %>
+</div>
\ No newline at end of file
@name = printable_name @relation
@title = t('browse.relation_history.relation_history') + ' | ' + @name
%>
-<h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
+
+<% content_for :heading do %>
+ <h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %></li>
+ <li><%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></li>
+ </ul>
+<% end %>
+
<%= render :partial => "map", :object => @relation %>
+<div class='column-1'>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
- <hr />
<% end %>
-<%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %>
-| <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %>
+</div>
\ No newline at end of file
-<div>
- <div style="text-align: center">
- <p style="margin-top: 10px; margin-bottom: 20px">
- <a id="browse_filter_toggle" href="#"><%= t'browse.start_rjs.manually_select' %></a>
- <br />
- <a id="browse_hide_areas_box" href="#"><%= t'browse.start_rjs.hide_areas' %></a>
- </p>
- </div>
- <div id="browse_status" style="text-align: center; display: none">
- </div>
- <div id="browse_content">
- </div>
+<div id="browse_controls" class='inner12'>
+ <a id="browse_filter_toggle" class="button" href="#"><%= t'browse.start_rjs.manually_select' %></a>
+ <a id="browse_hide_areas_box" class="button" href="#"><%= t'browse.start_rjs.hide_areas' %></a>
</div>
+<div id="browse_status" class='inner12'></div>
+<div id="browse_content"></div>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<% end %>
+
+<% content_for :heading do %>
+ <h2><%= t'browse.way.way_title', :way_name => @name %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %></li>
+ <li><%= link_to(t('browse.way.view_history'), :action => "way_history") %></li>
+ <li><%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id) %></li>
+ </ul>
+<% end %>
+
<%= render :partial => "navigation" %>
-<h2><%= t'browse.way.way_title', :way_name => @name %></h2>
<%= render :partial => "map", :object => @way %>
-<%= render :partial => "way_details", :object => @way %>
-<hr />
-<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
-| <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
-| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id) %>
+
+<div class='column-1'>
+ <%= render :partial => "way_details", :object => @way %>
+</div>
\ No newline at end of file
@name = printable_name @way
@title = t('browse.way_history.way_history') + ' | ' + @name
%>
-<h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
+
+<% content_for :heading do %>
+ <h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %></li>
+ <li><%= link_to(t('browse.way_history.view_details'), :action => "way") %></li>
+ </ul>
+<% end %>
+
<%= render :partial => "map", :object => @way %>
+<div class='column-1'>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
- <hr />
<% end %>
-<%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
-| <%= link_to(t('browse.way_history.view_details'), :action => "way") %>
+</div>
\ No newline at end of file
end
%>
-<%= content_tag "tr", :class => cycle('table0', 'table1'), :id => "tr-changeset-#{changeset.id}", :data => {:changeset => changeset_data} do %>
- <td>
- <%=
- id_link = link_to(changeset.id,
- {:controller => 'browse', :action => 'changeset', :id => changeset.id},
- {:title => t('changeset.changeset.view_changeset_details')})
- raw t 'changeset.changeset.id', :id => id_link
- %>
- </td>
+<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
+ <li>
- <td class="date">
- <span class="date">
+ <span class="changeset_id">
+ <%=
+ link_to(changeset.id,
+ {:controller => 'browse', :action => 'changeset', :id => changeset.id},
+ {:title => t('changeset.changeset.view_changeset_details')})
+ %>
+ </span>
+
+ <span class='date'>
<% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
<% else %><%= l changeset.closed_at, :format => :long %><% end %>
</span>
-
+
<%if showusername %>
- <br />
<span class="user">
- <% if changeset.user.data_public? %>
- <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %>
- <% else %>
- <i><%= t'changeset.changeset.anonymous' %></i>
- <% end %>
+ <% if changeset.user.data_public? %>
+ <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %>
+ <% else %>
+ <i><%= t'changeset.changeset.anonymous' %></i>
+ <% end %>
</span>
<% end %>
- </td>
-
- <td class="comment">
+ </li>
+
+ <li class="comment deemphasize">
<% if changeset.tags['comment'].to_s != '' %>
<%= linkify(h(changeset.tags['comment'])) %>
<% else %>
<%= t'changeset.changeset.no_comment' %>
<% end %>
- </td>
+ </li>
+
<% end %>
-<p>
-
-<% if @page > 1 %>
-<%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
-<% else %>
-<%= t('changeset.changeset_paging_nav.previous') %>
-<% end %>
-
-| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
-
-<% if @edits.size < @page_size %>
-<%= t('changeset.changeset_paging_nav.next') %>
-<% else %>
-<%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
-<% end %>
-
-</p>
+<ul class='secondary-actions pager clearfix'>
+ <% if @page > 1 %>
+ <li><%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %></li>
+ <% else %>
+ <li><%= t('changeset.changeset_paging_nav.previous') %></li>
+ <% end %>
+
+ <li><%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %></li>
+
+ <% if @edits.size < @page_size %>
+ <li><%= t('changeset.changeset_paging_nav.next') %></li>
+ <% else %>
+ <li><%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %></li>
+ <% end %>
+</ul>
\ No newline at end of file
<% showusername = true if showusername.nil? %>
-<table id="changeset_list">
+<div id="changeset_list">
<%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %>
-</table>
+</div>
<%= javascript_include_tag "changeset" %>
<% end -%>
-<h1><%= @heading %></h1>
-<p><%= raw(@description) %></p>
+<% content_for :heading do %>
-<% if @edits.size > 0 %>
- <%= render :partial => 'changeset_paging_nav' %>
+ <h1><%= @heading %></h1>
+ <ul class='secondary-actions clearfix'>
+ <li><%= raw(@description) %></li>
+ <% unless params[:friends] or params[:nearby] -%>
+ <li><%= atom_link_to params.merge({ :page => nil, :action => :feed }) %></li>
+ <% end -%>
+ </ul>
+
+<% end %>
+
+<%= render :partial => 'changeset_paging_nav' %>
- <div id="changeset_list_container">
- <%= render :partial => 'map' %>
+<% if @edits.size > 0 %>
+ <%= render :partial => 'map' %>
+ <div class='column-1'>
<%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
</div>
-
<%= render :partial => 'changeset_paging_nav' %>
<% elsif @user and @user.display_name == params[:display_name] %>
- <p><%= t('changeset.list.empty_user_html') %></p>
+ <h4><%= t('changeset.list.empty_user_html') %></h4>
<% else %>
- <p><%= t('changeset.list.empty_anon_html') %></p>
+ <h4><%= t('changeset.list.empty_anon_html') %></h4>
<% end %>
<% unless params[:friends] or params[:nearby] -%>
-<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>
-
-<% content_for :head do -%>
-<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
-<% end -%>
-<% end -%>
+ <% content_for :head do -%>
+ <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
+ <% end -%>
+<% end -%>
\ No newline at end of file
-<p><%= t'changeset.timeout.sorry' %></p>
+<p><%= t'changeset.timeout.sorry' %></p>
\ No newline at end of file
-<%= user_thumbnail diary_comment.user %>
-<h4 id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></h4>
-<%= diary_comment.body.to_html %>
-<%= if_administrator(:span) do %>
- <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %>
-<% end %>
-<hr />
+<div class='clearfix diary-comment'>
+ <%= user_thumbnail diary_comment.user %>
+ <p class='deemphasize comment-heading' id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></p>
+ <%= diary_comment.body.to_html %>
+ <%= if_administrator(:span) do %>
+ <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %>
+ <% end %>
+</div>
\ No newline at end of file
-<b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br />
+<div class='diary_post'>
+ <div class='post_heading clearfix'>
+ <% if !@this_user %>
+ <%= user_thumbnail diary_entry.user %>
+ <% end %>
-<div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
- <%= diary_entry.body.to_html %>
-</div>
+ <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
+ </div>
+ <div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
+ <%= diary_entry.body.to_html %>
+ </div>
+
+ <% if diary_entry.latitude and diary_entry.longitude %>
+ <%= render :partial => "location", :object => diary_entry %>
+ <% end %>
-<% if diary_entry.latitude and diary_entry.longitude %>
- <%= render :partial => "location", :object => diary_entry %>
- <br />
-<% end %>
+ <small class='deemphasize'>
+ <%= raw(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, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
+ </small>
-<%= raw(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, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
+ <ul class='secondary-actions clearfix'>
+ <% if params[:action] == 'list' %>
+ <li><%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li>
+ <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %></li>
+ <li><%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
+ <% end %>
-<% if params[:action] == 'list' %>
- <br />
- <%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
- |
- <%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %>
- |
- <%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
-<% end %>
-<%= if_user(diary_entry.user, :span) do %>
- | <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
-<% end %>
-<%= if_administrator(:span) do %>
- | <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %>
-<% end %>
+ <%= if_user(diary_entry.user, :span) do %>
+ <li><%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>
+ <% end %>
-<br />
-<hr />
+ <%= if_administrator(:span) do %>
+ <li><%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %></li>
+ <% end %>
+ </ul>
+</div>
-<%= user_thumbnail diary_list_entry.user %>
-<%= render :partial => "diary_entry", :object => diary_list_entry %>
+<%= render :partial => "diary_entry", :object => diary_list_entry %>
\ No newline at end of file
-<h1><%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %></h1>
+<% content_for :heading do %>
+ <h1><%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %></h1>
+<% end %>
-<table width="100%">
+<table class="comments-table" width="100%">
<tr>
- <th><%= t 'diary_entry.comments.post' %></th>
- <th><%= t 'diary_entry.comments.when' %></th>
- <th><%= t 'diary_entry.comments.comment' %></th>
+ <th width="25%"><%= t 'diary_entry.comments.post' %></th>
+ <th width="25%"><%= t 'diary_entry.comments.when' %></th>
+ <th width="50%"><%= t 'diary_entry.comments.comment' %></th>
</tr>
<% @comments.each do |comment| -%>
<% cl = cycle('table0', 'table1') %>
<tr class="<%= cl %>">
- <td><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td>
- <td><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
- <td><%= comment.body.to_html %></td>
+ <td width="25%"><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td>
+ <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
+ <td width="50%"><%= comment.body.to_html %></td>
</tr>
<% end -%>
</table>
-<%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %>
-<% if @comment_pages.current.next and @comment_pages.current.previous %>
-|
-<% end %>
-<%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %>
+<ul class='secondary-actions clearfix'>
+ <li><%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %></li>
+ <li><%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></li>
+</ul>
\ No newline at end of file
<%= javascript_include_tag "diary_entry" %>
<% end %>
-<h1><%= @title %></h1>
+<% content_for :heading do %>
+ <h1><%= @title %></h1>
+<% end %>
<%= error_messages_for 'diary_entry' %>
-<% if @this_user %>
- <%= user_image @this_user %>
+<% content_for :heading do %>
+ <div <% if @this_user %> id="userinformation"<% end %> >
+ <% if @this_user %>
+ <%= user_image @this_user %>
+ <% end %>
+ <h2><%= h(@title) %></h2>
+
+ <ul class='secondary-actions clearfix'>
+ <% unless params[:friends] or params[:nearby] -%>
+ <li><%= rss_link_to :action => 'rss', :language => params[:language] %></li>
+ <% end -%>
+
+ <% if @this_user %>
+ <%= if_user(@this_user) do %>
+ <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li>
+ <% end %>
+ <% else %>
+ <%= if_logged_in do %>
+ <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li>
+ <% end %>
+ <% end %>
+ </ul>
+ </div>
<% end %>
-<h2><%= h(@title) %></h2>
+<% if @entries.empty? %>
+ <h4><%= t 'diary_entry.list.no_entries' %></h4>
+<% else %>
+ <h4><%= t 'diary_entry.list.recent_entries' %></h4>
<% if @this_user %>
- <%= if_user(@this_user) do %>
- <%= 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 %>
+ <%= render :partial => 'diary_entry', :collection => @entries %>
<% else %>
- <%= if_logged_in do %>
- <%= 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 %>
+ <%= render :partial => 'diary_list_entry', :collection => @entries %>
<% end %>
-<% if @entries.empty? %>
- <p><%= t 'diary_entry.list.no_entries' %></p>
-<% else %>
- <p><%= t 'diary_entry.list.recent_entries' %></p>
-
- <hr />
-
- <% if @this_user %>
- <%= render :partial => 'diary_entry', :collection => @entries %>
- <% else %>
- <%= render :partial => 'diary_list_entry', :collection => @entries %>
- <% end %>
-
- <%= 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, :language => params[:language] } if @entry_pages.current.previous %>
+<%= 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, :language => params[:language] } if @entry_pages.current.previous %>
- <br />
<% end %>
<% unless params[:friends] or params[:nearby] -%>
-<%= rss_link_to :action => 'rss', :language => params[:language] %>
-
-<% content_for :head do -%>
-<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
-<% end -%>
+ <% content_for :head do -%>
+ <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
+ <% end -%>
<% end -%>
-<h2><%= t 'diary_entry.no_such_entry.heading', :id => h(params[:id]) %></h2>
+<% content_for :heading do %>
+ <h2><%= t 'diary_entry.no_such_entry.heading', :id => h(params[:id]) %></h2>
+<% end %>
+
<p><%= t 'diary_entry.no_such_entry.body', :id => h(params[:id]) %></p>
-<%= user_image @entry.user %>
-
-<h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
+<% content_for :heading do %>
+ <div id="userinformation" >
+ <%= user_image @entry.user %>
+ <h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
+ </div>
+<% end %>
<%= render :partial => 'diary_entry', :object => @entry %>
<a id="comments"></a>
-
+<div class='comments'>
<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
-
+</div>
<%= if_logged_in(:div) do %>
- <h4 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h4>
+ <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>
<%= error_messages_for 'diary_comment' %>
<%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
<%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
- <br />
- <br />
<%= submit_tag t('diary_entry.view.save_button') %>
<% end %>
<% end %>
<%= if_not_logged_in(:div) do %>
- <h4 id="newcomment"><%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h4>
-<% end %>
+ <h3 id="newcomment"><%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>
+<% end %>
\ No newline at end of file
<%= form_tag :action => "finish" do %>
- <p class="export_heading"><%= t'export.start.area_to_export' %></p>
-
- <div class="export_bounds">
- <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
- <br/>
- <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
- <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
- <br/>
- <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
- <p class="export_hint">
- <a id="drag_box" href="#"><%= t'export.start.manually_select' %></a>
- </p>
- </div>
-
- <p class="export_heading"><%= t'export.start.format_to_export' %></p>
+ <h4><%= t'export.start.area_to_export' %></h4>
- <div class="export_details">
- <p>
- <%= radio_button_tag("format", "osm") %> <%= t'export.start.osm_xml_data' %>
+ <div class="export_bounds inner12">
+ <div class='export_area_inputs'>
+ <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
<br/>
- <%= radio_button_tag("format", "mapnik") %> <%= t'export.start.map_image' %>
+ <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
+ <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
<br/>
- <%= radio_button_tag("format", "html") %> <%= t'export.start.embeddable_html' %>
- </p>
+ <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
+ </div>
+ <a id="drag_box" class='export_hint button' href="#"><%= t'export.start.manually_select' %></a>
</div>
+ <h4><%= t'export.start.format_to_export' %></h4>
+
+ <ul class="export_details inner12">
+ <li><%= radio_button_tag("format", "osm") %> <%= t'export.start.osm_xml_data' %></li>
+ <li><%= radio_button_tag("format", "mapnik") %> <%= t'export.start.map_image' %></li>
+ <li><%= radio_button_tag("format", "html") %> <%= t'export.start.embeddable_html' %></li>
+ </ul>
+
<div id="export_osm">
- <p class="export_heading"><%= t'export.start.licence' %></p>
+ <h4><%= t'export.start.licence' %></h4>
- <div class="export_details">
+ <div class="export_details inner12">
<p><%= raw t'export.start.export_details' %></p>
</div>
<div id="export_osm_too_large">
- <p class="export_heading"><%= t'export.start.too_large.heading' %></p>
+ <h4><%= t'export.start.too_large.heading' %></h4>
- <div class="export_details">
+ <div class="export_details inner12">
<p><%= t'export.start.too_large.body' %></p>
</div>
</div>
</div>
<div id="export_mapnik">
- <p class="export_heading"><%= t'export.start.options' %></p>
+ <h4><%= t'export.start.options' %></h4>
- <div class="export_details">
- <p><%= t'export.start.format' %> <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"]], "png")) %></p>
- <p><%= t'export.start.scale' %> 1 : <%= text_field_tag("mapnik_scale", nil, :size => 8) %> <span class="export_hint">(<%= t'export.start.max' %> 1 : <span id="mapnik_max_scale"></span>)</span></p>
- <p><%= t'export.start.image_size' %> <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span></p>
- </div>
+ <ul class="export_details inner12">
+ <li><%= t'export.start.format' %> <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"]], "png")) %></li>
+ <li><%= t'export.start.scale' %> 1 : <%= text_field_tag("mapnik_scale", nil) %> <p class="deemphasize export_hint">(<%= t'export.start.max' %> 1 : <span id="mapnik_max_scale"></span>)</p></li>
+ <li><%= t'export.start.image_size' %> <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span></li>
+ </ul>
</div>
<div id="export_html">
- <p class="export_heading"><%= t'export.start.options' %></p>
-
- <div class="export_details">
- <p><a id="add_marker" href="#"><%= t'export.start.add_marker' %></a></p>
- <p id="marker_inputs" style="display:none">
- <%= t'export.start.latitude' %> <input type="text" id="marker_lat" size="9" />
- <%= t'export.start.longitude' %> <input type="text" id="marker_lon" size="9" />
- </p>
+ <h4><%= t'export.start.options' %></h4>
+
+ <div class="export_details inner12">
+ <ul id="marker_inputs" style="display:none">
+ <li><%= t'export.start.latitude' %> <input type="text" id="marker_lat"/></li>
+ <li><%= t'export.start.longitude' %> <input type="text" id="marker_lon"/></li>
+ </ul>
+ <a id="add_marker" class='button' href="#"><%= t'export.start.add_marker' %></a>
</div>
- <p class="export_heading"><%= t'export.start.output' %></p>
+ <h4><%= t'export.start.output' %></h4>
- <div class="export_details">
- <p><input type="text" id="export_html_text" style="width:95%" /></p>
- <p><%= t'export.start.paste_html' %></p>
+ <div class="export_details inner12">
+ <input type="text" id="export_html_text"/>
+ <p class='deemphasize'><%= t'export.start.paste_html' %></p>
</div>
</div>
<% @sources.each do |source| %>
<% if source[:types] %>
- <p class="search_results_heading"><%= raw(t("geocoder.description.title.#{source[:name]}", :types => t("geocoder.description.types.#{source[:types]}"))) %></p>
+ <h4><%= raw(t("geocoder.description.title.#{source[:name]}", :types => t("geocoder.description.types.#{source[:types]}"))) %></h4>
<% else %>
- <p class="search_results_heading"><%= raw(t("geocoder.description.title.#{source[:name]}")) %></p>
+ <h4><%= raw(t("geocoder.description.title.#{source[:name]}")) %></h4>
<% end %>
- <div class='search_results_entry' id='<%= "description_#{source[:name]}_#{source[:types]}" %>'>
+ <div class='search_results_entry inner12' id='<%= "description_#{source[:name]}_#{source[:types]}" %>'>
<%= image_tag "searching.gif", :class => "search_searching" %>
</div>
<script type="text/javascript">
<% if @results.empty? %>
- <p class="search_results_entry"><%= t 'geocoder.results.no_results' %></p>
+ <p class="search_results_entry inner12"><%= t 'geocoder.results.no_results' %></p>
<% else %>
+ <ul class='results-list'>
<% @results.each do |result| %>
- <p class="search_results_entry"><%= result_to_html(result) %></p>
+ <li><p class="inner12 search_results_entry deemphasize"><%= result_to_html(result) %></p></li>
<% end %>
+</ul>
<% if @more_params %>
<div id="search_more_<%= @more_params.hash %>">
- <p class="search_results_entry">
- <%= link_to t('geocoder.results.more_results'), "#" %>
- </p>
+ <div class="inner12 search_results_entry">
+ <%= link_to t('geocoder.results.more_results'), "#", :class => "button" %>
+ </div>
<%= image_tag "searching.gif", :class => "search_searching" %>
</div>
<script type="text/javascript">
- $("#search_more_<%= @more_params.hash %> .search_searching").hide();
+ $("#search_more_<%= @more_params.hash %> .search_searching").hide();
- $("#search_more_<%= @more_params.hash %> a").click(function () {
- $("#search_more_<%= @more_params.hash %> .search_results_entry").hide();
- $("#search_more_<%= @more_params.hash %> .search_searching").show();
-
- $("#search_more_<%= @more_params.hash %>").load("<%= raw url_for(@more_params) %>");
- });
+ $("#search_more_<%= @more_params.hash %> a").click(function () {
+ $("#search_more_<%= @more_params.hash %> .search_results_entry").hide();
+ $("#search_more_<%= @more_params.hash %> .search_searching").show();
+ $("#search_more_<%= @more_params.hash %>").load("<%= raw url_for(@more_params) %>");
+ });
</script>
<% end %>
<% end %>
<% @sources.each do |source| %>
- <p class="search_results_heading"><%= raw(t "geocoder.search.title.#{source}") %></p>
+ <h4><%= raw(t "geocoder.search.title.#{source}") %></h4>
<div class="search_results_entry" id="<%= "search_#{source}" %>">
<%= image_tag "searching.gif", :class => "search_searching" %>
</div>
<% if flash[:error] %>
- <div id="error"><%= raw flash[:error] %></div>
+ <div id="error" class="flash"><%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:error] %></div>
<% end %>
<% if flash[:warning] %>
- <div id="warning"><%= raw flash[:warning] %></div>
+ <div id="warning" class="flash"><%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:warning] %></div>
<% end %>
<% if flash[:notice] %>
- <div id="notice"><%= raw flash[:notice] %></div>
+ <div id="notice" class="flash"><%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:notice] %></div>
<% end %>
<%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>
<h1><%= t 'layouts.project_name.h1' %></h1>
</div>
- <div id="content">
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
- <%= yield %>
- </div>
- <div id='top-bar'>
- <span id="greeting">
- <% if @user and @user.id %>
- <span id="full-greeting"><%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip'))) %></span>
- <span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %></span> |
- <%= yield :greeting %>
- <%= render :partial => "layouts/inbox" %> |
- <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
- <% else %>
- <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
- <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
- <% end %>
- </span>
- <ul id="tabnav">
- <li><%= link_to t('layouts.view'), root_path, {
- :id => 'viewanchor',
- :title => t('layouts.view_tooltip'),
- :class => 'geolink llz layers'
- } %></li>
- <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, {
- :id => 'editanchor',
- :title => t('javascripts.site.edit_tooltip'),
- :data => { :minzoom => 13, :editor => preferred_editor },
- :class => 'geolink llz object disabled'
- } %></li>
- <li><%= link_to t('layouts.history'), browse_changesets_path, {
- :id => 'historyanchor',
- :data => { :minzoom => 11 },
- :title => t('javascripts.site.history_tooltip'),
- :class => 'geolink bbox'
- } %></li>
- <li><%= link_to t('layouts.export'), export_path, {
- :id => 'exportanchor',
- :title => t('layouts.export_tooltip'),
- :data => { :url => url_for(:controller => :export, :action => :start) },
- :class => 'geolink llz layers'
- } %></li>
- </ul>
- </div>
- <div id="editmenu" class="menu">
- <ul>
- <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
- <li><%= link_to t('layouts.edit_with',
- :editor => t("editor.#{editor}.description")),
- edit_path(:editor => editor), {
- :data => { :editor => editor },
- :class => "geolink llz object"
- } %></li>
- <% end %>
- <%= yield :editmenu %>
- </ul>
- </div>
- <script type="text/javascript">
- createMenu("editanchor", "editmenu", "left");
- </script>
- <div id="left">
+ <div id="left">
<div id="logo">
<%= link_to(image_tag("osm_logo.png",
:size => "120x120",
</p>
</div>
</div>
+ <div id='top-bar'>
+ <ul class='secondary-actions' id="greeting">
+ <% if @user and @user.id %>
+ <li id="full-greeting"><%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %></li>
+ <li><%= yield :greeting %></li>
+ <li><%= render :partial => "layouts/inbox" %></li>
+ <li><%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%></li>
+ <% else %>
+ <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
+ <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+ <% end %>
+ </ul>
+ <ul id="tabnav">
+ <li><%= link_to t('layouts.view'), root_path, {
+ :id => 'viewanchor',
+ :title => t('layouts.view_tooltip'),
+ :class => 'geolink llz layers'
+ } %></li>
+ <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, {
+ :id => 'editanchor',
+ :title => t('javascripts.site.edit_tooltip'),
+ :data => { :minzoom => 13, :editor => preferred_editor },
+ :class => 'geolink llz object disabled'
+ } %></li>
+ <li><%= link_to t('layouts.history'), browse_changesets_path, {
+ :id => 'historyanchor',
+ :data => { :minzoom => 11 },
+ :title => t('javascripts.site.history_tooltip'),
+ :class => 'geolink bbox'
+ } %></li>
+ <li><%= link_to t('layouts.export'), export_path, {
+ :id => 'exportanchor',
+ :title => t('layouts.export_tooltip'),
+ :data => { :url => url_for(:controller => :export, :action => :start) },
+ :class => 'geolink llz layers'
+ } %></li>
+ </ul>
+ </div>
+ <div id="editmenu" class="menu">
+ <ul>
+ <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+ <li><%= link_to t('layouts.edit_with',
+ :editor => t("editor.#{editor}.description")),
+ edit_path(:editor => editor), {
+ :data => { :editor => editor },
+ :class => "geolink llz object"
+ } %></li>
+ <% end %>
+ <%= yield :editmenu %>
+ </ul>
+ </div>
+ <script type="text/javascript">
+ createMenu("editanchor", "editmenu", "left");
+ </script>
+ <div class="wrapper">
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+ <div class="content-heading">
+ <%= yield :heading %>
+ </div>
+ <% end %>
+ <div id="content" class="clearfix">
+ <%= yield %>
+ </div>
+ </div>
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
<noscript><p><img src="<%= request.protocol %><%= PIWIK_LOCATION %>/piwik.php?idsite=<%= PIWIK_SITE %>" style="border:0" alt="" /></p></noscript>
<% end -%>
<tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" if not message_summary.message_read? %>">
<td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %></td>
<td class="inbox-subject"><%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %></td>
- <td class="inbox-sent nowrap"><%= l message_summary.sent_on, :format => :friendly %></td>
+ <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
<td class="inbox-mark-unread"><%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %></td>
<td class="inbox-mark-read"><%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %></td>
<td><%= button_to t('message.message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath %></td>
<tr class="inbox-row">
<td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %></td>
<td class="inbox-subject"><%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %></td>
- <td class="inbox-sent nowrap"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
+ <td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
<td><%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %></td>
</tr>
-<div class='text-content'>
-<h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %></h2>
+<% content_for :heading do %>
+ <h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %></h2>
+<% end %>
-<%= render :partial => "message_count" %>
+ <h4><%= render :partial => "message_count" %></h4>
<% if @user.messages.size > 0 %>
<table class="messages">
<% else %>
<div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
<% end %>
-</div>
-<h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h2>
+<% content_for :heading do %>
+ <h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h2>
+<% end %>
<%= error_messages_for 'message' %>
-<h1><%= t'message.no_such_message.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t'message.no_such_message.heading' %></h1>
+<% end %>
+
<p><%= t'message.no_such_message.body' %></p>
-<h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %></h2>
+<% content_for :heading do %>
+ <h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %></h2>
+<% end %>
-<p><%= t'message.outbox.messages', :count => @user.sent_messages.size %></p>
+<h4><%= t'message.outbox.messages', :count => @user.sent_messages.size %></h4>
<% if @user.sent_messages.size > 0 %>
<table class="messages">
-<div class='text-content'>
<% if @user == @message.recipient %>
-
+ <% content_for :heading do %>
<h2><%= h(@message.title) %></h2>
-
- <div class='info-line'>
- <%= user_thumbnail_tiny @message.sender %>
- <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
- <div class='right'>
- <%= l @message.sent_on, :format => :friendly %>
- <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %>
- <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %>
- </div>
+ <% end %>
+
+ <div class='info-line clearfix'>
+ <%= user_thumbnail_tiny @message.sender %>
+ <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+ <div class='right'>
+ <%= l @message.sent_on, :format => :friendly %>
+ <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %>
+ <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %>
</div>
+ </div>
- <%= @message.body.to_html %></td>
+ <%= @message.body.to_html %></td>
- <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
+ <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
<% else %>
- <h2><%= h(@message.title) %></h2>
+ <h2><%= h(@message.title) %></h2>
- <div class='info-line'>
- <%= user_thumbnail_tiny @message.recipient %>
- <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
- <div class='right'>
- <%= l @message.sent_on, :format => :friendly %>
- </div>
+ <div class='info-line clearfix'>
+ <%= user_thumbnail_tiny @message.recipient %>
+ <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+ <div class='right'>
+ <%= l @message.sent_on, :format => :friendly %>
</div>
+ </div>
- <%= @message.body.to_html %></td>
+ <%= @message.body.to_html %></td>
- <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
+ <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
-<% end %>
-</div>
+<% end %>
\ No newline at end of file
-<h1>Authorize access to your account</h1>
-<p><%= raw t('oauth.oauthorize.request_access', :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %></p>
+<% content_for :heading do %>
+ <h1>Authorize access to your account</h1>
+ <p><%= raw t('oauth.oauthorize.request_access', :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %></p>
+<% end %>
+
<%= form_tag authorize_url do %>
<%= hidden_field_tag "oauth_token", @token.token %>
<%- if params[:oauth_callback] -%>
-<h1>You have disallowed this request</h1>
+<% content_for :heading do %>
+ <h1>You have disallowed this request</h1>
+<% end %>
\ No newline at end of file
-<h1>You have allowed this request</h1>
+<% content_for :heading do %>
+ <h1>You have allowed this request</h1>
+<% end %>
<% if @token.oob? and not @token.oauth10? %>
<p>The verification code is <%= @token.verifier %></p>
-<h1><%= t'oauth_clients.edit.title' %></h1>
+<% content_for :heading do %>
+ <h1><%= t'oauth_clients.edit.title' %></h1>
+<% end %>
+
<%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put } do |f| %>
<%= render :partial => "form", :locals => { :f => f } %>
<br/>
-<h1><%= t'oauth_clients.index.title' %></h1>
+<% content_for :heading do %>
+ <h1><%= t'oauth_clients.index.title' %></h1>
+<% end %>
+
<% unless @tokens.empty? %>
<h3><%= t'oauth_clients.index.my_tokens' %></h3>
<p><%= t'oauth_clients.index.list_tokens' %></p>
<% end %>
</td>
<% end %>
- <% end %>
+ <% end %>
</table>
<% end %>
<h3><%= t'oauth_clients.index.my_apps' %></h3>
<% end %>
<% end %>
<% end %>
-<h3><%= link_to t('oauth_clients.index.register_new'), :action => :new %></h3>
+<h3><%= link_to t('oauth_clients.index.register_new'), :action => :new %></h3>
\ No newline at end of file
-<h1><%= t'oauth_clients.new.title' %></h1>
+<% content_for :heading do %>
+ <h1><%= t'oauth_clients.new.title' %></h1>
+<% end %>
+
<%= form_for :client_application, :url => { :action => :create } do |f| %>
<%= render :partial => "form", :locals => { :f => f } %>
<br />
<%= submit_tag t('oauth_clients.new.submit') %>
-<% end %>
+<% end %>
\ No newline at end of file
-<h1><%= t('oauth_clients.show.title', :app_name => @client_application.name) %></h1>
+<% content_for :heading do %>
+ <h1><%= t('oauth_clients.show.title', :app_name => @client_application.name) %></h1>
+<% end %>
<p>
<b><%= t'oauth_clients.show.key' %></b> <%=@client_application.key %>
</p>
<% @title = t 'redaction.edit.title' %>
-<h1><%= t 'redaction.edit.heading' %></h1>
+
+<% content_for :heading do %>
+ <h1><%= t 'redaction.edit.heading' %></h1>
+<% end %>
<%= form_for(@redaction) do |f| %>
<%= f.error_messages %>
<% @title = t('redaction.index.title') %>
-<h1><%= t('redaction.index.heading') %></h1>
+<% content_for :heading do %>
+ <h1><%= t('redaction.index.heading') %></h1>
+<% end %>
<% unless @redactions.empty? %>
<%= render :partial => 'redactions' %>
<% @title = t 'redaction.new.title' %>
-<h1><%= t 'redaction.new.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'redaction.new.heading' %></h1>
+<% end %>
<%= form_for(@redaction) do |f| %>
<%= f.error_messages %>
<% @title = t('redaction.show.title') %>
-<h1><%= t('redaction.show.heading', :title => @redaction.title) %></h1>
+<% content_for :heading do %>
+ <h1><%= t('redaction.show.heading', :title => @redaction.title) %></h1>
+<% end %>
<p>
<b><%= t 'redaction.show.user' %></b>
<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
<% content_for :greeting do %>
- <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> |
+ <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %>
<% end %>
<% end %>
flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml";
flashvars.connection = "XML";
flashvars.show_help = "once";
+ flashvars.user_check = "warn";
<% if token %>
flashvars.oauth_token = "<%= token.token %>";
flashvars.oauth_token_secret = "<%= token.secret %>";
<div id="search_field">
<%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
<%= submit_tag t('site.search.submit_text') %>
- <%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search') %>
+ <%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search'), :autofocus => "autofocus" %>
<% end %>
</div>
</div>
<div id="sidebar">
- <table class="sidebar_title" width="100%">
- <tr>
- <td id="sidebar_title"><% t 'site.sidebar.search_results' %></td>
- <td id="sidebar_close"><a class="sidebar_close" href="#"><%= t 'site.sidebar.close' %></a></td>
- </tr>
- </table>
+ <div class="sidebar_heading">
+ <h4 id="sidebar_title"><% t 'site.sidebar.search_results' %></h4>
+ <div id="sidebar_close"><a class="sidebar_close" href="#"><%= t 'site.sidebar.close' %></a></div>
+ </div>
<div id="sidebar_content">
</div>
</div>
+<% content_for :heading do %>
<% if @locale == 'en' %>
<!-- Maybe ease foreigners back to their native page -->
- <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %>
- <h2><%= t 'license_page.native.title' %></h2>
- <p>
- <%= raw t 'license_page.native.text',
- :native_link => link_to(t('license_page.native.native_link'),
- :controller => 'site',
- :action => 'copyright',
- :copyright_locale => nil),
- :mapping_link => link_to(t('license_page.native.mapping_link'),
- :controller => 'site',
- :action => 'index') %>
- </p>
- <hr />
- <% end %>
-<% else %>
- <!-- Maybe note that this page has been translated -->
- <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %>
- <h2><%= t 'license_page.foreign.title' %></h2>
- <p>
- <%= raw t 'license_page.foreign.text',
- :english_original_link => link_to(t('license_page.foreign.english_link'),
- :controller => 'site',
- :action => 'copyright',
- :copyright_locale => 'en') %>
- </p>
- <hr />
+
+ <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %>
+ <h2><%= t 'license_page.native.title' %></h2>
+ <p>
+ <%= raw t 'license_page.native.text',
+ :native_link => link_to(t('license_page.native.native_link'),
+ :controller => 'site',
+ :action => 'copyright',
+ :copyright_locale => nil),
+ :mapping_link => link_to(t('license_page.native.mapping_link'),
+ :controller => 'site',
+ :action => 'index') %>
+ </p>
+ <hr />
+ <% end %>
+ <% else %>
+ <!-- Maybe note that this page has been translated -->
+ <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %>
+ <h2><%= t 'license_page.foreign.title' %></h2>
+ <p>
+ <%= raw t 'license_page.foreign.text',
+ :english_original_link => link_to(t('license_page.foreign.english_link'),
+ :controller => 'site',
+ :action => 'copyright',
+ :copyright_locale => 'en') %>
+ </p>
+ <hr />
+ <% end %>
<% end %>
-<% end %>
-<h2><%= t "license_page.legal_babble.title_html", :locale => @locale %></h2>
+ <h2><%= t "license_page.legal_babble.title_html", :locale => @locale %></h2>
+
+<% end %>
<p><%= t "license_page.legal_babble.intro_1_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.intro_2_html", :locale => @locale %></p>
<p><%= image_tag("attribution_example.png",
:alt => t('license_page.legal_babble.attribution_example.alt'),
:border => 0,
- :width => 193,
- :height => 69,
:title => t('license_page.legal_babble.attribution_example.title')) %>
<h3><%= t "license_page.legal_babble.more_title_html", :locale => @locale %></h3>
<h3><%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %></p>
-<p><%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %></p>
\ No newline at end of file
<% end %>
</td>
<td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
- <span class="trace_summary" title="<%= trace.timestamp %>"> ...
- <% if trace.inserted %>
+ <span class="trace_summary" title="<%= trace.timestamp %>"> ...
+ <% if trace.inserted %>
(<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
- <% end %>
+ <% end %>
... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
<%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> /
<%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> /
<%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
<span class="trace_<%= trace.visibility %>"><%= t('trace.trace.' + trace.visibility) %></span>
<br />
- <%= h(trace.description) %>
+ <%= t('trace.list.description') %>
<br />
<%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
<% if !trace.tags.empty? %>
- <%= t'trace.trace.in' %>
+ <%= t'trace.trace.in' %>
<%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
<% end %>
</td>
<% content_for :optionals do %>
<div class="optionalbox">
- <h1><%= t'trace.trace_optionals.tags' %></h1>
- <br />
+ <h4><%= t'trace.trace_optionals.tags' %></h4>
<% if @all_tags %>
<% @all_tags.each do |tag| %>
<%= link_to_tag tag %><br />
-<h1><%= t'trace.create.upload_trace' %></h1>
+<% content_for :heading do %>
+ <h1><%= t'trace.create.upload_trace' %></h1>
+<% end %>
<%= error_messages_for 'trace' %>
-<h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
+<% content_for :heading do %>
+ <h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
+<% end %>
<img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
<tr>
<td><%= t'trace.edit.filename' %></td>
<td><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
- </tr>
+ </tr>
<tr>
<td><%= t'trace.edit.uploaded_at' %></td>
<td><%= l @trace.timestamp, :format => :friendly %></td>
-<h1><%= h(@title) %></h1>
+<% content_for :heading do %>
+ <h1><%= h(@title) %></h1>
+ <ul class='secondary-actions clearfix'>
+ <li><%= t('trace.list.description') %></li>
+ <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>
+ <li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li>
+ <% if @tag %>
+ <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
+ <li><%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+ <% else %>
+ <% if @display_name %>
+ <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
+ <% end %>
+ <%= unless_user(@target_user, :li) do %>
+ <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+ <% end %>
+ <% end %>
+ </ul>
+<% end %>
<% content_for :head do %>
<%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %>
<% end %>
-<p>
- <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
- | <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %>
- <% if @tag %>
- | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
- | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
- <% else %>
- <% if @display_name %>
- | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
- <% end %>
- <%= unless_user(@target_user, :span) do %>
- | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
- <% end %>
- <% end %>
-</p>
-
<% if @traces.size > 0 %>
<%= render :partial => 'trace_paging_nav' %>
<%= render :partial => 'trace_paging_nav' %>
<% else %>
- <p><%= t 'trace.list.empty_html', :upload_link => trace_create_path %></p>
+ <h4><%= t 'trace.list.empty_html', :upload_link => trace_create_path %></h4>
<% end %>
<%= render :partial => 'trace_optionals' %>
+<% content_for :heading do %>
<h2><%= t 'trace.offline.heading' %></h2>
+<% end %>
+
<p><%= t 'trace.offline.message' %></p>
-<h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
+<% content_for :heading do %>
+ <h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
+<% end %>
<% if STATUS != :gpx_offline %>
<% if @trace.inserted %>
<tr>
<td><%= t'trace.view.filename' %></td>
<td><%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
- </tr>
+ </tr>
<tr>
<td><%= t'trace.view.uploaded' %></td>
<td><%= l @trace.timestamp, :format => :friendly %></td>
-<tr>
+<div class='contact-activity clearfix'>
<%
user_data = {
:lon => contact.home_lon,
<%= content_tag "td", :rowspan => 3, :data => {:user => user_data} do %>
<%= user_thumbnail contact %>
<% end %>
- <td>
- <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %>
- <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>
- <% distance = @this_user.distance(contact) %>
- <% if distance < 1 %>
- (<%= t 'user.view.m away', :count => (distance * 1000).round %>)
+ <div class='activity-details'>
+ <p class='deemphasize'>
+ <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %>
+ <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>
+ <% distance = @this_user.distance(contact) %>
+ <% if distance < 1 %>
+ (<%= t 'user.view.m away', :count => (distance * 1000).round %>)
+ <% else %>
+ (<%= t 'user.view.km away', :count => distance.round %>)
+ <% end %>
+ <% end %>
+ </p>
+ <p>
+ <% changeset = contact.changesets.first %>
+ <% if changeset %>
+ <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
+ <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %>
+ "<%= link_to(comment,
+ {:controller => 'browse', :action => 'changeset', :id => changeset.id},
+ {:title => t('changeset.changeset.view_changeset_details')})
+ %>"
<% else %>
- (<%= t 'user.view.km away', :count => distance.round %>)
+ <%= t'changeset.changeset.no_edits' %>
+ <% end %>
+ </p>
+
+ <ul class='secondary-actions clearfix deemphasize'>
+ <li><%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %></li>
+ <li>
+ <% if @user.is_friends_with?(contact) %>
+ <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
+ <% else %>
+ <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
<% end %>
- <% end %>
- </td>
-</tr>
-<tr>
- <td>
- <% changeset = contact.changesets.first %>
- <% if changeset %>
- <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
- <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %>
- "<%= link_to(comment,
- {:controller => 'browse', :action => 'changeset', :id => changeset.id},
- {:title => t('changeset.changeset.view_changeset_details')})
- %>"
- <% else %>
- <%= t'changeset.changeset.no_edits' %>
- <% end %>
- </td>
-</tr>
-<tr>
- <td>
- <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
- |
- <% if @user.is_friends_with?(contact) %>
- <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
- <% else %>
- <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
- <% end %>
- </td>
-</tr>
+ </li>
+ </ul>
+ </div>
+</div>
-<h2><%= t 'user.account.my settings' %></h2>
-
-<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> |
-<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
+<% content_for :heading do %>
+ <h2><%= t 'user.account.my settings' %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %></li>
+ <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+ </ul>
+<% end %>
<%= error_messages_for 'user' %>
<%= form_for :user, :html => { :multipart => true } do |f| %>
</td>
<td class="accountImage">
<%= user_image @user %>
- <table>
+ <table class="accountImage-options">
<% if @user.image.file? %>
<tr>
<td><%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %></td>
<% content_for :head do %>
<%= javascript_include_tag "user" %>
<% end %>
- <%= content_tag "div", "", :id => "map", :class => "user_map set_location" %>
+ <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
</td>
</tr>
<h2><%= t 'user.account.public editing note.heading' %></h2>
<%= raw t 'user.account.public editing note.text' %>
<%= button_to t('user.account.make edits public button'), :action => :go_public %>
-<% end %>
+<% end %>
\ No newline at end of file
-<h1><%= t 'user.new.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.new.heading' %></h1>
+<% end %>
<p><%= t 'user.new.no_auto_account_create' %></p>
$("#content").hide();
</script>
-<h1><%= t 'user.confirm.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.confirm.heading' %></h1>
+<% end %>
<p><%= t 'user.confirm.press confirm button' %></p>
$("#content").hide();
</script>
-<h1><%= t 'user.confirm_email.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.confirm_email.heading' %></h1>
+<% end %>
<p><%= t 'user.confirm_email.press confirm button' %></p>
<% @title = t('user.list.title') %>
-<h1><%= t('user.list.heading') %></h1>
+<% content_for :heading do %>
+ <h1><%= t('user.list.heading') %></h1>
+<% end %>
<% unless @users.empty? %>
<%= form_tag do %>
-<div id="login_wrapper">
- <div id="login_login">
- <h1><%= t 'user.login.heading' %></h1>
+<div id="login_login">
+<% content_for :heading do %>
+ <h1><%= t 'user.login.heading' %></h1>
+<% end %>
- <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
- <%= hidden_field_tag('referer', h(params[:referer])) %>
+ <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
+ <%= hidden_field_tag('referer', h(params[:referer])) %>
-
<p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
+ <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
- <table id="loginForm">
- <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %></td></tr>
- <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
- <tr>
- <td></td>
- <td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
- <label for="remember_me">
- <%= t 'user.login.remember' %></label>
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
- </td>
- </tr>
- </table>
+ <table id="loginForm">
+ <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %></td></tr>
+ <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
+ <tr>
+ <td></td>
+ <td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
+ <label for="remember_me">
+ <%= t 'user.login.remember' %></label>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
+ </td>
+ </tr>
+ </table>
+ <p><%= t 'user.login.with openid' %></p>
- <br clear="all" />
+ <ul id="login_openid_buttons">
+ <li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>
+ <li><%= openid_button "google", "gmail.com" %></li>
+ <li><%= openid_button "yahoo", "me.yahoo.com" %></li>
+ <li><%= openid_button "myopenid", "myopenid.com" %></li>
+ <li><%= openid_button "wordpress", "wordpress.com" %></li>
+ <li><%= openid_button "aol", "aol.com" %></li>
+ </ul>
- <p><%= t 'user.login.with openid' %></p>
+ <table>
+ <tr id="login_openid_url">
+ <td class="fieldName nowrap">
+ <%= raw t 'user.login.openid', :logo => openid_logo %>
+ </td>
+ <td>
+ <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
+ <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldName nowrap" id="remember_me_label"><label for="remember_me"><%= t 'user.login.remember' %></label></td>
+ <td width="100%"><%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %></td>
+ </tr>
+ </table>
- <table id="login_openid_buttons">
- <tr>
- <td><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></td>
- <td><%= openid_button "google", "gmail.com" %></td>
- <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
- <td><%= openid_button "myopenid", "myopenid.com" %></td>
- <td><%= openid_button "wordpress", "wordpress.com" %></td>
- <td><%= openid_button "aol", "aol.com" %></td>
- </tr>
- </table>
+ <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+ <% end %>
- <table>
- <tr id="login_openid_url">
- <td class="fieldName nowrap">
- <%= raw t 'user.login.openid', :logo => openid_logo %>
- </td>
- <td>
- <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
- <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
- </td>
- </tr>
- <tr>
- <td class="fieldName nowrap" id="remember_me_label"><label for="remember_me"><%= t 'user.login.remember' %></label></td>
- <td width="100%"><%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %></td>
- </tr>
- </table>
-
- <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
- <% end %>
-
- <br clear="all" />
- </div>
</div>
<script type="text/javascript">
-<h1><%= t 'user.logout.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.logout.heading' %></h1>
+<% end %>
+
<%= form_tag :action => "logout" do %>
<%= hidden_field_tag("referer", h(params[:referer])) %>
<%= hidden_field_tag("session", request.session_options[:id]) %>
-<h1><%= t 'user.lost_password.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.lost_password.heading' %></h1>
+<% end %>
<p><%= t 'user.lost_password.help_text' %></p>
-<h1><%= t "user.make_friend.heading", :user => @new_friend.display_name %></h1>
+<% content_for :heading do %>
+ <h1><%= t "user.make_friend.heading", :user => @new_friend.display_name %></h1>
+<% end %>
+
<%= form_tag do %>
<% if params[:referer] -%>
<%= hidden_field_tag("referer", params[:referer]) %>
-<h1><%= t 'user.new.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.new.heading' %></h1>
+<% end %>
<p><%= t 'user.new.fill_form' %></p>
-<h2><%= t 'user.no_such_user.heading', :user => h(@not_found_user) %></h2>
+<% content_for :heading do %>
+ <h2><%= t 'user.no_such_user.heading', :user => h(@not_found_user) %></h2>
+<% end %>
<p><%= t 'user.no_such_user.body', :user => h(@not_found_user) %></p>
-<h1><%= t "user.remove_friend.heading", :user => @friend.display_name %></h1>
+<% content_for :heading do %>
+ <h1><%= t "user.remove_friend.heading", :user => @friend.display_name %></h1>
+<% end %>
+
<%= form_tag do %>
<% if params[:referer] -%>
<%= hidden_field_tag("referer", params[:referer]) %>
-<h1><%= t 'user.reset_password.heading', :user => @user.display_name %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.reset_password.heading', :user => @user.display_name %></h1>
+<% end %>
<%= error_messages_for :user %>
<table id="loginForm">
<tr><td class="fieldName"><%= t 'user.reset_password.password' %></td><td><%= password_field(:user, :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
<tr><td class="fieldName"><%= t 'user.reset_password.confirm password' %></td><td><%= password_field(:user, :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
-
+
<tr><td colspan=2> <!--vertical spacer--></td></tr>
<tr><td></td><td class="submitButton"><input type="submit" value="<%= t'user.reset_password.reset' %>" tabindex="6"></td></tr>
</table>
-blah
-
<%= @user.email %>
<% @title = t "user.suspended.title" %>
-<h1><%= t "user.suspended.heading" %></h1>
+<% content_for :heading do %>
+ <h1><%= t "user.suspended.heading" %></h1>
+<% end %>
<%= raw t "user.suspended.body", :webmaster => link_to(t("user.suspended.webmaster"), "mailto:webmaster@openstreetmap.org") %>
-<h1><%= t 'user.terms.heading' %></h1>
+<% content_for :heading do %>
+ <h1><%= t 'user.terms.heading' %></h1>
+<% end %>
<p><%= t 'user.terms.read and accept' %></p>
-<%= user_image @this_user %>
+<% content_for :heading do %>
+ <div id='userinformation'>
+ <%= user_image @this_user %>
+ <div class='userinformation-inner'>
+ <h2><%= @this_user.display_name %><%= role_icons(@this_user) %></h2>
+ <% if @user and @this_user.id == @user.id %>
+ <!-- Displaying user's own profile page -->
+ <ul class='secondary-actions clearfix'>
+ <li>
+ <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
+ </li>
+ <li>
+ <%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %>
+ </li>
+ <li>
+ <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
+ <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
+ </li>
+ <li>
+ <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
+ </li>
+ <li>
+ <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
+ </li>
+ <li>
+ <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+ </li>
-<h2><%= @this_user.display_name %><%= role_icons(@this_user) %></h2>
+ <% if @user.blocks.exists? %>
+ <li>
+ <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
+ </li>
+ <% end %>
+
+ <% if @user and @user.moderator? and @user.blocks_created.exists? %>
+ <li>
+ <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
+ </li>
+ <% end %>
+
+ </ul>
+
+ <% else %>
+
+ <ul class='secondary-actions clearfix'>
+
+ <li>
+ <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@this_user.changesets.size) %></span>
+ </li>
+ <li>
+ <%= link_to t('user.view.notes'), :controller => 'notes', :action=> 'mine' %>
+ </li>
+ <li>
+ <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
+ </li>
+
+ <!-- Displaying another user's profile page -->
+
+ <li>
+ <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
+ </li>
+ <li>
+ <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@this_user.diary_entries.size) %></span>
+ </li>
+ <li>
+ <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
+ </li>
+ <li>
+ <% if @user and @user.is_friends_with?(@this_user) %>
+ <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %>
+ <% else %>
+ <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %>
+ <% end %>
+ </li>
+
+ <% if @this_user.blocks.exists? %>
+ <li>
+ <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@this_user.blocks.active.size) %></span>
+ </li>
+ <% end %>
+
+ <% if @this_user.moderator? and @this_user.blocks_created.exists? %>
+ <li>
+ <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %>
+ <span class='count-number'><%= number_with_delimiter(@this_user.blocks_created.active.size) %></span>
+ </li>
+ <% end %>
+
+ <% if @user and @user.moderator? %>
+ <li>
+ <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %>
+ </li>
+ <% end %>
+
+ </ul>
+
+ <% end %>
+
+ <% if @user and @user.administrator? %>
+
+ <ul class='secondary-actions clearfix'>
+ <% if ["active", "confirmed"].include? @this_user.status %>
+ <li>
+ <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+ </li>
+ <% elsif ["pending"].include? @this_user.status %>
+ <li>
+ <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+ </li>
+ <% end %>
+
+ <% if ["active", "suspended"].include? @this_user.status %>
+ <li>
+ <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+ </li>
+ <% end %>
+ <li>
+ <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %>
+ <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+ <% else %>
+ <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+ </li>
+ <% end %>
+ <li>
+ <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+ </li>
+ </ul>
+
+ <% end %>
+
+ <p class='deemphasize'>
+ <small>
+ <%= t 'user.view.mapper since' %> <%= l @this_user.creation_time.to_date, :format => :long %>
+ |
+ <%= t 'user.view.ct status' %>
+ <% if not @this_user.terms_agreed.nil? -%>
+ <%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed) %>
+ <% elsif not @this_user.terms_seen? -%>
+ <%= t 'user.view.ct undecided' %>
+ <% else -%>
+ <%= t 'user.view.ct declined' %>
+ <% end -%>
+ </small>
+ </p>
+ </div>
+
+ <div class='user-description'><%= @this_user.description.to_html %></div>
+
+ </div>
+
+ <% if @user and @user.administrator? -%>
+ <div class='admin-user-info deemphasize'>
+ <small><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></small>
+ <% unless @this_user.creation_ip.nil? -%>
+ <small><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></small>
+ <% end -%>
+ <small><b><%= t 'user.view.status' %></b> <%= @this_user.status.capitalize %></small>
+ <small><b><%= t 'user.view.spam score' %></b> <%= @this_user.spam_score %></small>
+ </div>
+ <% end -%>
+
+<% end %>
-<div id="userinformation">
<% if @user and @this_user.id == @user.id %>
- <!-- Displaying user's own profile page -->
- <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
- |
- <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
- <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
- |
- <%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %>
- |
- <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
- |
- <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
- |
- <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
- <% if @user.blocks.exists? %>
- |
- <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
- <% end %>
- <% if @user and @user.moderator? and @user.blocks_created.exists? %>
- |
- <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
- <% end %>
- <% else %>
- <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@this_user.changesets.size) %></span>
- |
- <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
- |
- <%= link_to t('user.view.notes'), :controller => 'notes', :action=> 'mine' %>
- |
- <!-- Displaying another user's profile page -->
- <%= 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 %>
- <span class='count-number'><%= number_with_delimiter(@this_user.diary_entries.size) %></span>
- |
- <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
- |
- <% if @user and @user.is_friends_with?(@this_user) %>
- <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %>
+ <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+ <div id="map" class="content_map">
+ <p id="no_home_location"><%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %></p>
+ </div>
<% else %>
- <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %>
- <% end %>
- <% if @this_user.blocks.exists? %>
- |
- <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@this_user.blocks.active.size) %></span>
- <% end %>
- <% if @this_user.moderator? and @this_user.blocks_created.exists? %>
- |
- <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %>
- <span class='count-number'><%= number_with_delimiter(@this_user.blocks_created.active.size) %></span>
- <% end %>
- <% if @user and @user.moderator? %>
- | <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %>
+ <% content_for :head do %>
+ <%= javascript_include_tag "user" %>
+ <% end %>
+ <%
+ user_data = {
+ :lon => @user.home_lon,
+ :lat => @user.home_lat,
+ :icon => image_path("marker-red.png"),
+ :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
+ }
+ %>
+ <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %>
<% end %>
- <% end %>
- <% if @user and @user.administrator? %>
- <br/>
- <% if ["active", "confirmed"].include? @this_user.status %>
- <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> |
- <% elsif ["pending"].include? @this_user.status %>
- <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> |
- <% end %>
- <% if ["active", "suspended"].include? @this_user.status %>
- <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> |
- <% end %>
- <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %>
- <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> |
+
+ <% friends = @this_user.friends.collect { |f| f.befriendee } %>
+ <% nearby = @this_user.nearby - friends %>
+
+ <div class="activity-block column-1">
+ <h3><%= t 'user.view.your friends' %></h3>
+
+ <% if friends.empty? %>
+ <%= t 'user.view.no friends' %>
<% else %>
- <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> |
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t('user.view.friends_changesets'), friend_changesets_path %></li>
+ <li><%= link_to t('user.view.friends_diaries'), friend_diaries_path %></li>
+ </ul>
+ <div id="friends-container">
+ <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
+ </div>
<% end %>
- <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
- <% end %>
-</div>
-
-<div id="description"><%= @this_user.description.to_html %></div>
-
-<p class='deemphasize'><small>
-<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time.to_date, :format => :long %>
-/
-<%= t 'user.view.ct status' %>
-<% if not @this_user.terms_agreed.nil? -%>
-<%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed) %>
-<% elsif not @this_user.terms_seen? -%>
-<%= t 'user.view.ct undecided' %>
-<% else -%>
-<%= t 'user.view.ct declined' %>
-<% end -%>
-</small>
-</p>
-
-<% if @user and @user.administrator? -%>
- <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>
- <% unless @this_user.creation_ip.nil? -%>
- <p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
- <% end -%>
- <p><b><%= t 'user.view.status' %></b> <%= @this_user.status.capitalize %></p>
- <p><b><%= t 'user.view.spam score' %></b> <%= @this_user.spam_score %></p>
-<% end -%>
-
-<% if @user and @this_user.id == @user.id %>
- <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
- <div id="map" class="user_map">
- <p id="no_home_location"><%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %></p>
- </div>
- <% else %>
- <% content_for :head do %>
- <%= javascript_include_tag "user" %>
+ </div>
+
+ <div class="activity-block column-1">
+ <h3><%= t 'user.view.nearby users' %></h3>
+
+ <% if nearby.empty? %>
+ <%= t 'user.view.no nearby users' %>
+ <% else %>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %></li>
+ <li><%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %></li>
+ </ul>
+ <div id="nearbyusers">
+ <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>
+ </div>
<% end %>
- <%
- user_data = {
- :lon => @user.home_lon,
- :lat => @user.home_lat,
- :icon => image_path("marker-red.png"),
- :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
- }
- %>
- <%= content_tag "div", "", :id => "map", :class => "user_map", :data => {:user => user_data} %>
- <% end %>
-
- <% friends = @this_user.friends.collect { |f| f.befriendee } %>
- <% nearby = @this_user.nearby - friends %>
-
- <h3 style="margin-top: 0"><%= t 'user.view.your friends' %></h3>
-
- <% if friends.empty? %>
- <%= t 'user.view.no friends' %>
- <% else %>
- <%= link_to t('user.view.friends_changesets'), friend_changesets_path %><br/>
- <%= link_to t('user.view.friends_diaries'), friend_diaries_path %><br/><br/>
- <table id="friends">
- <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
- </table>
- <% end %>
-
- <h3><%= t 'user.view.nearby users' %></h3>
-
- <% if nearby.empty? %>
- <%= t 'user.view.no nearby users' %>
- <% else %>
- <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %><br/>
- <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %><br/><br/>
- <table id="nearbyusers">
- <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>
- </table>
- <% end %>
+ </div>
<% end %>
<%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
</table>
-<p>
+<ul class='secondary-actions'>
<% if @user_blocks_pages.current_page.number > 1 -%>
- <%= link_to t('user_block.partial.previous'), params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %>
+ <li><%= link_to t('user_block.partial.previous'), params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %></li>
<% else -%>
- <%= t('user_block.partial.previous') %>
+ <li><%= t('user_block.partial.previous') %></li>
<% end -%>
- | <%= t('user_block.partial.showing_page', :page => @user_blocks_pages.current_page.number) %> |
+ <li><%= t('user_block.partial.showing_page', :page => @user_blocks_pages.current_page.number) %></li>
<% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
- <%= link_to t('user_block.partial.next'), params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %>
+ <li><%= link_to t('user_block.partial.next'), params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %></li>
<% else -%>
- <%= t('user_block.partial.next') %>
+ <li><%= t('user_block.partial.next') %></li>
<% end -%>
-</p>
+</ul>
<% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %>
-<h1><%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %></h1>
+<% content_for :heading do %>
+ <h1><%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %></h1>
+<% end %>
<% unless @user_blocks.empty? %>
<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => false } %>
<% @title = t('user_block.blocks_on.title', :name => h(@this_user.display_name)) %>
-<h1><%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %></h1>
-
+<% content_for :heading do %>
+ <h1><%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %></h1>
+<% end %>
<% unless @user_blocks.empty? %>
<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => false, :show_creator_name => true } %>
<% else %>
<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
-<h1><%= raw t('user_block.edit.title',
- :name => link_to(
- h(@user_block.user.display_name),
- {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
+<% content_for :heading do %>
+ <h1><%= raw t('user_block.edit.title',
+ :name => link_to(
+ h(@user_block.user.display_name),
+ {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t('user_block.edit.show'), @user_block %></li>
+ <li><%= link_to t('user_block.edit.back'), user_blocks_path %></li>
+ </ul>
+<% end %>
<%= form_for(@user_block) do |f| %>
<%= f.error_messages %>
<p>
<%= f.submit t('user_block.edit.submit') %>
</p>
-<% end %>
-
-<%= link_to t('user_block.edit.show'), @user_block %> |
-<%= link_to t('user_block.edit.back'), user_blocks_path %>
+<% end %>
\ No newline at end of file
<% @title = t('user_block.index.title') %>
-<h1><%= t('user_block.index.heading') %></h1>
+<% content_for :heading do %>
+ <h1><%= t('user_block.index.heading') %></h1>
+<% end %>
<% unless @user_blocks.empty? %>
<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>
<% @title = t 'user_block.new.title', :name => h(@this_user.display_name) %>
-<h1><%= raw t('user_block.new.heading',
- :name => link_to(
- h(@this_user.display_name),
- {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
-
+<% content_for :heading do %>
+ <h1><%= raw t('user_block.new.heading',
+ :name => link_to(
+ h(@this_user.display_name),
+ {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
+<% end %>
<%= form_for(@user_block) do |f| %>
<%= f.error_messages %>
<% @title = t('user_block.revoke.title',
:block_on => h(@user_block.user.display_name),
:block_by => h(@user_block.creator.display_name)) %>
-<h1><%= raw t('user_block.revoke.heading',
- :block_on => link_to(
- h(@user_block.user.display_name),
- {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
- :block_by => link_to(
- h(@user_block.creator.display_name),
- {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+
+<% content_for :heading do %>
+ <h1><%= raw t('user_block.revoke.heading',
+ :block_on => link_to(
+ h(@user_block.user.display_name),
+ {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
+ :block_by => link_to(
+ h(@user_block.creator.display_name),
+ {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+<% end %>
<% if @user_block.ends_at > Time.now %>
<p><b>
<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
<%= f.error_messages %>
-<p>
+<p>
<%= check_box_tag 'confirm', 'yes' %>
<%= label_tag 'confirm', t('user_block.revoke.confirm') %>
</p>
<% @title = t('user_block.show.title',
:block_on => @user_block.user.display_name,
:block_by => @user_block.creator.display_name) %>
-<h1><%= raw t('user_block.show.heading',
- :block_on => link_to(
- h(@user_block.user.display_name),
- {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
- :block_by => link_to(
- h(@user_block.creator.display_name),
- {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+
+<% content_for :heading do %>
+ <h1><%= raw t('user_block.show.heading',
+ :block_on => link_to(
+ h(@user_block.user.display_name),
+ {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
+ :block_by => link_to(
+ h(@user_block.creator.display_name),
+ {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+<ul class='secondary-actions clearfix'>
+ <% if @user_block.ends_at > Time.now.getutc %>
+ <% if @user and @user.id == @user_block.creator_id %>
+ <li><%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %></li>
+ <% end %>
+ <% if @user and @user.moderator? %>
+ <li><%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
+ <% end %>
+ <% end %>
+ <li><%= link_to t('user_block.show.back'), user_blocks_path %></li>
+</ul>
+<% end %>
+
<% if @user_block.revoker %>
<p>
<b><%= t'user_block.show.revoker' %></b>
<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
<p><b><%= t'user_block.show.reason' %></b></p>
-<%= @user_block.reason.to_html %>
-
-<% if @user_block.ends_at > Time.now.getutc %>
-<% if @user and @user.id == @user_block.creator_id %>
-<%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %> |
-<% end %>
-<% if @user and @user.moderator? %>
-<%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %> |
-<% end %>
-<% end %>
-<%= link_to t('user_block.show.back'), user_blocks_path %>
+<%= @user_block.reason.to_html %>
\ No newline at end of file
credit_1_html: "Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që\n kreditit tuaj lexon të paktën \"© OpenStreetMap\n kontribuesit, CC BY-SA \". Nëse jeni duke përdorur të dhëna vetëm në hartë,\n ne kerkojme \"Organizimi i të dhënave © kontribuesit OpenStreetMap,\n CC BY-SA \"."
credit_2_html: "Ku të jetë e mundur, duhet të jetë OpenStreetMap hyperlinked në <a\n href = \"http://www.openstreetmap.org/\"> http://www.openstreetmap.org/ </ a>\n dhe CC BY-SA për <a\n href = \"http://creativecommons.org/licenses/by-sa/2.0/\"> http://creativecommons.org/licenses/by-sa/2.0/ </ a>. Nëse\n ju jeni duke përdorur një të mesme, ku lidhjet nuk janë të mundshme (p.sh. një\n shtypura punë), ne ju sugjerojmë lexuesit tuaj të drejtpërdrejtë të\n www.openstreetmap.org (ndoshta duke zgjeruar\n 'OpenStreetMap' në këtë adresë të plotë) dhe të\n www.creativecommons.org."
credit_title_html: Si të kreditit OpenStreetMap
- intro_1_html: "OpenStreetMap është <i> dhënat e hapur </ i>, të licencuar sipas <a\nhref = \"http://creativecommons.org/licenses/by-sa/2.0/\"> Creative\nCommons Attribution-ShareAlike 2,0</a> licencës (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Ju jeni të lirë ta kopjoni, shpërndani, përcjell dhe përshtatur hartat tona\n dhe të dhënat, për aq kohë sa ju e kreditit OpenStreetMap e saj\n kontribuesve. Nëse ju ndryshoni ose me ndërtimin e hartave tona ose të dhëna, ju\n mund të shpërndani rezultat vetëm në bazë të licencës të njëjtën.\n <Plotë një\n href = \"http://creativecommons.org/licenses/by-sa/2.0/legalcode\"> ligjore\n <Kod / a> shpjegon të drejtat tuaja dhe të përgjegjësive."
more_1_html: "Lexo më shumë lidhje me përdorimin e të dhënave tona në <a\n href = \"http://wiki.openstreetmap.org/wiki/Legal_FAQ\"> Ligjore\n FAQ </ a>."
more_2_html: "OSM janë kontribuesit kujtoi kurrë për të shtuar të dhënat nga ndonjë\n Burime copyright (p.sh. Google Maps apo të shtypura harta) pa\n lejen shprehimisht nga mbajtësit të drejtën e autorit."
display_name: Nome a amosar
email: Corréu
languages: Llingües
- pass_crypt: Conseña
+ pass_crypt: Contraseña
models:
acl: Llista de Control d'Accesu
changeset: Conxuntu de cambios
show_areas: Amosar árees
show_history: Ver historial
unable_to_load_size: "Nun se pue cargar: El tamañu del cuadru de llende %{bbox_size} ye demasiao grande (tien de ser menor de %{max_bbox_size})"
+ view_data: Ver los datos de la vista actual del mapa
wait: Espera...
zoom_or_select: Amplía o seleiciona un área del mapa pa velu
tag_details:
comment_count:
one: 1 comentariu
other: "%{count} comentarios"
+ zero: Ensin comentarios
comment_link: Comentar esta entrada
confirm: Confirmar
edit_link: Editar esta entrada
infringement_1_html: Recordamos a los collaboradores d'OSM qu'enxamás amiesten datos que vengan d'una fonte con drechos d'autor acutaos (p. ex. de Google Maps o mapes impresos) ensin el permisu esplícitu de los dueños de los drechos d'autor.
infringement_2_html: Si crees que s'amestó de mou inapropiáu material con drechos d'autor a la base de datos d'OpenStreetMap o a esti sitiu, consulta'l nuesu <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimientu de retirada de datos</a> o pidilo direutamente nel nuesu <a href="http://dmca.openstreetmap.org/">formulariu en llinia</a>.
infringement_title_html: Incumplimientu de drechos d'autor
- intro_1_html: "OpenStreetMap son <i>datos abiertos (Open Data)</i>, con llicencia <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.es\">Creative Commons Reconocimientu - Compartir igual 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap son <i>datos abiertos</i>, baxo llicencia <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Pues copiar, distribuir, tresmitir y adautar los nuesos datos de mou llibre, mentanto des reconocimientu a OpenStreetMap y a los sos collaboradores. Si camudes o creas conteníu sobre los nuesos datos, namái podrás distribuir el resultáu baxo la mesma llicencia. El <a href="http://opendatacommons.org/licenses/odbl/1.0/">códigu llegal completu</a> t'esplica los tos drechos y obligaciones.
intro_3_html: La cartografía de los mosaicos del mapa y la nuesa documentación, tan llicenciaos baxo la llicencia <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Reconocimientu-CompartirIgual 2.0</a> (CC-BY-SA).
more_1_html: "Llei más tocante a cómo utilizar los nuesos datos, y cómo acreditanos, en <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Entrugues y rempuestes llegales</a> (n'inglés)."
yahoo:
alt: Coneutar con una OpenID de Yahoo
title: Coneutar con Yahoo
- password: "Conseña:"
+ password: "Contraseña:"
register now: Rexistrate agora
remember: "Recordame:"
title: Entrar
success: "%{name} agora ye amigu tuyu."
new:
confirm email address: "Confirmar direición de corréu:"
- confirm password: "Confirma la conseña:"
+ confirm password: "Confirma la contraseña:"
contact_webmaster: Ponte en contautu col <a href="mailto:webmaster@openstreetmap.org">webmaster</a> p'arreglar la creación d'una cuenta - procuraremos xestionar la solicitú lo más aína que podamos.
continue: Siguir
display name: "Nome a amosar:"
openid: "%{logo} OpenID:"
openid association: "<p>La to OpenID nun ta asociada con una cuenta d'OpenStreetMap entá.</p>\n<ul>\n <li>Si yes nuevu n'OpenStreetMap, por favor crea una cuenta nueva col formulariu darréu.</li>\n <li>\n Si yá tienes una cuenta, pues entrar nella col to nome\n d'usuariu y conseña, y entós asociar la cuenta cola OpenID\n nes preferencies d'usuariu.\n </li>\n</ul>"
openid no password: Con OpenID nun fai falta una conseña, pero delles ferramientes estra o sirvidores entá puen necesitala.
- password: "Conseña:"
+ password: "Contraseña:"
terms accepted: ¡Gracies por aceutar les condiciones de collaboración!
terms declined: Sentimos que decidieres nun aceutar les Condiciones de Collaboración. Pa más información llei <a href="%{url}">esta páxina wiki</a>.
title: Crear una cuenta
not_a_friend: "%{name} nun ye un de los tos amigos."
success: "%{name} se desanició de los tos amigos."
reset_password:
- confirm password: "Confirma la conseña:"
+ confirm password: "Confirma la contraseña:"
flash changed: Se camudó la to conseña
flash token bad: Nun s'alcontró esi token, ¿tendríes de comprobar la URL, seique?
heading: Reaniciar la conseña de %{user}
- password: "Conseña:"
- reset: Reaniciar conseña
+ password: "Contraseña:"
+ reset: Reaniciar contraseña
title: Reaniciar conseña
set_home:
flash success: Llocalización d'aniciu guardada correutamente
--- /dev/null
+# Messages for Azerbaijani (azərbaycanca)
+# Exported from translatewiki.net
+# Export driver: syck-pecl
+# Author: AZISS
+# Author: Cekli829
+# Author: SalihB
+# Author: Vugar 1981
+# Author: Wertuose
+az:
+ activerecord:
+ attributes:
+ diary_entry:
+ language: Dil
+ latitude: En dairəsi
+ longitude: Uzunluq dairəsi
+ title: Başlıq
+ user: İstifadəçi
+ friend:
+ friend: Dost
+ user: İstifadəçi
+ message:
+ recipient: Qəbul edən
+ sender: Göndərən
+ title: Başlıq
+ trace:
+ description: İzah
+ latitude: En dairəsi
+ longitude: Uzunluq dairəsi
+ name: Ad
+ public: İctimai istifadə
+ size: Ölçüsü
+ user: İstifadəçi
+ visible: Görünən
+ user:
+ active: Aktiv
+ description: İzah
+ display_name: "Gorüntülənən ad:"
+ email: E-poçt
+ languages: Dillər
+ pass_crypt: Parol
+ models:
+ changeset: Dəyişikliklər dəsti
+ country: Ölkə
+ friend: Dost
+ language: Dil
+ message: Mesaj
+ notifier: Bildiriş
+ user: İstifadəçi
+ way: Yol
+ way_node: Yol kəsişməsi
+ browse:
+ changeset:
+ changeset: "Dəyişikliklər dəsti: %{id}"
+ changesetxml: XML dəyişikliklər dəsti
+ feed:
+ title: Dəyişikliklər dəsti %{id}
+ title_comment: Dəyişikliklər dəsti %{id} - %{comment}
+ osmchangexml: osmChange XML
+ title: Dəyişikliklər dəsti
+ changeset_details:
+ belongs_to: "Məxsusdur:"
+ bounding_box: "Məhdudlaşdırıcı çərçivə:"
+ box: qutu
+ closed_at: "Bağlanılıb:"
+ created_at: "Yaradılıb:"
+ show_area_box: Ərazi çərçivəsini göstər
+ common_details:
+ changeset_comment: "Şərh:"
+ deleted_at: "Silinib:"
+ deleted_by: "Tərəfindən silinib:"
+ edited_at: "Redaktə edilib:"
+ edited_by: "Tərəfindən redaktə edilib:"
+ in_changeset: "Dəyişikliklər dəstində:"
+ version: "Versiya:"
+ map:
+ deleted: Silinib
+ loading: Yüklənir…
+ navigation:
+ all:
+ next_changeset_tooltip: Sonrak dəyişikliklər dəsti
+ next_node_tooltip: Sonrakı kəsişmə
+ next_relation_tooltip: Sonrakı əlaqə
+ next_way_tooltip: Növbəti yol
+ prev_changeset_tooltip: Əvvəlki dəyişikliklər dəsti
+ prev_node_tooltip: Əvvəlki kəsişmə
+ prev_relation_tooltip: Əvvəlki əlaqə
+ prev_way_tooltip: Əvvəlki yol
+ user:
+ name_changeset_tooltip: "%{user} tərəfindən edilmiş redaktələrə bax"
+ next_changeset_tooltip: "%{user} tərəfindən edilmiş sonrakı redaktələr"
+ prev_changeset_tooltip: "%{user} tərəfindən edilmiş əvvəlki redaktələr"
+ node:
+ download_xml: XML kimi yüklə
+ edit: redaktə
+ view_history: Tarixçəyə bax
+ node_details:
+ coordinates: "Koordinatlar:"
+ node_history:
+ download_xml: XML kimi yüklə
+ view_details: Detalları göstər
+ not_found:
+ type:
+ changeset: dəyişikliklər dəsti
+ redacted:
+ redaction: Redaktə %{id}
+ type:
+ node: kəsişmə
+ way: yol
+ relation:
+ download_xml: XML kimi yüklə
+ view_history: Tarixçəyə bax
+ relation_details:
+ members: "Üzvlər:"
+ relation_history:
+ download_xml: XML kimi yüklə
+ view_details: Detalları göstər
+ relation_member:
+ type:
+ node: Kəsişmə
+ way: Yol
+ start_rjs:
+ data_frame_title: Tarix
+ data_layer_name: Xəritəs Məlumatlarını Gözdən keçir
+ hide_areas: Ərazini gizlət
+ loading: Yüklənir…
+ object_list:
+ details: Detallar
+ history:
+ type:
+ node: Kəsişmə %{id}
+ way: Yol %{id}
+ selected:
+ type:
+ node: Kəsişmə %{id}
+ type:
+ way: Yol
+ private_user: məxfi istifadəçi
+ show_areas: Ərazini göstər
+ show_history: Tarixçəni göstər
+ wait: Gözlə...
+ timeout:
+ type:
+ changeset: dəyişikliklər dəsti
+ way: yol
+ way:
+ download_xml: XML kimi yüklə
+ edit: redaktə
+ view_history: Tarixçəyə bax
+ way: Yol
+ way_history:
+ download_xml: XML kimi yüklə
+ view_details: Detalları göstər
+ changeset:
+ changeset:
+ anonymous: Anonim
+ big_area: (böyük)
+ no_comment: (heç biri)
+ changeset_paging_nav:
+ next: Növbəti »
+ previous: « Əvvəlki
+ changesets:
+ area: Ərazi
+ comment: Şərh
+ id: ID
+ user: İstifadəçi
+ list:
+ description_friend: Dostlarınız tərəfindən edilmiş dəyişikliklər dəsti
+ description_nearby: Yaxınlıqdakı istifadəçilər tərəfindən edilmiş dəyişikliklər dəsti
+ description_user: "%{user} tərəfindən edilmiş dəyişikliklər dəsti"
+ heading: Dəyişikliklər dəsti
+ heading_bbox: Dəyişikliklər dəsti
+ heading_friend: Dəyişikliklər dəsti
+ heading_nearby: Dəyişikliklər dəsti
+ heading_user: Dəyişikliklər dəsti
+ heading_user_bbox: Dəyişikliklər dəsti
+ title: Dəyişikliklər dəsti
+ diary_entry:
+ comments:
+ ago: "%{ago} əvvəl"
+ comment: Şərh
+ newer_comments: Yeni şərhlər
+ older_comments: Köhnə Şərhlər
+ when: Harada
+ diary_comment:
+ confirm: Təsdiq et
+ hide_link: Bu şərhi gizlət
+ diary_entry:
+ comment_link: Bu yazıyı şərh et
+ confirm: Təsdiq et
+ edit_link: Bu yazıyı redaktə et
+ hide_link: Bu yazını gizlət
+ edit:
+ language: "Dil:"
+ latitude: "En dairəsi:"
+ longitude: "Uzunluq dairəsi:"
+ marker_text: Gundəlik yazısının yeri
+ save_button: Qeyd et
+ subject: "Mövzu:"
+ title: Gündəlik yazısıni redaktə et
+ use_map_link: xəritədən istifadə
+ feed:
+ all:
+ title: OpenStreetMap gündəlik yazısı
+ language:
+ title: "%{language_name} dilində OpenStreetMap gündəlik yazısı"
+ user:
+ title: "%{user} üçün OpenStreetMap gündəlik yazısı"
+ list:
+ in_language_title: "%{language} dilində Gundəlik Yazıları"
+ new: Yeni Gündəlik Yazısı
+ newer_entries: Yeni yazılar
+ no_entries: Gundəlik yazıları yoxdur
+ older_entries: Köhnə yazılar
+ title: İstifadəçi gündəlikləri
+ title_friends: Dostların gündəlikləri
+ title_nearby: Yaxınlıqdakı İstifadəçilərin Gündəlikləri
+ user_title: "%{user}'nin gündəliyi"
+ location:
+ edit: Redaktə
+ view: Görünüş
+ new:
+ title: Yeni Gündəlik Yazısı
+ view:
+ login: Daxil ol
+ save_button: Saxla
+ title: "%{user}'nin gündəliyi | %{title}"
+ user_title: "%{user}'nin gündəliyi"
+ editor:
+ potlatch:
+ description: Potlatch 1 (brauzer üzərindən redaktə)
+ name: Potlatch 1
+ potlatch2:
+ description: Potlatch 2 (brauzer üzərindən redaktə)
+ name: Potlatch 2
+ remote:
+ description: Uzaqdan idarəetmə (JOSM və ya Merkaartor)
+ name: Uzaqdan idarəetmə
+ export:
+ start:
+ format: Format
+ image_size: Şəkil ölçüsü
+ latitude: "En:"
+ licence: Lisenziya
+ longitude: "Uz:"
+ scale: Miqyas
+ too_large:
+ heading: Sahə Çox Böyükdür
+ zoom: Yaxınlaşdır
+ start_rjs:
+ view_larger_map: Böyüdülmüş xəritəyə bax
+ geocoder:
+ description:
+ types:
+ cities: Şəhərlər
+ direction:
+ east: şərq
+ north: şimal
+ north_east: şimal-şərq
+ north_west: şimal-qərb
+ south: cənub
+ south_east: cənub-şərq
+ south_west: cənub-qərb
+ west: qərb
+ results:
+ more_results: Daha çox nəticə
+ no_results: Nəticələr tapılmadı
+ search_osm_nominatim:
+ prefix:
+ aeroway:
+ aerodrome: Aerodrom
+ helipad: Vertalyot meydançası
+ terminal: Terminal
+ amenity:
+ airport: Aeroport
+ atm: ATM
+ bank: Bank
+ bar: Bar
+ bus_station: Avtovağzal
+ cafe: Kafe
+ car_rental: Avtomobil icarəsi
+ car_wash: Avto yuyucu
+ casino: Kazino
+ cinema: Kinoteatr
+ clinic: Klinika
+ club: Klub
+ college: Kollec
+ crematorium: Krematoriya
+ dentist: Diş həkimi
+ doctors: Həkimlər
+ dormitory: Yataqxana
+ drinking_water: İçməli su
+ driving_school: Sürücülük məktəbi
+ embassy: Səfirlik
+ fountain: Fontan
+ fuel: Yanacaq
+ grave_yard: Qəbirsanlıq
+ gym: Fitnes mərkəzi
+ hall: Zal
+ health_centre: Sağlamlıq mərkəzi
+ hospital: Qospital
+ hotel: Otel
+ hunting_stand: Ov stendi
+ ice_cream: Dondurma
+ kindergarten: Uşaq bağçası
+ library: Kitabxana
+ market: Market
+ nightclub: Gecə klubu
+ nursing_home: Qocalar evi
+ office: Ofis
+ park: Park
+ pharmacy: Aptek
+ place_of_worship: Sitayişgah
+ police: Polis
+ post_box: Poçt qutusu
+ post_office: Poçt
+ prison: Həbsxana
+ pub: Pivəxana
+ public_building: İctimai binalar
+ reception_area: Qəbul sahəsi
+ restaurant: Restoran
+ sauna: Sauna
+ school: Məktəb
+ shelter: Sığınacaq
+ supermarket: Supermarket
+ swimming_pool: Üzgüçülük hovuzu
+ taxi: Taksi
+ theatre: Teatr
+ toilets: Tualet
+ university: Universitet
+ vending_machine: Ticarət avtomatı
+ boundary:
+ administrative: Administrativ sərhəd
+ national_park: Milli Park
+ protected_area: Qorunan ərazi
+ bridge:
+ "yes": Körpü
+ building:
+ "yes": Tikili
+ highway:
+ bus_stop: Avtobus dayanacağı
+ emergency_access_point: Təcili yardım məntəqəsi
+ footway: Cığır
+ primary: Birinci dərəcəli yol
+ primary_link: Birinci dərəcəli yol
+ road: Yol
+ secondary: İkici dərəcəli yol
+ secondary_link: İkici dərəcəli yol
+ service: Servis yolu
+ speed_camera: Sürət kamerası
+ tertiary: Üçüncü dərəcəli yol
+ tertiary_link: Üçüncü dərəcəli yol
+ trunk: Baş yol
+ trunk_link: Baş yol
+ unclassified: Təsnifatsız yol
+ historic:
+ battlefield: Döyüş meydanı
+ boundary_stone: Sərhəd daşı
+ building: Tikili
+ castle: Qala
+ church: Kilsə
+ fort: Qala
+ house: Ev
+ manor: Malikanə
+ memorial: Memorial
+ mine: Mədən
+ museum: Muzey
+ ruins: Xarabalıqlar
+ tower: Qüllə
+ wayside_cross: Yolkənarı xaç
+ landuse:
+ cemetery: Məzarlıq
+ commercial: Ticarət sahəsi
+ construction: Tikinti
+ farm: Ferma
+ farmland: Kənd təsərrüfatı
+ farmyard: Ferma həyəti
+ forest: Meşə
+ garages: Qarajlar
+ grass: Ot
+ industrial: Sənaye sahəsi
+ meadow: Çəmənlik
+ military: Hərbi ərazi
+ mine: Mədən
+ nature_reserve: Təbiət Qoruğu
+ orchard: Meyvə bağı
+ park: Park
+ railway: Dəmir yolu
+ wood: Ağac
+ leisure:
+ fishing: Balıq tutmaq üçün ərazi
+ garden: Bağ
+ marina: Liman
+ park: Park
+ sauna: Sauna
+ sports_centre: İdman mərkəzi
+ stadium: Stadion
+ swimming_pool: Üzgüçülük hovuzu
+ water_park: Su parkı
+ military:
+ airfield: Hərbi Aerodrom
+ bunker: Bunker
+ natural:
+ beach: Çimərlik
+ crater: Krater
+ forest: Meşə
+ geyser: Qeyzer
+ glacier: Buzlaq
+ island: Ada
+ marsh: Bataqlıq
+ mud: Palçıqlıq
+ peak: Pik
+ ridge: Dağ silsiləsi
+ river: Çay
+ rock: Qaya
+ shoal: Dayazlıq
+ spring: Bulaq
+ stone: Qaya
+ strait: Boğaz
+ tree: Ağac
+ valley: Vadi
+ volcano: Vulkan
+ water: Su
+ wetland: Bataqlıq
+ wetlands: Bataqlıqlar
+ office:
+ accountant: Mühasib
+ company: Şirkət
+ estate_agent: Əmlak agenti
+ insurance: Sığorta şirkəti
+ lawyer: Hüquqşünas
+ travel_agent: Səyahət Agentliyi
+ place:
+ airport: Aeroport
+ city: Şəhər
+ country: Ölkə
+ county: Ölkə
+ farm: Ferma
+ house: Ev
+ houses: Evlər
+ island: Ada
+ islet: Adacıq
+ municipality: Bələdiyyə
+ region: Bölgə
+ sea: Dəniz
+ village: Kənd
+ railway:
+ station: Dəmiryol stansiyası
+ tram: Tramvay
+ shop:
+ antiques: Əntiq əşyalar
+ bakery: Un məmulatları dükanı
+ bicycle: Velosiped dükanı
+ books: Kitab dükanı
+ butcher: Qəssab
+ car: Avtomobil Dükanı
+ car_parts: Avtomobil ehtiyat hissələri
+ car_repair: Avtomobil təmiri
+ clothes: Geyim Dükanı
+ computer: Kompyuter Dükanı
+ cosmetics: Kosmetika Dükanı
+ discount: Endirimli mallar dükanı
+ dry_cleaning: Quru təmizləmə
+ estate_agent: Əmlak agenti
+ fashion: Dəb dükanı
+ fish: Balıq Dükanı
+ food: Ərzaq Dükanı
+ furniture: Mebel
+ gift: Hədiyyələr dükanı
+ hardware: Alətlər Dükanı
+ hifi: Hi-Fi
+ insurance: Sığorta
+ jewelry: Zərgərlik dükanı
+ kiosk: Kiosk
+ laundry: Camaşırxana
+ market: Market
+ mobile_phone: Mobil telefon dükanı
+ motorcycle: Motosiklet Dükanı
+ music: Musiqi dükanı
+ optician: Optik
+ pet: Zoomaqazin
+ salon: Salon
+ shoes: Ayaqqabı dükanı
+ shopping_centre: Ticarət Mərkəzi
+ sports: İdman malları dükanı
+ supermarket: Supermarket
+ toys: Otuncaq dükanı
+ travel_agency: Səyahət Agentliyi
+ tourism:
+ artwork: İncəsənə əsərləri dükanı
+ attraction: Attraksion
+ caravan_site: Karvansaray
+ guest_house: Qonaq evi
+ hotel: Hotel
+ information: Məlumat
+ motel: Motel
+ museum: Muzey
+ valley: Vadi
+ tunnel:
+ "yes": Tunel
+ waterway:
+ canal: Kanal
+ derelict_canal: İstifadəsiz Kanal
+ ditch: Yarğan
+ mooring: Sahilə yan alma
+ river: Çay
+ waterfall: Şəlalə
+ weir: Su bəndi
+ javascripts:
+ map:
+ base:
+ standard: Standart
+ transport_map: Nəqliyyat Xəritəsi
+ site:
+ edit_tooltip: Xəritəni redaktə et
+ layouts:
+ copyright: Müəllif hüquqları və Lisenziyalar
+ documentation: Sənədləşdirmə
+ donate_link_text: maddi yardım
+ edit: Redaktə
+ help: Kömək
+ help_centre: Kömək mərkəzi
+ history: Tarix
+ intro_2_create_account: İstifadəçi hesabı yarat
+ intro_2_download: yüklə
+ intro_2_license: açıq lisenziya
+ intro_2_use: istifadə
+ log_in: daxil ol
+ logo:
+ alt_text: OpenStreetMap loqosu
+ make_a_donation:
+ text: Maddi yardım et
+ partners_partners: partnyorlar
+ tag_line: Azad Viki Dünya Xəritəsi
+ user_diaries: İstifadəçi Gündəlikləri
+ view: Görünüş
+ view_tooltip: Xəritəni göstər
+ welcome_user: Xoş gəlmisiz, %{user_link}
+ welcome_user_link_tooltip: Sizin istifadəçi səhifəniz
+ wiki: Viki
+ license_page:
+ legal_babble:
+ title_html: Müəllif hüquqları və Lisenziyalar
+ native:
+ title: Bu səhifə haqqında
+ message:
+ delete:
+ deleted: Mesaj silindi
+ inbox:
+ date: Tarix
+ from: Kimdən
+ my_inbox: Mənim gələnlər
+ outbox: göndərilənlər
+ subject: Mövzu
+ title: Gələnlər
+ mark:
+ as_read: Mesaj oxunulmuş kimi işarələndi
+ as_unread: Mesaj oxunulmamış kimi işarələndi
+ message_summary:
+ delete_button: Sil
+ read_button: Oxunulmuş kimi işarələ
+ reply_button: Geri göndər
+ unread_button: Oxunulmamış kimi işarələ
+ new:
+ back_to_inbox: Gələnlərə geri qayıt
+ message_sent: Mesaj göndərildi
+ send_button: Göndər
+ send_message_to: "%{name} yeni mesaj göndər"
+ subject: Mövzu
+ title: Mesaj göndər
+ no_such_message:
+ heading: Belə bir mesaj yoxdur
+ title: Belə bir mesaj yoxdur
+ outbox:
+ date: Tarix
+ inbox: gələnlər
+ my_inbox: Mənim %{inbox_link}
+ outbox: göndərilənlər
+ subject: Mövzu
+ title: Göndərilənlər
+ to: Kimə
+ read:
+ back_to_inbox: Gələnlərə geri qayıt
+ back_to_outbox: Göndərilənlərə geri qayıt
+ date: Tarix
+ from: Kimdən
+ reading_your_messages: Mesajlarını oxu
+ reading_your_sent_messages: Göndərdiyin mesajı oxu
+ reply_button: Geri göndər
+ subject: Mövzu
+ title: Mesajı oxu
+ to: Kimə
+ unread_button: Oxunulmamış kimi işarələ
+ sent_message_summary:
+ delete_button: Sil
+ notifier:
+ diary_comment_notification:
+ hi: Salam %{to_user},
+ email_confirm_html:
+ greeting: Salam,
+ email_confirm_plain:
+ greeting: Salam,
+ gpx_notification:
+ greeting: Salam,
+ lost_password:
+ subject: "[OpenStreetMap] Parolu yeniləmək tələbi"
+ lost_password_html:
+ greeting: Salam,
+ lost_password_plain:
+ greeting: Salam,
+ message_notification:
+ hi: Salam %{to_user},
+ signup_confirm:
+ greeting: Salam!
+ subject: "[OpenStreetMap] OpenStreetMap-ə xoş gəldiniz"
+ signup_confirm_html:
+ more_videos: Burada %{more_videos_link}.
+ more_videos_here: daha çox videolar burada
+ video_to_openstreetmap: OpenStreetMap üçün giriş videosu
+ signup_confirm_plain:
+ the_wiki: "OpenStreetMap haqqında vikini oxu:"
+ oauth_clients:
+ form:
+ name: Ad
+ index:
+ revoke: Ləğv et!
+ show:
+ confirm: Əminsinizmi?
+ redaction:
+ edit:
+ description: Təsvir
+ show:
+ confirm: Əminsinizmi?
+ user: "Yaradıcısı:"
+ site:
+ edit:
+ user_page_link: istifadəçi səhifəsi
+ index:
+ shortlink: Qısa keçid
+ key:
+ table:
+ entry:
+ admin: Administrativ sərhəd
+ apron:
+ 1: terminal
+ building: Əhəmiyyətli bina
+ cemetery: Məzarlıq
+ centre: İdman mərkəzi
+ commercial: Ticarət sahəsi
+ common:
+ 1: çəmənlik
+ farm: Ferma
+ footway: Piyada yolu
+ forest: Meşə
+ industrial: Sənaye sahəsi
+ lake:
+ - Göl
+ - su anbarı
+ military: Hərbi ərazi
+ motorway: Avtomagistral
+ park: Park
+ permissive: Açıq giriş
+ primary: Birinci dərəcəli yol
+ private: Xüsusi giriş
+ rail: Dəmir yolu
+ reserve: Təbiət Qoruğu
+ resident: Yaşayış sahəsi
+ retail: Ticarət sahəsi
+ runway:
+ - Aeroport uçuş-enmə zolağı
+ school:
+ - Məktəb
+ - universitet
+ secondary: İkici dərəcəli yol
+ station: Dəmiryol stansiyası
+ subway: Metro
+ summit:
+ - Zirvə
+ - pik
+ tourist: Turist attraksionu
+ track: Cığır
+ tram:
+ 1: tramvay
+ trunk: Baş yol
+ unclassified: Təsnifatsız yol
+ unsurfaced: Torpaq yol
+ markdown_help:
+ alt: Alternativ mətn
+ heading: Başlıq
+ headings: Başlıqlar
+ image: Şəkil
+ link: Keçid
+ subheading: Alt başlıq
+ text: Mətn
+ url: URL
+ richtext_area:
+ preview: Sınaq görüntüsü
+ search:
+ search: Axtar
+ submit_text: Keç
+ where_am_i: Mən haradayam?
+ sidebar:
+ close: Bağla
+ search_results: Axtarış Nəticələri
+ time:
+ formats:
+ friendly: "%e %B %Y %H:%M"
+ trace:
+ edit:
+ description: "İzah:"
+ download: yüklə
+ edit: redaktə
+ filename: "Fayl adı:"
+ map: xəritə
+ owner: "Sahibi:"
+ save_button: Dəyişiklikləri yadda saxla
+ trace:
+ edit: redaktə et
+ edit_map: Xəritəni redaktə et
+ map: xəritə
+ private: MƏXFİ
+ public: İCTİMAİ
+ view_map: Xəritəyə bax
+ trace_form:
+ description: "İzah:"
+ help: Kömək
+ view:
+ description: "İzah:"
+ download: yüklə
+ edit: redaktə et
+ filename: "Fayl adı:"
+ map: xəritə
+ owner: "Sahibi:"
+ start_coordinates: "Başlanğıc koordinatları:"
+ user:
+ account:
+ contributor terms:
+ link text: bu nədir?
+ current email address: "Hazırki E-Poçt Ünvanı:"
+ delete image: Hazırki şəkili sil
+ gravatar:
+ link text: bu nədir?
+ image: "Şəkil:"
+ latitude: "En dairəsi:"
+ longitude: "Uzunluq dairəsi:"
+ new email address: "Yeni E-Poçt Ünvanı:"
+ new image: Şəkil kimi əlavə et
+ openid:
+ link text: bu nədir?
+ openid: "OpenID:"
+ public editing:
+ disabled link text: Niyə mən redaktə edə bilmirəm?
+ enabled link text: Bu nədir?
+ replace image: Hazırki şəkili əvəzlə
+ return to profile: Profilə geri qayıt
+ save changes button: Dəyişiklikləri yadda saxla
+ confirm:
+ button: Təsdiq et
+ confirm_email:
+ button: Təsdiq et
+ confirm_resend:
+ failure: İstifadəçi %{name} tapılmadı.
+ list:
+ heading: İstifadəçilər
+ hide: Seçilmiş istifadəçiləri gizlət
+ title: İstifadəçilər
+ login:
+ heading: Daxil olun
+ login_button: Daxil ol
+ new to osm: OpenStreetMap-də yenisiz?
+ no account: İstifadəçi hesabınız yoxdur?
+ openid: "%{logo} OpenID:"
+ openid_logo_alt: OpenID ilə hesabınıza daxil olun
+ openid_providers:
+ aol:
+ alt: AOL OpenID ilə hesabınıza daxil olun
+ title: AOL ilə hesaba giriş
+ google:
+ alt: Google OpenID ilə hesabınıza daxil olun
+ title: Google ilə hesaba giriş
+ myopenid:
+ alt: myOpenID OpenID ilə hesabınıza daxil olun
+ title: myOpenID ilə hesaba giriş
+ openid:
+ alt: OpenID URL ilə hesabınıza daxil olun
+ title: OpenID ilə hesaba giriş
+ wordpress:
+ alt: Wordpress OpenID ilə hesabınıza daxil olun
+ title: Wordpress ilə hesaba giriş
+ yahoo:
+ alt: Yahoo OpenID ilə hesabınıza daxil olun
+ title: Yahoo ilə hesaba giriş
+ password: "Parol:"
+ register now: İndi qeydiyyatdan keç
+ remember: Məni xatırla
+ title: Daxil olun
+ logout:
+ heading: OpenStreetMap-dən çıx
+ logout_button: Sistemdən çıx
+ title: Sistemdən çıx
+ lost_password:
+ email address: "E-poçt ünvanları:"
+ heading: Parolu unutmusan?
+ new password button: Parolu yenilə
+ title: İtirilmiş parol
+ make_friend:
+ already_a_friend: Siz artıq %{name} dostsunuz.
+ button: Dostluğa əlavə et
+ failed: Bağışlayın, %{name}-i(ı) dostluğa əlavə etmədə xəta yarandı.
+ heading: "%{user}-i(ı) dostluğa əlavə edək?"
+ success: "%{name} indi sənin dostundur."
+ new:
+ confirm password: "Parolu təkrarla:"
+ continue: Davam et
+ display name: "Gorüntülənən ad:"
+ email address: "E-poçt ünvanları:"
+ heading: İstifadəçi Hesabı yarat
+ openid: "%{logo} OpenID:"
+ password: "Parol:"
+ title: Hesab aç
+ popup:
+ friend: Dost
+ your location: Yerləşdiyin yer
+ remove_friend:
+ button: Dostluqdan sil
+ heading: "%{user} dostluqdan silək?"
+ reset_password:
+ confirm password: "Parolu təkrarla:"
+ flash changed: Parolun indi dəyişildi.
+ heading: "%{user} üçün parolu yenilə"
+ password: "Parol:"
+ reset: Parolu Yenilə
+ title: Parolu yenilə
+ terms:
+ agree: Razıyam
+ consider_pd_why: bu nədir?
+ decline: İmtina
+ legale_names:
+ france: Fransa
+ italy: İtaliya
+ view:
+ activate_user: Bu istifadəçini aktivləşdir
+ add as friend: dostluğa əlavə edilmiş
+ confirm: Təsdiq et
+ create_block: bu istifadəçini blokla
+ ct accepted: "%{ago} əvvəl qəbul edilib"
+ deactivate_user: Bu istifadəçini deaktivləşdir
+ delete_user: bu istifadəçini sil
+ diary: gündəlik
+ email address: "E-poçt ünvanı:"
+ hide_user: Bu istifadəçini gizlət
+ latest edit: "Son redaktə %{ago}:"
+ my comments: mənim şərhlərim
+ my diary: mənim gündəliyim
+ my edits: mənim redaktələrim
+ remove as friend: dostluqdan silinmiş
+ send message: mesaj göndər
+ status: "Status:"
+ your friends: Sənin dostların
+ user_block:
+ blocks_by:
+ title: "%{name} tərəfindən blok edilib"
+ create:
+ flash: "%{name} adlı istifadəçiyə blok yaradılıb."
+ edit:
+ back: Bütün blokları göstər
+ show: Bu bloku göstər
+ submit: Bloku yenilən
+ helper:
+ time_past: "%{time} əvvəl sona çatıb."
+ index:
+ heading: İstifadəçi blokları siyahısı
+ title: İstifadəçi blokları
+ new:
+ back: Bütün blokları göstər
+ submit: Blok yarat
+ partial:
+ confirm: Əminsinizmi?
+ creator_name: Yaradıcı
+ display_name: Bloklanmış İstifadəçilər
+ edit: Redaktə et
+ next: Növbəti »
+ not_revoked: (ləgv edilməyib)
+ previous: « Əvvəlki
+ reason: Bloklanma səbəbi
+ revoke: Ləğv et!
+ revoker_name: Tərəfindən ləgv edilib
+ show: Göstər
+ status: Status
+ revoke:
+ flash: Bu blok ləğv edilib.
+ heading: "%{block_on} adlı istifadəçi üçün blok, %{block_by} tərəfindən ləğv edilib"
+ revoke: Ləğv et!
+ title: "%{block_on} adlı istifadəçi üçün blok ləğv edilib"
+ show:
+ revoke: Ləğv et!
+ show: "Göstər:"
+ status: Status
+ time_past: "%{time} əvvəl sona çatıb"
+ title: "%{block_on}, %{block_by} tərəfindən blok edilib"
+ update:
+ success: Blok yeniləndi.
+ user_role:
+ grant:
+ confirm: Təsdiq et
+ revoke:
+ confirm: Təsdiq et
credit_1_html: "Калі Вы выкарыстоўваеце выявы мапаў OpenStreetMap, мы патрабуем, каб\nВы рабілі спасылку хаця б “© удзельнікі OpenStreetMap\n, CC BY-SA”. Калі Вы выкарыстоўваеце толькі картаграфічныя зьвесткі,\nмы патрабуем наяўнасьць “Картаграфічныя зьвесткі © Удзельнікі OpenStreetMap,\nCC BY-SA”."
credit_2_html: "Дзе магчыма, павінна быць гіпэр-спасылка на OpenStreetMap <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nі на CC BY-SA <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Калі\nВы выкарыстоўваеце носьбіты, дзе выкарыстаньне спасылак немагчымае (напр.\nдрукаваныя працы), мы прапануем накіроўваць Вашым чытачоў на\nwww.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу\n‘OpenStreetMap’) і на\nwww.creativecommons.org."
credit_title_html: Як спасылацца на OpenStreetMap
- intro_1_html: "OpenStreetMap прадстаўляе <i>вольныя зьвесткі</i>, на ўмовах ліцэнзіі <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя мапы\nі зьвесткі, да той пары, пакуль Вы спасылаецеся на OpenStreetMap і яе\nўдзельнікаў. Калі Вы зьмяняеце ці выкарыстоўваеце нашыя мапы і зьвесткі, Вы можаце\nраспаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст ліцэнзіі\n<a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\ncode</a> растлумачыць Вам правы і адказнасьці."
more_1_html: "Даведайцеся болей пра выкарыстаньне нашых зьвестак на <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">старонцы адказаў\nі пытаньняў</a>."
more_2_html: "Удзельнікі OSM павінны памятаць пра тое, што забаронена дадаваць зьвесткі\nз любых крыніцаў абароненых аўтарскім правам (напрыклад, Google Maps ці друкаваных мапаў)\nбез папярэдняга дазволу ўладальнікаў аўтарскіх правоў."
hide_link: Kuzhat an evezhiadenn-mañ
diary_entry:
comment_count:
- one: 1 addispleg
- other: "%{count} addispleg"
+ one: Un evezhiadenn
+ other: "%{count} evezhiadenn"
+ zero: Evezhiadenn ebet
comment_link: Addisplegañ an enmoned-mañ
confirm: Kadarnaat
edit_link: Aozañ an enmoned-mañ
infringement_1_html: "Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\neus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre\nezpleg ar re zo ar gwirioù-aozer ganto."
infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se da c'houzout d'hon <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">argerzh dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="http://dmca.openstreetmap.org/">furmskrid enlinenn</a>.
infringement_title_html: Terriñ ar gwir-eilañ
- intro_1_html: " OpenStreetMap zo un hollad <i>roadennoù digor</i>, a c'haller kaout dindan an aotre-implijout <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n genlabourerien. Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">legal\ncode</a> e kavot munudoù ho kwirioù hag ho teverioù."
intro_3_html: "Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons Attribution-ShareAlike 2.0</a> license (CC-BY-SA)."
more_1_html: "Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAG ar reolennoù</a>."
show_areas: Prikazati područja
show_history: Prikazati historiju
unable_to_load_size: "Ne može se učitati: Okvir obuhvata veličine %{bbox_size} je prevelik (mora biti manji od %{max_bbox_size})"
+ view_data: Prikazati podatke za trenutni prikaz karte
wait: Pričekajte...
zoom_or_select: Uvećati ili izabrati područje karte za pregled
tag_details:
hide_link: Sakriti ovaj komentar
diary_entry:
comment_count:
- other: jedan=%{count} komentar
+ one: "%{count} komentar"
+ other: "%{count} komentara"
zero: nema komentara
comment_link: Komentirati ovaj zapis
confirm: Potvrditi
county: Kanton
farm: Farma
hamlet: Zaselak
- house: Kuća
+ house: Objekat
houses: Kuće
island: Ostrvo
islet: Ostrvce
history: Historija
home: Početna
home_tooltip: Idite na početnu lokaciju
- inbox_html: dolazne poruke %{count}
+ inbox_html: Dolazne poruke %{count}
inbox_tooltip:
one: Imate 1 nepročitanu poruku
other: Imate %{count} nepročitane(ih) poruke(a)
logo:
alt_text: OpenStreetMap logotip
logout: Odjava
- logout_tooltip: Odjava sa projekta {{SITENAME}}
+ logout_tooltip: Odjava sa projekta
make_a_donation:
text: Donirajte
title: Podržite Openstreetmap novčanom donacijom
partners_bytemark: Bytemark Hosting
partners_html: Hosting je podržan od strane %{ucl}, %{ic} i %{bytemark}, i drugih %{partners}.
partners_ic: Imperial College London
- partners_partners: partneri
+ partners_partners: partnera
partners_ucl: UCL VR Centar
sign_up: Otvorite račun
sign_up_tooltip: Otvorite korisnički račun za uređivanje
preview: Pregledati
search:
search: Pretraga
- search_help: "primjer: 'Mostar', 'Ferhadija
52, Sarajevo', ili 'željeznička stanica, Doboj' <a href='http://wiki.openstreetmap.org/wiki/Search'>više primjera...</a>"
+ search_help: "primjer: 'Mostar', 'Ferhadija
1, Sarajevo', ili 'Spomenik Kralju Tvrtku I Kotromaniću, Tuzla' <a href='http://wiki.openstreetmap.org/wiki/Search'>više primjera...</a>"
submit_text: Idi
where_am_i: Gdje sam?
where_am_i_title: Opišite trenutnu lokaciju koristeći pretraživač
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
+ old_way: Via antiga
+ old_way_node: Node de la via antiga
+ old_way_tag: Etiqueta de la via antiga
relation: Relació
relation_member: Membre de la relació
relation_tag: Etiqueta de la relació
session: Sessió
- trace: Traç
+ trace: Traça
tracepoint: Punt de traç
- tracetag: Etiqueta del traç
+ tracetag: Etiqueta de la traça
user: Usuari
user_preference: Preferències d'usuari
user_token: Testimoni d'usuari
- way: Camí
- way_node: Node del camí
- way_tag: Etiqueta del camí
+ way: Via
+ way_node: Node de la via
+ way_tag: Etiqueta de la via
application:
require_cookies:
cookies_needed: Sembla que teniu les galetes inhabilitades - habiliteu les galetes al navegador abans de continuar.
way: Via %{id}
type:
node: Node
- way: Camí
+ way: Via
private_user: usuari privat
show_areas: Mostra les zones
show_history: Mostra l'historial
unable_to_load_size: "No es pot carregar: Bounding mida de caixa de %{bbox_size} és massa gran (ha de ser més petita que %{max_bbox_size})"
+ view_data: Mostra les dades per la vista actual del mapa
wait: Espereu...
zoom_or_select: Amplia o selecciona una àrea del mapa per mostrar
tag_details:
still_editing: (Encara en edició)
view_changeset_details: Mostra els detalls del conjunt de canvis
changeset_paging_nav:
- next: Següent »
- previous: « Anterior
+ next: Endavant »
+ previous: « Enrere
showing_page: Mostrant pàgina %{page}
changesets:
area: Àrea
has_commented_on: "%{display_name} ha comentat les següents entrades del diari"
newer_comments: Comentaris recents
older_comments: Comentaris antics
- post: Publicar
+ post: Publica
when: Quan
diary_comment:
comment_from: Comentari de %{link_user} el %{comment_created_at}
paste_html: Enganxa HTML per incloure'l al lloc web
scale: Escala
too_large:
- body: Aquesta zona és massa gran per exportar com a dades XML de OpenStreetMap. Si us plau entrar ràpidament o seleccioneu una àrea més petita.
+ body: Aquesta zona és massa gran per exportar com a dades XML de OpenStreetMap. Si us plau seleccioneu una àrea més petita.
heading: L'àrea és massa gran
zoom: Zoom
start_rjs:
wifi: Punt d'accés WiFi
youth_centre: Centre juvenil
boundary:
- administrative: Administració de Fronteres
+ administrative: Límit administratiu
census: Límit censal
national_park: Parc Nacional
protected_area: Zona protegida
ford: Fiord
living_street: Carrer habitat
milestone: Fita
- minor: Camí secundari
- motorway: L'autopista
- motorway_junction: L'autopista
- motorway_link: L'autopista Road
+ minor: Via secundària
+ motorway: Autopista
+ motorway_junction: Unió d'autopista
+ motorway_link: Carretera d'autopista
path: Camí
pedestrian: Via Peatonal
platform: Perron
infringement_1_html: Recordem als col·laboradors d'OSM que mai s'han d'afegir dades de qualsevol font amb drets d'autor registrats (com Google Maps o mapes impresos per exemple) sense tenir una autorització explícita dels titulars dels drets d'autor.
infringement_2_html: Si penseu que hi ha material protegit per drets d'autor que ha estat afegit a la base de dades d'OpenStreetMap o a aquest web, si us plau aneu a la pàgina web dedicada al <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">Procediment per eliminar dades protegides pels drets d'autor</a> o empleneu aquest <a href="http://dmca.openstreetmap.org/">formulari en línia.</a>.
infringement_title_html: Violació dels drets d'autor
- intro_1_html: "OpenStreetMap és <i>obrir dades</i>, concedeix una llicència sota el <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Llicència Commons Attribution-ShareAlike 2.0 (CC BY-SA)."
+ intro_1_html: "Les dades d'OpenStreetMap són un conjunt de <i>dades obertes</i> publicades sota una <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">llicència de base de dades oberta</a> (ODbL)."
intro_2_html: "Sou lliure de copiar, distribuir, comunicar públicament i fer-ne obres \nderivades de les nostres dades, sempre que atribuïu els crèdits a \nOpenStreetMap i els seus col·laboradors. Si modifiqueu o utilitzeu les\nnostres dades fer fer obres derivades, només podreu distribuir l'obra \nresultant amb la mateixa llicència. Aquest \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">text legal\ncode</a> sencer que explica detalladament els vostres drets i responsabbilitats."
intro_3_html: "La cartografia de les nostres tessel·les i la nostra documentació són ofertes\nsota llicència <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Text de la llicència de Creative Commons Reconeixement-Compartir Igual 2.0</a>(CC-BY-SA)."
more_1_html: "Llegiu més informació sobre com utilitzar les nostres dades a les <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Preguntes\nFreqüents sobre legalitat</a>."
notifier:
diary_comment_notification:
footer: També podeu llegir el comentari a les %{readurl} i es pot comentar als %{commenturl} o respondre a les %{replyurl}
- header: "%{from_user} ha comentat en el seu recent entrada del diari OpenStreetMap amb el tema %{subject}:"
+ header: "%{from_user} ha comentat en la vostra recent entrada del diari OpenStreetMap amb el tema %{subject}:"
hi: Hola %{to_user},
- subject: "[OpenStreetMap] %{user}, va comentar sobre la seva entrada del diari"
+ subject: "[OpenStreetMap] %{user}, va comentar sobre la vostra entrada del diari"
email_confirm:
subject: "[OpenStreetMap] Confirmeu l'adreça de correu"
email_confirm_html:
click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç sota per confirmar el canvi.
greeting: Hola,
- hopefully_you: Algú (esperem que vostè) vol canviar la seva adreça d'e-mail a %{server_url} per %{new_address}.
+ hopefully_you: Algú (esperem que vostè) vol canviar la vostra adreça electrònica a %{server_url} per %{new_address}.
email_confirm_plain:
- click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç sota per confirmar el canvi.
+ click_the_link: Si sou vós mateix, feu clic a l'enllaç inferior per confirmar el canvi.
greeting: Hola,
hopefully_you_1: Algú (esperem que vós mateix) vol canviar l'adreça de correu a
hopefully_you_2: "%{server_url} a %{new_address}."
lost_password:
subject: "[OpenStreetMap] Sol·licitud de reinicialització de contrasenya"
lost_password_html:
- click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç de sota per restaurar la seva contrasenya.
+ click_the_link: Si sou vós, feu clic a l'enllaç de sota per restaurar la vostra contrasenya.
greeting: Hola,
hopefully_you: Algú (possiblement vostè) ha demanat per a la contrasenya restaurar el compte de openstreetmap.org d'aquesta adreça de correu electrònic.
lost_password_plain:
hi: Hola %{to_user},
signup_confirm:
confirm: "Primer de tot hem de confirmar que aquesta petició ha estat feta per vostè, si ha estat així, si us plau, premeu sobre el següent enllaç per tal confirmar la vostra petició de creació del compte d'usuari:"
- created: Algú (esperem que hagi estat vostè) acaba de crear un compte a %{site_url}.
+ created: Algú (suposem que vós mateix) acaba de crear un compte a %{site_url}.
greeting: Hola!
subject: "[OpenStreetMap] Benvinguts a OpenStreetMap"
welcome: Volem donar-vos la benvinguda i oferir-vos informació addicional que us ajudarà a començar.
more_videos: Hi ha %{more_videos_link}.
more_videos_here: més de vídeos aquí
user_wiki_page: "Es recomana que es crea una pàgina de wiki de l'usuari, que inclou Etiquetes de categoria assenyalant on estàs, com <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_in_London\">[[Categoria: Users_in_London]]</a>."
- video_to_openstreetmap: vídeo d'introducció a OpenStreetMap
+ video_to_openstreetmap: vídeo d'introducció a l'OpenStreetMap
wiki_signup: Vostè també pot <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">inscriure s a la wiki OpenStreetMap</a>.
signup_confirm_plain:
ask_questions: "Pot fer qualsevol pregunta que tingui sobre OpenStreetMap a les nostres preguntes i lloc de resposta:"
introductory_video: "Podeu veure un vídeo d'introducció a OpenStreetMap aquí:"
more_videos: "Hi ha més videos aquí:"
opengeodata: "OpenGeoData.org és blog fundador OpenStreetMap Steve Costa, i té podcasts també:"
- the_wiki: "Obtenir llegint sobre OpenStreetMap al wiki:"
+ the_wiki: "Llegiu sobre l'OpenStreetMap al wiki:"
user_wiki_page: Us recomanem de crear una pàgina wiki d'usuari, amb etiquetes de categoria que indiquin on sou, com per exemple [[Category:Users_in_Barcelona].
- wiki_signup: "Vostè també pot inscriure s a la wiki OpenStreetMap a:"
+ wiki_signup: "També us podeu inscriuire a la wiki de l'OpenStreetMap a:"
oauth:
oauthorize:
- allow_read_gpx: llegir el seu privats traces GPS.
+ allow_read_gpx: llegir les vostres traces GPS privades.
allow_read_prefs: llegiu les vostres preferències d'usuari.
allow_to: "Permet la sol·licitud de client per:"
allow_write_api: modificar el mapa.
allow_write_diary: crear entrades de diari, comentaris i fer amics.
allow_write_gpx: carregar traces GPS.
- allow_write_prefs: modificar les seves preferències d'usuari.
- request_access: L'aplicació %{app_name} sol·licita accés al seu compte, %{user}. Si us plau marqui si vostè would com l'aplicació té les següents capacitats. Vostè pot triar tantes o tan poc com vulgui.
+ allow_write_prefs: modificar les preferències d'usuari.
+ request_access: L'aplicació %{app_name} sol·licita accés al vostre compte, %{user}. Marqueu si voleu autoritzar l'aplicació amb les següents funcions. Podeu triar les que vulgueu.
revoke:
flash: He estat revocat el testimoni per %{application}
oauth_clients:
flash: Destruït la matrícula d'aplicació de client
edit:
submit: Modificació
- title: Editar la seva aplicació
+ title: Editar la vostra aplicació
form:
allow_read_gpx: llegir les seves traces GPS privats.
allow_read_prefs: llegir les seves preferències d'usuari.
index:
application: Nom d'aplicació
issued_at: Emès A
- list_tokens: "Les fitxes següents s'han emès per aplicacions en el seu nom:"
+ list_tokens: "Les fitxes següents s'han emès per aplicacions en el vostre nom:"
my_apps: Meves aplicacions de Client
my_tokens: Meves aplicacions autoritzada
- no_apps: Té una aplicació que li agradaria inscriure's per al seu ús amb nosaltres utilitzant l'estàndard %{oauth}? Heu de registrar la seva aplicació web abans que pugui fer peticions OAuth a aquest servei.
+ no_apps: ¿Teniu cap aplicació que voldríeu inscriure per usar amb nosaltres utilitzant l'estàndard %{oauth}? Heu de registrar la vostra aplicació web abans que pugui fer peticions OAuth a aquest servei.
register_new: Registrar-se l'aplicació
registered_apps: "Teniu les següents aplicacions client registrades:"
revoke: Revoca!
show:
access_url: "Accés Fitxa URL:"
allow_read_gpx: llegir les seves traces GPS privats.
- allow_read_prefs: llegir les seves preferències d'usuari.
+ allow_read_prefs: llegir les vostres preferències d'usuari.
allow_write_api: modificar el mapa.
allow_write_diary: crear entrades de diari, comentaris i fer amics.
allow_write_gpx: carregar traces GPS.
- allow_write_prefs: modificar les seves preferències d'usuari.
+ allow_write_prefs: modificar les vostres preferències d'usuari.
authorize_url: "Autoritza URL:"
confirm: N'esteu segur?
delete: Suprimeix client
secret: "Secret de consum:"
support_notice: Donem suport a HMAC-SHA1 (recomanat), així com text sense format en el mode de ssl.
title: OAuth detalls per %{app_name}
- url: "Sol. licitud Token URL:"
+ url: "Sol·licitud Token URL:"
update:
flash: La informació de client ha actualitzat correctament
redaction:
friendly: "%e %B %Y a les %H.%M"
trace:
create:
- trace_uploaded: El seu arxiu GPX s'ha pujat i està pendent d'inserció a la base de dades. Això passarà en general dins d'una mitja hora, i s'enviarà un correu electrònic a vostè en finalitzar.
+ trace_uploaded: El fitxer GPX s'ha pujat i està pendent d'inserció a la base de dades. Això passarà en general dins d'una mitja hora, i se us enviarà un correu electrònic en finalitzar.
upload_trace: Pujar traça de GPS
delete:
scheduled_for_deletion: Track programat per a ser suprimit
map: mapa
owner: "Propietari:"
points: "Punts:"
- save_button: Guardar canvis
+ save_button: Desa els canvis
start_coord: "Coordenada d'inici:"
tags: "Etiquetes:"
tags_help: separat per comes
heading: "Termes de col·laboració:"
link text: què és això?
not yet agreed: Que han no encara s'ha accedit a les noves condicions de col. laborador.
- review link text: Si us plau, seguiu aquest enllaç a la seva conveniència de revisar i acceptar els termes de col. laborador nou.
+ review link text: Seguiu aquest enllaç pel vostre interès per revisar i acceptar els termes de col·laborador nou.
current email address: "Adreça de correu electrònic actual:"
delete image: Suprimeix la imatge actual
email never displayed publicly: (no es mostrarà mai en públic)
flash update success: Informació de l'usuari ha actualitzat correctament.
- flash update success confirm needed: Informació de l'usuari ha actualitzat correctament. Comprovi el seu e-mail per a una nota per confirmar la seva adreça de correu electrònic nou.
+ flash update success confirm needed: Informació de l'usuari ha actualitzat correctament. Comproveu el vostre correu per confirmar la vostra adreça de correu electrònic nova.
gravatar:
- gravatar: Usar Gravatar
+ gravatar: Usa Gravatar
link: http://wiki.openstreetmap.org/wiki/Gravatar
link text: què és això?
home location: "Ubicació inicial:"
already active: Aquest compte ja ha estat confirmat.
before you start: Sabem que vostè està probablement en una pressa per començar a mapatge, però abans de fer que t'agradaria omplir una mica més informació sobre si mateix en el formulari a continuació.
button: Confirma
- heading: Confirmar un compte d'usuari
- press confirm button: Premeu el botó de confirmar sota per activar el seu compte.
+ heading: Confirma un compte d'usuari
+ press confirm button: Premeu el botó de confirmar sota per activar el compte.
reconfirm: Si ha estat una estona ja que s'inscrivia podria necessitar <a href="%{reconfirm}">enviar-se un nou correu electrònic de confirmació</a>.
- success: Confirmar el seu compte, gràcies per registrar-te!
+ success: Heu confirmat el vostre compte, gràcies per registrar-vos!
unknown token: Aquesta mostra no sembla que hi ha.
confirm_email:
button: Confirma
success: S'ha confirmat l'adreça electrònica, gràcies per registrar-vos-hi!
confirm_resend:
failure: L'usuari %{name} no s'ha trobat.
- success: Hem enviat un bitllet de confirmació nou per %{email} i tan aviat com vostè confirmar el seu compte es podrà aconseguir d'assignació.<br><br>Si utilitzeu un sistema que envia les sol·licituds de confirmació llavors si us plau fer segur whitelist webmaster@openstreetmap.org com som capaços de respondre a qualsevol sol·licituds de confirmació.
+ success: Hem enviat un bitllet de confirmació nou per %{email} i tan aviat com vostè confirmar el vostre compte podreu mapar.<br><br>Si utilitzeu un sistema anti correu brossa que envia les sol·licituds de confirmació llavors, autoritzeu whitelist webmaster@openstreetmap.org ja que no som capaços de respondre les sol·licituds de confirmació.
filter:
not_an_administrator: Cal que sigueu administrador per dur a terme aquesta acció.
go_public:
title: Usuaris
login:
account is suspended: Ho sentim, s'ha suspès el vostre compte per presentar una activitat sospitosa.<br />Contacteu amb el <a href="%{webmaster}">webmestre</a> si voleu parlar-ne.
- account not active: Ho sentim, el
teu compte encara no està actiu.<br>Si us plau utilitzi l'enllaç a l'e-mail de confirmació de compte d'activar el seu compte, o <a href="%{reconfirm}">demanar un nou correu electrònic de confirmació</a>.
+ account not active: Ho sentim, el
vostre compte encara no és actiu.<br>Utilitzeu l'enllaç al correu de confirmació per activar el vostre compte, o <a href="%{reconfirm}">demanar un nou correu electrònic de confirmació</a>.
auth failure: Ho sentim, no podeu registrar-vos amb aquesta informació.
create account minute: Crear un compte. Només es triga un minut.
email or username: "Adreça de correu o usuari:"
new to osm: Nou a OpenStreetMap?
no account: No teniu cap compte?
openid: "%{logo} OpenID:"
- openid invalid: Ho sentim, el seu OpenID sembla ser no vàlida
- openid missing provider: Ho sento, podria no en contacte amb el seu proveïdor d'OpenID
+ openid invalid: Ho sentim, la vostra OpenID sembla ser no vàlida
+ openid missing provider: Ho sento, no podem contactar amb el vostre proveïdor d'OpenID
openid_logo_alt: Inicia sessió amb un compte OpenID
openid_providers:
aol:
- alt: Connecti's amb un AOL OpenID
- title: Connecti's amb AOL
+ alt: Inicia sessió amb un AOL OpenID
+ title: Inicia sessió amb AOL
google:
- alt: Connecti's amb un OpenID de Google
- title: Connecti's amb Google
+ alt: Inicia sessió amb un OpenID de Google
+ title: Inicia sessió amb Google
myopenid:
- alt: Connecti's amb un myOpenID OpenID
- title: Connecti's amb myOpenID
+ alt: Inicia sessió amb un myOpenID OpenID
+ title: Inicia sessió amb myOpenID
openid:
- alt: Connecti's amb un URL d'OpenID
- title: Connecti's amb OpenID
+ alt: Inicia sessió amb un URL d'OpenID
+ title: Inicia sessió amb OpenID
wordpress:
- alt: Connecti's amb un Wordpress OpenID
- title: Connecti's amb Wordpress
+ alt: Inicia sessió amb un Wordpress OpenID
+ title: Inicia sessió amb Wordpress
yahoo:
- alt: Connecti's amb un OpenID Yahoo
- title: Connecti's amb Yahoo
+ alt: Inicia sessió amb un OpenID Yahoo
+ title: Inicia sessió amb Yahoo
password: "Contrasenya:"
register now: Registreu-vos-hi ara
remember: "Recorda'm:"
title: Accés
to make changes: Per fer canvis a les dades de OpenStreetMap, ha de tenir un compte.
- with openid: "Alternativament, si us plau utilitzi el seu OpenID per connectar-se:"
+ with openid: "Alternativament, utilitzeu el vostre OpenID per iniciar sessió:"
with username: "Ja teniu un compte de l'OpenStreetMap? Incieu sessió amb el nom d'usuari i contrasenya:"
logout:
- heading: Finalitza la sessió d'OpenStreetMap
- logout_button: Finalitza la sessió
- title: Finalitza la sessió
+ heading: Tanca la sessió d'OpenStreetMap
+ logout_button: Tanca la sessió
+ title: Tanca la sessió
lost_password:
email address: "Adreça de correu electrònic:"
heading: Heu oblidat la contrasenya?
help_text: Introduïu l'adreça de correu electrònic que va utilitzar per registrar-se, us enviarem un enllaç a ella que pot utilitzar per restablir la contrasenya.
new password button: Restableix la contrasenya
- notice email cannot find: Podria no trobar que l'e-mail adreçar, ho sento.
- notice email on way: Trist que perdia:-(però un correu electrònic està en camí així pot restaurar això aviat.
+ notice email cannot find: Podria no trobar aquesta adreça de correu.
+ notice email on way: Lamentem que l'hàgiu perdut :-( però us hem enviat un correu, així podreu restaurar-la ràpidament.
title: contrasenya perduda
make_friend:
already_a_friend: Que ja són amics amb %{name}.
- button: Afegir als amics
+ button: Afegeix als amics
failed: Ho sentim, no afegir %{name} com un amic.
- heading: Afegir % {user} com un amic?
+ heading: Voleu afegir % {user} com un amic?
success: "%{name} ara és el vostre amic."
new:
confirm email address: "Confirmeu l'adreça de correu electrònic:"
display name description: El nom d'usuari que es motrarà públicament. El podeu canviar més endavant a les preferències.
email address: "Adreça de correu:"
fill_form: Ompliu el formulari i us enviarem un correu electrònic per activar el vostre compte.
- flash create success message: Gràcies per registrar-se. Hem enviat un bitllet de confirmació a %{email} i tan aviat com vostè confirmar el seu compte es podrà aconseguir d'assignació.<br><br>Si utilitzeu un sistema que envia les sol·licituds de confirmació llavors si us plau fer segur whitelist webmaster@openstreetmap.org com som capaços de respondre a qualsevol sol·licituds de confirmació.
+ flash create success message: Gràcies per registrar-vos. Hem enviat un bitllet de confirmació a %{email} i tan aviat com confirmeu el vostre compte podreu mapar.<br><br>Si utilitzeu un sistema contra el correu brossa que envia sol·licituds de confirmació, assegureu-vos d'autoritzar l'adreça webmaster@openstreetmap.org, ja que no som capaços de respondre qualsevol sol·licitud de confirmació.
flash welcome: Gràcies per enregistar-vos. Us hem enviat un missatge de benvinguda a %{email} amb alguns consells sobre com començar.
heading: Crea un compte d'usuari
license_agreement: Quan confirmeu el compte, heu d'acceptar els <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">termes de col·laboracio</a>.
no_auto_account_create: No us podem crear automàticament un compte.
not displayed publicly: No es mostrarà públicament (vegeu la <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">política de privacitat</a>)
openid: "%{logo} OpenID:"
- openid association: "<p>El
seu OpenID encara no està associat a un compte de OpenStreetMap.</p>\n<ul>\n<li>Si sou nou a l'OpenStreetMap, creeu un compte utilitzant el formulari següent.</li>\n<li>\n Si ja teniu un compte, podeu iniciar sessió amb el vostre compte\n utilitzant el nom d'usuari i contrasenya i aleshores associeu el compte\n amb el vostre compte OpenID a les preferències d'usuari.\n</li>\n</ul>"
+ openid association: "<p>El
vostre OpenID encara no està associat a un compte de OpenStreetMap.</p>\n<ul>\n<li>Si sou nou a l'OpenStreetMap, creeu un compte utilitzant el formulari següent.</li>\n<li>\n Si ja teniu un compte, podeu iniciar sessió amb el vostre compte\n utilitzant el nom d'usuari i contrasenya i aleshores associeu el compte\n amb el vostre compte OpenID a les preferències d'usuari.\n</li>\n</ul>"
openid no password: Amb l'OpenID no es requereix contrasenya, però algunes eines extres o el servidor encara poden necessitar-la.
password: "Contrasenya:"
terms accepted: Gràcies per a l'acceptació de les condicions de col. laborador nou!
nearby mapper: L'Assignador proper
your location: La vostra ubicació
remove_friend:
- button: Suprimir dels amics
- heading: Suprimir % {user} dels amics?
+ button: Suprimeix dels amics
+ heading: Voleu suprimir % {user} dels amics?
not_a_friend: "%{name} no és un dels seus amics."
success: "%{name} s'ha suprimit dels teus amics."
reset_password:
confirm password: "Confirmeu la contrasenya:"
flash changed: S'ha canviat la contrasenya.
flash token bad: No ha trobat que comproven token, l'URL potser?
- heading: Restablir la contrasenya per %{user}
+ heading: Restableix la contrasenya per %{user}
password: "Contrasenya:"
reset: Restableix la contrasenya
- title: Restablir la contrasenya
+ title: Restableix la contrasenya
set_home:
flash success: Localització de casa desat correctament
suspended:
- body: "<p>\n Ho sentim, el seu compte ha estat automàticament suspès a causa de\n l'activitat sospitosa.\n</p>\n<p>\n Aquesta decisió serà revisat per un administrador en breu, o\n es pot contactar amb el %{webmaster} si vostè desitja discutir això.\n</p>"
+ body: "<p>\n El vostre compte ha estat automàticament suspès a causa de\n l'activitat sospitosa.\n</p>\n<p>\n Aquesta decisió serà revisat per un administrador en breu, o\n es pot contactar amb el %{webmaster} si desitgeu discutir això.\n</p>"
heading: Compte suspès
title: Compte suspès
webmaster: per a administradors web
friends_changesets: Navega per tots els conjunts de canvis dels vostres amics
friends_diaries: Navega totes les entrades de diari dels amics
hide_user: amagar aquest usuari
- if set location: Si establiu la vostra ubicació, un mapa força i matèria es mostrarà aquí. Podeu configurar la vostra ubicació de casa a la seva pàgina %{settings_link}.
+ if set location: Si establiu la vostra ubicació, aquí es mostrarà un mapa i altre coses interessants. Podeu configurar la vostra ubicació a la pàgina %{settings_link}.
km away: "%{count}km de distància"
latest edit: "Última edició %{ago}:"
m away: "%{count}m de distància"
- mapper since: "Mapejant des de:"
+ mapper since: "Mapant des de:"
moderator_history: blocs donats
my comments: els meus comentaris
my diary: el meu diari
heading: Llista de blocs %{name}
title: Blocs %{name}
blocks_on:
- empty: "%{name} no ha estat bloquejat encara."
+ empty: "%{name} no ha estat blocat encara."
heading: Llista de quadres a %{name}
title: Blocs en %{name}
create:
non_moderator_revoke: Ha de ser un moderador per crear o un bloc d'actualització.
non_moderator_update: Ha de ser un moderador per crear o un bloc d'actualització.
new:
- back: Veure tots els blocs
+ back: Mostra tots els blocs
heading: Creació de bloc %{name}
needs_view: L'usuari necessita connectar-se abans que aquest bloqueig es suprimeixi
- period: Quant de temps, a partir d'ara, l'usuari es bloqueja des de l'API.
- reason: La raó per què està sent bloquejat %{name}. Si us plau, estigui tan tranquil i tan raonable com sigui possible, donant tant detall com sigui possible sobre la situació, recordant que el missatge serà visible públicament. Tingueu en compte que no tots els usuaris comprenen l'argot de la comunitat, així que si us plau, intenti utilitzar termes de comuns.
+ period: Quant de temps, a partir d'ara, l'usuari es bloca des de l'API.
+ reason: La raó per què està sent blocat %{name}. Manteniu la tranquil·litat i sigueu raonable com sigui possible, donant tants detalls com sigui possible sobre la situació, recordeu que el missatge serà visible públicament. Tingueu en compte que no tots els usuaris comprenen l'argot de la comunitat, així que intenteu utilitzar termes de comuns.
submit: Crear bloc
title: Creació de bloc %{name}
tried_contacting: Em vaig posar en contacte amb l'usuari i li vaig demanar que s'atures.
show: Mostra
status: Estat
time_future: Finalitza en %{time}
- time_past: Va acabar %{time} fa
+ time_past: Va acabar fa %{time}
title: "%{block_on} bloquejat per %{block_by}"
update:
only_creator_can_edit: Només el moderador que ha creat aquest bloc pot editar-lo.
show_areas: Zobrazit oblasti
show_history: Zobrazit historii
unable_to_load_size: "Nelze načíst: Rozměr %{bbox_size} je příliš velký (maximum je %{max_bbox_size})"
+ view_data: Ukázat data k zobrazené mapě
wait: Čekejte...
zoom_or_select: Zvolte větší měřítko nebo vyberte nějakou oblast mapy
tag_details:
few: "%{count} komentáře"
one: 1 komentář
other: "%{count} komentářů"
+ zero: Bez komentářů
comment_link: Okomentovat tento zápis
confirm: Potvrdit
edit_link: Upravit tento záznam
show_areas: Vis områder
show_history: Vis historik
unable_to_load_size: "Kunne ikke indlæse: området %{bbox_size} er for stort (skal være mindre end %{max_bbox_size})"
+ view_data: Vis data for nuværende kortvisning
wait: Vent...
zoom_or_select: Zoom ind eller vælg et område af kortet for visning
tag_details:
hide_link: Skjul denne kommentar
diary_entry:
comment_count:
- one: 1 kommentar
+ one: "%{count} kommentar"
other: "%{count} kommentarer"
+ zero: Ingen kommentarer
comment_link: Kommentér dette indlæg
confirm: Bekræft
edit_link: Vis dette indlæg
infringement_1_html: "OSM-bidragydere bliver mindet om aldrig at tilføje data fra nogen\nophavsretligt beskyttede kilder (f.eks. Google Maps eller trykte kort) uden\neksplicit tilladelse fra ophavsret-indehaverne."
infringement_2_html: "Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er\n føjet til OpenStreetMap databasen eller dette websted, bedes du følge\n vores <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">procedure til fjernelse a materiale</a> eller udfyld formular direkte på vores\n<a href=\"http://dmca.openstreetmap.org/\">on-line side</a>."
infringement_title_html: Krænkelse af ophavsretten
- intro_1_html: "OpenStreetMap er <i>åben data</i>, licenseret under <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a>-licensen (CC BY-SA)."
+ intro_1_html: "OpenStreetMap er <i>åbne data</i>, licenseret under <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores data, \nså længe du angiver OpenStreetMap og dets\nbidragydere som kilde. Hvis du ændrer eller bygger på vores\ndata, må du kun distribuere resultatet under den samme licens. Den\nfulde <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiske tekst</a>\nforklarer dine rettigheder og pligter."
intro_3_html: "Kartografi i vores kort, og vores dokumentation er\n licenseret under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a>-licensen (CC-BY-SA)."
more_1_html: "Læs mere om brug af vores data, og hvordan du kreditere os, på den <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiske\nFAQ</a>."
show_areas: Gebiete einblenden
show_history: Chronik
unable_to_load_size: "Das Laden ist nicht möglich: Der Größe %{bbox_size} des Bereichs ist zu groß und muss kleiner als %{max_bbox_size} sein."
+ view_data: Daten für aktuelle Kartenansicht ansehen
wait: Verarbeiten …
zoom_or_select: Karte vergrößern oder einen Bereich auf der Karte auswählen
tag_details:
hide_link: Diesen Kommentar verbergen
diary_entry:
comment_count:
- one: 1 Kommentar
+ one: Ein Kommentar
other: "%{count} Kommentare"
+ zero: Keine Kommentare
comment_link: Kommentar zu diesem Eintrag
confirm: Bestätigen
edit_link: Diesen Eintrag bearbeiten
credit_3_html: "Za pśepytujobnu elektronisku kórtu by měło se źěkowanje w rožku kórty pokazaś. Na pśikład:"
credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap
infringement_title_html: Pśejźenje stwóriśelskego pšawa
- intro_1_html: OpenStreetMap wobstoj ze <i>zjawnych datow</i>, licencěrowanych pód licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Móžoš naše daty kopěrowaś, rozdźěliś, pśenjasć a pśiměriś, tak dłujko ako naspomnjejoš OpenStreetMap a jich sobustatkujucych. Jolic změnijoš naše kórty abo daty abo zepěraš se na nje, móžoš wuslědk jano pód teju sameju licencu rozdźěliś. Dopołny <a href="http://opendatacommons.org/licenses/odbl/1.0/">pšawniski code</a> wujasnjujo twóje pšawa a zagronitosći.
intro_3_html: Kartografija w našych kórtowych kachlach a naša dokumentacija stej pód licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA) licencěrowanej.
more_1_html: Cytaj wěcej wó wužywanju našych datow a kak dajo se nas pśipóznaś pód <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Ceste pšawniske pšašenja</a>.
# Author: Geraki
# Author: Glavkos
# Author: Kiriakos
+# Author: Kongr43gpen
# Author: Logictheo
# Author: Omnipaedista
# Author: Protnet
description_nearby: Ομάδες αλλαγών από κοντινούς χρήστες
description_user: Ομάδες αλλαγών από %{user}
description_user_bbox: Ομάδες αλλαγών από %{user} μεταξύ %{bbox}
+ empty_anon_html: Δεν έχει γίνει ακόμη καμία επεξεργασία
heading: Ομάδες αλλαγών
heading_bbox: Ομάδες αλλαγών
heading_friend: Ομάδες αλλαγών
toys: Κατάστημα Παιγνιδιών
travel_agency: Ταξιδιωτικό Πρακτορείο
tourism:
+ attraction: Αξιοθέατο
cabin: Καμπίνα
camp_site: Χώρος Κατασκήνωσης
chalet: Σαλέ
relation: relation
changeset: changeset
paging_nav:
- showing_page: "Showing page"
+ showing_page: "page"
of: "of"
redacted:
redaction: "Redaction %{id}"
edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
object_list:
heading: "Object list"
- back: "Display object list"
+ back: "Back to object list"
type:
node: "Node"
way: "Way"
comments: "Comments:"
changeset:
changeset_paging_nav:
- showing_page: "Showing page %{page}"
+ showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
changeset:
- id: "#%{id}"
still_editing: "(still editing)"
anonymous: "Anonymous"
no_comment: "(none)"
heading_user_bbox: "Changesets"
heading_friend: "Changesets"
heading_nearby: "Changesets"
- description: "Recent changes"
+ description: "Browse recent contributions to the map"
description_user: "Changesets by %{user}"
description_bbox: "Changesets within %{bbox}"
description_user_bbox: "Changesets by %{user} within %{bbox}"
description_friend: "Changesets by your friends"
description_nearby: "Changesets by nearby users"
empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
- empty_anon_html: "No edits made yet"
+ empty_anon_html: "No edits made yet."
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
diary_entry:
new: New Diary Entry
new_title: Compose a new entry in your user diary
no_entries: No diary entries
- recent_entries: "Recent diary entries:"
+ recent_entries: "Recent diary entries"
older_entries: Older Entries
newer_entries: Newer Entries
edit:
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
trace_not_found: "Trace not found!"
visibility: "Visibility:"
trace_paging_nav:
- showing_page: "Showing page %{page}"
+ showing_page: "Page %{page}"
older: "Older Traces"
newer: "Newer Traces"
trace:
public_traces: "Public GPS traces"
your_traces: "Your GPS traces"
public_traces_from: "Public GPS traces from %{user}"
+ description: "Browse recent GPS track uploads"
tagged_with: " tagged with %{tags}"
empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
delete:
edits: edits
traces: traces
notes: map notes
- remove as friend: remove as friend
- add as friend: add as friend
+ remove as friend: unfriend
+ add as friend: add friend
mapper since: "Mapper since:"
ago: "(%{time_in_words_ago} ago)"
ct status: "Contributor terms:"
spam score: "Spam Score:"
description: Description
user location: User location
- if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your %{settings_link} page."
+ if set location: "Set your home location on the %{settings_link} page to see nearby users."
settings_link_text: settings
your friends: Your friends
no friends: You have not added any friends yet.
unhide_user: "unhide this user"
delete_user: "delete this user"
confirm: "Confirm"
- friends_changesets: "Browse all changesets by friends"
- friends_diaries: "Browse all diary entries by friends"
- nearby_changesets: "Browse all changesets by nearby users"
- nearby_diaries: "Browse all diary entries by nearby users"
+ friends_changesets: "friends' changesets"
+ friends_diaries: "friends' diary entries"
+ nearby_changesets: "nearby user changesets"
+ nearby_diaries: "nearby user diary entries"
popup:
your location: "Your location"
nearby mapper: "Nearby mapper"
make_friend:
heading: "Add %{user} as a friend?"
button: "Add as friend"
- success: "%{name} is now your 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:
- heading: "Remove %{user} as a friend?"
- button: "Remove as friend"
+ heading: "Unfriend %{user}?"
+ button: "Unfriend"
success: "%{name} was removed from your friends."
not_a_friend: "%{name} is not one of your friends."
filter:
title: Users
heading: Users
showing:
- one: Showing page %{page} (%{first_item} of %{items})
- other: Showing page %{page} (%{first_item}-%{last_item} of %{items})
+ one: Page %{page} (%{first_item} of %{items})
+ other: Page %{page} (%{first_item}-%{last_item} of %{items})
summary: "%{name} created from %{ip_address} on %{date}"
summary_no_ip: "%{name} created on %{date}"
confirm: Confirm Selected Users
status: "Status"
revoker_name: "Revoked by"
not_revoked: "(not revoked)"
- showing_page: "Showing page %{page}"
+ showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
helper:
show_areas: Mostrar áreas
show_history: Mostrar historial
unable_to_load_size: "Imposible cargar: El tamaño de la envoltura (%{bbox_size} es demasiado grande (debe ser menor que %{max_bbox_size})"
+ view_data: Ver los datos de la vista de mapa actual
wait: Espere...
zoom_or_select: Para ver los datos, haga más zoom o seleccione un área del mapa
tag_details:
comment_count:
one: 1 comentario
other: "%{count} comentarios"
+ zero: Sin comentarios
comment_link: Comentar esta entrada
confirm: Confirmar
edit_link: Editar entrada
infringement_1_html: Se le recuerda a los colaboradores de OSM que no deberán añadir información procedente de ninguna fuente con derechos de autor reservados (como por ejemplo de Google Maps o mapas impresos) sin el consentimiento explícito de los poseedores de los derechos de autor.
infringement_2_html: Si usted cree que algún material con derechos de autor ha sido incorrectamente agregado a la base de datos de OpenStreetMap o a este sitio, consulte nuestro <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimiento de desmantelamiento</a> o preséntelo directamente en nuestra <a href="http://dmca.openstreetmap.org/">página de presentación en línea</a>.
infringement_title_html: Violación de copyright
- intro_1_html: "OpenStreetMap es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Reconocimiento-CompartirIgual 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Reconocimiento-CompartirIgual 2.0</a> (CC BY-SA)."
intro_2_html: Puedes copiar, distribuir, transmitir y adaptar nuestros mapas e información libremente siempre y cuando des reconocimiento a OpenStreetMap y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e información, solo podrás distribuir estos cambios bajo la misma licencia. El <a href="http://opendatacommons.org/licenses/odbl/1.0/">código legal completo</a> explica tus derechos y obligaciones.
intro_3_html: La cartografía en nuestros mosaicos de mapas y en nuestra documentación, están licenciados bajo la licencia <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Reconocimiento-CompartirIgual 2.0</a> (CC-BY-SA).
more_1_html: Encontrarás más información acerca de cómo utilizar nuestros datos, y cómo darnos créditos, en <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Preguntas legales más frecuentes</a>.
user: Kasutaja
visible: Nähtav
user:
+ active: Aktiivne
description: Kirjeldus
display_name: Näita nime
email: E-posti aadress
pass_crypt: Parool
models:
country: Riik
+ diary_comment: Päeviku kommentaar
diary_entry: Päeviku sissekanne
+ friend: Sõber
language: Keel
message: Sõnum
node: Sõlm
area: Muuda ala
node: Muuda sõlme
relation: Muuda relatsiooni
+ way: Muuda joont
larger:
area: Vaata ala suuremal kaardil
node: Vaata sõlme suuremal kaardil
of: " /"
showing_page: Näitan lehte
redacted:
+ redaction: Redaktsioon %{id}
type:
node: sõlm
relation: relatsioon
+ way: joon
relation:
download_xml: Laadi XML
relation: relatsioon
way: joon
start_rjs:
data_frame_title: Andmed
- data_layer_name: Andmed
+ data_layer_name: Sirvi kaardi andmeid
details: Detailid
edited_by_user_at_timestamp: Viimati muudetud kasutaja %{user} poolt kell %{timestamp}
hide_areas: Peida alad
anonymous: Anonüümne
big_area: (suur)
no_comment: (puudub)
+ no_edits: (muudatused puuduvad)
still_editing: redigeerimine pooleli
changeset_paging_nav:
next: Järgmine »
user: Kasutaja
list:
description: Viimased muudatused
+ empty_anon_html: Muudatusi ei ole veel tehtud
diary_entry:
comments:
+ ago: "%{ago} tagasi"
+ comment: Kommentaar
+ has_commented_on: "%{display_name} on kommenteerinud järgnevaid päeviku sissekandeid"
newer_comments: Uuemad kommentaarid
older_comments: Vanemad kommentaarid
+ post: Postitus
+ when: Millal
diary_comment:
+ comment_from: Kommentaar kasutajalt %{link_user} %{comment_created_at}
confirm: Kinnita
hide_link: Peida see kommentaar
diary_entry:
comment_count:
- one: 1 kommentaar
+ one: "%{count} kommentaar"
other: "%{count} kommentaari"
+ zero: Kommentaarid puuduvad
comment_link: Kommenteeri seda päeviku sissekannet
confirm: Kinnita
edit_link: Muuda seda sissekannet
subject: "Teema:"
title: Muuda päeviku sissekannet
use_map_link: kasuta kaarti
+ feed:
+ all:
+ description: Hiljutised OpenStreetMap kasutajate päeviku sissekanded
+ title: OpenStreetMap päeviku sissekanded
+ language:
+ description: Hiljutised OpenStreetMap kasutajate päeviku sissekanded keeles %{language_name}
+ title: OpenStreetMap päeviku sissekanded keeles %{language_name}
+ user:
+ description: Kasutaja %{user} hiljutised OpenStreetMap päeviku sissekanded
+ title: Kasutaja %{user} OpenStreetMap päeviku sissekanded
list:
+ in_language_title: Päeviku sissekanded %{language}
new: Uus päeviku sissekanne
new_title: Lisa päevikusse uus sissekanne
newer_entries: Uuemad...
recent_entries: "Hiljutised päeviku sissekanded:"
title: Kasutajate päevikud
title_friends: Sõprade päevikud
+ title_nearby: Lähedalasuvate kasutajate päevikud
user_title: Kasutaja %{user} päevik
location:
edit: muuda
south_east: kagu
south_west: edela
west: lääne
+ distance:
+ one: umbes 1km
+ other: umbes %{count}km
+ zero: vähem kui 1km
results:
more_results: Veel tulemusi
no_results: Ei leidnud midagi
terminal: Terminal
amenity:
airport: Lennujaam
+ artwork: Kunstiteos
atm: Pangaautomaat
auditorium: Auditoorium
bank: Pank
embassy: Saatkond
emergency_phone: Hädaabi telefon
fast_food: Kiirtoit
+ ferry_terminal: Praamiterminal
fire_station: Tuletõrjedepoo
fountain: Purskkaev
fuel: Kütus
historic_station: Ajalooline raudteejaam
junction: Raudtee ülekäigukoht
level_crossing: Raudtee ülesõidukoht
+ miniature: Miniatuurraudtee
narrow_gauge: Kitsarööpmeline raudtee
platform: Raudteeperroon
station: Raudteejaam
zero: Sul ei ole lugemata sõnumeid
intro_1: OpenStreetMap on vaba, kogu maailma hõlmav kaart, mille on loonud inimesed, nagu sina.
intro_2_create_account: loo oma konto
+ intro_2_download: allalaadida
intro_2_html: Andmeid võib olemasoleva %{license} alusel tasuta %{download} ja %{use}. Kaardi täiendamiseks %{create_account}.
+ intro_2_license: avatud litsentsi
+ intro_2_use: kasutada
log_in: logi sisse
log_in_tooltip: Logi sisse oma kasutajanimega
logo:
delete_button: Kustuta
notifier:
diary_comment_notification:
+ header: "%{from_user} on kommenteerinud sinu hiljutist OpenStreetMap päeviku sissekannet pealkirjaga %{subject}:"
hi: Tere, %{to_user}!
subject: "[OpenStreetMap] %{user} kommenteeris sinu päeviku sissekannet"
email_confirm:
lost_password_plain:
greeting: Tere,
message_notification:
+ header: "%{from_user} on saatnud sulle OpenStreetMapi kaudu sõnumi teemaga %{subject}:"
hi: Tere, %{to_user},
signup_confirm:
subject: "[OpenStreetMap] E-posti aadressi kinnitamine"
form:
allow_read_gpx: lugeda enda privaatseid GPS-radasid.
allow_read_prefs: Lugeda oma kasutajaeelistusi.
- allow_write_api: muuta kaarti
+ allow_write_api: muuta kaarti.
allow_write_diary: luua päeviku sissekandeid, kommenteerida ja saada sõpradeks.
+ allow_write_gpx: laadida üles GPS-radasid.
allow_write_prefs: Muuta oma kasutajaeelistusi.
name: Nimi
requests: "Kasutajalt nõutakse järgmisi õiguseid:"
your_traces: Sinu GPS rajad
trace:
ago: "%{time_in_words_ago} tagasi"
+ by: kasutajalt
count_points:
one: "%{count} punkt"
other: "%{count} punkti"
edit: redigeeri
edit_map: Redigeeri kaarti
+ map: asukoht kaardil
more: rohkem
pending: OOTEL
trace_details: Vaata Jälje Detaile
user:
account:
contributor terms:
+ agreed: Oled nõustunud uute Kaastöö tingimustega.
heading: "Kaastöö tingimused:"
link text: Mis see on?
+ not yet agreed: Sa ei ole veel nõustunud uute Kaastöö tingimustega.
current email address: "Praegune e-posti aadress:"
delete image: Eemalda praegune pilt
email never displayed publicly: (ei näidata mitte kunagi avalikult)
heading: Logi sisse
login_button: Logi sisse
lost password link: Salasõna ununes?
- no account: Sa ei ole veel registreerinud kasutaja?
+ no account: Sa ei ole veel registreerinud kasutajaks?
openid: "%{logo} OpenID:"
+ openid_providers:
+ openid:
+ title: Logi sisse OpenID abil
password: "Parool:"
register now: "Registreeru:"
remember: "Jäta mind meelde:"
email address: "E-posti aadress:"
fill_form: Täitke vorm ning me saadame teile e-posti konto aktiveerimiseks.
heading: Loo uus kasutajanimi
+ not displayed publicly: Ei näidata avalikult (vaata <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="viki privaatsusreeglid, sh osa e-posti aadresside käsitlemisest">privaatsusreegleid</a>)
openid: "%{logo} OpenID:"
+ openid no password: OpenID kasutamisel ei ole parool kohustuslik, kuid mõned eritööriistad või serverid nõuavad seda siiski.
password: "Uus parool:"
title: Loo uus konto
+ use openid: Teise võimalusena kasuta %{logo} OpenID sisselogimist
no_such_user:
body: Vabandust kuid kasutajat nimega %{user} pole olemas. Kontrolli sisestatud lingi õigekirja. Võimalik, et link millele sa vajutasid on vigane.
heading: Kasutajat %{user} pole olemas
# Messages for Persian (فارسی)
# Exported from translatewiki.net
# Export driver: syck-pecl
+# Author: BMRG14
# Author: Grille chompa
# Author: Hooshmand.hasannia
# Author: Huji
license_page:
foreign:
english_link: اصل انگلیسی
- text: در زÙ\85اÙ\86 بÙ\87 Ù\88جÙ\88د Ø¢Ù\85دÙ\86 تداخÙ\84 بÛ\8cÙ\86 ترجÙ\85Ù\87 Ù\81ارسÛ\8c Ù\88 %{english_original_link} Ù\85تÙ\86 اÙ\86Ú¯Ù\84Û\8cسÛ\8c در اÙ\88Ù\84Ù\88Û\8cت است
+ text: در زÙ\85اÙ\86 بÙ\87 Ù\88جÙ\88د Ø¢Ù\85دÙ\86 تداخÙ\84 بÛ\8cÙ\86 برگرداÙ\86 پارسÛ\8c Ù\88 %{english_original_link}Ø\8c Ù\86Ù\88شتÙ\87â\80\8cÛ\8c اÙ\86Ú¯Ù\84Û\8cسÛ\8c برترÛ\8c دارد
title: درباره این ترجمهها
native:
mapping_link: شروع به نقشهکشی
# Author: Crt
# Author: Daeron
# Author: Lliehu
+# Author: Nedergard
# Author: Nemo bis
# Author: Nike
# Author: Olli
old_relation: Vanha relaatio
old_relation_member: Vanha relaation jäsen
old_relation_tag: Vanha relaation tagi
- old_way: Vanha polku
- old_way_node: Vanha polun piste
- old_way_tag: Vanha tien tagi
+ old_way: Vanha viiva
+ old_way_node: Vanha viiva piste
+ old_way_tag: Vanha viivan tagi
relation: Relaatio
relation_member: Relaation jäsen
relation_tag: Relaation tagi
user: Käyttäjä
user_preference: Käyttäjän asetus
user_token: Käyttäjän tunnus
- way: Polku
- way_node: Polun piste
- way_tag: Polun tagi
+ way: Viiva
+ way_node: Viivan piste
+ way_tag: Viivan tagi
application:
require_cookies:
cookies_needed: Selaimen evästeet on otettu pois päältä - salli evästeiden käyttö selaimessasi ennen jatkamista.
one: "Sisältää seuraavan relaation:"
other: "Sisältää seuraavat %{count} relaatiota:"
has_ways:
- one: "Sisältää seuraavan polun:"
- other: "Sisältää seuraavat %{count} polkua:"
+ one: "Sisältää seuraavan viivan:"
+ other: "Sisältää seuraavat %{count} viivaa:"
no_bounding_box: Tässä muutoskokoelmassa ei ole rajattua aluetta.
show_area_box: Näytä rajattu alue
common_details:
area: Muokkaa aluetta
node: Muokkaa pistettä
relation: Muokkaa relaatiota
- way: Muokkaa tietä
+ way: Muokkaa polkua
larger:
area: Näytä alue suurella kartalla
node: Näytä piste suurella kartalla
next_changeset_tooltip: Seuraava muutoskokoelma
next_node_tooltip: Seuraava piste
next_relation_tooltip: Seuraava relaatio
- next_way_tooltip: Seuraava polku
+ next_way_tooltip: Seuraava viiva
prev_changeset_tooltip: Edellinen muutoskokoelma
prev_node_tooltip: Edellinen piste
prev_relation_tooltip: Edellinen relaatio
- prev_way_tooltip: Edellinen polku
+ prev_way_tooltip: Edellinen viiva
user:
name_changeset_tooltip: Näytä käyttäjän %{user} muutokset
next_changeset_tooltip: Käyttäjän %{user} seuraava muutos
show_areas: Näytä alueet
show_history: Näytä historia
unable_to_load_size: "Lataaminen epäonnistui: Alueen koko %{bbox_size} on liian suuri (täytyy olla pienempi kuin %{max_bbox_size})"
+ view_data: Näytä tiedot nykyisestä karttanäkymästä
wait: Odota...
zoom_or_select: Katso pienempää aluetta tai valitse kartalta alue, jonka tiedot haluat
tag_details:
list:
description: Tuoreet muutokset
description_bbox: Muutoskokoelmat alueelle %{bbox}
- description_friend: Ystäviesi muutoskokoelmat
+ description_friend: Kaverien muutoskokoelmat
description_nearby: Lähellä olevien käyttäjien muutoskokoelmat
description_user: Käyttäjän %{user} muutoskokoelmat
description_user_bbox: Käyttäjän %{user} muutoskokoelmat %{bbox} sisällä
heading_user_bbox: Muutoskokoelmat
title: Muutoskokoelmat
title_bbox: Muutoskokoelmat alueelle %{bbox}
- title_friend: Ystäviesi muutoskokoelmat
+ title_friend: Kaverien muutoskokoelmat
title_nearby: Lähellä olevien käyttäjien muutoskokoelmat
title_user: Käyttäjän %{user} muutoskokoelmat
title_user_bbox: Käyttäjän %{user} muutoskokoelmat %{bbox} sisällä
diary_entry:
comment_count:
one: 1 kommentti
- other: zerp=Ei kommentteja
+ other: "%{count} kommenttia"
+ zero: Ei kommentteja
comment_link: Kommentoi tätä kirjoitusta
confirm: Vahvista
edit_link: Muokkaa päiväkirjamerkintää
older_entries: Vanhempia...
recent_entries: Uusimmat päiväkirjamerkinnät
title: Käyttäjien päiväkirjamerkinnät
- title_friends: Ystäviesi päiväkirjat
+ title_friends: Kaverien päiväkirjat
title_nearby: Lähellä olevien käyttäjien päiväkirjat
user_title: Käyttäjän %{user} päiväkirja
location:
make_a_donation:
text: Lahjoita
title: Tue OpenStreetMapia rahallisella lahjoituksella.
- osm_offline: OpenStreetMapin tietokantaan ei toistaiseksi ole pääsyä välttämättömien ylläpitotöiden takia.
- osm_read_only: OpenStreetMapin tietokantaan ei toistaiseksi voi lähettää mitään välttämättömien ylläpitotöiden takia.
+ osm_offline: OpenStreetMapin tietokanta ei toistaiseksi ole käytettävissä välttämättömien ylläpitotöiden takia.
+ osm_read_only: OpenStreetMapin tietokantaa ei toistaiseksi voi muokata välttämättömien ylläpitotöiden takia.
partners_bytemark: Bytemark Hosting
partners_html: Palvelinta ylläpitää %{ucl}, %{ic} ja %{bytemark} sekä muut %{partners}.
partners_ic: Imperial College London
infringement_1_html: "OSM:n tekijöitä muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista\n(esimerkiksi Google Maps tai painetut kartat) ilman\ntekijänoikeuden haltijan nimenomaista lupaa on kielletty."
infringement_2_html: Jos kuka tahansa OpenStreetMapin käyttäjä epäilee, että karttatietoja on otettu luvattomasta lähteestä OSM:n karttatietoihin tai sivustolle, siitä tulee tehdä <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">poistopyyntö</a> tai <a href="http://dmca.openstreetmap.org/">ilmoittaa suoraan</a>.
infringement_title_html: Tekijänoikeusloukkaus
- intro_1_html: "OpenStreetMapin sisältö on <i>avointa tietoa</i>, joka on lisensoitu <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.fi/\">\nCreative Commonsin Nimeä-Tarttuva 2.0 Raakaversio</a> -lisenssilllä (CC BY-SA)."
+ intro_1_html: "OpenStreetMap on <i>avointa dataa</i>, joka on lisensoitu <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database Lisenssillä</a> (ODbL)."
intro_2_html: "Karttojamme ja tietojamme voi kopioida, levittää, välittää ja mukauttaa, \nkunhan OpenStreetMap ja sen tekijät mainitaan.\nJos muutat tai kehität karttojamme tai tietoja, voit\njakaa teosta vain saman lisenssin nojalla.\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">Legal codessa</a>\nkerrotaan oikeutesi ja velvollisuutesi."
more_1_html: Lue lisää datan käyttämisestä <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ:sta</a>.
more_2_html: "Vaikka OpenStreetMap on avointa dataa, emme voi tarjota\nmaksutonta karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nKatso <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">APIn käyttösäännöt</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">karttakuvien käyttösäännöt</a>\n<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">ja Nominatimin käyttösäännöt</a>."
title: Tietoja sivusta
message:
delete:
- deleted: Viesti poistettu
+ deleted: Viesti on poistettu.
inbox:
date: Päiväys
from: Lähettäjä
old_messages:
one: "%{count} vanha viesti"
other: "%{count} vanhaa viestiä"
- outbox: lähetetyt
+ outbox: Lähetetyt
people_mapping_nearby: Lähiseudun kartoittajat
subject: Otsikko
title: Saapuneet
mark:
- as_read: Viesti merkitty luetuksi
- as_unread: Viesti merkitty lukemattomaksi
+ as_read: Viesti on merkitty luetuksi.
+ as_unread: Viesti on merkitty lukemattomaksi.
message_summary:
delete_button: Poista
read_button: Merkitse luetuksi
back_to_inbox: Takaisin saapuneisiin
body: Sisältö
limit_exceeded: Olet lähettänyt runsaasti viestejä lyhyessä ajassa. Odota hetki ennen kuin yrität lähettää lisää.
- message_sent: Viesti lähetetty
+ message_sent: Viesti on lähetetty.
send_button: Lähetä
send_message_to: Lähetä viesti käyttäjälle %{name}
subject: Otsikko
hopefully_you_2: "%{server_url} osoitteeseen %{new_address}."
friend_notification:
befriend_them: Voit myös lisätä lähettäjän ystäväksi osoitteessa %{befriendurl}.
- had_added_you: Käyttäjä %{user} lisäsi sinut kaverikseen OpenStreetMap:ssa.
- see_their_profile: Näet hänen tietonsa sivulla %{userurl}.
- subject: "[OpenStreetMap] %{user} lisäsi sinut ystäväkseen"
+ had_added_you: Käyttäjä %{user} lisäsi sinut kaverikseen OpenStreetMapissa.
+ see_their_profile: Voit tutustua hänen profiiliinsa osoitteessa %{userurl}.
+ subject: "[OpenStreetMap] %{user} lisäsi sinut kaverikseen"
gpx_notification:
and_no_tags: ja jolla ei tageja.
and_the_tags: "ja seuraavat avainsanat:"
hopefully_you_1: Joku (ehkä sinä) pyysi nollaamaan salasanan
hopefully_you_2: openstreetmap.org-käyttäjätilin sähköpostiosoitteet.
message_notification:
- footer1: Voit lukea viestin myös osoitteessa %{readurl}
- footer2: ja voit vastata siihen osoitteessa %{replyurl}
- header: "%{from_user} on lähettänyt sinulle viestin OpenStreetMapin kautta, otsikko %{subject}:"
+ footer1: Viestin voi lukea myös osoitteessa %{readurl}
+ footer2: ja siihen voi vastata osoitteessa %{replyurl}.
+ header: "%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikkolla %{subject}:"
hi: Hei %{to_user}!
signup_confirm:
confirm: "Varmista, että tämän käyttäjätunnuksen on luonut sinä. Jos et ole luonut tätä käyttäjätiliä, poista se napsauttamalla tätä linkkiä:"
created: Joku (toivottavasti sinä) on luonut käyttäjätunnuksen osoitteessa %{site_url}.
greeting: Hei!
- subject: "[OpenStreetMap] Tervetuloa OpenStreetMap:iin"
+ subject: "[OpenStreetMap] Tervetuloa OpenStreetMap-sovellukseen"
welcome: Tervetuloa OpenStreetMap-karttapalveluun! Haluaisimme kertoa joitain hyödyllisiä asioita, jotta pääset alkuun.
signup_confirm_html:
ask_questions: OpenStreetMapista voi esittää kysymyksiä <a href="http://help.openstreetmap.org/">kysymyksiä ja vastauksia -sivulla</a>.
potlatch_unsaved_changes: Tallentamattomia muutoksia. Tallenna muutokset Potlatchissa poistamalla valinta nykyiseltä karttakohteelta tai napsauta Tallenna-painiketta, jos sellainen on käytössä.
user_page_link: käyttäjätiedot
index:
- js_1: Selaimesi ei tue JavaScriptiä tai sen suoritus on estetty.
+ js_1: Selain ei tue JavaScriptiä tai sen suorittaminen on estetty.
js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan.
license:
copyright: "Tekijänoikeus: OpenStreetMapin tekijät, avoimella lisenssillä"
openid_logo_alt: Kirjaudu sisään OpenID-tunnuksella
openid_providers:
aol:
- alt: Kirjaudu sisään AOL OpenID-tunnuksella
+ alt: Kirjaudu sisään AOL:n OpenID-tunnuksella
title: Kirjaudu sisään AOL-tunnuksella
google:
alt: Kirjaudu sisään Googlen OpenID-tunnuksella
title: Kirjaudu sisään Google-tunnuksella
myopenid:
- alt: Kirjaudu sisään myOpenID OpenID-tunnuksella
+ alt: Kirjaudu sisään myOpenID:n OpenID-tunnuksella
title: Kirjaudu sisään myOpenID-tunnuksella
openid:
alt: Kirjaudu sisään OpenID-tunnuksen URL-osoitteella
title: Kirjaudu sisään Yahoo-tunnuksella
password: "Salasana:"
register now: Rekisteröidy
- remember: "Muista minut:"
+ remember: Muista minut
title: Kirjautumissivu
to make changes: OpenStreetMapin karttatietojen muuttaminen vaatii käyttäjätunnuksen.
with openid: "Vaihtoehtoisesti kirjautuminen voidaan suorittaa OpenID-tunnuksella:"
not_a_role: Merkkijono '%{role}' ei ole kelvollinen rooli.
not_an_administrator: Vain ylläpitäjät voivat hallita käyttäjärooleja, etkä ole ylläpitäjä.
grant:
+ are_you_sure: Haluatko varmasti lisätä käyttäjän ”%{name}” ryhmään ”%{role}”?
confirm: Vahvista
fail: Roolin ”%{role}” myöntäminen käyttäjälle ”%{name}” epäonnistui. Tarkista että käyttäjä ja rooli ovat molemmat kelvollisia.
heading: Vahvista roolin myöntäminen
title: Vahvista roolin myöntäminen
revoke:
+ are_you_sure: Haluatko varmasti poistaa käyttäjän ”%{name}” ryhmästä ”%{role}”?
confirm: Vahvista
+ fail: Ryhmän ”%{role}” poistaminen käyttäjältä ”%{name}” epäonnistui. Tarkista että käyttäjä ja ryhmä ovat molemmat kelvollisia.
heading: Vahvista roolin poistaminen
title: Vahvista roolin poistaminen
# Export driver: syck-pecl
# Author: Alno
# Author: Boniface
+# Author: Cquoi
# Author: Crochet.david
# Author: Damouns
# Author: DavidL
old_node: Ancien nœud
old_node_tag: Balise de l'ancien nœud
old_relation: Ancienne relation
- old_relation_member: Ancien membre de la relation
+ old_relation_member: Membre de l'ancienne relation
old_relation_tag: Balise de l’ancienne relation
old_way: Ancien chemin
old_way_node: Nœud de l’ancien chemin
show_areas: Afficher les zones
show_history: Afficher l’historique
unable_to_load_size: "Impossible de charger les données : le cadre de délimitation d’une taille de %{bbox_size} est trop grand (il doit être inférieur à %{max_bbox_size})"
+ view_data: Afficher les données sur la vue actuelle de la carte
wait: Patientez...
zoom_or_select: Zoomer ou sélectionner une zone de la carte pour la visualiser
tag_details:
hide_link: Masquer ce commentaire
diary_entry:
comment_count:
- one: 1 commentaire
+ one: "%{count} commentaire"
other: "%{count} commentaires"
+ zero: Aucun commentaire
comment_link: Commenter cette entrée
confirm: Confirmer
edit_link: Modifier cette entrée
infringement_1_html: "Nous rappelons aux contributeurs d’OSM qu’ils ne doivent jamais ajouter de données provenant de\n sources protégées par le droit d’auteur (copyright) ou des droits voisins (par ex. Google Maps ou des cartes imprimées) sans\n autorisation explicite de la part des détenteurs des droits d’auteur."
infringement_2_html: Si vous pensez que des données ont été ajoutées à la base de données OpenStreetMap ou à ce site en violation des droits d'auteur, veuillez vous référer à notre <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procédure de retrait de données</a> ou notifiez nous directement à travers notre <a href="http://dmca.openstreetmap.org/">formulaire en ligne</a>.
infringement_title_html: Violation des droits d'auteur
- intro_1_html: "OpenStreetMap est un ensemble de <i>données ouvertes</i>, disponibles sous la licence <a\n href=\"http://opendatacommons.org/licenses/odbl/\">Open Data Commons Open Database License</a> (ODbL)."
+ intro_1_html: "OpenStreetMap est un ensemble de <i>données ouvertes</i>, disponibles sous la licence <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data Commons Open Database License</a> (ODbL)."
intro_2_html: " Vous êtes libre de copier, distribuer, transmettre et adapter nos données,\n à condition que vous créditiez OpenStreetMap et ses\n contributeurs. Si vous modifiez ou utilisez nos données dans d’autres œuvres dérivées, vous\n ne pouvez distribuer celles-ci que sous la même licence. Le\n <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">texte\n légal</a> complet détaille vos droits et responsabilités."
intro_3_html: "Les tuiles de notre carte, ainsi que notre documentation, sont\n disponibles sous la licence <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons paternité – partage à l’identique 2.0</a> (CC-BY-SA)."
more_1_html: "Si vous voulez obtenir plus d’informations sur comment réutiliser nos données et nous créditer, lisez la <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n légale</a>."
show_areas: Mostrar as zonas
show_history: Mostrar o historial
unable_to_load_size: "Non se puido cargar: O tamaño %{bbox_size} da caixa de envoltura é grande de máis (ten que ser menor de %{max_bbox_size})"
+ view_data: Ver os datos para a vista do mapa actual
wait: Agarde...
zoom_or_select: Escolla unha zona do mapa ou achéguese a ela para vela
tag_details:
hide_link: Agochar este comentario
diary_entry:
comment_count:
- one: 1 comentario
+ one: "%{count} comentario"
other: "%{count} comentarios"
+ zero: Sen comentarios
comment_link: Comentar esta entrada
confirm: Confirmar
edit_link: Editar esta entrada
infringement_1_html: "Lembramos aos colaboradores do OSM que nunca engadan datos de\nfontes con dereitos de autor (por exemplo, o Google Maps ou mapas impresos) sen\no permiso explícito dos posuidores deses dereitos."
infringement_2_html: "Se pensa que se engadiu material protexido de xeito inapropiado\ná base de datos do OpenStreetMap ou a este sitio, consulte\no noso <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">procedemento\npara retirar datos</a> ou deixe unha notificación no noso\n<a href=\"http://dmca.openstreetmap.org/\">formulario en liña</a>."
infringement_title_html: Violación dos dereitos de autoría
- intro_1_html: "O OpenStreetMap é de <i>datos abertos</i> e atópase baixo a licenza <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons recoñecemento compartir igual 2.0</a> (CC BY-SA)."
+ intro_1_html: "O OpenStreetMap é de <i>datos abertos</i> e atópase baixo a <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos datos,\nna medida en que acredite o OpenStreetMap e mais os seus\ncolaboradores. Se altera ou constrúe a partir dos nosos datos, terá\nque distribuír o resultado baixo a mesma licenza. O\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">texto\nlegal</a> ao completo explica os seus dereitos e responsabilidades."
intro_3_html: "Os datos cartográficos dos cuadrantes dos nosos mapas e a nosa documentación\natópanse baixo a licenza <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons recoñecemento compartir igual 2.0</a> (CC BY-SA)."
more_1_html: "Descubra máis sobre como empregar os nosos datos e como acreditarnos nas <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">preguntas máis frecuentes\nsobre asuntos legais</a>."
show_areas: להצגת אזורים
show_history: הצגת ההיסטוריה
unable_to_load_size: "לא ניתן לטעון: תיבה תוחמת בגודל %{bbox_size} היא גדולה מדי (מוכרחה להיות קטנה מאשר %{max_bbox_size})"
+ view_data: הצגת נתונים לתצוגת המפה הנוכחית
wait: נא להמתין...
zoom_or_select: התקרבות או בחירה אזור במפה לצפייה
tag_details:
comment_count:
one: תגובה אחת
other: "%{count} תגובות"
+ zero: אין תגובות
comment_link: הערות לרשומה הזאת
confirm: לאישור
edit_link: עריכת רשומה
one: תיבת הדואר הנכנס שלכם מכילה הודעה אחת שלא נקראה
other: תיבת הדואר הנכנס שלכם מכילה %{count} הודעות שלא נקראו
zero: תיבת הדואר הנכנס שלכם אינה מכילה הודעות שלא נקראו
- intro_1: OpenStreetMap ×\94×\99×\90 ×\9eפ×\94 ×\97×\95פש×\99ת ש×\9c ×\9b×\9c ×\94×¢×\95×\9c×\9d, ש×\9b×\9c ×\90×\97×\93 ×\99×\9b×\95×\9c ×\9cער×\95×\9a. ×\99×\95צר×\99×\9d ×\90×\95ת×\94 אנשים כמוך.
+ intro_1: OpenStreetMap ×\94×\99×\90 ×\9eפ×\94 ×\97×\95פש×\99ת ש×\9c ×\9b×\9c ×\94×¢×\95×\9c×\9d, ש×\99×\95צר×\99×\9d אנשים כמוך.
intro_2_create_account: נא ליצור חשבון משתמש
intro_2_download: להוריד
intro_2_html: יש לך חופש %{download} את הנתונים ו%{use} בהם בהתאם ל%{license} שהם מתפרסמים לפיו. %{create_account} כדי לשפר את המפה.
infringement_1_html: "אנו מזכירים לתורמים ל־OSM לעולם לא להוסיף נתונים משום מקור\nשמוגבל בזכויות יוצרים (למשל מפות גוגל או מפות מודפסות) ללא\nאישור מפורש מבעלי הזכויות."
infringement_2_html: "אם נראה לך שחומר שמוגבל בזכויות יוצרים נוסף באופן לא הולם\nאל מסד הנתונים של OpenStreetMap או אל האתר הזה, נא לפנות\nאל <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">נוהל\nההסרה</a> שלנו או כתבו תלונה ישירות\n<a href=\"http://dmca.openstreetmap.org/\">בדף התלונות המקוון שלנו</a>."
infringement_title_html: הפרת זכויות יוצרים
- intro_1_html: "אתר OpenStreetMap הוא <i>נותנים פתוחים</i>, המופצים לפי רישיון <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">קריאייטיב\nקומונז ייחוס–שיתוף־זהה 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap הוא <i>מיזם נתונים פתוחים</i>, לפי רישיון <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a>‏ (ODbL)."
intro_2_html: "אתם חופשיים להעתיק, להפיץ, לשדר ולהתאים את הנתונים שלנו,\nכל עוד אתם נותנים ייחוס ל־OpenStreetMap\nולתורמים למיזם. אם אתם משנים את הנתונים או את המפות שלנו או מסתמכים עליהם כדי ליצור משהו חדש,\nמותר לכם להפיץ את התוצאות רק לפי תנאי אותו הרישיון.\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">המסמך\nהמשפטי</a> המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם."
intro_3_html: "המיפוי באריחי המפה שלנו, והתיעוד שלנו מוגשים בכפוף\nלרישיון <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">קריאייטיב\nקומונז ייחוס–שיתוף־זהה 2.0</a> license (בקיצור CC-BY-SA)."
more_1_html: "קִראו עוד על שימוש בנתונים שלנו ועל דרכים לייחס אלינו יצירות נגזרות ב<a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">דף שו״ת\nמשפטי</a>."
credit_1_html: "Ako koristite slike OpenstreetMap karte, zahtjevamo da\n se navede najmanje “© OpenStreetMap\n contributors, CC BY-SA”. Ako koristite samo podatke,\n zahtjevamo “Map data © OpenStreetMap contributors,\n CC BY-SA”."
credit_2_html: "Gdje je moguće, OpenStreetMap treba biti kao hyperlink na <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n and CC BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Ako\n koristite medij gdje linkovi nisu mogući (npr. tiskane\n karte), predlažemo da uputite vaše čitatelje na\n www.openstreetmap.org (proširenjem na\n ‘OpenStreetMap’ za ovo punu adresu) i na\n www.creativecommons.org."
credit_title_html: Kako navoditi OpenStreetMap kao izvor
- intro_1_html: " OpenStreetMap su <i>otvoreni podaci</i>, licencirani pod <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> dozvolom (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati naše podatke, sve dok navodite OpenStreetMap i njegove doprinositelje kao izvor. Ako izmijenite ili nadogradite naše podatke, možete distribuirati rezultate samo pod istom licencom. Puni <a href="http://opendatacommons.org/licenses/odbl/1.0/">pravni tekst</a> objašnjava vaša prava i odgovornosti.
more_1_html: "Čitajte više o korištenju naših podataka na <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>."
more_2_html: "OSM korisnici - doprinostielji se podsjećaju da nikada ne dodaju podakte iz bilo kojeg\n izvora zaštićenog autorskim pravima (npr. Google Maps ili tiskane karte) bez izričite dozvole\n vlasnika autorskih prava."
show_areas: Kónčiny pokazać
show_history: Historiju pokazać
unable_to_load_size: "Njeje móžno začitać: Wulkosć %{bbox_size} wobłuka je přewulka ((dyrbi mjenje hač %{max_bbox_size} być)"
+ view_data: Daty za aktualny kartowy napohlad pokazać
wait: Čakać...
zoom_or_select: Wobłuk karty powjetšić abo wubrać
tag_details:
diary_entry:
comment_count:
few: "%{count} komentary"
- one: 1 komentar
+ one: Jedyn komentar
other: "%{count} komentarow"
two: "%{count} komentaraj"
+ zero: Žane komentary
comment_link: Komentar k tutomu zapiskej
confirm: Wobkrućić
edit_link: Tutón zapisk wobdźěłać
credit_2_html: Hdźež je móžno, OpenStreetMap měł wotkaz do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> a CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a> měć. Jeli medij wužiwaš, hdźež wotkazy móžno njejsu (na př. wućišćane dźěło), namjetujemy, zo pokazuješ swojich čitarjow na www.openstreetmap.org a na www.creativecommons.org.
credit_3_html: "Za přepytujomnu elektronisku kartu měło so dźakprajenje w róžku karty jewić. Na přikład:"
credit_title_html: Kak awtorstwo OpenStreetMap naspomnić
+ infringement_1_html: Sobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow, kotrež su přez awtorske prawo škitane (na př. z Google Maps abo z wućišćanych kartow) bjez wurazneje dowolnosće awtorow njepřidawaja.
+ infringement_2_html: Jeli měniš, zo awtorskoprawnisće škitany material je so datowej bance OpenStreetMap abo tutomu sydłu bjez dowolnosće přidał, poćahuj so prošu na naše <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postupowanje za wotstronjenje wobsaha</a>abo zdźěl to direktnje na našej <a href="http://dmca.openstreetmap.org/">formularnej stronje</a>
infringement_title_html: Přeńdźenje awtorskeho prawa
- intro_1_html: OpenStreetMap wobsteji ze <i>zjawnych datow</i>, licencowanych pod licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
+ intro_1_html: "OpenStreetMap su <i>zjawne daty</i>, licencowane pod licencu <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database</a> (ODbL)."
intro_2_html: Móžeš naše daty kopěrować, rozdźělić, přenjesć a přiměrić, tak dołho kaž OpenStreetMap a jich sobuskutkowacych naspominaš. Jeli změniš naše daty abo zepěraš so na nje, móžeš wuslědk jenož pod samsnej licencu rozdźělić. Dospołny <a href="http://opendatacommons.org/licenses/odbl/1.0/">prawniski kod</a> wujasnja twoje prawa a zamołwitosće.
intro_3_html: Kartografija w našich kartowych kachličkach a naša dokumentacija stej pod licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA) licencowanej.
more_1_html: Čitaj wjace wo wužiwanju našich datow a kak hodźi so nas připóznać, pod <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Huste prawniske prašenja</a>.
- more_2_html: Sobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow, kotrež su přez awtorske prawo škitane (na př. z Google Maps abo z wućišćanych kartow) bjez wurazneje dowolnosće awtorow njepřidawaja.
+ more_2_html: "Hačrunjež OpenStreetMap wobsteji ze zjawnych datow, njemóžemy darmotny kartowy API za wuwiwarjow třećich poskićić. \nHlej naše <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">prawidła za wužiwanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Prawidła za wužiwanje polow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Prawidła za wužiwanje Nominatim</a>."
more_title_html: Dalše informacije
title_html: Awtorske prawo a licenca
native:
header: "%{from_user} je ći přez OpenStreetMap powěsć z temowym nadpismom %{subject} pósłał:"
hi: Witaj %{to_user},
signup_confirm:
+ confirm: "Prjedy hač něšto činimy, dyrbimy wobkrućić, zo tute naprašowanje wote tebje přińdźe, jeli tomu tak je, klikń prošu na slědowacy wotkaz, zo by swoje konto wobkrućił:"
created: Něchtó (nadźijamy so ty) je runje konto na %{site_url} załožił.
greeting: Witaj!
subject: "[OpenStreetMap] Witaj do OpenStreetMap"
text: Abban az esetben, ha ez a lefordított oldal és %{english_original_link} eltér egymástól, akkor az angol nyelvű oldal élvez elsőbbséget
title: Erről a fordításról
legal_babble:
+ attribution_example:
+ alt: Példa arra, hogyan jelenjen meg az OpenStreetMap-re való hivatkozás egy weboldalon
+ title: Példa egy hivatkozásra
contributors_at_html: "<strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:\n <a href=\"http://data.wien.gv.at/\">Bécs városa</a>\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a> licenc alatt."
contributors_ca_html: "<strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada)."
contributors_footer_2_html: " Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti\n adatszolgáltató támogatja az OpenStreetMapot, nyújt garanciát vagy\n vállal rá felelősséget."
contributors_title_html: Közreműködőink
credit_1_html: " Ha az OpenStreetMap térkép képeit használod, kérjük \n legyen feltüntetve legalább az “© OpenStreetMap\n közreműködői, CC BY-SA” szöveg. Ha csak a térkép adatait használod,\n akkor a “Térképadatok © OpenStreetMap közreműködői,\n CC BY-SA” feltüntetését kérjük."
credit_2_html: "Ahol lehetséges, ott az OpenStreetMapnak hiperhivatkoznia kell a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>,\n a CC BY-SA-nak pedig a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> webhelyre. Ha\n olyan médiumot használsz, ahol a hivatkozás nem lehetséges (pl. egy\n nyomtatott munka), javasoljuk, hogy irányítsd az olvasóidat a\n www.openstreetmap.org (esetleg az\n ‘OpenStreetMap’ szöveg kibővítésével erre a teljes címre) és a\n www.creativecommons.org webhelyre."
+ credit_3_html: "Böngészhető elektronikus térkép esetén a forrásra vonatkozó hivatkozás jelenjen meg a térkép sarkában.\nPéldául:"
credit_title_html: Hogyan kell feltüntetned az OpenStreetMapot?
infringement_1_html: " Az OSM közreműködői emlékeztetve lettek arra, hogy soha ne adjanak hozzá adatokat egyetlen\n szerzői jogvédett forrásból se (pl. Google Térkép vagy nyomtatott térképek) a\n szerzői jog tulajdonosának kifejezett engedélye nélkül."
infringement_title_html: Copyright megsértése
credit_2_html: Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="http://www.openstreetmap.org/copyright">iste pagina de copyright</a>. Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote nominar e ligar directemente al licentia(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a www.openstreetmap.org (forsan per inserer iste adresse complete in loco del parola ‘OpenStreetMap’), a www.opendatacommosn.org, e (si relevante) a www.creativecommons.org.
credit_3_html: "Pro un carta electronic navigabile, le recognoscentia debe apparer in le angulo del carta. Per exemplo:"
credit_title_html: Como dar recognoscentia a OpenStreetMap
- intro_1_html: " OpenStreetMap es <i>datos aperte</i>, disponibile sub le licentia\n <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: " Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n contributores. Si vos altera o extende nostre cartas e datos, vos\n pote distribuer le resultato solmente sub le mesme licentia. Le\n complete <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">codice\n legal</a> explica vostre derectos e responsabilitates."
intro_3_html: "Le cartographia in nostre tegulas de carta, e nostre documentation, son\npublicate sub licentia <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
more_1_html: " Lege plus super le uso de nostre datos al <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n Legal</a>."
show_areas: Tampilkan wilayah
show_history: Tunjukkan Riwayat
unable_to_load_size: "Tidak dapat memuat: Ukuran bounding box %{bbox_size} terlalu besar (harus lebih kecil dari %{max_bbox_size})"
+ view_data: Lihat data untuk tampilan peta saat ini
wait: Tunggu...
zoom_or_select: Perbesar atau pilih sebuah wilayah dari peta untuk melihatnya
tag_details:
hide_link: Sembunyikan komentar ini
diary_entry:
comment_count:
- one: 1 comment
- other: "%{count} comments"
+ one: "%{count} komentar"
+ other: "%{count} komentar"
+ zero: Tidak ada komentar
comment_link: Komentar pada entri ini
confirm: Konfirmasi
edit_link: Edit entri ini
emergency_access_point: Titik Akses Darurat
footway: Jalan setapak
living_street: Jalan Permukiman
+ minor: Jalan Kecil
motorway: Jalan Tol
+ motorway_junction: Persimpangan Jalan Motor
+ motorway_link: Jalan Motor
path: Jalan Setapak
pedestrian: Jalur Pejalan Kaki
primary: Jalam Primer
nature_reserve: Cagar Alam
orchard: Kebun buah-buahan
park: Taman
+ piste: Piste
quarry: Tempat Penggalian
railway: Rel Kereta
recreation_ground: Taman Rekreasi
crater: Kawah
dune: Bukit Pasir
feature: Fitur
+ fjord: Fyord
forest: Hutan
geyser: Mata air panas
glacier: Gletser
historic_station: Stasiun Kereta Bersejarah
junction: Persimpangan Rel
level_crossing: Perlintasan Bertingkat
+ monorail: Monorel
+ narrow_gauge: Sepur Sempit
+ platform: Peron Kereta
+ preserved: Jalur Kereta Terlindungi
+ spur: Sepur Kereta
+ station: Stasiun Kereta Api
+ subway: Stasiun Kereta Bawah Tanah
+ subway_entrance: Pintu Masuk Kereta Bawah Tanah
+ tram: Jalur Trem
+ tram_stop: Perhentian Trem
+ yard: Emplasemen
shop:
antiques: Toko Benda Antik
art: Toko Kerajinan Tangan
clothes: Toko Baju
computer: Toko Komputer
confectionery: Toko Konfeksi
+ convenience: Toko Serba Ada
copyshop: Fotocopy
cosmetics: Toko Kosmetik
department_store: Department Store
fish: Toko Ikan
florist: Toko Bunga
food: Toko Makanan
+ funeral_directors: Penyelenggara Pemakaman
furniture: Toko Meubel
gallery: Galeri
garden_centre: Pusat Kebun
supermarket: Supermarket
toys: Toko Mainan
travel_agency: Agen Perjalanan
+ video: Toko Video
tourism:
artwork: Karya Seni
attraction: Atraksi
motel: Motel
museum: Museum
picnic_site: Tempat Piknik
+ theme_park: Taman Hiburan
valley: Lembah
+ viewpoint: Sudut Pandang
zoo: Kebun Binatang
tunnel:
"yes": Terowongan
waterway:
+ artificial: Jalur Air Buatan
canal: Kanal
+ connector: Penghubung Jalur Air
+ dam: Bendungan
+ ditch: Parit
+ dock: Dermaga
+ lock: Pintu Air
+ lock_gate: Gerbang Pintu Air
+ mineral_spring: Mata Air Mineral
+ rapids: Jeram
river: Sungai
riverbank: Bantaran Sungai
+ stream: Arus
+ wadi: Wadi
+ water_point: Titik Air
waterfall: Air Terjun
+ weir: Weir
layouts:
community: Komunitas
community_blogs: Blog Komunitas
attribution_example:
alt: Contoh tentang bagaimana mengatribusi OpenStreetMap pada halaman web
title: Contoh atribusi
+ contributors_at_html: "<strong>Austria</strong>: Berisi data dari\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (lisensi\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> dan\nLand Tirol (lisensi <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT dengan perubahan</a>)."
+ contributors_ca_html: "<strong>Kanada</strong>: Berisi data dari\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), dan StatCan (Geography Division,\nStatistics Canada)."
+ contributors_fr_html: "<strong>Perancis</strong>: Berisi data yang bersumber dari\nDirection Générale des Impôts."
+ contributors_gb_html: "<strong>Britania Raya</strong>: Berisi data Ordnance\nSurvey © Hak cipta dan basis data milik Kerajaan\n2010-12."
+ contributors_nl_html: "<strong>Belanda</strong>: Berisi © data AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
+ contributors_nz_html: "<strong>Selandia Baru</strong>: Berisi data yang bersumber dari\nLand Information New Zealand. Hak cipta milik Kerajaan."
contributors_title_html: Kontributor kami
+ contributors_za_html: "<strong>Afrika Selatan</strong>: Berisi data yang bersumber dari\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, hak cipta milik negara."
credit_1_html: Kita memerlukan bahwa Anda menggunakan kredit "© Kontributor OpenStreetMap ".
credit_3_html: "Untuk peta elektronik dapat ditelusuri, kredit harus muncul di sudut peta.\nSebagai contoh:"
credit_title_html: Cara menampilkan kredit OpenStreetMap
+ infringement_title_html: Pelanggaran hak cipta
intro_1_html: Data OpenStreetMap memiliki lisensi <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
intro_2_html: "Anda dibebaskan untuk menyalin, mendistribusikan, mentransfer dan mengadaptasi data kami,\nselama Anda menyertakan OpenStreetMap dan kontributornya. Jika anda merubah atau membangun\ndata kami, Anda harus mendistribusikan hasilnya dalam lisensi yang sama.\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">kode legal\ncode</a> akan menjelaskan hak dan kewajiban Anda"
intro_3_html: "Kartografi dalam tampilan peta dan dokumentasi kami\n berlisensi di bawah <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> lisensi (CC-BY-SA)."
email_confirm_plain:
click_the_link: Jika ini adalah Anda, silahkan klik link di bawah ini untuk mengkonfirmasi perubahan.
greeting: Halo,
+ hopefully_you_2: "%{server_url} ke %{new_address}."
friend_notification:
befriend_them: Anda juga dapat menambahkannua sebagai teman di %{befriendurl}.
had_added_you: "%{user} telah menambahkan Anda sebagai teman pada OpenStreetMap."
see_their_profile: Anda dapat melihat profilnya pada %{userurl}.
subject: "[OpenStreetMap] %{user} menambahkan Anda sebagai teman"
gpx_notification:
+ and_no_tags: dan tanpa tag.
+ and_the_tags: "dan tag berikut:"
failure:
failed_to_import: "gagal melakukan impor. Berikut ini adalah kesalahannya:"
subject: "[OpenStreetMap] gagal impor GPX"
greeting: Halo,
+ with_description: dengan deskripsi
your_gpx_file: Kelihatannya ini file GPX Anda
+ lost_password:
+ subject: "[OpenStreetMap] Permintaan atur ulang sandi"
lost_password_html:
click_the_link: Jika ini Anda, silahkan klik link di bawah ini untuk menyetel ulang kata sandi.
greeting: Halo,
footer1: Anda juga dapat membaca pesan pada %{readurl}
footer2: dan Anda juga dapat membalas pada %{replyurl}
hi: Halo %{to_user},
+ signup_confirm:
+ greeting: Halo!
+ subject: "[OpenStreetMap] Selamat datang di OpenStreetMap"
signup_confirm_html:
ask_questions: Anda dapat mengajukan pertanyaan yang Anda miliki tentang OpenStreetMap pada <a href="http://help.openstreetmap.org/">situs pertanyaan dan jawaban</a>.
get_reading: Mulai membaca tentang OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">pada wiki</a>, lihat berita terbaru melalui <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> atau <a href="http://twitter.com/openstreetmap">Twitter</a>, atau cari tahu tentang pendiri OpenStreetMap Steve Coast melalui <a href="http://www.opengeodata.org/">OpenGeoData blog</a> untuk sejarah proyek ini, yang memiliki <a href="http://www.opengeodata.org/?cat=13">podcasts yang dapat didengarkan</a> pula!
signup_confirm_plain:
introductory_video: "Anda dapat menonton video pengantar OpenStreetMap di sini:"
more_videos: "Ada lebih banyak video di sini:"
+ opengeodata: "OpenGeoData.org adalah blog pendiri OpenStreetMap Steve Coast. Blog ini juga punya podcast:"
the_wiki: "Baca mengenai OpenStreetMap di wiki:"
wiki_signup: "Anda juga dapat mendaftar wiki OpenStreetMap di:"
oauth:
text: "Stangist þessi þýðing á við %{english_original_link} gildir\nhin síðari fram yfir íslenskuna."
title: Um þessa þýðingu
legal_babble:
- intro_1_html: "OpenStreetMap er <i>frjáls kortagrunnur</i> undir <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> leyfi. (CC BY-SA)."
+ intro_1_html: "OpenStreetMap er <i>frjáls kortagrunnur</i> undir <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database</a> leyfi. (ODbL)."
intro_2_html: " Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninnn\n og gögn hans, gegn því að þú viðurkennir rétt OpenStreetMap\n og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum\n eða gögnum hans, þá verður þú að gefa niðurstöðuna út með\n sama leyfi. <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Leyfistextinn</a>\n útskýrir réttindi þín og skyldur."
title_html: Höfundaréttur og leyfi
native:
show_areas: Mostra le aree
show_history: Visualizza storico
unable_to_load_size: "Impossibile caricare: la dimensione del riquadro di selezione di %{bbox_size} è troppo grande (deve essere minore di %{max_bbox_size})"
+ view_data: Mostra i dati per la visualizzazione attuale della mappa
wait: Attendere...
zoom_or_select: Ingrandire oppure selezionare l'area della mappa che si desidera visualizzare
tag_details:
hide_link: Nascondi questo commento
diary_entry:
comment_count:
- one: 1 commento
+ one: "%{count} commento"
other: "%{count} commenti"
+ zero: Nessun commento
comment_link: Commento su questa voce
confirm: Conferma
edit_link: Modifica questa voce
# Author: Tombi-aburage
# Author: Wrightbus
# Author: 青子守歌
+# Author: 아라
ja:
activerecord:
attributes:
way: ウェイ
way_title: "ウェイ: %{way_name}"
way_details:
+ also_part_of:
+ other: ウェイ %{related_ways} の一部でもあります
nodes: "ノード:"
part_of: "以下の一部:"
way_history:
home_tooltip: ホームに戻る
inbox_html: 受信箱 %{count}
inbox_tooltip:
- one: 受信箱に 1 通の未読メッセージがあります
- other: 受信箱に %{count} 通の未読メッセージがあります
+ one: 受信箱に 1 件の未読メッセージがあります
+ other: 受信箱に %{count} 件の未読メッセージがあります
zero: 受信箱に未読メッセージはありません
intro_1: OpenStreetMap は自由に編集できる世界地図です。あなたのような人々が作りました。
intro_2_create_account: ユーザー アカウントを作成
messages: "%{new_messages}、%{old_messages}があります"
my_inbox: 自分の受信箱
new_messages:
- one: "%{count} 件の新着メッセージ"
other: "%{count} 件の新着メッセージ"
no_messages_yet: まだメッセージがありません。%{people_mapping_nearby_link}とお近づきになってはいかがですか?
old_messages:
- one: "%{count} 件の古いメッセージ"
other: "%{count} 件の古いメッセージ"
outbox: 送信箱
people_mapping_nearby: 近所でマッピングしている人々
date: 日付
inbox: 受信箱
messages:
- one: "%{count} 件の送信済みメッセージがあります"
other: "%{count} 件の送信済みメッセージがあります"
my_inbox: 自分の%{inbox_link}
no_sent_messages: 送信したメッセージはまだありません。%{people_mapping_nearby_link}とお近づきになってはいかがですか?
and_the_tags: "と以下のタグ:"
failure:
failed_to_import: "インポートするのに失敗しました。エラーはここです。:"
- more_info_1: GPX ã\82¤ã\83³ã\83\9dã\83¼ã\83\88ã\81®å¤±æ\95\97ã\81¨ã\81©ã\81\86ã\82\84ã\81£ã\81\9fã\82\89é\81¿ã\81\91ã\82\89ã\82\8cã\82\8bã\81\8bã\81«ã\81¤ã\81\84ã\81¦ã\81®è©³ã\81\97ã\81\84ã\81\93ã\81¨ã\81¯ã\80\81
- more_info_2: "ã\81\9dã\82\8cã\82\89ã\81¯ã\81\93ã\81\93にあります:"
+ more_info_1: GPX ã\82¤ã\83³ã\83\9dã\83¼ã\83\88ã\81®å¤±æ\95\97ã\82\92é\81¿ã\81\91ã\82\8bæ\96¹æ³\95ã\81«ã\81¤ã\81\84ã\81¦ã\81®è©³ç´°æ\83\85å ±ã\81¯
+ more_info_2: "ã\81\93ã\81¡ã\82\89にあります:"
subject: "[OpenStreetMap] GPX のインポートが失敗"
greeting: こんにちは、
success:
back: すべてのブロックを閲覧
heading: "%{name} のブロックの編集"
period: ユーザーが今からどれくらいの間、APIからブロックされるか。
- reason: "%{name} ã\81\95ã\82\93ã\81\8cã\83\96ã\83ã\83\83ã\82¯ã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bç\90\86ç\94±ã\81§ã\81\99ã\80\82ã\83¡ã\83\83ã\82»ã\83¼ã\82¸ã\81¯å¤\9aã\81\8fã\81®äººã\81®ç\9b®ã\81«ã\81µã\82\8cã\82\8bã\81\93ã\81¨ã\81«ã\81ªã\82\8aã\81¾ã\81\99ã\81\8bã\82\89ã\80\81ã\81§ã\81\8dã\82\8bã\81 ã\81\91å\86·é\9d\99ã\81\8bã\81¤å\90\88ç\90\86ç\9a\84ã\81«ã\81ªã\82\8aã\80\81ã\81§ã\81\8dã\82\8bã\81 ã\81\91ä¸\81寧ã\81«ç\8a¶æ³\81ã\82\92説æ\98\8eã\81\99ã\82\8bã\82\88ã\81\86ã\81«ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82ã\81\99ã\81¹ã\81¦ã\81®ã\83¦ã\83¼ã\82¶ã\83¼ã\81\8cã\82³ã\83\9fã\83¥ã\83\8bã\83\86ã\82£å\86\85ã\81§ã\81®é\9a èª\9eã\82\92ç\90\86解ã\81\97ã\81¦ã\81\84ã\82\8bã\82\8fã\81\91ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\81®ã\81§、分かりやすい用語を使うように努めてください。"
+ reason: "%{name} ã\81\95ã\82\93ã\81\8cã\83\96ã\83ã\83\83ã\82¯ã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bç\90\86ç\94±ã\81§ã\81\99ã\80\82ã\81§ã\81\8dã\82\8bã\81 ã\81\91å\86·é\9d\99ã\81\8bã\81¤ç\90\86æ\80§ç\9a\84ã\81«ã\81ªã\82\8aã\80\81ã\81§ã\81\8dã\82\8bã\81 ã\81\91ä¸\81寧ã\81«ç\8a¶æ³\81ã\82\92説æ\98\8eã\81\99ã\82\8bã\82\88ã\81\86ã\81«ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82ã\81\99ã\81¹ã\81¦ã\81®ã\83¦ã\83¼ã\82¶ã\83¼ã\81\8cã\82³ã\83\9fã\83¥ã\83\8bã\83\86ã\82£å\86\85ã\81§ã\81®é\9a èª\9eã\82\92ç\90\86解ã\81\97ã\81¦ã\81\84ã\82\8bã\82\8fã\81\91ã\81§ã\81¯ã\81ªã\81\84ã\81\9fã\82\81、分かりやすい用語を使うように努めてください。"
show: このブロックを閲覧
submit: ブロックを更新
title: "%{name} のブロックの編集"
heading: "%{name} のブロックの作成"
needs_view: ブロックを解除するにはログインし直す必要があります。
period: ユーザーが今からどれくらいの間、APIからブロックされるか。
- reason: "%{name} ã\81\95ã\82\93ã\81\8cã\83\96ã\83ã\83\83ã\82¯ã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bç\90\86ç\94±ã\81§ã\81\99ã\80\82ã\83¡ã\83\83ã\82»ã\83¼ã\82¸ã\81¯å¤\9aã\81\8fã\81®äººã\81®ç\9b®ã\81«ã\81µã\82\8cã\82\8bã\81\93ã\81¨ã\81«ã\81ªã\82\8aã\81¾ã\81\99ã\81\8bã\82\89ã\80\81ã\81§ã\81\8dã\82\8bã\81 ã\81\91å\86·é\9d\99ã\81\8bã\81¤å\90\88ç\90\86ç\9a\84ã\81«ã\81ªã\82\8aã\80\81ã\81§ã\81\8dã\82\8bã\81 ã\81\91ä¸\81寧ã\81«ç\8a¶æ³\81ã\82\92説æ\98\8eã\81\99ã\82\8bã\82\88ã\81\86ã\81«ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82ã\81\99ã\81¹ã\81¦ã\81®ã\83¦ã\83¼ã\82¶ã\83¼ã\81\8cã\82³ã\83\9fã\83¥ã\83\8bã\83\86ã\82£å\86\85ã\81§ã\81®é\9a èª\9eã\82\92ç\90\86解ã\81\97ã\81¦ã\81\84ã\82\8bã\82\8fã\81\91ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\81®ã\81§、分かりやすい用語を使うように努めてください。"
+ reason: "%{name} ã\81\95ã\82\93ã\81\8cã\83\96ã\83ã\83\83ã\82¯ã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bç\90\86ç\94±ã\81§ã\81\99ã\80\82ã\83¡ã\83\83ã\82»ã\83¼ã\82¸ã\81¯å¤\9aã\81\8fã\81®äººã\81®ç\9b®ã\81«ã\81µã\82\8cã\82\8bã\81\93ã\81¨ã\81«ã\81ªã\82\8bã\81\9fã\82\81ã\80\81ã\81§ã\81\8dã\82\8bã\81 ã\81\91å\86·é\9d\99ã\81\8bã\81¤ç\90\86æ\80§ç\9a\84ã\81«ã\81ªã\82\8aã\80\81ã\81§ã\81\8dã\82\8bã\81 ã\81\91ä¸\81寧ã\81«ç\8a¶æ³\81ã\82\92説æ\98\8eã\81\99ã\82\8bã\82\88ã\81\86ã\81«ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82ã\81\99ã\81¹ã\81¦ã\81®ã\83¦ã\83¼ã\82¶ã\83¼ã\81\8cã\82³ã\83\9fã\83¥ã\83\8bã\83\86ã\82£å\86\85ã\81§ã\81®é\9a èª\9eã\82\92ç\90\86解ã\81\97ã\81¦ã\81\84ã\82\8bã\82\8fã\81\91ã\81§ã\81¯ã\81ªã\81\84ã\81\9fã\82\81、分かりやすい用語を使うように努めてください。"
submit: ブロックを作成
title: "%{name} のブロックの作成"
tried_contacting: ユーザーに連絡して、それらをやめるよう依頼しました。
hide_link: ამ კომენტარის დამალვა
diary_entry:
comment_count:
- one: 1 კომენტარი
+ one: "%{count} კომენტარი"
other: "%{count} კომენტარი"
+ zero: არ არის კომენტარი
comment_link: კომენტარი
confirm: დადასტურება
edit_link: ჩანაწერის რედაქტირება
message_notification:
hi: გამარჯობა %{to_user},
signup_confirm:
- subject: "[OpenStreetMap] á\83\93á\83\90á\83\90á\83\93á\83\90á\83¡á\83¢á\83£á\83 á\83\94á\83\97 á\83\94á\83\9a.á\83¤á\83\9dá\83¡á\83¢á\83\98á\83¡ á\83\9bá\83\98á\83¡á\83\90á\83\9bá\83\90á\83 á\83\97ი"
+ subject: "[OpenStreetMap] á\83\9bá\83\9dá\83\92á\83\94á\83¡á\83\90á\83\9aá\83\9bá\83\94á\83\91á\83\98á\83\97 OpenStreetMap-á\83¨ი"
signup_confirm_html:
more_videos: აქ არის %{more_videos_link}.
more_videos_here: მეტი ვიდეო აქ
edit:
description: აღწერა
show:
+ confirm: დარწმუნებული ხართ?
description: "აღწერა:"
user: "შემქმნელი:"
site:
creator_name: შემქმნელი
display_name: დაბლოკილი მომხმარებელი
edit: რედაქტირება
+ next: შემდეგი »
not_revoked: (არ არის განბლოკილი)
+ previous: « წინა
reason: დაბლოკვის მიზეზი
revoke: განბლოკვა!
revoker_name: განბლოკილია
# Author: B891202
# Author: Freebiekr
# Author: Kwj2772
+# Author: Stleamist
# Author: Wrightbus
# Author: 아라
ko:
way: 길
way_node: 길노드
way_tag: 길태그
+ application:
+ require_cookies:
+ cookies_needed: 쿠키를 비활성화한 것으로 보입니다 - 계속하기 전에 브라우저에서 쿠키를 활성화하세요.
+ require_moderator:
+ not_a_moderator: 해당 동작을 수행하려면 운영자 권한이 필요합니다.
+ setup_user_auth:
+ blocked: API에 대한 접근을 차단했습니다. 자세한 내용을 알아보려면 웹 인터페이스에 로그인하세요.
+ need_to_see_terms: API에 대한 접근을 일시적으로 중지했습니다. 기여자 약관을 보려면 웹 인터페이스에 로그인하세요. 기여자 약관에 동의 할 필요는 없습니다만 기여자 약관을 보아야 합니다.
browse:
changeset:
changeset: "바뀜집합: %{id}"
title: 바뀜집합
changeset_details:
belongs_to: "소유자:"
- bounding_box: "í\85\8cë\91\90리 ì§\80ì \95 ì\82¬ê°\81í\98\95:"
+ bounding_box: "í\85\8cë\91\90리 ì\83\81ì\9e\90:"
box: 사각형
closed_at: "종료된 때:"
- created_at: "생성된 때:"
+ created_at: "만든 때:"
has_nodes: "다음 노드 %{count}개 있음:"
has_relations: "다음 관계 %{count}개 있음:"
has_ways: "다음 길 %{count}개 있음:"
- no_bounding_box: ì\9d´ ë°\94ë\80\9cì§\91í\95©ì\97\90ì\84\9c ì\96´ë\96¤ í\85\8cë\91\90리 ì§\80ì \95 ì\82¬ê°\81í\98\95도 저장되지 않았습니다.
+ no_bounding_box: ì\9d´ ë°\94ë\80\9cì§\91í\95©ì\97\90ì\84\9c ì\96´ë\96¤ í\85\8cë\91\90리 ì\83\81ì\9e\90도 저장되지 않았습니다.
show_area_box: 구역 사각형 표시
common_details:
changeset_comment: "덧글:"
show_areas: 지역 보이기
show_history: 역사 보기
unable_to_load_size: "불러오기 실패: 표시하려는 지역(%{bbox_size})의 설정 박스가 너무 큽니다. %{max_bbox_size}까지 표시할 수 있습니다."
+ view_data: 현재 지도 보기에 대한 데이터 보기
wait: 잠시만 기다려 주세요...
zoom_or_select: 확대 또는 보고 싶은 지도의 지역을 선택하세요
tag_details:
changeset_paging_nav:
next: 다음 »
previous: « 이전
- showing_page: 페이지 %{page}개 보임
+ showing_page: 페이지 %{page} 보는 중
changesets:
area: 지역
comment: 설명
hide_link: 이 덧글 숨기기
diary_entry:
comment_count:
- one: 덧글 1개
+ one: 덧글 %{count}개
other: 덧글 %{count}개
+ zero: 덧글 없음
comment_link: 이 항목에 덧글 남기기
confirm: 확인
edit_link: 이 항목 수정
area_to_export: 지역 내보내기
embeddable_html: 내장된 HTML
export_button: 내보내기
- export_details: OpenStreetMap ë
\8d°ì
\9d´í
\84°ë
\8a\94 <a href="http://opendatacommons.org/licenses/odbl/1.0/">ì
\98¤í
\94\88 ë
\8d°ì
\9d´í
\84° 커먼ì¦
\88 ì
\98¤í
\94\88 ë
\8d°ì
\9d´í
\84°ë² ì
\9d´ì
\8a¤ ë
\9d¼ì
\9d´ì
\84 ì
\8a¤</a>(ODbL)ì
\97\90 ë
\94°ë
¦\85니다.
+ export_details: OpenStreetMap ë
\8d°ì
\9d´í
\84°ë
\8a\94 <a href="http://opendatacommons.org/licenses/odbl/1.0/">ì
\98¤í
\94\88 ë
\8d°ì
\9d´í
\84° 커먼ì¦
\88 ì
\98¤í
\94\88 ë
\8d°ì
\9d´í
\84°ë² ì
\9d´ì
\8a¤ ë
\9d¼ì
\9d´ì
\84 ì
\8a¤</a>(ODbL)ì
\97\90 ë
\94°ë
\9d¼ ì\82¬ì\9a©í\95 ì\88\98 ì\9e\88ì\8aµ니다.
format: 형식
format_to_export: 내보내기 형식
image_size: 이미지 크기
postcode: 우편 번호
region: 지역
sea: 바다
- state: 주
+ state: ì\8b\9c/ë\8f\84/주
subdivision: 구분
suburb: 교외
town: 탑
river: 강
riverbank: 강가
stream: 하류
+ wadi: 와디
water_point: 급수소
waterfall: 폭포
weir: 댐
license_page:
foreign:
english_link: 영어 원본
- text: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우, 영어 문서가 우선합니다
+ text: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우 영어 문서가 우선합니다
title: 이 번역에 대한 정보
legal_babble:
- contributors_title_html: 우리의 기여자
- credit_1_html: "“© OpenStreetMap \n기여자” 로 제작진을 적어야 합니다."
+ attribution_example:
+ alt: 웹페이지에 OpenStreetMap에 저작자를 표시하는 방법의 예
+ title: 저작자 표시 예
+ contributors_at_html: "<strong>오스트리아</strong>: <a href=\"http://data.wien.gv.at/\">Stadt Wien</a>\n(<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>로 배포),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a>와\nLand Tirol (<a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT with amendments</a>로 배포)에서의\n데이터를 포함합니다."
+ contributors_ca_html: "<strong>캐나다</strong>: GeoBase®, GeoGratis\n(© Department of Natural Resources Canada),\nCanVec (© Department of Natural\nResources Canada)과 StatCan (Geography Division,\nStatistics Canada)에서의 데이터를 포함합니다."
+ contributors_footer_1_html: "자세한 내용과 OpenStreetMap을 개선하는 데 도움이 되는 데 사용한\n기타 자료에 대해서는 OpenStreetMap 위키에 있는 <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">기여자 문서</a>\n를 참고하세요."
+ contributors_footer_2_html: "OpenStreetMap에 포함된 데이터는 원래 데이터 제공자가\nOpenStreetMap을 보증하거나 어떠한 보증도 제공하거나\n어떠한 책임도 진다는 것을 의미하지 않습니다."
+ contributors_fr_html: "<strong>프랑스</strong>: Direction Générale des Impôts에서의\n데이터를 포함합니다."
+ contributors_gb_html: "<strong>연합 왕국(영국)</strong>: Ordnance\nSurvey 데이터를 포함합니다. © 2010년 12월 Crown\n저작권과 데이터베이스 권리."
+ contributors_intro_html: "기여자는 수천 명의 개인입니다. 또한 국립지도 제작 기관과\n같은 다른 소스의 공개 가능한 라이센스의 데이터를 포함합니다:"
+ contributors_nl_html: "<strong>네덜란드</strong>: © 2007년\nAND 데이터(<a href=\"http://www.and.com\">www.and.com</a>)를 포함합니다."
+ contributors_nz_html: "<strong>뉴질랜드</strong>: Land Information New Zealand에서의\n데이터를 포함합니다. Crown이 저작권을 소유합니다."
+ contributors_title_html: 기여자
+ contributors_za_html: "<strong>남아프리카 공화국</strong>: <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>에서의 데이터를\n포함합니다. State가 저작권을 소유합니다."
+ credit_1_html: "“© OpenStreetMap \ncontributors” 로 제작진을 적어야 합니다."
+ credit_2_html: "또한 명확하게 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며,\n지도 제작은 지도 타일을 사용할 때에 CC-BY-SA로 허가합니다.\n<a href=\"http://www.openstreetmap.org/copyright\">이 저작권 문서</a>로\n링크하여 이렇게 할 수 있습니다.\n또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과\n라이선스에 직접 링크를 할 수 있습니다. 링크할 수 없는\n매체(예를 들어 인쇄 작업)에서는 opendatacommons.org와\nopenstreetmap.org('OpenStreetMap'을 전체 주소로 확장)로\n독자에 직접 알려주세요. 관련 있다면 creativecommons.org로 알려주세요."
+ credit_3_html: "찾아볼 수 있는 전자 지도에 대해서는 제작진은 지도의 모서리에 보여야만 합니다.\n예를 들어:"
credit_title_html: OpenStreetMap 제작진 적는 방법
+ infringement_1_html: "OSM 기여자는 저작권 소유자로부터 명시적 허가 없이\n저작권이 있는 자료 (예를 들어 Google 지도 또는 인쇄된 지도)에서\n데이터를 반입하지 않도록 주의하여야 합니다."
+ infringement_2_html: "저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에\n추가되었다고 생각하면 <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">게시\n중단 절차</a>를 참고하거나 <a href=\"http://dmca.openstreetmap.org/\">온라인\n신고 페이지</a>에서 직접 제출하세요."
infringement_title_html: 저작권 침해
+ intro_1_html: "OpenStreetMap은 <i>오픈 데이터</i>로 <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">오픈 데이터\n커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다."
+ intro_2_html: "당신은 가능하면 OpenStreetMap 제작진과 기여로\n자유롭게 복사, 배포, 전송 및 데이터를 적용할 수 있습니다.\n데이터를 바꾸거나 데이터에 기초로 할 때는 오로지\n같은 라이선스 하에만 결과를 배포할 수 있습니다.\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">전문</a>은\n당신의 권리와 책임을 설명합니다."
+ intro_3_html: "지도 타일로 지도 제작과 설명서는\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">크리에이티브\n커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC-BY-SA)하에 허가됩니다."
+ more_1_html: "데이터를 사용하는 방법과 제작진을 표시하는 방법에 대해서는 <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">법적\nFAQ</a>를 자세히 읽으세요."
+ more_2_html: "OpenStreetMap은 오픈 데이터이지만 타사 개발자를 위한\n지도 API는 무료로 제공할 수 없습니다.\n<a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API 사용 정책</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">타일 사용 정책</a>과\n<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim(이름) 사용 정책</a>를 참고하세요."
more_title_html: 자세히 찾기
title_html: 저작권 및 라이선스
native:
title: 메시지 읽기
to: 받는 사람
unread_button: 읽지 않음으로 표시
+ wrong_user: "'%{user}' 사용자로 로그인하고 있지만 읽기를 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 읽으려면 올바른 사용자로 로그인하세요."
+ reply:
+ wrong_user: "'%{user}' 사용자로 로그인하고 있지만 답장을 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 답장을 하려면 올바른 사용자로 로그인하세요."
sent_message_summary:
delete_button: 삭제
notifier:
email_confirm:
subject: "[OpenStreetMap] 이메일 주소 확인"
email_confirm_html:
+ click_the_link: 만약 당신이라면 바뀜을 확인하기 위해 아래 링크를 클릭하세요.
greeting: 안녕하세요,
+ hopefully_you: 누군가가 아마 자신이 %{server_url} 에 %{new_address} 로 이메일 주소를 바꾸고 싶습니다.
email_confirm_plain:
+ click_the_link: 만약 당신이라면 바뀜을 확인하기 위해 아래 링크를 클릭하세요.
greeting: 안녕하세요,
- hopefully_you_1: 누군가(바라는 데 당신)가 여기를 통해 이메일 주소를 바꾸고 싶습니다.
- hopefully_you_2: "%{server_url}(은)는 %{new_address}에 있습니다."
+ hopefully_you_1: 누군가가 아마 자신이 여기를 통해 이메일 주소를 바꾸고 싶습니다.
+ hopefully_you_2: "%{server_url} (은)는 %{new_address} 에 있습니다."
friend_notification:
befriend_them: 또한 %{befriendurl}에서 친구로 추가할 수 있습니다.
had_added_you: "%{user} 님이 당신을 OpenStreetMap 친구로 추가하였습니다."
lost_password:
subject: "[OpenStreetMap] 비밀번호 초기화 요청"
lost_password_html:
+ click_the_link: 만약 당신이라면 비밀번호를 재설정하기 위해 아래 링크를 클릭하세요.
greeting: 안녕하세요,
+ hopefully_you: 누군가가 아마 자신이 이 이메일 계정의 openstreetmap.org 계정에서 재설정할 비밀번호를 요청했습니다.
lost_password_plain:
+ click_the_link: 만약 당신이라면 비밀번호를 재설정하기 위해 아래 링크를 클릭하세요.
greeting: 안녕하세요,
- hopefully_you_1: 누군가(아마도 당신)가 openstreetmap.org 계정의 이 이메일 주소로
+ hopefully_you_1: 누군가가 아마 자신이 openstreetmap.org 계정의 이 이메일 주소로
hopefully_you_2: 재설정할 비밀번호를 요청했습니다.
message_notification:
footer1: "%{readurl} 에서도 쪽지를 확인할 수 있습니다."
header: "%{from_user} 님이 OpenStreetMap을 통해 %{subject} 쪽지를 보냈습니다."
hi: "%{to_user}님 안녕하세요."
signup_confirm:
+ confirm: "무엇을 하기 전에 당신에게 온 요청을 확인해야 하며 만약 당신에게 온 요청이 맞다면 계정을 확인하기 위해 아래 링크를 클릭하세요:"
+ created: 누군가가 아마도 자신이 %{site_url} 에 계정을 만들었습니다.
+ greeting: 안녕하세요!
subject: "[OpenStreetMap] OpenStreetMap에 오신 것을 환영합니다"
+ welcome: 당신을 환영하고 시작하기 위해 몇 가지 추가 정보를 제공하게 됩니다.
signup_confirm_html:
+ ask_questions: <a href="http://help.openstreetmap.org/">질문과 답변 사이트</a>에서 OpenStreetMap에 대해 무엇이든 질문을 할 수 있습니다.
+ current_user: 세계 사람이 사는 위치에 따라 분류한 현재 사용자의 목록은 <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>에서 볼 수 있습니다.
+ get_reading: <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">위키에서</a> OpenStreetMap에 대해 읽을 것을 얻고, <a href="http://blog.openstreetmap.org/">OpenStreetMap 블로그</a>나 <a href="http://twitter.com/openstreetmap">트위터</a>를 통해 최신 뉴스를 따라 잡고, 또는 프로젝트에 담긴 역사의 OpenStreetMap 설립자인 Steve Coast의 <a href="http://www.opengeodata.org/">OpenGeoData 블로그</a>를 찾아볼 수 있고, 또한 <a href="http://www.opengeodata.org/?cat=13">팟캐스트를 들어보세요</a>!
+ introductory_video: "%{introductory_video_link}을 볼 수 있습니다."
more_videos: "%{more_videos_link}이 있습니다."
more_videos_here: 여기에 더 많은 동영상이 있습니다
+ user_wiki_page: <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Seoul">[[Category:Users_in_Seoul]]</a>과 같이 당신이 어디에 있는지 생각하여 분류 태그를 포함하는 사용자 위키 문서를 만들 것을 권장합니다.
video_to_openstreetmap: OpenStreetMap 소개 동영상
+ wiki_signup: 또한 <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page&uselang=ko">OpenStreetMap 위키에 가입할</a> 수 있습니다.
signup_confirm_plain:
+ ask_questions: "질문과 답변 사이트에서 OpenStreetMap에 대해 무엇이든 질문을 할 수 있습니다:"
blog_and_twitter: "OpenStreetMap 블로그 또는 트위터를 통해 최신 뉴스 보기:"
+ current_user: "세계 사람이 사는 위치에 따라 분류한 현재 사용자의 목록은 다음에서 볼 수 있습니다:"
introductory_video: "여기서 OpenStreetMap 소개 동영상을 볼 수 있습니다:"
more_videos: "여기에 더 많은 동영상이 있습니다:"
+ opengeodata: "OpenGeoData.org는 OpenStreetMap 설립자 Steve Coast의 블로그이며 팟캐스트도 있습니다:"
the_wiki: "위키에서 OpenStreetMap에 대하여 읽어보기:"
+ user_wiki_page: "[[Category:Users_in_Seoul]]과 같이 당신이 어디에 있는지 생각하여 분류 태그를 포함하는 사용자 위키 문서를 만들 것을 권장합니다."
+ wiki_signup: "또한 OpenStreetMap 위키에 가입할 수 있습니다:"
oauth:
oauthorize:
allow_read_gpx: 비공개 GPS 추적을 읽습니다.
allow_read_prefs: 사용자 환경 설정을 읽습니다.
- allow_to: "ë\8b¤ì\9d\8c í\81´ë\9d¼ì\9d´ì\96¸í\8a¸ ì\96´í\94\8c리ì¼\80ì\9d´ì\85\98을 허용합니다:"
+ allow_to: "ë\8b¤ì\9d\8c í\81´ë\9d¼ì\9d´ì\96¸í\8a¸ ì\9d\91ì\9a© í\94\84ë¡\9cê·¸ë\9e¨을 허용합니다:"
allow_write_api: 지도를 수정합니다.
allow_write_diary: 일지 항목을 만들고 덧글을 달고 친구를 만듭니다.
allow_write_gpx: GPS 추적을 올립니다.
allow_write_prefs: 사용자 환경 설정을 수정합니다.
+ request_access: "%{app_name} 응용 프로그램이 %{user} 계정에 접근을 요청합니다. 응용 프로그램이 다음 기능을 수행할 것인지 확인하세요. 원하는 많큼 많거나 적게 선택할 수 있습니다."
revoke:
flash: "%{application}에 대한 토큰을 철회했습니다"
oauth_clients:
create:
flash: 성공적으로 정보를 등록했습니다
destroy:
- flash: í\81´ë\9d¼ì\9d´ì\96¸í\8a¸ ì\96´í\94\8c리ì¼\80ì\9d´ì\85\98 등록을 파괴했습니다
+ flash: í\81´ë\9d¼ì\9d´ì\96¸í\8a¸ ì\9d\91ì\9a© í\94\84ë¡\9cê·¸ë\9e¨ 등록을 파괴했습니다
edit:
submit: 편집
- title: ì\96´í\94\8c리ì¼\80ì\9d´ì\85\98 편집
+ title: ì\9d\91ì\9a© í\94\84ë¡\9cê·¸ë\9e¨ 편집
form:
allow_read_gpx: 비공개 GPS 추적을 읽습니다.
allow_read_prefs: 사용자 환경 설정을 읽습니다.
requests: "사용자가 다음 권한을 요청합니다:"
required: 필수
support_url: 지원 URL
- url: 주ì\9a\94 ì\96´í\94\8c리ì¼\80ì\9d´ì\85\98 URL
+ url: 주ì\9a\94 ì\9d\91ì\9a© í\94\84ë¡\9cê·¸ë\9e¨ URL
index:
- application: ì\96´í\94\8c리ì¼\80ì\9d´ì\85\98 이름
+ application: ì\9d\91ì\9a© í\94\84ë¡\9cê·¸ë\9e¨ 이름
issued_at: 발행
- my_apps: 내 클라이언트 어플리케이션
- my_tokens: 내 인증한 어플리케이션
- register_new: 어플리케이션 등록
+ list_tokens: "다음 토큰이 내 이름으로 응용 프로그램에 발급했습니다:"
+ my_apps: 내 클라이언트 응용 프로그램
+ my_tokens: 내 인증한 응용 프로그램
+ no_apps: "%{oauth} 표준을 사용하여 OpenStreetMap과 함께 사용하기 위해 등록할 응용 프로그램이 있습니까? 이 서비스에 OAuth를 요청하기 전에 웹 응용 프로그램을 등록해야 합니다."
+ register_new: 응용 프로그램 등록
+ registered_apps: "등록한 다음 클라이언트 응용 프로그램이 있습니다:"
revoke: 철회!
title: 내 OAuth 자세한 정보
new:
submit: 등록
- title: ì\83\88 ì\96´í\94\8c리ì¼\80ì\9d´ì\85\98 등록
+ title: ì\83\88 ì\9d\91ì\9a© í\94\84ë¡\9cê·¸ë\9e¨ 등록
not_found:
sorry: 죄송합니다, 해당 %{type}(을)를 찾을 수 없습니다.
show:
confirm: 확실합니까?
delete: 클라이언트 삭제
edit: 자세한 사항 편집
+ key: "컨슈머 키:"
requests: "사용자가 다음 권한을 요청합니다:"
+ secret: "컨슈머 비밀 값:"
+ support_notice: SSL 모드에서 일반 텍스트 뿐만 아니라 HMAC-SHA1(권장)도 지원하고 있습니다.
title: "%{app_name}에 데한 OAuth 자세한 정보"
url: "요청 토큰 URL:"
update:
site:
edit:
anon_edits_link_text: 왜 이러한지 알아보세요.
- potlatch_unsaved_changes: 바뀜 사항을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우, 현재의 방식이나 지점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
+ flash_player_required: OpenStreetMap 플래시 편집기인 Potlatch를 사용하려면 플래시 플래이어가 필요합니다. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Adobe.com에서 플래시 플레이어를 다운로드</a>할 수 있습니다. <a href="http://wiki.openstreetmap.org/wiki/Editing">몇 가지 다른 설정</a> 또한 OpenStreetMap 편집을 위해 사용할 수 있습니다.
+ no_iframe_support: 브라우저가 이 기능에 필요한 HTML iframe을 지원하지 않습니다.
+ not_public: 공개할 편집을 설정하지 않았습니다.
+ not_public_description: 이렇게 하지 않으면 더 이상 지도를 편집할 수 없습니다. %{user_page}에서 공개로 편집을 설정할 수 있습니다.
+ potlatch2_not_configured: Potlatch 2가 설정되지 않았습니다 - 자세한 정보는 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 를 참고하세요
+ potlatch2_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch 2에서 저장하려면 저장을 클릭해야 합니다.)
+ potlatch_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우, 현재의 방식이나 지점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
user_page_link: 사용자 문서
index:
js_1: 자바스크립트를 지원하지 않는 브라우저이거나, 자바스크립트가 활성화 되어 있지 않습니다.
license:
copyright: 저작권 OpenStreetMap과 기여자, 오픈 라이선스로 배포
permalink: 고유링크
+ remote_failed: 편집을 실패했습니다 - JOSM이나 Merkaartor를 불러왔고 원격 제어 설정이 활성화되어 있는지 확인하세요
shortlink: 짧은링크
key:
map_key: 지도 키
search_help: "예제: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 또는 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>더 많은 예제...</a>"
submit_text: 가기
where_am_i: 내가 어디있나요?
- where_am_i_title: 검색 엔진을 사용하여 현재 위치를 설명
+ where_am_i_title: 검색 엔진을 사용하여 현재 위치를 나타냅니다
sidebar:
close: 닫기
search_results: 찾기 결과
friendly: "%Y년 %B %e일 %H:%M"
trace:
create:
+ trace_uploaded: GPX 파일을 올리고 있으며 데이터베이스에 삽입을 기다리고 있습니다. 이 작업은 보통 반 시간 내에 수행하며 완료되면 이메일을 보낼 것입니다.
upload_trace: GPS 추적 올리기
delete:
scheduled_for_deletion: 삭제 예정 추적
visibility: "공개 여부:"
visibility_help: 이게 무슨 의미입니까?
list:
+ empty_html: 여기에 아직 아무것도 없습니다. <a href='%{upload_link}'>새 추적을 올리거나</a> <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>위키 문서</a>에 GPS 추적에 대한 자세한 내용을 알아보세요.
public_traces: 공개 GPS 추적
public_traces_from: "%{user} 사용자의 공중 GPS 추적"
tagged_with: "%{tags}로 태그함"
made_public: 추적이 공개적으로 만들어짐
offline:
heading: GPX 저장소 오프라인
+ message: GPX 파일 저장소와 올리기 시스템은 현재 사용할 수 없습니다.
+ offline_warning:
+ message: GPX 파일 올리기 시스템은 현재 사용할 수 없습니다
trace:
ago: "%{time_in_words_ago} 전"
by: 사용자
trace_header:
see_all_traces: 모든 추적 보기
see_your_traces: 내 추적 보기
+ traces_waiting: 올리기를 기다리는 추적 %{count}개가 있습니다. 이 올리기가 완료될 때까지 기다리세요. 다른 사용자의 올리기가 제한되어 버립니다.
upload_trace: 추적 올리기
trace_optionals:
tags: 태그
trace_paging_nav:
newer: 다음 추적
older: 이전 추적
- showing_page: 페이지 %{page}개 보임
+ showing_page: 페이지 %{page} 보는 중
view:
delete_track: 이 추적 삭제
description: "설명:"
account:
contributor terms:
agreed: 새 기여자 약관에 동의했습니다.
+ agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
heading: "기여자 약관:"
link text: 이게 뭐죠?
not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
+ review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요.
current email address: "현재 이메일 주소:"
delete image: 현재 이미지 제거
email never displayed publicly: (절대 공개하지 않습니다)
flash update success: 사용자 정보를 성공적으로 업데이트했습니다.
flash update success confirm needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기 위해 이메일을 확인하세요.
- home location: "대문 위치:"
+ gravatar:
+ gravatar: Gravatar 사용
+ link text: 이게 뭐죠?
+ home location: "생활 위치:"
image: "그림:"
image size hint: (100x100 이하의 정사각형 그림이 최적)
keep image: 현재 이미지를 유지
my settings: 내 설정
new email address: "새 이메일 주소:"
new image: 그림 추가
- no home location: 대문 위치를 입력하지 않았습니다.
+ no home location: 생활 위치를 입력하지 않았습니다.
openid:
link: http://wiki.openstreetmap.org/wiki/OpenID
link text: 이게 뭐죠?
heading: "공개 편집:"
public editing note:
heading: 공개 편집
+ text: 현재 편집은 익명이고 사람이 당신에게 메시지를 보내거나 위치를 볼 수 없습니다. 당신이 편집한 것으로 나타내고 사람이 웹 사이트를 통해 연락을 허용하려면 아래 버튼을 클릭하세요. <b>0.6 API 역전 이후 공개 새용자만 지도 데이터를 편집할 수 있습니다</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">이유 알아보기</a>).<ul><li>이메일 주소는 공개함으로서 추가로 공개하지 않습니다.</li><li>이 작업을 되돌릴 수 없고 모든 새 사용자는 지금 기본값으로 공개입니다.</li></ul>
replace image: 현재 이미지 대체
return to profile: 프로필로 돌아가기
save changes button: 바뀐 사항 저장
title: 계정 편집
- update home location on click: 지도에서 클릭하면 대문 위지로 업데이트할까요?
+ update home location on click: 지도에서 클릭하면 생활 위치로 업데이트할까요?
confirm:
already active: 이 계정은 이미 확인했습니다.
+ before you start: 매핑을 시작하는 데 서두를 것을 알지만 전에 아래의 양식에 자신에 대한 조금 자세한 정보를 채울 수 있습니다.
button: 확인
heading: 사용자 계정 확인
press confirm button: 계정을 활성화하려면 아래 확인 버튼을 누르세요.
+ reconfirm: 가입한 지 조금 오래 있었다면 <a href="%{reconfirm}">자신에게 새 확인 이메일 보내야</a> 할 수 있습니다.
success: 계정을 확인했습니다, 가입해주셔서 감사합니다!
unknown token: 이 토큰이 존재하지 않습니다.
confirm_email:
button: 확인
failure: 이메일 주소는 이미 이 토큰으로 확인했습니다.
- heading: ì\9d´ë©\94ì\9d¼ 주ì\86\8c ë³\80ê²½ 확인
+ heading: ì\9d´ë©\94ì\9d¼ 주ì\86\8c ë°\94꾸기 확인
press confirm button: 새 이메일 주소를 확인하여면 아래에 확인 버튼을 누르세요.
success: 이메일 계정을 확인했습니다, 가입해주셔서 감사합니다!
confirm_resend:
failure: "%{name} 사용자를 찾을 수 없습니다."
+ success: "%{email} 로 새 확인 쪽지를 보냈는데 즉시 계정을 확인하는 대로 매핑을 할 수 있습니다.<br /><br />확인 요청을 보낼 때 스팸 방지 시스템을 사용한다면 어떤 확인 요청에 답변할 수 없으므로 화이트리스트에 webmaster@openstreetmap.org 가 있는지 확인하세요."
filter:
not_an_administrator: 해당 동작을 수행하려면 관리자 권한이 필요합니다.
go_public:
heading: 사용자
hide: 선택한 사용자 숨기기
showing:
- one: 페이지 %{page}개 보임 (%{items} 중 %{first_item})
- other: 페이지 %{page}개 보임 (%{items} 중 %{first_item}-%{last_item})
+ one: 페이지 %{page} 보는 중 (%{items} 중 %{first_item})
+ other: 페이지 %{page} 보는 중 (%{items} 중 %{first_item}-%{last_item})
summary: "%{name}(이)가 %{date}에 %{ip_address}에서 만들어짐"
summary_no_ip: "%{name}(이)가 %{date}에 만들어짐"
title: 사용자
login:
+ account is suspended: 죄송합니다, 의심스러운 활동으로 인해 계정이 일시 중지되었습니다.<br />이 문제를 토론하려면 <a href="%{webmaster}">웹마스터</a>에게 문의하세요.
+ account not active: 죄송합니다, 계정을 아직 활성화하지 않았습니다.<br />계정을 활성화하려면 계정 확인 이메일에 있는 링크를 사용하거나 <a href="%{reconfirm}">새 확인 이메일을 요청하세요</a>.
auth failure: 죄송합니다, 자세한 내용으로 로그인할 수 없습니다.
create account minute: 계정을 만듭니다. 1분도 걸리지 않습니다.
email or username: "이메일 주소 또는 사용자 이름:"
lost_password:
email address: "이메일 주소:"
heading: 비밀번호를 잊으셨나요?
- help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 우리는 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.
+ help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.
new password button: 비밀번호 초기화
notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다.
notice email on way: 죄송합니다, 잃어버렸습니다 :-( 곧 재설정을 할 수 있도록 하지만, 이메일을 사용할 수 있습니다.
new:
confirm email address: "이메일 주소 확인:"
confirm password: "비밀번호 확인:"
+ contact_webmaster: 계정을 만들 수 있도록 <a href="mailto:webmaster@openstreetmap.org">웹마스터</a>에게 문의하세요. 희망에 대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다.
continue: 계속
display name: "보여줄 이름:"
display name description: 공개적으로 보여질 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
email address: "이메일 주소:"
- fill_form: 양식을 채우고 우리에게 계정을 활성화하기 위해 신속하게 이메일을 보내드립니다.
+ fill_form: 양식을 채우고 계정을 활성화하기 위해 신속하게 이메일을 보내드립니다.
+ flash create success message: 가입해주셔서 감사합니다. %{email} 로 확인 쪽지를 보냈는데 즉시 계정을 확인하는 대로 매핑을 할 수 있습니다.<br /><br />확인 요청을 보낼 때 스팸 방지 시스템을 사용한다면 어떤 확인 요청에 답변할 수 없으므로 화이트리스트에 webmaster@openstreetmap.org 가 있는지 확인하세요.
+ flash welcome: 가입해주셔서 감사합니다. 시작하기 위한 힌트와 함께 %{email} 로 환영 메시지를 보냈습니다.
heading: 사용자 계정 만들기
license_agreement: 계정을 확인하면 당신은 <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">기여자 약관</a>에 동의해야합니다.
+ no_auto_account_create: 불행하게도 현재로서는 자동으로 계정을 만들 수 없습니다.
not displayed publicly: 공개적으로 보여지지 않습니다 (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="이메일 주소에 대한 부분을 포함한 위키 개인정보 정책">개인정보 정책</a>을 참고하세요)
openid: "%{logo} OpenID:"
+ openid association: "<p>OpenID는 아직 OpenStreetMap 계정과 연결되지 않았습니다.</p>\n<ul>\n <li>OpenStreetMap에 새로 가입하려면 아래의 양식을 사용하여 새 계정을 만드세요.</li>\n <li>\n 이미 계정이 있다면 사용자 이름과 비밀번호를 사용해 로그인하고 나서\n 사용자 설정에서 OpenID와 계정을 연결할 수 있습니다.\n </li>\n</ul>"
openid no password: OpenID로 비밀번호가 필요하지 않지만 몇가지 추가 도구나 서버는 여전히 비밀번호가 필요할 수 있습니다.
password: "비밀번호:"
terms accepted: 새 기여자 약관에 동의하셔서 감사합니다!
- terms declined: ì
\9a°ë¦¬ë\8a\94 ì\83\88 기ì
\97“
\9e\90 ì
\95½ê´
\80ì
\97\90 ë
\8f\99ì
\9d\98í
\95\98ì§
\80 ì
\95\8aì
\9d\80 ê²
\83ì
\9c¼ë¡
\9c ê²°ì
\95í
\96\88기ì
\97\90 ì£
\84ì
\86¡í
\95©ë
\8b\88ë
\8b¤. ì
\9e\90ì
\84¸í
\95\9c ì
\95ë³´ì
\97\90 ë
\8c\80í
\95´ì
\84\9cë
\8a\94 <a href="%{url}">ì
\9d´ ì
\9c\84í
\82¤ 문ì
\84\9c</a>를 ì°¸ê³ í
\95\98ì
\84¸ì
\9a\94.
+ terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이 위키 문서</a>를 참고하세요.
title: 계정 만들기
use openid: 또는 %{logo} OpenID를 사용하여 로그인하세요
no_such_user:
+ body: 죄송합니다, %{user} 이름으로 된 사용자가 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요.
heading: "%{user} 사용자는 존재하지 않습니다"
title: 이러한 사용자는 없습니다
popup:
reset: 비밀번호 초기화
title: 비밀번호 초기화
set_home:
- flash success: 대문 주소를 성공적으로 저장했습니다
+ flash success: 생활 주소를 성공적으로 저장했습니다
suspended:
+ body: "<p>\n 죄송합니다, 의심스러운 활동으로 인해 계정이 자동으로\n 일시 중지되었습니다.\n</p>\n<p>\n 이 결정은 곧 관리자가 검토할 것입니다. 또는\n 이 문제를 토론하려면 %{webmaster}에게 문의할 수 있습니다.\n</p>"
heading: 계정 정지
title: 계정 정지
webmaster: 웹마스터
terms:
agree: 동의
+ consider_pd: 위의 계약뿐만 아니라 내 기여가 퍼블릭 도메인에 있는지 고려하세요
consider_pd_why: 이게 뭐죠?
decline: 거부
+ guidance: "약관을 이애햐는 데 유용한 정보: <a href=\"%{summary}\">사람이 읽을 수 있는 요약</a>과 일부 <a href=\"%{translations}\">비공식 번역</a>"
heading: 기여자 약관
legale_names:
france: 프랑스
italy: 이탈리아
- rest_of_world: 세계의 나머지
+ rest_of_world: 나머지 국가
+ legale_select: "거주 국가를 선택하세요:"
+ read and accept: 아래의 계약을 읽고 기존 및 앞으로의 기여가 계약 약관에 동의했는지 확인하려면 동의 버튼을 누르세요.
title: 기여자 약관
+ you need to accept or decline: 계속하려면 새 기여자 약관을 읽고 나서 동의나 거부하세요.
view:
activate_user: 이 사용자 활성화
add as friend: 친구 추가
friends_changesets: 친구의 모든 바뀜집합 찾아보기
friends_diaries: 친구의 모든 일지 항목 찾아보기
hide_user: 이 사용자를 숨기기
+ if set location: 위치를 설정하면 예쁜 지도와 물건이 여기에 나타납니다. %{settings_link} 페이지에 생활 주소를 설정할 수 있습니다.
km away: "%{count}km 거리"
latest edit: "최근 편집 %{ago}:"
m away: "%{count}m 거리"
title: "%{name} 사용자에 대해 차단"
create:
flash: "%{name} 사용자를 차단했습니다."
+ try_contacting: 차단하기 전에 사용자에게 연락하여 사용자가 대답할 수 있는 충분한 시간을 주세요.
+ try_waiting: 차단하기 전에 사용자에게 대답할 수 있는 충분한 시간을 주세요.
edit:
back: 모든 차단 보기
heading: "%{name} 사용자에 대한 차단 편집"
+ needs_view: 이 차단을 해제하기 전에 사용자가 로그인을 해야 합니까?
+ period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
+ reason: "%{name} 사용자를 차단한 이유입니다. 상황에 대해 가능한 한 냉정하고 합리적으로 최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요."
show: 이 차단 보기
submit: 차단 업데이트
title: "%{name} 사용자에 대한 차단 편집"
+ filter:
+ block_expired: 차단은 이미 만료되었고 편집할 수 없습니다.
+ block_period: 차단 기간은 드롭 다운 목록에서 선택할 수 있는 값 중 하나여야 합니다.
helper:
time_future: "%{time}에 끝납니다."
time_past: "%{time} 전에 끝났습니다."
new:
back: 모든 차단 보기
heading: "%{name} 사용자 차단"
+ needs_view: 차단 해제하기 전에 로그인해야 합니다
+ period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
+ reason: "%{name} 사용자를 차단한 이유입니다. 메시지가 대중에 공개적으로 보여지기 때문에, 상황에 대해 가능한 한 냉정하고 합리적으로 최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요."
submit: 차단 만들기
title: "%{name} 사용자 차단"
+ tried_contacting: 사용자에게 연락하여 이를 멈추도록 요청했습니다.
+ tried_waiting: 의사 소통에 대답한 사용자에게 충분한 시간을 주었습니다.
not_found:
back: 색인으로 돌아가기
sorry: 죄송합니다, %{id} ID로 된 사용자 차단을 찾을 수 없습니다.
revoke: 철회!
revoker_name: 철회자
show: 보기
- showing_page: 페이지 %{page}개 보임
+ showing_page: 페이지 %{page} 보는 중
status: 상태
period:
one: 1시간
filter:
already_has_role: 사용자는 이미 %{role} 역할이 있습니다.
doesnt_have_role: 사용자는 %{role} 역할이 없습니다.
+ not_a_role: "'%{role}' 문자열은 올바른 역할이 아닙니다."
+ not_an_administrator: 관리자만 사용자 역할 관리를 수행할 수 있습니다, 당신은 관리자가 아닙니다.
grant:
+ are_you_sure: "'%{name}' 사용자한테 '%{role}' 역할을 부여하겠습니까?"
confirm: 확인
+ fail: "'%{name} 사용자에게 '%{role}' 역할을 부여할 수 없습니다. 사용자와 역할이 모두 올바른지 확인하세요."
heading: 역할 부여 확인
title: 역할 부여 확인
revoke:
+ are_you_sure: "'%{name}' 사용자한테 '%{role}' 역할을 철회하겠습니까?"
confirm: 확인
+ fail: "'%{name} 사용자에게 '%{role}' 역할을 철회할 수 없습니다. 사용자와 역할이 모두 올바른지 확인하세요."
heading: 역할 철회 확인
title: 역할 철회 확인
show_areas: Rādīt apgabalus
show_history: Rādīt vēsturi
unable_to_load_size: "Nevar ielādēt: Apgabala rāmis %{bbox_size}, ir pārāk liels (jābūt mazākam nekā %{max_bbox_size})"
+ view_data: Skatīt datus pašreizējā kartes skatā
wait: Uzgaidiet ...
zoom_or_select: Tuvini vai atlasi kartes apgabalu, lai skatītu
tag_details:
hide_link: Paslēpt šo komentāru
diary_entry:
comment_count:
- one: 1 komentārs
+ one: "%{count} komentārs"
other: "%{count} komentāri"
+ zero: Nav komentāru
comment_link: Komentēt šo ierakstu
confirm: Apstiprināt
edit_link: Rediģēt šo ierakstu
title_nearby: Tuvumā esošu lietotāju dienasgrāmatas
user_title: "%{user} dienasgrāmata"
location:
- edit: Rediģēt
+ edit: Labot
location: "Atrašanās vieta:"
view: Skatīt
new:
area_to_export: Kvadrants, kuru eksportēt
embeddable_html: Ievietojams HTML kods
export_button: Eksportēt
- export_details: OpenStreetMap dati ir licencēta saskaņā ar <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 licenci</a>.
+ export_details: OpenStreetMap dati ir licencēti saskaņā ar <a href="http://opendatacommons.org/licenses/odbl/1.0/">Atvērtās Datu Kopas Atvērtās Datubāzes licenci</a> (ODbL).
format: Formāts
format_to_export: Eksportēšanas formāts
image_size: Attēla izmērs
documentation_title: Projekta dokumentācija
donate: Atbalstiet OpenStreetMap, %{link} aparatūras uzlabošanas fondam.
donate_link_text: ziedojot
- edit: Rediģēt
+ edit: Labot
edit_with: Rediģēt ar %{editor}
export: Eksportēt
export_tooltip: Eksportēt kartes datus
text: Gadījumā, ja šī tulkotā lapa ir nesaskaņā ar %{english_original_link}, vērā jāņem un jāvadās no angliskās lapas
title: Par šo tulkojumu
legal_babble:
+ attribution_example:
+ alt: Piemērs, kā OpenStreetMap apzīmēt web lapā
+ title: Atsauces piemērs
contributors_at_html: "<strong>Austrija</strong>: Ietver datus no\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (zem\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>)."
contributors_ca_html: "<strong>Kanāda</strong>: Ietver datus no\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), un StatCan (Geography Division,\n Statistics Canada)."
contributors_footer_1_html: "Sīkāku informāciju par šiem, un citiem avotiem, kas izmantoti,\nlai uzlabotu OpenStreetMap, lūdzu apskati <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Veidotāju\nlapu</a> iekš OpenStreetMap Wiki."
contributors_footer_2_html: " Datu ievietošana OpenStreetMap nenozīmē ka oriģinālais\n datu avots sniedz atbalstu OpenStreetMap, dod garantiju, vai\n pieņem jebkādu atbildību."
contributors_fr_html: "<strong>Francija</strong>: Ietver datus no\n Direction Générale des Impôts."
- contributors_gb_html: "<strong>Apvienotā Karaliste</strong>: Satur Ordnance\n Survey datus © Crown copyright and database right\n 2010."
- contributors_intro_html: "Mūsu CC BY-SA licence pieprasa tev “dot Oriģinālajam\n Autoram atsauci saprātīgu līdz vidēju vai veidu, ka Tu lieto\n ”. Individuāli OSM kartētāji nepieprasa\n atsauci pāri “OpenStreetMap\n veidotāji”, bet, kur dati no nacionālas kartēšanas aģentūras\n vai cita nopietna avota ir iekļauti iekš\n OpenStreetMap, varētu būt saprātīgi uz viņiem atsaukties tieši\n reproducējot viņu atsauci vai iesaitējot uz šo lapu."
+ contributors_gb_html: "<strong>Apvienotā Karaliste</strong>: Satur Ordnance\n Survey datus © Kroņa tiesības un datubāze\n 2010-12."
+ contributors_intro_html: "Mūsu veidotāji ir tūkstošiem cilvēku. Mēs arī ievietojam\natvērti-licencētus datus no nacionālajām kartēšanas aģentūrām\nun citiem avotiem, to skaitā:"
contributors_nl_html: "<strong>Nīderlande</strong>: Satur © AND data, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
contributors_nz_html: "<strong>Jaunzēlande</strong>: Ietver datus no\n Land Information New Zealand. Crown Copyright reserved."
contributors_title_html: Mūsu veidotāji
contributors_za_html: "<strong>Dienvidāfrika</strong>: Ietver datus no\n <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n National Geo-Spatial Information</a>, State copyright reserved."
- credit_1_html: "Ja Tu lieto OpenStreetMap kartes bildes, mēs pieprasām ka\n tava atsaucē ir vismaz “© OpenStreetMap\n veidotāji, CC BY-SA”. Ja tu izmanto tikai kartes datus,\n mēs pieprasām “Kartes dati © OpenStreetMap veidotāji,\n CC BY-SA”."
- credit_2_html: "Kur iespējams, OpenStreetMap vajadzētu būt iesaitētam uz <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n un CC BY-SA uz <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Ja\n tu lieto mediju, kur saites nav iespējamas (piem. \n printēts darbs), mēs iesakām pārsūtīt savus lasītājus uz\n www.openstreetmap.org (piemēram paplašinot\n ‘OpenStreetMap’ uz pilno adresi) un uz\n www.creativecommons.org."
+ credit_1_html: "Mēs pieprasām, ka tu izmanto atsauci “© OpenStreetMap\nveidotāji”."
+ credit_2_html: "Kur iespējams, OpenStreetMap vajadzētu būt iesaitētam uz <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n un CC BY-SA uz <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Ja\n tu lieto mediju, kur saites nav iespējamas (piem. \n printēts darbs), mēs iesakām pārsūtīt savus lasītājus uz\n www.openstreetmap.org (piemēram paplašinot\n ‘OpenStreetMap.org’ uz pilno adresi) un uz\n www.creativecommons.org."
+ credit_3_html: "Priekš pārlūkojamas elektroniskās kartes, atsaucei ir jāparādās kartes stūrī. Piemēram:"
credit_title_html: Kā atsaukties uz OpenStreetMap
- intro_1_html: " OpenStreetMap ir <i>atvērti dati</i>, licencēti zem <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> licences (CC BY-SA)."
- intro_2_html: " Tu vari kopēt, izplatīt, nosūtīt un adaptēt mūsu kartes\n un datus, kamēr tu atsaucies uz OpenStreetMap un tās\n veidotājiem. Ja tu maini vai veido uz mūsu kartēm, tu\n vari izplatīt rezultātu tikai zem tās pašas licences. Pilns\n <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiskais kods</a> izskaidro tavas tiesības un pienākumus."
- more_1_html: " Lasi vairāk par mūsu datu izmantošanu <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Juridiskajā\n FAQ</a>."
- more_2_html: "OSM veidotājiem tiek atgādināts nievietot datus no\n ar autortiesībām aizsargātām vietām (piem. Google Maps vai drukātas kartes) bez\n skaidri izteiktas atļaujas no autortiesību turētājiem."
+ infringement_1_html: "OSM veidotājiem tiek atgādināts, nekad neizmantot datus no jebkuriem \nar autortiesībām aizsargātiem avotiem (piem. Google Maps vai drukātām kartēm), bez \nprecīzi formulētas atļaujas no autortiesību īpašniekiem."
+ infringement_2_html: "Ja tu tici, ka ar autortiesībām aizsargāts materiāls ir ticis neatbilstoši\npievienots OpenStreetMap datubāzei vai vietnei, lūdzu atsaucies uz\nmūsu <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">noņemšanas\nprocedūru</a> vai paziņo pa tiešo mums, izmantojot\n<a href=\"http://dmca.openstreetmap.org/\">on-line ziņošanas veidni</a>."
+ infringement_title_html: Autortiesību pārkāpums
+ intro_1_html: "OpenStreetMap ir <i>atvērti dati</i>, kad licencēti zem <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Atvērtās Datu Kopas Atvērtās Datubāzes licences</a> (ODbL)."
+ intro_2_html: "Tu vari kopēt, izplatīt, nosūtīt un adaptēt mūsu kartes\n un datus, kamēr tu atsaucies uz OpenStreetMap un tās\n veidotājiem. Ja tu maini vai veido uz mūsu kartēm, tu\n vari izplatīt rezultātu tikai zem tās pašas licences. Pilns\n <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiskais kods</a> izskaidro tavas tiesības un pienākumus."
+ intro_3_html: "Kartogrāfija mūsu karšu flīzēs un mūsu dokumentācija ir licencēti zem <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> licences (CC-BY-SA)."
+ more_1_html: "Lasi vairāk par mūsu datiem, un kā uz mums atsaukties <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiskajā\n FAQ</a>."
+ more_2_html: "Lai gan OpenStreetMap ir atvērti dati, mēs nevaram piedāvāt bezmaksas kartes API trešās puses izstrādātājiem.\nApskati mūsu <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API Lietošanas Politiku</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Flīžu Lietošanas Politiku</a>\nun <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim Lietošanas Politiku</a>."
more_title_html: Uzzināt vairāk
title_html: Autortiesības un Licence
native:
header: "OpenStreetMap lietotājs %{from_user} ir jums nosūtījis ziņu ar tematu %{subject}:"
hi: Sveiks %{to_user},
signup_confirm:
+ confirm: "Pirms mēs turpinām, mums vajag pārliecināties, ka pieprasījums nāca no tevis, ja tas nāca, lūdzu uzklikšķini uz zemāk redzamās saites, lai aktivizētu savu lietotāju:"
+ created: Kāds (cerams tu) tikko izveidoja lietotāju %{site_url}.
+ greeting: Sveicināti!
subject: "[OpenStreetMap] Laipni lūgti OpenStreetMap"
+ welcome: Mēs vēletos tevi sveikt un dot tev papildus informāciju par OpenStreetMap.
signup_confirm_html:
ask_questions: Tu vari jautāt jebkurus jautājumus par OpenStreetMap mūsu <a href="http://help.openstreetmap.org/">jautājumu un atbilžu lapā</a>.
current_user: Saraksts ar pašreizējiem lietotājiem kategorijās, pamatojoties uz to, kur tie atrodas pasaulē, ir pieejams no <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
signup_confirm_plain:
ask_questions: "Tu vari jautāt jebkurus jautājumus par OpenStreetMap mūsu jautājumu un atbilžu lapā:"
blog_and_twitter: "Sekojiet jaunumiem OpenStreetMap emuārā un Twitter:"
+ current_user: "Saraksts ar esošajiem lietotājiem kategorijās, ņemot vērā, kur pasaulē viņi atrodas, ir pieejams:"
introductory_video: "Šeit varat noskatīties video, kas iepazīstina ar OpenStreetMap:"
more_videos: "Šeit ir vēl citi video:"
opengeodata: "OpenGeoData.org ir OpenStreetMap dibinātāja Stīva Kousta emuārs, tajā ir arī podraides:"
the_wiki: "Lasiet par OpenStreetMap mūsu viki:"
+ user_wiki_page: Ir ieteicams izveidot lietotājam wiki lapu, kurā atrastos kategoriju birkas, kuras norādīs uz to, kur tu atrodies, piemēram [[Category:Users_in_London]].
wiki_signup: Tu arī varētu vēlēties piereģistrēties mūsu OpenStreetMap wiki, šeit
oauth:
oauthorize:
destroy:
flash: Iznīcināja klienta aplikācijas reģistrāciju
edit:
- submit: Rediģēt
+ submit: Labot
title: Rediģē savu pieteikumu
form:
allow_read_gpx: lasīt savas privātās GPS trases.
index:
js_1: Vai nu jūs lietojat pārlūkprogrammu, kas neatbalsta JavaScript, vai arī jūsu pārlūkprogrammā JavaScript ir atslēgts.
js_2: OpenStreetMap kartes rādīšanai lieto JavaScript.
+ license:
+ copyright: Autortiesības OpenStreetMap un tā veidotāji, zem atvērtas licences
permalink: Pastāvīgā saite
remote_failed: Rediģēšana neizdevās - pārbaudi, ka JOSM vai Merkaartor ir ielādēts un attālinātās vadības iespēja ir aktivizēta
shortlink: Īsā saite
email never displayed publicly: (nekad netiek rādīta publiski)
flash update success: Lietotāja informācija veiksmīgi atjaunināta.
flash update success confirm needed: Lietotāja informācija veiksmīgi atjaunota. Pārbaudi e-pastu, lai apstiprinātu savu jauno e-pasta adresi.
+ gravatar:
+ gravatar: Izmantot Gravatar
+ link text: kas šis ir?
home location: "Māju atrašanās vieta:"
image: "Attēls:"
image size hint: (vislabāk der kvadrātveida attēli vismaz 100x100 izmērā)
email address: "E-pasta adrese:"
fill_form: Aizpildi šo formu un mēs tev nosūtīsim ātru e-pastu, lai aktivizētu tavu lietotāju.
flash create success message: Paldies, ka reģistrējies. Mēs tev nosūtījām pārbaudes e-pastu uz %{email} un tiklīdz tu apstiprināsi savu lietotāju, tu varēsi sākt kartēt.<br /><br />Ja tu lieto pretmēstuļu sistēmu, kura nosūta pārbaudes pieprasījumus, tad pārliecinies, ka esi ielicis webmaster@openstreetmap.org baltajā sarakstā, jo mēs nevaram atbildēt uz pārbaudes pieprasījumiem.
+ flash welcome: Paldies, ka reģistrējies. Mēs tev nosūtījām sveiciena vēstuli uz %{email} ar dažiem ieteikumiem, kā sākt kartes papildināšanu.
heading: Izveidot lietotāja kontu
license_agreement: Kad tu apstiprini savu lietotāju, tev būs nepieciešams pieņemt <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">veidotāju noteikumus</a>.
no_auto_account_create: Diemžēl mēs šobrīd nevaram izveidot kontu automātiski.
show:
back: Skatīt visus bloķējumus
confirm: Vai esat pārliecināts?
- edit: Rediģēt
+ edit: Labot
heading: "%{block_on} bloķēts pēc %{block_by}"
needs_view: Lietotājam ir jāautorizējas, pirms liegums tiks notīrīts.
reason: "Bloķēšanas iemesls:"
show_areas: Прикажи подрачја
show_history: Прикажи историја
unable_to_load_size: "Не можам да вчитам: Рамката од %{bbox_size} е преголема (мора да биде помала од %{max_bbox_size}))"
+ view_data: Погледајте податоци за тековниот поглед на картата
wait: Почекајте...
zoom_or_select: Приближи и избери простор на картата за преглед
tag_details:
hide_link: Скриј го коментаров
diary_entry:
comment_count:
- one: 1 коментар
+ one: "%{count} коментар"
other: "%{count} коментари"
+ zero: Нема коментари
comment_link: Коментирај на оваа ставка
confirm: Потврди
edit_link: Уреди ја оваа ставка
start_rjs:
add_marker: Стави бележник на картата
change_marker: Смени позиција на бележникот
- click_add_marker: Ð\9aликнете на картата за да ставите бележник.
+ click_add_marker: СÑ\82иÑ\81нете на картата за да ставите бележник.
drag_a_box: Повлечете рамка на картата за да изберете површина
export: Извоз
manually_select: Рачно изберете друг простор
infringement_1_html: "Би сакале да ги потсетиме учесниците на OSM дека никогаш не смеат да ставаат\nподатоци од извори заштитени со авторски права (на пр. Google Карти или печатени карти) без\nизрична дозвола од имателите на тие права."
infringement_2_html: "Доколку сметате дека базата на OpenStreetMap или ова мрежно место\nсодржи бесправно или неисправно поставени податоци, погледајте ја\n<a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">процедурата \nза отстранување</a> или поднесете жалба на \n<a href=\"http://dmca.openstreetmap.org/\">оваа наменска страница</a>."
infringement_title_html: Прекршување на авторските права
- intro_1_html: "OpenStreetMap содржи <i>отворени податоци</i>, лиценцирани со <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив комонс НаведиИзвор-СподелиПодИстиУслови 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap има <i>отворени податоци</i> под лиценцата <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Нашите податоци слободно можете да ги умножувате, распространувате, предавате и менувате, \nдоколку ја наведете OpenStreetMap и нејзините\nучесници. Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">правен текст</a>."
intro_3_html: "Картографијата во нашите полиња на картите и нашата документација\nсе нудат под лиценцата <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив комонс НаведиИзвор-СподелиПодИстиУслови 2.0</a> (CC-BY-SA)."
more_1_html: "Повеќе за употребата на податоци и како да не наведувате, ќе најдете на <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Правни ЧПП</a>."
email_confirm:
subject: "[OpenStreetMap] Потврдете ја вашата е-поштенска адреса"
email_confirm_html:
- click_the_link: Ако ова сте вие, кликнете подолу за да ја потврдите измената.
+ click_the_link: Ако ова сте вие, стиснете подолу за да ја потврдите измената.
greeting: Здраво,
hopefully_you: Некој (се надеваме, Вие) сака да ја смени е-поштенската адреса на %{server_url} со новата адреса %{new_address}.
email_confirm_plain:
- click_the_link: Ако ова сте вие, кликнете на врската подолу за да ја потврдите измената.
+ click_the_link: Ако ова сте вие, стиснете на врската подолу за да ја потврдите измената.
greeting: Здраво,
hopefully_you_1: Некој (се надеваме Вие) сака да ја замени е-поштенската адреса на
hopefully_you_2: "%{server_url} со новата адреса %{new_address}."
lost_password:
subject: "[OpenStreetMap] Барање за промена на лозинка"
lost_password_html:
- click_the_link: Ако ова сте вие, тогаш кликнете ја врската подолу за да си ја промените лозинката.
+ click_the_link: Ако ова сте вие, тогаш стиснете на врската подолу за да си ја промените лозинката.
greeting: Здраво,
hopefully_you: Некој (можеби Вие) побарал да се промени лозинката на сметката на openstreetmap.org која ѝ припаѓа на оваа адреса.
lost_password_plain:
- click_the_link: Ако ова сте вие, кликнете на врската подолу за да си ја смените лозинката.
+ click_the_link: Ако ова сте вие, стиснете на врската подолу за да си ја смените лозинката.
greeting: Здраво,
hopefully_you_1: Некој (можеби Вие) има побарано да се смени лозинката на
hopefully_you_2: адресата на оваа openstreetmap.org сметка.
not_public_description: Повеќе не можете да ја уредувате картата ако не го направите тоа. Можете да наместите уредувањата да ви бидат јавни на вашата %{user_page}.
potlatch2_not_configured: Potlatch 2 не е поставен - погледајте ја страницата http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 за повеќе информации
potlatch2_unsaved_changes: Имате незачувани промени. (Зачувувањето во Potlatch 2 се врши со стискање на „зачувај“.)
- potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или кликнете на „зачувај“ ако го имате тоа копче.)
+ potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или стиснете на „зачувај“ ако го имате тоа копче.)
user_page_link: корисничка страница
index:
js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го оневозможиле тој програм.
unsurfaced: Неасфалтиран пат
wood: Шумичка
markdown_help:
- alt: Алетрн. текст
+ alt: Алтернативен текст
first: Прва ставка
heading: Наслов
headings: Наслови
heading: "Јавно уредување:"
public editing note:
heading: Јавно уредување
- text: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат порака или да ви ја видат местоположбата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница,
кликнете на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.</li> </ul>
+ text: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат порака или да ви ја видат местоположбата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница,
стиснете на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.</li> </ul>
replace image: Замени тековна слика
return to profile: Назад кон профилот
save changes button: Зачувај ги промените
title: Уреди сметка
- update home location on click: Подновувај го матичната местоположба кога ќе кликнам на картата
+ update home location on click: Подновувај ја матичната местоположба кога ќе стиснам на картата
confirm:
already active: Оваа сметка е веќе потврдена.
before you start: Знаеме дека со нетрпение чекате да почнете со картографска работа, но пред тоа препорачуваме да пополните некои податоци за вас во образецот подолу.
title: Корисници
login:
account is suspended: Нажалост, вашата сметка е закочена поради сомнителна активност.<br />Обратете се кај <a href="%{webmaster}">раководителот</a> ако сакате да продискутирате за проблемот.
- account not active: Ð
\96алиме, но Ñ
\81меÑ
\82каÑ
\82а Ñ
\81è Ñ
\83Ñ
\88Ñ
\82е не е акÑ
\82ивна.<br />Ð
\9aликнете на врската наведена во пораката со која ви ја потврдуваме сметката за да ја активирате, или пак <a href="%{reconfirm}">побарајте нова потврдна порака</a>.
+ account not active: Ð
\96алиме, но Ñ
\81меÑ
\82каÑ
\82а Ñ
\81è Ñ
\83Ñ
\88Ñ
\82е не е акÑ
\82ивна.<br />Ð
¡Ñ\82иÑ\81нете на врската наведена во пораката со која ви ја потврдуваме сметката за да ја активирате, или пак <a href="%{reconfirm}">побарајте нова потврдна порака</a>.
auth failure: Жалиме, не можевме да ве најавиме со тие податоци.
create account minute: Направете сметка. Ова трае само една минута.
email or username: Е-пошта или корисничко име
title: Направи сметка
use openid: Во друг случај, најавете се со %{logo} OpenID
no_such_user:
- body: Жалиме, но не постои корисник по име %{user}. Проверете да не сте згрешиле во пишувањето, или пак да не сте кликнале на погрешна врска.
+ body: Жалиме, но не постои корисник по име %{user}. Проверете да не сте згрешиле во пишувањето, или пак да не сте стиснале на погрешна врска.
heading: Корисникот %{user} не постои.
title: Нема таков корисник
popup:
show_areas: Tunjukkan kawasan
show_history: Tunjukkan Sejarah
unable_to_load_size: "Tidak dapat muat: Saiz petak pembatasan %{bbox_size} terlalu besar (mesti lebih kecil daripada %{max_bbox_size})"
+ view_data: Lihat data untuk paparan peta semasa
wait: Tunggu...
zoom_or_select: Zum dekat atau pilih satu kawasan pada peta untuk dilihat
tag_details:
confirm: Sahkan
hide_link: Sorokkan komen ini
diary_entry:
- comment_count: "%{count} komen"
+ comment_count:
+ other: "%{count} komen"
+ zero: Tiada komen
comment_link: Ulas catatan ini
confirm: Sahkan
edit_link: Sunting catatan ini
infringement_1_html: Penyumbang OSM diingatkan supaya tidak sesekali menambah data dari mana-mana sumber berhak cipta (cth. Google Maps atau peta cetakan) tanpa izin bersurat dari pemegang hak cipta.
infringement_2_html: "Sekiranya anda percaya bahawa bahan berhak cipta telah dtambahkan secara tidak berpatutan ke dalam pangkalan OpenStreetMap atau tapak ini, sila rujuk <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">prosedur penarikan</a> atau laporkan secara terus ke dalam \n<a href=\"http://dmca.openstreetmap.org/\">halaman laporan on-line</a>."
infringement_title_html: Pencabulan hak cipta
- intro_1_html: OpenStreetMap merupakan <i>data terbuka</i> yang dilesenkan di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Pengiktirafan-PerkongsianSerupa 2.0</a> (CC BY-SA).
+ intro_1_html: "OpenStreetMap ialah <i>data terbuka</i> yang dilesenkan di bawah <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Anda bebas menyalin, mengedarkan, menyebarkan dan mengubah suai data kami, asalkan anda memperakui OpenStreetMap dan para penyumbangnya. Jika anda mengubah suai atau menokok tambah data kami, anda boleh mengedarkannya di bawah lesen yang sama sahaja. <a href="http://opendatacommons.org/licenses/odbl/1.0/">Kanun undang-undang</a> yang lengkap ini menerangkan hak-hak dan tanggungjawab anda.
intro_3_html: Kartografi jubin peta kami serta dokumentasi kami dilesenkan di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Pengiktirafan-PerkongsianSerupa 2.0</a> (CC-BY-SA).
more_1_html: Baca lebih lanjut tentang penggunaan data kami serta memperakui kami di <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Soalan Lazim Undang-Undang</a>.
# Export driver: syck-pecl
# Author: Danmichaelo
# Author: Dittaeva
+# Author: EvenT
# Author: Event
# Author: Gustavf
# Author: Haakon K
show_areas: Vis områder
show_history: Vis historikk
unable_to_load_size: "Klarte ikke laste inn: Avgrensingsboks med størrelse %{bbox_size} er for stor (må være mindre enn %{max_bbox_size})"
+ view_data: Vis data for gjeldende kartvisning
wait: Vent ...
zoom_or_select: Zoom inn eller velg et område av kartet for visning
tag_details:
hide_link: Skjul denne kommentaren
diary_entry:
comment_count:
- one: 1 kommentar
+ one: "{count} kommentar"
other: "%{count} kommentarer"
+ zero: Ingen kommentarer
comment_link: Kommenter denne oppføringen
confirm: Bekreft
edit_link: Rediger denne oppføringen
license_page:
foreign:
english_link: den engelske originalen
- text: I tilfellet av en konflikt mellom denne oversatte siden og %{english_original_link} har den engelske presedens
+ text: I tilfelle konflikt mellom denne oversatte siden og %{english_original_link} har den engelske versjonen presedens
title: Om denne oversettelsen
legal_babble:
+ attribution_example:
+ alt: Eksempel på hvordan man angir OpenStreetMap som kartkilde på en nettside
contributors_at_html: "<strong>Østerrike</strong>: Inneholder data fra\n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> under\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>,\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> og\nLand Tirol (under <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT med tilføyelser</a>)."
contributors_ca_html: "<strong>Canada</strong>: Inneholder data fra\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada)."
contributors_footer_1_html: For detaljer om disse og andre kilder som har blitt brukt for å forbedre OpenStreetMap, se <a href="http://wiki.openstreetmap.org/wiki/Contributors">siden med bidragsytere</a> på OpenStreetMap-wikien.
contributors_nz_html: "<strong>New Zealand</strong>: Inneholder data hentet fra\n Land Information New Zealand. Crown Copyright reservert."
contributors_title_html: Våre bidragsytere
contributors_za_html: "<strong>Sør-Afrika</strong>: Inneholder data fra <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, State copyright reservert."
- credit_1_html: "Hvis du bruker kartgrafikk fra OpenStreetMap, ber vi om at krediteringen som minimum inneholder \n «© OpenStreetMap-bidragsytere, CC BY-SA». Hvis du kun bruker kartdata, ber vi om krediteringen \n «Kartdata © OpenStreetMap-bidragsytere, CC BY-SA»."
+ credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene».
credit_2_html: " Der det er mulig, bør OpenStreetMap bli lenket til <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n og CC BY-SA til <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Hvis\n du bruker et medium der lenker ikke er mulig (f.eks. i utskrevne arbeid), foreslår vi at du henviser leserne til\n www.openstreetmap.org (kanskje ved å utvide 'OpenStreetMap' til denne fullstendige adressen) og til\n www.creativecommons.org."
+ credit_3_html: For et navigerbart elektronisk kart bør krediteringen vises i hjørnet på kartet.
credit_title_html: Hvordan kreditere OpenStreetMap
infringement_title_html: Brudd på opphavsrettigheter
- intro_1_html: " OpenStreetMap er <i>åpne data</i>, lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap er <i>åpne data</i>, lisensiert under <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Du står fritt til å kopiere, distribuere, overføre og tilpasse våre kart og data, så lenge du krediterer OpenStreetMap og dens bidragsytere. Hvis du endrer eller bygger videre på våre kart eller data, må du distribuere resultatet under samme lisens. Den fullstendige <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">juridiske teksten</a> beskriver rettigheter og ansvar.
+ intro_3_html: "Kartografien i våre kartruter, samt dokumentasjonen, er lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> license (CC-BY-SA)."
more_1_html: " Les mer om hvordan du bruker våre data i den <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiske\n FAQ-en"
more_2_html: "Selv om OpenStreetMap er åpne data, kan vi ikke bidra med gratiskart-API for tredjepartsutviklere. Nærmere informasjon finnes på <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API Usage Policy</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Tile Usage Policy</a> og <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim Usage Policy</a>."
more_title_html: Finn ut mer
map: kart
none: Ingen
owner: "Eier:"
- pending: VENTENDE
+ pending: VENTER
points: "Punkter:"
start_coordinates: "Startkoordinat:"
tags: "Markelapper:"
you need to accept or decline: Les og deretter enten godta eller avslå de nye bidragsytervilkårene for å fortsette.
view:
activate_user: aktiver denne brukeren
- add as friend: legg til som en venn
+ add as friend: legg til som venn
ago: (%{time_in_words_ago} siden)
block_history: mottatte blokkeringer
blocks by me: blokkeringer utført av meg
# Messages for Dutch (Nederlands)
# Exported from translatewiki.net
# Export driver: syck-pecl
+# Author: Donarreiskoffer
# Author: Freek
# Author: Fruggo
# Author: Greencaps
show_areas: Gebieden weergeven
show_history: Geschiedenis weergeven
unable_to_load_size: Laden is niet mogelijk. Het selectiekader van %{bbox_size} is te groot. Het moet kleiner zijn dan %{max_bbox_size}
+ view_data: Gegevens voor huidige kaartweergave weergeven
wait: Een ogenblik geduld alstublieft...
zoom_or_select: Inzoomen of een gebied van de kaart selecteren om te bekijken
tag_details:
new:
title: Nieuw dagboekbericht
no_such_entry:
- body: Er is geen dagboekbericht of opmerking met het id %{id}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
+ body: Er is geen dagboekbericht of opmerking met het id %{id}. Controleer de spelling, of misschien is de koppeling waarop u geklikt hebt onjuist.
heading: Een bericht met id %{id} bestaat niet
title: Het opgevraagde dagboekbericht bestaat niet
view:
infringement_1_html: "Bijdragers aan OSM mogen nooit gegevens toevoegen\nuit bronnen waarvan de licentie niet vrij is (bijvoorbeeld Google Maps of gedrukte kaarten)\nzonder expliciete toestemming van de auteursrechtenhouders."
infringement_2_html: "Als u van mening bent dat auteursrechtelijk beschermd en niet vrij gelicenseerd materiaal\nongeoorloofd aan de database van OpenStreetMap is toegevoegd, raadpleeg dan\nonze <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">takedownprocedure</a>\nof meld het direct en formeel via onze <a href=\"http://dmca.openstreetmap.org/\">online claimpagina</a>."
infringement_title_html: Auteursrechtenschending
- intro_1_html: "OpenStreetMap is <i>open data</i>, gelicenceerd onder de licentie <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Naamsvermelding-Gelijk delen 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, gelicenseerd onder de <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Het staat u vrij onze gegevens te kopiëren, te distribueren,\nweer te geven en aan te passen, zo lang als u OpenStreetMap en haar\nauteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,\nmag u de resultaten onder dezelfde licentie distribueren. In de\nvolledige <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridische\ntekst</a> worden uw rechten en verantwoordelijkheden uitgelegd."
intro_3_html: "De cartografie in onze kaarttegels en onze documentatie zijn\ngelicenseerd onder de licentie <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Naamsvermelding-Gelijk delen 2.0</a> license (CC-BY-SA)."
more_1_html: "U kunt meer lezen over het gebruik van onze gegevens en hoe naamsvermelding toe te passen in de <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Veel gestelde juridische\nvragen</a>."
email_confirm:
subject: "[OpenStreetMap] Bevestig uw e-mailadres"
email_confirm_html:
- click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande verwijzing om de wijziging te bevestigen.
+ click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande koppeling om de wijziging te bevestigen.
greeting: Hallo,
hopefully_you: Iemand - hopelijk u - wil zijn e-mailadres op %{server_url} wijzigen naar %{new_address}.
email_confirm_plain:
- click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande verwijzing om de wijziging te bevestigen.
+ click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande koppeling om de wijziging te bevestigen.
greeting: Hallo,
hopefully_you_1: Iemand - hopelijk u - wil zijn e-mailadres op
hopefully_you_2: "%{server_url} wijzigen naar %{new_address}."
lost_password:
subject: "[OpenStreetMap] Verzoek wachtwoord opnieuw instellen"
lost_password_html:
- click_the_link: Als u dit bent, klik dan op de onderstaande verwijzing om uw wachtwoord te wijzigen.
+ click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om uw wachtwoord te wijzigen.
greeting: Hallo,
hopefully_you: Iemand - mogelijk u - heeft aangevraagd om het wachtwoord opnieuw in te stellen voor de gebruiker met dit e-mailadres op openstreetmap.org.
lost_password_plain:
- click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande verwijzing om uw wachtwoord opnieuw in te stellen.
+ click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande koppeling om uw wachtwoord opnieuw in te stellen.
greeting: Hallo,
hopefully_you_1: Iemand - mogelijk u - heeft aangevraagd om het wachtwoord opnieuw in te stellen voor
hopefully_you_2: de gebruiker met dit e-mailadres op openstreetmap.org.
header: "%{from_user} heeft u een bericht gezonden via OpenStreetMap met het onderwerp %{subject}:"
hi: Hallo %{to_user},
signup_confirm:
- confirm: "Voordat we iets doen, zoeken we bevestiging dat dit verzoek inderdaad van u afkomstig is. Als dat zo is, klik dan op de onderstaande verwijzing om uw gebruiker te bevestigen:"
+ confirm: "Voordat we iets doen, zoeken we bevestiging dat dit verzoek inderdaad van u afkomstig is. Als dat zo is, klik dan op de onderstaande koppeling om uw gebruiker te bevestigen:"
created: Iemand (hopelijk u) heeft zojuist een gebruiker aangemaakt op %{site_url}.
greeting: Hallo!
subject: "[OpenStreetMap] Welkom bij OpenStreetMap"
blog_and_twitter: "Volg het laatste nieuws via de OpenStreetMap-blog of Twitter:"
current_user: "Hier is een lijst te vinden met de labels voor huidige gebruikers:"
introductory_video: "Er is een introductievideo over OpenStreetMap:"
- more_videos: "Via de volgende verwijzing zijn meer video's beschikbaar:"
+ more_videos: "Via de volgende koppeling zijn meer video's beschikbaar:"
opengeodata: "OpenGeoData.org is de blog van OpenStreetMap-grondlegger Steve Coast, en deze biedt ook podcasts aan:"
the_wiki: "Lees meer over OpenStreetMap op de wiki:"
user_wiki_page: Het is aan te raden om een gebruikerspagina op de wiki aan te maken, waar u categorielabels aan kunt toevoegen, zoals [[Category:Users_in_London]].
js_2: OpenStreetMap gebruikt JavaScript voor de slippy-kaart.
license:
copyright: Copyright OpenStreetMap en bijdragers, onder een open licentie
- permalink: Permanente verwijzing
+ permalink: Permanente koppeling
remote_failed: Bewerken is mislukt. Zorg dat JOSM of Merkaartor is geladen en dat de instelling voor Remote Control is ingeschakeld
- shortlink: Korte verwijzing
+ shortlink: Korte koppeling
key:
map_key: Legenda
map_key_tooltip: Kaartsleutel
heading: Kopje
headings: Kopjes
image: Afbeelding
- link: Verwijzing
+ link: Koppeling
ordered: Geordende lijst
second: Tweede item
subheading: Onderkop
heading: "Bijdragersovereenkomst:"
link text: wat is dit?
not yet agreed: U hebt nog niet ingestemd met de nieuwe Bijdragersovereenkomst.
- review link text: Volg deze verwijzing als u wilt om de nieuwe Bijdragersovereenkomst te lezen en te accepteren.
+ review link text: Volg deze koppeling als u wilt om de nieuwe Bijdragersovereenkomst te lezen en te accepteren.
current email address: "Huidige e-mailadres:"
delete image: Huidige afbeelding verwijderen
email never displayed publicly: (nooit openbaar gemaakt)
title: Gebruikers
login:
account is suspended: Uw gebruiker is automatisch opgeschort vanwege verdachte activiteit.<br />Neem contact op met de <a href="%{webmaster}">webmaster</a> als u deze handeling wilt bespreken.
- account not active:
Sorry, uw gebruiker is nog niet actief.<br />Klik op de verwijzing in de bevestigingse-mail om deze te activeren of <a href="%{reconfirm}">vraag een nieuwe bevestigingse-mail aan</a>.
+ account not active:
Uw gebruiker is helaas nog niet actief.<br />Klik op de koppeling in de bevestigingse-mail om deze te activeren of <a href="%{reconfirm}">vraag een nieuwe bevestigingse-mail aan</a>.
auth failure: Sorry, met deze gegevens kunt u niet aanmelden.
create account minute: Maak een gebruiker aan. Dat is snel gebeurd.
email or username: "E-mailadres of gebruikersnaam:"
lost_password:
email address: "E-mailadres:"
heading: Wachtwoord vergeten?
- help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie. We sturen u dan een webverwijzing die u kunt gebruiken om uw wachtwoord opnieuw in te stellen.
+ help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie. We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw in te stellen.
new password button: Nieuw wachtwoord verzenden
notice email cannot find: Kon dat e-mailadres niet vinden, sorry.
notice email on way: Spijtig om te horen dat u het vergeten bent, maar er is een e-mail onderweg zodat u uw wachtwoord opnieuw kunt instellen.
password: "Wachtwoord:"
terms accepted: Dank u wel voor het aanvaarden van de nieuwe bijdragersovereenkomst!
terms declined: We vinden het jammer dat u hebt besloten de nieuwe Bijdragersvoorwaarden niet te accepteren. Zie <a href="%{url}">deze wikipagina</a> voor meer informatie.
- title: Gebruiker aanmaken
+ title: Registreren
use openid: U kunt ook aanmelden met een %{logo} OpenID
no_such_user:
body: Sorry, er is geen gebruiker met de naam %{user}. Controleer de spelling, of misschien is de link waarop je klikte onjuist.
show_areas: Vis områder
show_history: Vis historikk
unable_to_load_size: "Klarte ikkje laste inn: Avgrensingsboks med storleik %{bbox_size} er for stor (må vere mindre enn %{max_bbox_size})"
+ view_data: Vis data for gjeldande kartvising
wait: Vent ...
zoom_or_select: Zoom inn eller vel eit område av kartet for vising
tag_details:
osm_offline: OpenStreetMap databasen er for augneblunken utilgjengelig medan essensielt vedlikeholdsarbeid vert utført.
osm_read_only: OpenStreetMap kan ikkje redigerast akkurat no, på grunn av nødvendig vedlikehaldsarbeid.
partners_bytemark: Bytemark Hosting
- partners_html: Drifta er støtta av %{ucl}, %{ic} og %{bytemark}, og andre %{partners}.
+ partners_html: Drifta er støtta av %{ucl}, %{ic}, %{bytemark} og andre %{partners}.
partners_ic: Imperial College London
partners_partners: partnarar
- partners_ucl: UCL VR senteret
+ partners_ucl: UCL VR-senteret
project_name:
h1: OpenStreetMap
title: OpenStreetMap
license_page:
foreign:
english_link: den engelske originalen
- text: I tilfellet konflikt mellom denne omsette sida og %{english_original_link} har den engelske presedensen
+ text: I tilfelle konflikt mellom denne omsette sida og %{english_original_link} har den engelske versjonen presedens
title: Om denne omsetjinga
legal_babble:
attribution_example:
contributors_nz_html: "<strong>New Zealand</strong>: Inneheld data henta frå\n Land Information New Zealand. Crown Copyright reservert."
contributors_title_html: Bidragsytarane våre
contributors_za_html: "<strong>Sør-Afrika</strong>: Inneheld data frå <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, State copyright reserved."
- credit_1_html: "Me krever at du brukar krediteringa “© OpenStreetMap \ncontributors”."
- credit_2_html: Du må óg gjere det klart at dataa er tilgjenglig under Open Database Licesese, og dersom du brukar kartflisene, at kartografien er lisensiert under CC BY-SA. Du kan gjere dette ved å lenke til <a href="http://www.openstreetmap.org/copyright">denne sida</a>. Alternativt, og eit krav om du distrubuerer OSM i dataform, kan du nevne og linke til lisensen eller lisensane. I former der linkar er umoglige (t.d. trykte verk), foreslår me at du henviser lesarane dine til openstreetmap.org (kansje ved å utvide 'OpenStreetMap' til denne fulle adressa), til opendatacommons.org, og dersom relevant, til creativecommons.org.
+ credit_1_html: Me krev at du brukar godskrivinga «© OpenStreetMap-bidragsytarane».
+ credit_2_html: Du må óg gjere det klart at dataa er tilgjenglig under Open Database Licesese, og dersom du brukar kartflisene, at kartografien er lisensiert under CC BY-SA. Du kan gjere dette ved å lenke til <a href="http://www.openstreetmap.org/copyright">denne sida</a>. Alternativt, og eit krav om du distrubuerer OSM i dataform, kan du nevne og linke til lisensen eller lisensane. I former der linkar er umoglige (t.d. trykte verk), foreslår me at du henviser lesarane dine til openstreetmap.org (kanskje ved å utvide 'OpenStreetMap' til denne fulle adressa), til opendatacommons.org, og dersom relevant, til creativecommons.org.
credit_3_html: "For et navigerbart elektronisk kart, skal kjelda visast i hjørnet av kartet.\nTil dømes:"
credit_title_html: Korleis kreditere OpenStreetMap
infringement_1_html: "OSM-bidragsytarar vert minna på å aldri leggje til data frå opphavsrettsbeskytta kjelder (t.d. Google Maps eller utskrivne kart) utan\n uttrykkeleg løyve frå rettighetshavere."
infringement_2_html: "Dersom du trur at kopibeskytta materiale har blitt lagt inn i OpenStreetMap databasen eller denne sida, venligst henvend deg til vår <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">takedown \nprosedyre</a> eller direkte til vårt <a href=\"http://dmca.openstreetmap.org/\">online skjema</a>."
infringement_title_html: Illegal kopiering
- intro_1_html: "OpenStreetMap er <i>opne data</i>, lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA)."
+ intro_1_html: Data frå OpenStreetMap er <i>åpne data</i>, lisensiert under <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
intro_2_html: "Du er fri til å kopiere, distribuere, overføre og tilpasse dataa våre, så lenge du godskriv OpenStreetMap og bidragsytarane\n deira. Dersom du endrar eller byggjer på dataa våre, kan du berre distribuere resultatet under same lisens. \n Den fullstendige <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiske\n teksten</a> forklarer rettane og ansvaret."
intro_3_html: "Kartografien i våre kartfliser, og dokumentasjonen vår, er lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA)."
more_1_html: "Les meir om korleis du brukar dataa våre, og korleis du krediterer oss, i den <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiske\n FAQ-en</a>."
friendly: "%e %B %Y kl. %H:%M"
trace:
create:
- trace_uploaded: Din GPX-fil er lasa opp og ventar på å verte sett inn i databasen. Dette skjer vanlegvis innan ein halvtime og ein e-post vert send til deg når det er gjort.
+ trace_uploaded: GPX-fila di er lasta opp og ventar på å bli sett inn i databasen. Dette skjer vanlegvis innan ein halvtime og ein e-post vert sendt til deg når det er gjort.
upload_trace: Last opp GPS-spor
delete:
scheduled_for_deletion: Spor planlagt sletta
in: i
map: kart
more: meir
- pending: VENTER
+ pending: VENTAR
private: PRIVAT
public: OFFENTLEG
trace_details: Vis detaljar for spor
map: kart
none: Ingen
owner: "Eigar:"
- pending: VENTANDE
+ pending: VENTAR
points: "Punkter:"
start_coordinates: "Startkoordinat:"
tags: "Markelappar:"
title: Gløymt passord
make_friend:
already_a_friend: Du er allereie venner med %{name}.
- button: Legg til som ein ven
+ button: Legg til som ven
failed: Klarte ikkje leggje til %{name} som ven.
heading: Legg til %{user} som ein ven?
success: "%{name} er no venen din."
you need to accept or decline: Les og deretter anten godta eller avslå dei nye bidragsytervilkåra for å halde fram.
view:
activate_user: aktiver denne brukaren
- add as friend: legg til som ein ven
+ add as friend: legg til som ven
ago: (%{time_in_words_ago} sidan)
block_history: mottekne blokkeringar
blocks by me: blokkeringar utført av meg
# Author: BeginaFelicysym
# Author: Deejay1
# Author: Nemo bis
+# Author: Odie2
# Author: Przemub
# Author: RafalR
+# Author: Rezonansowy
# Author: Soeb
# Author: Sp5uhe
# Author: Woytecr
application:
require_cookies:
cookies_needed: Wydaje się, że masz wyłączoną obsługę ciasteczek (cookies) w swojej przeglądarce internetowej – włącz ją, zanim przejdziesz dalej.
+ require_moderator:
+ not_a_moderator: Musisz być moderatorem, aby wykonać tą akcję.
setup_user_auth:
blocked: Twój dostęp do API jest zablokowany. Zaloguj się do interfejsu sieciowego, aby dowiedzieć się więcej.
need_to_see_terms: Dostęp do API został czasowo zawieszony. Proszę się zalogować do interfejsu sieci, aby wyświetlić postanowienia. Nie musisz ich akceptować, ale chociaż przejrzeć.
prev_changeset_tooltip: Poprzednia edycja wykonana przez użytkownika %{user}
node:
download_xml: Ściągnij XML
- edit: edytuj
+ edit: Edytuj węzeł
node: Węzeł
node_title: "Węzeł: %{node_name}"
- view_history: zobacz historię zmian
+ view_history: Zobacz historię
node_details:
coordinates: "Współrzędne:"
part_of: "Jest częścią:"
download_xml: Ściągnij XML
node_history: Historia zmian węzła
node_history_title: "Historia punktu: %{node_name}"
- view_details: zobacz szczegóły
+ view_details: Zobacz szczegóły
not_found:
sorry: Niestety %{type} o id %{id} nie został znaleziony.
type:
of: z
showing_page: Widoczna jest strona
redacted:
+ message_html: Wersja %{version} tego %{type} nie może zostać pokazana jako zredagowana. Zapoznaj się z %{redaction_link}, aby uzyskać szczegółowe informacje.
type:
node: węzeł
relation: relacja
show_areas: Pokaż obszary
show_history: Pokaż zmiany
unable_to_load_size: "Nie można załadować: prostokąt ograniczający %{bbox_size} jest zbyt duży (nie może przekraczać %{max_bbox_size} stopnia)"
+ view_data: Zobacz dane w aktualnym widoku mapy
wait: Moment…
zoom_or_select: Przybliż albo wybierz inny obszar mapy
tag_details:
description_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu
description_user: Zestawy zmian utworzone przez użytkownika %{user}
description_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox}
+ empty_anon_html: Nie podjęto jeszcze edycji
empty_user_html: Wydaje się że jeszcze nie edytowałeś. By zacząć, przejrzyj <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Przewodnik dla początkujących</a>.
heading: Zestawy zmian
heading_bbox: Zestawy zmian
comments:
ago: "%{ago} temu"
comment: Komentarz
+ has_commented_on: "%{display_name} skomentował następujące wpisy dziennika"
newer_comments: Nowsze komentarze
older_comments: Starsze komentarze
post: Wpis
auditorium: Audytorium
bank: Bank
bar: Bar
+ bbq: Miejsce do grillowania
bench: Ławka
bicycle_parking: Parking rowerowy
bicycle_rental: Wypożyczalnia rowerów
bridge:
aqueduct: Akwedukt
suspension: Most wiszący
+ swing: Most obrotowy
viaduct: Wiadukt
"yes": Most
building:
railway: Teren kolejowy
recreation_ground: Ziemia rekreacyjna
reservoir: Sztuczny zbiornik wodny
+ reservoir_watershed: Zbiornik wodny
residential: Zabudowa mieszkaniowa
retail: Handel detaliczny
road: Obszar drogowy
channel: Kanał
cliff: Urwisko
crater: Krater
+ dune: Wydma
feature: Obiekt
fell: Hale górskie
fjord: Fiord
wetlands: Obszary podmokłe
wood: Puszcza
office:
+ accountant: Księgowy
architect: Architekt
company: Przedsiębiorstwo
employment_agency: Urząd pracy
estate_agent: Biuro nieruchomości
government: Biura rządowe
+ insurance: Biuro ubezpieczeń
+ lawyer: Prawnik
+ ngo: Biuro organizacji pozarządowych
+ telecommunication: Urząd telekomunikacji
+ travel_agent: Biuro podróży
+ "yes": Biuro
place:
airport: Lotnisko
city: Miasto
houses: Zabudowanie
island: Wyspa
islet: Wysepka
+ isolated_dwelling: Oddzielny dom-gospodarstwo
locality: Rejon
moor: Torfowisko
municipality: Gmina
junction: Węzeł kolejowy
level_crossing: Przejazd kolejowy
light_rail: Lekka kolej
+ miniature: Mini kolej
monorail: Kolej jednoszynowa
narrow_gauge: Kolej wąskotorowa
platform: Peron
yard: Stacja postojowa, lokomotywownia
shop:
alcohol: Sklep monopolowy
+ antiques: Antyki
art: Sklep z dziełami sztuki
bakery: Piekarnia
beauty: Salon kosmetyczny
valley: Dolina
viewpoint: Punkt widokowy
zoo: Zoo
+ tunnel:
+ "yes": Tunel
waterway:
+ artificial: Sztuczne zbiorniki wodne
boatyard: Stocznia
canal: Kanał
connector: Złącze dróg wodnych
history_tooltip: Wyświetla przeprowadzone edycje dla tego obszaru
history_zoom_alert: Musisz przybliżyć się, by odczytać historię edycji
layouts:
+ community: Społeczność
community_blogs: Blogi wspólnoty
community_blogs_title: Blogi członków społeczności OpenStreetMap
copyright: Prawa autorskie i licencja
history: Zmiany
home: główna
home_tooltip: Przejdź do strony głównej
+ inbox_html: wiadomości %{count}
inbox_tooltip:
one: Twoja skrzynka zawiera jedną nową wiadomość
other: Twoja skrzynka zawiera %{count} nowych wiadomości
zero: Brak nowych wiadomości
intro_1: OpenStreetMap to mapa całego świata, którą możesz swobodnie edytować. Tworzą ją ludzie tacy jak Ty.
+ intro_2_create_account: Utwórz konto
+ intro_2_download: pobierz
+ intro_2_html: Wszystkie dane są bezpłatne dla %{download}, %{use} i są dostępne na %{license}. %{create_account} w celu poprawienia mapy.
+ intro_2_license: wolna licencja
+ intro_2_use: użyj
log_in: zaloguj się
log_in_tooltip: Zaloguj się
logo:
title: Wspomóż OpenStreetMap za pomocą darowizny pieniężnej
osm_offline: Baza danych OpenStreetMap jest niedostępna na czas ważnych zadań administracyjnych, które są w tym momencie wykonywane.
osm_read_only: Baza danych OpenStreetMap jest w trybie tylko-do-odczytu na czas ważnych zadań administracyjnych, które są w tym momencie wykonywane.
+ partners_bytemark: Hosting Bytemark
+ partners_html: Hosting obsługuje %{ucl}, %{ic}, %{bytemark}, a także inni %{partners}.
+ partners_ic: Królewskie kolegium w Londynie
+ partners_partners: partnerzy
+ partners_ucl: centrum UCL VR
sign_up: zarejestruj
sign_up_tooltip: Załóż konto, aby edytować
tag_line: Swobodna Wiki-Mapa Świata
text: W przypadku konfliktu pomiędzy tym tłumaczeniem a %{english_original_link}, preferowana jest strona w języku angielskim.
title: Informacje o tłumaczeniu
legal_babble:
+ attribution_example:
+ alt: Przykład, jak przypisywać OpenStreetMap na stronie internetowej
+ title: Przykład uznania autorstwa
contributors_at_html: "<strong>Austria</strong>: Zawiera dane <a href=\"http://data.wien.gv.at/\">miasta Wiednia</a> (na licencji <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> oraz\nLand Tyrol (na licencji <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT z późniejszymi zmianami</a>)."
contributors_ca_html: "<strong>Kanada</strong>: Zawiera dane z GeoBase®, GeoGratis (© ''Department of Natural Resources Canada''), CanVec (© ''Department of Natural Resources Canada'') i StatCan (''Geography Division, Statistics Canada'')."
+ contributors_footer_1_html: "Szczegóły tych i innych źródeł, które zostały wykorzystane,\naby poprawić OpenStreetMap, są dostępne na stronie\n<a href=\"http://wiki.openstreetmap.org/wiki/Contributors\">Uczestnicy (en)</a>"
contributors_footer_2_html: Włączenie danych do OpenStreetMap nie musi oznaczać, że podmiot będący ich źródłem popiera OpenStreetMap, udziela jakiejkolwiek gwarancji lub ponosi jakąkolwiek odpowiedzialność.
contributors_fr_html: "<strong>Francja</strong>: Zawiera dane uzyskane z ''Direction Générale des Impôts''.</li>"
contributors_gb_html: "<strong>Wielka Brytania</strong>: Zawiera dane ''Ordnance Survey''. © Crown copyright and database right 2010."
contributors_nl_html: "<strong>Holandia</strong>: Zawiera dane © AND, 2007\t\n(<a href=\"http://www.and.com\">www.and.com</a>)"
contributors_nz_html: "<strong>Nowa Zelandia</strong>: Zawiera dane uzyskane z ''Land Information New Zealand''. Crown Copyright reserved."
contributors_title_html: Dane włączone do OpenStreetMap
+ contributors_za_html: "<strong>Południowa Afryka</strong>: zawiera dane pochodzące\nz <a href=\"http://www.ngi.gov.za/\">zarządu głównego:\nNational Geo-Spatial Information</a>, prawa autorskie państwa zastrzeżone."
credit_1_html: Jeśli korzystasz z gotowej mapy OpenStreetMap, wymagane jest podanie źródła co najmniej w postaci „© użytkownicy OpenStreetMap, CC BY-SA”. Jeśli korzystasz tylko z danych geograficznych, wymagane jest podanie źródła w postaci „Dane mapy © użytkownicy OpenStreetMap, CC BY-SA”.
credit_2_html: O ile jest to możliwe, nazwa OpenStreetMap powinna być hiperłączem do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>, zaś CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. Jeśli korzystasz z nośnika, który uniemożliwia tworzenie hiperłącz (np. druk na papierze), zalecane jest kierowanie oglądających do stron internetowych www.openstreetmap.org (np. przez rozwinięcie nazwy OpenStreetMap do pełnego adresu internetowego) oraz www.creativecommons.org.
+ credit_3_html: Przy przeglądaniu map elektronicznych, podziękowania powinny pojawić się w rogu mapy.
credit_title_html: Jak podać źródło
- intro_1_html: OpenStreetMap stanowi zbiór <i>wolnych danych</i>, udostępnianych na licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
+ infringement_1_html: Użytkownicy OpenStreetMap powinni pamiętać, aby nigdy nie dodawać danych z jakichkolwiek źródeł chronionych prawami autorskimi (jak np. Google Maps i większość map drukowanych) bez wyraźnego pozwolenia właściciela praw autorskich.
+ infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim został niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedury usuwania danych</a> lub <a href="http://dmca.openstreetmap.org/">wypełnij formularz on-line</a>.
+ infringement_title_html: Naruszenia praw autorskich
+ intro_1_html: "OpenStreetMap zawiera <i>wolne dane</i>, rozpowszechniane na licencji <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze mapy i dane, pod warunkiem podania OpenStreetMap i jego użytkowników jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze mapy lub dane, wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji. <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">Pełen tekst licencji</a> dokładnie opisuje Twoje prawa i obowiązki.
+ intro_3_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane na warunkach licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pl/">Uznanie autorstwa na tych samych warunkach 2.0</a> (CC-BY-SA 2.0).
more_1_html: Więcej informacji o możliwości wykorzystania danych OpenStreetMap można znaleźć w <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>.
more_2_html: Użytkownicy OpenStreetMap powinni pamiętać, aby nigdy nie dodawać danych z jakichkolwiek źródeł chronionych prawami autorskimi (jak np. Google Maps i większość map drukowanych) bez wyraźnego pozwolenia właściciela praw autorskich.
more_title_html: Dowiedz się więcej
outbox:
date: Nadano
inbox: odbiorcza
+ messages:
+ one: Masz %{count} wysłaną wiadomość
+ other: Masz %{count} wysłanych wiadomości
my_inbox: Moja skrzynka %{inbox_link}
no_sent_messages: Nie masz jeszcze wysłanych wiadomości. Może skontaktujesz się z %{people_mapping_nearby_link}?
outbox: nadawcza
header: "%{from_user} wysłał do Ciebie wiadomość z OpenStreetMap o temacie %{subject}:"
hi: Witaj %{to_user},
signup_confirm:
+ confirm: "Musimy upewnić się, że wniosek pochodzi od ciebie, dlatego kliknij na łącze poniżej, aby potwierdzić założenie konta:"
+ created: Ktoś (mamy nadzieję, że ty) właśnie założył konto w %{site_url}.
+ greeting: Cześć!
subject: "[OpenStreetMap] Prośba o potwierdzenie adresu e-mail"
+ welcome: Chcielibyśmy powitać cię i dostarczyć kilka dodatkowych informacji na dobry początek.
signup_confirm_html:
ask_questions: Możesz zadać nurtujące Cię pytania dotyczące OpenStreetMap na <a href="http://help.openstreetmap.org/">naszej stronie pytań i odpowiedzi</a>.
current_user: Aktualne listy użytkowników według ich położenia na Ziemi znajdziesz na stronie <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
signup_confirm_plain:
ask_questions: "Możesz zadać nurtujące Cię pytania dotyczące OpenStreetMap na naszej stronie pytań i odpowiedzi:"
blog_and_twitter: "Bądź na bieżąco z wiadomościami poprzez blog OpenStreetMap czy Twitter:"
+ current_user: "Lista z kategoriami dostępna jest pod adresem:"
introductory_video: "To dobry moment żeby obejrzeć wideo-wprowadzenie do OpenStreetMap tutaj:"
more_videos: "Więcej materiału wideo znajdziesz na:"
opengeodata: "OpenGeoData.org to blog założyciela OpenStreetMap, Steve'a Coasta. Ma także podcasty:"
the_wiki: "Zacznij czytać o OpenStreetMap na naszej wiki:"
+ user_wiki_page: Zalecane jest utworzenie własnej strony użytkownika na wiki, która zawiera twoją lokalizację.
wiki_signup: "Załóż sobie konto na wiki projektu OpenStreetMap jeśli chcesz:"
oauth:
oauthorize:
my_apps: Programy klienckie
my_tokens: Zarejestrowane programy
no_apps: Czy chcesz zarejestrować programy korzystające ze standardu %{oauth}? Programy muszą być wcześniej zarejestrowane, nim będzie można skorzystać z zapytań OAuth do tego serwisu.
+ register_new: Zarejestruj swoją aplikację
revoke: Odwołaj!
title: Szczegóły autoryzacji OAuth
new:
submit: Zarejestruj
title: Rejestracja nowej aplikacji
show:
+ access_url: "URL znaki dostępu:"
+ authorize_url: "URL upoważnienia:"
+ confirm: Jesteś pewien?
+ delete: Usuń klienta
edit: Edytuj szczegóły
key: "Klucz odbiorcy:"
secret: "Sekret odbiorcy:"
+ support_notice: Wspieramy HMAC-SHA1 (zalecane) jak i zwykły tekst, w trybie SSL.
title: Szczegóły OAuth dla %{app_name}
+ url: "URL znacznika zapytania:"
redaction:
create:
flash: Utworzono poprawkę.
unsurfaced: Droga nieutwardzona
wood: Puszcza
markdown_help:
+ alt: Tekst alternatywny
+ first: Pierwszy element
heading: Nagłówek
headings: Nagłówki
+ image: Obraz
+ link: Łącze
+ ordered: Uporządkowana lista
+ second: Drugi element
+ subheading: Podtytuł
+ text: Tekst
+ title_html: Analizowany z <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+ unordered: Lista nieuporządkowana
+ url: Adres (URL)
+ richtext_area:
+ edit: Edytuj
+ preview: Podgląd
search:
search: Szukaj
search_help: "przykłady: 'Wąchock', 'Franciszkańska, Poznań', 'CB2 5AQ', lub 'post offices near Mokotów' <a href='http://wiki.openstreetmap.org/wiki/Search'>więcej przykładów...</a>"
trace_optionals:
tags: Znaczniki
trace_paging_nav:
+ newer: Nowsze ślady
+ older: Starsze ślady
showing_page: Wyświetlanie strony %{page}
view:
delete_track: Wykasuj ten ślad
heading: "Warunki uczestnictwa:"
link text: co to jest?
not yet agreed: Nie zgodziłeś się na nowe warunki uczestnictwa.
+ review link text: Proszę, przejdź na tą stronę, w dogodnym dla ciebie czasie, żeby potwierdzić zgodę na nowe Warunkami Uczestnictwa.
current email address: "Aktualny adres e-mail:"
delete image: Usuń obecną grafikę
email never displayed publicly: (nie jest wyświetlany publicznie)
flash update success: Zaktualizowano profil użytkownika.
flash update success confirm needed: Zaktualizowano profil użytkownika. Sprawdź czy przyszedł już mail potwierdzający nowy adres mailowy.
+ gravatar:
+ gravatar: Użyj Gravatara
+ link text: co to jest?
home location: "Lokalizacja domowa:"
image: "Grafika:"
image size hint: (najlepiej sprawdzają się kwadratowe obrazy o rozmiarach przynajmniej 100x100)
title: zgubione hasło
make_friend:
already_a_friend: "%{name} już jest Twoim gronie znajomych."
+ button: Dodaj do listy przyjaciół
failed: Niestety dodanie %{name} jako znajomego nie powiodło się.
+ heading: Dodać %{user} do listy przyjaciół?
success: "%{name} jest teraz Twoim znajomym."
new:
confirm email address: "Potwierdzenie adresu e-mail:"
openid association: "<p>Twoje konto OpenID nie jest jeszcze skojarzone z kontem OpenStreetMap.</p>\n<ul>\n <li>Jeśli jesteś nowym użytkownikiem OpenStreetMap, utwórz nowe konto, korzystając z poniższego formularza.</li>\n <li>Jeśli masz już konto, możesz zalogować się na nie przy użyciu nazwy użytkownika i hasła, a następnie skojarzyć je z kontem OpenID w ustawieniach użytkownika.\n </li>\n</ul>"
openid no password: Jeśli korzystasz z OpenID hasło nie jest wymagane, jednak niektóre dodatkowe narzędzia lub serwer mogą go potrzebować.
password: Hasło
+ terms accepted: Dziękujemy za przyjęcie nowych warunków udziału!
title: Nowe konto
use openid: Ewentualnie użyj %{logo} OpenID do zalogowania
no_such_user:
nearby mapper: Mapowicz z okolicy
your location: Twoje położenie
remove_friend:
+ button: Usuń z listy przyjaciół
+ heading: Usunąć %{user} z listy przyjaciół?
not_a_friend: "%{name} nie był Twoim znajomym."
success: "%{name} został wyłączony z grona Twoich znajomych."
reset_password:
# Author: Nemo bis
# Author: Nighto
# Author: Rodrigo Avila
+# Author: Tuliouel
# Author: 555
pt-BR:
activerecord:
prev_changeset_tooltip: Editado anteriormente por %{user}
node:
download_xml: Baixar XML
- edit: editar
+ edit: Editar nó
node: Ponto
node_title: "Ponto: %{node_name}"
- view_history: ver histórico
+ view_history: Ver histórico
node_details:
coordinates: "Coordenadas:"
part_of: "Parte de:"
download_xml: Baixar XML
node_history: Histórico do ponto
node_history_title: "Histórico do ponto: %{node_name}"
- view_details: ver detalhes
+ view_details: Ver detalhes
not_found:
sorry: Desculpe, o %{type} com o ID %{id}, não pode ser encontrado.
type:
of: de
showing_page: Exibindo página
redacted:
+ message_html: A versão %{version} deste %{type} não pode ser exibida tal como foi redigida. Consulte %{redaction_link} para obter mais informações.
+ redaction: Edição %{id}
type:
node: nó
relation: relação
download_xml: Baixar XML
relation: Relação
relation_title: "Relação: %{relation_name}"
- view_history: ver histórico
+ view_history: Ver histórico
relation_details:
members: "Membros:"
part_of: "Parte de:"
download_xml: Baixar XML
relation_history: Histórico de Relação
relation_history_title: "Histórico da Relação: %{relation_name}"
- view_details: ver detalhes
+ view_details: Ver detalhes
relation_member:
entry: "%{type} %{name}"
entry_role: "%{type} %{name} como %{role}"
hide_areas: Ocultar áreas
history_for_feature: Histórico para %{feature}
load_data: Carregar dados
- 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.
+ loaded_an_area_with_num_features: "Você carregou uma área que contém %{num_features} pontos. Alguns navegadores podem não conseguir exibir essa quantidade de dados. Geralmente, navegadores trabalham melhor exibindo menos de %{max_features} pontos por vez: acima disso pode deixá-lo lento ou travá-lo. Se você tem certeza que deseja exibir estes dados, clique no botão abaixo."
loading: Carregando...
manually_select: Selecionar manualmente uma área diferente
object_list:
show_areas: Mostrar áreas
show_history: Exibir histórico
unable_to_load_size: "Impossível carregar dados: tamanho da área de %{bbox_size} é muito grande (precisa ser menor que %{max_bbox_size})"
+ view_data: Ver dados sobre a vista atual do mapa
wait: Aguarde...
zoom_or_select: Aproxime ou selecione uma área diferente para visualizar
tag_details:
way: caminho
way:
download_xml: Baixar XML
- edit: editar
- view_history: ver histórico
+ edit: Editar caminho
+ view_history: Ver histórico
way: Caminho
way_title: "Caminho: %{way_name}"
way_details:
part_of: "Parte de:"
way_history:
download_xml: Baixar XML
- view_details: ver detalhes
+ view_details: Ver detalhes
way_history: Histórico de caminho
way_history_title: "Histórico do caminho: %{way_name}"
changeset:
description_nearby: Conjuntos de alterações de usuários próximos
description_user: Conjuntos de alterações de %{user}
description_user_bbox: Conjuntos de alterações de %{user} em %{bbox}
+ empty_anon_html: Ainda não foram realizadas edições
+ empty_user_html: Parece que você ainda não fez edições. Para começar, consulte o <a href='http://http://wiki.openstreetmap.org/wiki/Pt-br:Beginners%27_guide'>Guia para Principiantes</a>.
heading: Conjuntos de alterações
heading_bbox: Conjuntos de alterações
heading_friend: Conjuntos de alterações
hide_link: Ocultar esse comentário
diary_entry:
comment_count:
- one: 1 comentário
+ one: "%{count} comentário"
other: "%{count} comentários"
+ zero: Sem comentários
comment_link: Comentar nesta entrada
confirm: Confirmar
edit_link: Editar esta entrada
area_to_export: Área a exportar
embeddable_html: HTML para embutir
export_button: Exportar
- export_details: Os dados do OpenStreetMap estão licenciados sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative Commons Atribuição - Compartilhamento pela mesma Licença 2.0 Genérica (CC BY-SA 2.0)</a>.
+ export_details: Os dados do OpenStreetMap estão licenciados sob a licença <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
format: Formato
format_to_export: Formato a Exportar
image_size: Tamanho da Imagem
history: Histórico
home: início
home_tooltip: Ir para a sua localização
+ inbox_html: "%{count} mensagens"
inbox_tooltip:
one: 1 Nova mensagem na sua caixa de entrada
other: Sua caixa de entrada tem %{count} mensagens não lidas
text: Caso haja um conflito entre esta tradução e %{english_original_link}, a página em Inglês terá precedência
title: Sobre esta tradução
legal_babble:
- contributors_at_html: "<strong>Áustria</strong>: Contém dados do \n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (sob licença\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.pt_BR\">CC BY</a>) e <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg.</a>."
+ attribution_example:
+ alt: Exemplo de como atribuir o OpenStreetMap a uma página
+ title: Exemplo de atribuição
+ contributors_at_html: "<strong>Áustria</strong>: Contém dados de \n <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (sob licença\n <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.pt_BR\">CC BY</a>), \n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> e \nLand Tirol (sob a licença <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT com emendas</a>)."
contributors_ca_html: "<strong>Canadá</strong>: Contém dados do\n GeoBase®, GeoGratis (© Departamento de Recursos\n Naturais do Canadá), CanVec (© Departamento de Recursos\n Naturais do Canadá), and StatCan (Divisão de Geografia e \n Estatística do Canada)."
contributors_footer_1_html: " A inclusão de dados no OpenStreetMap não implica em endosso do provedor dos dados \n ao OpenStreetMap, nem em qualquer garantia, ou\n aceitação de qualquer responsabilidade."
+ contributors_footer_2_html: "A inclusão de dados no OpenStreetMap não implica que fornecedor \noriginal apoie o OpenStreetMap, ou dê qualquer garantia, ou \naceite qualquer responsabilidade."
contributors_fr_html: "<strong>França</strong>: Contém dados da\n Direction Générale des Impôts."
- contributors_gb_html: "<strong>Reino Unido</strong>: Contém Ordnance\n Survey data © Crown copyright and database right\n 2010."
- contributors_intro_html: " A nossa licença CC BY-SA requer que você “dê crédito ao \n Autor Original de forma equivalente à mídia ou meios que Você\n está utilizando”. Mapeadores individuais do OSM não solicitam \n crédito além do “OpenStreetMap\n contributors”, mas quando os dados vem de uma agência \n nacional de mapeamento, ou de outra fonte superior, a ser incluída\n no OpenStreetMap, é razoável creditá-la por reproduzir diretamente \n os seus créditos ou por fazer links para eles nesta página."
+ contributors_gb_html: "<strong>Reino Unido</strong>: Contém dados da Ordnance\n Survey © Crown copyright e direitos da base de dados 2010."
+ contributors_intro_html: "Nossos contribuidores são milhares de indivíduos. Nós também incluímos\ndados, cujas licenças são abertas, de organismos nacionais de cartografia\ne de outras fontes, dentre elas:"
+ contributors_nl_html: "<strong>Holanda</strong>: Contém dados © AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
contributors_nz_html: "<strong>Nova Zelândia</strong>: Contém dados do \n Land Information New Zealand. Crown Copyright reserved."
contributors_title_html: Nossos colaboradores
- credit_1_html: " Se você usar as imagens dos mapas do OpenStreetMap, nós pedimos que\n os créditos apareçam como “© OpenStreetMap\n contributors, CC BY-SA”. Se você estiver usando apenas os dados dos mapas,\n nós pedimos que os créditos apareçam como “Map data © OpenStreetMap contributors,\n CC BY-SA”."
- credit_2_html: " Onde for possível, um link para o OpenStreetMap deve direcionar para <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n e a licença CC BY-SA para <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Se\n você estiver usando uma mídia que não pode conter links (ex.: um\n trabalho impresso), sugerimos que você direcione seus leitores para \n www.openstreetmap.org (talvez por expandir\n ‘OpenStreetMap’ para este endereço completo) e para \n www.creativecommons.org."
+ contributors_za_html: "<strong>Africa do Sul</strong>: contém dados originários de\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, com direitos de autor reservados àquele Estado."
+ credit_1_html: Solicitamos que você faça referência a “contribuidores do © OpenStreetMap”.
+ credit_2_html: "Você deve deixar claro que os dados são disponíveis sob a \"Open\nDatabase Licence, e se usar nosso acervo cartográfico, que o mesmo é\nlicenciado como CC-BY-SA. Você pode proceder ligando a\n<a href=\"http://www.openstreetmap.org/copyright\">esta página</a>.\nAlternativamente, e obrigatoriamente, caso esteja distribuindo o OSM em \nforma de dados, você pode denominar e ligar diretamente à(s) licença(s). Em veículos\nonde \"links\" não são possíveis (p. ex.: impressos), sugerimos que você\nremeta seus leitores ao endereço openstreetmap.org (talvez escrevendo \nOpenStreetMap ao endereço completo), ao opendatacommons.org, e,\nse for relevante, ao creativecommons.org."
+ credit_3_html: "Para um mapa eletrônico explorável, os créditos devem aparecer no canto do mapa.\nPor exemplo:"
credit_title_html: Como dar crédito ao OpenStreetMap
- intro_1_html: " O OpenStreetMap possui <i>dados abertos</i>, licenciados sob a licença <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Atribuição-Compartilhamento pela mesma Licença 2.0</a> (CC BY-SA)."
- intro_2_html: " Você está livre para copiar, distribuir, transmitir e adaptar nossos mapas\n e dados, desde que você dê crédito ao OpenStreetMap e seus\n colaboradores. Se você alterar ou criar sobre nossos mapas ou dados, você\n deve distribuir os resultados apenas sobre a mesma licença. A\n <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">licença\n jurídica</a> explica seus direitos e responsabilidades."
- more_1_html: " Leia mais sobre o uso de nossos dados no <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>."
- more_2_html: " Os colaboradores do OSM são lembrados de nunca adicionar dados de quaisquer\n fontes sob copyright (ex.: Google Maps ou mapas impressos) sem\n permissão explícita dos detentores dos direitos atorais."
+ infringement_1_html: " Os colaboradores do OSM são lembrados de nunca adicionar dados de quaisquer\n fontes com direitos autorais protegidos (ex.: Google Maps ou mapas impressos) sem\n permissão expressa dos seus detentores."
+ infringement_2_html: "Se você acredita que material protegido por direitos autorais foi, inapropriadamente,\nadicionado à base de dados do OpenStreetMap ou a este sítio, por favor, proceda\nao nosso <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">takedown\nprocedure</a> (em inglês) ou comunique diretamente em nosso \n<a href=\"http://dmca.openstreetmap.org/\">on-line filing page</a> (em inglês)."
+ infringement_title_html: Violação de direitos autorais
+ intro_1_html: "O OpenStreetMap possui <i>dados abertos</i>, licenciados sob a <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
+ intro_2_html: "Você é livre para copiar, distribuir, transmitir e adaptar nossos dados,\ndesde que você referencie o OpenStreetMap e seus \ncontribuidores. Se você alterar ou inovar a partir de nossos mapas, você\ndeve distribuir o resultado somente sob a mesma licença. O\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">texto\nlegal</a> completo explica seus direitos e responsabilidades."
+ intro_3_html: "Nosso acervo cartográfico, bem como nossa documentação, são\nlicenciados sob a licença <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Atribuição – Compartilhamento pela mesma Licença 2.0</a> (CC-BY-SA)."
+ more_1_html: "Leia mais sobre o uso de nossos dados, e como nos dar crédito, em <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\nFAQ</a>."
+ more_2_html: " Embora o OpenStreetMap tenha dados abertos, nós não podemos prover uma\n API de mapas livre de encargos para desenvolvedores de terceiros.\n\n Veja nossa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso da API</a>,\n <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de Uso de Imagens</a>\n e <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Política de Uso do Nominatim</a>."
more_title_html: Descobrir mais
title_html: Direitos Autorais e Licença
native:
hi: Olá %{to_user},
subject_header: "[OpenStreetMap] %{subject}"
signup_confirm:
- subject: "[OpenStreetMap] Confirme seu endereço de e-mail"
+ confirm: "Antes de qualquer coisa, nós precisamos confirmar que esta solicitação veio de você, portanto, se sim, por favor, clique no endereço abaixo para confirmar sua conta:"
+ created: Alguém (provavelmente você) acaba de criar uma conta em %{site_url}.
+ greeting: Olá!
+ subject: "[OpenStreetMap] Bem-vindo(a) ao OpenStreetMap"
+ welcome: Nós damos a você as boas vindas com algumas informações adicionais para começar.
signup_confirm_html:
ask_questions: Você pode perguntar o que quiser sobre o OpenStreetMap em nosso <a href="http://help.openstreetmap.org/">site de perguntas e respostas</a>.
current_user: A lista de usuários, baseada em suas localizações no mundo, está disponível em <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
signup_confirm_plain:
ask_questions: "Você pode perguntar qualquer dúvida que você tiver sobre OpenStreetMap em nosso site de perguntas e respostas:"
blog_and_twitter: "Mantenha-se informado via o blog do OpenStreetMap or pelo Twitter:"
+ current_user: "A lista de usuarios por categorias, baseada em sua localização, está disponível em:"
introductory_video: "Você pode assistir um vídeo introdutório (em inglês) sobre o OpenStreetMap aqui:"
more_videos: "Existem mais vídeos aqui:"
opengeodata: "OpenGeoData.org é o blog do fundador do OpenStreetMap, Steve Coast, que também dispõe de podcasts (em inglês):"
the_wiki: "Continue lendo sobre o OpenStreetMap no wiki:"
the_wiki_url: http://wiki.openstreetmap.org/index.php?title=Pt-br:Beginners_Guide&uselang=pt-br
+ user_wiki_page: Recomenda-se que você crie uma página "wiki" de usuário, que inclua etiquetas de categoria que indiquem onde você está, como, por exemplo, [[Category:Users_in_Curitiba]].
wiki_signup: "Você também pode querer registrar-se no wiki do OpenStreetMap em:"
wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Main_Page&uselang=pt-br
oauth:
printable_name:
with_version: "%{id}, v%{version}"
redaction:
+ create:
+ flash: Edição criada.
+ destroy:
+ error: Houve um erro de destruir esta edição.
+ flash: Edição destruída.
+ not_empty: A edição não está vazia. Por favor, elimine todas as versões pertencentes a esta edição antes de destruí-la.
edit:
description: Descrição
heading: Editar redação
submit: Criar redação
title: Criando uma nova redação
show:
+ confirm: Tem certeza?
description: "Descrição:"
+ destroy: Remover esta edição
+ edit: Reformar esta edição
+ heading: Mostrando a edição "% {title}"
+ title: Mostrando edição
user: "Criador:"
+ update:
+ flash: Alterações salvas.
site:
edit:
anon_edits: (%{link})
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.
+ license:
+ copyright: Direitos autorais de OpenStreetMap e contribuidores sob uma licença aberta
permalink: Link Permanente
remote_failed: Edição falhou - certifique-se de que o JOSM ou o Merkaartor estão carregados e que o Controle Remoto está ativado
shortlink: Atalho
visibility_help: o que isso significa?
visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=pt-br
list:
+ empty_html: Nada aqui por enquanto. <a href='%{upload_link}'>Carregue uma nova trilha</a> ou aprenda mais sobre trilhas de GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página wiki</a> (em inglês).
public_traces: Trilhas Públicas de GPS
public_traces_from: Trilhas de GPS públicas de %{user}
tagged_with: " etiquetadas com %{tags}"
trace_optionals:
tags: Etiquetas
trace_paging_nav:
+ newer: Trilhas mais recentes
+ older: Trilhas mais antigas
showing_page: Mostrando página %{page}
view:
delete_track: Apague esta trilha
email never displayed publicly: (nunca mostrado publicamente)
flash update success: Informação de usuário atualizada com sucesso.
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.
+ gravatar:
+ gravatar: Use o Gravatar
+ link text: O que é isto?
home location: "Localização:"
image: "Imagem:"
image size hint: (imagens quadradas, com pelo menos 100x100, funcionam melhor)
title: Senha esquecida
make_friend:
already_a_friend: Você já é amigo de %{name}.
+ button: Adicionar como amigo
failed: Desculpe, erro ao adicionar %{name} como seu amigo.
+ heading: Adicionar %{user} como amigo?
success: "%{name} agora é seu amigo."
new:
confirm email address: "Confirme o Endereço de Email:"
email address: "Endereço de Email:"
fill_form: Preencha o formulário e lhe enviaremos um email rapidamente para ativar sua conta.
flash create success message: Obrigado por se cadastrar. Nós mandamos uma confirmação para %{email} e assim que você confirmar sua conta você poderá começar a mapear.<br /><br />Se você usa um sistema antispam que envia pedido de confirmação assegure-se que você adicionou o endereço webmaster@openstreetmap.org à sua lista de e-mails confiáveis, já que nós não conseguimos responder a nenhum pedido de confirmação.
+ flash welcome: Obrigado por registrar-se. Foi enviada uma mensagem de boas vindas para %{email} com algumas dicas sobre como começar.
heading: Criar uma nova conta de usuário
license_agreement: Quando você confirmar sua conta, você precisará concordar com os <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Termos de Colaborador</a>.
no_auto_account_create: Infelizmente não foi possível criar uma conta para você automaticamente.
nearby mapper: Mapeador próximo
your location: Sua localização
remove_friend:
+ button: Desfazer amizade
+ heading: Desfazer amizade com %{user}?
not_a_friend: "%{name} não é um de seus amigos."
success: "%{name} foi removido de seus amigos."
reset_password:
activate_user: ativar este usuário
add as friend: adicionar como amigo
ago: (%{time_in_words_ago} atrás)
- block_history: ver bloqueios recebidos
+ block_history: bloqueios recebidos
blocks by me: bloqueios por mim
blocks on me: bloqueios sobre mim
comments: comentários
latest edit: "Última edição %{ago}:"
m away: "%{count}m de distância"
mapper since: "Mapeador desde:"
- moderator_history: ver bloqueios aplicados
+ moderator_history: bloqueios aplicados
my comments: meus comentários
my diary: meu diário
my edits: minhas edições
creator_name: Criador
display_name: Usuário bloqueado
edit: Editar
+ next: Próximo »
not_revoked: (não retirado)
+ previous: « Anterior
reason: Razão para o bloqueio
revoke: Cancelar!
revoker_name: Retirado por
show: Exibir
+ showing_page: Mostrando a página % {page}
status: Status
period:
one: uma hora
description: Descrição
display_name: Nome visualizado
email: E-mail
- languages: Idiomas
+ languages: Línguas
pass_crypt: Palavra-passe
models:
acl: Lista de Controlo do Acesso
history_for_feature: Histórico de %{feature}
load_data: Carregar Dados
loaded_an_area_with_num_features: Carregou uma área com %{num_features} elementos. Alguns navegadores de Internet podem ter problemas em mostrar esta quantidade de dados. Geralmente os navegadores funcionam melhor a mostrar até %{max_features} elementos de cada vez. Mais do que isso o navegador poderá ficar muito lento ou até bloquear. Se tem a certeza que quer mostrar esta quantidade de elementos clique no botão seguinte.
- loading: A carregar...
+ loading: A carregar…
manually_select: Selecionar manualmente uma área diferente
object_list:
api: Descarregar esta área no formato XML OSM através da API
hide_link: Ocultar este comentário
diary_entry:
comment_count:
- one: 1 comentário
+ one: "%{count} comentário"
other: "%{count} comentários"
+ zero: Sem comentários
comment_link: Comentar esta entrada
confirm: Confirmar
edit_link: Editar esta entrada
reply_link: Responder a esta entrada
edit:
body: "Mensagem:"
- language: "Idioma:"
+ language: "Língua:"
latitude: "Latitude:"
location: "Localização:"
longitude: "Longitude:"
infringement_1_html: É relembrado aos contribuidores do OpenStreetMap para nunca adicionarem dados de fontes protegidas por direitos de autor (por exemplo o Google Maps ou mapas comerciais impressos) sem permissão explícita dos detentores dos direitos de autor.
infringement_2_html: Se acredita que foi adicionado material protegido por direitos de autor indevidamente à base de dados do OpenStreetMap, por favor consulte o <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimento para retirar dados protegidos</a> (em inglês) ou preencha os dados diretamente no <a href="http://dmca.openstreetmap.org/">formulário</a> (em inglês).
infringement_title_html: Violação de direitos de autor
- intro_1_html: " O OpenStreetMap é constituído por <i>dados abertos</i>, disponibilizados sob a licença <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.pt\">Creative Commons - Atribuição - CompartilhaIgual 2.0 Genérica</a> (CC BY-SA 2.0)."
+ intro_1_html: "O OpenStreetMap é disponibilizado em <i>dados abertos</i>, sob a licença <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Tem o direito de copiar, distribuir, transmitir e adaptar os nossos dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores. Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado apenas com a mesma licença. O <a href="http://opendatacommons.org/licenses/odbl/1.0/">texto legal completo</a> explica os seus direitos e responsabilidades.
intro_3_html: A cartografia nas nossas telas de mapas (imagens dos mapas) e a nossa documentação são disponibilizadas sob a licença <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative Commons Atribuição - CompartilhaIgual 2.0 Genérica (CC BY-SA 2.0)</a>.
more_1_html: Leia mais informações sobre a utilização dos nossos dados e como atribuir a autoria em <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Perguntas frequentes - Legais</a> (em inglês).
header: "%{from_user} enviou-lhe uma mensagem através do OpenStreetMap com o assunto %{subject}:"
hi: Olá %{to_user},
signup_confirm:
- subject: "[OpenStreetMap] Confirme o seu endereço de e-mail"
+ subject: "[OpenStreetMap] Bem vindo(a) ao OpenStreetMap"
signup_confirm_html:
ask_questions: Pode fazer qualquer pergunta sobre o OpenStreetMap no nosso <a href="http://help.openstreetmap.org/">fórum de ajuda</a>.
current_user: Está disponível uma lista de utilizadores por categorização conforme o local onde se encontram em <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
# Author: Mechano
# Author: Mixaill
# Author: Nemo bis
+# Author: Santacloud
# Author: Spider
# Author: TarzanASG
# Author: Yuri Nazarov
one: "Содержит %{count} точку:"
other: "Содержит %{count} точек:"
has_relations:
- few: "Содержит следующие %{count} отношения:"
- one: "Содержит следующие %{count} отношение:"
- other: "Содержит следующие %{count} отношений:"
+ few: "Содержит %{count} следующих отношения:"
+ one: "Содержит %{count} следующее отношение:"
+ other: "Содержит %{count} следующих отношений:"
has_ways:
few: "Содержит %{count} линии:"
one: "Содержит %{count} линию:"
of: из
showing_page: Показана страница
redacted:
- message_html: Версия %{version} этого %{type} не может быть показана как он отредактированнаям. Пожалуйста, смотрите %{redaction_link} для получение дополнительной информации.
+ message_html: Версия %{version} этого объекта вырезана и не может быть отображена. Смотрите %{redaction_link} для дополнительной информации.
redaction: Редакция %{id}
type:
node: точка
show_areas: Показать области
show_history: Показать историю
unable_to_load_size: Загрузка невозможна. Размер квадрата %{bbox_size} слишком большой (должен быть меньше %{max_bbox_size})
+ view_data: Просмотр данных для текущего вида карты
wait: Подождите...
zoom_or_select: Увеличьте или выберите область для просмотра
tag_details:
farm: Ферма
farmland: Сельхозугодья
farmyard: Сельхоздворы
- forest: Ð\94икий леÑ\81
+ forest: Ð\9bеÑ\81ное Ñ\85озÑ\8fйÑ\81Ñ\82во
garages: Гаражи
grass: Трава
greenfield: Неосвоенная территория
water: Водоём
wetland: Заболоченная территория
wetlands: Заболоченные земли
- wood: Ð\95Ñ\81Ñ\82еÑ\81Ñ\82веннÑ\8bй лес
+ wood: Ð\9bес
office:
accountant: Бухгалтер
architect: Архитектор
car_parts: Автомагазин
car_repair: Автомастерская
carpet: Ковры
- charity: Секонд-Ñ\85Ñ\8dнд
+ charity: Ð\91лагоÑ\82воÑ\80иÑ\82елÑ\8cнÑ\8bй магазин
chemist: Магазин бытовой химии
clothes: Магазин одежды
computer: Компьютерный магазин
confectionery: Кондитерская
- convenience: Ð\9bаÑ\80Ñ\91к
+ convenience: Ð\9fÑ\80одоволÑ\8cÑ\81Ñ\82веннÑ\8bй магазин
copyshop: Услуги копирования
cosmetics: Косметика
department_store: Универсам
discount: Магазин распродаж
- doityourself: Ð\9cагазин Ñ\82ипа «Сделай Ñ\81ам» (DIY â\80\94 Do-It-Yourself)
+ doityourself: Сделай Ñ\81ам
dry_cleaning: Химчистка
- electronics: Магазин электротоваров
+ electronics: Магазин электроники
estate_agent: Продажа недвижимости
farm: Сельпо
fashion: Магазин модной одежды
mobile_phone: Магазин мобильных телефонов
motorcycle: Магазин по продаже мотоциклов
music: Музыкальный магазин
- newsagent: Ð\9aиоск
- optician: оптика
+ newsagent: Ð\93азеÑ\82нÑ\8bй киоск
+ optician: Ð\9eптика
organic: Продуктовый магазин
outdoor: Открытый рынок
pet: Зоомагазин
video: Магазин видеозаписей
wine: Винный магазин
tourism:
- alpine_hut: Ð\92Ñ\8bÑ\81окогоÑ\80наÑ\8f гоÑ\81Ñ\82иниÑ\86а
+ alpine_hut: Ð\90лÑ\8cпийÑ\81кий Ð\94омик
artwork: Произведения искусства
attraction: Аттракцион
bed_and_breakfast: Полупансион
tunnel:
"yes": Туннель
waterway:
- artificial: Ð\98Ñ\81кÑ\83Ñ\81Ñ\81Ñ\82веннÑ\8bй воднÑ\8bй пÑ\83Ñ\82Ñ\8c
+ artificial: Ð\98Ñ\81кÑ\83Ñ\81Ñ\81Ñ\82веннÑ\8bй водоÑ\82ок
boatyard: Верфь
canal: Канал
connector: Слияние рек
contributors_footer_2_html: Включение данных в OpenStreetMap не означает, что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap, предоставляет гарантии или принимает на себя какую-любую ответственность.
contributors_fr_html: "<strong>Франция</strong>: Данные от Главного налогового управления."
contributors_gb_html: <strong>Великобритания.</strong> Данные Ordnance Survey © Crown copyright и права на базы данных 2010-12.
- contributors_intro_html: Наша лицензия CC BY-SA требует от вас «указывать авторство Автора Оригинала разумно в средстве или способах, которые Вы используете». Индивидуальные картографы OSM не требуют указания авторства больше, чем строчкой «участники OpenStreetMap», но в OpenStreetMap есть данные, полученные от национальных картографических агентств или других существенных источников, поэтому возможно имеет смысл указать непосредственно на них, как на источник, или добавить ссылку на эту страницу.
+ contributors_intro_html: "Участниками проекта являются тысячи отдельных людей. Проект также включает данные под свободными лицензиями от национальных картографических агентств и от других источников, среди которых:"
contributors_nl_html: "<strong>Нидерланды</strong>: Contains © AND data, 2007 (<a href=\"http://www.and.com\">www.and.com</a>)"
contributors_nz_html: <strong>Новая Зеландия.</strong> Данные из сведений о земельных ресурсах Новой Зеландии. Crown Copyright reserved.
contributors_title_html: Кто вносит вклад в наш проект
contributors_za_html: "<strong>ЮАР</strong>: Имеются данные из\n<a href=\"http://www.ngi.gov.za/\">Главное управление:\nНациональная геоинформационная система</a>, права принадлежат государству."
credit_1_html: Мы требуем, чтобы вы указывали «© Участники OpenStreetMap».
- credit_2_html: Где это возможно, текст «OpenStreetMap» должен быть гиперссылкой на <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>, «CC BY-SA» — на <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.ru">http://creativecommons.org/licenses/by-sa/2.0/deed.ru</a>. Если вы используете носители, где гиперссылки невозможны (например, печатная работа), мы предлагаем вам направлять ваших читателей непосредственно к www.openstreetmap.org (возможно, расширяя «OpenStreetMap» до полного адреса) и к www.creativecommons.org.
+ credit_2_html: Вы должны также ясно обозначить, что по лицензии Open Database License распространяется база геоданных, в то время как готовые изображения карты лицензированы под CC-BY-SA. Вы можете сделать это, разместив ссылку на <a href="http://www.openstreetmap.org/copyright">эту страницу</a>. Если же вы распространяете OSM только в виде базы данных, мы можете размещать гиперссылку напрямую на текст соответствующей лицензии. Если формат медиа делает использование гиперссылок невозможным (как например бумажные карты), мы рассчитываем, что вы направите читателей на openstreetmap.org (обозначив именно адрес сайта вместо только лишь названия проекта, 'OpenStreetMap'), на opendatacommons.org, и, при необходимости, на creativecommons.org.
+ credit_3_html: "В случае электронной карты с прокруткой, ссылка должна всегда находиться в углу окна просмотра карты.\nНапример:"
credit_title_html: Как сослаться на OpenStreetMap
infringement_1_html: Напоминаем участникам сообщества OSM, что добавление данных из любых защищённых авторским правом источников (например, с Google Maps или печатных карт) не должно проводиться без явного предварительного согласия правообладателей.
infringement_2_html: "Если вы считаете, что защищённый авторским правом материал был неправомерно\n добавлен к базе OpenStreetMap или к этому сайту, пожалуйста, обратитесь\n к нашей <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">процедуре\n изымания</a> или непосредственно на нашу\n<a href=\"http://dmca.openstreetmap.org/\">вебстраницу регистрации</a>."
infringement_title_html: Нарушение авторских прав
- intro_1_html: OpenStreetMap — это <i>открытые данные</i> доступные по лицензии <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.ru">Creative Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
+ intro_1_html: "OpenStreetMap содержит <i>свободные данные</i>, распространяемые по лицензии <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: Вы можете свободно копировать, распространять, передавать и дорабатывать наши данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество. Если вы изменяете или берёте наши данные за основу, то вы должны распространять результат только по такой же лицензии. Полный <a href="http://opendatacommons.org/licenses/odbl/1.0/">юридический текст лицензии</a> разъясняет ваши права и обязанности.
+ intro_3_html: Изготовленные нами изображения карты, также как и наша документация распространяются по лицензии <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
more_1_html: Прочитайте больше об использовании наших данных и о поддержке на странице <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=ru">ответов на юридические вопросы</a>.
more_2_html: Хотя данные OpenStreetMap открыты для использования, мы не в состоянии предоставить бесплатный API к нашим картам для сторонних разработчиков. См. <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Правила использования API</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Правила использования частей карты</a> и <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Правила использования службы Nominatim</a> .
more_title_html: Узнайте больше
header: "Пользователь OpenStreetMap %{from_user} отправил вам сообщение с темой %{subject}:"
hi: Привет, %{to_user},
signup_confirm:
- subject: "[OpenStreetMap] Подтвердите ваш адрес электронной почты"
+ confirm: "Прежде чем мы сможем что-либо сделать, мы должны убедиться, что эта просьба исходит от вас, так что если это так, то, пожалуйста, нажмите на ссылку ниже для подтверждения вашей учетной записи:"
+ created: Кто-то (надеемся, вы) только что создал учетную запись на %{site_url}.
+ greeting: Привет!
+ subject: "[OpenStreetMap] Добро пожаловать в OpenStreetMap"
+ welcome: Мы хотели бы приветствовать вас и предоставить вам некоторую дополнительную информацию для начального ознакомления
signup_confirm_html:
ask_questions: Вы можете задать интересующие Вас вопросы о OpenStreetMap на нашем <a href="http://help.openstreetmap.org/">сайте вопросов и ответов</a> .
current_user: "Список пользователей, основанный на их местоположении, доступен здесь: <a href=\"http://wiki.openstreetmap.org/index.php?title=Category:Users_by_geographical_region&uselang=ru\">Category:Users_by_geographical_region</a>."
signup_confirm_plain:
ask_questions: "Вы можете задать интересующие Вас вопросы об OpenStreetMap на нашем сайте вопросов и ответов:"
blog_and_twitter: "Ознакомиться с последними новостями через блог OpenStreetMap или Twitter:"
+ current_user: "Список текущих пользователей собранный по категориям исходя из указанного местоположения находится на:"
introductory_video: "Вы можете посмотреть ознакомительное видео об OpenStreetMap здесь:"
more_videos: "Здесь ещё больше видео:"
opengeodata: "OpenGeoData.org — это блог основателя OpenStreetMap Стива Коста (Steve Coast) и там же можно найти подкасты:"
the_wiki: "Почитать об OpenStreetMap в вики:"
the_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Beginners%27_guide?uselang=ru
+ user_wiki_page: Рекомендуется создать вики-страницу пользователя которая будет содержать теги вашего местоположения, например, [[:Category:RU:Пользователи_(Россия)].
wiki_signup: "Вы также можете зарегистрироваться в вики OpenStreetMap здесь:"
wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=RU:Заглавная_страница&uselang=ru
oauth:
description: "Описание:"
help: Справка
help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D1%80%D1%83%D0%B7%D0%BA%D0%B0_%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
- tags: "Ð\9cеÑ\82ки:"
+ tags: "Теги:"
tags_help: через запятую
upload_button: Передать на сервер
upload_gpx: Загрузить GPX-файл
user:
account:
contributor terms:
- agreed: Вы согласились на новые Условия сотрудничества.
+ agreed: Вы согласились с новыми Условиями участия.
agreed_with_pd: Вы также заявили, что вы считаете свои правки находящимися в общественном достоянии.
- heading: "УÑ\81ловиÑ\8f Ñ\81оÑ\82Ñ\80Ñ\83дниÑ\87еÑ\81Ñ\82ва:"
+ heading: "УÑ\81ловиÑ\8f Ñ\83Ñ\87аÑ\81Ñ\82иÑ\8f:"
link: http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru
- link text: что это значит?
+ link text: что это?
not yet agreed: Вы ещё не согласились с новыми Условиями участия.
review link text: Пожалуйста, перейдите по этой ссылке в удобное для вас время и подтвердите согласие с новыми Условиями участия.
- current email address: "Текущий адрес эл. почты:"
+ current email address: "Текущий адрес электронной почты:"
delete image: Удалить текущее изображение
email never displayed publicly: (не будет показан)
flash update success: Информация о пользователе успешно обновлена.
- flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту, чтобы подтвердить ваш новый адрес.
+ flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту для подтверждения вашего нового адреса.
gravatar:
gravatar: Использовать Gravatar
- link text: Что это?
- home location: "Ð\9eÑ\81новное местоположение:"
+ link text: что это?
+ home location: "Ð\94омаÑ\88нее местоположение:"
image: "Изображение:"
- image size hint: (квадратные изображения, по крайней мере 100×100 работают лучше)
- keep image: Ð¥Ñ\80анить текущее изображение
+ image size hint: (квадратные изображения, по крайней мере 100×100, работают лучше)
+ keep image: Ð\9eÑ\81Ñ\82авить текущее изображение
latitude: "Широта:"
longitude: "Долгота:"
make edits public button: Сделать все мои правки доступными
my settings: Мои настройки
- new email address: "Новый адрес эл. почты:"
+ new email address: "Новый адрес электронной почты:"
new image: Добавить изображение
- no home location: Ð\92Ñ\8b не обознаÑ\87или Ñ\81вое оÑ\81новное местоположение.
+ no home location: Ð\92Ñ\8b не обознаÑ\87или Ñ\81вое домаÑ\88нее местоположение.
openid:
link: http://wiki.openstreetmap.org/wiki/RU:OpenID
- link text: что это такое?
+ link text: что это?
openid: "OpenID:"
preferred editor: "Предпочтительный редактор:"
preferred languages: "Предпочитаемые языки:"
disabled link text: почему я не могу вносить изменения?
enabled: Включено. Можно редактировать. Правки не анонимны.
enabled link: http://wiki.openstreetmap.org/wiki/RU:Anonymous_edits&uselang=ru
- enabled link text: что это значит?
- heading: "Ð\9fÑ\83блиÑ\87ное изменение:"
+ enabled link text: что это?
+ heading: "Ð\9fÑ\83блиÑ\87наÑ\8f пÑ\80авка:"
public editing note:
heading: Общедоступная правка
text: В настоящий момент ваши правки анонимны и никто не может отправлять вам сообщения или видеть ваше местоположение. Чтобы указать авторство своих правок и позволить другим связываться с вами через вебсайт, нажмите на кнопку внизу. <b>После перехода на API версии 0.6, только доступные для связи пользователи могут править данные карты</b>. (<a href="http://wiki.openstreetmap.org/wiki/RU:Anonymous_edits">узнайте, почему</a>).<ul> <li>Ваш адрес электронной почты не будет раскрыт для других, но связаться с вами будет возможно.</li> <li>Это действие не имеет обратной силы, а все новые пользователи теперь доступны для связи по умолчанию.</li> </ul>
replace image: Заменить текущее изображение
- return to profile: Ð\92озвÑ\80аÑ\82 к профилю
+ return to profile: Ð\92еÑ\80нÑ\83Ñ\82Ñ\8cÑ\81Ñ\8f к профилю
save changes button: Сохранить изменения
- title: Ð\98зменение Ñ\83Ñ\87Ñ\91Ñ\82ной запиÑ\81и
+ title: Ð\98змениÑ\82Ñ\8c Ñ\83Ñ\87еÑ\82нÑ\83Ñ\8e запиÑ\81Ñ\8c
update home location on click: Обновлять моё местоположение, когда я нажимаю на карту?
confirm:
already active: Эта учётная запись уже подтверждена.
- before you start: Ð\9cÑ\8b знаем, вÑ\8b Ñ\81пеÑ\88иÑ\82е пÑ\80иÑ\81Ñ\82Ñ\83пиÑ\82Ñ\8c к каÑ\80Ñ\82огÑ\80аÑ\84иÑ\80ованиÑ\8e, но пеÑ\80ед Ñ\8dÑ\82им вÑ\8b можеÑ\82е еÑ\89Ñ\91 Ñ\83казаÑ\82Ñ\8c какие-Ñ\82о сведения о себе.
+ before you start: Ð\9cÑ\8b знаем, вÑ\8b Ñ\81пеÑ\88иÑ\82е пÑ\80иÑ\81Ñ\82Ñ\83пиÑ\82Ñ\8c к каÑ\80Ñ\82огÑ\80аÑ\84иÑ\80ованиÑ\8e, но пеÑ\80ед Ñ\8dÑ\82им вÑ\8b можеÑ\82е еÑ\89Ñ\91 Ñ\83казаÑ\82Ñ\8c кое-какие сведения о себе.
button: Подтвердить
heading: Подтвердить учётную запись пользователя
- press confirm button: Ð\9dажмиÑ\82е на кнопкÑ\83 подÑ\82веÑ\80ждениÑ\8f ниже, чтобы активировать вашу учетную запись.
- reconfirm: Если уже прошло достаточно времени с момента вашей регистрации, возможно, вам необходимо <a href="%{reconfirm}">отправить себе новое подтверждение</a>.
+ press confirm button: Ð\9dажмиÑ\82е кнопкÑ\83 ниже, чтобы активировать вашу учетную запись.
+ reconfirm: Если уже прошло достаточно времени с момента вашей регистрации, возможно, вам необходимо <a href="%{reconfirm}">отправить себе новое электронное пиьмо</a>.
success: Ваша учётная запись подтверждена, спасибо за регистрацию!
unknown token: Похоже, что такого токена не существует.
confirm_email:
button: Подтвердить
failure: Адрес электронной почты уже был подтверждён этим токеном.
heading: Подтвердите изменение адреса электронной почты
- press confirm button: Нажмите кнопку подтверждения ниже, чтобы подтвердить ваш новый адрес электронной почты.
+ press confirm button: Нажмите кнопку подтверждения чтобы подтвердить ваш новый адрес электронной почты.
success: Ваш адрес электронной почты подтверждён, спасибо за регистрацию!
confirm_resend:
failure: Участник %{name} не найден.
hide: Скрыть выделенных пользователей
showing:
one: Показана страница %{page} (%{first_item} из %{items})
- other: Ð\9fоказано Ñ\81Ñ\82Ñ\80аниÑ\86 %{page} (%{first_item}-%{last_item} из %{items})
+ other: Ð\9fоказана Ñ\81Ñ\82Ñ\80аниÑ\86а %{page} (%{first_item}-%{last_item} из %{items})
summary: "%{name} создан %{date}, с адреса %{ip_address}"
summary_no_ip: "%{name} создан %{date}"
title: Пользователи
notice email on way: Жаль, что вы потеряли пароль :-( но ничего, скоро придёт письмо и вы сможете поменять свой пароль.
title: Восстановление пароля
make_friend:
- already_a_friend: Вы уже друзья с %{name}.
+ already_a_friend: Вы всё ещё друзья с %{name}.
button: Добавить в друзья
failed: Не удалось добавить %{name} в друзья.
- heading: Ð\94обавиÑ\82Ñ\8c %{user} как дÑ\80Ñ\83га?
- success: Теперь %{name} является вашим другом.
+ heading: Ð\94обавиÑ\82Ñ\8c %{user} в дÑ\80Ñ\83зÑ\8cÑ\8f?
+ success: "%{name} теперь ваш друг."
new:
confirm email address: "Подтвердите адрес эл. почты:"
confirm password: "Повторите пароль:"
email address: "Адрес эл. почты:"
fill_form: Заполните форму, и мы вышлем вам на электронную почту письмо с инструкцией по активации.
flash create success message: Спасибо за регистрацию. Мы выслали письмо с подтверждением на адрес %{email} и как только вы подтвердите вашу учётную запись, вы можете начать работать с картами.<br /><br />Если вы используете антиспам, посылающий запросы на подтверждение, внесите адрес webmaster@openstreetmap.org в ваш белый список, так как мы не можем отвечать на такие запросы.
+ flash welcome: Спасибо за регистрацию. Мы отправили сообщение с приветствием на адрес %{email} с несколькими подсказками о начале работы.
heading: Создание учётной записи
license_agreement: Для подтверждения своей учётной записи вам необходимо согласиться с <a href="http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru">условиями сотрудничества</a>.
no_auto_account_create: К сожалению, сейчас мы не можем автоматически создать для вас учётную запись.
your location: Ваше местоположение
remove_friend:
button: Удалить из друзей
- heading: УбÑ\80аÑ\82Ñ\8c %{user} из Ñ\81пиÑ\81ка друзей?
+ heading: УдалиÑ\82Ñ\8c %{user} из друзей?
not_a_friend: "%{name} не является вашим другом."
- success: "%{name} Ñ\83далÑ\91н из ваÑ\88его Ñ\81пиÑ\81ка дÑ\80Ñ\83зей."
+ success: "%{name} удалён из друзей."
reset_password:
confirm password: "Подтверждение пароля:"
flash changed: Ваш пароль был изменён.
reset: Установить пароль
title: Повторная установка пароля
set_home:
- flash success: Ð\92аÑ\88е местоположение сохранено
+ flash success: Ð\94омаÑ\88нее местоположение сохранено
suspended:
- body: "<p>\n Извините, ваша учётная запись была автоматически приостановлена из-за\n подозрительной активности.\n</p>\n<p>\n Это решение может быть вскоре пересмотрено администратором, или\n вы можете связаться с %{webmaster}, если вы хотите обсудить это.\n</p>"
+ body: "<p>\n Извините, ваша учётная запись была автоматически приостановлена из-за\n подозрительной активности.\n</p>\n<p>\n Это решение может быть вскоре пересмотрено администратором, или\n вы можете связаться с %{webmaster}, если вы хотите это обсудить.\n</p>"
heading: Учётная запись приостановлена
title: Учётная запись приостановлена
webmaster: веб-мастер
edits: правки
email address: "Адрес Email:"
friends_changesets: Просмотреть все наборы правок друзей
- friends_diaries: Ð\9fÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c вÑ\81е дневниковÑ\8bе запиÑ\81и дÑ\80Ñ\83зей
+ friends_diaries: Просмотреть все дневники друзей
hide_user: скрыть этого пользователя
if set location: Если вы укажете свое местоположение, ниже появятся карта и дополнительные инструменты. Вы можете установить ваше местоположение на вашей странице %{settings_link}.
km away: "%{count} км от вас"
my settings: мои настройки
my traces: мои треки
nearby users: Другие ближайшие пользователи
- nearby_changesets: Ð\9fÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c вÑ\81е набоÑ\80Ñ\8b пÑ\80авок Ñ\81оÑ\81едниÑ\85 Ñ\83Ñ\87аÑ\81Ñ\82ников
- nearby_diaries: Ð\9fÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c вÑ\81е дневниковÑ\8bе запиÑ\81и Ñ\81оÑ\81едниÑ\85 Ñ\83Ñ\87аÑ\81Ñ\82ников
+ nearby_changesets: Ð\9fÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c вÑ\81е пÑ\80авки Ñ\81оÑ\81едей
+ nearby_diaries: Ð\9fÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c вÑ\81е дневники Ñ\81оÑ\81едей
new diary entry: новая запись
no friends: Вы не добавили ещё ни одного друга.
no nearby users: Пока нет других пользователей, признающих, что занимающихся составлением карты поблизости.
infringement_1_html: Prispievateľom OSM pripomíname, že by nikdy nemali pridávať dáta zo zdrojov chránených autorským právom (napr. Google Maps či tlačené mapy) bez výslovného súhlasu držiteľov práv.
infringement_2_html: Ak sa domnievate, že materiál podliehajúci autorským právam bol neoprávnene pridaný do databázy OpenStreetMap alebo na tieto stránky, prosíme vás, aby ste si pozreli náš <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postup odstraňovania</a> alebo podajte žiadosť priamo na <a href="http://dmca.openstreetmap.org/">stránke pre podávanie sťažností</a>.
infringement_title_html: Porušenie autorských práv
- intro_1_html: " OpenStreetMap sú <em>slobodné dáta</em>, ponúkané za podmienok licencie <a href=\"http://opendatacommons.org/licenses/odbl/\">Open Data Commons Open Database License</a> (ODbL)."
+ intro_1_html: OpenStreetMap sú <em>slobodné dáta</em>, ponúkané za podmienok licencie <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
intro_2_html: " Môžete kopírovať, distribuovať, oznamovať verejnosti a upravovať naše dáta, pokiaľ ako zdroj uvediete „<em>OpenStreetMap a jeho prispievatelia</em>“. Ak naše mapy alebo dáta budete upravovať alebo ich použijete vo svojom diele, musíte výsledné dielo šíriť pod rovnakou licenciou. Vaše práva a povinnosti sú vysvetlené v <a href=\"http://opendatacommons.org/licenses/odbl/\">plnom znení licenčnej zmluvy</a>."
intro_3_html: Kartografia v našich mapových podkladoch a naša dokumentácia je zverejnená pod licenciou <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Uveďte autora – Zachovajte licenciu 2.0</a> (CC-BY-SA).
more_1_html: O používaní našich dát a spôsobe citovania, sa môžete dočítať viac v našich <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Často kladených právnych otázkach</a>.
# Author: Dbc334
# Author: Eleassar
# Author: Lesko987
+# Author: Stefanb
sl:
activerecord:
attributes:
show_areas: Prikaži podrpčja
show_history: Prikaži zgodovino
unable_to_load_size: "Ni mogoče naložiti: Pravokotno področje velikosti %{bbox_size} je preveliko (mora biti manjše od %{max_bbox_size})"
+ view_data: Ogled podatkov trenutno prikazanega zemljevida
wait: Počakajte...
zoom_or_select: Povečajte zemljevid ali izberite področje za prikaz
tag_details:
hide_link: Skrij ta komentar
diary_entry:
comment_count:
- few: "%{count} komentarje"
one: "%{count} komentar"
- other: "%{count} komentarjev"
+ other: three=%{count} komentarji
two: "%{count} komentarja"
+ zero: Brez komentarjev
comment_link: Komentiraj ta vnos
confirm: Potrdi
edit_link: Uredi ta vnos
bench: Klop
bicycle_parking: Parkirišče za kolesa
bicycle_rental: Izposoja koles
+ biergarten: Pivski vrt
brothel: Javna hiša
bureau_de_change: Menjalnica
bus_station: Avtobusna postaja
national_park: Nacionalni Park
protected_area: Zavarovano območje
bridge:
+ aqueduct: Akvadukt
+ suspension: Viseči most
+ swing: Vrteči most
viaduct: Viadukt
"yes": Most
building:
building: Zgradba
castle: Grad
church: Cerkev
+ fort: Trdnjava
house: Hiša
icon: Ikona
manor: Graščina
wood: Pragozd
leisure:
beach_resort: kopališče
+ bird_hide: Ptičja opazovalnica
common: Javno zemljišče
fishing: Ribolovno območje
garden: Vrt
channel: Kanal
cliff: Klif
crater: Krater
+ dune: Peščina
feature: Znamenitost
fell: Višinski travnik
fjord: Fjord
+ forest: Gozd
geyser: Gejzir
glacier: Ledenik
heath: Ravnina
scrub: Grmovje
shoal: Peščena plaža
spring: Izvir
+ stone: Skala
strait: Ožina
tree: Drevo
valley: Dolina
wetland: Mokrišče
wetlands: Mokrišča
wood: Pragozd
+ office:
+ accountant: Računovodja
+ architect: Arhitekt
+ company: Podjetje
+ employment_agency: Agencija za zaposlovanje
+ estate_agent: Nepremičninska agencija
+ government: Vladni urad
+ lawyer: Odvetnik
+ travel_agent: Potovalna agencija
+ "yes": Pisarne
place:
airport: Letališče
city: Mesto
tunnel:
"yes": Predor
waterway:
+ artificial: Umetni vodotok
boatyard: Ladjedelnica
canal: Prekop
connector: Vodne povezave
email never displayed publicly: (nikoli javno objavljen)
flash update success: Podatki o uporabniku so bili uspešno posodobljeni.
flash update success confirm needed: Podatki o uporabniku so bili uspešno posodobljeni. Preverite svojo e-pošto in potrdite spremembo e-poštnega naslova.
+ gravatar:
+ gravatar: Uporabi Gravatar
+ link text: Kaj je to?
home location: "Domača lokacija:"
image: "Slika:"
image size hint: (Najbolje delujejo kvadratne slike vsaj 100x100 točk)
credit_1_html: " Nëse ju përdorni imazhe të hartave të OpenStreetMap, ne kërkojmë që \n së paku citimet tuaja të përfshijnë “© OpenStreetMap\n kontribuuesit, CC BY-SA”. Nëse ju përdorni vetëm të dhëna të hartave\n ne kërkojmë citimin e kontribuuesve “të të dhënave të hartave © të OpenStreetMap,\n CC BY-SA”."
credit_2_html: " Ku është e mundur, OpenStreetMap duhet të hyperlinked to <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n dhe CC BY-SA to <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n www.openstreetmap.org (ndoshta duke shpjeguar \n ‘OpenStreetMap’ këtë adresë të plotë) dhe tek \n www.creativecommons.org."
credit_title_html: Si të citoni OpenStreetMap
- intro_1_html: " OpenStreetMap është <i>me kod të hapur</i>, dhe e licencuar nën <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n Commons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: " Ju jeni të lirë të kopjoni, shpërndani, transmetoni dhe adoptoni hartat\n dhe të dhënat tona, duke pasur parasysh citimin e OpenStreetMap dhe \n kontribuuesve të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\n mund të shpërndani rezultatet nën licencën e njëjtë. Licenca e\n e plotë <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n code</a> shpjegon të drejtat dhe përgjegjësitë tuaja."
more_1_html: " Lexoni më shumë rreth përdorimit të të dhënave <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n FAQ</a>."
more_2_html: " OSM kontribuuesit duhet të mos përdorin asnjë të dhënë prej burimeve të çfarëdoshme\n të mbrojtura me të drejta të kopjimit (p.sh. Google Maps apo harta të printuara) pa\n leje speciale prej pronarëve të të drejtave të kopjimit."
credit_1_html: " Ako koristite naše slike mapa, tražimo da zasluge sadrže\n bar “© Doprinosioci\n Openstritmapa, CC BY-SA”. Ako koristite samo podatke mapa,\n navedite “Kartografski podaci © Doprinosioci Openstritmapa,\n CC BY-SA”."
credit_2_html: " Gde je moguće, Openstritmap bi trebalo da vodi do adrese <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n i CC BY-SA do <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n Ako koristite medijum u kom se veze ne mogu postaviti\n (npr. štampani rad), predlažemo da usmerite vaše\n čitaoce na www.openstreetmap.org (po mogućstvu\n proširavanjem ‘Openstritmapa’ na celu adresu)\n i na www.creativecommons.org."
credit_title_html: Kako da imenujete Openstritmap
- intro_1_html: " Openstritmap čine <i>slobodni podaci</i> koji su objavljeni pod\n licencom <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: " Možete da umnožavate, delite, prenosite i prilagođavate\n naše mape i podatke, sve dok imenujete Openstritmap i njene\n urednike. Ako želite da menjate i dograđujete naše podatke,\n možete ih deliti samo pod istom licencom.\n Ceo <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">\n tekst ugovora</a> objašnjava vam vaša prava i odgovornosti."
more_1_html: " Pročitajte više o korišćenju naših podataka na <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">ČPP</a>."
more_2_html: " Podsećamo urednike Openstritmapa da nikada ne dodaju podatke\n od bilo kog izvora zaštićenog autorskim pravima (npr.\n Gugl mape ili štampane mape) bez izričite dozvole\n nosioca autorskog prava."
credit_3_html: "Ради прегледније електронске мапе, приписивање би требало да се прикаже у углу мапе.\nНа пример:"
credit_title_html: Како да именујете Опенстритмап
infringement_title_html: Кршење ауторских права
- intro_1_html: " Опенстритмап чине <i>слободни подаци</i> који су објављени под\n лиценцом <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n Кријејтив комонс Ауторство-Делити под истим условима 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: " Можете да умножавате, делите, преносите и прилагођавате\n наше податке, све док именујете Опенстритмап и њене\n уреднике. Ако желите да мењате и дограђујете наше податке,\n можете их делити само под истом лиценцом.\n Цео <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">\n текст уговора</a> објашњава вам ваша права и одговорности."
intro_3_html: "Картографија у нашим пољима мапа и документацији\nнуди се под лиценцом <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Кријејтив комонс Ауторство-Делити под истим условима 2.0</a> (CC-BY-SA)."
more_1_html: "Више о употреби података и како да нас наводите можете пронаћи на <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Правним ЧПП</a>."
hi: Поздрав, %{to_user},
subject_header: "[Опенстритмап] – %{subject}"
signup_confirm:
- subject: "[OpenStreetMap] Потврдите вашу е-адресу"
+ created: Неко (надамо се ви) управо је отворио налог на %{site_url}.
+ greeting: Здраво!
+ subject: "[OpenStreetMap] Добро дошли на Опенстритмап"
signup_confirm_html:
ask_questions: Можете поставити било које питање о Опенстритмапу на нашим <a href="http://help.openstreetmap.org/">страницама за питања и одговоре</a>.
current_user: Списак тренутних корисника у категоријама, заснован на томе где се они налазе, доступан је на <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
create:
flash: Подаци су успешно уписани
destroy:
- flash: УпиÑ\81 пÑ\80огÑ\80ама Ñ\98е Ñ\83кинÑ\83Ñ\82
+ flash: УниÑ\88Ñ\82ена Ñ\98е Ñ\80егиÑ\81Ñ\82Ñ\80аÑ\86иÑ\98а клиÑ\98енÑ\82Ñ\81ког пÑ\80огÑ\80ама
edit:
submit: Уреди
title: Уреди програм
# Author: Balp
# Author: Cohan
# Author: Cybjit
+# Author: Fader
# Author: Grillo
# Author: Jas
# Author: Jopparn
show_areas: Visa område
show_history: Visa historik
unable_to_load_size: "Kan inte ladda: det omslutande området %{bbox_size} är för stort (den måste vara mindre än %{max_bbox_size})"
+ view_data: Visa data för aktuell kartvy
wait: Vänta...
zoom_or_select: Zooma in eller välj arean du vill se.
tag_details:
paste_html: Klistra in HTML för att bädda in på webbplats
scale: Skala
too_large:
- body: Detta område är för stort för att exporteras som OpenStreetMap XML-data. Vänligen zooma in eller välja ett mindre område.
+ body: Detta område är för stort för att exporteras som OpenStreetMap XML-data. Vänligen zooma in eller välj ett mindre område.
heading: For stort område
zoom: Zooma
start_rjs:
copyright: Upphovsrätt & licens
documentation: Dokumentation
documentation_title: Projektdokumentation
- donate: Donera till OpenStreetMap med en %{link} till hårdvarufonden.
+ donate: Stöd OpenStreetMap med en %{link} till hårdvarufonden.
donate_link_text: donation
edit: Redigera
edit_with: Redigera med %{editor}
export: Exportera
export_tooltip: Exportera kartdata som bild eller rådata
foundation: Stiftelsen
- foundation_title: OpenStreetMap stiftelsen
+ foundation_title: OpenStreetMap-stiftelsen
gps_traces: GPS-spår
gps_traces_tooltip: Visa, ladda upp och ändra GPS-spår.
help: Hjälp
home_tooltip: Gå till hempositionen
inbox_html: inkorg %{count}
inbox_tooltip:
- one: Du har ett oläst meddelande
- other: Du har %{count} olästa meddelanden
- zero: Du har inga olästa meddelanden.
+ one: Din inkorg innehåller ett oläst meddelande
+ other: Din inkorg innehåller %{count} olästa meddelanden
+ zero: Din inkorg innehåller inga olästa meddelanden.
intro_1: Openstreetmap är en fri redigeringsbar karta av hela världen, den görs av folk precis som du.
intro_2_create_account: Skapa ett användarkonto
intro_2_download: ladda ner
make_a_donation:
text: Donera
title: Stöd OpenStreetMap med en monetär donation
- osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, då databasunderhåll pågår.
- osm_read_only: Det går bara att läsa från OpenStreetMap-databasen just nu, då viktigt underhåll utförs på databasen.
+ osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, då nödvändigt databasunderhåll pågår.
+ osm_read_only: OpenStreetMap-databasen är skrivskyddad just nu, då nödvändigt databasunderhåll pågår.
partners_bytemark: Bytemark Hosting
partners_html: Hosting via %{ucl}, %{ic} och %{bytemark}, med flera %{partners}.
partners_ic: Imperial College London
date: Datum
from: Från
messages: Du har %{new_messages} och %{old_messages}
- my_inbox: Min inbox
+ my_inbox: Min inkorg
new_messages:
one: "%{count} nytt meddelande"
other: "%{count} nya meddelanden"
old_messages:
one: "%{count} gammalt meddelande"
other: "%{count} gamla meddelanden"
- outbox: utbox
+ outbox: utkorg
people_mapping_nearby: folk som kartlägger i närheten
subject: Ärende
- title: Inbox
+ title: Inkorg
mark:
as_read: Meddelandet markerat som läst
as_unread: Meddelandet markerat som oläst
reply_button: Svar
unread_button: Markera som oläst
new:
- back_to_inbox: Tillbaks till inboxen
+ back_to_inbox: Tillbaka till inkorgen
body: Brödtext
limit_exceeded: Du har skickat många meddelanden på kort tid. Var god vänta en stund innan du försöker igen.
message_sent: Meddelande skickat
send_button: Skicka
- send_message_to: Skicka nytt meddelande till %{name}
+ send_message_to: Skicka ett nytt meddelande till %{name}
subject: Ärende
title: Skicka meddelande
no_such_message:
title: Inget sådant meddelande
outbox:
date: Datum
- inbox: inbox
+ inbox: inkorg
messages:
one: Du har %{count} skickat meddelande
other: Du har %{count} skickade meddelanden
my_inbox: Min %{inbox_link}
- no_sent_messages: Du had ing a skickade meddelanden ännu. Varför inte ta kontakt med någon av de %{people_mapping_nearby_link}?
- outbox: utbox
+ no_sent_messages: Du har inte skickat några meddelanden ännu. Varför inte ta kontakt med någon av de %{people_mapping_nearby_link}?
+ outbox: utkorg
people_mapping_nearby: folk som kartlägger i närheten
subject: Ärende
- title: Utbox
+ title: Utkorg
to: Till
read:
- back_to_inbox: Åter till inbox
- back_to_outbox: Tillbaks till utboxen
+ back_to_inbox: Tillbaka till inkorgen
+ back_to_outbox: Tillbaka till utkorgen
date: Datum
from: Från
reading_your_messages: Läser dina meddelanden
title: Läs meddelande
to: Till
unread_button: Markera som oläst
- wrong_user: Du är inloggad som '%{user}' men meddelandet du har bett om att få läsa skickades inte till eller av den användaren. Logga in som korrekt användare för att läsa det..
+ wrong_user: Du är inloggad som '%{user}', men meddelandet du har bett om att få läsa skickades inte till eller av den användaren. Logga in med korrekt användare för att läsa det.
reply:
- wrong_user: Du är inloggad som '%{user}' men meddelandet du har beth om att besvara skickades inte till den användaren. Logga in som den användaren för att svara.
+ wrong_user: Du är inloggad som '%{user}', men meddelandet du har bett om att besvara skickades inte till den användaren. Logga in med korrekt användare för att svara.
sent_message_summary:
delete_button: Radera
notifier:
click_the_link: Om det är du, klicka på länken nedan för att återställa ditt lösenord.
greeting: Hej,
hopefully_you_1: Någon (förhoppningsvis du) vill återställa lösenordet för denna
- hopefully_you_2: email adress openstreetmap.org konto.
+ hopefully_you_2: e-postadress för openstreetmap.org-konto.
message_notification:
footer1: Du kan också läsa meddelandet på %{readurl}
footer2: och du kan svara på %{replyurl}
site:
edit:
anon_edits_link_text: Ta reda på varför det är så.
- flash_player_required: Du måste ha Flash
för att kunna använda Potatch, OpenStreetMaps flasheditor. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ladda hem Flash Player från Adobe.com</a>. Det finns <a href="http://wiki.openstreetmap.org/wiki/Editing">flera andra editorer</a> tillgängliga för OpenStreetMap.
- no_iframe_support: Din webbläsare stöder inte HTML iframe, som är nödvändiga för den här funktionen.
- not_public: Du har into ändrat statusen på dina ändringar till offentliga.
+ flash_player_required: Du måste ha Flash
Player för att kunna använda Potlatch, OpenStreetMaps flasheditor. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ladda hem Flash Player från Adobe.com</a>. Det finns också <a href="http://wiki.openstreetmap.org/wiki/Editing">flera andra editorer</a> tillgängliga för OpenStreetMap.
+ no_iframe_support: Din webbläsare stöder inte HTML iframe, som är nödvändig för den här funktionen.
+ not_public: Du har inte satt statusen på dina redigeringar som offentliga.
not_public_description: Du kan inte längre redigera kartan om du inte gör det. Du kan göra dina redigeringar offentliga från din %{user_page}.
potlatch2_not_configured: Potlatch 2 har inte konfigurerats - se http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 för mer information
potlatch2_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch 2, bör du klicka på Spara.)
license:
copyright: Upphovsrätten tillhör OpenStreetMap och bidragsgivare, under en öppen licens
permalink: Permanent länk
- remote_failed: Redigering misslyckades - kontrollera att JOSM eller Merkaartor är inläst och fjärrkontrollsalternativet är aktiverat
+ remote_failed: Redigering misslyckades - kontrollera att JOSM eller Merkaartor är startad och fjärrkontrollsalternativet är aktiverat
shortlink: Kortlänk
key:
map_key: Kartnyckel
search: Sök
search_help: "exempel: 'Delsbo', 'Storgatan, Svedala', <a href='http://wiki.openstreetmap.org/wiki/Sv:Search'>Fler exempel..</a>"
submit_text: Gå
- where_am_i: Var är jag
+ where_am_i: Var är jag?
where_am_i_title: Beskriv den aktuella platsen med hjälp av sökmotorn
sidebar:
close: Stäng
title: Användare
login:
account is suspended: "Tyvärr har ditt konto stängts av på grund av tvivelaktig aktivitet.<br />Kontakta <a href=\"%\n{webmaster}\">webbansvarig</a> om du vill diskutera saken."
- account not active:
Ditt konto är inte aktivterat.<br />Vänligen klicka på länken i e-brevet med kontobekräftelsen för att aktivera ditt konto, eller <a href="%{reconfirm}">begär ett nytt bekräftelsebrev</a>.
+ account not active:
Tyvärr, ditt konto är inte aktiverat.<br />Vänligen klicka på länken i e-brevet med kontobekräftelsen, för att aktivera ditt konto, eller <a href="%{reconfirm}">begär ett nytt bekräftelsebrev</a>.
auth failure: Kunde inte logga in med de uppgifterna.
create account minute: Skapa ett konto. Det tar bara en minut.
email or username: "E-postadress eller användarnamn:"
new to osm: Ny på OpenStreetMap?
no account: Har du inget konto?
openid: "%{logo} OpenID:"
- openid invalid: Tyvärr verkar din OpenID vara felaktigt formaterad.
+ openid invalid: Tyvärr verkar ditt OpenID vara felaktigt formaterat.
openid missing provider: Kunde inte nå din OpenID leverantör
openid_logo_alt: Logga in med ett OpenID
openid_providers:
alt: Logga in med myOpenID OpenID
title: Logga in med myOpenID
openid:
- alt: Logga in med ett OpenID-URL
+ alt: Logga in med en OpenID-URL
title: Logga in med OpenID
wordpress:
- alt: Logga in med Wordpress OpenID
+ alt: Logga in med ett Wordpress OpenID
title: Logga in med Wordpress
yahoo:
alt: Logga in med ett Yahoo OpenID
title: Logga in med Yahoo
password: "Lösenord:"
register now: Registrera dig nu
- remember: "Kom ihåg mig:"
+ remember: Kom ihåg mig
title: Logga in
to make changes: För att göra ändringar i OpenStreetMaps data måste du ha ett konto.
with openid: "Du kan även använda ditt OpenID-konto för att logga in:"
- with username: "Har du redan ett OpenStreetMap konto? Logga in med ditt användarnamn och lösenord:"
+ with username: "Har du redan ett OpenStreetMap-konto? Logga in med ditt användarnamn och lösenord:"
logout:
heading: Logga ut från OpenStreetMap
logout_button: Logga ut
new:
confirm email address: "Bekräfta e-postadress:"
confirm password: "Bekräfta lösenord:"
- contact_webmaster: Kontakta <a href="mailto:webmaster@openstreetmap.org">webmastern</a> för att få ett konto skapat - vi kommer att behandla ansökan så snabbt som möjligt.
+ contact_webmaster: Kontakta <a href="mailto:webmaster@openstreetmap.org">webbansvarig</a> för att få ett konto skapat - vi kommer att behandla ansökan så snart som möjligt.
continue: Fortsätt
display name: "Namn som visas:"
display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i inställningarna.
flash create success message: Tack för att du registrerade dig. Vi har skickat ett bekräftelsebegäran till %{email} och så snart du bekräftat ditt konto kommer du kunna kartlägga.<br /><br />Använder du ett antispamsystem som skickar bekräftelsebegäranden se till att du vitlistar webmaster@openstreetmap.org då vi inte kan svara på några bekräftelsebegäranden.
flash welcome: Tack för att du valt att bli medlem. Vi har skickat ett välkomstmeddelande till %{email} med lite tips på hur man kommer igång.
heading: Skapa ett användarkonto
- license_agreement: När du bekräftar ditt konto måste du samtycka till <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">bidragsgivarvillkoren</a> .
+ license_agreement: När du bekräftar ditt konto måste du samtycka till <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">bidragsgivarvillkoren</a>.
no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto åt dig automatiskt.
- not displayed publicly: Visas inte offentligt (se <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wikins sekretesspolicy inklusive avsnittet om e-postadresser">sekretesspolicyn</a>)
+ not displayed publicly: Visas inte offentligt (se <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wikins integritetspolicy (inkluderar avsnitt om e-postadresser)">integritetspolicyn</a>)
openid: "%{logo} OpenID:"
- openid association: "<p>Ditt OpenID är ännu inte associerad med ett OpenStreetMap konto</p>\n<ul>\n<li>Om du är ny på OpenStreetMap, skapa ett nytt konto med hjälp av formuläret nedan.</li>\n<li>\n Om du redan har ett konto kan du logga in till ditt konto på vanligt sätt\n med hjälp av ditt användarnamn och lösenord, för att sedan associera kontot\n med ditt OpenID i användarinställningarna.\n</li>\n</ul>"
- openid no password: Med OpenID behövs inget lösenord, men en del extra verktyg och vissa servrar kan fortfarande behöva en.
+ openid association: "<p>Ditt OpenID är ännu inte associerad med ett OpenStreetMap konto ännu.</p>\n<ul>\n <li>Om du är ny på OpenStreetMap, skapa ett nytt konto med hjälp av formuläret nedan.</li>\n <li>\n Om du redan har ett konto, kan du logga in\n med hjälp av ditt användarnamn och lösenord, för att sedan associera kontot\n med ditt OpenID i användarinställningarna.\n </li>\n</ul>"
+ openid no password: Med OpenID behövs inget lösenord, men en del extra verktyg och vissa servrar kan fortfarande behöva ett.
password: "Lösenord:"
terms accepted: Tack för att du accepterar de nya vilkoren för bidrag till kartan
terms declined: Vi beklagar att du bestämt dig för att inte acceptera de nya användarvillkoren. För mer information, se <a href="%{url}">denna wikisida</a>.
no_such_user:
body: Det finns ingen användare med namnet %{user}. Kontrollera stavningen eller kanske länken är trasig.
heading: Användaren %{user} finns inte
- title: Ingen sådan användare
+ title: Finns ingen sådan användare
popup:
friend: Vän
nearby mapper: Användare i närheten
legale_names:
france: Frankrike
italy: Italien
- rest_of_world: Resten av världen
- legale_select: Välj din vistelseort
+ rest_of_world: Övriga världen
+ legale_select: "Välj det land du bor i:"
read and accept: Läs avtalet nedan och klicka på knappen Godkänn för att bekräfta att du godkänner villkoren i detta avtal för dina befintliga och framtida bidrag.
title: Villkor för deltagare
you need to accept or decline: Läs igenom och Godkänn eller Avböj de nya bidragsvillkoren för att fortsätta.
credit_1_html: "Kinakailangan namin na gamitin ang kredito na “© mga tagapag-ambag ng \nOpenStreetMap”."
credit_2_html: "Kung saan maaari, dapat na ikawing nang labis (lagyan ng hyperlink) ang OpenStreetMap\nna papunta sa <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nat CC BY-SA sa <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Kung\ngumagamit ka ng isang midyum o kasangkapan kung saan hindi maaari ang mga kawing (iyong isang\nakdang nakalimbag), iminumungkahi namin na ituro ang mga mambabasa mo sa \nwww.openstreetmap.org (marahil sa pamamagitan ng pagpapalawak ng ‘OpenStreetMap’\nupang maging tumuturo sa buong tirahan na ito) at sa www.creativecommons.org."
credit_title_html: Paano babanggitin ang OpenStreetMap
- intro_1_html: "Ang OpenStreetMap ay <i>bukas na dato</i>, na nilisensiyahan sa ilalim ng <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: "Malaya mong makokopya, maipapamahagi, maipahahatid at mahahalaw ang aming mga dato,\nbasta't babanggitin mo ang OpenStreetMap at ang mga tagapag-ambag\nnito. Kapag binago mo o nagbuo sa pamamagitan ng aming mga dato, maaari\nmong ipamahagi ang resulta sa ilalim lamang ng katulad na lisensiya. Ipinapaliwanag \nng buong <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">kodigong pambatas</a> \nang mga karapatan at mga pananagutan mo."
intro_3_html: "Ang kartograpya sa aming mga tile na mapa at ang aming dokumentasyon ay lisensyado sa ilalim ng <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">lisensiyang Creative\nCommons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
more_1_html: "Magbasa ng mas marami pa hinggil sa paggamit ng dato namin doon sa <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Mga Palaging Itinatanong \nna Makabatas</a>."
# Author: AS
# Author: Andygol
# Author: Arturyatsko
+# Author: Base
# Author: Dim Grits
# Author: Dittaeva
# Author: KEL
show_areas: Показати ділянки
show_history: Показати історію
unable_to_load_size: "Неможливо завантажити: розмір %{bbox_size} завеликий (має бути менше, ніж %{max_bbox_size})"
+ view_data: Переглянути дані для поточного подання карти
wait: Зачекайте…
zoom_or_select: Збільшить масштаб або виберіть ділянку на мапі для перегляду
tag_details:
few: "%{count} коментарі"
one: "%{count} коментар"
other: "%{count} коментарів"
+ zero: Немає коментарів
comment_link: Коментувати
confirm: Підтвердити
edit_link: Правити цей запис
infringement_1_html: Члени спільноти OSM повинні завжди пам’ятати про те, що забороняється додавати дані з будь-яких захищених авторським правом джерел (наприклад, з Google Maps чи з друкованих мап) без отримання попереднього дозволу правовласників.
infringement_2_html: Якщо ви вважаєте, що захищений авторським правом матеріал був недоречно доданий до бази даних OpenStreetMap або до цього сайту, ознайомтесь із нашим <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">порядком з вилучення таких даних</a> або скористуйтесь безпосередньо нашою <a href="http://dmca.openstreetmap.org/">сторінкою для онлайн звернень</a>.
infringement_title_html: Порушення авторських прав
- intro_1_html: "
Дані OpenStreetMap є <i>відкрити даними</i>, що ліцензуються на\n умовах Ліцензії <a href=\"http://opendatacommons.org/licenses/odbl/\">Open Data Commons Open Database License</a> (ODbL)"
+ intro_1_html: "
Дані OpenStreetMap є <i>відкрити даними</i>, що ліцензуються на\nумовах Ліцензії <a href=\"http://opendatacommons.org/licenses/odbl/\">Open Data Commons Open Database License</a> (ODbL)"
intro_2_html: Ви можете вільно копіювати, поширювати, передавати й змінювати наші дані, посилаючись при цьому на OpenStreetMap та його спільноту. Якщо ви змінюєте наші дані чи створюєте на їх основі свої, ви повинні розповсюджувати результати під такою ж Ліцензією. Повний <a href="http://opendatacommons.org/licenses/odbl/1.0/">чинний текст</a> Ліцензії пояснює ваші права та обов’язки.
intro_3_html: "Мапи в графічному вигляді, а також документація розповсюджуються на умовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцензії Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
more_1_html: Дізнайтеся більше про використання наших даних та про те, як вказувати нас як джерело походження даних у <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">відповідях з правових питань</a>.
header: "%{from_user} надіслав вам повідомлення через OpenStreetMap з темою %{subject}:"
hi: Привіт, %{to_user},
signup_confirm:
- subject: "[OpenStreetMap] Підтвердіть вашу адресу електронної пошти"
+ confirm: "Перш ніж ми щось зробимо, ми повинні впевнитись, що запит надійшов від Вас; тож якщо це були Ви, будь ласка, натисніть на посилання нижче, щоб підтвердити Ваш обліковий запис:"
+ created: Хтось (сподіваємось Ви) щойно створив обліковий запис на % {site_url}.
+ greeting: Привіт!
+ subject: "[OpenStreetMap] Ласкаво просимо на OpenStreetMap"
+ welcome: Ми хочемо привітати Вас і надати Вам деяку додаткову інформацію для початку.
signup_confirm_html:
ask_questions: Ви можете задати питання про OpenStreetMap на нашому <a href="http://help.openstreetmap.org/">сайті питань і відповідей</a>.
current_user: "Перелік користувачів, за їх місцем знаходження, можна отримати тут: <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region\">Category:Users_by_geographical_region</a>."
signup_confirm_plain:
ask_questions: "Ви можете задати питання про OpenStreetMap на нашому сайті питань та і відповідей:"
blog_and_twitter: "Ознайомитися з останніми новинами через блог OpenStreetMap або Twitter:"
+ current_user: "Список поточних коростувачів у категоріях, основаних на тому, де в світі вони перебувають, доступних з:"
introductory_video: "Ви можете подивитися відео-вступ про OpenStreetMap тут:"
more_videos: "Ще більше відео тут:"
opengeodata: "OpenGeoData.org — це блог засновника OpenStreetMap — Стіва Коуста (Steve Coast), тут також можна знайти підкасти:"
the_wiki: "Почитати про OpenStreetMap у Вікі:"
the_wiki_url: http://wiki.openstreetmap.org/wiki/Uk:Beginners%27_Guide
+ user_wiki_page: Рекомендовано створити вікі-сторінку користувача, до якої включити категорії, що вказують на те, де Ви перебуваєте, такі як [[Category:Users_in_London]].
wiki_signup: "Ви також можете зареєструватися в вікі OpenStreetMap тут:"
wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Uk:Main_Page
oauth:
email never displayed publicly: "\n(ніколи не показується загальнодоступно)"
flash update success: Інформацію про користувача успішно оновлено.
flash update success confirm needed: Інформацію про користувача успішно оновлено. Перевірте свою електронну пошту, щоб підтвердити вашу нову адресу.
+ gravatar:
+ gravatar: Використовувати Gravatar
+ link text: Що це?
home location: "Основне місце розташування:"
image: "Зображення:"
image size hint: (найкраще підходять квадратні зображення, принаймні 100х100)
email address: "Адреса ел. пошти:"
fill_form: Заповніть форму, і ми надішлемо вам на електронну пошту листа з інструкцією по активацію вашого облікового запису.
flash create success message: Користувача успішно зареєстровано. Перевірте вашу електрону пошту (%{email}) на наявність листа з підтвердженням, натисніть на посилання в ньому та можете негайно починати редагувати мапу :-).<br /><br /> Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти. <br /><br />Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити.
+ flash welcome: Дякуємо за реєстрацію. Ми надіслали привітання з деякими порадами для початку на адресу %{email}.
heading: Створення облікового запису користувача
license_agreement: Створюючи обліковий запис, вам треба погодитись з <a href="http://wiki.openstreetmap.org/wiki/Uk:Open_Database_License/Contributor_Terms">Умовами Співпраці</a>.
no_auto_account_create: На жаль, ми в даний час не в змозі створити для вас обліковий запис автоматично.
show_areas: Hiện các khu vực
show_history: Xem Lịch sử
unable_to_load_size: "Không thể tải: Hộp bao với cỡ %{bbox_size} quá lớn (phải nhỏ hơn %{max_bbox_size})"
+ view_data: Xem dữ liệu của phần bản đồ đang xem
wait: Xin chờ…
zoom_or_select: Phóng to hoặc chọn vùng bản đồ để xem
tag_details:
hide_link: Ẩn bình luận này
diary_entry:
comment_count:
- one: 1 bình luận
other: "%{count} bình luận"
+ zero: Chưa có bình luận
comment_link: Bình luận về mục này
confirm: Xác nhận
edit_link: Sửa đổi mục này
infringement_1_html: Những người đóng góp vào OSM được khuyên không bao giờ bổ sung dữ liệu từ những nguồn có bản quyền (chẳng hạn Bản đồ Google hoặc các bản đồ trên giấy) trước khi các nhà giữ bản quyền cho phép rõ ràng.
infringement_2_html: Nếu bạn tin rằng tài liệu có bản quyền đã được bổ sung vào cơ sở dữ liệu OpenStreetMap hoặc trang này một cách không thích đáng, xin vui lòng tham khảo <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure?uselang=vi">quá trình <i>takedown</i></a> hoặc nộp đơn trực tiếp tại <a href="http://dmca.openstreetmap.org/">trang khiếu nại trực tuyến</a> của chúng tôi.
infringement_title_html: Vi phạm bản quyền
- intro_1_html: " OpenStreetMap là <i>dữ liệu mở</i> được phát hành theo giấy phép <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative Commons Ghi công–Chia sẻ tương tự 2.0</a> (CC BY-SA)."
+ intro_1_html: "OpenStreetMap là <i>dữ liệu mở</i> được phát hành theo <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Giấy phép Cơ sở dữ liệu Mở của Open Data\nCommons</a> (ODbL)."
intro_2_html: Bạn được tự do sao chép, phân phối, truyền, và tạo ra các tác phẩm phái sinh từ các dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap và những người đóng góp vào nó. Nếu bạn sửa đổi hoặc tạo sản phẩm dựa trên các dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng giấy phép. <a href="http://opendatacommons.org/licenses/odbl/1.0/">Mã pháp lý</a> đầy đủ giải thích các quyền và trách nhiệm của bạn.
intro_3_html: "Các hình ảnh bản đồ và tài liệu của chúng tôi được phát hành theo giấy phép <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative \nCommons Ghi công–Chia sẻ tương tự 2.0</a> (CC BY-SA)."
more_1_html: Hãy đọc thêm chi tiết về việc sử dụng dữ liệu của chúng tôi và cách ghi công chúng tôi trong <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=vi">Hỏi đáp Pháp lý</a>.
heading: Mở Tài khoản Người dùng
license_agreement: Lúc khi xác nhận tài khoản, bạn sẽ phải chấp nhận <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=vi">các Điều kiện Đóng góp</a>.
no_auto_account_create: Rất tiếc, chúng ta hiện không có khả năng tạo ra tài khoản tự động cho bạn.
- not displayed publicly: Không được hiển thị công khai (xem <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy?uselang=vi" title="Chính sách riêng tư wiki, có đoạn nói về địa chỉ thư điện tử including section on email addresses">chính sách riêng tư</a>)
+ not displayed publicly: Không được hiển thị công khai (xem <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy?uselang=vi" title="Quy định quyền riêng tư wiki, có đoạn nói về địa chỉ thư điện tử">quy định quyền riêng tư</a>)
openid: "%{logo} OpenID:"
openid association: "<p>OpenID của bạn chưa được nối với một tài khoản OpenStreetMap.</p>\n<ul>\n <li>Nếu bạn mới đến OpenStreetMap, hãy mở tài khoản dùng biểu mẫu ở dưới.</li>\n <li>Nếu đã có tài khoản, bạn có thể đăng nhập vào tài khoản của bạn dùng tên người dùng và một khẩu thường và nối tài khoản với OpenID của bạn tại trang tùy chọn.</li>\n</ul>"
openid no password: Khi đăng nhập dùng OpenID, bạn sẽ không cần đưa vào mật khẩu. Tuy nhiên, một số công cụ hoặc máy chủ phụ vẫn có thể cần mật khẩu.
contributors_title_html: 我们的贡献者
infringement_1_html: "OSM 的贡献者会被提醒，在没有\n版权持有人的明确许可下，绝不添加任何受版权保护的数据\n（例如：谷歌地图，或印刷地图）。"
infringement_title_html: 侵权问题
- intro_1_html: " OpenStreetMap 是<i>开放数据</i>的，采用<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">知识\n 共享 署名-相同方式共享 2.0</a>协议(CC BY-SA)授权。"
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
intro_2_html: " 您可以自由地复制、发行、传播和创作演绎我们的地图\n 和数据，只要您信任 OpenStreetMap 和它的\n 贡献者。如果您改变、转换或者以我们的地图或数据为基础进行创作，您\n 只能采用与本协议相同的许可协议发布您的作品。完整\n 的<a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">法律\n 文本</a>阐明了您的权利和义务。"
more_1_html: " 阅读更多关于使用我们数据的 <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">常见\n 法律问题</a>。"
more_title_html: 了解更多
node_title: 節點： %{node_name}
view_history: 檢視歷史
node_details:
- coordinates: å\9d\90標：
+ coordinates: 座標：
part_of: 部分：
node_history:
download_xml: 下載 XML
text: 這這個翻譯頁面和 %{english_original_link} 在事件上有衝突時，英文(English)網頁會有較高的優先權
title: 關於這個翻譯
legal_babble:
- intro_1_html: "OpenStreetMap 是<i>開放資料</i>，以<a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">創用 CC 姓名標示-相同方式分享 2.0</a> 許可 (CC BY-SA) 授權。"
+ intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
more_title_html: 了解更多
title_html: 版權與授權條款
native:
"ja" => "ja_JP",
"ka" => "ka",
"ko" => "ko",
+ "ky" => "ky",
"lb" => "lb",
"lt" => "lt",
"lv" => "lv",
xhr :get, :start
assert_response :success
end
-
+
def test_read_relation
browse_check 'relation', relations(:visible_relation).relation_id
end
-
+
def test_read_relation_history
browse_check 'relation_history', relations(:visible_relation).relation_id
end
-
+
def test_read_way
browse_check 'way', ways(:visible_way).way_id
end
-
+
def test_read_way_history
browse_check 'way_history', ways(:visible_way).way_id
end
-
+
def test_read_node
browse_check 'node', nodes(:visible_node).node_id
end
-
+
def test_read_node_history
browse_check 'node_history', nodes(:visible_node).node_id
end
-
+
def test_read_changeset
browse_check 'changeset', changesets(:normal_user_first_change).id
end
#
# note that these are presently highly reliant on the structure of the
# page for the selection tests, which doesn't work out particularly
- # well if that structure changes. so... if you change the page layout
+ # well if that structure changes. so... if you change the page layout
# then please make it more easily (and robustly) testable!
##
def test_redacted_node_history
get :node_history, :id => nodes(:redacted_node_redacted_version).node_id
assert_response :success
assert_template 'node_history'
-
+
# there are 2 revisions of the redacted node, but only one
# should be showing up here.
- assert_select "body div[id=content] table[class=browse_details]", 1
- assert_select "body div[id=content] table[class=browse_details][id=1]", 0
+ assert_select "body div[id=content] div[class=browse_details]", 1
+ assert_select "body div[id=content] div[class=browse_details][id=1]", 0
end
-
+
def test_redacted_way_history
get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id
assert_response :success
assert_template 'way_history'
-
+
# there are 4 revisions of the redacted way, but only 2
# should be showing up here.
- assert_select "body div[id=content] table[class=browse_details]", 2
+ assert_select "body div[id=content] div[class=browse_details]", 2
# redacted revisions are 2 & 3
- assert_select "body div[id=content] table[class=browse_details][id=2]", 0
- assert_select "body div[id=content] table[class=browse_details][id=3]", 0
+ assert_select "body div[id=content] div[class=browse_details][id=2]", 0
+ assert_select "body div[id=content] div[class=browse_details][id=3]", 0
end
-
+
def test_redacted_relation_history
get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id
assert_response :success
assert_template 'relation_history'
-
+
# there are 4 revisions of the redacted relation, but only 2
# should be showing up here.
- assert_select "body div[id=content] table[class=browse_details]", 2
+ assert_select "body div[id=content] div[class=browse_details]", 2
# redacted revisions are 2 & 3
- assert_select "body div[id=content] table[class=browse_details][id=2]", 0
- assert_select "body div[id=content] table[class=browse_details][id=3]", 0
+ assert_select "body div[id=content] div[class=browse_details][id=2]", 0
+ assert_select "body div[id=content] div[class=browse_details][id=3]", 0
end
-
+
# This is a convenience method for most of the above checks
# First we check that when we don't have an id, it will correctly return a 404
# then we check that we get the correct 404 when a non-existant id is passed
# then we check that it will get a successful response, when we do pass an id
- def browse_check(type, id)
+ def browse_check(type, id)
assert_raise ActionController::RoutingError do
get type
end
assert_template "list"
# Now check that all 20 (or however many were returned) changesets are in the html
assert_select "h1", :text => "Changesets", :count => 1
- assert_select "table[id='changeset_list'] tr", :count => changesets.size
+ assert_select "div[id='changeset_list'] ul", :count => changesets.size
changesets.each do |changeset|
# FIXME this test needs rewriting - test for table contents
end
assert_select "title", :text => /New Diary Entry/, :count => 1
end
assert_select "body", :count => 1 do
- assert_select "div#content", :count => 1 do
- assert_select "h1", :text => "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/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
- assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1
- assert_select "input[name=commit][type=submit][value=Save]", :count => 1
+ assert_select "div.wrapper", :count => 1 do
+ assert_select "div.content-heading", :count => 1 do
+ assert_select "h1", :text => "New Diary Entry", :count => 1
+ end
+ assert_select "div#content", :count => 1 do
+ # We don't care about the layout, we just care about the form fields
+ # that are available
+ 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
+ assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1
+ assert_select "input[name=commit][type=submit][value=Save]", :count => 1
+ end
end
end
end
assert_response :not_found
assert_select "html", :count => 1 do
assert_select "body", :count => 1 do
- assert_select "div#content", :count => 1 do
- assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+ assert_select "div.wrapper", :count => 1 do
+ assert_select "div.content-heading", :count => 1 do
+ assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+ end
end
end
end
assert_select "title", :text => /Edit diary entry/, :count => 1
end
assert_select "body", :count => 1 do
- assert_select "div#content", :count => 1 do
- assert_select "h1", :text => /Edit diary entry/, :count => 1
- assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
- assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
- assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
- assert_select "select#diary_entry_language_code", :count => 1
- assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
- assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
- assert_select "input[name=commit][type=submit][value=Save]", :count => 1
- assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
- assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
- assert_select "input", :count => 7
+ assert_select "div.wrapper", :count => 1 do
+ assert_select "div.content-heading", :count => 1 do
+ assert_select "h1", :text => /Edit diary entry/, :count => 1
+ end
+ assert_select "div#content", :count => 1 do
+ assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
+ assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
+ assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
+ assert_select "select#diary_entry_language_code", :count => 1
+ assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
+ assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
+ assert_select "input[name=commit][type=submit][value=Save]", :count => 1
+ assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
+ assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
+ assert_select "input", :count => 7
+ end
end
end
end
assert_select "title", :text => /Users' diaries | /, :count => 1
end
assert_select "body", :count => 1 do
- assert_select "div#content", :count => 1 do
- assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
- assert_select "b", :text => /#{new_title}/, :count => 1
- # This next line won't work if the text has been run through the htmlize function
- # due to formatting that could be introduced
- assert_select "p", :text => /#{new_body}/, :count => 1
- assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
- # As we're not logged in, check that you cannot edit
- #print @response.body
- assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
+ assert_select "div.wrapper", :count => 1 do
+ assert_select "div.content-heading", :count => 1 do
+ assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+ end
+ assert_select "div#content", :count => 1 do
+ assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+ # This next line won't work if the text has been run through the htmlize function
+ # due to formatting that could be introduced
+ assert_select "p", :text => /#{new_body}/, :count => 1
+ assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
+ # As we're not logged in, check that you cannot edit
+ #print @response.body
+ assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
+ end
end
end
end
assert_select "title", :text => /Users' diaries | /, :count => 1
end
assert_select "body", :count => 1 do
- assert_select "div#content", :count => 1 do
- assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1
- assert_select "b", :text => /#{new_title}/, :count => 1
- # This next line won't work if the text has been run through the htmlize function
- # due to formatting that could be introduced
- assert_select "p", :text => /#{new_body}/, :count => 1
- assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
- # As we're not logged in, check that you cannot edit
- assert_select "span[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do
- assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
+ assert_select "div.wrapper", :count => 1 do
+ assert_select "div.content-heading", :count => 1 do
+ assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1
+ end
+ assert_select "div#content", :count => 1 do
+ assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+ # This next line won't work if the text has been run through the htmlize function
+ # due to formatting that could be introduced
+ assert_select "p", :text => /#{new_body}/, :count => 1
+ assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
+ # As we're not logged in, check that you cannot edit
+ assert_select "span[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do
+ assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
+ end
end
end
end
assert_template 'user/account'
# check that the form to allow new client application creations exists
- assert_in_body do
- assert_select "a[href='/user/test2/oauth_clients']"
+ assert_in_heading do
+ assert_select "ul.secondary-actions li a[href='/user/test2/oauth_clients']"
end
# now we follow the link to the oauth client list
# now we follow the link to the new oauth client page
get '/user/test2/oauth_clients/new'
assert_response :success
- assert_in_body do
+ assert_in_heading do
assert_select "h1", "Register a new application"
+ end
+ assert_in_body do
assert_select "form[action='/user/test2/oauth_clients']" do
[ :name, :url, :callback_url, :support_url ].each do |inp|
assert_select "input[name=?]", "client_application[#{inp}]"
# tests, as its too tied into the HTTP headers and stuff that it signs.
end
+ ##
+ # utility method to make the HTML screening easier to read.
+ def assert_in_heading
+ assert_select "html:root" do
+ assert_select "body" do
+ assert_select "div.wrapper" do
+ assert_select "div.content-heading" do
+ yield
+ end
+ end
+ end
+ end
+ end
+
##
# utility method to make the HTML screening easier to read.
def assert_in_body
# that need to be tested, which can't be tested in the functional tests
assert_select "html:root" do
assert_select "body" do
- assert_select "div#content" do
- assert_select "h1", "New Diary Entry"
- assert_select "form[action='/diary/new']" do
- assert_select "input[id=diary_entry_title]"
+ assert_select "div.wrapper", :count => 1 do
+ assert_select "div.content-heading", :count => 1 do
+ assert_select "h1", "New Diary Entry"
+ end
+ assert_select "div#content" do
+ assert_select "form[action='/diary/new']" do
+ assert_select "input[id=diary_entry_title]"
+ end
end
end
end
projects / rails.git / commitdiff
