From: Tom Hughes Date: Tue, 20 Nov 2012 19:08:30 +0000 (+0000) Subject: Merge branch 'master' into notes X-Git-Tag: live~6181^2~71 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7599f98957334d1924550205f7ba12a726de7eb0?hp=9f560df39d21a82b7c34e203c555da7fab01a3ae Merge branch 'master' into notes Conflicts: Gemfile Gemfile.lock app/assets/stylesheets/common.css.scss app/helpers/application_helper.rb --- diff --git a/Gemfile b/Gemfile index ce13c6532..4b2d2ba9e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.8' +gem 'rails', '3.2.9' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -13,6 +13,9 @@ gem 'pg' # Load jquery support gem 'jquery-rails' +# Load R2 for RTL conversion +gem 'r2' + # Load rails plugins gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' @@ -25,6 +28,7 @@ gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' gem 'i18n-js', '>= 3.0.0.rc2' +gem 'rack-cors' gem 'jsonify-rails' # We need ruby-openid 2.2.0 or later for ruby 1.9 support diff --git a/Gemfile.lock b/Gemfile.lock index 23eeceb19..eafd5d341 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,44 +2,44 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.8) - actionpack (= 3.2.8) + actionmailer (3.2.9) + actionpack (= 3.2.9) mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + actionpack (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.8) - activesupport (= 3.2.8) + sprockets (~> 2.2.1) + activemodel (3.2.9) + activesupport (= 3.2.9) builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + activerecord (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - activesupport (3.2.8) + activeresource (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) + activesupport (3.2.9) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) bigdecimal (1.1.0) - builder (3.0.3) - cocaine (0.4.0) + builder (3.0.4) + cocaine (0.4.2) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.3.3) + coffee-script-source (1.4.0) composite_primary_keys (5.0.9) activerecord (~> 3.2.0, >= 3.2.8) deadlock_retry (1.2.0) @@ -56,7 +56,7 @@ GEM httpauth (0.2.0) httpclient (2.3.0.1) i18n (0.6.1) - i18n-js (3.0.0.rc2) + i18n-js (3.0.0.rc3) i18n iconv (0.1) journey (1.0.4) @@ -79,8 +79,8 @@ GEM treetop (~> 1.4.8) memcached (1.4.6) mime-types (1.19) - minitest (4.1.0) - multi_json (1.3.6) + minitest (4.3.0) + multi_json (1.3.7) multipart-post (1.1.5) nokogiri (1.5.5) oauth (0.4.7) @@ -104,9 +104,12 @@ GEM mime-types pg (0.14.1) polyglot (0.3.3) + r2 (0.0.3) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) + rack-cors (0.2.7) + rack rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -114,49 +117,50 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.8) - actionmailer (= 3.2.8) - actionpack (= 3.2.8) - activerecord (= 3.2.8) - activeresource (= 3.2.8) - activesupport (= 3.2.8) + rails (3.2.9) + actionmailer (= 3.2.9) + actionpack (= 3.2.9) + activerecord (= 3.2.9) + activeresource (= 3.2.9) + activesupport (= 3.2.9) bundler (~> 1.0) - railties (= 3.2.8) - rails-i18n (0.6.6) + railties (= 3.2.9) + rails-i18n (0.7.0) i18n (~> 0.5) - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) + railties (3.2.9) + actionpack (= 3.2.9) + activesupport (= 3.2.9) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) + rake (10.0.2) rdoc (3.12) json (~> 1.4) - redcarpet (2.2.1) + redcarpet (2.2.2) rinku (1.7.2) - ruby-openid (2.2.1) + ruby-openid (2.2.2) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.2.1) + sass (3.2.3) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.3) + sprockets (2.2.1) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) therubyracer (0.10.2) libv8 (~> 3.3.10) thor (0.16.0) tilt (1.3.3) - timecop (0.5.2) - treetop (1.4.11) + timecop (0.5.3) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.35) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -187,7 +191,9 @@ DEPENDENCIES open_id_authentication (>= 1.1.0) paperclip (~> 2.0) pg - rails (= 3.2.8) + r2 + rack-cors + rails (= 3.2.9) rails-i18n (>= 0.6.3) redcarpet rinku (>= 1.2.2) diff --git a/README.md b/README.md index 4579b9b80..c59f9f0ef 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ helpful as a reference. ## Coding style When writing code it is generally a good idea to try and match your -formatting to hat of any existing code in the same file, or to other +formatting to that of any existing code in the same file, or to other similar files if you are writing new code. Consistency of layout is far more important that the layout itself as it makes reading code much easier. @@ -107,7 +107,7 @@ and why it should be the way it is. When you submit patches, the project maintainer has to read them and understand them. This is difficult enough at the best of times, and misunderstanding patches can lead to them being more difficult to -merge. To help wit this, when submitting you should: +merge. To help with this, when submitting you should: * Split up large patches into smaller units of functionality. * Keep your commit messages relevant to the changes in each individual diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png index f422d70c4..d13dbaa8f 100644 Binary files a/app/assets/images/sprite.png and b/app/assets/images/sprite.png differ diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index f6c1209ef..a70a7532b 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -17,7 +17,7 @@ inkscape:export-filename="/Users/tmcw/src/openstreetmap-website/app/assets/images/sprite.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - sodipodi:docname="New document 1"> + sodipodi:docname="sprite.svg"> + showgrid="true" + inkscape:window-width="1289" + inkscape:window-height="904" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0"> + + diff --git a/app/assets/images/users/images/large.png b/app/assets/images/users/images/large.png index ae33d8a87..ec0a7fde6 100644 Binary files a/app/assets/images/users/images/large.png and b/app/assets/images/users/images/large.png differ diff --git a/app/assets/images/users/images/small.png b/app/assets/images/users/images/small.png index cfaeb24c0..19fd092cc 100644 Binary files a/app/assets/images/users/images/small.png and b/app/assets/images/users/images/small.png differ diff --git a/app/assets/javascripts/edit.js b/app/assets/javascripts/edit.js index 0b2b329b5..30823d49e 100644 --- a/app/assets/javascripts/edit.js +++ b/app/assets/javascripts/edit.js @@ -1,13 +1,12 @@ function maximiseMap() { $("#left").hide(); - $("#greeting").hide(); - $("#tabnav").hide(); + $("#top-bar").hide(); $("#content").css("top", "0px"); if ($("html").attr("dir") == "ltr") { - $("#content").css("left", "0px"); + $("#content").css("margin-left", "0px"); } else { - $("#content").css("right", "0px"); + $("#content").css("margin-right", "0px"); } handleResize(); @@ -15,14 +14,13 @@ function maximiseMap() { function minimiseMap() { $("#left").show(); - $("#greeting").show(); - $("#tabnav").show(); + $("#top-bar").show(); $("#content").css("top", "30px"); if ($("html").attr("dir") == "ltr") { - $("#content").css("left", "185px"); + $("#content").css("margin-left", "185px"); } else { - $("#content").css("right", "185px"); + $("#content").css("margin-right", "185px"); } handleResize(); diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 33f190412..e8428da3a 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -23,7 +23,7 @@ OSM = { mapParams: function (search) { var params = {}, mapParams = {}, loc; - search = (search || window.location.search).replace('?', '').split('&'); + search = (search || window.location.search).replace('?', '').split(/&|;/); for (var i = 0; i < search.length; ++i) { var pair = search[i], diff --git a/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss b/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss index ad6a63223..2788221b0 100644 --- a/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss +++ b/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss @@ -30,6 +30,7 @@ top: 13px; width: 25px; height: 24px; + left: 0px; background-position: -5px -17px; } diff --git a/app/assets/openlayers/theme/openstreetmap/style.css.scss b/app/assets/openlayers/theme/openstreetmap/style.css.scss index b082c9933..bd755a53a 100644 --- a/app/assets/openlayers/theme/openstreetmap/style.css.scss +++ b/app/assets/openlayers/theme/openstreetmap/style.css.scss @@ -51,9 +51,14 @@ div.olControlZoom a { color: black; background: #ffffff; border: 1px solid #cccccc; + margin: 0 !important; // remove filter } +div.olControlZoom a.olControlZoomIn { + border-bottom: 0; +} + div.olControlZoom a:hover { background: #f5f5f5; } diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index d41dd5481..ec06997f8 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -10,6 +10,7 @@ body { background-color: #fff; margin: 0px; padding: 0px; + text-align: left; } body.slim { @@ -48,20 +49,23 @@ h2 { #left { position: absolute; - top: 0px; + top: 30px; + bottom: 0; width: 185px; font-size: 11px; line-height: 12px; + border-right: 1px solid #ccc; } /* Rules for the OpenStreetMap logo in the top left corner */ #logo { + display: block; width: 170px; min-width: 170px; padding: 5px; text-align: center; - margin: 25px 0 5px 0; + margin: auto; } #logo img { @@ -94,7 +98,7 @@ h2 { /* Rules for the introductory text displayed in the left sidebar to new users */ .sidebar-copy { - padding: 0px 10px; + padding: 5px 10px; } .sidebar-copy p { @@ -150,38 +154,35 @@ h2 { /* Rules for the menu displayed in the left sidebar */ .left_menu { + left: 0px; + margin: 0; padding: 5px 10px; - margin: 4px 0; + line-height: 15px; + font-size: 12px; + list-style-type: none; + border-bottom: 1px solid #ccc; border-top: 1px solid #ccc; - line-height: 20px; - font-size: 14px; - font-weight: bold; -} - -.left_menu h1 { - font-style: normal; - font-size: 15px; } .left_menu ul { - margin: 0px; - list-style-type: none; + padding: 0; + margin: 0; } .left_menu li { - margin: 0px; - padding: 0px; + list-style-type: none; + padding: 0; + margin: 0; } -/* submenus */ -.left_menu ul li ul { - font-weight: normal; - line-height: 15px; +.left_menu h4 { + padding: 5px 0 5px 0; font-size: 12px; + margin: 0; } -.left_menu a { - color: #000; +.left_menu li:last-child h4 { + padding-top: 0; } /* Rules for SOTM advert */ @@ -205,8 +206,10 @@ h2 { */ .optionalbox { + left: 0px; padding: 5px 10px; - margin: 4px 0; + margin: 5px 0; + text-align: left; } .optionalbox h1 { @@ -223,21 +226,21 @@ h2 { } #search_field form { - width: 100%; + width: 165px; margin: 0px; padding: 0px; } #search_field { - position:relative; + position: relative; } #search_field input[type="text"] { width: 165px; - padding: 5px; font-size: 14px; line-height: 15px; height: 25px; + padding: 2px 0px 2px 5px; box-shadow: inset #DDD 0px 1px 3px; box-sizing: border-box; -webkit-box-sizing: border-box; @@ -253,19 +256,21 @@ h2 { #search_field input[type="submit"] { width: 15px; height: 15px; - border:0; - text-indent:-1000px; + border: 0px; + text-indent: -1000px; + overflow: hidden; + text-transform: capitalize; padding-left: 0px; padding-right: 0px; - background: url(sprite.png); - position:absolute; - right:2px; - top:5px; - cursor:pointer; + background: image-url("sprite.png"); + position: absolute; + top: 5px; + right: 4px; + cursor: pointer; } .search_help { - margin:0; + margin: 5px 0 0 0; } .deemphasize { @@ -279,8 +284,10 @@ h2 { /* Rules for donation request box */ .donate { + display: block; + position: relative; width: 153px; - margin: 10px 10px; + margin: 10px 10px 0px 10px; padding: 5px; border: 1px solid #AED1A0; background: #cbeea7; @@ -289,10 +296,29 @@ h2 { font-size: 14px; border-radius: 2px; -moz-border-radius: 2px; + color: #222; } -.donate a { - color:#222; +.donate:hover { + background: #9ed485; + text-decoration: none; +} + +.donate p { + text-indent: 20px; + margin: 0; +} + +.donate .donate-icon { + 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; + left: 17px; } /* Rules for Creative Commons logo button */ @@ -305,8 +331,13 @@ h2 { /* Rules for tabbed navigation bar */ #top-bar { - border-bottom: 1px solid #ccc; + position: absolute; + top: 0; + left: 185px; + right: 0; height: 29px; + border-bottom: 1px solid #ccc; + background: white; } #tabnav { @@ -323,11 +354,13 @@ h2 { } #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; text-decoration: none; color: #333; -webkit-transition: color 200ms ease-in; @@ -376,8 +409,10 @@ body.site-export #tabnav a#exportanchor { /* Rules for greeting bar in the top right corner */ #greeting { + float: right; height: 28px; margin: 0px; + padding-right: 10px; font-size: 13px; line-height: 28px; } @@ -392,6 +427,7 @@ body.site-export #tabnav a#exportanchor { z-index: 20000000; position: absolute; top: 15px; + left: 15px; } /* Rules for OpenLayers maps */ @@ -430,6 +466,18 @@ body.site-export #tabnav a#exportanchor { text-decoration: none; } +.site-index #map .SimpleLayerSwitcher, +.site-index #map .olControlSimplePanZoom, +.site-export #map .SimpleLayerSwitcher, +.site-export #map .olControlSimplePanZoom { + top: 40px !important; +} + +.site-index #map .olControlScaleLine, +.site-export #map .olControlScaleLine { + left: 10px !important; +} + /* Rules for edit menu */ .menuicon { @@ -469,20 +517,30 @@ body.site-export #tabnav a#exportanchor { display: none; } +.attribution_license { + text-align: left; +} + .attribution_notice { text-align: center; } +.attribution_project { + text-align: right; +} + /* Rules for the popout map sidebar */ #sidebar { display: none; position: absolute; - margin: 0px; + margin: 30px 0px 0px 0px; padding: 0px; + border-right: 1px solid #ccc; width: 30%; top: 0px; bottom: 0px; + left: 0px; } #sidebar #sidebar_content { @@ -502,7 +560,15 @@ body.site-export #tabnav a#exportanchor { height: 29px; font-size: 14px; line-height: 15px; - background: #bbb; + background: #ccc; +} + +#sidebar #sidebar_title { + text-align: left; +} + +#sidebar #sidebar_close { + text-align: right; } /* Rules for the map key which appears in the popout sidebar */ @@ -614,19 +680,28 @@ body.site-export #tabnav a#exportanchor { /* Rules for the main content area */ #content { - padding: 10px; - margin: 0px; - position: absolute; - bottom: 0px; + padding: 20px; + margin: 30px 0px 0px 185px; + border-left: 1px solid #ccc; + text-align: left; } -.site-index #content, .site-edit #content, +.site-index #content, .site-export #content { - border: 0px; + position: fixed; + margin-top: 0px; + left: 0px; + right: 0px; + top: 0px; + bottom: 0px; padding: 0px; } +.site-edit #content { + top: 30px; +} + #slim_container { width: 100%; } @@ -656,6 +731,7 @@ body.site-export #tabnav a#exportanchor { #slim_header img { vertical-align: middle; margin-bottom: 5px; + margin-right: 5px; } /* Rules for text content pages */ @@ -706,6 +782,7 @@ body.site-export #tabnav a#exportanchor { border-width: 0px; margin-top: 1px; margin-bottom: 1px; + text-align: left; } #changeset_list td { @@ -732,8 +809,10 @@ body.site-export #tabnav a#exportanchor { #changeset_list_map { position: absolute; + float: right; top: 0px; bottom: 0px; + right: 0px; width: 49%; min-height: 400px; border: solid 1px black; @@ -742,7 +821,9 @@ body.site-export #tabnav a#exportanchor { /* Rules for the data browser */ #browse_navigation { + float: right; width: 250px; + margin-left: 10px; text-align: center; } @@ -768,7 +849,10 @@ td.browse_comments table td span.by { } #browse_map { + float: right; width: 250px; + text-align: right; + margin-left: 10px; } #browse_map #small_map { @@ -787,6 +871,7 @@ td.browse_comments table td span.by { font-size: small; border-collapse: collapse; border-width: 0px; + text-align: right; } #trace_list .trace_summary { @@ -831,9 +916,30 @@ td.browse_comments table td span.by { } #user_list_actions { + float: right; margin-top: 10px; } +/* Rules for the diary list */ + +.diary_entry-list img.user_image { + float: right; +} + +.diary_entry-list img.user_thumbnail { + float: right; +} + +/* Rules for the diary entry view */ + +.diary_entry-view img.user_image { + float: right; +} + +.diary_entry-view img.user_thumbnail { + float: right; +} + /* Rules for the new diary entry page */ .diary_entry div#map { @@ -922,6 +1028,14 @@ form#termsForm { margin-bottom: 3em; } +form#termsForm div#buttons { + float: right; +} + +form#termsForm input#agree { + margin-left: 50px; +} + div#slim_content form#termsForm { width: auto; } @@ -947,12 +1061,23 @@ p#contributorGuidance { #accountForm .user_map { position: relative; width: 500px; - height: 400px; + height: 400px; border: 1px solid #ccc; } -#accountImage td { - padding-bottom: 0px; +#accountForm td.accountImage { + img { + vertical-align: top; + margin-top: 3px; + } + + table { + display: inline-block; + + td { + padding-bottom: 0px; + } + } } .nohome .location { @@ -973,10 +1098,15 @@ p#contributorGuidance { /* Rules for the user view */ +.user-view img.user_image { + float: right; +} + .user-view .user_map { + float: right; position: relative; width: 400px; - height: 400px; + height: 400px; border: 1px solid #ccc; } @@ -1113,9 +1243,11 @@ p#contributorGuidance { #errorExplanation h2 { font-weight: bold; font-size: 12px; + padding: 5px 5px 5px 15px; margin: -7px; background-color: #c00; color: #fff; + text-align: left; } #errorExplanation p { @@ -1136,6 +1268,11 @@ p#contributorGuidance { font-weight: bold; font-size: 12px; line-height: 20px; + text-align: right; +} + +.submitButton { + text-align: right; } .minorNote { @@ -1150,6 +1287,11 @@ textarea { 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 { @@ -1239,6 +1381,7 @@ abbr.geo { display: inline-block; vertical-align: top; background-color: #ddd; + margin-left: 15px; padding: 5px 10px 10px 10px; font-size: 12px; @@ -1248,9 +1391,12 @@ abbr.geo { th { vertical-align: top; + text-align: left; + padding: 0px 15px 0px 0px !important; } td { + text-align: left; font-family: fixed; line-height: 16px; padding: 0px !important; @@ -1258,10 +1404,12 @@ abbr.geo { input.richtext_doedit { margin-top: 5px !important; + margin-right: 10px !important; } input.richtext_dopreview { margin-top: 5px !important; + margin-left: 10px !important; } } } diff --git a/app/assets/stylesheets/large-ltr.css b/app/assets/stylesheets/large-ltr.css index 00ce0910b..20cacea02 100644 --- a/app/assets/stylesheets/large-ltr.css +++ b/app/assets/stylesheets/large-ltr.css @@ -1,5 +1,4 @@ /* - *= require common - *= require ltr + *= require ltr/common *= require large */ diff --git a/app/assets/stylesheets/large-rtl.css b/app/assets/stylesheets/large-rtl.css index 5919290ed..7f0edf072 100644 --- a/app/assets/stylesheets/large-rtl.css +++ b/app/assets/stylesheets/large-rtl.css @@ -1,5 +1,4 @@ /* - *= require common - *= require rtl + *= require rtl/common *= require large */ diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css index 05da4445f..ca58badc4 100644 --- a/app/assets/stylesheets/large.css +++ b/app/assets/stylesheets/large.css @@ -6,12 +6,6 @@ display: none; } -/* Rules for the main content area */ - -#content { - top: 30px; -} - /* Rules for OpenLayers maps */ .olControlZoom { diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss deleted file mode 100644 index eb72ff9d1..000000000 --- a/app/assets/stylesheets/ltr.css.scss +++ /dev/null @@ -1,240 +0,0 @@ -/* Styles for LTR languages */ - -/* Default rules for the body of every page */ - -html body { - text-align: left; -} - -/* Rules for the menu displayed in the left sidebar */ - -.left_menu { - left: 0px; -} - -.left_menu td { - padding-right: 4px; -} - -.left_menu h1 { - text-align: left; - padding: 0em 0em 0em 1em; -} - -.left_menu ul { - padding-left: 0px; -} - -.left_menu img { - margin: 2px 8px 0px 0px; -} - -/* - * Rules for "optional boxes" which appear in the left sidebar on - * certain pages. Current users are the seach box on the main page - * and the tag cloud on the traces pages. - */ - -.optionalbox { - left: 0px; - text-align: left; -} - -/* Rules for tabbed navigation bar */ - -#top-bar { - margin-left: 185px; -} - -#tabnav a, -#tabnav a:link, -#tabnav a:visited { - float: left; - margin-right: 1px; -} - -/* Rules for greeting bar in the top right corner */ - -#greeting { - float: right; - padding-right: 10px; -} - -/* Rules for the message shown in place of the map when javascript is disabled */ - -#noscript { - left: 15px -} - -/* Rules for OpenLayers maps */ - -#map { - border-left: 1px solid #ccc; -} - -/* Rules for attribution text under the main map shown on printouts */ - -.attribution_license { - text-align: left; -} - -.attribution_project { - text-align: right; -} - -/* Rules for the popout map sidebar */ - -#sidebar { - left: 0px; - border-left: 1px solid #ccc; -} - -#sidebar #sidebar_title { - text-align: left; -} - -#sidebar #sidebar_close { - text-align: right; -} - -/* Rules for the main content area */ - -#content { - border-left: 1px solid #ccc; - left: 185px; - right: 0px; - text-align: left; -} - -#slim_header img { - margin-right: 5px; -} - -/* Rules for the copyright page */ - -#cc_logo { - float: right; -} - -/* Rules for the changeset list shown by the history tab etc */ - -#changeset_list { - text-align: left; -} - -#changeset_list_map { - float: right; - right: 0px; -} - -/* Rules for the data browser */ - -#browse_navigation { - float: right; - margin-left: 10px; -} - -#browse_map { - float: right; - text-align: right; - margin-left: 10px; -} - -/* Rules for the trace list shown by the traces tab etc */ - -#trace_list { - text-align: right; -} - -/* Rules for the diary list */ - -.diary_entry-list img.user_image { - float: right; -} - -.diary_entry-list img.user_thumbnail { - float: right; -} - -/* Rules for the diary entry view */ - -.diary_entry-view img.user_image { - float: right; -} - -.diary_entry-view img.user_thumbnail { - float: right; -} - -/* Rules for the user list */ - -#user_list_actions { - float: right; -} - -/* Rules for the account confirmation page */ - -form#termsForm div#buttons { - float: right; -} - -form#termsForm input#agree { - margin-left: 50px; -} - -/* Rules for the user view */ - -.user-view img.user_image { - float: right; -} - -.user-view .user_map { - float: right; -} - -/* Rules for rails validation error boxes */ - -#errorExplanation h2 { - text-align: left; - padding: 5px 5px 5px 15px; -} - -/* Rules for forms */ - -.fieldName { - text-align: right; -} - -.submitButton { - text-align: right; -} - -input.openid_url { - background: image-url('openid_input.png') repeat-y left white; - padding-left: 16px; -} - -/* Rules for rich text editors */ - -.richtext_container { - .richtext_help { - margin-left: 15px; - - th { - text-align: left; - padding: 0px 15px 0px 0px !important; - } - - td { - text-align: left; - } - - input.richtext_doedit { - margin-right: 10px !important; - } - - input.richtext_dopreview { - margin-left: 10px !important; - } - } -} diff --git a/app/assets/stylesheets/ltr/common.css.scss b/app/assets/stylesheets/ltr/common.css.scss new file mode 120000 index 000000000..b8c328296 --- /dev/null +++ b/app/assets/stylesheets/ltr/common.css.scss @@ -0,0 +1 @@ +../common.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/ltr/small.css.scss b/app/assets/stylesheets/ltr/small.css.scss new file mode 120000 index 000000000..f08fdd55f --- /dev/null +++ b/app/assets/stylesheets/ltr/small.css.scss @@ -0,0 +1 @@ +../small.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/print-ltr.css b/app/assets/stylesheets/print-ltr.css index 5f3ae8f7c..162c6f23c 100644 --- a/app/assets/stylesheets/print-ltr.css +++ b/app/assets/stylesheets/print-ltr.css @@ -1,4 +1,3 @@ /* *= require print - *= require ltr */ diff --git a/app/assets/stylesheets/print-rtl.css b/app/assets/stylesheets/print-rtl.css index 5ef840645..162c6f23c 100644 --- a/app/assets/stylesheets/print-rtl.css +++ b/app/assets/stylesheets/print-rtl.css @@ -1,4 +1,3 @@ /* *= require print - *= require rtl */ diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss deleted file mode 100644 index 8dd38834b..000000000 --- a/app/assets/stylesheets/rtl.css.scss +++ /dev/null @@ -1,240 +0,0 @@ -/* Styles for RTL languages */ - -/* Default rules for the body of every page */ - -html body { - text-align: right; -} - -/* Rules for the menu displayed in the left sidebar */ - -.left_menu { - right: 0px; -} - -.left_menu td { - padding-left: 4px; -} - -.left_menu h1 { - text-align: right; - padding: 0em 1em 0em 0em; -} - -.left_menu ul { - padding-right: 0px; -} - -.left_menu img { - margin: 2px 0px 0px 8px; -} - -/* - * Rules for "optional boxes" which appear in the left sidebar on - * certain pages. Current users are the seach box on the main page - * and the tag cloud on the traces pages. - */ - -.optionalbox { - right: 0px; - text-align: right; -} - -/* Rules for tabbed navigation bar */ - -#top-bar { - margin-right: 185px -} - -#tabnav a, -#tabnav a:link, -#tabnav a:visited { - float: right; - margin-left: 1px; -} - -/* Rules for greeting bar in the top right corner */ - -#greeting { - float: left; - padding-left: 10px; -} - -/* Rules for the message shown in place of the map when javascript is disabled */ - -#noscript { - right: 15px -} - -/* Rules for OpenLayers maps */ - -#map { - border-right: 1px solid #ccc; -} - -/* Rules for attribution text under the main map shown on printouts */ - -.attribution_license { - text-align: right; -} - -.attribution_project { - text-align: left; -} - -/* Rules for the popout map sidebar */ - -#sidebar { - right: 0px; - border-right: 1px solid #ccc; -} - -#sidebar #sidebar_title { - text-align: right; -} - -#sidebar #sidebar_close { - text-align: left; -} - -/* Rules for the main content area */ - -#content { - border-right: 1px solid #ccc; - right: 185px; - left: 0px; - text-align: right; -} - -#slim_header img { - margin-left: 5px; -} - -/* Rules for the copyright page */ - -#cc_logo { - float: left; -} - -/* Rules for the changeset list shown by the history tab etc */ - -#changeset_list { - text-align: right; -} - -#changeset_list_map { - float: left; - left: 0px; -} - -/* Rules for the data browser */ - -#browse_navigation { - float: left; - margin-right: 10px; -} - -#browse_map { - float: left; - text-align: left; - margin-right: 10px; -} - -/* Rules for the trace list shown by the traces tab etc */ - -#trace_list { - text-align: right; -} - -/* Rules for the diary list */ - -.diary_entry-list img.user_image { - float: left; -} - -.diary_entry-list img.user_thumnbail { - float: left; -} - -/* Rules for the diary entry view */ - -.diary_entry-view img.user_image { - float: left; -} - -.diary_entry-view img.user_thumbnail { - float: left; -} - -/* Rules for the user list */ - -#user_list_actions { - float: left; -} - -/* Rules for the account confirmation page */ - -form#termsForm div#buttons { - float: left; -} - -form#termsForm input#agree { - margin-right: 50px; -} - -/* Rules for the user view */ - -.user-view img.user_image { - float: left; -} - -.user-view .user_map { - float: left; -} - -/* Rules for rails validation error boxes */ - -#errorExplanation h2 { - text-align: right; - padding: 5px 15px 5px 5px; -} - -/* Rules for forms */ - -.fieldName { - text-align: left; -} - -.submitButton { - text-align: left; -} - -input.openid_url { - background: image-url('openid_input.png') repeat-y right white; - padding-right: 16px; -} - -/* Rules for rich text editors */ - -.richtext_container { - .richtext_help { - margin-right: 15px; - - th { - text-align: right; - padding: 0px 0px 0px 15px !important; - } - - td { - text-align: right; - } - - input.richtext_doedit { - margin-left: 10px !important; - } - - input.richtext_dopreview { - margin-right: 10px !important; - } - } -} diff --git a/app/assets/stylesheets/rtl/common.css.r2.scss b/app/assets/stylesheets/rtl/common.css.r2.scss new file mode 120000 index 000000000..b8c328296 --- /dev/null +++ b/app/assets/stylesheets/rtl/common.css.r2.scss @@ -0,0 +1 @@ +../common.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/rtl/small.css.r2.scss b/app/assets/stylesheets/rtl/small.css.r2.scss new file mode 120000 index 000000000..f08fdd55f --- /dev/null +++ b/app/assets/stylesheets/rtl/small.css.r2.scss @@ -0,0 +1 @@ +../small.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/small-ltr.css b/app/assets/stylesheets/small-ltr.css index 2526d2585..838c9198f 100644 --- a/app/assets/stylesheets/small-ltr.css +++ b/app/assets/stylesheets/small-ltr.css @@ -1,5 +1,4 @@ /* - *= require common - *= require ltr - *= require small + *= require ltr/common + *= require ltr/small */ diff --git a/app/assets/stylesheets/small-rtl.css b/app/assets/stylesheets/small-rtl.css index 4d3a5e1fc..91d9fa3ed 100644 --- a/app/assets/stylesheets/small-rtl.css +++ b/app/assets/stylesheets/small-rtl.css @@ -1,5 +1,4 @@ /* - *= require common - *= require rtl - *= require small + *= require rtl/common + *= require rtl/small */ diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index daacb5a7f..ba9e59d96 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -17,16 +17,19 @@ h1 { } /* Rules for tabbed navigation bar */ + #top-bar { + left: 0; margin: 0px; - height: 19px; + height: 39px; + padding: 0; } #tabnav { height: 14px; margin: 0px; padding-top: 5px; - margin-top: 18px; + margin-top: 20px; font-size: 10px; line-height: 10px; } @@ -46,7 +49,8 @@ h1 { height: 16px; display: block; position: absolute; - top: 0; + left: 5px; + top: 5px; padding: 2px; width: 110px; /* TODO: find better fix for overlap */ background-color: #fff; @@ -61,15 +65,15 @@ h1 { position: absolute; left: 18px; font-size: 12px; - margin: 2px; + margin: 0; } /* Rules for greeting bar in the top right corner */ #greeting { position: absolute; - top: 0px; - right: 0px; + right: 5px; + top: 5px; height: 14px; font-size: 12px; line-height: 12px; @@ -95,24 +99,26 @@ h1 { display: none; } +.site-index #map .olControlZoom, +.site-index #map .SimpleLayerSwitcher, +.site-export #map .olControlZoom, +.site-export #map .SimpleLayerSwitcher { + top: 8px !important; +} + /* Rules for the main content area */ #content { - left: 0px; - right: 0px; - top: 38px; margin-left: 0px; margin-right: 0px; border-left: 0px; border-right: 0px; } +.site-export #content, +.site-edit #content, .site-index #content { - left: 0px; - right: 0px; - top: 38px; - bottom: 0px; - padding-bottom: 0px; + margin-top: 40px; } /* Rules for search sidebar when shown */ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8f9ae2948..4b2c70825 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,6 +3,8 @@ class ApplicationController < ActionController::Base protect_from_forgery + before_filter :fetch_body + if STATUS == :database_readonly or STATUS == :database_offline def self.cache_sweeper(*sweepers) end @@ -278,7 +280,7 @@ class ApplicationController < ActionController::Base end end - I18n.locale = request.compatible_language_from(I18n.available_locales) || I18n.default_locale + I18n.locale = params[:locale] || request.compatible_language_from(I18n.available_locales) || I18n.default_locale response.headers['Content-Language'] = I18n.locale.to_s end @@ -404,7 +406,20 @@ class ApplicationController < ActionController::Base format.all { render :nothing => true, :status => :not_found } end end - + + ## + # Unfortunately if a PUT or POST request that has a body fails to + # read it then Apache will sometimes fail to return the response it + # is given to the client properly, instead erroring: + # + # https://issues.apache.org/bugzilla/show_bug.cgi?id=44782 + # + # To work round this we call rewind on the body here, which is added + # as a filter, to force it to be fetched from Apache into a file. + def fetch_body + request.body.rewind + end + private # extract authorisation credentials from headers, returns user = nil if none diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 05f97bf0d..4b138bdae 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -368,7 +368,7 @@ private filename = "/tmp/#{rand}" # ...and save the uploaded file to that location - File.open(filename, "w") { |f| f.write(file.read) } + File.open(filename, "wb") { |f| f.write(file.read) } # Create the trace object, falsely marked as already # inserted to stop the import daemon trying to load it diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 9e1585243..321b61918 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -32,12 +32,14 @@ class UserController < ApplicationController # the open_id_authentication function @user = session.delete(:new_user) - openid_verify(nil, @user) do |user| + openid_verify(nil, @user) do |user,verified_email| + user.status = "active" if user.email == verified_email end if @user.openid_url.nil? or @user.invalid? render :action => 'new' else + session[:new_user] = @user render :action => 'terms' end elsif params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last) @@ -51,11 +53,13 @@ class UserController < ApplicationController if params[:user] and params[:user][:openid_url] and @user.pass_crypt.empty? # We are creating an account with OpenID and no password # was specified so create a random one - @user.pass_crypt = SecureRandom.base64(16) - @user.pass_crypt_confirmation = @user.pass_crypt + @user.pass_crypt = SecureRandom.base64(16) + @user.pass_crypt_confirmation = @user.pass_crypt end if @user + @user.status = "pending" + if @user.invalid? if @user.new_record? # Something is wrong with a new user, so rerender the form @@ -72,6 +76,9 @@ class UserController < ApplicationController # Verify OpenID before moving on session[:new_user] = @user openid_verify(params[:user][:openid_url], @user) + elsif @user.new_record? + # Save the user record + session[:new_user] = @user end else # Not logged in, so redirect to the login page @@ -114,28 +121,40 @@ class UserController < ApplicationController else redirect_to :action => :account, :display_name => @user.display_name end - elsif Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last) - render :action => 'blocked' else - @user = User.new(params[:user]) - - @user.status = "pending" - @user.data_public = true - @user.description = "" if @user.description.nil? - @user.creation_ip = request.remote_ip - @user.languages = request.user_preferred_languages - @user.terms_agreed = Time.now.getutc - @user.terms_seen = true - @user.openid_url = nil if @user.openid_url and @user.openid_url.empty? - - if @user.save - flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL) - flash[:notice] = t 'user.new.flash create success message', :email => @user.email - Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver - session[:token] = @user.tokens.create.token - redirect_to :action => 'login', :referer => params[:referer] + @user = session.delete(:new_user) + + if Acl.no_account_creation(request.remote_ip, @user.email.split("@").last) + render :action => 'blocked' else - render :action => 'new', :referer => params[:referer] + @user.data_public = true + @user.description = "" if @user.description.nil? + @user.creation_ip = request.remote_ip + @user.languages = request.user_preferred_languages + @user.terms_agreed = Time.now.getutc + @user.terms_seen = true + @user.openid_url = nil if @user.openid_url and @user.openid_url.empty? + + if @user.save + flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL) + + if @user.status == "active" + flash[:notice] = t 'user.new.flash welcome', :email => @user.email + + Notifier.signup_confirm(@user, nil).deliver + + successful_login(@user) + else + flash[:notice] = t 'user.new.flash create success message', :email => @user.email + session[:token] = @user.tokens.create.token + + Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver + + redirect_to :action => 'login', :referer => params[:referer] + end + else + render :action => 'new', :referer => params[:referer] + end end end end @@ -299,7 +318,7 @@ class UserController < ApplicationController referer = token.referer token.destroy - if session[:token] + if session[:token] token = UserToken.find_by_token(session[:token]) session.delete(:token) else @@ -551,6 +570,7 @@ private # the simple registration protocol. nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first email = sreg["email"] || ax["http://axschema.org/contact/email"].first + redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url end elsif result.missing? @@ -568,8 +588,18 @@ private def openid_verify(openid_url, user) user.openid_url = openid_url - authenticate_with_open_id(openid_expand_url(openid_url), :method => :get) do |result, identity_url| + authenticate_with_open_id(openid_expand_url(openid_url), :method => :get, :required => [:email, "http://axschema.org/contact/email"]) do |result, identity_url, sreg, ax| if result.successful? + # Do we trust the emails this provider returns? + if openid_email_verified(identity_url) + # Guard against not getting any extension data + sreg = Hash.new if sreg.nil? + ax = Hash.new if ax.nil? + + # Get the verified email + verified_email = sreg["email"] || ax["http://axschema.org/contact/email"].first + end + # We need to use the openid url passed back from the OpenID provider # rather than the one supplied by the user, as these can be different. # @@ -577,7 +607,7 @@ private # than a user specific url. Only once it comes back from the provider # provider do we know the unique address for the user. user.openid_url = identity_url - yield user + yield user, verified_email elsif result.missing? flash.now[:error] = t 'user.login.openid missing provider' elsif result.invalid? @@ -603,7 +633,15 @@ private else return openid_url end - end + end + + ## + # check if we trust an OpenID provider to return a verified + # email, so that we can skpi verifying it ourselves + def openid_email_verified(openid_url) + openid_url.match(/https:\/\/www.google.com\/accounts\/o8\/id?(.*)/) or + openid_url.match(/https:\/\/me.yahoo.com\/(.*)/) + end ## # process a successful login @@ -663,8 +701,15 @@ private user.languages = params[:user][:languages].split(",") case params[:image_action] - when "new" then user.image = params[:user][:image] - when "delete" then user.image = nil + when "new" then + user.image = params[:user][:image] + user.image_use_gravatar = false + when "delete" then + user.image = nil + user.image_use_gravatar = false + when "gravatar" then + user.image = nil + user.image_use_gravatar = true end user.home_lat = params[:user][:home_lat] @@ -755,7 +800,7 @@ private ## # def disable_terms_redirect - # this is necessary otherwise going to the user terms page, when + # this is necessary otherwise going to the user terms page, when # having not agreed already would cause an infinite redirect loop. # it's .now so that this doesn't propagate to other pages. flash.now[:skip_terms] = true diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fb422cc17..18f233e50 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -88,6 +88,14 @@ module ApplicationHelper end end + def dir + if dir = params[:dir] + dir == "rtl" ? "rtl" : "ltr" + else + I18n.t("html.dir") + end + end + def friendly_date(date) content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) end diff --git a/app/helpers/notifier_helper.rb b/app/helpers/notifier_helper.rb new file mode 100644 index 000000000..4b2cd2a06 --- /dev/null +++ b/app/helpers/notifier_helper.rb @@ -0,0 +1,5 @@ +module NotifierHelper + def fp(text) + format_paragraph(text, 72, 0) + end +end diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 70125e804..7113cf1b2 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -1,22 +1,46 @@ module UserHelper + # User images + def user_image(user, options = {}) options[:class] ||= "user_image" - image_tag user.image.url(:large), options + if user.image_use_gravatar + user_gravatar_tag(user, options) + else + image_tag user.image.url(:large), options + end end def user_thumbnail(user, options = {}) options[:class] ||= "user_thumbnail" - image_tag user.image.url(:small), options + if user.image_use_gravatar + user_gravatar_tag(user, options) + else + image_tag user.image.url(:small), options + end end def user_thumbnail_tiny(user, options = {}) options[:class] ||= "user_thumbnail_tiny" - image_tag user.image.url(:small), options + if user.image_use_gravatar + user_gravatar_tag(user, options) + else + image_tag user.image.url(:small), options + end + end + + def user_image_url(user, options = {}) + if user.image_use_gravatar + user_gravatar_url(user, options) + else + "http://#{SERVER_URL}#{image_path(user.image.url)}" + end end + # OpenID support + def openid_logo image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo" end @@ -29,4 +53,20 @@ module UserHelper :title => t("user.login.openid_providers.#{name}.title") ) end + + # Gravatar support + + # See http://en.gravatar.com/site/implement/images/ for details. + def user_gravatar_url(user, options = {}) + size = options[:size] || 100 + hash = Digest::MD5::hexdigest(user.email.downcase) + default_image_url = "http://#{SERVER_URL}#{image_path("users/images/large.png")}" + url = "http://www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}" + end + + def user_gravatar_tag(user, options = {}) + url = user_gravatar_url(user, options) + options.delete(:size) + image_tag url, options + end end diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 1107a0da6..a4eb0d4c3 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -6,11 +6,20 @@ class Notifier < ActionMailer::Base def signup_confirm(user, token) @locale = user.preferred_language_from(I18n.available_locales) - @url = url_for(:host => SERVER_URL, - :controller => "user", :action => "confirm", - :display_name => user.display_name, - :confirm_string => token.token) - + + # If we are passed an email address verification token, create + # the confirumation URL for account activation. + # + # Otherwise the email has already been verified e.g. through + # a trusted openID provider and the account is active and a + # confirmation URL is not needed. + if token + @url = url_for(:host => SERVER_URL, + :controller => "user", :action => "confirm", + :display_name => user.display_name, + :confirm_string => token.token) + end + mail :to => user.email, :subject => I18n.t('notifier.signup_confirm.subject', :locale => @locale) end diff --git a/app/models/relation.rb b/app/models/relation.rb index ce19f7b98..e402d0d08 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -167,13 +167,9 @@ class Relation < ActiveRecord::Base # FIXME is this really needed? def members - unless @members - @members = Array.new - self.relation_members.each do |member| - @members += [[member.member_type,member.member_id,member.member_role]] - end + @members ||= self.relation_members.map do |member| + [member.member_type, member.member_id, member.member_role] end - @members end def tags @@ -194,9 +190,9 @@ class Relation < ActiveRecord::Base @tags = t end - def add_member(type,id,role) - @members = Array.new unless @members - @members += [[type,id.to_i,role]] + def add_member(type, id, role) + @members ||= [] + @members << [type, id.to_i, role] end def add_tag_keyval(k, v) diff --git a/app/models/user.rb b/app/models/user.rb index 889c40451..33f01c06b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -47,12 +47,13 @@ class User < ActiveRecord::Base validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true attr_accessible :display_name, :email, :email_confirmation, :openid_url, - :pass_crypt, :pass_crypt_confirmation, :consider_pd + :pass_crypt, :pass_crypt_confirmation, :consider_pd, + :image_use_gravatar after_initialize :set_defaults before_save :encrypt_password - has_attached_file :image, + has_attached_file :image, :default_url => "/assets/:class/:attachment/:style.png", :styles => { :large => "100x100>", :small => "50x50>" } @@ -84,7 +85,7 @@ class User < ActiveRecord::Base token.update_column(:expiry, 1.week.from_now) if token and user return user - end + end def to_xml doc = OSM::API.new.get_xml_doc @@ -127,7 +128,7 @@ class User < ActiveRecord::Base end def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) - if self.home_lon and self.home_lat + if self.home_lon and self.home_lat gc = OSM::GreatCircle.new(self.home_lat, self.home_lon) bounds = gc.bounds(radius) sql_for_distance = gc.sql_for_distance("home_lat", "home_lon") @@ -184,7 +185,7 @@ class User < ActiveRecord::Base end ## - # returns the first active block which would require users to view + # returns the first active block which would require users to view # a message, or nil if there are none. def blocked_on_view blocks.active.detect { |b| b.needs_view? } @@ -208,8 +209,8 @@ class User < ActiveRecord::Base ## # return a spam score for a user def spam_score - changeset_score = self.changesets.limit(10).length * 50 - trace_score = self.traces.limit(10).length * 50 + changeset_score = self.changesets.size * 50 + trace_score = self.traces.size * 50 diary_entry_score = self.diary_entries.inject(0) { |s,e| s += e.body.spam_score } diary_comment_score = self.diary_comments.inject(0) { |s,c| s += c.body.spam_score } diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index b5110bbf5..f10d0a3f9 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -6,6 +6,8 @@ class UserPreference < ActiveRecord::Base validates_length_of :k, :within => 1..255 validates_length_of :v, :within => 1..255 + attr_accessible :k, :v + # Turn this Node in to an XML Node without the wrapper. def to_xml_node el1 = XML::Node.new 'preference' diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder index 7ee36e9bd..35f05028d 100644 --- a/app/views/diary_entry/rss.rss.builder +++ b/app/views/diary_entry/rss.rss.builder @@ -6,24 +6,24 @@ xml.rss("version" => "2.0", xml.channel do xml.title @title xml.description @description - xml.link url_for(:action => "list", :only_path => false) + xml.link url_for(:action => "list", :host => SERVER_URL) xml.image do xml.url "http://www.openstreetmap.org/images/mag_map-rss2.0.png" xml.title "OpenStreetMap" xml.width "100" xml.height "100" - xml.link url_for(:action => "list", :only_path => false) + xml.link url_for(:action => "list", :host=> SERVER_URL) end for entry in @entries xml.item do xml.title h(entry.title) - xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false) - xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false) + xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL) + xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL) xml.description entry.body.to_html xml.author entry.user.display_name xml.pubDate entry.created_at.to_s(:rfc822) - xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false) + xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL) if entry.latitude and entry.longitude xml.geo :lat, entry.latitude.to_s diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index c85594189..88ad3eb39 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -2,10 +2,10 @@ <%= javascript_include_tag "application" %> - <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %> - <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %> - <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %> - + <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %> + <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %> + <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> + <%= favicon_link_tag "favicon.ico" %> <%= favicon_link_tag "osm_logo.png", :rel => "apple-touch-icon", :type => "image/png" %> <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %> diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 383941685..f1ae440e7 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,5 +1,5 @@ - + <%= render :partial => "layouts/head" %>
@@ -13,8 +13,8 @@
<% if @user and @user.id %> - <%= 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'))) %> - <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> | + <%= 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'))) %> + <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> | <%= 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')}%> @@ -70,7 +70,7 @@ <%= link_to(image_tag("osm_logo.png", :size => "120x120", :alt => t('layouts.logo.alt_text')), - root_path) %>
+ root_path) %>

<%= t 'layouts.project_name.h1' %>

<%= t('layouts.tag_line') %>

@@ -102,34 +102,36 @@

<%= raw t 'layouts.donate', :link => "#{t('layouts.donate_link_text')}" %>

<% end %> -
-
    -
  • <%= t'layouts.help' %> -
      +
        +
      • +

        <%= t'layouts.help' %>

        +
        • <%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %>
        • <%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %>
        • <%= link_to t('layouts.copyright'), copyright_path %>
          • -
        -
        • -
      • <%= t'layouts.community' %> -
          +
        +
        • +
      • +

        <%= t'layouts.community' %>

        + -
        • -
      • <%= link_to t('layouts.gps_traces'), traces_path, { +
      + +
    • +

      <%= link_to t('layouts.gps_traces'), traces_path, { :id => 'traceanchor', :title => t('layouts.gps_traces_tooltip') - } %>

      • - <%= yield :left_menu %> -
    -
- + } %> + + <%= yield :left_menu %> + +

<%= t 'layouts.partners_html', :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"), diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb index 862f55d87..ba02104f4 100644 --- a/app/views/layouts/slim.html.erb +++ b/app/views/layouts/slim.html.erb @@ -1,5 +1,5 @@ - + <%= render :partial => "layouts/head" %>

diff --git a/app/views/notifier/signup_confirm.html.erb b/app/views/notifier/signup_confirm.html.erb index 5b7566fba..0c154c968 100644 --- a/app/views/notifier/signup_confirm.html.erb +++ b/app/views/notifier/signup_confirm.html.erb @@ -1,21 +1,24 @@ -

<%= t'notifier.signup_confirm_html.greeting' %>

+

<%= t("notifier.signup_confirm.greeting") %>

-

<%= t'notifier.signup_confirm_html.hopefully_you' %> - <%= SERVER_URL %>.

+

<%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %>

-

<%= t'notifier.signup_confirm_html.click_the_link' %>

+<% if @url -%> +

<%= t("notifier.signup_confirm.confirm") %>

-

<%= raw(link_to @url, @url) %>

+

<%= link_to @url, @url %>

+<% end -%> -

<%= raw(t'notifier.signup_confirm_html.introductory_video', :introductory_video_link => link_to(t('notifier.signup_confirm_html.video_to_openstreetmap'), "http://showmedo.com/videos/video?name=1800000&fromSeriesID=180")) %> - <%= raw(t'notifier.signup_confirm_html.more_videos', :more_videos_link => link_to(t('notifier.signup_confirm_html.more_videos_here'), "http://showmedo.com/videos/series?name=mS2P1ZqS6")) %>

+

<%= t("notifier.signup_confirm.welcome") %>

-

<%= raw(t'notifier.signup_confirm_html.get_reading') %>

+

<%= raw(t("notifier.signup_confirm_html.introductory_video", :introductory_video_link => link_to(t('notifier.signup_confirm_html.video_to_openstreetmap'), "http://showmedo.com/videos/video?name=1800000&fromSeriesID=180"))) %> + <%= raw(t("notifier.signup_confirm_html.more_videos", :more_videos_link => link_to(t('notifier.signup_confirm_html.more_videos_here'), "http://showmedo.com/videos/series?name=mS2P1ZqS6"))) %>

-

<%= raw(t'notifier.signup_confirm_html.ask_questions') %>

+

<%= raw(t("notifier.signup_confirm_html.get_reading")) %>

-

<%= raw(t'notifier.signup_confirm_html.wiki_signup') %>

+

<%= raw(t("notifier.signup_confirm_html.ask_questions")) %>

-

<%= raw(t'notifier.signup_confirm_html.user_wiki_page') %>

+

<%= raw(t("notifier.signup_confirm_html.wiki_signup")) %>

-

<%= raw(t'notifier.signup_confirm_html.current_user') %>

+

<%= raw(t("notifier.signup_confirm_html.user_wiki_page")) %>

+ +

<%= raw(t("notifier.signup_confirm_html.current_user")) %>

diff --git a/app/views/notifier/signup_confirm.text.erb b/app/views/notifier/signup_confirm.text.erb index a53f27dda..76bc65808 100644 --- a/app/views/notifier/signup_confirm.text.erb +++ b/app/views/notifier/signup_confirm.text.erb @@ -1,46 +1,46 @@ -<%= t'notifier.signup_confirm_plain.greeting' %> +<%= fp(t("notifier.signup_confirm.greeting")) %> -<%= t'notifier.signup_confirm_plain.hopefully_you' %> -<%= SERVER_URL %> +<%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %> -<%= t'notifier.signup_confirm_plain.click_the_link_1' %> -<%= t'notifier.signup_confirm_plain.click_the_link_2' %> +<% if @url -%> +<%= fp(t("notifier.signup_confirm.confirm")) %> -<%= @url %> + <%= @url %> -<%= t'notifier.signup_confirm_plain.introductory_video' %> +<% end -%> +<%= fp(t("notifier.signup_confirm.welcome")) %> - http://showmedo.com/videos/video?name=1800000&fromSeriesID=180 +<%= fp(t("notifier.signup_confirm_plain.introductory_video")) %> -<%= t'notifier.signup_confirm_plain.more_videos' %> + http://showmedo.com/videos/video?name=1800000&fromSeriesID=180 - http://showmedo.com/videos/series?name=mS2P1ZqS6 +<%= fp(t("notifier.signup_confirm_plain.more_videos")) %> -<%= t'notifier.signup_confirm_plain.the_wiki' %> + http://showmedo.com/videos/series?name=mS2P1ZqS6 - <%= t'notifier.signup_confirm_plain.the_wiki_url' %> +<%= fp(t("notifier.signup_confirm_plain.the_wiki")) %> -<%= t'notifier.signup_confirm_plain.blog_and_twitter' %> + <%= t("notifier.signup_confirm_plain.the_wiki_url") %> - http://blog.openstreetmap.org/ - http://twitter.com/openstreetmap +<%= fp(t("notifier.signup_confirm_plain.blog_and_twitter")) %> -<%= t'notifier.signup_confirm_plain.opengeodata' %> + http://blog.openstreetmap.org/ + http://twitter.com/openstreetmap - http://www.opengeodata.org/ +<%= fp(t("notifier.signup_confirm_plain.opengeodata")) %> -<%= t'notifier.signup_confirm_plain.ask_questions' %> + http://www.opengeodata.org/ - http://help.openstreetmap.org/ +<%= fp(t("notifier.signup_confirm_plain.ask_questions")) %> -<%= t'notifier.signup_confirm_plain.wiki_signup' %> + http://help.openstreetmap.org/ - <%= t'notifier.signup_confirm_plain.wiki_signup_url' %> +<%= fp(t("notifier.signup_confirm_plain.wiki_signup")) %> -<%= t'notifier.signup_confirm_plain.user_wiki_1' %> -<%= t'notifier.signup_confirm_plain.user_wiki_2' %> + <%= t("notifier.signup_confirm_plain.wiki_signup_url") %> -<%= t'notifier.signup_confirm_plain.current_user_1' %> -<%= t'notifier.signup_confirm_plain.current_user_2' %> +<%= fp(t("notifier.signup_confirm_plain.user_wiki_page")) %> -http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region +<%= fp(t("notifier.signup_confirm_plain.current_user")) %> + + http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 248b5a0b6..d4c33fcfd 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -10,7 +10,7 @@ <% end -%> <% content_for :left_menu do %> -
  • <%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %>
    • +

  • <%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %>

    • <% end %> <%= render :partial => 'home_link' %> diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 6745f1b34..179e1b2f6 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -84,27 +84,37 @@ <%= t 'user.account.image' %> - - <% if @user.image.file? %> - - - - - - - - - - - - - - -
    <%= user_image @user %><%= radio_button_tag "image_action", "keep", true %><%= t 'user.account.keep image' %>
    <%= radio_button_tag "image_action", "delete" %><%= t 'user.account.delete image' %>
    <%= radio_button_tag "image_action", "new" %><%= t 'user.account.replace image' %>
    <%= f.file_field :image, :onchange => "$('image_action_new').prop('checked', true)" %>
    <%= t 'user.account.image size hint' %>
    - <% else %> - <%= hidden_field_tag "image_action", "new" %> - <%= t 'user.account.new image' %>
    <%= f.file_field :image %>
    <%= t 'user.account.image size hint' %> - <% end %> + + <%= user_image @user %> + + <% if @user.image.file? %> + + + + + <% end %> + <% if @user.image.file? || @user.image_use_gravatar? %> + + + + + <% end %> + <% if @user.image.file? %> + + + + + <% else %> + + + + + <% end %> + + + + +
    <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %><%= t 'user.account.keep image' %>
    <%= radio_button_tag "image_action", "delete" %><%= t 'user.account.delete image' %>
    <%= radio_button_tag "image_action", "new" %><%= t 'user.account.replace image' %>
    <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
    <%= t 'user.account.image size hint' %>
    <%= radio_button_tag "image_action", "new" %><%= t 'user.account.new image' %>
    <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
    <%= t 'user.account.image size hint' %>
    <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %><%= t 'user.account.gravatar.gravatar' %> (<%= t 'user.account.gravatar.link text' %>)
    @@ -123,7 +133,7 @@ <%= content_tag "div", "", :id => "map", :class => "user_map set_location" %> - + <%= submit_tag t('user.account.save changes button') %> diff --git a/app/views/user/api_read.builder b/app/views/user/api_read.builder index db7bcc2b7..71bf29208 100644 --- a/app/views/user/api_read.builder +++ b/app/views/user/api_read.builder @@ -12,8 +12,8 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do else xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed end - if @this_user.image.file? - xml.tag! "img", :href => "http://#{SERVER_URL}#{@this_user.image.url}" + if @this_user.image.file? or @this_user.image_use_gravatar + xml.tag! "img", :href => user_image_url(@this_user, :size => 256) end xml.tag! "roles" do @this_user.roles.each do |role| @@ -35,7 +35,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do xml.tag! "home", :lat => @this_user.home_lat, :lon => @this_user.home_lon, :zoom => @this_user.home_zoom - end + end if @this_user.languages xml.tag! "languages" do @this_user.languages.split(",") { |lang| xml.tag! "lang", lang } diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 849005274..f006fde77 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -33,14 +33,6 @@

    <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> - <% if @user.new_record? %> - <%= hidden_field('user', 'email') %> - <%= hidden_field('user', 'email_confirmation') %> - <%= hidden_field('user', 'display_name') %> - <%= hidden_field('user', 'pass_crypt') %> - <%= hidden_field('user', 'pass_crypt_confirmation') %> - <%= hidden_field('user', 'openid_url') %> - <% end %>

    <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> diff --git a/config/example.application.yml b/config/example.application.yml index c795fc0d9..b99e4a103 100644 --- a/config/example.application.yml +++ b/config/example.application.yml @@ -11,7 +11,7 @@ defaults: &defaults email_return_path: "bounces@openstreetmap.org" # API version api_version: "0.6" - # Application status - posstible values are: + # Application status - possible values are: # :online - online and operating normally # :api_readonly - site online but API in read-only mode # :api_offline - site online but API offline diff --git a/config/example.database.yml b/config/example.database.yml index 3908e51e5..e075d7f8d 100644 --- a/config/example.database.yml +++ b/config/example.database.yml @@ -1,5 +1,5 @@ -# Postgresql version 8.3 recommended. -# See http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6/postgres for detailed setup instructions. +# Using a recent release (8.3 or higher) of PostgreSQL (http://postgresql.org/) is recommended. +# See http://wiki.openstreetmap.org/wiki/The_Rails_Port#PostgreSQL_setup for detailed setup instructions. # development: adapter: postgresql diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb new file mode 100644 index 000000000..fdb6888b2 --- /dev/null +++ b/config/initializers/active_record.rb @@ -0,0 +1,9 @@ +# We need to restore field_changed? support until CPK is updated +module ActiveRecord + module AttributeMethods + module Dirty + private + alias_method :field_changed?, :_field_changed? + end + end +end diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..9bbf937cf --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,14 @@ +require "rack/cors" + +# Allow any and all cross-origin requests to the API. Allow any origin, and +# any headers. Non-browser requests do not have origin or header restrictions, +# so browser-requests should be similarly permitted. (Though the API does not +# require any custom headers, Ajax frameworks may automatically add headers +# such as X-Requested-By to requests.) +Rails.configuration.middleware.use Rack::Cors do + allow do + origins "*" + resource "/oauth/*", :headers => :any, :methods => [:get, :post] + resource "/api/*", :headers => :any, :methods => [:get, :post, :put, :delete] + end +end diff --git a/config/initializers/r2.rb b/config/initializers/r2.rb new file mode 100644 index 000000000..70676ca7e --- /dev/null +++ b/config/initializers/r2.rb @@ -0,0 +1,21 @@ +class R2Template < Tilt::Template + self.default_mime_type = 'text/css' + + def self.engine_initialized? + defined? ::R2 + end + + def initialize_engine + require_template_library "r2" + end + + def prepare + @output = R2.r2(data) + end + + def evaluate(scope, locals, &block) + @output + end +end + +Rails.application.assets.register_engine ".r2", R2Template diff --git a/config/locales/af.yml b/config/locales/af.yml index dd2e58714..b8366f11a 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -831,20 +831,13 @@ af: subject: "[OpenStreetMap] Bevestig u e-posadres" signup_confirm_html: get_reading: Lees meer oor OpenStreetMap op die wiki of die opengeodata-blog waar u ook na podgooie kan luister! - greeting: Hallo daar! - hopefully_you: Iemand (hopelik u) wil graag 'n rekening skep op introductory_video: U kan na 'n %{introductory_video_link} kyk. more_videos: Daar is %{more_videos_link}. more_videos_here: meer video's hier video_to_openstreetmap: inleidende video oor OpenStreetMap signup_confirm_plain: - click_the_link_1: As dit u is, welkom! Kliek asseblief op die onderstaande skakel om u rekening te bevestig - current_user_2: "is beskikbaar op:" - greeting: Hallo daar! more_videos: "Daar is meer videos hier:" the_wiki: "Lees meer oor OpenStreetMap op die wiki:" - user_wiki_1: Ons beveel aan dat u 'n gebruikersblad op die wiki skep met onder andere - user_wiki_2: kategorie-etikette wat aandui waar u woon, soos [[Category:Users_in_Pretoria]]. wiki_signup: "U kan ook op die OpenStreetMap-wiki registreer by:" oauth: oauthorize: diff --git a/config/locales/aln.yml b/config/locales/aln.yml index c9a65b377..9913adb48 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -996,11 +996,8 @@ aln: signup_confirm: subject: "[OpenStreetMap] Konfirmoje email adresën tonde" signup_confirm_html: - click_the_link: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu atë llogari dhe lexoni ma shumë informata rreth OpenStreetMap current_user: "Lista e përdoruesve të tanishëm në kategori, në bazë të në botë ku ata janë, është në dispozicion nga Kategoria: Users_by_geographical_region ." get_reading: Get lexuar në lidhje me OpenStreetMap në wiki , të arrijë me të rejat e fundit nëpërmjet blog OpenStreetMap ose Twitter , ose të kërkoni nëpër OpenStreetMap themeluesit Steve Bregu OpenGeoData blog për historinë në vazo të projektit, e cila ka podcast për të dëgjuar gjithashtu! - greeting: Hi there! - hopefully_you: Dikush (shpresojmë se ju), do të doja të krijuar një llogari të gjatë në introductory_video: Ju muni me shiku një %{introductory_video_link}. more_videos: Ka %{more_videos_link}. more_videos_here: ma shumë video këtu @@ -1009,18 +1006,10 @@ aln: wiki_signup: Ju mund të dëshironi të regjistroheni në OpenStreetMap wiki. signup_confirm_plain: blog_and_twitter: "Njoftohu me lajmet ma të fundit nëpërmjet blogut të OpenStreetMap ose Twitter-it:" - click_the_link_1: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu - click_the_link_2: llogarin tonde dhe lexo ma shumë informata për OpenStreetMap. - current_user_1: Lista e përdoruesve të tanishëm në kategori, në bazë të ku në botë - current_user_2: "ata janë, është i vlefshëm nga:" - greeting: Hi there! - hopefully_you: Dikush (shpresojmë se ju), do të doja të krijuar një llogari të gjatë në introductory_video: "Këtu ju muni me shiku një video hyrëse për në OpenStreetMap:" more_videos: "Ma shumë video keni këtu:" opengeodata: "OpenGeoData.org është blog OpenStreetMap themelues Steve Bregu, dhe ajo ka podcast shumë:" the_wiki: "Lexo n'wiki rreth OpenStreetMap:" - user_wiki_1: Është e rekomanduar që ju të krijoni një përdorues faqe wiki, i cili përfshin - user_wiki_2: "tags kategori duke vënë në dukje se ku je, si për shembull [[Category: Users_in_London]]." wiki_signup: "Ti munesh gjithashtu me u regjistru në OpenStreetMap wiki:" oauth: oauthorize: diff --git a/config/locales/ar.yml b/config/locales/ar.yml index e69bd239b..f7fb42494 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -10,6 +10,7 @@ # Author: Meno25 # Author: Mutarjem horr # Author: OsamaK +# Author: TTMTT # Author: ترجمان05 ar: activerecord: @@ -410,6 +411,7 @@ ar: licence: الرخصة longitude: "خط الطول:" manually_select: اختر يدويًا منطقة أخرى + map_image: صورة الخريطة (عرض الطبقة الإفتراضية) max: الأقصى options: خيارات osm_xml_data: معطيات خريطة الطريق المفتوح بنسق إكس أم أل @@ -511,6 +513,7 @@ ar: ferry_terminal: مرسى عبّارة fire_hydrant: مواد مكافحة حرائق fire_station: فوج إطفاء + food_court: مطعم وجبات سريعة fountain: نافورة fuel: وقود grave_yard: مقبرة @@ -575,6 +578,8 @@ ar: protected_area: منطقة محمية bridge: suspension: جسر معلق + swing: جسر متحرك + viaduct: جسر "yes": جسر building: "yes": مبنى @@ -610,6 +615,7 @@ ar: steps: درج stile: مرقى لعبور جدار tertiary: طريق فرعي + tertiary_link: طريق فرعي track: مسار trail: درب trunk: طريق رئيسي @@ -957,6 +963,7 @@ ar: intro_1: خريطة الشارع المفتوحة هي خريطة للعالم كله قابلة للتحرير حرة ومجانية. قام بإنشائها أشخاص مثلك. intro_2_create_account: أنشئ حساب مستخدم intro_2_download: نزّل + intro_2_license: مفتوح الترخيص intro_2_use: إستعمل log_in: تسجيل الدخول log_in_tooltip: سجّل الدخول مع حساب موجود @@ -970,6 +977,7 @@ ar: osm_offline: حاليًا قاعدة بيانات خريطة الشارع المفتوحة مغلقة بينما يتم الانتهاء من أعمال الصيانة الأساسية لقاعدة البيانات. osm_read_only: حاليًا قاعدة بيانات خريطة الشارع المفتوحة في وضع القراءة بينما يتم الانتهاء من أعمال الصيانة الأساسية لقاعدة البيانات. partners_html: الضيافة مدعومة من %{ucl}, %{ic} و %{bytemark}, و %{partners} آخرون. + partners_ic: كلية امبراطورية لندن partners_partners: الشركاء sign_up: أنشئ حسابًا sign_up_tooltip: أنشئ حسابًا كي تستطيع المساهمة @@ -1108,11 +1116,8 @@ ar: signup_confirm: subject: "[خريطة الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني" signup_confirm_html: - click_the_link: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد هذا الحساب، واقرأ عن المزيد من المعلومات حول خريطة الشارع المفتوحة current_user: لائحة بالمستخدمين في تصنيفات، استنادًا على مكانهم في العالم، وهي متاحة من تصنيف:مستخدمين بحسب المنطقة الجغرافية. get_reading: اقرأ حول خريطة الشارع المفتوحة في الويكي، واكب أحدث الأخبار عبر مدونة خريطة الشارع المفتوحة أو تويتر، أو من خلال مدونة مؤسس خريطة الشارع المفتوحة ستيف كوست OpenGeoData مدونة للذاكرة التاريخية للمشروع والتي تضم أيضًا بودكاست مسموع! - greeting: مرحباَ بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على introductory_video: يمكنك مشاهدة %{introductory_video_link}. more_videos: يوجد %{more_videos_link}. more_videos_here: المزيد من الفيديو هنا @@ -1121,18 +1126,10 @@ ar: wiki_signup: قد تحتاج أيضًا إلى التسجيل في ويكي خريطة الشارع المفتوحة. signup_confirm_plain: blog_and_twitter: "واكب أحدث الأخبار عبر مدونة خريطة الشارع المفتوحة أو تويتر:" - click_the_link_1: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد - click_the_link_2: حساب وإقرأ المزيد من المعلومات عن خريطة الطريق المفتوحة. - current_user_1: لائحة للمستخدمين الحاليين في فئات، استنادًا إلى الموقع في العالم - current_user_2: "وهم، متوفر من:" - greeting: مرحبًا بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على introductory_video: "يمكنك مشاهدة شريط فيديو تمهيدي لخريطة الطريق المفتوحة هنا:" more_videos: "هناك المزيد من الفيديوهات هنا:" opengeodata: "OpenGeoData.org هي مدونة مؤسس خريطة الشارع المفتوحة ستيف كوست، وتحوي أيضًا على بودكاست:" the_wiki: "احصل على بعض المطالعة عن خريطة الطريق المفتوح على الويكي:" - user_wiki_1: من المستحسن أن تقوم بإنشاء صفحة مستخدم ويكي، والتي تتضمن - user_wiki_2: سمات الخريطة التي تشير إلى مكانك، مثل [[Category:Users_in_Egypt]]. wiki_signup: "قد تحتاج أيضًا إلى التسجيل في ويكي خريطة الشارع المفتوحة على:" oauth: oauthorize: diff --git a/config/locales/arz.yml b/config/locales/arz.yml index 86712bf0a..0dac59bea 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -901,9 +901,6 @@ arz: signup_confirm: subject: "[خريطه الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني" signup_confirm_html: - click_the_link: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد هذا الحساب، واقرأ عن المزيد من المعلومات حول خريطه الشارع المفتوحة - greeting: مرحباَ بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على introductory_video: يمكنك مشاهده %{introductory_video_link}. more_videos: يوجد %{more_videos_link}. more_videos_here: المزيد من الفيديو هنا @@ -911,16 +908,9 @@ arz: wiki_signup: قد تحتاج أيضًا إلى التسجيل فى ويكى خريطه الشارع المفتوحه. signup_confirm_plain: blog_and_twitter: "واكب أحدث الأخبار عبر مدونه خريطه الشارع المفتوحه أو تويتر:" - click_the_link_1: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد - click_the_link_2: حساب وإقرأ المزيد من المعلومات عن خريطه الطريق المفتوحه. - current_user_1: لائحه للمستخدمين الحاليين فى فئات، استنادًا إلى الموقع فى العالم - current_user_2: "وهم، متوفر من:" - greeting: مرحبًا بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على introductory_video: "يمكنك مشاهده شريط فيديو تمهيدى لخريطه الطريق المفتوحه هنا:" more_videos: "هناك المزيد من الفيديوهات هنا:" the_wiki: "احصل على بعض المطالعه عن خريطه الطريق المفتوح على الويكي:" - user_wiki_1: من المستحسن أن تقوم بإنشاء صفحه مستخدم ويكى، والتى تتضمن wiki_signup: "قد تحتاج أيضًا إلى التسجيل فى ويكى خريطه الشارع المفتوحه على:" oauth: oauthorize: diff --git a/config/locales/ast.yml b/config/locales/ast.yml index b70289705..fd95b11fb 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -980,7 +980,6 @@ ast: partners_ucl: el Centru de RV de la UCL sign_up: dase d'alta sign_up_tooltip: Crear una cuenta pa editar - sotm2012: ¡Ven a la Conferencia United States OpenStreetMap 2012, L'Estáu del Mapa de los EE.XX., el 13 y 14 d'ochobre en Portland, Oregon! tag_line: El wikimapamundi llibre user_diaries: Diarios d'usuariu user_diaries_tooltip: Ver los diarios d'usuariu @@ -996,6 +995,9 @@ ast: text: En casu d'haber un conflictu ente esta páxina traducida y %{english_original_link}, la páxina n'inglés tendrá prioridá title: Tocante a esta traducción legal_babble: + attribution_example: + alt: Exemplu de cómo dar reconocimientu a OpenStreetMap nuna páxina web + title: Exemplu de reconocimientu contributors_at_html: "Austria: Contien datos de\nStadt Wien (baxo\nCC BY),\nLand Vorarlberg y\nLand Tirol (baxo CC-BY AT con enmiendes)." contributors_ca_html: "Canadá: Contien datos de GeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), y StatCan (Geography Division,\nStatistics Canada)." contributors_footer_1_html: "Pa más detalles d'estes, y otres fontes que s'usaron p'ayudar a\nameyorar OpenStreetMap, por favor, llei la Páxina\nde los collaboradores na Wiki d'OpenStreetMap." @@ -1009,6 +1011,7 @@ ast: contributors_za_html: "Sudáfrica: Contién datos sacaos de\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." credit_1_html: Requerimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”. credit_2_html: "Tamién debes dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC-BY-SA. Pues facelo enllazando a esta páxina de drechos d'autor.\nAlternativamente, y como requisitu si distribúis OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres impreses), te suxerimos dirixir a los llectores a openstreetmap.org (espandiendo «OpenStreetMap» a esta dirección completa, seique), a opendatacommons.org y, si ye'l casu, a creativecommons.org." + credit_3_html: "Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa.\nPor exemplu:" credit_title_html: Cómo dar reconocimientu a OpenStreetMap 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 procedimientu de retirada de datos o pidilo direutamente nel nuesu formulariu en llinia. @@ -1148,14 +1151,15 @@ ast: header: "%{from_user} t'unvió un mensax per OpenStreetMap col asuntu %{subject}:" hi: Bones %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Confirma la to direición de corréu" + confirm: "Antes de facer nada, necesitamos confirmar qu'esta solicitú ye daveres tuya; si ye asina, calca nel enllaz de más abaxo pa confirmar la cuenta:" + created: Dalguién (seique tu) vien de crear una cuenta en %{site_url}. + greeting: ¡Hola! + subject: "[OpenStreetMap] Bienllegáu a OpenStreetMap" + welcome: Prestanos date la bienvenida y tamién dalguna información más p'ayudate nos primeros pasos. signup_confirm_html: ask_questions: Pues facer toles entrugues que pudieres tener tocante a OpenStreetMap nel sitiu d'entrugues y rempuestes. - click_the_link: Si yer tu, ¡bienllegáu/ada! Calca nel enllaz d'abaxo pa confirmar esa cuenta y sigui lleendo pa más información tocante a OpenStreetMap. current_user: Hai una llista d'usuarios por categoríes, basada nel llugar del mundu onde tan, que ta disponible enCategory:Users_by_geographical_region. get_reading: Hai llectura tocante a OpenStreetMap na wiki, sigui les caberes noticies nel blogue d'OpenStreetMap o per Twitter, o visita'l blogue OpenGeoData, del fundador d'OpenStreetMapSteve Coast, pa la hestoria resumida del proyeutu, ¡que tamién tien podcasts pa escuchar! - greeting: ¡Hola! - hopefully_you: Dalguién (esperamos que tu) quier crear una cuenta en introductory_video: Pues ver un %{introductory_video_link}. more_videos: Equí hai %{more_videos_link}. more_videos_here: más videos @@ -1165,18 +1169,12 @@ ast: signup_confirm_plain: ask_questions: "Pues facer toles entrugues que pudieres tener tocante a OpenStreetMap nel sitiu d'entrugues y rempuestes:" blog_and_twitter: "Sigui les caberes noticies nel blogue d'OpenStreetMap o per Twitter:" - click_the_link_1: Si yer tu, ¡bienllegáu/ada! Calca nel enllaz d'abaxo pa confirmar la to - click_the_link_2: cuenta y sigui lleendo pa más información tocante a OpenStreetMap. - current_user_1: Hai una llista d'usuarios por categoríes, basada nel llugar del mundu - current_user_2: "onde tan, ta disponible en:" - greeting: ¡Hola! - hopefully_you: Dalguién (esperamos que tu) quier crear una cuenta en + current_user: "La llista usuarios actuales, clasificaos en base al llugar del que son, ta disponible en:" introductory_video: "Pues ver un videu d'introducción a OpenStreetMap equí:" more_videos: "Equí hai más videos:" opengeodata: "OpenGeoData.org ye'l blogue de Steve Coast, fundador d'OpenStreetMap, que tamién tien podcasts:" the_wiki: "Hai llectura tocante a OpenStreetMap na wiki:" - user_wiki_1: S'encamienta que crees una páxina wiki d'usuariu, qu'incluya - user_wiki_2: etiquetes de categoría pa marcar ú tas, como [[Category:Users_in_London]]. + user_wiki_page: T'afalamos a crear una páxina wiki d'usuariu, con etiquetes de categoría qu'indiquen de ónde yes, como [[Category:Users_in_Llanes]. wiki_signup: "Tamién pue ser que t'interese rexistrate na wiki d'OpenStreetMap en:" oauth: oauthorize: @@ -1505,6 +1503,10 @@ ast: email never displayed publicly: (nunca s'amuesa en público) flash update success: La información del usuariu s'anovó correutamente. flash update success confirm needed: La información del usuariu s'anovó correutamente. Nel to corréu electrónicu alcontrarás una nota pa confirmar la to nueva direición de corréu. + gravatar: + gravatar: Usar Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: ¿qué ye esto? home location: "Llugar d'orixe:" image: "Imaxe:" image size hint: (les imaxes cuadraes de polo menos 100x100 funcionen meyor) @@ -1640,6 +1642,7 @@ ast: email address: "Direición de corréu electrónicu:" fill_form: Rellena'l formulariu y t'unviaremos un mensaxe de corréu rápidamente p'activar la to cuenta. flash create success message: Gracies por rexistrate. Venimos d'unvia un corréu de confirmación a %{email} y darréu que confirmes la to cuenta tarás preparáu pa mapear.

    Si uses un sistema escontra'l corréu puxarra qu'unvia solicitúes de confirmación, asegúrate d'amestar webmaster@openstreetmap.org na llista blanca de remitentes seguros, porque nós nun podemos responder solicitúes de confirmación. + flash welcome: Gracies por rexistrate. Acabamos d'unviate un mensaxe de bienvenida a %{email} con dellos gabitos pa los primeros pasos. heading: Crear una cuenta d'usuariu license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los términos de collaboración. no_auto_account_create: Por desgracia anguaño nun podemos crear una cuenta por ti automáticamente. diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 0cc816665..7bfc6f27a 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1101,11 +1101,8 @@ be-Tarask: subject: "[OpenStreetMap] Пацьвердзіце Ваш адрас электроннай пошты" signup_confirm_html: ask_questions: Вы можаце задаць любыя пытаньні пра OpenStreetMap на нашым сайце пытаньняў і адказаў. - click_the_link: Калі гэта Вы, вітаем! Калі ласка, націсьніце спасылку ніжэй, каб пацьвердзіць гэты рахунак і даведацца болей пра OpenStreetMap current_user: Сьпіс удзельнікаў паводле іх месцазнаходжаньня, даступны ў Category:Users_by_geographical_region. get_reading: Пачытайце пра OpenStreetMap на вікі, даведайцеся пра апошнія навіны праз блёг OpenStreetMap ці Twitter, ці даведайцеся пра гісторыю праекта ў блёгу OpenGeoData, аўтарам якога зьяўляецца Сціў Коўст, заснавальнік OpenStreetMap, у гэтым блёгу ёсьць падкасты, якія таксама можна праслухаць! - greeting: Прывітаньне! - hopefully_you: Нехта (спадзяемся, што Вы) жадае стварыць рахунак на introductory_video: Вы можаце прагледзець %{introductory_video_link}. more_videos: Маем %{more_videos_link}. more_videos_here: яшчэ відэа тут @@ -1115,18 +1112,10 @@ be-Tarask: signup_confirm_plain: ask_questions: "Вы можаце задаць любое пытаньне пра OpenStreetMap на нашым сайце пытаньняў і адказаў:" blog_and_twitter: "Даведацца пра апошнія навіны праз блёг OpenStreetMap ці Twitter:" - click_the_link_1: Калі гэта сапраўды Вы, вітаем! Калі ласка, націсьніце на спасылку ніжэй каб пацьвердзіць сябе - click_the_link_2: рахунак і прачытаць дадатковую інфармацыю пра OpenStreetMap. - current_user_1: Сьпіс цяперашніх карыстальнікаў у катэгорыях, заснаваны на іх месцазнаходжаньні - current_user_2: "яны даступныя на:" - greeting: Прывітаньне! - hopefully_you: Нехта (спадзяемся, што Вы) жадае стварыць рахунак на introductory_video: "Вы можаце праглядзець відэа-уводзіны ў OpenStreetMap тут:" more_videos: "Тут яшчэ відэа:" opengeodata: "OpenGeoData.org — блёг заснавальніка OpenStreetMap Стыва Коуста, і тут ёсьць падкасты:" the_wiki: "Прачытаць пра OpenStreetMap на вікі:" - user_wiki_1: Рэкамэндуецца стварыць вікі-старонку ўдзельніка, якая будзе ўтрымліваць - user_wiki_2: тэгі катэгорыяў, якія апісваюць Вашае месцазнаходжаньне, напрыклад [[Category:Users_in_London]]. wiki_signup: "Вы таксама можаце зарэгістравацца на OpenStreetMap вікі на:" oauth: oauthorize: diff --git a/config/locales/br.yml b/config/locales/br.yml index e7322e16d..e3209730d 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -985,7 +985,6 @@ br: partners_ucl: ↓Kreizenn VR an UCL sign_up: En em enskrivañ sign_up_tooltip: Krouiñ ur gont evit aozañ - sotm2012: Kemerit perzh e kendalc'h OpenStreetMap 2012, Stad ar gartenn, d'ar 13 ha d'ar 14 a viz Here e Portland, Oregon ! tag_line: Kartenn digoust eus ar bed Wiki user_diaries: Deizlevrioù an implijer user_diaries_tooltip: Gwelet deizlevrioù an implijerien @@ -1001,6 +1000,9 @@ br: text: Ma vez digendalc'h etre ar bajenn troet-mañ hag %{english_original_link} e teuio ar bajenn saoznek da gentañ title: Diwar-benn an droidigezh-mañ legal_babble: + attribution_example: + alt: Skouer eus penaos deverkañ OpenStreetMap war ur bajenn web + title: Skouer deverkadur contributors_at_html: "Aostria : Ennañ roadennoù eus\nStadt Wien (dindan\nCC BY. \t\nCC BY), \nLand Vorarlberg ha\nLand Tirol (dindan CC-BY AT gant enkemmadoù)." contributors_ca_html: "Kanada : Ennañ roadennoù eus\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), ha StatCan (Geography Division,\n Statistics Canada)." contributors_footer_1_html: "↓Evit muioc'h a vunudoù diwar-benn ar re-se, hag ar mammennoù all a zo bet implijet da sikour da wellaat OpenStreetMap, sellit ouzh ar Bajenn Skoazellerien e Wiki OpenStreetMap." @@ -1014,6 +1016,7 @@ br: contributors_za_html: "Afrika ar Su : Ennañ roadennoù eus\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." credit_1_html: Goulenn a reomp diganeoc'h lakaat en ho kred ar meneg “© kenlabourerien OpenStreetMap”. credit_2_html: "Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du http://www.openstreetmap.org/\n ha CC BY-SA war-du http://creativecommons.org/licenses/by-sa/2.0/.\n Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :\n un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da\n www.openstreetmap.org (marteze en ur astenn\n ‘OpenStreetMap’ ar chomlec'h klok) ha da\n www.creativecommons.org." + credit_3_html: "Evit ur gartenn elektronek a c'haller merdeiñ enni e tlefe ar c'hred dont war wel e korn ar gartenn.\nDa skouer :" credit_title_html: Penaos reiñ kred da OpenStreetMap 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 argerzh dizober, mar plij, pe skrivit war-eeun war hor furmskrid enlinenn. @@ -1153,14 +1156,15 @@ br: header: "%{from_user} en deus kaset deoc'h ur gemennadenn dre OpenStreetMap gant an danvez %{subject} :" hi: Demat %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Kadarnaat ho chomlec'h postel" + confirm: "A-raok ober forzh petra hon eus ezhomm da wiriañ hag-eñ ez eo ganeoc'h-c'hwi ez eo bet kaset ar goulenn-mañ ; m'emañ kont evel-se, klikit war al liamm a-is da gadarnaat ho kont :" + created: Unan bennak (c'hwi, emichañs) a zo o paouez krouiñ ur gont war %{site_url}. + greeting: Demat ! + subject: "[OpenStreetMap] Degemer mat en OpenStreetMap" + welcome: Fellout a ra dimp degemer ac'hanoc'h ha reiñ un nebeud titouroù ouzhpenn deoc'h evit kregiñ ganti. signup_confirm_html: ask_questions: Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war hol lec'hienn goulennoù-respontoù. - click_the_link: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat krouidigezh ho kont ha gouzout hiroc'h diwar-benn OpenStreetMap current_user: Ur roll eus an implijerien red dre rummadoù, diazezet war al lec'h m'emaint er bed, a c'haller kaout diwar Category:Users_by_geographical_region. get_reading: Muioc'h a ditouroù diwar-benn OpenStreetMap war ar wiki pe war ar blog opengeodata a ginnig ivez podskignadennoù da selaou ! - greeting: Demat ! - hopefully_you: Unan bennak (c'hwi, moarvat) a garfe krouiñ ur gont war introductory_video: Gallout a rit sellet ouzh un %{introductory_video_link}. more_videos: Bez' ez eus %{more_videos_link}. more_videos_here: muioc'h a videoioù amañ @@ -1170,18 +1174,12 @@ br: signup_confirm_plain: ask_questions: "Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war hol lec'hienn goulennoù-respontoù :" blog_and_twitter: "Tapout ar c'heleier diwezhañ diwar blog OpenStreetMap pe Twitter :" - click_the_link_1: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat ho - click_the_link_2: kont ha lenn muioc'h a ditouroù diwar-benn OpenStreetMap. - current_user_1: Ur roll eus an implijerien diazezet war al lec'h m'emaint er bed - current_user_2: "a c'haller kaout diwar :" - greeting: Demat ! - hopefully_you: Unan bennak (c'hwi moarvat) a garfe krouiñ ur gont war + current_user: "Ur roll eus an implijerien e rummadoù, diazezet war al lec'h m'emaint er bed, a c'haller kaout diwar :" introductory_video: "Gallout a rit sellet ouzh ur video evit kregiñ gant OpenStreetMap amañ :" more_videos: "Muioc'h a videoioù zo amañ :" opengeodata: "OpenGeoData.org eo blog OpenStreetMap, ha kinnig a ra podskignadennoù ivez :" the_wiki: "Lennit traoù diwar-benn OpenStreetMap war ar wiki :" - user_wiki_1: Erbediñ a reomp deoc'h krouiñ ur bajenn implijer wiki, enni - user_wiki_2: rummadoù hag a verk pelec'h emaoc'h, evel [[Category:Users_in_Brest]]. + user_wiki_page: Erbediñ a reomp deoc'h krouiñ ur bajenn implijer war ar wiki, enni balizennoù rummadoù o tiskouez pelec'h emaoc'h, evel [[Category:Users_in_London]]. wiki_signup: "Gallout a rit ivez krouiñ ur gont war wiki OpenStreetMap war :" oauth: oauthorize: @@ -1510,6 +1508,10 @@ br: email never displayed publicly: (n'eo ket diskwelet d'an holl morse) flash update success: Hizivaet eo bet titouroù an implijer. flash update success confirm needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù evit kadarnaat ho chomlec'h postel nevez. + gravatar: + gravatar: Implijout Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: petra eo se ? home location: "Lec'hiadur ar gêr :" image: "Skeudenn :" image size hint: (ar skeudennoù karrezenneg gant ar stumm 100×100 pixel a zo ar re wellañ) @@ -1645,6 +1647,7 @@ br: email address: "Chomlec'h postel :" fill_form: Leugnit ar furmskrid hag e kasimp deoc'h ur postel evit gweredekaat ho kont. flash create success message: Trugarez deoc'h evit en em enskrivañ ! Kaset hon eus ur postel kadarnaat da %{email}. Kerkent ha kadarnaet ho kont e c'hallot kregiñ da gartennañ.

    Ma implijit ur reizhiad enep-strob hag a gas goulennoù kadarnaat, lakait webmaster@openstreetmap.org en ho listenn wenn, mar plij, rak n'omp ket evit respont d'ar posteloù-se. + flash welcome: Trugarez da vezañ lakaet hoc'h anv. Kas a raimp ur c'hemennad degemer mat dre %{email} gant un nebeud korvigelloù evit loc'hañ. heading: Krouiñ ur gont implijer license_agreement: Pa gadarnaot ho kont e tleot asantiñ da ziferadennoù ar c'henlabourer. no_auto_account_create: Siwazh n'omp ket evit krouiñ ur gont evidoc'h ent emgefreek. diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 16306fa41..6d5460fa4 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1,17 +1,1083 @@ -# Messages for Bosnian (Bosanski) +# Messages for Bosnian (bosanski) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Alenmahovic # Author: CERminator +# Author: DzWiki bs: activerecord: attributes: + diary_comment: + body: Tijelo diary_entry: + language: Jezik + latitude: Geografska Å¡irina (Latitude) + longitude: Geografska dužina (Longitude) title: Naslov user: Korisnik + friend: + friend: Prijatelj + user: Korisnik + message: + body: Tijelo + recipient: Primalac + sender: PoÅ¡iljalac + title: Naslov + trace: + description: Opis + latitude: Geografska Å¡irina (Latitude) + longitude: Geografska dužina (Longitude) + name: Ime + public: Javno + size: Veličina + user: Korisnik + visible: Vidljivo + user: + active: Aktivan + description: Opis + display_name: Ime za prikaz + email: E-mail + languages: Jezici + pass_crypt: Lozinka models: + acl: Kontrole pristupa + changeset: Set promjena + changeset_tag: Oznaka seta promjena country: Država + diary_comment: Komentar dnevnika + diary_entry: Unos dnevnika + friend: Prijatelj language: Jezik message: Poruka - relation: Veza - relation_member: Član veze + node: Čvor + node_tag: Oznaka čvora + notifier: Izvjestilac + old_node: Stari čvor + old_node_tag: Oznaka starog čvora + old_relation: Stara relacija + old_relation_member: Stari član relacije + old_relation_tag: Oznaka stare relacije + old_way: Stara putanja + old_way_node: Čvor stare putanje + old_way_tag: Oznaka stare putanje + relation: Relacija + relation_member: Član relacije + relation_tag: Oznaka relacije + session: Sesija + trace: Trasa + tracepoint: Tačka trase + tracetag: Oznaka trase + user: Korisnik + user_preference: Korisničke postavke + user_token: Korisnička značka + way: Putanja + way_node: Čvor putanje + way_tag: Oznaka putanje + browse: + changeset: + changeset: "Set promjena: %{id}" + changesetxml: XML seta promjena + feed: + title: Set promjena %{id} + title_comment: Set promjena %{id} - %{comment} + osmchangexml: osmChange XML + title: Set promjena + changeset_details: + belongs_to: "Pripada:" + bounding_box: "Okvir obuhvata:" + box: okvir + closed_at: "Zatvoreno:" + created_at: "Napravljeno:" + has_nodes: + few: Sadrži sljedeće %{count} čvorove + one: "Sadrži sljedeći %{count} čvor:" + other: "Sadrži sljedećih %{count} ćvorova:" + has_relations: + few: "Sadrži sljedeće %{count} relacije:" + one: "Sadrži sljedeću %{count} relaciju:" + other: "Sadrži slijedećih %{count} relacija:" + has_ways: + few: "Sadrži sljedeće %{count} putanje:" + many: "Sadrži sljedećih %{count} putanja:" + one: "Sadrži sljedeću %{count} putanju:" + other: "Sadrži slijedećih %{count} putanja:" + no_bounding_box: Okvir obuhvata nije pohranjen za ovaj set promjena. + show_area_box: Prikaži okvir područja + common_details: + changeset_comment: "Komentar:" + deleted_at: "Izbrisano:" + deleted_by: "Izbrisano od strane:" + edited_at: "Uređeno:" + edited_by: "Uređeno od strane:" + in_changeset: "U setu promjena:" + version: "Verzija:" + containing_relation: + entry: Relacija %{relation_name} + entry_role: Relacija %{relation_name} (kao %{relation_role}) + map: + deleted: Izbrisano + edit: + area: Urediti područje + node: Urediti čvor + relation: Urediti relaciju + way: Urediti putanju + larger: + area: Pogledati područje na većoj karti + node: Pogledati čvor na većoj karti + relation: Pogledati relaciju na većoj karti + way: Pogledati putanju na većoj karti + loading: Učitavanje... + navigation: + all: + next_changeset_tooltip: Sljedeći set promjena + next_node_tooltip: Sljedeći čvor + next_relation_tooltip: Sljedeća relacija + next_way_tooltip: Sljedeća putanja + prev_changeset_tooltip: Prethodni set promjena + prev_node_tooltip: Prethodni čvor + prev_relation_tooltip: Prethodna relacija + prev_way_tooltip: Prethodna putanja + user: + name_changeset_tooltip: "Pogledati promjene korisnika: %{user}" + next_changeset_tooltip: Sljedeća promjena od strane %{user} + prev_changeset_tooltip: Prethodno uređeno od strane %{user} + node: + download_xml: Preuzmi XML + edit: Urediti čvor + node: Čvor + node_title: "Čvor: %{node_name}" + view_history: Pregled historije + node_details: + coordinates: "Koordinate:" + part_of: "Dio od:" + node_history: + download_xml: Preuzmi XML + node_history: Historija čvora + node_history_title: "Historija čvora: %{node_name}" + view_details: Vidjeti detalje + not_found: + sorry: Žao nam je, ali %{type} sa ID %{id}, se ne može naći. + type: + changeset: Set promjena + node: čvor + relation: relacija + way: putanja + paging_nav: + of: od + showing_page: Prikazana stranica + redacted: + message_html: Verzija %{version} ovoga %{type} ne može biti prikazana s obzirom da je u procesu redakcije. Molimo pogledajte %{redaction_link} za detalje. + redaction: Redakcija %{id} + type: + node: čvor + relation: relacija + way: putanja + relation: + download_xml: Preuzeti XML + relation: Relacija + relation_title: "Relacija: %{relation_name}" + view_history: Pregled historije + relation_details: + members: "Članovi:" + part_of: "Dio od:" + relation_history: + download_xml: Preuzeti XML + relation_history: Historija relacije + relation_history_title: "Historija relacije: %{relation_name}" + view_details: Vidjeti detalje + relation_member: + entry_role: "%{type} %{name} kao %{role}" + type: + node: Čvor + relation: Relacija + way: Putanja + start: + manually_select: Ručno izabrati drukčije područje + view_data: Prikazati podatke za trenutni prikaz karte + start_rjs: + data_frame_title: Podaci + data_layer_name: Pretražiti podatke na karti + details: Detalji + drag_a_box: Povući okvir na karti za odabir područja + edited_by_user_at_timestamp: Uređeno od strane %{user} u %{timestamp} + hide_areas: Sakriti područja + history_for_feature: Historija za %{feature} + load_data: Učitati podatke + loaded_an_area_with_num_features: "Učitali ste područje koje sadrži %{num_features} značajki. Općenito, neki se web preglednici ne mogu nositi sa prikazom tolike količine podataka. Inače, preglednici najbolje rade kada prikazuju manje od %{max_features} značajki istovremeno: ukoliko radite joÅ¡ neÅ¡to, to može usporiti preglednik ili ga zalediti. Ako ste sigurni da želite prikazati ove podtake, možete to učiniti klikom na dugme ispod." + loading: Učitavanje... + manually_select: Ručno izabrati drukčije područje + object_list: + api: Preuzeti ovo područje iz API + back: Prikazati spisak objekata + details: Detalji + heading: Spisak objekata + history: + type: + node: Čvor %{id} + way: Putanja %{id} + selected: + type: + node: Čvor %{id} + way: Putanja %{id} + type: + node: Čvor + way: Putanja + private_user: privatni korisnik + 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})" + wait: Pričekajte... + zoom_or_select: Uvećati ili izabrati područje karte za pregled + tag_details: + tags: "Oznake:" + wiki_link: + key: Wiki stranica opisa za oznaku %{key} (tag) + tag: Wiki stranica opisa za oznaku %{key}=%{value} (tag) + wikipedia_link: Članak o %{page} na Wikipediji + timeout: + sorry: Žao mi je, podacima za %{type} sa id %{id}, je trebalo previÅ¡e da se preuzmu. + type: + changeset: Set promjena + node: čvor + relation: relacija + way: putanja + way: + download_xml: Preuzeti XML + edit: Urediti putanju + view_history: Pregled historije + way: Putanja + way_title: "Putanja: %{way_name}" + way_details: + also_part_of: + one: takođe dio putanje %{related_ways} + other: takođe dio putanja %{related_ways} + nodes: "Čvorovi:" + part_of: "Dio od:" + way_history: + download_xml: Preuzeti XML + view_details: Prikazati detalje + way_history: Historija putanje + way_history_title: "Povijest putanje: %{way_name}" + changeset: + changeset: + anonymous: Anonimno + big_area: (veliko) + no_comment: (niÅ¡ta) + no_edits: (nema uređivanja) + show_area_box: Prikazati okvir područja + still_editing: (joÅ¡ uređuje) + view_changeset_details: Pregled detalja o setu promjena + changeset_paging_nav: + next: Sljedeća » + previous: « Prethodna + showing_page: Prikaz stranice %{page} + changesets: + area: Područje + comment: Komentar + id: ID + saved_at: Spremljeno user: Korisnik + list: + description: Nedavne izmjene + description_bbox: Setovi promjena unutar %{bbox} + description_friend: Setovi promjena vaÅ¡ih prijatelja + description_nearby: Setovi promjena obližnjih korisnika + description_user: Setovi promjena od %{user} + description_user_bbox: Setovi promjena od %{user} unutar %{bbox} + empty_anon_html: JoÅ¡ uvijek nije bilo uređivanja + empty_user_html: Izgleda da niste joÅ¡ uvijek niÅ¡ta uredili. Da bi ste započeli, otiđite na Vodič za početnike. + heading: Setovi promjena + heading_bbox: Setovi promjena + heading_friend: Setovi promjena + heading_nearby: Setovi promjena + heading_user: Setovi promjena + heading_user_bbox: Setovi promjena + title: Setovi promjena + title_bbox: Setovi promjena unutar %{bbox} + title_friend: Setovi promjena vaÅ¡ih prijatelja + title_nearby: Setovi promjena obližnjih korisnika + title_user: Setovi promjena od %{user} + title_user_bbox: Setovi promjena od %{user} unutar %{bbox} + timeout: + sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za preuzimanje. + diary_entry: + comments: + ago: "%{ago} prije" + comment: Komentar + has_commented_on: "%{display_name} je komentirao/la sljedeće unose u dnevnik" + newer_comments: Noviji komentari + older_comments: Stariji komentari + post: Post + when: Kada + diary_comment: + comment_from: Komentar od %{link_user} u %{comment_created_at} + confirm: Potvrditi + hide_link: Sakriti ovaj komentar + diary_entry: + comment_count: + one: 1 komentar + other: "%{count} komentara" + comment_link: Komentirati ovaj zapis + confirm: Potvrditi + edit_link: Urediti ovaj unos + hide_link: Sakriti ovaj unos + posted_by: "Postavljeno od %{link_user} u %{created} na jeziku: %{language_link}" + reply_link: Odgovoriti na ovaj zapis + edit: + body: "Tijelo:" + language: "Jezik:" + latitude: Geografska Å¡irina (Latitude) + location: "Lokacija:" + longitude: Geografska dužina (Longitude) + marker_text: Lokacija unosa u dnevnik + save_button: Spremiti + subject: "Predmet:" + title: Urediti unos u dnevniku + use_map_link: korisititi kartu + feed: + all: + description: Nedavni unosi u dnevnik OpenStreetMap korisnika + title: Unosi u OpenStreetMap dnevniku + language: + description: "Nedavni unosi u dnevnik OpenStreetMap korisnika na jeziku: %{language_name}" + title: "Unosi u OpenStreetMap dnevnik na jeziku: %{language_name}" + user: + description: Nedavni unosi u OpenStreetMap dnevnik od %{user} + title: Unosi u OpenStreetMap dnevnik za korisnika %{user} + list: + in_language_title: "Unosi u dnevnik na jeziku: %{language}" + new: Novi unos u dnevnik + new_title: Napravite novi unos u vaÅ¡ dnevnik + newer_entries: Noviji unosi + no_entries: Nema unosa u dnevniku + older_entries: Stariji unosi + recent_entries: "Nedavni unosi u dnevnik:" + title: Dnevnici korisnika + title_friends: Dnevnici prijatelja + title_nearby: Dnevnici obližnjih korisnika + user_title: Dnevnik od %{user} + location: + edit: Urediti + location: "Lokacija:" + view: Pogledati + new: + title: Novi unos u dnevnik + no_such_entry: + body: Žao mi je, ne postoji unos u dnevniku ili komentar sa id %{id}. Provjerite ispravnost upisa, ili poveznice na koju ste kliknuli. + heading: "Nema unosa sa id: %{id}" + title: Nema takvog unosa u dnevnik + view: + leave_a_comment: Ostaviti komentar + login: Prijava + login_to_leave_a_comment: "%{login_link} da bi ostavili komentar" + save_button: Spremiti + title: Dnevnik korisnika %{user} | %{title} + user_title: Dnenvnik korisnika %{user} + editor: + default: Zadano (currently %{name}) + potlatch: + description: Potlatch 1 (uređivač unutar web preglednika) + name: Potlatch 1 + potlatch2: + description: Potlatch 1 (uređivač unutar web preglednika) + name: Potlatch 2 + remote: + description: Udaljena kontrola (JOSM ili Merkaartor) + name: Udaljena kontrola + export: + start: + add_marker: Dodati marker na kartu + area_to_export: Područje za izvoz + embeddable_html: HTML kod sa mogućnošću za umetanje + export_button: Izvoz + export_details: OpenStreetMap podaci je licenciran pod Open Data Commons Open Database License dozvolom (ODbL). + format: Format + format_to_export: Format za izvoz + image_size: Veličina slike + latitude: "Lat:" + licence: Dozvola + longitude: "Lon:" + manually_select: Ručno izabrati drukčije područje + map_image: Slika karte (prikazuje standardni sloj) + max: najviÅ¡e + options: Opcije + osm_xml_data: OpenStreetMap XML podaci + output: Izlaz + paste_html: Zalijepiti HTML za umetanje na web stranicu + scale: Skala + too_large: + body: Ovo područje je preveliko da bi se izvezlo kao OpenStreetMap XML podaci. Molimo povećajte (zoom) ili odaberite manje područje. + heading: Područje je preveliko + zoom: Uvećanje + start_rjs: + add_marker: Dodati marker na kartu + change_marker: Promjeniti poziciju markera + click_add_marker: Kliknuti za dodavanje markera na kartu + drag_a_box: Povući okvir na karti za odabir područja + export: Izvoz + manually_select: Ručno izabrati drukčije područje + view_larger_map: Prikazati veću kartu + geocoder: + description: + title: + geonames: Lokacija sa GeoNames-a + osm_nominatim: Lokacija sa OpenStreetMap Nominatima + types: + cities: Gradovi + places: Mjesta + towns: Manji gradovi + direction: + east: istočno + north: sjeverno + north_east: sjeveroistočno + north_west: sjeverozapadno + south: južno + south_east: jugoistočno + south_west: jugozapadno + west: zapadno + distance: + one: oko 1km + other: oko %{count}km + zero: manje od 1km + results: + more_results: ViÅ¡e rezultata + no_results: Nema pronađenih rezultata + search: + title: + ca_postcode: Rezultati sa Geocoder.CA + geonames: Rezultati sa GeoNames + latlon: Rezultati sa Internal + osm_nominatim: Rezultati sa OpenStreetMap Nominatim + uk_postcode: Rezultati sa NPEMap / FreeThe Postcode + us_postcode: Rezultati sa Geocoder.us + search_osm_nominatim: + prefix: + aeroway: + aerodrome: Aerodrom + apron: Dio piste (područje za parking) + gate: Prilaz + helipad: SletiÅ¡te za helikopter + runway: Pista + taxiway: Rulna staza + terminal: Terminal + amenity: + WLAN: WiFi pristup + airport: Aerodrom + arts_centre: Centar umjetnosti + artwork: Umjetnine + atm: Bankomat + auditorium: Auditorij + bank: Banka + bar: Bar + bbq: Gril + bench: Klupa + bicycle_parking: Biciklistički parking + bicycle_rental: Iznajmljivanje bicikala + biergarten: Beer Garden (serviranje piva) + brothel: Bordel + bureau_de_change: Mjenjačnica + bus_station: Autobuska stanica + cafe: Caffe bar + car_rental: Rent-a-car + car_sharing: Carsharing + car_wash: Autopraonica + casino: Kazino + charging_station: Stanica za punjenje + cinema: Kino + clinic: Klinika + club: Klub + college: Koledž + community_centre: DruÅ¡tveni centar + courthouse: Sud + crematorium: Krematorij + dentist: Zubar + doctors: Doktor + dormitory: Studentski dom + drinking_water: Voda za piće + driving_school: AutoÅ¡kola + embassy: Ambasada + emergency_phone: S.O.S. Telefon + fast_food: Fast food + ferry_terminal: Trajektni terminal + fire_hydrant: Hidrant + fire_station: Vatrogasna stanica + food_court: DvoriÅ¡te restorana + fountain: Fontana + fuel: Benzinska pumpa + grave_yard: Groblje + gym: Fitness centar + hall: Dvorana + health_centre: Zdravstveni centar + hospital: Bolnica + hotel: Hotel + hunting_stand: Lovačka čeka + ice_cream: Sladoled + kindergarten: Dječiji vrtić + library: Biblioteka + market: Tržnica + marketplace: Tržnica + mountain_rescue: Gorska služba spaÅ¡avanja + nightclub: 'Noćni klub' + nursery: Čuvanje djece + nursing_home: Starački dom + office: Kancelarija + park: Park + parking: Parking + pharmacy: Apoteka + place_of_worship: Bogomolja + police: Policija + post_box: PoÅ¡tanski sandučić + post_office: PoÅ¡ta + preschool: PredÅ¡kolska ustanova + prison: Zatvor + pub: Pub + public_building: Ustanova + public_market: Javna tržnica + reception_area: Recepcija + recycling: Reciklažna stanica + restaurant: Restoran + retirement_home: Dom penzionera + sauna: Sauna + school: Å kola + shelter: SkloniÅ¡te + shop: Trgovina + shopping: Trgovački centar + shower: TuÅ¡ + social_centre: DruÅ¡tveni centar + social_club: DruÅ¡tveni klub + studio: Studio + supermarket: Supermarket + swimming_pool: Bazen + taxi: Taxi + telephone: Telefonska govornica + theatre: Teatar + toilets: WC + townhall: Gradska Vijećnica + university: Univerzitet + vending_machine: Automat + veterinary: Veterinar + village_hall: Seoski Dom + waste_basket: Kanta za otpatke + wifi: WiFi pristup + youth_centre: Centar za omladinu + boundary: + administrative: Administrativna granica + census: Popisna granica + national_park: Nacionalni park + protected_area: ZaÅ¡tićeno područje + bridge: + aqueduct: Akvadukt + suspension: Viseći most + swing: Obrtni most + viaduct: Vijadukt + "yes": Most + building: + "yes": Građevina + highway: + bridleway: Konjička staza + bus_guideway: Autobuska traka + bus_stop: Autobusko stajaliÅ¡te + byway: Prečica + construction: Autoput u izgradnji + cycleway: Biciklistička staza + emergency_access_point: S.O.S. tačka pristupa + footway: PjeÅ¡ačka staza + ford: Gaz + living_street: Ulica smirenog prometa + milestone: Miljokaz + minor: Drugorazredna cesta + motorway: Autocesta + motorway_junction: Čvor (autoputa) + motorway_link: Autoput (pristupna cesta) + path: Staza + pedestrian: PjeÅ¡ački put + platform: Platforma + primary: Državna cesta + primary_link: Državna cesta + raceway: TrkaliÅ¡te + residential: Ulica + rest_area: Područje za odmor + road: Cesta + secondary: Sekundarna cesta + secondary_link: Sekundarna cesta + service: Servisna cesta + services: Autoput - usluge + speed_camera: Kamera za kontrolu brzine + steps: Stepenice + stile: Prijelaz preko ograde + tertiary: Lokalna cesta + tertiary_link: Lokalna cesta + track: Makadam + trail: Staza + trunk: Brza cesta + trunk_link: Prilaz brzoj cesti + unclassified: Neklasificirana cesta + unsurfaced: Neasfaltirana cesta + historic: + archaeological_site: ArheoloÅ¡ko nalaziÅ¡te + battlefield: Bojno polje + boundary_stone: Granični kamen + building: Građevina + castle: Dvorac + church: Crkva + fort: Utvrđenje + house: Kuća + icon: Ikona + manor: Zamak + memorial: Memorijal + mine: Rudnik + monument: Spomenik + museum: Muzej + ruins: RuÅ¡evine + tower: Toranj + wayside_cross: KrajputaÅ¡ + wayside_shrine: Usputni hram + wreck: Olupina + landuse: + allotments: Vrtovi + basin: Bazen + brownfield: ZemljiÅ¡te za prenamjenu + cemetery: Groblje + commercial: Poslovno područje + conservation: ZaÅ¡tićeno područje + construction: GradiliÅ¡te + farm: Farma + farmland: Polje + farmyard: Farma + forest: Å uma + garages: Garaže + grass: Trava + greenfield: Greenfield zemljiÅ¡te + industrial: Industrijsko područje + landfill: Deponija + meadow: Livada + military: Vojno područje + mine: Rudnik + nature_reserve: Rezervat prirode + orchard: Voćnjak + park: Park + piste: Ski staza + quarry: Kamenolom + railway: Željeznica + recreation_ground: Rekreacijsko područje + reservoir: Rezervoar + reservoir_watershed: Razvodnica rezervoara + residential: Stambeno područje + retail: Trgovina + road: Područje ceste + village_green: Seoski travnjak + vineyard: Vinograd + wetland: Močvara + wood: Å uma + leisure: + beach_resort: OdmaraliÅ¡te - plaža + bird_hide: Posmatračnica ptica + common: Općinsko zemljiÅ¡te + fishing: Ribolovno područje + fitness_station: Fitnes centar + garden: Vrt + golf_course: Golf igraliÅ¡te + ice_rink: KlizaliÅ¡te + marina: Marina + miniature_golf: Minigolf + nature_reserve: Rezervat prirode + park: Park + pitch: Sportski teren + playground: IgraliÅ¡te + recreation_ground: Teren za rekreaciju + sauna: Sauna + slipway: Navoz + sports_centre: Sportski centar + stadium: Stadion + swimming_pool: Bazen + track: Staza za trčanje + water_park: Vodeni park + military: + airfield: Vojni aerodrom + barracks: Kasarna + bunker: Bunker + natural: + bay: Zaljev + beach: Plaža + cape: Rt + cave_entrance: Pećina (ulaz) + channel: Kanal + cliff: Litica + crater: Krater + dune: Dina + feature: Značajka + fell: Brdo + fjord: Fjord + forest: Å uma + geyser: Gejzir + glacier: Glečer + heath: Stepa + hill: Brdo + island: Ostrvo + land: Zemlja + marsh: Močvara + moor: Močvarno tlo + mud: Blato + peak: Vrh + point: Tačka + reef: Greben + ridge: Greben + river: Rijeka + rock: Stijena + scree: KrÅ¡ + scrub: Å ikara + shoal: Sprud + spring: Izvor + stone: Kamen + strait: Tjesnac + tree: Drvo + valley: Dolina + volcano: Vulkan + water: Voda + wetland: Močvara + wetlands: Močvare + wood: Å uma + office: + accountant: Računovođa + architect: Arhitekta + company: Kompanija + employment_agency: Agencija za zapoÅ¡ljavanje + estate_agent: Agent za nekretnine + government: Vladin ured + insurance: Ured za osiguranje + lawyer: Advokat + ngo: Ured NVO + telecommunication: Ured telekomunikacija + travel_agent: Putnička agencija + "yes": Kancelarija + place: + airport: Aerodrom + city: Grad + country: Država + county: Kanton + farm: Farma + hamlet: Zaselak + house: Kuća + houses: Kuće + island: Ostrvo + islet: Ostrvce + isolated_dwelling: Izolirano stanovanje + locality: Lokalitet + moor: Močvarno tlo + municipality: Općina + postcode: PoÅ¡tanski broj + region: Regija + sea: More + state: Pokrajina/ Entitet + subdivision: Podgrupa + suburb: Predgrađe/ Gradsko naselje + town: Grad + unincorporated_area: Slobodna zemlja + village: Selo + railway: + abandoned: NapuÅ¡tena pruga + construction: Pruga u izgradnji + disused: NapuÅ¡tena pruga + disused_station: Željeznička stanica (nije u upotrebi) + funicular: Uspinjača + halt: Željeznička stanica + historic_station: Historijska željeznička stanica + junction: Željeznički čvor + level_crossing: Pružni prelaz + light_rail: Lahka željeznica + miniature: Minijaturna željeznica + monorail: Jednotračna pruga + narrow_gauge: Uskotračna pruga + platform: Željeznička platforma + preserved: Sačuvana pruga + spur: Pruga + station: Željeznička stanica + subway: Stanica podzemne željeznice + subway_entrance: Ulaz u podzemnu željezničku stanicu + switch: Skretnica + tram: Tramvaj + tram_stop: Tramvajska stanica + yard: Ranžirni kolodvor + shop: + alcohol: Trgovina pićem + antiques: Antikviteti + art: Atelje + bakery: Pekara + beauty: Parfumerija + beverages: Trgovina pićem + bicycle: Trgovina biciklima + books: Knjižara + butcher: Mesnica + car: Autokuća + car_parts: Autodijelovi + car_repair: Autoservis + carpet: Trgovina tepisima + charity: Dobrotvorna trgovina + chemist: Apoteka + clothes: Butik + computer: Trgovina kompjutera + confectionery: Delikatesa + convenience: Prodavnica + copyshop: Kopirnica + cosmetics: Parfumerija + department_store: Robna kuća + discount: Diskont + doityourself: Uradi sam + dry_cleaning: Hemijska čistionica + electronics: Trgovina elektronikom + estate_agent: Agent za nekretnine + farm: Poljo-apoteka + fashion: Modna trgovina + fish: Ribarnica + florist: Cvjećara + food: Trgovina prehranom + funeral_directors: Pogrebno preduzeće + furniture: NamjeÅ¡taj + gallery: Galerija + garden_centre: Vrtni centar + general: Trgovina mjeÅ¡ovitom robom + gift: Poklon trgovina + greengrocer: Voćarnica + grocery: Trgovina prehranom + hairdresser: Frizer + hardware: Željezarija + hifi: Hi-Fi + insurance: Osiguranje + jewelry: Trgovina nakitom + kiosk: Kiosk + laundry: Praonica rublja + mall: Trgovački centar + market: Tržnica + mobile_phone: Trgovina mobitelima + motorcycle: Moto Shop + music: Trgovina muzikom + newsagent: Novinar + optician: Optičar + organic: Trgovina zdrave hrane + outdoor: Trgovina za slobodno vrijeme + pet: Trgovina za kućne ljubimce + photo: Fotograf + salon: Salon + shoes: Trgovina obućom + shopping_centre: Trgovački centar + sports: Trgovina sportskom opremom + stationery: Papirnica + supermarket: Supermarket + toys: Trgovina igračkama + travel_agency: Putnička agencija + video: Videoteka + wine: Vinoteka + tourism: + alpine_hut: Alpska kuća + artwork: Umjetnine + attraction: Atrakcija + bed_and_breakfast: 'Noćenje i doručak' + cabin: Koliba + camp_site: Kamp + caravan_site: Kamp-kućice (mjesto) + chalet: Planinska kuća + guest_house: Apartman + hostel: Hostel + hotel: Hotel + information: Informacije + lean_to: NadstreÅ¡nica + motel: Motel + museum: Muzej + picnic_site: Piknik-mjesto + theme_park: Tematski park + valley: Dolina + viewpoint: Vidikovac + zoo: ZooloÅ¡ki vrt + tunnel: + "yes": Tunel + waterway: + artificial: VjeÅ¡tački vodotok + boatyard: BrodogradiliÅ¡te + canal: Kanal + connector: Spoj vodnih puteva + dam: Brana + derelict_canal: Zanemaren kanal + ditch: Jarak + dock: Dok + drain: Odvod + lock: Ustava + lock_gate: Ustava (vrata) + mineral_spring: Mineralni izvor + mooring: SidriÅ¡te + rapids: Brzaci + river: Rijeka + riverbank: Riječna obala + stream: Potok + wadi: Suho korito rijeke + water_point: Tačka vodotoka + waterfall: Vodopad + weir: Brana + layouts: + community: Zajednica + community_blogs: Blogovi zajednice + community_blogs_title: Blogovi članova OpenStreetMap zajednice + copyright: Autorska prava i dozvola + documentation: Dokumentacija + documentation_title: Dokumentacija za projekt + donate: Podržite OpenStreetMap sa %{link} Hardware Upgrade Fond-om. + donate_link_text: doniranje + edit: Urediti + edit_with: Uredi sa %{editor} + export: Izvoz + export_tooltip: Izvoz podataka karte + foundation: Fondacija + foundation_title: OpenStreetMap Fondacija + gps_traces: GPS trase + gps_traces_tooltip: Upravljanje GPS trasama + help: Pomoć + help_centre: Centar za pomoć + help_title: Stranice pomoći za projekt + history: Historija + home: Početna + home_tooltip: Idite na početnu lokaciju + inbox_html: dolazne poruke %{count} + inbox_tooltip: + one: Imate 1 nepročitanu poruku + other: Imate %{count} nepročitane(ih) poruke(a) + zero: Nema nepročitanih poruka + intro_1: OpenStreetMap je besplatna, promjenjiva karta cijelog svijeta. Napravili su je ljudi kao Å¡to ste Vi. + intro_2_create_account: Napravite korisnički račun + intro_2_download: preuzimanje + intro_2_html: Podaci su besplatni za %{download} i %{use} pod svojom %{license}. %{create_account} da bi ste poboljÅ¡ali kartu. + intro_2_license: otvorena dozvola + intro_2_use: koriÅ¡tenje + log_in: Prijava + log_in_tooltip: Prijavite se sa postojećim korisničkim računom + logo: + alt_text: OpenStreetMap logotip + logout: Odjava + logout_tooltip: Odjava sa projekta {{SITENAME}} + make_a_donation: + text: Donirajte + title: Podržite Openstreetmap novčanom donacijom + osm_offline: OpenStreetMap baza podataka je trenutno nedostupna dok se ne zavrÅ¡e važni radovi na održavanju. + osm_read_only: OpenStreetMap baza podataka je trenutno samo u modu čitanja, dok se ne sprovedu važni radovi na održavanju baze podataka. + 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_ucl: UCL VR Centar + sign_up: Otvorite račun + sign_up_tooltip: Otvorite korisnički račun za uređivanje + tag_line: Slobodna wiki karta Svijeta + user_diaries: Dnevnici korisnika + user_diaries_tooltip: Prikazati dnevnike korisnika + view: Karta + view_tooltip: Pogledati kartu + welcome_user: DobrodoÅ¡li, %{user_link} + welcome_user_link_tooltip: VaÅ¡a korisnička stranica + wiki: Wiki + wiki_title: Wiki stranice projekta + license_page: + foreign: + english_link: Engleski original + text: U slučaju konflikta između ove prevedene stranice i %{english_original_link}, Engleska stranica ima prednost + title: O ovom prevodu + legal_babble: + attribution_example: + alt: Primjer kako se navodi zasluga projekta OpenStreetMap na web stranici + title: Primjer navođenja zasluge + contributors_at_html: "Austrija: Sadrži podatke sa Stadt Wien (under\nCC BY),\nLand Vorarlberg i\nLand Tirol (under CC-BY AT sa amandmanima)." + contributors_ca_html: "Kanada: Sadrži podatke iz GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), i StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: "Za dalje detalje o ovome, i drugim izvorima koji su koriÅ¡teni da bi poboljÅ¡ali OpenStreetMap, molimo pogledajte Stranica doprinosilaca na Wiki OpenStreetMap." + contributors_footer_2_html: " UvrÅ¡tenje podataka u OpenStreetMap ne podrazumjeva da se izvorni davatelj podataka podržava OpenStreetMap, pruža bilo kakvu garanciju, ili prihvata bilo kakve obaveze." + contributors_fr_html: "Francuska: Sadrži podatke sa Direction Générale des Impôts." + contributors_gb_html: "Velika Britanija: Sadrži podatke Ordnance\n Survey data © Crown copyright and database right\n 2010." + contributors_intro_html: "NaÅ¡i doprinosioci su hiljade osoba. Mi takođe uključujemo podatke sa otvorenom dozvolom iz nacionalnih kartografskih agencija i drugih izvora, među njima:" + contributors_nl_html: "Holandija: Sadrži © AND data, 2007\n(www.and.com)" + contributors_nz_html: "Novi Zeland: Sadrži podatke izvorno iz\n Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: NaÅ¡i korisnici - doprinosioci + contributors_za_html: "Južna Afrika: Sadrži podatke sa Chief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: "Tražimo da koristite navedete zasluge “© OpenStreetMap\ncontributors”." + credit_2_html: Gdje je moguće, OpenStreetMap treba biti kao hyperlink na http://www.openstreetmap.org/and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. Ako koristite medij gdje linkovi nisu mogući (npr. tiskane karte), predlažemo da uputite vaÅ¡e čitatelje na www.openstreetmap.org (proÅ¡irenjem na ‘OpenStreetMap’ za ovo punu adresu) i na www.creativecommons.org. + credit_3_html: "Za pretraživu elektronsku kartu, navođenje zasluge se treba pojaviti u uglu karte. Naprimjer:" + credit_title_html: Kako navesti zasluge OpenStreetMap projekta kao izvora + infringement_1_html: OSM doprinosioci se podsjećaju da nikada ne dodaju podatke sa bilo kojeg izvora koji zadržava autorska prava (npr. Google Maps ili printane karte) bez eksplicitne dozvole od strane autora. + infringement_2_html: Ukoliko vjerujete da je zaÅ¡tićeni materijal bio dodan bazi podataka OpenStreetMap ili ovom web sajtu, molimo da pogledate naÅ¡u proceduru skidanja ili uložite prigovor direktno na naÅ¡u online stranicu. + infringement_title_html: KrÅ¡enje autorskih prava + intro_1_html: " OpenStreetMap su otvoreni podaci, licencirani pod Open Data\nCommons Open Database License dozvolom (ODbL)." + intro_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati naÅ¡e podatke, sve dok navodite OpenStreetMap i njegove doprinositelje kao izvor. Ukoliko izmijenite ili nadogradite naÅ¡e podatke, možete distribuirati rezultate samo pod istom licencom. Puni pravni tekst objaÅ¡njava vaÅ¡a prava i odgovornosti. + intro_3_html: "Kartografija u naÅ¡im dijelovima karte, i naÅ¡a dokumentacija, su licencirani pod Creative\nCommons Attribution-ShareAlike 2.0 licencom (CC-BY-SA)." + more_1_html: Čitajte viÅ¡e o koriÅ¡tenju naÅ¡ih podataka na Legal FAQ. + more_2_html: "Iako su OpenStreetMap podaci otvoreni, mi ne možemo ponuditi besplatni API karte za druge developere (third party).\nVidjeti naÅ¡e Politika koriÅ¡tenja API,\nPolitika koriÅ¡tenja dijelova karte\ni Politika koriÅ¡tenja usluge Nominatim." + more_title_html: ViÅ¡e o + title_html: Autorska prava i dozvola + native: + mapping_link: počnite sa ucrtavanjem + native_link: BOSANSKI verzija + text: Vi gledate englesku verziju stranice o autorskim pravima. Možete se vratiti na %{native_link} ove stranice ili možete prestati čitati o autorskim pravima i %{mapping_link}. + title: O ovoj stranici + notifier: + diary_comment_notification: + footer: Možete pročitati komentare na %{readurl} i komentirati na %{commenturl} ili odgovoriti na %{replyurl} + header: "%{from_user} je komentirao tvoj nedavni OpenStreetMap unos u dnevnik sa predmetom %{subject}:" + hi: Zdravo %{to_user}, + subject: "[OpenStreetMap] %{user} je komentirao tvoj unos u dnevnik" + email_confirm: + subject: "[OpenStreetMap] Potvrdite VaÅ¡u e-mail adresu" + email_confirm_html: + greeting: Zdravo, + hopefully_you: Netko (nadamo se Vi) bi želio promjeniti svoju e-mail adresu sa %{server_url} na %{new_address}. + email_confirm_plain: + click_the_link: Ako ste ovo Vi, molimo klinknite na poveznicu ispod da potvrdite promjene. + greeting: Zdravo, + hopefully_you_1: Neko (nadamo se Vi) želio bi promjeniti svoju e-mail adresu + hopefully_you_2: "%{server_url} na %{new_address}." + friend_notification: + befriend_them: Takođe, možete ih dodati kao prijatelja na %{befriendurl}. + had_added_you: "%{user} Vas je dodao kao prijatelja na OpenStreetMap-u." + see_their_profile: Možete vidjeti njihov profil na %{userurl}. + subject: "[OpenStreetMap] %{user} Vas je dodao kao prijatelja" + gpx_notification: + and_no_tags: i bez oznaka + and_the_tags: "i sa sljedećim oznakama:" + failure: + failed_to_import: "Import nije uspio. Evo greÅ¡ke:" + more_info_1: ViÅ¡e o neuspjelom GPX importu i kako isto izbjeći + more_info_2: "može se naći na:" + subject: "[OpenStreetMap] GPX Import nije uspio" + greeting: Zdravo, + success: + loaded_successfully: "uspjeÅ¡no učitano sa %{trace_points} od mogućih\n%{possible_points} tačaka." + subject: "[OpenStreetMap] GPX Import uspjeÅ¡an" + with_description: sa opisom + your_gpx_file: Liči na vaÅ¡u GPX datoteku + message_notification: + footer1: Možete takođe pročitati poruku na %{readurl} + footer2: i možete odgovoriti na %{replyurl} + header: "%{from_user} Vam je poslao poruku preko OpenStreetMap sa predmetom %{subject}:" + hi: Zdravo %{to_user}, + signup_confirm: + confirm: "Prije nego uradimo bilo Å¡ta drugo, moramo potvrditi da je ovaj zahtjev doÅ¡ao od Vas, ako je to istina, molimo Vas da kliknete poveznicu ispod da potvrdite VaÅ¡ račun:" + created: Neko (nadamo se Vi) upravo je kreirao račun na %{site_url}. + greeting: Zdravo! + subject: "[OpenStreetMap] DobrodoÅ¡li na OpenStreetMap" + welcome: Želimo Vam dobrodoÅ¡licu i takođe želimo Vam dati neke dodatne informacije kako bi ste počeli. + signup_confirm_html: + ask_questions: Možete postaviti bilo kakva pitanja koja imate o projektu OpenStreetMap na naÅ¡im stranicama pitanja i odgovora. + current_user: Lista trenutnih korisnika u kategorijama, bazirano gdje su u svijetu, je dostupna sa Kategorija:Korisnici_po_geografskom_području. + get_reading: Čitajte o OpenStreetMap-u na wiki-ju, budite u toku sa zadnjim novostima preko OpenStreetMap bloga ili Twittera, ili pregledajte OpenGeoData blog osnivača OpenStreetMap-a, Stevea Coasta za historiju projekta, gdje imate i podcaste za sluÅ¡anje! + introductory_video: Možete pogledati %{introductory_video_link}. + more_videos: Postoji %{more_videos_link}. + more_videos_here: viÅ¡e video zapisa ovdje + user_wiki_page: Preporučeno je da napravite korisničku wiki stranicu, koja uključuje kategoriju oznake, koje označavaju gdje ste, kao npr.[[Category:Users_in_Sarajevo]]. + video_to_openstreetmap: uvodni video za OpenStreetMap + wiki_signup: Možda želite otvoriti račun na OpenStreetMap wiki. + signup_confirm_plain: + ask_questions: "Možete postaviti bilo kakva pitanja koja imate o projektu OpenStreetMap na naÅ¡im stranicama pitanja i odgovora:" + blog_and_twitter: "Budite u toku s najnovijim vijestima preko OpenstreetMap bloga ili Twittera:" + current_user: "Lista trenutnih korisnika u kategorijama, bazirana na tome gdje se nalaze u svijetu, je dostupna sa:" + introductory_video: "Možete pogledati uvodni video za OpenStreetMap ovdje:" + more_videos: "Ovdje ima viÅ¡e video zapisa:" + opengeodata: "OpenGeoData.org je blog osnivača OpenStreetMap-a, Steva Coasta, i takođe ima podcaste:" + the_wiki: "Čitajte o OpenStreetMap-u na wiki-ju:" + user_wiki_page: Preporučeno je da napravite wiki korisničku stranicu, koja uključuje oznake kategorije gdje se nalazite, kao Å¡to je [[Category:Users_in_Sarajevo]]. + wiki_signup: "Možda želite takođe otvoriti račun i na OpenStreetMap wiki na:" + time: + formats: + friendly: "%e %B %Y u %H:%M" diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 61b4d23ed..77d7f0941 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -89,8 +89,10 @@ ca: application: require_cookies: cookies_needed: Sembla que teniu les galetes inhabilitades - habiliteu les galetes al navegador abans de continuar. + require_moderator: + not_a_moderator: Heu de ser un moderador per dur a terme aquesta acció setup_user_auth: - blocked: S'ha blocat l'accés a l'API. Si us plau, log-in a la interfície de web per obtenir més informació. + blocked: El vostre accés a l'API ha estat blocat. Si us plau, connecteu-vos a la interfície web per obtenir més informació. need_to_see_terms: L'accés a l'API és temporalment suspeses. Si us plau, log-in a la interfície de web per veure els termes de col. laborador. Vostè no necessita estar d'acord, però cal veure-les. browse: changeset: @@ -158,10 +160,10 @@ ca: prev_changeset_tooltip: Edició anterior de %{user} node: download_xml: Baixa l'XML - edit: modificació + edit: Modifica el node node: Node node_title: "Node: %{node_name}" - view_history: visualitza l'historial + view_history: Mostra l'historial node_details: coordinates: "Coordenades:" part_of: "Part de:" @@ -169,7 +171,7 @@ ca: download_xml: Baixa l'XML node_history: Historial del node node_history_title: "Historial del node: %{node_name}" - view_details: visualitza els detalls + view_details: Mostra els detalls not_found: sorry: Ho sentim, no s'ha trobat el %{type} amb l'id %{id}. type: @@ -181,12 +183,17 @@ ca: of: de showing_page: S'està mostrant pàgina redacted: + message_html: La versió %{version} d'aquest %{type} no pot ser mostrada com ha estat redactada. Si us plau, vegeu %{redaction_link} per més detalls. redaction: Redacció %{id} + type: + node: node + relation: relació + way: via relation: download_xml: Baixa l'XML relation: Relació relation_title: "Relació: %{relation_name}" - view_history: visualitza l'historial + view_history: Mostra l'historial relation_details: members: "Membres:" part_of: "Part de:" @@ -206,14 +213,14 @@ ca: view_data: Visualitza la informació per a la vista del mapa actual start_rjs: data_frame_title: Informació - data_layer_name: Informació + data_layer_name: Explora les dades del mapa details: Detalls drag_a_box: Marqueu un rectangle al mapa per a seleccionar una àrea edited_by_user_at_timestamp: Editat per %{user} el %{timestamp} hide_areas: Oculta les zones history_for_feature: Historial per a %{feature} load_data: Carrega dades - loaded_an_area_with_num_features: "Heu carregat una àrea que conté %{num_features} característiques. En general, alguns navegadors no poden fer front a mostrar aquesta quantitat de dades. En general, els navegadors funcionen millor mostrant menys de 100 característiques a la vegada: fer una altre cosa pot fer que el seu navegador esdevingui lent o que no respongui. Si esteu segurs que voleu visualitzar aquestes dades, pot fer-ho fent clic al botó de sota." + loaded_an_area_with_num_features: "Heu carregat una àrea que conté %{num_features} elements. En general, els navegadors no poden mostrar una quantitat tant gran de dades, funcionen millor mostrant menys de 100 elements a la vegada: el fet de voler que es mostri una quantitat més gran pot fer que el vostre navegador esdevingui lent o que deixi de respondre. Si esteu segur que voleu mostrar aquestes dades, podeu fer-ho fent clic sobre el botó de sota." loading: S'està carregant... manually_select: Selecciona manualment una àrea diferent object_list: @@ -253,8 +260,8 @@ ca: way: via way: download_xml: Descarrega XML - edit: modificació - view_history: visualitza l'històric + edit: Modifica via + view_history: Mostra l'historial way: Via way_title: "Via: %{way_name}" way_details: @@ -265,7 +272,7 @@ ca: part_of: "Part de:" way_history: download_xml: Descarrega XML - view_details: visualitza els detalls + view_details: Mostra els detalls way_history: Historial de la via way_history_title: "Historial de la via: %{way_name}" changeset: @@ -294,6 +301,8 @@ ca: description_nearby: Conjunts de canvis d'usuaris propers description_user: Conjunt de canvis fets per %{user} description_user_bbox: Conjunt de canvis de %{user} dins de %{bbox} + empty_anon_html: Encara no ha estat feta cap modificació + empty_user_html: Sembla que encara no heu fet cap modificació. Per començar feu un cop d'ull a la Guia d'iniciació . heading: Conjunt de canvis heading_bbox: Conjunt de canvis heading_friend: Conjunts de canvis @@ -312,8 +321,11 @@ ca: comments: ago: fa %{ago} comment: Comentari + has_commented_on: "%{display_name} ha comentat les següents entrades del diari" newer_comments: Comentaris recents older_comments: Comentaris antics + post: Publicar + when: Quan diary_comment: comment_from: Comentari de %{link_user} el %{comment_created_at} confirm: Confirma @@ -395,7 +407,7 @@ ca: area_to_export: Àrea a exportar embeddable_html: HTML que es pot incloure export_button: Exporta - export_details: Les dades l'OpenStreetMap són publicades sota el termes de la llicència Creative Commons Attribution-ShareAlike 2.0. + export_details: Les dades d'OpenStreetMap són publicades sota el termes de la llicència Creative Commons Attribution-ShareAlike 2.0. format: Format format_to_export: Format d'exportació image_size: Mida de la imatge @@ -403,6 +415,7 @@ ca: licence: Llicència longitude: "Lon:" manually_select: Selecciona manualment una àrea diferent + map_image: Imatge de mapa (mostra una capa estàndard) max: màx options: Opcions osm_xml_data: OpenStreetMap XML Data @@ -468,13 +481,16 @@ ca: WLAN: Punt d'accés WiFi airport: Aeroport arts_centre: Centre d'Art + artwork: Obra d'art atm: Caixer automàtic auditorium: Auditori bank: Banc bar: Bar + bbq: barbacoa bench: Banc bicycle_parking: Aparcament de bicicletes bicycle_rental: Lloguer de bicicletes + biergarten: Cervesseria a l'aire lliure brothel: Prostíbul bureau_de_change: Oficina de canvi bus_station: Estació d'autobusos @@ -483,6 +499,7 @@ ca: car_sharing: Compartició de cotxes car_wash: Rentat de cotxes casino: Casino + charging_station: Estació de recàrrega cinema: Cinema clinic: Clínica club: Club @@ -562,6 +579,7 @@ ca: youth_centre: Centre juvenil boundary: administrative: Administració de Fronteres + census: Límit censal national_park: Parc Nacional protected_area: Zona protegida bridge: @@ -601,12 +619,13 @@ ca: secondary_link: Carretera secundària service: Carretera de Servei services: Serveis en ruta + speed_camera: Radar steps: Graons stile: Escala per a travessar reixats tertiary: Carretera terciària tertiary_link: Carretera terciària track: Pista - trail: Sendera + trail: Sendera o corriol trunk: Autovia de trunk_link: Autovia de unclassified: Sense classificar Road @@ -659,9 +678,10 @@ ca: railway: Ferrocarril recreation_ground: Zona d'Esbarjo reservoir: Embassament + reservoir_watershed: Embassament de conca residential: Àrea residencial retail: Al detall - village_green: Village Green + village_green: Zona verda vineyard: Vinya wetland: Aiguamoll wood: Fusta @@ -670,6 +690,7 @@ ca: bird_hide: Aguait common: Terra comú fishing: Àrea de pesca + fitness_station: Centre de fitness garden: Jardí golf_course: Camp de golf ice_rink: Pista de patinatge sobre gel @@ -688,6 +709,7 @@ ca: track: Pista water_park: Parc aquàtic military: + airfield: Aeroport militar barracks: Caserna bunker: Búnquer natural: @@ -741,6 +763,7 @@ ca: insurance: Oficina d'assegurances lawyer: Advocat ngo: Oficina d'una ONG + telecommunication: Oficina de telecomunicacions travel_agent: Agència de viatges "yes": Oficina place: @@ -793,6 +816,7 @@ ca: yard: Pati de ferrocarril shop: alcohol: De llicència + antiques: Antiquari art: Galeria d'Art bakery: Fleca beauty: Saló de bellesa @@ -941,14 +965,17 @@ ca: history: Historial home: Inici home_tooltip: Vés a la posició inicial + inbox_html: rebut %{count} inbox_tooltip: one: Teniu 1 missatge sense llegir other: Teniu %{count} missatges sense llegir zero: No teniu cap missatge sense llegir intro_1: L'OpenStreetMap és un mapa editable i lliure de tot el món. Està fet per gent com vós. intro_2_create_account: Crea un compte d'usuari - intro_2_download: baixada + intro_2_download: baixades intro_2_html: Les dades poden ser %{download} i %{use} lliurement sota la seva %{license}. %{create_account} per millorar el mapa. + intro_2_license: llicència oberta + intro_2_use: utilitzades log_in: inicia una sessió log_in_tooltip: Inicia una sessió amb un compte existent logo: @@ -960,6 +987,11 @@ ca: title: Ajudeu l'OpenStreetMap amb una donació econòmica osm_offline: La base de dades OpenStreetMap és fora de línia, mentre es fan actuacions de manteniment necessàries. osm_read_only: La base de dades OpenStreetMap actualment és en el mode read-only mentre que les actuacions de manteniment essencials de base de dades es porta a terme. + partners_bytemark: Allotjament Bytemark + partners_html: L'allotjament és a càrrec de %{ucl}, %{ic}, %{bytemark}, i d'altres %{partners}. + partners_ic: Imperial College Londres + partners_partners: socis + partners_ucl: el Centre UCL VR sign_up: registre sign_up_tooltip: Crea un usuari per editar tag_line: El mapa wiki lliure mundial @@ -977,21 +1009,32 @@ ca: text: En cas de conflicte entre aquesta pàgina traduïda i %{english_original_link}, la pàgina en anglès tindrà prioritat title: Quant a la traducció legal_babble: + attribution_example: + alt: Exemple de com atribuir OpenStreetMap a una pàgina web + title: Exemple d'atribució contributors_at_html: "Àustria: conté dades de\n Stadt Wien sota\n CC BY." contributors_ca_html: "Canadà: conté dades de\n GeoBase ®, GeoGratis (© Departament de Natural\n Recursos Canadà), CanVec (© Departament de Natural\n Recursos Canadà) i StatCan (Divisió de Geografia,\n Canadà de Estadístiques)." + contributors_footer_1_html: "Per a més detalls sobre aquesta i d'altres fonts que han estat utilitzades per millorar els mapes d'OpenStreetMap, si us plau, vegeu al wiki d'OSM la pàgina dedicada als Col·laboradors" contributors_footer_2_html: "Inclusió de dades en OpenStreetMap no implica que l'original\n el proveïdor de dades recolza OpenStreetMap, proporciona cap garantia, o\n accepta qualsevol responsabilitat." contributors_fr_html: "França: conté dades d'origen de\n Direcció Générale des Impôts." - contributors_gb_html: "Regne Unit: conté cartografia\n Enquesta dades © Crown copyright i base de dades correcte\n 2010." - contributors_intro_html: "La nostra llicència CC BY-SA requereix que \"doni l'Original\n Autor de crèdit raonable per al suport i mitjà que ets\n utilització\". No tornis a sol·licitar individuals dibuixants de mapes de OSM un\n de crèdit més enllà de que a \"OpenStreetMap\n col. laboradors\", però on les dades des d'un mapatge Nacional\n Agència o l'altra font important ha estat inclòs en\n OpenStreetMap, pot ser raonable per crèdit per directament\n reproduir el seu crèdit o per vincular-hi d'aquesta pàgina." + contributors_gb_html: "Regne Unit: conté dades del\nOrdnance Survey © Drets d'autor de la Corona i de la base de dades\n2010-12." + contributors_intro_html: "Els nostres col·laboradors són milers de persones. També incloem dades amb llicència oberta de les agències públiques de cartografia i d'altres fonts, entre elles:" + contributors_nl_html: "Països Baixos: Conté © dades d'Automotive Navigation Data (AND), 2007 (www.and.com)" contributors_nz_html: "Nova Zelanda: conté dades d'origen de\n Informació Nova Zelanda de la terra. Corona de drets d'autor reservat." contributors_title_html: Nostres col. laboradors - credit_1_html: "Si està utilitzant imatges de mapa de OpenStreetMap, us preguem que\n el seu crèdit llegeix com a mínim \"© OpenStreetMap\n col. laboradors, CC BY-SA\". Si està utilitzant les dades de mapa només\n demanem \"mapa dades © OpenStreetMap col·laboradors\n CC BY-SA\"." - credit_2_html: "Sempre que sigui possible, OpenStreetMap ha de ser un hipervincle a http://www.openstreetmap.org/\n i CC BY-SA a http://creativecommons.org/licenses/by-sa/2.0/. Si\n està utilitzant un mitjà on enllaços no són possibles (per exemple, un\n treball impresa), us suggerim que directa als seus lectors a\n www.OpenStreetMap.org (potser per l'ampliació\n 'OpenStreetMap' a aquesta adreça completa) i a\n www.creativecommons.org." + contributors_za_html: "Sud-àfrica: conté dades del\nChief Directorate:\nNational Geo-Spatial Information, drets d'autor reservat per l'estat." + credit_1_html: "Exigim que l'atribució de drets d'autor sigui “© Col·laboradors d'OpenStreetMap\n”." + credit_2_html: També heu de deixar clar que les dades són disponibles sota llicència obereta, i si s'utilitzen les nostres tessel·les de mapes, que la cartografia és llicenciada com CC-BY-SA. Podeu fer això enllaçant a aquest pàgina de copyright. D'altra banda, i com a requisit obligatori si voleu distribuir OSM en forma de dades en brut, podeu citar i enllaçar directament a la llicència. En el cas d'utilitzar suports on els enllaços d'hipertext no són possibles (per exemple, obres impreses), us suggerim d'adreçar els lectors a openstreetmap.org (potser indicant l'adreça completa d'OpenStreetMap), a opendatacommons.org i si s'escau, a creativecommons.org. + credit_3_html: "En el cas d'un mapa electrònic navegable, els crèdits han d'aparèixer a la cantonada del mapa.\nPer exemple:" credit_title_html: Com a crèdit OpenStreetMap + 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 Procediment per eliminar dades protegides pels drets d'autor o empleneu aquest formulari en línia.. + infringement_title_html: Violació dels drets d'autor intro_1_html: "OpenStreetMap és obrir dades, concedeix una llicència sota el Creative\n Llicència Commons Attribution-ShareAlike 2.0 (CC BY-SA)." - intro_2_html: "Vostè és lliure de copiar, distribuir, transmetre i adaptar-se a nostres mapes\n i les dades, sempre que li doni crèdit OpenStreetMap i la seva\n col. laboradors. Si alterar o construir sobre els nostres mapes o dades, vostè\n distribuir el resultat només sota la mateixa llicència. La\n Full legal\n codi explica els seus drets i responsabilitats." - more_1_html: "Llegiu més informació sobre com utilitzar les nostres dades a les Legal\n PREGUNTES MÉS FREQÜENTS." - more_2_html: "Col. laboradors OSM se li va recordar mai per afegir les dades des de qualsevol\n drets d'autor fonts (p. ex. Google Maps o mapes impreses) sense\n permís explícit dels titulars del copyright." + 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 \ntext legal\ncode 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 Text de la llicència de Creative Commons Reconeixement-Compartir Igual 2.0(CC-BY-SA)." + more_1_html: "Llegiu més informació sobre com utilitzar les nostres dades a les Preguntes\nFreqüents sobre legalitat." + more_2_html: Encara que les dades d'OpenStreetMap són dades obertes, no podem oferir una API gratuïta per als desenvolupadors de terceres parts. Vegeu la Política d'ús de l'API, la Política d'ús de les tessel·les i la Política d'ús de Nominatim. more_title_html: Saber-ne més title_html: Drets d'autor i llicència native: @@ -1064,7 +1107,7 @@ ca: title: Llegeix el missatge to: Per a unread_button: Marca com a no llegit - wrong_user: Heu iniciat la sessió com "%{user}", però el missatge que han demanat a llegir a no va ser enviat o dirigit a aquest usuari. Si us plau connecti's com l'usuari correcte per a llegir-lo. + wrong_user: Heu iniciat la sessió com a "%{user}", però el missatge que proveu de llegir a no va ser enviat o adreçat a aquest usuari. Si us plau connecteu-vos com l'usuari correcte per poder llegir-ho. reply: wrong_user: Heu iniciat la sessió com "%{user}", però el missatge que han demanat de respondre a no s'ha enviat a aquest usuari. Si us plau connecti's com l'usuari correcte per a respondre. sent_message_summary: @@ -1122,14 +1165,15 @@ ca: header: "%{from_user} ha enviat un missatge a través de OpenStreetMap amb el tema %{subject}:" hi: Hola %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Confirmeu la vostra adreça electrònica" + 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}. + greeting: Hola! + subject: "[OpenStreetMap] Benvinguts a OpenStreetMap" + welcome: Volem donar-vos la benvinguda i oferir-vos informació addicional que us ajudarà a començar. signup_confirm_html: ask_questions: Podeu fer qualsevol pregunta que tingueu sobre l'OpenStreetMap al nostre lloc de preguntes i respostes. - click_the_link: Si això és vostè, Benvingut! Si us plau, feu clic a l'enllaç de sota per confirmar que compte i seguiu llegint per obtenir més informació sobre OpenStreetMap current_user: "Una llista d'usuaris actuals en categories, basades en on en el món que són, està disponible des de Categoria: Users_by_geographical_region." get_reading: Obtenir de lectura sobre OpenStreetMap al wiki, posarà al dia amb les últimes notícies via OpenStreetMap bloc o Twittero navegar a través de OpenStreetMap fundador Steve Costa OpenGeoData blog per a la breu història del projecte, que disposa de podcasts d'escoltar ! - greeting: Hola, què tal? - hopefully_you: Algú (esperem que vostè) would com crear un compte per a les introductory_video: Podeu veure un %{introductory_video_link}. more_videos: Hi ha %{more_videos_link}. more_videos_here: més de vídeos aquí @@ -1139,18 +1183,12 @@ ca: signup_confirm_plain: ask_questions: "Pot fer qualsevol pregunta que tingui sobre OpenStreetMap a les nostres preguntes i lloc de resposta:" blog_and_twitter: "Posarà al dia amb les últimes notícies via el blog de OpenStreetMap o Twitter:" - click_the_link_1: Si això és vostè, Benvingut! Si us plau, feu clic a l'enllaç sota per confirmar el seu - click_the_link_2: compte i seguiu llegint per obtenir més informació sobre OpenStreetMap. - current_user_1: Una llista d'usuaris actuals en categories, basades en on en el món - current_user_2: "ells són, està disponible des de:" - greeting: Hola, què tal? - hopefully_you: Algú (creiem que vós mateix) vol crear un compte per a les + current_user: "Una llista dels usuaris classificats en base al lloc on són està disponible a:" 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:" - user_wiki_1: Es recomana que es crea una pàgina de wiki de l'usuari, que inclou - user_wiki_2: "Categoria Etiquetes assenyalant on es troba, com [[Categoria: Users_in_London]]." + 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:" oauth: oauthorize: @@ -1211,6 +1249,7 @@ ca: allow_write_prefs: modificar les seves preferències d'usuari. authorize_url: "Autoritza URL:" confirm: N'esteu segur? + delete: Suprimeix client edit: Edita els detalls key: "Clau de consum:" requests: "Sol·licitar els permisos següents des de l'usuari:" @@ -1221,28 +1260,54 @@ ca: update: flash: La informació de client ha actualitzat correctament redaction: + create: + flash: Redacció creada + destroy: + error: Ha hagut un error en suprimir aquesta redacció. + flash: Redacció suprimida + not_empty: La redacció no és buida. Si us plau, desfeu totes les versions que pertanyen a aquesta redacció abans de destruir-la. edit: description: Descripció + heading: Modifica la redacció + submit: Desa la redacció + title: Modifica la redacció + index: + empty: No hi ha redaccions a mostrar. + heading: Llista de redaccions + title: Llista de redaccions new: description: Descripció + heading: Introduïu informació per una nova redacció + submit: Crea una redacció + title: Creant una nova redacció show: + confirm: N'esteu segur? + description: "Descripció:" + destroy: Suprimeix aquesta redacció + edit: Modifica aquesta redacció + heading: Mostrant la redacció "%{title}" + title: Mostrant la redacció user: "Autor:" + update: + flash: Modificacions desades site: edit: anon_edits_link_text: Esbrina perquè aquest és el cas. flash_player_required: Necessiteu intèrpret de Flash per utilitzar el Potlatch, l'editor de l'OpenStreetMap. Podeu baixar el pluguin de Flash des del web Adobe.com. També hi ha altres opcions per editar l'OpenStreetMap. no_iframe_support: El navegador no suporta iframes HTML, que són necessàries per a aquesta funcionalitat. - not_public: No ha posat les modificacions per ser públic. - not_public_description: Ja no es pot editar el mapa a menys que vostè fer-ho. Pot configurar les modificacions com a públic del seu %{user_page}. + not_public: No heu fet les configuracions necessàries per tal que les vostres modificacions siguin públiques. + not_public_description: Ja no podeu modificar el mapa a menys que feu públics els vostres canvis. Podeu configurar les modificacions com a públiques a la vostra %{user_page}. potlatch2_not_configured: No s'ha configurat el Potlatch 2 - vegeu http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 per a més informació potlatch2_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al Potlatch 2, heu de fer clic a "desa".) potlatch_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al Potlatch, heu de desseleccionar la via o el punt actual, si esteu en l'edicó en viu, o fer clic a "desa", si teniu un botó "desa".) user_page_link: pàgina d'usuari index: js_1: Tampoc està utilitzant un navegador que no suporta JavaScript o té deshabilitat JavaScript. - js_2: L'OpenStreetMap utilitza JavaScript per al mapa slippy. + js_2: L'OpenStreetMap utilitza JavaScript per al mapa lliscant. + license: + copyright: Copyright d'OpenStreetMap i els seus col·laboradors sota llicència oberta permalink: Enllaç permanent - remote_failed: Edició ha fallat - assegureu-vos que JOSM o Merkaartor es carrega i l'opció de comandament a distància és habilitat + remote_failed: L'edició ha fallat - assegureu-vos que JOSM o Merkaartor ha estat carregat i que l'opció de comandament a distància ha estat habilitatada shortlink: Enllaç curt key: map_key: Llegenda @@ -1255,7 +1320,7 @@ ca: - Davantal de l'Aeroport - terminal bridge: Embolcall negre = bridge - bridleway: Bridleway + bridleway: Camí de ferradura brownfield: Lloc Brownfield building: Edifici significatiu byway: Byway @@ -1301,7 +1366,7 @@ ca: station: Estació de tren subway: Metro summit: - - Cimera + - Cim - pic tourist: Atracció turística track: Pista @@ -1316,8 +1381,20 @@ ca: markdown_help: alt: Text alternatiu first: Primer element + heading: Encapçalament + headings: Encapçalaments image: Imatge + link: Enllaç + ordered: Llista ordenada + second: Segon element + subheading: Subencapçalament text: Text + title_html: Analitzat amb Markdown + unordered: Llista sense ordenar + url: URL + richtext_area: + edit: Modifica + preview: Previsualització search: search: Cerca search_help: "exemples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' o 'oficines de correus a prop Lünen' més exemples..." @@ -1335,7 +1412,7 @@ ca: 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. upload_trace: Pujar traça de GPS delete: - scheduled_for_deletion: Water programat per a la supressió + scheduled_for_deletion: Track programat per a ser suprimit edit: description: "Descripció:" download: descàrrega @@ -1348,21 +1425,22 @@ ca: save_button: Guardar canvis start_coord: "Coordenada d'inici:" tags: "Etiquetes:" - tags_help: separat per comas + tags_help: separat per comes title: Editant traça %{name} uploaded_at: "Pujat a:" visibility: "Visibilitat:" visibility_help: Què vol dir això? list: + empty_html: Aquí encara no hi ha res. Pujeu un nou track o apreneu més sobre els tracks GPS a la pàgina wiki. public_traces: Traces GPS públiques - public_traces_from: Públics traces GPS de %{user} + public_traces_from: Tracks GPS públics de %{user} tagged_with: " etiquetat amb %{tags}" - your_traces: Les vosres traces GPS + your_traces: Les vostres traces GPS make_public: made_public: Water fet públic offline: heading: GPX emmagatzematge fora de línia - message: Al GPX d'emmagatzematge i carregar sistema d'arxiu no està disponible actualment. + message: L'emmagatzematge i el sistema de pujada de fitxers GPX no són operatius actualment. offline_warning: message: El sistema de càrrega de fitxers GPX no està disponible actualment trace: @@ -1377,9 +1455,9 @@ ca: more: mes pending: PENDENT private: PRIVAT - public: PUBLIC + public: PÚBLIC trace_details: Mostra els detalls de la traça - trackable: RASTREABLE + trackable: RASTREJABLE view_map: Visualitza el mapa trace_form: description: "Descripció:" @@ -1398,6 +1476,8 @@ ca: trace_optionals: tags: Etiquetes trace_paging_nav: + newer: Tracks més recents + older: Tracks més antics showing_page: S'està mostrant pàgina %{page} view: delete_track: Elimina aquesta traça @@ -1412,7 +1492,7 @@ ca: owner: "Propietari:" pending: PENDENT points: "Punts:" - start_coordinates: "coordenada de inici:" + start_coordinates: "coordenada d'inici:" tags: "Etiquetes:" title: S'està mostrant la traça %{name} trace_not_found: No s'ha trobat la traça! @@ -1420,7 +1500,7 @@ ca: visibility: "Visibilitat:" visibility: identifiable: Identifiable (mostrat en llista de traça i com a punts d'identificació, ordenades amb timestamps) - private: Privat (només compartit com anònims, desordenada punts) + private: Privat (només compartit com anònim, el punts són desordenats) public: Públic (mostrat en llista de traça i com anònims, desordenada punts) trackable: Seguiments (només compartit com punts anònims, ordenades amb timestamps) user: @@ -1437,6 +1517,10 @@ ca: 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. + gravatar: + gravatar: Usar Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: què és això? home location: "Ubicació inicial:" image: "Imatge:" image size hint: (Plaça imatges com a mínim 100 x 100 treball millor) @@ -1572,6 +1656,7 @@ ca: 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ó.

    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 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 termes de col·laboracio. no_auto_account_create: No us podem crear automàticament un compte. @@ -1631,7 +1716,7 @@ ca: activate_user: activa aquest usuari add as friend: afegeix com a amic ago: (fa %{time_in_words_ago}) - block_history: mostra els blocs rebuts + block_history: blocs rebuts blocks by me: blocs per mi blocks on me: blocs en mi comments: comentaris @@ -1657,7 +1742,8 @@ ca: latest edit: "Última edició %{ago}:" m away: "%{count}m de distància" mapper since: "Mapejant des de:" - moderator_history: mostra els blocs donats + moderator_history: blocs donats + my comments: els meus comentaris my diary: el meu diari my edits: les meves edicions my settings: les meves preferències diff --git a/config/locales/cs.yml b/config/locales/cs.yml index df07f34e7..d7e5d6d57 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -183,8 +183,8 @@ cs: of: z showing_page: Zobrazuji stranu redacted: - message_html: Verze %{version} typu %{type} nelze zobrazit, jak byla upravena. Další informace dostupné na %{redaction_link}. - redaction: Oprava %{id} + message_html: Verzi %{version} tohoto objektu %{type} nelze zobrazit, protože byla skryta. Více informací uvádí stránka %{redaction_link}. + redaction: Redakce %{id} type: node: uzel relation: relace @@ -997,7 +997,6 @@ cs: partners_ucl: středisko VR UCL sign_up: zaregistrovat se sign_up_tooltip: Vytvořit si uživatelský účet pro editaci - sotm2012: Přijeďte na letoÅ¡ní americkou konferenci OpenStreetMap, The State of the Map US, 13.–14. října v Portlandu v Oregonu! tag_line: Otevřená wiki-mapa světa user_diaries: Deníčky user_diaries_tooltip: Zobrazit deníčky uživatelů @@ -1014,6 +1013,9 @@ cs: text: V případě rozporů mezi touto přeloženou verzí a %{english_original_link} má přednost anglická stránka. title: O tomto překladu legal_babble: + attribution_example: + alt: Příklad, jak uvádět autorství OpenStreetMap na webové stránce + title: Příklad uvedení autorství contributors_at_html: "Rakousko: Obsahuje data od města Vídně pod CC BY), země Vorarlbersko a země Tyrolsko (pod CC BY AT s dodatky)." contributors_ca_html: "Kanada: Obsahuje data z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada)." contributors_footer_1_html: "Další podrobnosti o těchto a dalších zdrojích, které se používaly pro vylepÅ¡ení OpenStreetMap, najdete na stránce Contributors na wiki OpenStreetMap." @@ -1027,6 +1029,7 @@ cs: contributors_za_html: "Jihoafrická republika: Obsahuje data pocházející z Chief Directorate:\nNational Geo-Spatial Information, State copyright reserved." credit_1_html: Vyžadujeme uvádění autorství „© Přispěvatelé OpenStreetMap“. credit_2_html: "Také musíte jasně uvést, že data jsou dostupná za podmínek Open Database License, a pokud používáte naÅ¡e mapové dlaždice, že jejich kartografický obsah je licencován pod CC-BY-SA. To můžete splnit odkázáním na tuto stránku.\n\nNebo můžete (a pokud šíříte OSM jako data, tak musíte) uvést název licence a odkaz na ni přímo. Pokud používáte médium, které odkazy neumožňuje (např. v tiÅ¡těném díle), navrhujeme, abyste své čtenáře nasměrovali na openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy), na opendatacommons.org a, pokud se vás to týká, na creativecommons.org." + credit_3_html: "U interaktivní elektronické mapy by autorství mělo být uvedeno v rohu mapy.\nPříklad:" credit_title_html: Jak uvádět OpenStreetMap infringement_1_html: Přispěvatelům OSM připomínáme, že by nikdy neměli přidávat data ze zdrojů chráněných autorským právem (např. Google Maps či tiÅ¡těné mapy) bez výslovného svolení držitelů práv. infringement_2_html: Pokud si myslíte, že byl do databáze OpenStreetMap nebo na tento server neoprávněně vložen autorskoprávně chráněný obsah, postupujte podle naÅ¡eho postupu pro odstranění nebo přímo podejte výzvu pomocí on-line formuláře. @@ -1169,14 +1172,15 @@ cs: header: "%{from_user} vám poslal(a) prostřednictvím OpenStreetMap zprávu s předmětem %{subject}:" hi: Dobrý den, uživateli %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Potvrzení vaší e-mailové adresy" + confirm: "Než budeme pokračovat, potřebujeme potvrdit, že tento požadavek přiÅ¡el od vás, takže pokud jste to byli vy, klikněte prosím na odkaz níže, abyste svůj účet potvrdili:" + created: Někdo (doufáme, že vy) si právě založil účet na %{site_url}. + greeting: Ahoj! + subject: "[OpenStreetMap] Vítejte v OpenStreetMap" + welcome: Rádi bychom vás přivítali a poskytli vám do začátku trochu dalších informací. signup_confirm_html: ask_questions: Libovolné otázky k OpenStreetMap můžete klást na naÅ¡em webu otázek a odpovědí. - click_the_link: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte svůj účet, níže se dozvíte další informace o OpenStreetMap. current_user: Seznam existujících uživatelů v kategoriích podle místa bydliÅ¡tě je dostupný v kategorii Users by geographical region. get_reading: Přečtěte si něco o OpenStreetMap na wiki, sledujte aktuální dění na naÅ¡em blogu či Twitteru nebo si projděte blog zakladatele OpenStreetMap Steva Coasta OpenGeoData se stručnou historií projektu i ve formě podcastů! - greeting: Ahoj! - hopefully_you: Někdo (snad vy) si chce založit účet na introductory_video: Můžete si prohlédnout %{introductory_video_link}. more_videos: Máme i %{more_videos_link}. more_videos_here: další videa @@ -1186,19 +1190,13 @@ cs: signup_confirm_plain: ask_questions: "Libovolné otázky k OpenStreetMap můžete klást na naÅ¡em webu otázek a odpovědí:" blog_and_twitter: "Sledujte aktuální dění na naÅ¡em blogu či Twitteru:" - click_the_link_1: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte - click_the_link_2: svůj účet, níže se dozvíte další informace o OpenStreetMap. - current_user_1: Seznam existujících uživatelů v kategoriích podle místa bydliÅ¡tě - current_user_2: "je dostupný na:" - greeting: Ahoj! - hopefully_you: Někdo (snad vy) si chce založit účet na + current_user: "Seznam stávajících kategorií pro dělení uživatelů podle bydliÅ¡tě je dostupný na:" introductory_video: "Můžete si prohlédnout úvodní video k OpenStreetMap:" more_videos: "Další videa najdete na:" opengeodata: "OpenGeoData.org je blog zakladatele OpenStreetMap Steva Coasta, nabízí i podcasty:" the_wiki: "Přečtěte si něco o OpenStreetMap na wiki:" the_wiki_url: http://wiki.openstreetmap.org/wiki/CS:Beginners_Guide?uselang=cs - user_wiki_1: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které - user_wiki_2: kategoriemi označíte, odkud pocházíte, například [[Category:Users in Praha]]. + user_wiki_page: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které kategoriemi označíte, odkud pocházíte, například [[Category:Users in Praha]]. wiki_signup: "Také se můžete chtít zaregistrovat na OpenStreetMap wiki:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=CS:Main_Page&uselang=cs oauth: @@ -1272,32 +1270,32 @@ cs: flash: Klientské informace úspěšně aktualizovány redaction: create: - flash: Oprava vytvořena. + flash: Redakce vytvořena. destroy: - error: DoÅ¡lo k chybě při ničení této opravy. - flash: Oprava zničena. - not_empty: Úprava není prázdná. Odstraňte vÅ¡echny verze této úpravy dříve, než je zrušíte. + error: DoÅ¡lo k chybě při ničení této redakce. + flash: Redakce zničena. + not_empty: Redakce není prázdná. Před zruÅ¡ením této redakce zruÅ¡te skrytí vÅ¡ech verzí patřících do této redakce. edit: description: Popis - heading: Upravit relaci - submit: Uložit úpravy - title: Upravit relaci + heading: Upravit redakci + submit: Uložit redakci + title: Upravit redakci index: empty: Žádné opravy k ukázání. heading: Seznam oprav title: Seznam oprav new: description: Popis - heading: Zadejte informace o nové opravě - submit: Vytvořte opravu - title: Vytváření nových oprav + heading: Zadejte informace k nové redakci + submit: Vytvořit redakci + title: Tvorba nové redakce show: confirm: Opravdu? description: "Popis:" - destroy: Odstranit tuto opravu - edit: Upravit tuto opravu - heading: Zobrazit opravy "%{title}" - title: Zobrazení oprav + destroy: Odstranit tuto redakci + edit: Upravit tuto redakci + heading: Zobrazení redakce „%{title}“ + title: Zobrazení redakce user: "Autor:" update: flash: Změny uloženy. @@ -1529,6 +1527,10 @@ cs: email never displayed publicly: (nikde se veřejně nezobrazuje) flash update success: Uživatelské údaje byly úspěšně aktualizovány. flash update success confirm needed: Uživatelské údaje byly úspěšně aktualizovány. Zkontrolujte si e-mail, měla by vám přijít výzva k potvrzení nové e-mailové adresy. + gravatar: + gravatar: Používat Gravatar + link: http://wiki.openstreetmap.org/wiki/CS:Gravatar + link text: co to znamená? home location: "Poloha domova:" image: "Obrázek:" image size hint: (nejlépe fungují čtvercové obrázky velikosti nejméně 100×100) @@ -1552,7 +1554,7 @@ cs: disabled link text: proč nemůžu editovat? enabled: Aktivní. Není anonym, smí editovat data. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: co tohle je? + enabled link text: co to znamená? heading: "Veřejné editace:" public editing note: heading: Veřejné editace @@ -1664,6 +1666,7 @@ cs: email address: "E-mailová adresa:" fill_form: Vyplňte následující formulář a my vám poÅ¡leme stručný e-mail, jak si účet aktivovat. flash create success message: Děkujeme za registraci. Na %{email} jsme poslali potvrzovací zprávu, jakmile potvrdíte svůj účet, budete moci začít tvořit mapy.

    Pokud používáte nějaký protispamový systém, který vyžaduje potvrzení, nezapomeňte zařídit výjimku pro webmaster@openstreetmap.org, neboÅ¥ na žádosti o potvrzení nejsme schopni reagovat. + flash welcome: Děkujeme za registraci. Na %{email} jsme poslali přivítání a několik rad do začátku. heading: Vytvořit uživatelský účet license_agreement: Při potvrzení účtu budete muset souhlasit s podmínkami pro přispěvatele. no_auto_account_create: Bohužel za vás momentálně nejsme schopni vytvořit účet automaticky. diff --git a/config/locales/da.yml b/config/locales/da.yml index 5181c7e7b..fd7601125 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -989,7 +989,6 @@ da: partners_ucl: UCL VR centret sign_up: opret konto sign_up_tooltip: Opret en konto for at kunne redigere - sotm2012: Kom til den amerikanske 2012 OpenStreetMap-konference, Kortets tilstand USA, 13.-14. oktober i Portland, Oregon! tag_line: Det frie Wiki-verdenskort user_diaries: Brugerblogs user_diaries_tooltip: Vis brugerblogs @@ -1005,6 +1004,9 @@ da: text: I tilfælde af en konflikt mellem denne oversatte side og %{english_original_link} har den engelske tekst forrang title: Om denne oversættelse legal_babble: + attribution_example: + alt: Eksempel pÃ¥ hvordan man angiver OpenStreetMap som kilde for en webside + title: Eksempel pÃ¥ kildeangivelse contributors_at_html: "Østrig: Indeholder data fra\nStadt Wien (under\nCC BY),\nDelstaten Vorarlberg og\nDelstaten Tyrol (under CC-BY AT med tilføjelser)." contributors_ca_html: "Canada: Indeholder data fra\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) og StatCan (Geography Division,\nStatistics Canada)." contributors_footer_1_html: "For yderligere oplysninger om disse og andre kilder, der er blevet brugt for at hjælpe med at forbedre OpenStreetMap, se venligst siden med bidragydere pÃ¥ OpenStreetMap Wiki." @@ -1018,6 +1020,7 @@ da: contributors_za_html: "Syd Afrika: Indeholder data fra\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserveret." credit_1_html: Vi kræver at din kildeangivelse mindst bestÃ¥r af “© OpenStreetMap-bidragyderer”.. credit_2_html: "Du skal ogsÃ¥ gøre det klart, at dataene er tilgængelige under Open \nDatabase License, og hvis du bruger vores kort fliser, at kartografi er\n licenseret som CC-BY-SA. Du kan gøre dette ved at linke til\ndenne side om ophavsret. \nAlternativt, og som et krav, hvis du distribuerer OSM i en\n dataform, kan du navngive og oprette et hyperlink direkte til licenserne. I medier\n hvor hyperlinks ikke er mulig (f.eks. trykte værker), foreslÃ¥r vi, at du\n henviser dine læsere til openstreetmap.org (mÃ¥ske ved at udvide\n'OpenStreetMap' til denne fuld adresse), til opendatacommons.org, og\n hvis relevant, til creativecommons.org." + credit_3_html: "For et navigerbart elektronisk kort, skal kildeangivelsen være i hjørnet af kortet.\nFor eksempel:" credit_title_html: Kildeangivelse og OpenStreetMap 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 procedure til fjernelse a materiale eller udfyld formular direkte pÃ¥ vores\non-line side." @@ -1157,14 +1160,15 @@ da: header: "%{from_user} har sendt dig en besked gennem OpenStreetMap med emnet %{subject}:" hi: Hej %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Bekræft din emailadresse" + confirm: "Før vi gør mere, har vi brug at bekræfte, at denne anmodning kommer fra dig, sÃ¥ hvis det er tilfældet bedes du venligst klikke pÃ¥ nedenstÃ¥ende link for at bekræfte din konto:" + created: En person (forhÃ¥bentlig dig) har lige oprettet en konto pÃ¥ %{site_url}. + greeting: Halløj! + subject: "[OpenStreetMap] Velkommen til OpenStreetMap" + welcome: Vi vil gerne byde dig velkommen og give dig nogle yderligere oplysninger sÃ¥ du kan komme godt i gang. signup_confirm_html: ask_questions: Du kan stille alle spørgsmÃ¥l du mÃ¥tte have om OpenStreetMap pÃ¥ vores spørgsmÃ¥l og svar-site. - click_the_link: Hvis dette er dig, velkommen! Klik pÃ¥ linket nedenfor for at bekræfte kontoen og læs videre for flere oplysninger om OpenStreetMap current_user: En liste over nuværende brugere i kategorier baseret pÃ¥ hvor i verden de er, kan ses pÃ¥ Category:Users_by_geographical_region. get_reading: Du kan læse om OpenStreetMap pÃ¥ wikien, følge de seneste nyheder via OpenStreetMap-bloggen eller Twitter, eller se OpenStreetMap-stifteren Steve Coasts OpenGeoData-blog for en hurtig udgave af projektets historie, endda med podcasts du kan lytte til! - greeting: Hejsa! - hopefully_you: En eller anden (forhÃ¥bentlig dig) vil gerne oprette en konto pÃ¥ introductory_video: Du kan se en %{introductory_video_link}. more_videos: Der er %{more_videos_link}. more_videos_here: flere videoer her @@ -1174,18 +1178,12 @@ da: signup_confirm_plain: ask_questions: "Du kan stille spørgsmÃ¥l du mÃ¥tte have om OpenStreetMap pÃ¥ vores spørgsmÃ¥l og svar-side:" blog_and_twitter: "Hold dig opdateret med de seneste nyheder via OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Hvis det er dig, velkommen! Klik pÃ¥ linket nedenfor for at bekræfte din - click_the_link_2: konto og læs videre for flere oplysninger om OpenStreetMap. - current_user_1: En liste over nuværende brugere i kategorier baseret pÃ¥ hvor i verden - current_user_2: "de er, er tilgængelig fra:" - greeting: Halløj! - hopefully_you: En eller anden (forhÃ¥bentlig dig) vil gerne oprette en konto pÃ¥ + current_user: "En liste over nuværende brugere i kategorier, baseret pÃ¥ hvor i verden de er, er tilgængelig fra:" introductory_video: "Du kan se en introduktionsvideo til OpenStreetMap her:" more_videos: "Der er flere videoer her:" opengeodata: "OpenGeoData.org er OpenStreetMap-stifteren Steve Coasts blog, og der er ogsÃ¥ podcasts:" the_wiki: "Læs mere om OpenStreetMap pÃ¥ wikien:" - user_wiki_1: Det anbefales at du opretter en bruger-wikiside som indeholder - user_wiki_2: kategorielementer der forklarer hvor du er, sÃ¥som [[Category:Users_in_Denmark]] + user_wiki_page: Det anbefales, at du opretter en bruger wiki side, som indeholder kategori tags, der viser hvor du er, som [[Category:Users_in_Copenhagen]]. wiki_signup: "Du kan ogsÃ¥ tilmelde dig til OpenStreetMap-wikien pÃ¥:" oauth: oauthorize: @@ -1514,6 +1512,10 @@ da: email never displayed publicly: (vises aldrig offentligt) flash update success: Brugerinformation opdateret. flash update success confirm needed: Brugeroplysninger blev opdateret. Tjek din email for en nøgle til at bekræfte din nye emailadresse. + gravatar: + gravatar: Brug Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: hvad er dette? home location: "Hjemmeposition:" image: "Billede:" image size hint: (kvadratiske billeder pÃ¥ mindst 100x100 fungerer bedst) @@ -1649,6 +1651,7 @@ da: email address: "E-mail-adresse:" fill_form: Udfyld felterne, og vi sender dig en hurtig email til at aktivere din konto. flash create success message: Tak for din tilmelding. Vi har sendt en bekræftelses-email til %{email}, og sÃ¥ snart du har bekræftet din konto, kan du gÃ¥ i gang med kortlægningen.

    Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler, sÃ¥ sørg for at du har hvidlistet webmaster@openstreetmap.org da vi ikke kan svare pÃ¥ den slags forespørgsler. + flash welcome: Tak for din tilmelding. Vi har sendt en velkomsthilsen til %{email} med nogle tips til at komme godt i gang. heading: Opret en brugerkonto license_agreement: NÃ¥r du bekræfter din konto, skal du acceptere vilkÃ¥rene for bidragydere. no_auto_account_create: Vi kan desværre ikke oprette en konto automatisk for dig pt. diff --git a/config/locales/de.yml b/config/locales/de.yml index 1b1cb9427..007850fd3 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -20,6 +20,7 @@ # Author: McDutchie # Author: Metalhead64 # Author: Michi +# Author: Mormegil # Author: Pill # Author: Purodha # Author: Raymond @@ -1022,7 +1023,6 @@ de: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: Registrieren sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen - sotm2012: Komm zur OpenStreetMap-Konferenz „The State of the Map US“ 2012 vom 13. bis 14. Oktober in Portland, Oregon! tag_line: Die freie Wiki-Weltkarte user_diaries: Benutzer-Blogs user_diaries_tooltip: Benutzer-Blogs lesen @@ -1039,6 +1039,9 @@ de: text: Für den Fall einer Abweichung zwischen der vorliegenden Übersetzung und %{english_original_link}, ist die englischsprachige Seite maßgebend. title: Über diese Übersetzung legal_babble: + attribution_example: + alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist + title: Hinweisbeispiel contributors_at_html: "Österreich: Enthält Daten der Stadt Wien (lizenziert gemäß CC BY AT), des Landes Vorarlberg und des Landes Tirol (beides lizenziert gemäß CC BY AT mit Anpassungen zur Lizenz)." contributors_ca_html: "Kanada: Enthält Daten von GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) und StatCan (Geography Division, Statistics Canada)." contributors_footer_1_html: Für weitere diesbezügliche Einzelheiten sowie anderer Datenquellen, die zur Verbesserung von OpenStreetMap genutzt wurden, besuche bitte die Seite über die Mitwirkenden im Wiki von OpenStreetMap. @@ -1052,6 +1055,7 @@ de: contributors_za_html: "Südafrika: Enthält Daten von Chief Directorate: National Geo-Spatial Information, Staatliches Urheberrecht vorbehalten." credit_1_html: Wir verlangen die Verwendung des Hinweises „© OpenStreetMap-Mitwirkende“. credit_2_html: "Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz\nverfügbar sind, und sofern du unsere Kartenkacheln verwendest, dass die\nKartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf\ndiese Seite verlinkst.\nErsatzweise, und als Erfordernis, falls du OSM in Datenform weitergibst,\nkannst du die Lizenz(en) direkt verlinken und benennen. In Medien, in denen\nkeine Links möglich sind (z. B. gedruckten Werken), empfehlen wir dir,\ndeine Leser direkt auf openstreetmap.org zu verweisen (möglicherweise mit\ndem Erweitern von „OpenStreetMap“ zur vollen Adresse), auf opendatacommons.org,\nund, sofern zutreffend, auf creativecommons.org." + credit_3_html: "Der Hinweis sollte für eine durchsuchbare elektronische Karte in der Ecke der Karte stehen.\nZum Beispiel:" credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen ist infringement_1_html: Die Mitwirkenden von OpenStreetMap weisen wir darauf hin, dass keinesfalls Daten aus urheberrechtlich geschützten Quellen verwendet werden dürfen (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben. infringement_2_html: "Sofern du denkst, dass urheberrechtlich geschütztes Material unerlaubterweise zur\nOpenStreetMap-Datenbank oder auf dieser Website hinzugefügt wurde, informiere dich\nbitte über unser Verfahren\nzum Entfernen von Inhalten oder melde dies direkt mit unserem\nOnlineformular." @@ -1191,14 +1195,15 @@ de: header: "%{from_user} hat dir eine Nachricht über OpenStreetMap mit dem Betreff %{subject} gesendet:" hi: Hallo %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Deine E-Mail-Adresse bestätigen" + confirm: "Bevor wir etwas unternehmen, benötigen wir eine Bestätigung, dass diese Anfrage von dir stammt. Falls ja, klicke bitte auf den unten stehenden Link, um dein Benutzerkonto zu bestätigen:" + created: Jemand (hoffentlich du) erstellte gerade bei %{site_url} ein Benutzerkonto. + greeting: Hallo! + subject: "[OpenStreetMap] Willkommen bei OpenStreetMap" + welcome: Wir möchten dich willkommen heißen und geben dir zusätzliche Informationen, um anzufangen. signup_confirm_html: ask_questions: Du kannst jegliche Fragen zu OpenStreetMap auf unserer Website mit Fragen und Antworten stellen. - click_the_link: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile um dein Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM. current_user: Ebenso ist eine Liste mit allen Benutzern in einer Kategorie, die anzeigt wo diese auf der Welt sind, verfügbar. get_reading: Auf dieser Seite findest du einige nützliche Links und Informationen, die dir den Einstieg erleichtern werden. - greeting: Hallo! - hopefully_you: Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für introductory_video: Du kannst dir das %{introductory_video_link} anschauen. more_videos: Darüber hinaus gibt es noch viele weitere %{more_videos_link}. more_videos_here: Videos über OpenStreetMap @@ -1208,19 +1213,13 @@ de: signup_confirm_plain: ask_questions: "Du kannst jegliche Fragen zu OpenStreetMap auf unserer Website mit Fragen und Antworten stellen:" blog_and_twitter: "Immer auf dem neuesten Stand dank dem OpenStreetMap-Blog oder Twitter:" - click_the_link_1: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile, um dein - click_the_link_2: Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM. - current_user_1: Eine Liste mit allen Benutzern in einer Kategorie, - current_user_2: "die anzeigt wo sie auf der Welt sind, ist hier verfügbar:" - greeting: Hallo! - hopefully_you: Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für + current_user: "Eine aktuelle Liste von Benutzern in Kategorien, basierend auf ihren Wohnorten, ist verfügbar unter:" introductory_video: "Ein Einführungsvideo zu OpenStreetMap kannst du dir hier anschauen:" more_videos: "Weitere Videos gibt es hier:" opengeodata: "OpenGeoData.org ist das Blog von OpenStreetMap-Gründer Steve Coast; dort gibt es auch einen Podcast:" the_wiki: "Weitere Informationen über OSM findest du in unserem Wiki:" the_wiki_url: http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide - user_wiki_1: Es wird begrüßt wenn du dort eine Benutzerseite erstellst, welche - user_wiki_2: einen Kategorie-Tag enthält der auf deinen Standort hinweist, zum Beispiel [[Category:Users_in_München]]. + user_wiki_page: Es wird dir empfohlen, eine Benutzerseite mit Kategoriemarkierungen deiner Herkunft zu erstellen, z. B. [[Kategorie:Benutzer aus München]]. wiki_signup: "Im Wiki von OpenStreetMap kannst du dich ebenfalls registrieren:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Hauptseite oauth: @@ -1551,6 +1550,10 @@ de: email never displayed publicly: (nicht öffentlich sichtbar) flash update success: Benutzerinformationen erfolgreich aktualisiert. flash update success confirm needed: Benutzerinformationen erfolgreich aktualisiert. Du erhältst eine E-Mail, um deine neue E-Mail-Adresse zu bestätigen. + gravatar: + gravatar: Gravatar verwenden + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: Was ist das? home location: "Standort:" image: "Bild:" image size hint: (quadratische Bilder mit zumindest 100x100 Pixel funktionieren am besten) @@ -1686,6 +1689,7 @@ de: email address: "E-Mail-Adresse:" fill_form: Fülle das Formular aus und dir wird eine kurze E-Mail zur Aktivierung deines Benutzerkontos geschickt. flash create success message: "\nVielen Dank für deine Registrierung. Wir haben eine Bestätigungsnachricht an %{email} gesendet. Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren anfangen.

    Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert, musst du auf dessen Positivliste setzten, da wir auf keine Bestätigungsanfragen reagieren können." + flash welcome: Vielen Dank fürs Anmelden. Wir haben dir eine Willkommensnachricht an %{email} mit einigen Hinweisen zum Anfangen gesandt. heading: Ein Benutzerkonto erstellen license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den Bedingungen für Mitwirkende zustimmen. no_auto_account_create: Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht möglich. diff --git a/config/locales/diq.yml b/config/locales/diq.yml index a1b45a68c..bd2927c58 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -36,7 +36,7 @@ diq: description: Sılasnayış display_name: Nameyo ke Aseno email: E-posta - languages: Zuwani + languages: Zıwani pass_crypt: Parola models: acl: Qontrol Listeyê Resayışi @@ -106,10 +106,10 @@ diq: map: deleted: Esteriya edit: - area: Warey timar ke - node: Qedyin timar ke - relation: Eleqi timar ke - way: Rayer timar ke + area: Wareyê vurnayışi + node: Gıreyê vurnayışi + relation: Eleqeyê vurnayışi + way: Raya vurnayışi loading: Bar beno... navigation: all: @@ -201,7 +201,7 @@ diq: relation: eleqe way: ray way: - edit: Rayer timar ke + edit: Raya vurnayışi view_history: Tarixi bıvin way: Ray way_title: "Ray: %{way_name}" @@ -261,7 +261,7 @@ diq: location: "Herun:" view: Bıvin view: - login: Dekewtış + login: Cıkewtış save_button: Star ke editor: default: Hesıbyaye (%{name} yo ke karêno) @@ -568,16 +568,16 @@ diq: layouts: community: Cemaet community_blogs: Blogê Cemaeti - documentation: Tewsiqkerdış + documentation: Dokumentasyon edit: Timar ke export: Tebergroten help: Peşti history: Ravêrden intro_1: OpenStreetMap yew xeritey dınyayo u merduma hemın rê belaso. intro_2_download: ronayış - log_in: Ronıştış akerê - logout: bıveciyên - logout_tooltip: Bıveciyên + log_in: cı kewe + logout: veciyayış + logout_tooltip: Bıveciye sign_up: Qeyd bı view: Bıvin view_tooltip: Xeriter bımocne @@ -626,8 +626,6 @@ diq: greeting: Merheba, message_notification: hi: Merheba %{to_user}, - signup_confirm_plain: - greeting: Merheba hemna rê! oauth_clients: edit: submit: Bıvurne @@ -706,7 +704,7 @@ diq: edit: bıvurne filename: "Nameyê dosya:" map: xerite - owner: "Rıştayen:" + owner: "Wayir:" points: "Dawte:" tags: "Etiketi:" uploaded_at: "Bar bı:" @@ -741,12 +739,12 @@ diq: view: description: "Şınasiyen:" download: ron - edit: Timar ke + edit: bıvurne filename: "Nameyê dosya:" heading: Rêça %{name} mocnêyêna map: xerite none: Çıniyo - owner: "Rıştayen:" + owner: "Wayir:" pending: PAWEDEYO points: "Dawte:" start_coordinates: "Pêkerden koordinat:" @@ -797,8 +795,8 @@ diq: title: Karberi login: email or username: "Adresê e-posta yana namey karberi:" - heading: Dekewtış - login_button: Dekewtış + heading: Cıkewtış + login_button: Cıkewtış lost password link: Şıma parolay xo ke xo vira? no account: Hesabê şıma çıniyo? openid: "%{logo} OpenID:" @@ -825,11 +823,11 @@ diq: password: "Parola:" register now: Enewkê qeyd bê remember: Mı biya xo viri - title: Dekewtış + title: Cıkewtış logout: heading: OpenStreetMap ra vıcyayış - logout_button: Bıveciyên - title: Bıveciyên + logout_button: Bıvciyê + title: Bıvciyê lost_password: email address: "Adresê e-posta:" heading: To parola ke xo vira? diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 354fdea13..82b097813 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -994,7 +994,6 @@ dsb: partners_ucl: z UCL VR Centre sign_up: registrěrowaś sign_up_tooltip: Konto za wobźěłowanje załožyś - sotm2012: Dojěź ku konference OpenStreetMap 2012, "the State of the Map", 6 - 8. septembra w Tokiju! tag_line: Licha wikikórta swěta user_diaries: Dnjowniki user_diaries_tooltip: Wužywarske dnjowniki cytaś @@ -1010,6 +1009,9 @@ dsb: text: W paźe konflikta mjazy pśełožonym bokom a %{english_original_link}, engelski bok ma prědnosć měś title: Wó toś tom pśełožku legal_babble: + attribution_example: + alt: Pśikład, kak pokazujo se na webboku na OpenStreetMap + title: Pśipokazański pśikład contributors_at_html: "Awstriska: Wopśimujo daty z Stadt Wien (pód CC BY), Land Vorarlberg a Land Tirol (pod CC-BY AT ze změnami)." contributors_ca_html: "Kanada: Wopśimujo daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada)." contributors_footer_1_html: Za dalÅ¡ne drobnostki za to a druge žrědła, kótarež su se wužyli, aby OpenStreetMap pólěpÅ¡yli, glědaj pÅ¡oÅ¡ym bok sobustatkujucych na wikiju OpenStreetMap. @@ -1023,6 +1025,7 @@ dsb: contributors_za_html: "Pódpołdnjowa Afrika: Wopśimujo daty z Chief Directorate: National Geo-Spatial Information, Statne awtorske pÅ¡awo wuměnjone." credit_1_html: Pominamy se, až pódawaÅ¡ sobustatkujucych “© OpenStreetMap”. credit_2_html: Źož jo móžno, OpenStreetMap by měł wótkaz do http://www.openstreetmap.org/ a CC BY-SA do http://creativecommons.org/licenses/by-sa/2.0/ měś. Jolic wužywaÅ¡ medij, źož wótkaze njejsu móžno (na pś. wuśišćane źěło), naraźujomy, až pokazujoÅ¡ swójich cytarjow na www.openstreetmap.org a na www.creativecommons.org. + 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 zjawnych datow, licencěrowanych pód licencu Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA). @@ -1166,14 +1169,13 @@ dsb: header: "%{from_user} jo śi pósłał powěsć pśez OpenStreetMap z temowym nadpismom %{subject}:" hi: Witaj %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Twóju e-mailowu adresu wobkÅ¡uśiś" + created: Něchten (naźejamy se ty) jo rowno konto na %{site_url} załožył. + greeting: Witaj! + subject: "[OpenStreetMap] Witaj do OpenStreetMap" signup_confirm_html: ask_questions: MóžoÅ¡ se za něcym wó OpenStreetMap na naÅ¡om sedle PÅ¡aÅ¡anja a wótegrona pÅ¡aÅ¡aś. - click_the_link: Jolic ty to sy, witaj! Klikni pÅ¡osym dołojce na wótkaz, aby wobkÅ¡uśił toś to konto a cytaj dalej za dalÅ¡ne informacije wo OpenStreetMap current_user: Lisćina aktualnych wužywarjow w kategorijach pó jich městnje w swěśe stoj pód Category:Users_by_geographical_region k dispoziciji. get_reading: DalÅ¡ne informacije wó OpenStreetMap namakajoÅ¡ na wikiju, zastaraj se z nejnowÅ¡ymi powěsćami pśez blog OpenStreetMap abo Twitter, abo pśecytaj blog 0penGeoData załožarja OpenStreetMap Steve Coast za historiju projekta, kótaryž ma teke podkasty! - greeting: Witaj! - hopefully_you: Něchten (naźejucy to) co konto załožyś za introductory_video: MóžoÅ¡ se %{introductory_video_link} woglědaś. more_videos: Su %{more_videos_link}. more_videos_here: how dalÅ¡ne wideo @@ -1183,18 +1185,11 @@ dsb: signup_confirm_plain: ask_questions: "MóžoÅ¡ se za něcym wó OpenStreetMap na naÅ¡om sedle PÅ¡aÅ¡anja a wótegrona pÅ¡aÅ¡aś:" blog_and_twitter: "Zastaraj se z nejnowÅ¡ymi powěsćami pśez blog OpenStreetMap abo Twitter:" - click_the_link_1: Jolic ty to sy, witaj! PÅ¡osym klikni dołojce na wótkaz, aby wobkÅ¡uśił swójo - click_the_link_2: konto a cytaj dalej za dalÅ¡ne informacije wo OpenStreetMap. - current_user_1: Lisćina aktualnych wužywarjow w kategorijach pó jich městnje w swěśe - current_user_2: "stoj how k dispoziciji:" - greeting: Witaj! - hopefully_you: Něchten (naźejucy ty) co konto załožyś za + current_user: "Lisćina aktualnych wužywarjow w kategorijach na zakłaźe togo, źož na swěśe su, stoj k dispoziciji na:" introductory_video: "MóžoÅ¡ se zapokazańske wideo wó OpenStreetMap how woglědaś:" more_videos: "DalÅ¡ne wideo su how:" opengeodata: "OpenGeoData.org jo blog załožarja OpenStreetMap Steve Coast a ma teke podkasty:" the_wiki: "DalÅ¡ne informacije namakajoÅ¡ na wikiju OpenStreetMap:" - user_wiki_1: Pórucujo se, až napórajoÅ¡ wužywarski wikibok, kótaryž wopśimujo - user_wiki_2: kategorijowe atributy, źož sy, na přikład [[Category:Users_in_Chóśebuz]]. wiki_signup: "MóžoÅ¡ se teke za wiki OpenStreetMap registrěrowaś:" oauth: oauthorize: @@ -1523,6 +1518,9 @@ dsb: email never displayed publicly: (njejo nigda widobna) flash update success: Wužywarske informacije wuspěšnje zaktualizěrowane. flash update success confirm needed: Wužywarske informacije wuspěšnje zaktualizěrowane. DostanjoÅ¡ e-mail z napominanim, twóju e-mailowu adresu wobkÅ¡uśiś. + gravatar: + gravatar: Gravatar wužywaś + link text: Co to jo? home location: "Bydlišćo:" image: "Wobraz:" image size hint: (kwadratiske wobraze z nanejmjenjej 100x100 funkcioněruju nejlěpjej) @@ -1658,6 +1656,7 @@ dsb: email address: "E-mailowa adresa:" fill_form: Wupołni formular a pósćelomy śi krotku e-mail za aktiwěrowanje twójogo konta. flash create success message: Źěkujomy se za registrěrowanje. Smy wobkÅ¡uśeński e-mail na %{email} póslali a gaž wobkÅ¡uśijoÅ¡ swójo konto, móžoÅ¡ kartěrowanje zachopiś.

    Jolic wužywaÅ¡ pśeśiwospamowy system, kótaryž sćelo wobkÅ¡uśeńske napÅ¡aÅ¡owanja, pśewzij adresu webmaster@openstreetmap.org do swójeje běłeje lisćiny, dokulaž njamóžomy na wobkÅ¡uśeńske napÅ¡aÅ¡owanja wótegroniś. + flash welcome: Wjeliki źěk za registrěrowanje. Smy pówitańsku powěźeńku na %{email} pósłali, z někotarymi pokazkami wó tom, kak móžoÅ¡ zachopiś. heading: Wužywarske konto załožyś license_agreement: Z wobkÅ¡uśenim twójogo konta dejÅ¡ wuměnjenjam pśinosowarjow pśigłosowaś. no_auto_account_create: Bóžko njamóžomy tuchylu za tebje konto awtomatiski załožyś. diff --git a/config/locales/el.yml b/config/locales/el.yml index 7120d2349..978216507 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -303,7 +303,7 @@ el: comments: ago: "%{ago} πριν" comment: Σχόλιο - has_commented_on: Ο {display_name} % έχει σχολιάσει στις ακόλουθες καταχωρήσεις στο ημερολόγιο + has_commented_on: Ο %{display_name} έχει σχολιάσει στις ακόλουθες καταχωρήσεις στο ημερολόγιο newer_comments: Νεότερα Σχόλια older_comments: Παλαιότερα Σχόλια post: Καταχώρηση @@ -724,7 +724,7 @@ el: houses: Σπίτια island: Νησί islet: Νησίδα - isolated_dwelling: Απομονωμένη οικεία + isolated_dwelling: Απομονωμένη οικία locality: Τοποθεσία moor: Δέστρα municipality: Δήμος @@ -748,6 +748,7 @@ el: light_rail: Ελαφρύ τρένο narrow_gauge: Σιδηρόδρομος Στενής Τροχιάς platform: Πλατφόρμα σιδηροδρόμου + preserved: Διατηρητέος Σιδηρόδρομος station: Σιδηροδρομικός Σταθμός subway: Σταθμός Μετρό subway_entrance: Είσοδος Στο Μετρό @@ -785,6 +786,7 @@ el: greengrocer: Μανάβης grocery: Οπωροπωλείο hairdresser: Κομμωτήριο + hardware: Κατάστημα Σιδηρικών insurance: Ασφαλιστική jewelry: Κοσμηματοπωλείο kiosk: Περίπτερο @@ -919,6 +921,7 @@ el: inbox: date: Ημ/νία from: Από + messages: Έχετε %{new_messages} και %{old_messages} my_inbox: Τα Εισερχόμενα μου new_messages: one: "%{count} νέο μήνυμα" @@ -955,6 +958,9 @@ el: outbox: date: Ημ/νία inbox: εισερχόμενα + messages: + one: Έχετε %{count} απεσταλμένο μήνυμα + other: Έχετε %{count} απεσταλμένα μηνύματα my_inbox: Τα %{inbox_link} μου no_sent_messages: Δεν έχεις στείλει κανένα μήνυμα ακόμα. Γιατί δεν έρχεσαι σε επαφή με μερικά %{people_mapping_nearby_link}? outbox: εξερχόμενα @@ -1010,6 +1016,7 @@ el: with_description: με περιγραφή your_gpx_file: Μοιάζει με δικό σας αρχείο GPX lost_password_html: + click_the_link: Εάν είστε εσείς, παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να γίνει επαναφορά του κωδικού σας. greeting: Γεια, hopefully_you: Κάποιος (πιθανότατα εσείς) έχει ζητήσει επαναφορά του κωδικού πρόσβασης του λογαριασμού στο openstreetmap.org που αντιστοιχεί σε αυτή τη διεύθυνση email. lost_password_plain: @@ -1023,10 +1030,7 @@ el: signup_confirm: subject: "[OpenStreetMap] Επιβεβαιώστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας" signup_confirm_html: - click_the_link: Εάν πρόκειται για σας, Καλώς ήρθατε! Κάντε κλικ στο σύνδεσμο παρακάτω, για να επιβεβαιωθεί ο λογαριασμό σας και διαβάστε για περισσότερες πληροφορίες σχετικά με το OpenStreetMap get_reading: Διάβασε σχετικά με το OpenStreetMap στο wiki, μείνε ενήμερος με τα τελευταία νέα μέσω του OpenStreetMap blog ή το Twitter, ή περιηγήσου στο OpenGeoData blog του ιδρυτή του OpenStreetMap Steve Coast για το ιστορικό του project, το οποίο επίσης έχει podcasts να ακούσεις! - greeting: Γεια! - hopefully_you: Κάποιος (ελπίζουμε εσείς) θέλει να δημιουργήσει ένα λογαριασμό στο introductory_video: Μπορείτε να παρακολουθήσετε ένα %{introductory_video_link}. more_videos: Υπάρχουν {more_videos_link} %. more_videos_here: περισσότερα βίντεο εδώ @@ -1034,18 +1038,10 @@ el: signup_confirm_plain: ask_questions: "Μπορείς να ρωτήσεις για οποιαδήποτε απορία έχεις σχετικά με το OpenStreetMap στην ιστοσελίδα ερωτήσεων και απαντήσεων:" blog_and_twitter: "Μείνε ενήμερος με τα τελευταία νέα μέσω του ιστολογίου του OpenStreetMap ή το Twitter:" - click_the_link_1: Αν αυτός είσαι εσύ, καλώς ήρθες! Παρακαλώ κάνε κλίκ στο σύνδεσμο από κάτω ώστε να επιβεβαιωθεί - click_the_link_2: ο λογαριασμός σου και διάβασε για περισσότερες πληροφορίες σχετικά με το OpenStreetMap. - current_user_1: Ένας κατάλογος με τρέχοντες χρήστες ανά κατηγορίες, βασισμένος στο πού στον κόσμο - current_user_2: "βρίσκονται, είναι διαθέσιμος από:" - greeting: Γεια! - hopefully_you: Κάποιος (ελπίζουμε εσύ) θέλει να δημιουργήσει ένα λογαριασμό στο introductory_video: "Μπορείς να παρακολουθήσεις ένα εισαγωγικό βίντεο για το OpenStreetMap εδώ:" more_videos: "Υπάρχουν περισσότερα βίντεο εδώ:" opengeodata: "Το OpenGeoData.org είναι το ιστολόγιο του ιδρυτή του OpenStreetMap Steve Coast's , έχει επίσης και podcasts:" the_wiki: "Διάβασε σχετικά με το OpenStreetMap στο wiki:" - user_wiki_1: Προτείνεται να δημιουργήσεις μια σελίδα χρήστη wiki, η οποία περιλαμβάνει - user_wiki_2: ετικέτες που επισημαίνουν που βρίσκεσαι, όπως [[Category:Users_in_London]]. wiki_signup: "Ίσως θες επίσης να κάνεις εγγραφή στο OpenStreetMap wiki:" oauth_clients: edit: @@ -1063,9 +1059,6 @@ el: show: confirm: Είστε σίγουροι; requests: "Ζητά της ακόλουθες πληροφορίες από το χρήστη:" - printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" redaction: edit: description: Περιγραφή @@ -1097,6 +1090,7 @@ el: bridge: Μαύρο περίβλημα = γέφυρα bridleway: Μονοπάτι για Άλογα building: Σημαντικό κτίριο + byway: Παράδρομος cable: - Τελεφερίκ - τελεφερίκ με καθίσματα @@ -1485,6 +1479,7 @@ el: revoke: Ανάκληση! revoker_name: Ανακλήθηκε από show: Εμφάνιση + showing_page: Εμφάνιση σελίδας %{page} status: Κατάσταση period: one: 1 ώρα diff --git a/config/locales/en.yml b/config/locales/en.yml index c3fc981ea..ffd180d36 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -379,7 +379,8 @@ en: comment_link: Comment on this entry reply_link: Reply to this entry comment_count: - one: 1 comment + zero: No comments + one: "%{count} comment" other: "%{count} comments" edit_link: Edit this entry hide_link: Hide this entry @@ -1035,22 +1036,22 @@ en: code explains your rights and responsibilities. intro_3_html: | The cartography in our map tiles, and our documentation, are - licensed under the Creative + licensed under the Creative Commons Attribution-ShareAlike 2.0 license (CC-BY-SA). credit_title_html: How to credit OpenStreetMap credit_1_html: | - We require that you use the credit “© OpenStreetMap + We require that you use the credit “© OpenStreetMap contributors”. credit_2_html: | - You must also make it clear that the data is available under the Open - Database License, and if using our map tiles, that the cartography is - licensed as CC-BY-SA. You may do this by linking to - this copyright page. - Alternatively, and as a requirement if you are distributing OSM in a - data form, you can name and link directly to the license(s). In media - where links are not possible (e.g. printed works), we suggest you - direct your readers to openstreetmap.org (perhaps by expanding - 'OpenStreetMap' to this full address), to opendatacommons.org, and + You must also make it clear that the data is available under the Open + Database License, and if using our map tiles, that the cartography is + licensed as CC-BY-SA. You may do this by linking to + this copyright page. + Alternatively, and as a requirement if you are distributing OSM in a + data form, you can name and link directly to the license(s). In media + where links are not possible (e.g. printed works), we suggest you + direct your readers to openstreetmap.org (perhaps by expanding + 'OpenStreetMap' to this full address), to opendatacommons.org, and if relevant, to creativecommons.org. credit_3_html: | For a browsable electronic map, the credit should appear in the corner of the map. @@ -1118,10 +1119,10 @@ en: copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders. infringement_2_html: | - If you believe that copyrighted material has been inappropriately - added to the OpenStreetMap database or this site, please refer - to our takedown - procedure or file directly at our + If you believe that copyrighted material has been inappropriately + added to the OpenStreetMap database or this site, please refer + to our takedown + procedure or file directly at our on-line filing page. notifier: diary_comment_notification: @@ -1156,13 +1157,12 @@ en: subject: "[OpenStreetMap] GPX Import success" loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points. signup_confirm: - subject: "[OpenStreetMap] Confirm your email address" - signup_confirm_plain: + subject: "[OpenStreetMap] Welcome to OpenStreetMap" greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - # next two translations run-on : please word wrap appropriately - click_the_link_1: "If this is you, welcome! Please click the link below to confirm your" - click_the_link_2: "account and read on for more information about OpenStreetMap." + created: "Someone (hopefully you) just created an account at %{site_url}." + confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:" + welcome: "We would like to welcome you and provide you with some additional information to get you started." + signup_confirm_plain: introductory_video: "You can watch an introductory video to OpenStreetMap here:" more_videos: "There are more videos here:" the_wiki: "Get reading about OpenStreetMap on the wiki:" @@ -1172,15 +1172,9 @@ en: ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:" wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page" - # next four translations are in pairs : please word wrap appropriately - user_wiki_1: "It is recommended that you create a user wiki page, which includes" - user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]." - current_user_1: "A list of current users in categories, based on where in the world" - current_user_2: "they are, is available from:" + user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]." + current_user: "A list of current users in categories, based on where in the world they are, is available from:" signup_confirm_html: - greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap" introductory_video: "You can watch an %{introductory_video_link}." video_to_openstreetmap: "introductory video to OpenStreetMap" more_videos: "There are %{more_videos_link}." @@ -1674,6 +1668,7 @@ en: continue: Continue + flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started." flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

    If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." terms accepted: "Thanks for accepting the new contributor terms!" terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." @@ -1798,6 +1793,10 @@ en: preferred languages: "Preferred Languages:" preferred editor: "Preferred Editor:" image: "Image:" + gravatar: + gravatar: "Use Gravatar" + link: "http://wiki.openstreetmap.org/wiki/Gravatar" + link text: "what is this?" new image: "Add an image" keep image: "Keep the current image" delete image: "Remove the current image" diff --git a/config/locales/eo.yml b/config/locales/eo.yml index c5256bcfd..851e145a4 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -6,6 +6,7 @@ # Author: Lucas # Author: LyzTyphone # Author: Michawiki +# Author: Objectivesea # Author: Petrus Adamus # Author: Timsk # Author: Yekrats @@ -254,7 +255,7 @@ eo: changeset_paging_nav: next: Sekvanta » previous: « AntaÅ­a - showing_page: Montrante paĝon + showing_page: Montrante paĝon %{page} changesets: area: Areo comment: Komento @@ -356,6 +357,23 @@ eo: osm_nominatim: Rezultoj el OpenStreetMap Nominatim uk_postcode: Rezultoj el NPEMap / FreeThe Postcode us_postcode: Rezultoj el Geocoder.us + search_osm_nominatim: + prefix: + natural: + hill: Monteto + tree: Arbo + water: Akvo + place: + city: Urbego + country: Lando + farm: Farmobieno + house: Domo + houses: Domoj + region: Regiono + sea: Maro + town: Urbo + tourism: + museum: Muzeo layouts: donate: Subtenu OpenStreetMap %{link} al Fonduso de Ĝisdatigo de Aparataro. donate_link_text: donacante @@ -363,7 +381,7 @@ eo: export: Eksporti export_tooltip: Eksporti mapajn datumojn gps_traces: GPS spuroj - gps_traces_tooltip: Manipuli spurojn + gps_traces_tooltip: Manipuli la GPS-spurojn history: Historio home: hejmo home_tooltip: Iri al hejmloko @@ -386,14 +404,18 @@ eo: user_diaries: Uzantĵurnaloj user_diaries_tooltip: Vidi uzantĵurnalojn view: Vidi - view_tooltip: Vidi mapojn + view_tooltip: Vidi la mapon welcome_user: Bonvenon, %{user_link} welcome_user_link_tooltip: Via uzantpaĝo + license_page: + foreign: + title: Pri ĉi tiu traduko message: delete: deleted: Mesaĝo forigita inbox: date: Dato + from: De my_inbox: Mia leterkesto title: Alvenkesto mark: @@ -414,12 +436,16 @@ eo: date: Dato inbox: Alvenkesto my_inbox: Mia %{inbox_link} + subject: Temo + to: Al read: back_to_inbox: Reen al mesaĝejo date: Dato + from: De reading_your_messages: Legante viajn mesaĝojn reading_your_sent_messages: Legante viajn senditajn mesaĝojn reply_button: Respondi + subject: Temo title: Legi mesaĝon to: Al unread_button: Marki kiel nelegita @@ -522,6 +548,9 @@ eo: - tramo - tramo wood: Arbaro + markdown_help: + image: Bildo + text: Teksto search: search: Serĉi search_help: "ekzemploj: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' aÅ­ 'poŝtoficejoj proksime de Lünen' pliaj ekzemploj..." @@ -578,13 +607,13 @@ eo: trace_details: Vidi detalojn de spuro view_map: Vidi Mapon trace_form: - description: Priskribo + description: "Priskribo:" help: Helpo - tags: Etikedoj + tags: "Etikedoj:" tags_help: dislimataj de komoj upload_button: Alŝuti - upload_gpx: Alŝuti GPX dosieron - visibility: Videbleco + upload_gpx: "Alŝuti GPX dosieron:" + visibility: "Videbleco:" visibility_help: Kion tio signifas ? trace_header: see_all_traces: Vidi ĉiujn spurojn diff --git a/config/locales/es.yml b/config/locales/es.yml index f71302630..1f8d1cffc 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -997,7 +997,6 @@ es: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: registrarse sign_up_tooltip: Cree una cuenta para editar - sotm2012: ¡Ven a la Conferencia de OpenStreetMap Estados Unidos 2012, El Estado del Mapa en los EE.UU., del 13 al 14 de octubre en Portland, Oregon! tag_line: El WikiMapaMundi libre user_diaries: Diarios de usuario user_diaries_tooltip: Ver diarios de usuario @@ -1013,6 +1012,9 @@ es: text: En el caso de un conflicto entre esta página traducida y %{english_original_link}, la versión inglesa prevalecerá title: Acerca de esta traducción legal_babble: + attribution_example: + alt: Ejemplo de como dar reconocimiento a OpenStreetMap en una página web + title: Ejemplo de atribución contributors_at_html: "Austria: Contiene datos de\n Stadt Wien (bajo\n CC BY), Land Vorarlberg y Land Tirol (bajo licencia CC-BY AT con modificaciones)." contributors_ca_html: "Canadá: Contiene datos de GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada)." contributors_footer_1_html: Para obtener más detalles sobre estas y otras fuentes que se han utilizado para ayudar a mejorar OpenStreetMap, por favor vea la página de colaboradores en el Wiki de OpenStreetMap. @@ -1026,6 +1028,7 @@ es: contributors_za_html: "Sudáfrica: Contiene datos extraídos de \t\n Chief Directorate: Información \n Nacional Geoespacial, State copyright reserved." credit_1_html: Requerimos que utilices los créditos "© Colaboradores de OpenStreetMap". credit_2_html: "Usted debe también dejar claro que los datos están disponibles bajo la licencia Open Database License (ODbL), y si utiliza nuestros mapas, que la cartografía posee licencia CC-BY-SA. Puede hacer esto mediante el enlace a esta página de derechos de autor.\nComo alternativa y como un requisito si están distribuyendo OSM en un formulario de datos, puede nombrar y enlazar directamente a las licencias. En medios de comunicación donde los enlaces no sean posibles (por ejemplo, obras impresas), le sugerimos que\ndirija a sus lectores a openstreetmap.org (quizás expandiendo 'OpenStreetMap' hasta esta dirección completa), a opendatacommons.org, y si procede, a creativecommons.org." + credit_3_html: "En un mapa electrónico navegable, los créditos deben aparecer en la esquina del mapa.\nPor ejemplo:" credit_title_html: Cómo dar reconocimiento a OpenStreetMap 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 procedimiento de desmantelamiento o preséntelo directamente en nuestra página de presentación en línea. @@ -1165,14 +1168,15 @@ es: header: "%{from_user} te ha enviado un mensaje a través de OpenStreetMap con el asunto %{subject}:" hi: Hola %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Confirme su dirección de correo electrónico" + confirm: "Antes de hacer nada, tenemos que confirmar que esta solicitud procede de ti, así que si esto es cierto haz clic en el siguiente enlace para confirmar tu cuenta:" + created: Alguien (probablemente tú) acaba de crear una cuenta en %{site_url}. + greeting: ¡Hola! + subject: "[OpenStreetMap] Bienvenido a OpenStreetMap" + welcome: Queremos darte la bienvenida y suministrarte alguna información adicional para ayudarte a comenzar signup_confirm_html: ask_questions: Puedes hacer cualquier pregunta en relación al OpenStreetMap en nuestro sitio de preguntas y respuestas. - click_the_link: Si este es usted, ¡Bienvenido! Por favor, pulse en el enlace más abajo para confirmar su cuenta y leer más información sobre OpenStreetMap. current_user: Un listado categorizado de usuarios actuales, basado en que zona del mundo se encuentran, está disponible desde Category:Users_by_geographical_region. get_reading: Siga leyendo sobre OpenStreetMap en el wiki, póngase al día con las últimas noticias vía el blog de OpenStreetMap o Twitter, o navegue por el blog del fundador de OpenStreetMap Steve Coast OpenGeoData para conocer la historia abreviada del proyecto, que además también tiene podcasts para escuchar - greeting: ¡Hola! - hopefully_you: Alguien (probablemente usted) ha creado una cuenta en introductory_video: Puede ver un %{introductory_video_link} more_videos: Hay más %{more_videos_link} more_videos_here: ví­deos aquí­ @@ -1182,19 +1186,13 @@ es: signup_confirm_plain: ask_questions: "Puedes hacer cualquier pregunta en relación a OpenStreetMap en nuestro sitio de preguntas y respuestas:" blog_and_twitter: "Ponte al día con las últimas noticias a través del blog de OpenStreetMap o Twitter:" - click_the_link_1: Si este es usted, ¡Bienvenido! Por favor, pulse en el enlace más abajo para - click_the_link_2: confirmar su cuenta y leer más información sobre OpenStreetMap. - current_user_1: Una lista de todos los usuarios por categorí­as, basado en su procedencia, - current_user_2: "está disponible en:" - greeting: ¡Hola! - hopefully_you: Alguien (probablemente usted) ha creado una cuenta en + current_user: "Una lista de todos los usuarios actuales en categorías, según en qué lugar del mundo se encuentran, está disponible en:" introductory_video: "Puede ver un vídeo introductorio sobre OpenStreetMap aquí­:" more_videos: "Hay más ví­deos aquí­:" opengeodata: "OpenGeoData.org es el blog del fundador de OpenStreetMap Steve Coast, y también tiene podcasts:" the_wiki: "Lea más sobre OpenStreetMap en el wiki:" the_wiki_url: http://wiki.openstreetmap.org/wiki/ES:Beginners_Guide - user_wiki_1: Recomendamos que cree una página de usuario en el wiki, que incluya - user_wiki_2: etiquetas de categorí­a pasa saber de dónde es (por ejemplo [[Category:Users_in_Madrid]]) + user_wiki_page: Te recomendamos que crees una página wiki de usuario, y que incluyas etiquetas de categoría indicando donde estás, como por ejemplo [[Category:Users_in_London]]. wiki_signup: "Puede que también quiera registrarse en el Wiki de OpenStreetMap en:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&returnto=ES:Main_Page oauth: @@ -1524,6 +1522,10 @@ es: email never displayed publicly: (nunca es mostrado públicamente) flash update success: La información del usuario se ha actualizado correctamente. flash update success confirm needed: La información del usuario se ha actualizado correctamente. Compruebe su correo electrónico para ver una nota sobre cómo confirmar su nueva dirección de correo electrónico. + gravatar: + gravatar: Usa Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: ¿Qué es esto? home location: "Lugar de origen:" image: "Imagen:" image size hint: (las imágenes cuadradas de al menos 100x100 funcionan mejor) @@ -1659,6 +1661,7 @@ es: email address: "Dirección de correo electrónico:" fill_form: Rellene el formulario y le enviaremos un mensaje de correo electrónico rápido para activar su cuenta. flash create success message: Gracias por registrarte. Te hemos enviado un correo de confirmación a %{email} y tan pronto como confirmes tu cuenta podrás mapear :-).

    Por favor, ten en cuenta que no podrás acceder hasta que hayas recibido el aviso y confirmado tu dirección de correo electrónico,.

    Si utilizas un sistema de bloqueo de correo no deseado que envía solicitudes de confirmación, asegúrate por favor de incluir entre tus remitentes seguros a webmaster@openstreetmap.org, puesto que nosotros no podemos responder solicitudes de confirmación. + flash welcome: Gracias por registrarte. Te hemos enviado un mensaje de bienvenida a %{email} con algunos ejemplos de por donde comenzar. heading: Crear una cuenta de usuario license_agreement: Cuando confirmes tu cuenta tendrás que aceptar los términos del contribuyente. no_auto_account_create: Desafortunadamente no estamos actualmente habilitados para crear una cuenta para ti automáticamente. diff --git a/config/locales/et.yml b/config/locales/et.yml index 9636897ae..72e690699 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -659,7 +659,6 @@ et: title: Toeta OpenStreetMapi rahaliselt sign_up: registreeru sign_up_tooltip: Redigeerimiseks loo omale konto - sotm2012: Tule 2012 OpenStreetMapi konverentsile The State of the Map 6.-8. septembril Tokyos! tag_line: Vaba viki-maailmakaart user_diaries: Kasutajate päevikud user_diaries_tooltip: Vaata kasutajate päevikuid @@ -764,8 +763,6 @@ et: hi: Tere, %{to_user}, signup_confirm: subject: "[OpenStreetMap] E-posti aadressi kinnitamine" - signup_confirm_plain: - greeting: Hei! oauth: oauthorize: allow_write_api: muuda kaarti. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 8f7880b9d..42a24abdb 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -569,12 +569,9 @@ eu: message_notification: hi: Kaixo %{to_user}, signup_confirm_html: - greeting: Kaixo! introductory_video: "%{introductory_video_link} ikus dezakezu." more_videos: "%{more_videos_link} daude." more_videos_here: bideo gehiago hemen - signup_confirm_plain: - greeting: Kaixo! oauth: oauthorize: allow_write_api: mapa aldatu. diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 68b4d5fdc..ea2f6f667 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -804,10 +804,6 @@ fa: greeting: سلام ، message_notification: hi: سلام %{to_user}, - signup_confirm_html: - greeting: سلام! - signup_confirm_plain: - greeting: سلام! oauth_clients: edit: submit: ویرایش diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 50ebc1711..6a2ca9b29 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -53,7 +53,7 @@ fi: models: acl: Pääsyoikeuslista changeset: Muutoskokoelma - changeset_tag: Muutoskokoelman tunniste + changeset_tag: Muutoskokoelman tagi country: Maa diary_comment: Päiväkirjan kommentti diary_entry: Päiväkirjamerkintä @@ -61,29 +61,29 @@ fi: language: Kieli message: Viesti node: Piste - node_tag: Pisteen tunniste + node_tag: Pisteen tagi notifier: Ilmoitus old_node: Vanha piste - old_node_tag: Vanha pisteen tunniste. + old_node_tag: Vanha pisteen tagi old_relation: Vanha relaatio old_relation_member: Vanha relaation jäsen - old_relation_tag: Vanha relaation tunniste. + old_relation_tag: Vanha relaation tagi old_way: Vanha polku - old_way_node: Vanha tien piste - old_way_tag: Vanha tien tunniste + old_way_node: Vanha polun piste + old_way_tag: Vanha tien tagi relation: Relaatio relation_member: Relaation jäsen - relation_tag: Relaation tunniste + relation_tag: Relaation tagi session: Istunto trace: Jälki tracepoint: Jälkipiste - tracetag: Jäljen tunniste + tracetag: Jäljen tagi user: Käyttäjä user_preference: Käyttäjän asetus user_token: Käyttäjän tunnus - way: Viiva - way_node: Viivan piste - way_tag: Viivan tunniste + way: Polku + way_node: Polun piste + way_tag: Polun tagi application: require_cookies: cookies_needed: Selaimen evästeet on otettu pois päältä - salli evästeiden käyttö selaimessasi ennen jatkamista. @@ -114,8 +114,8 @@ fi: 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: @@ -124,7 +124,7 @@ fi: deleted_by: "Poistaja:" edited_at: "Muokattu:" edited_by: "Muokkaaja:" - in_changeset: "Muutoskokoelma:" + in_changeset: "Muutoskokoelmassa:" version: "Versio:" containing_relation: entry: Relaatio %{relation_name} @@ -164,7 +164,7 @@ fi: view_history: Näytä historia node_details: coordinates: "Koordinaatit:" - part_of: "Osana teitä:" + part_of: "Osana polkuja:" node_history: download_xml: Lataa muokkaushistorian XML node_history: Pisteen muokkaushistoria @@ -240,11 +240,11 @@ fi: private_user: käyttäjä show_areas: Näytä alueet show_history: Näytä historia - unable_to_load_size: "Ei voi ladata: Laatikon rajojen koko %{bbox_size} on liian suuri (täytyy olla pienempi kuin %{max_bbox_size})" + unable_to_load_size: "Lataaminen epäonnistui: Alueen koko %{bbox_size} on liian suuri (täytyy olla pienempi kuin %{max_bbox_size})" wait: Odota... zoom_or_select: Katso pienempää aluetta tai valitse kartalta alue, jonka tiedot haluat tag_details: - tags: "Tunnisteet:" + tags: "Tagit:" wiki_link: key: Wikisivu tietueelle %{key} tag: Wikisivu tietueelle %{key}=%{value} @@ -264,8 +264,8 @@ fi: way_title: "Polku: %{way_name}" way_details: also_part_of: - one: on myös osana polkua %{related_ways} - other: on myös osana polkuja %{related_ways} + one: on myös osana viivaa %{related_ways} + other: on myös osana viivoja %{related_ways} nodes: "Pisteet:" part_of: "Relaatiojäsenyydet:" way_history: @@ -391,10 +391,10 @@ fi: editor: default: Oletus (tällä hetkellä %{name}) potlatch: - description: Potlatch 1 (selaineditori) + description: Potlatch 1 (verkkopohjainen kartanmuokkaus) name: Potlatch 1 potlatch2: - description: Potlatch 2 (selaineditori) + description: Potlatch 2 (verkkopohjainen kartanmuokkaus) name: Potlatch 2 remote: description: Kauko-ohjaus (JOSM tai Merkaartor) @@ -583,7 +583,7 @@ fi: bridge: aqueduct: Akvedukti suspension: Riippusilta - swing: Riippusilta + swing: Kääntösilta viaduct: Maasilta "yes": Silta building: @@ -651,7 +651,7 @@ fi: landuse: allotments: Siirtolapuutarha basin: Syvänne - brownfield: Viljelysmaa + brownfield: Purettujen rakennusten alue cemetery: Hautausmaa commercial: Kaupallinen alue conservation: Suojeltu kohde @@ -992,8 +992,7 @@ fi: partners_ucl: UCL VR Centre sign_up: rekisteröidy sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta - sotm2012: Tule OpenStreetMapin kansainväliseen kokoukseen, The State of the Map 2012:een, joka järjestetään 6.–8. syyskuuta Tokiossa! - tag_line: Vapaa wikipohjainen maailmankartta + tag_line: Vapaa ja avoin maailmankartta user_diaries: Päiväkirjamerkinnät user_diaries_tooltip: Näytä käyttäjän päiväkirjat view: Kartta @@ -1002,17 +1001,21 @@ fi: welcome_user_link_tooltip: Käyttäjäsivusi wiki: Wiki wiki_title: Projektin wikisivusto + wiki_url: http://wiki.openstreetmap.org/wiki/Fi:Main_Page license_page: foreign: english_link: englanninenkielisen alkuperäisversion text: Jos tämän käännetyn sivun ja %{english_original_link} välillä on eroja, englanninkielinen sivu on aina etusijalla. title: Tietoja tästä käännöksestä legal_babble: + attribution_example: + alt: Esimerkki siitä, miten nimetä OpenStreetMap nettisivulla + title: Nimeämisesimerkki contributors_at_html: "Itävalta: Sisältää karttatietoja\nStadt Wienistä (\nCC BY -lisenssillä),\nLand Vorarlbergista ja\nLand Tirolista (CC-BY AT -lisenssillä tietyin muutoksin)." contributors_ca_html: "Kanada: Sisältää karttatietoja\n GeoBasesta ®, GeoGratisista (© Department of Natural\n Resources Canada), CanVecista (© Department of Natural\n Resources Canada), ja StatCanista (Geography Division,\n Statistics Canada)." contributors_footer_1_html: "Täydellinen lista OpenStreetMapin tukijoista löytyy OpenStreetMapin wikistä Avustajat-sivulta." contributors_footer_2_html: "Tietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja\nottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta." - contributors_fr_html: "France: Sisältää karttatietoja\n Direction Générale des Impôtsista." + contributors_fr_html: "Ranska: Sisältää karttatietoja\n Direction Générale des Impôtsista." contributors_gb_html: "Iso-Britanna: Sisältää Ordnance Surveyn\nkeräämiä karttatietoja © Crown Copyright ja tietokantojen käyttöoikeus 2010-12." contributors_intro_html: "Tekijöinämme on tuhansia yksityishenkilöitä. Olemme myös sisällyttäneet\nvapaasti lisensöityä dataa kansallisilta kartoitustoimistoilta\nja muista lähteistä, muun muassa:" contributors_nl_html: "Alankomaat: Sisältää © AND-karttatietoja vuodelta 2007\n(www.and.com)" @@ -1022,6 +1025,8 @@ fi: credit_1_html: Vaadimme että mainitset "© OpenStreetMapin tekijät, CC BY-SA". credit_2_html: "Teidän tulee tehdä selväksi, että data on saatavilla Open Database Lisenssillä,\nja jos käytätte karttaruutuja, ne ovat lisenssöity CC-BY-SA-lisenssillä.\nVoit tehdä tämän linkittämällä\ntekijänoikeussivulle. \nJos hyperlinkit eivät ole mahdollisia (esimerkiksi tulostettu työ),\nsuosittelemme, että ohjaat lukijat osoitteisiin www.openstreetmap.org\nja opendatacommons.org, ja jos merkityksellistä, osoitteeseen creativecommons.org." credit_title_html: OpenStreetMapin mainitseminen + 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ä poistopyyntö tai ilmoittaa suoraan. infringement_title_html: Tekijänoikeusloukkaus intro_1_html: "OpenStreetMapin sisältö on avointa tietoa, joka on lisensoitu \nCreative Commonsin Nimeä-Tarttuva 2.0 Raakaversio -lisenssilllä (CC BY-SA)." 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.\nLegal codessa\nkerrotaan oikeutesi ja velvollisuutesi." @@ -1157,14 +1162,15 @@ fi: header: "%{from_user} on lähettänyt sinulle viestin OpenStreetMapin kautta, otsikko %{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] Sähköpostiosoitteen vahvistus" + welcome: Tervetuloa OpenStreetMap-karttapalveluun! Haluaisimme kertoa joitain hyödyllisiä asioita, jotta pääset alkuun. signup_confirm_html: ask_questions: OpenStreetMapista voi esittää kysymyksiä kysymyksiä ja vastauksia -sivulla. - click_the_link: Jos se olet sinä, tervetuloa! Ole hyvä ja napsauta linkkiä alla vahvistaaksesi käyttäjätilin ja lukeaksesi tietoa OpenStreetMapista current_user: Lista nykyisistä käyttäjistä eri kategorioissa, perustuen heidän sijaintiinsa maailmassa, löytyy sivulta Category:Users_by_geographical_region. get_reading: Wikissä on tietoa OpenStreetMapista, uusimmat uutiset löytyvät OpenStreetMap-blogista tai Twitteristä, lisäksi OpenStreetMapin perustaneen Steve Coastin OpenGeoData-blogi käsittelee projektin historiaa, kuunneltavissa on myös podcasteja! - greeting: Hei! - hopefully_you: Joku (toivottavasti sinä) tahtoo luoda käyttäjätilin osoitteessa introductory_video: Voit katsella %{introductory_video_link}. more_videos: On olemassa %{more_videos_link}. more_videos_here: lisää videoita täällä @@ -1174,19 +1180,15 @@ fi: signup_confirm_plain: ask_questions: "Voit kysyä kysymyksiä OpenStreetMapiin liittyen kysymys-ja-vastaus -sivustollamme:" blog_and_twitter: "Katso viimeisimmät uutiset OpenStreetMap-blogista tai Twitteristä:" - click_the_link_1: Jos se olit sinä, tervetuloa! Napsauta linkkiä alla vahvistaaksesi - click_the_link_2: tilisi ja lukeaksesi lisätietoja OpenStreetMapista. - current_user_1: Luettelo tämänhetkisistä käyttäjistä luokissa, pohjautuen heidän sijaintiin - current_user_2: "ne ovat, on saatavilla täältä:" - greeting: Hei! - hopefully_you: Joku (toivottavasti sinä) haluaa luoda tilin + current_user: "Lista nykyisistä sijaintipohjaisista käyttäjäluetteloista löytyy täältä:" introductory_video: "Voit katsoa OpenStreetMap-esittelyvideon täällä:" more_videos: "Lisää videoita:" opengeodata: "OpenGeoData.org on OpenStreetMapin perustajan Steve Coastin blogi. Myös podcasteja on saatavissa:" the_wiki: "Lue lisää OpenStreetMapista wikissä:" - user_wiki_1: On suositeltavaa, että luot käyttäjäsivun, joka sisältää - user_wiki_2: "sijaintisi ilmoittavan luokka-tagin. Esimerkiksi näin: [[Category:Users_in_London]]." + the_wiki_url: http://wiki.openstreetmap.org/wiki/Fi:Beginners%27_guide + user_wiki_page: On suositeltavaa luoda käyttäjäsivu, jossa esimerkiksi kerrotaan asuinpaikkasi. Esimerkiksi lontoolaiset käyttäjät löytyvät sivulta [[Category:Users_in_London]]. wiki_signup: "Saatat myös haluta rekisteröityä OpenStreetMap-wikiin:" + wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Fi:Main_Page oauth: oauthorize: allow_read_gpx: lukea yksityisiä GPS-jälkiäsi @@ -1202,6 +1204,8 @@ fi: oauth_clients: create: flash: Tiedot on lähetetty hyväksyttäväksi. + destroy: + flash: Sovelluksen käyttöoikeus on poistettu. edit: submit: Muokkaa title: Muokkaa sovellustasi @@ -1226,18 +1230,23 @@ fi: my_tokens: Valtuutetut sovellukset no_apps: Oletko kehittänyt sovelluksen, jonka haluaisit käyttävän %{oauth}-kirjautumismenetelmää? Sovellus on rekisteröitävä, ennen kuin se voi lähettää kirjautumispyyntöjä tähän palveluun. register_new: Rekisteröi sovelluksesi + registered_apps: "Seuraavat sovellukset käyttävät käyttäjätunnustasi:" revoke: Peruuta! title: Omat OAuth-tietoni new: submit: Rekisteröi title: Rekisteröi uusi sovellus + not_found: + sorry: Valitettavasti tyyppiä %{type} ei löydy. show: + access_url: "Pääsyavaimen URRL-osoite:" allow_read_gpx: lukea heidän yksityisiä GPS-jälkiään allow_read_prefs: lukea heidän käyttäjäasetuksiaan allow_write_api: muokata karttaa allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä ystäviä. allow_write_gpx: tallentaa GPS-jälkiä allow_write_prefs: muokata heidän käyttäjäasetuksiaan + authorize_url: "Valtuuta URL-osoite:" confirm: Oletko varma? delete: Poista asiakas edit: Muokkaa yksityiskohtia @@ -1283,13 +1292,13 @@ fi: site: edit: anon_edits_link_text: Perustelut (englanniksi) julkisuusvaatimukselle. - flash_player_required: Potlatch-editori tarvitsee Flash player -laajennuksen. Saat sen Adobe.comin download Flash Player -sivulta. Kartan muokkaamiseen on useita muitakin ohjelmia. - no_iframe_support: Selaimesi ei tue HTML iframeja, joita tähän ominaisuuteen tarvitaan. + flash_player_required: Potlatch-karttamuokkausohjelman käyttö edellyttää Flash Player -lisäosan asentamista. Lataa Flash Player sitä ylläpitävän Adoben verkkosivuilta. Karttaa voi muokata myös muilla ohjelmistoilla. + no_iframe_support: Käytössä oleva selain ei tue HTML-kehyksiä, joka vaaditaan tämän toiminnon käyttämiseen. not_public: Muokkauksesi eivät ole julkisia. not_public_description: Et voi enää muokata karttaa ennen kuin vaihdat muokkauksesi julkisiksi. Voit vaihtaa asetuksen %{user_page}-sivulta. potlatch2_not_configured: Potlatch 2 ei ole määritetty - Katso lisätietoja http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Olet tehnyt tallentamattomia muutoksia. (Tallentaaksesi Potlatch 2 -editorissa voit napsauttaa.) - potlatch_unsaved_changes: Tallentamattomia muutoksia. Tallentaaksesi muutokset Potlatchissa, poista valinta nykyiseltä karttakohteelta; tai paina Tallenna -nappia jos sellainen on käytössä. + potlatch2_unsaved_changes: Karttaan on tehty tallentamattomia muutoksia. Tallenna muokkaukset Potlatch 2:ssa napsauttamalla Tallenna-painiketta. + 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. @@ -1414,7 +1423,7 @@ fi: points: "Pisteet:" save_button: Tallenna muutokset start_coord: "Alun koordinaatit:" - tags: "Tunnisteet:" + tags: "Tagit:" tags_help: pilkuilla erotettu lista title: Muokataan jälkeä %{name} uploaded_at: "Lähetetty:" @@ -1424,7 +1433,7 @@ fi: empty_html: Sivu on tyhjä. Lähetä uusi GPS-jälki tai lue lisätietoja GPS-jälkien keräämisestä wikisivulta. public_traces: Julkiset GPS-jäljet public_traces_from: Käyttäjän %{user} julkiset GPS-jäljet - tagged_with: ", joilla on tunniste %{tags}" + tagged_with: ", joilla on tagi %{tags}" your_traces: Omat GPS-jäljet make_public: made_public: Jäljestä tehtiin julkinen @@ -1466,7 +1475,7 @@ fi: traces_waiting: Lähettämiäsi jälkiä on jo %{count} käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan. upload_trace: Lisää GPS-jälki trace_optionals: - tags: Tunnisteet + tags: Tagit trace_paging_nav: newer: Uudet jäljet older: Vanhat jäljet @@ -1485,7 +1494,7 @@ fi: pending: ODOTTAA KÄSITTELYÄ points: "Pisteitä:" start_coordinates: "Alkupisteen koordinaatit:" - tags: Tunnisteet + tags: Tagit title: Näytetään jälkeä %{name} trace_not_found: Jälkeä ei löydy! uploaded: "Lähetetty:" @@ -1509,6 +1518,9 @@ fi: email never displayed publicly: (ei näy muille) flash update success: Käyttäjätietojen muutokset on tallennettu. flash update success confirm needed: Käyttäjätietojen muutokset on tallennettu. Vahvista uusi sähköpostiosoite siihen lähetettyjen ohjeiden mukaisesti. + gravatar: + gravatar: Käytä Gravataria + link text: mikä tämä on? home location: "Kotipaikka:" image: "Kuva:" image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään 100x100) @@ -1546,6 +1558,7 @@ fi: button: Vahvista heading: Vahvista käyttäjätunnuksen luominen press confirm button: Aktivoi uusi käyttäjätunnuksesi valitsemalla Vahvista. + reconfirm: Jos rekisteröitymisestäsi on kulunut jonkin aikaa, voit ehkä joutua lähettämään itsellesi uuden vahvistussähköpostin. success: Käyttäjätunnuksesi on nyt vahvistettu. confirm_email: button: Vahvista @@ -1567,6 +1580,7 @@ fi: hide: Piilota valitut käyttäjät title: Käyttäjät login: + account is suspended: Valitettavasti käyttäjätilisi on jäädytetty epäilyttävän toiminnan seurauksena.
    Ole hyvä ja ota yhteyttä webmasteriin jos haluat keskustella tästä. account not active: Käyttäjätunnustasi ei ole vielä aktivoitu.
    Aktivoi käyttäjätunnuksesi napsauttamalla sähköpostitse saamaasi vahvistuslinkkiä, tai pyydä uusi varmistusviesti. auth failure: Kirjautuminen epäonnistui. create account minute: Luo käyttäjätunnus. Se kestää vain hetken. @@ -1576,6 +1590,7 @@ fi: lost password link: Unohditko salasanasi? new to osm: Oletko uusi OpenStreetMapin käyttäjä? no account: Eikö sinulla vielä ole käyttäjätunnusta? + openid: "%{logo} OpenID:" openid invalid: Valitettavasti OpenID-tunnuksesi vaikuttaa olevan virheellinen. openid missing provider: Yhteyden muodostaminen OpenID-palvelimeen epäonnistui openid_logo_alt: Kirjaudu sisään OpenID-tunnuksella @@ -1633,6 +1648,7 @@ fi: email address: "Sähköpostiosoite:" fill_form: Lomakkeen täyttämisen jälkeen annettuun sähköpostiosoitteeseen lähetetään vahvistusviesti, jolla aktivoidaan käyttäjätunnus. flash create success message: Kiitos rekisteröitymisestä. Olemme lähettäneet vahvistusviestin osoitteeseen %{email}. Vahvistettuasi käyttäjätunnuksesi voit aloittaa kartoittamisen.

    Jos käytät roskapostit suodattavaa ohjelmaa, joka lähettää vahvistusviestejä, laita webmaster@openstreetmap.org sallittujen osoitteiden listalle, sillä emme voi vastata vahvistusviesteihin. + flash welcome: Kiitos rekisteröitymisestä! Sähköpostiosoitteeseen %{email} pitäisi tulla hetken kuluttua vahvistusviesti. heading: Luo uusi käyttäjätunnus license_agreement: Kun vahvistat tilisi sinun on sitouduttava osallistujan ehtoihin. no_auto_account_create: Automaattinen käyttäjätunnuksen luonti ei ole juuri nyt käytössä. @@ -1669,6 +1685,8 @@ fi: set_home: flash success: Kodin sijainnin tallennus onnistui suspended: + heading: Käyttäjätili jäädytetty + title: Käyttäjätili jäädytetty webmaster: webmaster terms: agree: Hyväksyn @@ -1777,12 +1795,17 @@ fi: empty: Ei estoja. heading: Luettelo käyttäjän estoista title: Estetyt käyttäjät + model: + non_moderator_revoke: Sinun on oltava moderaattori poistaaksesi eston. + non_moderator_update: Sinun on oltava moderaattori luodaksesi tai muokataksesi estoa. new: back: Näytä kaikki estot + heading: Luodaan esto käyttäjälle %{name} needs_view: Käyttäjän tulee kirjautua sisään ennen tämän eston poistumista period: Kuinka kauan käyttäjä on estetty käyttämästä APIa. Esto alkaa heti. reason: Syy käyttäjän %{name} estoon. Ole mahdollisimman rauhallinen ja järkevä. Anna niin paljon yksityiskohtia tilanteesta kuin voit. Muista, että viesti tulee olemaan esillä julkisesti. Muista myös, että kaikki käyttäjät eivät ymmärrä yhteisön slangia. Käytä siis maallikkojen termejä. submit: Luo esto + title: Luodaan esto käyttäjälle %{name} tried_contacting: Olen ottanut yhteyttä käyttäjään ja pyytänyt heitä lopettamaan. tried_waiting: Olen antanut käyttäjälle kohtuullisen ajan vastata näihin viesteihin. not_found: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7d6fbbaf1..7fdb5cf7e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -12,6 +12,7 @@ # Author: Gomoko # Author: Hashar # Author: IAlex +# Author: JB # Author: Jean-Frédéric # Author: Jiremek # Author: Litlok @@ -1007,7 +1008,6 @@ fr: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: S'inscrire sign_up_tooltip: Créer un compte pour la modification - sotm2012: Venez à la Conférence OpenStreetMap 2012 aux États-Unis, l’état de la carte US, les 13 et 14 octobre à Portland, Oregon! tag_line: La carte coopérative libre user_diaries: Journaux user_diaries_tooltip: Voir les journaux d'utilisateurs @@ -1023,6 +1023,9 @@ fr: text: En cas de conflit entre cette page et la page %{english_original_link}, la version anglaise prime title: À propos de cette traduction legal_babble: + attribution_example: + alt: Exemple d'attribution OpenStreetMap sur une page internet + title: Exemple d'attribution contributors_at_html: "Autriche: Contient des données sur\n la ville de Vienne (sous licence\n CC BY 3.0 Autriche),\n la région du Vorarlberg. et la région du Tyrol (sous licence CC-BY AT avec amendements)." contributors_ca_html: "Canada : contient des données de\n GeoBase®, GeoGratis (© Département des Ressources\n naturelles du Canada), CanVec (© Département des Ressources\n naturelles du Canada) et StatCan (Division Géographie,\n Statistiques du Canada)." contributors_footer_1_html: "Pour plus de détails sur ceux-ci, et les autres sources utilisées pour aider à améliorer OpenStreetMap, voyez la page des Contributeurs sur le wiki de OpenStreetMap." @@ -1036,6 +1039,7 @@ fr: contributors_za_html: "Afrique du Sud: Contient des données issues de\nDirection principale:\nInformation Géospatiale Nationale, tous droits de l'État réservés." credit_1_html: Nous demandons que votre crédit comporte la mention « © les contributeurs d’OpenStreetMap ». credit_2_html: "Vous devez également préciser clairement que les données sont disponibles sous la licence\n ODbL, et si vous utilisez les tuiles de notre carte, que la carte est sous\n la licence CC-BY-SA. Vous pouvez mentionner ceci avec un lien hypertexte vers\n cette page de mentions légales.\n Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous\n forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences.\n Sur les supports où les liens hypertexte sont impossibles (par exemple sur un support papier), nous vous suggérons\n de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant\n « OpenStreetMap » en l'adresse openstreetmap.org), vers opendatacommons.org, et,\n si c'est pertinent, vers creativecommons.org." + credit_3_html: "Pour une carte électronique navigable, le crédit devrait apparaître dans le coin de la carte.\nPar exemple:" credit_title_html: Comment créditer OpenStreetMap 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 procédure de retrait de données ou notifiez nous directement à travers notre formulaire en ligne. @@ -1175,14 +1179,15 @@ fr: header: "%{from_user} vous a envoyé un message depuis OpenStreetMap avec le sujet %{subject} :" hi: Bonjour %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Confirmer votre adresse de courriel" + confirm: "Avant que nous fassions quoi que ce soit d'autre, nous avons besoin d'une confirmation que cette demande provient bien de vous; si c'est bien le cas, veuillez donc cliquer sur le lien ci-dessous ^pour confirmer votre compte:" + created: Quelqu'un (vous, avec un peu de chance) vient juste de créer un compte sur %{site_url}. + greeting: Bonjour! + subject: "[OpenStreetMap] Bienvenue dans OpenStreetMap" + welcome: Nous tenons à vous accueillir et à vous fournir des informations supplémentaires pour démarrer. signup_confirm_html: ask_questions: Vous pouvez poser toutes les questions que vous pourriez avoir à propos d’OpenStreetMap sur notre site de questions-réponses. - click_the_link: Si vous êtes à l'origine de cette action, bienvenue ! Cliquez sur le lien ci-dessous pour confirmer la création de compte et avoir plus d'informations sur OpenStreetMap current_user: Une liste par catégories des utilisateurs actuels, basée sur leur position géographique, est disponible dans Category:Users_by_geographical_region. get_reading: Informez-vous sur OpenStreetMap sur le wiki, restez au courant des dernières infos ''via'' le blogue OpenStreetMap ou Twitter, ou surfez sur le blogue OpenGeoData de Steve Coast, le fondateur d’OpenStreetMap pour un petit historique du projet, avec également des balados à écouter ! - greeting: Bonjour ! - hopefully_you: Quelqu'un (probablement vous) aimerait créer un compte sur introductory_video: Vous pouvez visionner une %{introductory_video_link}. more_videos: Il y a %{more_videos_link}. more_videos_here: plus de vidéos ici @@ -1192,19 +1197,13 @@ fr: signup_confirm_plain: ask_questions: "Vous pouvez poser toutes les questions que vous pourriez avoir à propos d’OpenStreetMap sur notre site de questions-réponses :" blog_and_twitter: "Restez au courant des dernières infos ''via'' le blogue OpenStreetMap ou Twitter :" - click_the_link_1: Si vous êtes à l'origine de cette requête, bienvenue ! Cliquez sur le lien ci-dessous pour confirmer votre - click_the_link_2: compte et obtenir plus d'informations à propos d'OpenStreetMap. - current_user_1: Une liste des utilisateurs actuels, basée sur leur localisation dans le monde, - current_user_2: "est disponible depuis :" - greeting: Salut ! - hopefully_you: Quelqu'un (probablement vous) aimerait créer un compte sur + current_user: "Une liste des utilisateurs actuellement dans des catégories, d'après l'endroit du monde où ils se trouvent, est disponible depuis:" introductory_video: "Vous pouvez visionner une vidéo introductive à OpenStreetMap ici :" more_videos: "Davantage de vidéos sont disponibles ici :" opengeodata: "OpenGeoData.org est le blogue de Steve Coast, le fondateur d’OpenStreetMap et il propose également des balados :" the_wiki: "Lisez à propos d'OpenStreetMap sur le wiki :" the_wiki_url: http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide - user_wiki_1: Il est recommandé de créer une page utilisateur qui inclut - user_wiki_2: des catégories qui indiquent votre localisation, comme [[Category:Users_in_London]]. + user_wiki_page: Il est recommandé de créer une page wiki d'utilisateur, qui inclut les balises de catégorie notant qui vous êtes, comme [[Category:Users_in_London]]. wiki_signup: "Vous pouvez également vous créer un compte sur le wiki d'OpenStreetMap sur :" oauth: oauthorize: @@ -1298,7 +1297,7 @@ fr: title: Créer unn nouveau masquage show: confirm: Êtes-vous certain ? - description: "Description:" + description: "Description :" destroy: Supprimer ce masquage edit: Modifier ce masquage heading: Masquage "%{title}" @@ -1533,6 +1532,10 @@ fr: email never displayed publicly: (jamais affiché publiquement) flash update success: Informations sur l'utilisateur mises à jour avec succès. flash update success confirm needed: Informations sur l'utilisateur mises à jour avec succès. Vérifiez votre boîte mail afin de valider la vérification de votre nouvelle adresse e-mail. + gravatar: + gravatar: Utiliser Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: qu'est-ce que c'est ? home location: "Emplacement du domicile :" image: "Image :" image size hint: (les images carrées d'au moins 100×100 pixels fonctionnent le mieux) @@ -1668,6 +1671,7 @@ fr: email address: "Adresse e-mail :" fill_form: Remplissez le formulaire et nous vous enverrons un e-mail pour activer votre compte. flash create success message: Merci de vous être enregistré ! Nous avons envoyé une note de confirmation à %{email}. Dès que vous aurez confirmé votre compte, vous pourrez commencer à cartographier.

    Si vous utilisez un logiciel anti-spam qui envoie des requêtes de confirmation, veuillez mettre webmaster@openstreetmap.org dans votre liste blanche, car nous sommes incapables de répondre à ces messages. + flash welcome: Merci de votre inscription. Nous avons envoyé un message de bienvenue à %{email} avec quelques astuces pour le démarrage. heading: Créer un compte utilisateur license_agreement: En confirmant votre compte, vous devrez accepter les termes du contributeur. no_auto_account_create: Malheureusement, nous sommes actuellement dans l'impossibilité de vous créer un compte automatiquement. diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 583068db2..693956ed8 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -767,7 +767,6 @@ fur: signup_confirm: subject: "[OpenStreetMap] Conferme la tô direzion di pueste eletroniche" signup_confirm_html: - hopefully_you: Cualchidun (sperìn propite tu) al vûl creâ une identitât introductory_video: Tu puedis viodi un %{introductory_video_link}. more_videos: A son %{more_videos_link}. more_videos_here: altris videos culì diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 02ec4421d..f198fa738 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -982,7 +982,6 @@ gl: partners_ucl: centro de realidade virtual do UCL sign_up: rexistrarse sign_up_tooltip: Crear unha conta para editar - sotm2012: Veña á conferencia do OpenStreetMap de 2012 nos Estados Unidos de América, O estado do mapa nos EUA, do 13 ao 14 de outubro en Portland, Oregon! tag_line: O mapa mundial libre user_diaries: Diarios de usuario user_diaries_tooltip: Ollar os diarios do usuario @@ -998,6 +997,9 @@ gl: text: En caso de conflito entre esta páxina traducida e %{english_original_link}, a páxina en inglés prevalecerá title: Acerca desta tradución legal_babble: + attribution_example: + alt: Exemplo de como recoñecer o OpenStreetMap nunha páxina web + title: Exemplo de recoñecemento contributors_at_html: "Austria: Contén datos de\nStadt Wien (baixo a licenza\nCC BY),\nLand Vorarlberg e\nLand Tirol (baixo a licenza CC-BY AT con emendas)." contributors_ca_html: "Canadá: Contén datos de\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) e StatCan (Geography Division,\nStatistics Canada)." contributors_footer_1_html: "Para obter máis información sobre estas e outras fontes usadas\npara axudar na mellora do OpenStreetMap, bote unha ollada á páxina dos\ncolaboradores no wiki do OpenStreetMap." @@ -1011,6 +1013,7 @@ gl: contributors_za_html: "Sudáfrica: Contén datos con orixe no\nChief Directorate:\nNational Geo-Spatial Information, dereitos de autor do estado reservados." credit_1_html: "Pedímoslle que acredite o traballo así: “© dos colaboradores do\nOpenStreetMap”." credit_2_html: "Cómpre tamén deixar claro que os datos están dispoñibles baixo a Open \nDatabase License e, se utiliza os cuadrantes dos nosos mapas, que os datos cartográficos\nestán baixo a licenza CC-BY-SA. Pode facelo ligando con\nesta páxina.\nComo alternativa, e obrigatoriamente se está distribuíndo o OSM nun\nformulario de datos, pode nomear e ligar directamente cara á(s) licenza(s). Naqueles medios\nnos que non sexa posible incluír as ligazóns (por exemplo, nas obras impresas), suxerimos\nque dirixa aos lectores a openstreetmap.org (quizais poñendo o texto\n\"OpenStreetMap\" no enderezo completo), a opendatacommons.org e,\nse fose relevante, a creativecommons.org." + credit_3_html: "Nun mapa electrónico explorable, o crédito debe aparecer na beira do mapa.\nPor exemplo:" credit_title_html: Como acreditar o OpenStreetMap 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 procedemento\npara retirar datos ou deixe unha notificación no noso\nformulario en liña." @@ -1150,14 +1153,15 @@ gl: header: "%{from_user} envioulle unha mensaxe a través do OpenStreetMap co asunto \"%{subject}\":" hi: "Ola %{to_user}:" signup_confirm: - subject: "[OpenStreetMap] Confirme o seu enderezo de correo electrónico" + confirm: "Antes de facer nada, cómpre confirmar que esta solicitude veu de vostede. Se é así, prema na ligazón inferior para confirmar a conta:" + created: Alguén (probablemente vostede) acaba de crear unha conta en %{site_url}. + greeting: Boas! + subject: "[OpenStreetMap] Dámoslle a benvida ao OpenStreetMap" + welcome: Queremos darlle a benvida e proporcionarlle algunha información adicional como axuda para comezar. signup_confirm_html: ask_questions: Pode facer calquera pregunta en relación ao OpenStreetMap no noso sitio de preguntas e respostas. - click_the_link: Se este é vostede, benvido! Prema na ligazón que aparece a continuación para confirmar a súa conta e obter máis información sobre o OpenStreetMap. current_user: "A lista de todos os usuarios por categorías, baseada segundo a súa localización no mundo, está dispoñible en: Category:Users_by_geographical_region." get_reading: Infórmese sobre o OpenStreetMap no wiki, póñase ao día das últimas novas a través do blogue ou o Twitter do OpenStreetMap ou vaia polo blogue OpenGeoData de Steve Coast, o fundador do OpenStreetMap, para ler a pequena historia do proxecto e escoitar os podcasts tamén! - greeting: Boas! - hopefully_you: Alguén (probablemente vostede) quere crear unha conta en introductory_video: Pode ollar un %{introductory_video_link}. more_videos: Hai %{more_videos_link}. more_videos_here: máis vídeos aquí @@ -1167,18 +1171,12 @@ gl: signup_confirm_plain: ask_questions: "Pode facer calquera pregunta en relación ao OpenStreetMap no noso sitio de preguntas e respostas:" blog_and_twitter: "Póñase ao día das últimas novas a través do blogue ou o Twitter do OpenStreetMap:" - click_the_link_1: Se este é vostede, benvido! Prema na ligazón que aparece a continuación para confirmar a súa - click_the_link_2: conta e obter máis información sobre o OpenStreetMap. - current_user_1: A lista de todos os usuarios por categorías, baseada segundo a súa localización no mundo, - current_user_2: "está dispoñible en:" - greeting: Boas! - hopefully_you: Alguén (probablemente vostede) quere crear unha conta en + current_user: "A lista de todos os usuarios por categorías, baseada segundo a súa localización no mundo, está dispoñible en:" introductory_video: "Pode ollar un vídeo introdutorio ao OpenStreetMap aquí:" more_videos: "Hai máis vídeos aquí:" opengeodata: "OpenGeoData.org é o blogue de Steve Coast, o fundador do OpenStreetMap. Tamén ten podcasts:" the_wiki: "Lea máis acerca do OpenStreetMap no wiki:" - user_wiki_1: Recoméndase crear unha páxina de usuario que inclúa - user_wiki_2: etiquetas de categoría que indiquen a súa localización, como [[Category:Users_in_London]]. + user_wiki_page: Recoméndase crear unha páxina de usuario que inclúa etiquetas de categoría que indiquen a súa localización, como [[Category:Users_in_London]]. wiki_signup: "Poida que tamén queira crear unha conta no wiki do OpenStreetMap en:" oauth: oauthorize: @@ -1507,6 +1505,10 @@ gl: email never displayed publicly: (nunca mostrado publicamente) flash update success: Información de usuario actualizada correctamente. flash update success confirm needed: Información de usuario actualizada correctamente. Busque no seu correo electrónico unha mensaxe para confirmar o seu novo enderezo. + gravatar: + gravatar: Usar Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: que é isto? home location: "Lugar de orixe:" image: "Imaxe:" image size hint: (as imaxes cadradas de, polo menos, 100x100 funcionan mellor) @@ -1642,6 +1644,7 @@ gl: email address: "Enderezo de correo electrónico:" fill_form: Encha o formulario e axiña recibirá un correo electrónico coas instrucións para activar a súa conta. flash create success message: O usuario creouse correctamente. Busque unha nota de confirmación que lle enviamos a %{email} e comezará a crear mapas de contado.

    Se emprega un sistema de bloqueo de spam, asegúrese de incluír webmaster@openstreetmap.org na súa lista branca para poder completar o proceso sen problemas. + flash welcome: Grazas por rexistrarse. Enviámoslle unha mensaxe de benvida ao enderezo %{email} con algúns consellos para comezar. heading: Crear unha conta de usuario license_agreement: Cando confirme a súa conta necesitará aceptar os termos do colaborador. no_auto_account_create: Por desgraza, arestora non podemos crear automaticamente unha conta para vostede. diff --git a/config/locales/he.yml b/config/locales/he.yml index ccb059e78..8af4f699e 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -992,7 +992,6 @@ he: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: הרשמה sign_up_tooltip: יצירת חשבון לעריכה - sotm2012: בואו לוועידת OpenStreetMap 2012 בארצות הברית, „מצב המפה ארצות הברית”, 13–14 באוקטובר, בפורטלנד, אורגון! tag_line: מפת עולם חופשית בשיטת הוויקי user_diaries: יומני משתמשים user_diaries_tooltip: צפייה ביומני המשתמש @@ -1008,6 +1007,9 @@ he: text: במקרה של חוסר תאימות בין עמוד מתורגם זה ובין %{english_original_link}, יש לתת עדיפות לעמוד באנגלית title: אודות תרגום זה legal_babble: + attribution_example: + alt: דוגמה לצורה הנכונה לתת ייחוס ל־OpenStreetMap באתר האינטרנט + title: דוגמה לייחוס contributors_at_html: "אוסטריה: מכיל נתונים\nמעיריית וינה לפי תנאי\nCC BY,\nממדינת פורארלברג\nוממדינת טירול (לפי CC-BY AT עם תיקונים)." contributors_ca_html: "קנדה: מכיל נתונים\nמ־GeoBase®‏, GeoGratis‏ (©‏ Department of Natural\nResources Canada)‏, CanVec‏ (©‏ Department of Natural\nResources Canada), ו־StatCan‏ (Geography Division,\nStatistics Canada)." contributors_footer_1_html: "למידע נוסף על מקורות אלה ואחרים ששימשו\nלשיפור OpenStreetMap, נא לראות את דף\nהתורמים בוויקי של OpenStreetMap." @@ -1021,6 +1023,7 @@ he: contributors_za_html: "דרום אפריקה: מכיל נתונים שהגיעו\nמ־מִנהל כללי:\nמידע גאו־מרחבי לאומי, זכות יוצרים ממלכתית שמורה." credit_1_html: אנו דורשים ייחוס אל „© תורמי OpenStreetMap”. credit_2_html: "כמו־כן, חובתך להבהיר שהנתונים זמינים בכפוף לרישיון למסדי\nנתונים פתוחים, ואם נעשה שימוש באריחי המפה שלנו, שהמיפוי כפופות\nלרישיון CC-BY-SA. באפשרותך לעשות זאת באמצעות קישור אל\nדף זכויות היוצירם.\nלחלופין, וזו חובתך בעת הפצת OSM בצורת\nנתונים, באפשרותך לציין את השמות ולקשר ישירות אל הרישיון או הרישיונות. באמצעי תקשורת\nשלא ניתן להשתמש בהם בקישורים (למשל בדפוס), אני ממליצים\nלהפנות את הקוראים שלך אל openstreetmap.org (אולי על־ידי הרחבת\n„OpenStreetMap” ככתובת מלאה), אל opendatacommons.org, ואם\nזה מתאים, אל creativecommons.org." + credit_3_html: "בשביל מפה אלקטרונית שאפשר לעיין בה, הייחוס צריך להופיע בפינת המפה. למשל:" credit_title_html: איך לתת ייחוס ל־OpenStreetMap infringement_1_html: "אנו מזכירים לתורמים ל־OSM לעולם לא להוסיף נתונים משום מקור\nשמוגבל בזכויות יוצרים (למשל מפות גוגל או מפות מודפסות) ללא\nאישור מפורש מבעלי הזכויות." infringement_2_html: "אם נראה לך שחומר שמוגבל בזכויות יוצרים נוסף באופן לא הולם\nאל מסד הנתונים של OpenStreetMap או אל האתר הזה, נא לפנות\nאל נוהל\nההסרה שלנו או כתבו תלונה ישירות\nבדף התלונות המקוון שלנו." @@ -1160,14 +1163,15 @@ he: header: "לתיבתך ב־OpenStreetMap הגיעה הודעה מאת %{from_user} עם הנושא %{subject}:" hi: שלום %{to_user}, signup_confirm: - subject: "[אופן סטריט מאפ OpenStreetMap] נא לאשר כתובת דוא״ל" + confirm: "לפני שאנחנו ממשיכים, אנחנו צריכים לוודא שהבקשה הגיעה ממך, אז אם באמת עשית את זה, צריך ללחוץ כאן כדי לאמת את החשבון שלך:" + created: מישהו (בתקווה את או אתה) יצר חשבון באתר %{site_url}. + greeting: אהלן! + subject: "[אופן סטריט מאפ OpenStreetMap] ברוך בואך לאופן סטריט מאפ" + welcome: אנחנו רוצים לברך אותך ולתת לך קצת מידע נוסף כדי שיהיה לך קל יותר להתחיל. signup_confirm_html: ask_questions: באפשרותך לשאול שאלות על אתר OpenStreetMap באתר השאלות ותשובות שלנו. - click_the_link: אם אכן מדובר בך, ברוך בואך! נא ללחוץ על הקישור מטה כדי לאמת את החשבון ולקרוא מידע נוסף על OpenStreetMap current_user: רשימת משתמשים נוכחיים בקטגוריות, בהתאום למיקומם בעולם, זמינה בדף Category:Users_by_geographical_region. get_reading: "לקריאה נוספת על OpenStreetMap באתר הוויקי, להתעדכן בחדשות האחרונות בבלוג OpenStreetMap או בטוויטר, או לקריאה בבלוג של מייסד OpenStreetMap סטיב קוסט: OpenGeoData blog למידע על ההיסטוריה של המיזם, ויש בו גם קובצי קול!" - greeting: שלום! - hopefully_you: מישהו (בתקווה שמדובר בך) ביקש ליצור חשבון משתמש ב introductory_video: ניתן לצפות בסרטו מבוא ב-%{introductory_video_link}. more_videos: צפייה בסרטונים נוספים בכתובת %{more_videos_link}. more_videos_here: סרטונים נוספים מצויים כאן @@ -1177,18 +1181,12 @@ he: signup_confirm_plain: ask_questions: "באפשרותך לשאול שאלות על OpenStreetMap בדף השאלות ותשובות שלנו:" blog_and_twitter: "ניתן להתעדכן בחדשות האחרונות דרך הבלוג או חשבון הטוויטר של OpenStreetMap:" - click_the_link_1: אם אכן מדובר בך, ברוך בואך! נא ללחוץ על הקישור מטה כדי לאמת את - click_the_link_2: החשבון ולקרוא מידע נוסף על אתר OpenStreetMap. - current_user_1: רשימת קטגוריות משתמשים, המבוססת על מיקומכם ברחבי העולם - current_user_2: "מצויה כאן:" - greeting: שלום! - hopefully_you: מישהו (בתקווה שמדובר בך) מבקש ליצור חשבון ב + current_user: "רשימה של משתמשים לפי קטגוריות, בהתאם למקום המגורים שלהם, זמין כאן:" introductory_video: "באפשרותך לצפות בסרטון הדרכה לאתר OpenStreetMap כאן:" more_videos: "סרטוני הדרכה נוספים מצויים כאן:" opengeodata: "אתר OpenGeoData.org הוא הבלוג של מייסד OpenStreetMap סטיב קוסט, ויש בו גם פודקאסטים (הקלטות קול):" the_wiki: "ניתן לקרוא על OpenStreetMap בדפי ויקי:" - user_wiki_1: אנו ממליצים ליצור דף משתמש, שיכלול - user_wiki_2: "קטגוריות המסמנות את מקומכם, כגון קטגוריית „משתמשים בלונדון”: [[Category:Users_in_London]]." + user_wiki_page: מומלץ ליצור דף משתמש בוויקי עם תגים שאומרים מה מיקומך, למשל [[Category:Users_in_London]]. wiki_signup: "באפשרותך להירשם לוויקי OpenStreetMap בכתובת:" oauth: oauthorize: @@ -1517,6 +1515,10 @@ he: email never displayed publicly: (לעולם לא מוצגת בפומבי) flash update success: פרטי המשתמש/ת עודכנו בהצלחה. flash update success confirm needed: מידע המשתמש/ת עודכן בהצלחה. נא בדקו את תיבת הדוא"ל על מנת לאשרר את הדוא"ל החדש. + gravatar: + gravatar: להשתמש ב־Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: מה זה? home location: "מיקום ראשי:" image: "תמונה:" image size hint: (תמונה מרובעת בגודל 100x100 לפחות עובדת הכי טוב) @@ -1592,7 +1594,7 @@ he: heading: כניסה login_button: כניסה lost password link: איבדת את הססמה שלך? - new to osm: חדש ב־OpenStreetMap? + new to osm: הגעת עכשיו ב־OpenStreetMap? no account: אין לך חשבון? openid: "%{logo} OpenID:" openid invalid: סליחה, ה־OpenID שלך נראה מקולקל @@ -1619,7 +1621,7 @@ he: title: כניסה עם חשבון יאהו password: "ססמה:" register now: להירשם עכשיו - remember: "לזכור אותי:" + remember: לזכור אותי title: כניסה to make changes: כדי לשנות את נתוני OpenStreetMap, צריך שיהיה לך חשבון. with openid: "לחלופין אפשר להשתמש ב־OpenID כדי להיכנס:" @@ -1652,6 +1654,7 @@ he: email address: "כתובת דוא״ל:" fill_form: נא למלא את הטופס הבא ונשלח לך מכתב מהיר כדי להפעיל את חשבונך. flash create success message: תודה על הרישום. שלחנו מכתב אישור לכתוב %{email} וכשנקבל ממך את האישור, אפשר יהיה להתחיל למפות.

    אם נעשה בחשבון הדוא״ל שלך שימוש במערכת שמלבינה הודעות, נא להוסיף את webmaster@openstreetmap.org לרשימה הלבנה, כי איננו יכולים להשיב לבקשות אישור. + flash welcome: תודה על הרישום. שלחנו לך הודעת „ברוך בואך” לכתובת %{email} עם כמה עצות שיעזרו לך להתחיל. heading: יצירת חשבון משתמש license_agreement: עם אישור החשבון יש לקבל את     תנאי התרומה. no_auto_account_create: למרבה הצער, כעת איננו יכולים ליצור לך חשבון באופן אוטומטי. diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 9456a7202..5c46fdbfc 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1039,11 +1039,8 @@ hr: subject: "[OpenStreetMap] potvrdi email adresu" signup_confirm_html: ask_questions: Možete postaviti bilo kakva pitanja koja imate o projektu OpenStreetMap na naÅ¡im stranicama pitanja i odgovora. - click_the_link: Ako si ovo ti, dobrodoÅ¡ao! Molim klikni na link ispod za potvrdu korisničkog računa i čitaj dalje za viÅ¡e informacija o OpenStreetMap-u current_user: Lista trenutnih korisnika u kategorijama, bazirano gdje su na svijetu, je dostupna s Category:Users_by_geographical_region. get_reading: Čitajte o OpenStreetMap-u na wiki-ju, budute u toku s zadnjim novostima preko OpenStreetMap bloga ili Twittera, ili pregledajte OpenGeoData blog osnivača OpenStreetMap-a, Stevea Coasta za povijest projekta, gdje imate i podcaste za sluÅ¡anje! - greeting: Pozdrav! - hopefully_you: Netko (nadam se ti) bi želio stvoriti korisnički račun preko introductory_video: MožeÅ¡ pogledati %{introductory_video_link}. more_videos: Postoji %{more_videos_link}. more_videos_here: viÅ¡e video snimki ovdje @@ -1053,19 +1050,11 @@ hr: signup_confirm_plain: ask_questions: "Možete postaviti bilo kakva pitanja koja imate o projektu OpenStreetMap na naÅ¡im stranicama pitanja i odgovora:" blog_and_twitter: "Budite u toku s najnovijim vijestima preko OpenstreetMap bloga ili Twittera:" - click_the_link_1: Ako si to ti, dobrodoÅ¡ao! Molim klikni donji link za potvrdu - click_the_link_2: korinički račun i čitaj za viÅ¡e informacija o OpenStreetMap-u. - current_user_1: Lista trenutačnih kategorija, bazirano na lokaciji u svijetu - current_user_2: "oni su dostupni sa:" - greeting: Pozdrav! - hopefully_you: Netko (nadam se ti) bi želio otvoriti korisnički računa na introductory_video: "MožeÅ¡ pogledati uvodni video za OpenStreetMap ovdje:" more_videos: "Ovdje ima viÅ¡e videa:" opengeodata: "OpenGeoData.org je blog osnivača OpenStreetMap-a, Steva Coasta, i ima podcaste također:" the_wiki: "Čitaj o OpenStreetMap-u na wiki-ju:" the_wiki_url: http://wiki.openstreetmap.org/wiki/HR:Beginners_Guide - user_wiki_1: Preporuka je da stvoriÅ¡ korisničku stranicu na wiki-ju, koja uključuje - user_wiki_2: category oznake koje označavaju odakle si, kao npr.[[Category:Users_in_London]]. wiki_signup: "Možda želiÅ¡ otvoriti račun na OpenStreetMap wiki na:" oauth: oauthorize: diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 1dc6198cc..a2c830f5e 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -994,7 +994,6 @@ hsb: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: registrować sign_up_tooltip: Konto za wobdźěłowanje załožić - sotm2012: Dojědźće do konferency OpenStreetMap 2012, "The State of the Map US", 13. - 14. oktobra w Portlandźe, Oregon! tag_line: Swobodna swětowa karta user_diaries: Dźeniki user_diaries_tooltip: Wužiwarske dźeniki čitać @@ -1010,6 +1009,9 @@ hsb: text: W padźe konflikta mjez přełoženej stronje a %{english_original_link}, jendźelska strona dyrbi prioritatu měć title: Wo tutym přełožku legal_babble: + attribution_example: + alt: Přikład, kak so na webstronje na OpenStreetMap pokazuje + title: Připokazanski přikład contributors_at_html: "Awstriska: Wobsahuje daty z Stadt Wien (pod CC BY), Land Vorarlberg a Land Tirol (pod CC-BY AT ze změnami)." contributors_ca_html: "Kanada: Wobsahuje daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada)." contributors_footer_1_html: Za dalÅ¡e podrobnosće za to a druhe žórła, kotrež su so wužili, zo bychu OpenStreetMap polěpÅ¡ili, hlej proÅ¡u stronu sobuskutkowarjow na wikiju OpenStreetMap. @@ -1023,6 +1025,7 @@ hsb: contributors_za_html: "Južna Afrika: Wobsahuje daty z Chief Directorate: National Geo-Spatial Information, Statne awtorske prawo wuměnjene." credit_1_html: Žadamy sej, zo podawaÅ¡ sobuskutkowarjow “© OpenStreetMap”. credit_2_html: Hdźež je móžno, OpenStreetMap měł wotkaz do http://www.openstreetmap.org/ a CC BY-SA do http://creativecommons.org/licenses/by-sa/2.0/ 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_title_html: Přeńdźenje awtorskeho prawa intro_1_html: OpenStreetMap wobsteji ze zjawnych datow, licencowanych pod licencu Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA). @@ -1166,14 +1169,14 @@ hsb: header: "%{from_user} je ći přez OpenStreetMap powěsć z temowym nadpismom %{subject} pósłał:" hi: Witaj %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Twoju e-mejlowu adresu 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" + welcome: Bychmy će rady powitali a ći přidatne informacije dali zo ty móhł započeć. signup_confirm_html: ask_questions: MóžeÅ¡ so za něčim wo OpenStreetMap na naÅ¡im sydle PraÅ¡enja a wotmołwy praÅ¡eć. - click_the_link: Jeli ty to sy, witaj! Klikń proÅ¡u na slědowacy wotkaz, zo by konto wobkrućił a čitaj potom dalÅ¡e informacije wo OpenStreetMap current_user: Lisćina tuchwilnych wužiwarjow po jich stejnišću w swěće steji na Lisćina wužiwarjow po geografiskim regionje k dispoziciji. get_reading: Čitaj wo OpenStreetMap na wikiju, wobstaraj sej najnowÅ¡e powěsće přez blog OpenStreetMap abo Twitter, abo přečitaj blog OpenGeoData załožerja OpenStreetMap Steve Coast za historiju projekta, kotryž ma tež podcasty! - greeting: Witaj! - hopefully_you: Něchtó (najskerje ty) chce konto załožić za introductory_video: MóžeÅ¡ sej widejo %{introductory_video_link} wobhladać. more_videos: Je hišće wjace %{more_videos_link}. more_videos_here: dalÅ¡e wideja tu @@ -1183,18 +1186,12 @@ hsb: signup_confirm_plain: ask_questions: "MóžeÅ¡ so za něčim wo OpenStreetMap na naÅ¡im sydle PraÅ¡enja a wotmołwy praÅ¡eć:" blog_and_twitter: "Wobstaraj sej najnowÅ¡e powěsće přez blog OpenStreetMap abo Twitter:" - click_the_link_1: Jeli sy to ty, witaj! ProÅ¡u klikń na slědowacy wotkaz, zo by swoje - click_the_link_2: konto wobkrućił a čitaj potom dalÅ¡e informacije wo OpenStreetMap. - current_user_1: Lisćina tuchwilnych wužiwarjow w kategorijach po jich stejnišću w swěće - current_user_2: "tu k dispoziciji steji:" - greeting: Witaj! - hopefully_you: Něchtó (najskerje ty) chce konto załožić na + current_user: "Lisćina aktualnych wužiwarjow w kategorijach na zakładźe toho, hdźež na swěće su, steji k dispoziciji na:" introductory_video: "Zawodny widejo wo OpenStreetMap móžeÅ¡ sej tu wobhladać:" more_videos: "Tu su hišće dalÅ¡e wideja:" opengeodata: "OpenGeoData.org je blog załožerja OpenStreetMap Steve Coast a ma tež podkasty:" the_wiki: "Informacije wo OpenStreetMap namakaÅ¡ na wiki:" - user_wiki_1: Poruča so, zo wutworjeÅ¡ wužiwarsku wikistronu, kotraž wobsahuje - user_wiki_2: kategorijowe atributy, kotrež woznamjenjeja, hdźež sy, na př. [[Category:Users_in_London]]. + user_wiki_page: Poruča so, zo wutworiÅ¡ wužiwarsku wikistronu, kotraž kategorijowe marki wobsahuje, kotrež woznamjenjeja, hdźež sy, kaž na př. [[Kategorija:Wužiwarjo_z_BudyÅ¡ina]]. wiki_signup: "MóžeÅ¡ so tež za wiki OpenStreetMap registrować:" oauth: oauthorize: @@ -1523,6 +1520,10 @@ hsb: email never displayed publicly: (njeje ženje zjawnje widźomna) flash update success: Wužiwarske informacije wuspěšnje zaktualizowane. flash update success confirm needed: Wužiwarske informacije wuspěšnje zaktualizowane. DóstanjeÅ¡ e-mejl z namołwu, swoju nowu e-mejlowu adresu wobkrućić. + gravatar: + gravatar: Gravatar wužiwać + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: Å to to je? home location: "Domjace stejnišćo:" image: "Wobraz:" image size hint: (kwadratiske wobrazy z wulkosću wot znajmjeńša 100x100 najlěpje funguja) @@ -1658,6 +1659,7 @@ hsb: email address: "E-mejlowa adresa:" fill_form: Wupjelń formular a budźemy ći hnydom e-mejl słać, zo by swoje konto aktiwizował. flash create success message: Dźakujemy so za registrowanje. Smy wobkrućenski e-mejl na %{email} póslali a tak ruče hač swoje konto wobkrućiÅ¡, móžeÅ¡ kartěrowanje započeć.

    Jeli přećiwospamowy system wužiwaÅ¡, kotryž wobkrućenske napraÅ¡owanja sćele, přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske napraÅ¡owanja wotmołwić. + flash welcome: Wulki dźak za registrowanje. Smy witansku powěsć na %{email} pósłali, z někotrymi pokiwami wo tym, kak móžeÅ¡ započeć. heading: Wužiwarske konto załožić license_agreement: Hdyž swoje konto wubkrućeÅ¡, dyrbiÅ¡ wuměnjenjam za sobuskutkowarjow přihłosować. no_auto_account_create: Bohužel njemóžemy tuchwilu žane konto za tebje awtomatisce załožić. diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 6c3ba9b26..2e1145ea2 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -399,7 +399,7 @@ hu: area_to_export: Exportálandó terület embeddable_html: Beágyazható HTML export_button: Exportálás - export_details: Az OpenStreetMap adatokra a Creative Commons Nevezd meg!-Így add tovább! 2.0 licenc vonatkozik. + export_details: Az OpenStreetMap adatokra az Open Data Commons Open Database licenc vonatkozik. (ODbL) format: "Formátum:" format_to_export: Exportálás formátuma image_size: "Képméret:" @@ -985,7 +985,6 @@ hu: partners_ucl: az UCL VR központ sign_up: regisztráció sign_up_tooltip: Új felhasználói fiók létrehozása szerkesztéshez - sotm2012: Gyere a 2012-es OpenStreetMap, The State of the Map konferenciára, szeptember 6. és 8. között Tokióba! tag_line: A szabad világtérkép user_diaries: Naplók user_diaries_tooltip: Felhasználói naplók megtekintése @@ -1001,20 +1000,24 @@ hu: 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: - contributors_at_html: "Ausztria: adatokat tartalmaz a következő forrásból:\n Stadt Wien\n CC BY licenc alatt." + contributors_at_html: "Ausztria: adatokat tartalmaz a következő forrásból:\n Bécs városa\n CC BY licenc alatt." contributors_ca_html: "Kanada: 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_fr_html: "France: adatokat tartalmaz a következő forrásból:\n Direction Générale des Impôts." contributors_gb_html: "Egyesült Királyság: tartalmaz Ordnance\n Survey adatokat © Szerzői és adatbázisjog\n 2010." contributors_intro_html: "A CC BY-SA licencünk előírja, hogy “az eredeti szerzőt\n a médiumnak vagy a használt eszköznek megfelelően fel kell\n tüntetni”. Az egyéni térképszerkesztők nem kérik\n feltüntetésüket az “OpenStreetMap közreműködői” szövegen\n felül, de ahol az OpenStreetMap nemzeti térképészeti\n ügynökségtől vagy más jelentős forrásból származó adatokat tartalmaz,\n ott ésszerű lehet feltüntetni azokat közvetlenül,\n vagy hivatkozva erre az oldalra." + contributors_nl_html: "Hollandia: adatokat tartalmaz innen: Automotive Navigation Data, 2007\n(www.and.com)" contributors_nz_html: "Új-Zéland: adatokat tartalmaz a következő forrásból:\n Land Information New Zealand. Szerzői jog fenntartva." contributors_title_html: Közreműködőink - credit_1_html: "Ha az OpenStreetMap térkép képeit használod, kérünk, hogy\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_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 http://www.openstreetmap.org/,\n a CC BY-SA-nak pedig a http://creativecommons.org/licenses/by-sa/2.0/ 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_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 intro_1_html: " Az OpenStreetMap egy szabad adathalmaz, amelyre az Open Data\nCommons Open Database License licenc (ODbL) vonatkozik." intro_2_html: " Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod térképünket\n és adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és\n közreműködőit. Ha módosítod vagy felhasználod térképünket vagy adatainkat, akkor\n az eredményt is csak azonos licenccel terjesztheted. A\n teljes jogi\n szöveg ismerteti a jogaidat és kötelezettségeidet." - more_1_html: " További információ adataink használatáról a Jogi\n GYIK-ben." + intro_3_html: " Az OpenStreetMap térképeire a Creative\n Commons Nevezd meg! - Így add tovább! 2.0 licenc (CC BY-SA) vonatkozik." + more_1_html: "További információ adataink használatáról a Jogi\n GYIK-ban." more_2_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 (pl. Google Térkép vagy nyomtatott térképek) se a\n szerzői jog tulajdonosának kifejezett engedélye nélkül." more_title_html: Tudj meg többet! title_html: Szerzői jog és licenc @@ -1149,11 +1152,8 @@ hu: subject: "[OpenStreetMap] E-mail cím megerősítése" signup_confirm_html: ask_questions: Ha bármilyen kérdésed merülne fel az OpenStreetMappal kapcsolatban, felteheted azt a mi kérdés és válasz oldalunkon. - click_the_link: Ha ez Te vagy, üdvözlünk! Kattints az alábbi hivatkozásra a felhasználói fiókod megerősítéséhez és további információk olvasásához az OpenStreetMapról. current_user: "A jelenlegi felhasználók listája kategóriákban, annak megfelelően, hogy hol vannak a világban, elérhető innen: Category:Users_by_geographical_region." get_reading: Olvass az OpenStreetMapról a wikiben, kövesd a legfrissebb híreket az OpenStreetMap blogon vagy Twitteren, vagy böngészd az OpenStreetMap alapító Steve Coast OpenGeoData blogját a projekt történetéről, amin vannak hallgatható podcastok is! - greeting: Szia! - hopefully_you: "Valaki (remélhetőleg Te) készítene egy felhasználói fiókot itt:" introductory_video: Megnézhetsz egy %{introductory_video_link}. more_videos: "%{more_videos_link}." more_videos_here: További videók itt @@ -1163,19 +1163,11 @@ hu: signup_confirm_plain: ask_questions: "Ha bármilyen kérdésed merülne fel az OpenStreetMappal kapcsolatban, felteheted azt a mi kérdés és válasz oldalunkon:" blog_and_twitter: "Kövesd a legfrissebb híreket az OpenStreetMap blogon vagy Twitteren:" - click_the_link_1: Ha ez Te vagy, üdvözlünk! Kattints az alábbi hivatkozásra a felhasználói - click_the_link_2: fiókod megerősítéséhez és további információk olvasásához az OpenStreetMapról. - current_user_1: A jelenlegi felhasználók listája kategóriákban, annak megfelelően, - current_user_2: "hogy hol vannak a világban, elérhető innen:" - greeting: Szia! - hopefully_you: "Valaki (remélhetőleg Te) készítene egy felhasználói fiókot itt:" introductory_video: "Megnézhetsz egy bevezető videót az OpenStreetMaphez itt:" more_videos: "További videókat találsz itt:" opengeodata: "Az OpenGeoData.org az OpenStreetMap alapító Steve Coast blogja, és vannak podcastjai is:" the_wiki: "Olvass az OpenStreetMapról a wikiben:" the_wiki_url: http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide - user_wiki_1: Ajánlott, hogy készíts egy wiki oldalt, ami tartalmaz kategóriacímkéket - user_wiki_2: annak megfelelően, ahol vagy. Például [[Category:Users_in_Budapest]]. wiki_signup: "Szintén regisztrálhatsz az OpenStreetMap wikibe itt:" oauth: oauthorize: @@ -1246,9 +1238,6 @@ hu: url: "Utalványkérési URL:" update: flash: A kliens információi sikeresen frissítve - printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" redaction: edit: description: Leírás @@ -1256,6 +1245,7 @@ hu: description: Leírás show: confirm: Biztos vagy benne? + description: "Leírás:" user: "Készítő:" update: flash: Változtatások elmentve. @@ -1273,9 +1263,6 @@ hu: index: js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet, vagy letiltottad a JavaScriptet. js_2: Az OpenStreetMap JavaScriptet használ a slippy maphoz. - license: - license_url: http://creativecommons.org/licenses/by-sa/2.0/deed.hu - project_url: http://openstreetmap.org permalink: Permalink remote_failed: A szerkesztés nem sikerült. Győződj meg róla, hogy a JOSM vagy a Merkaartor be van töltve, és a távirányító opció engedélyezve van shortlink: Shortlink @@ -1487,6 +1474,8 @@ hu: email never displayed publicly: (soha nem jelenik meg nyilvánosan) flash update success: Felhasználói információk sikeresen frissítve. flash update success confirm needed: Felhasználói információk sikeresen frissítve. Nézd meg az e-mailjeidet az új e-mail címedet megerősítő levélhez. + gravatar: + link text: mi ez? home location: "Otthon:" image: "Kép:" image size hint: (legalább 100x100 pixel nagyságú négyzetes kép javasolt) @@ -1608,7 +1597,9 @@ hu: title: Elvesztett jelszó make_friend: already_a_friend: "%{name} már a barátod." + button: Ismerősnek jelölöm failed: Sajnáljuk, sikertelen volt %{name} felvétele barátnak. + heading: "%{user} felhasználó hozzáadása barátként?" success: "%{name} mostantól a barátod." new: confirm email address: "E-mail cím megerősítése:" @@ -1641,6 +1632,8 @@ hu: nearby mapper: Közeli térképszerkesztő your location: Helyed remove_friend: + button: barát eltávolítása + heading: "%{user} felhasználó eltávolítása barátnak?" not_a_friend: "%{name} nem tartozik a barátaid közé." success: "%{name} eltávolítva a barátaid közül." reset_password: @@ -1795,6 +1788,7 @@ hu: revoke: Visszavonás! revoker_name: "Visszavonta:" show: Megjelenítés + showing_page: "Jelenlegi oldal: %{page}" status: Állapot period: one: 1 óra diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 841360e36..3f0b79d61 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -983,7 +983,6 @@ ia: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: inscriber se sign_up_tooltip: Crear un conto pro modification - sotm2012: Veni al conferentia de OpenStreetMap de 2012, "Le stato del carta", del 6 al 8 de septembre in Tokyo! tag_line: Le wiki-carta libere del mundo user_diaries: Diarios de usatores user_diaries_tooltip: Leger diarios de usatores @@ -1150,11 +1149,8 @@ ia: subject: "[OpenStreetMap] Confirma tu adresse de e-mail" signup_confirm_html: ask_questions: Tu pote poner qualcunque questiones super OpenStreetMap a nostre sito de questiones e responsas. - click_the_link: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar iste conto e continua a leger pro ulterior informationes super OpenStreetMap current_user: Un lista de usatores actual in categorias, a base de lor position geographic, es disponibile de Category:Users_by_geographical_region. get_reading: Informa te super OpenStreetMap per leger le wiki, tene te al currente con le ultime novas via le blog de OpenStreetMap o con Twitter, o percurre le blog OpenGeoData del fundator de OpenStreetMap Steve Coast pro le historia compendiose del projecto, le qual include tamben podcasts a ascoltar! - greeting: Salute! - hopefully_you: Alcuno (sperabilemente tu) vole crear un conto in introductory_video: Tu pote reguardar un %{introductory_video_link}. more_videos: Il ha %{more_videos_link}. more_videos_here: plus videos hic @@ -1164,18 +1160,10 @@ ia: signup_confirm_plain: ask_questions: "Tu pote poner qualcunque questiones super OpenStreetMap a nostre sito de questiones e responsas:" blog_and_twitter: "Tene te al currente con le ultime novas al blog de OpenStreetMap o con Twitter:" - click_the_link_1: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar tu - click_the_link_2: conto. Continua a leger pro plus informationes a proposito de OpenStreetMap. - current_user_1: Un lista actual de usatores in categorias, a base de lor localisation in le mundo, - current_user_2: "es disponibile de:" - greeting: Salute! - hopefully_you: Alcuno (sperabilemente tu) vole crear un conto a introductory_video: "Tu pote reguardar un video de introduction a OpenStreetMap hic:" more_videos: "Il ha plus videos hic:" opengeodata: "OpenGeoData.org es le blog del fundator de OpenStreetMap, Steve Coast, e illo include tamben podcasts:" the_wiki: "Informa te super OpenStreetMap al wiki:" - user_wiki_1: Es recommendate crear un pagina wiki de usator, que include - user_wiki_2: etiquettas de categoria que indica tu localisation, como [[Category:Users_in_London]]. wiki_signup: "Considera tamben crear un conto al wiki de OpenStreetMap a:" oauth: oauthorize: diff --git a/config/locales/id.yml b/config/locales/id.yml new file mode 100644 index 000000000..7507ffea4 --- /dev/null +++ b/config/locales/id.yml @@ -0,0 +1,1492 @@ +# Messages for Indonesian (Bahasa Indonesia) +# Exported from translatewiki.net +# Export driver: syck-pecl +# Author: Emirhartato +# Author: Farras +# Author: Irwangatot +# Author: Iwan Novirion +# Author: Vasanthi +# Author: Wulankhairunisa +id: + activerecord: + attributes: + diary_comment: + body: Isi Diari + diary_entry: + language: Bahasa + latitude: Garis Lintang + longitude: Garis Bujur + title: Judul + user: Pengguna + friend: + friend: Teman + user: Pengguna + message: + body: Isi Pesan + recipient: Penerima + sender: Pengirim + title: Judul + trace: + description: Deskripsi + latitude: Garis Lintang + longitude: Garis Bujur + name: Nama + public: Publik + size: Ukuran + user: Pengguna + visible: Terlihat + user: + active: Aktif + description: Keterangan + display_name: Nama yang tampil + email: Email + languages: Bahasa + pass_crypt: Kata Sandi + models: + acl: Daftar Kontrol Akses + changeset: Set Perubahan + changeset_tag: Tag Set Perubahan + country: Negara + diary_comment: Komentar pada Catatan Harian + diary_entry: Entri Catatan harian + friend: Teman + language: Bahasa + message: Pesan + node: Node/Titik + node_tag: Tag node/titik + notifier: Pemberitahuan + old_node: Node/Titik Lama + old_node_tag: Tag Node/Titik Lama + old_relation: Relasi Lama + old_relation_member: Anggota Relasi Lama + old_relation_tag: Tag Relasi Lama + old_way: Garis Lama + old_way_node: Titik/node dari garis lama + old_way_tag: Tag garis lama + relation: Relasi + relation_member: Anggota Relasi + relation_tag: Tag Relasi + session: Sesi + trace: Trek + tracepoint: Titik Trek + tracetag: Tag Trek + user: Pengguna + user_preference: Preferensi Pengguna + user_token: Token Pengguna + way: Garis + way_node: Node/Titik dari garis + way_tag: Tag garis + browse: + changeset: + changeset: "Set Perubahan: %{id}" + changesetxml: Set Perubahan XML + feed: + title: Set Perubahan %{id} + title_comment: Set Perubahan %{id} - %{comment} + osmchangexml: osmChange XML + title: Set Perubahan + changeset_details: + belongs_to: "Milik dari:" + bounding_box: Batasan Wilayah + box: kotak + closed_at: "Ditutup pada:" + created_at: "Dibuat pada:" + has_nodes: + one: "telah memiliki memiliki berikut % {count} titik/node: " + other: "memiliki node % {{count} berikut:" + has_relations: + one: "telah memiliki berikut % {count} relasi : " + other: "memiliki hubungan % {{count} berikut:" + has_ways: + one: "telah memiliki berikut % {count} cara: " + other: "Has % {{count} garis berikut:" + no_bounding_box: Tidak ada batasan wilayah yang disimpan untuk changeset ini. + show_area_box: Tampilkan Kotak Wilayah + common_details: + changeset_comment: "Komentar:" + deleted_at: "Dihapus pada:" + deleted_by: "Dihapus oleh:" + edited_at: "Diedit pada:" + edited_by: "Diedit oleh:" + in_changeset: "Dalam set perubahan:" + version: "Versi:" + containing_relation: + entry: Relasi %{relation_name} + entry_role: Relasi %{relation_name} (as %{relation_role}) + map: + deleted: Dihapus + edit: + area: Edit area + node: Edit node/titik + relation: Edit relasi + way: Edit way/garis + larger: + area: Lihat area pada peta yang lebih besar + node: Lihat node/titik pada peta yang lebih besar + relation: Lihat relasi pada peta yang lebih besar + way: Lihat garis pada peta yang lebih besar + loading: Memuat... + navigation: + all: + next_changeset_tooltip: Set perubahan berikutnya + next_node_tooltip: Node/Titik berikutnya + next_relation_tooltip: Relation/Relasi berikutnya + next_way_tooltip: Garis Berikutnya + prev_changeset_tooltip: Set perubahan sebelumnya + prev_node_tooltip: Node/Titik sebelumnya + prev_relation_tooltip: Relation/Relasi sebelumnya + prev_way_tooltip: Garis sebelumnya + user: + name_changeset_tooltip: Lihat suntingan oleh %{user} + next_changeset_tooltip: Edit selanjutnya oleh %{user} + prev_changeset_tooltip: Edit sebelumnya oleh %{user} + node: + download_xml: Download XML + edit: Edit node/titik + node: Node/Titik + node_title: "Node/Titik: %{node_name}" + view_history: Lihat riwayat + node_details: + coordinates: "Koordinat:" + part_of: "Bagian dari:" + node_history: + download_xml: Download XML + node_history: "Riwayat node/titik:" + node_history_title: "Riwayat node/titik: %{node_name}" + view_details: "Lihat rincian:" + not_found: + sorry: Maaf, %{type} dengan id %{id}, tidak dapat ditemukan. + type: + changeset: Set perubahan + node: node/titik + relation: relasi + way: way/garis + paging_nav: + of: dari + showing_page: Menampilkan halaman + redacted: + message_html: Versi % {version} {type} % ini tidak dapat ditampilkan karena telah diedit. Silahkan lihat % {redaction_link} untuk rincian. + redaction: Redaksi %{id} + type: + node: node/titik + relation: relasi + way: way/garis + relation: + download_xml: Download XML + relation: Relasi + relation_title: "Relasi: %{relation_name}" + view_history: Lihat riwayat + relation_details: + members: "Anggota:" + part_of: Bagian dari + relation_history: + download_xml: Download XML + relation_history: Riwayat Relasi + relation_history_title: "Riwayat Relasi: %{relation_name}" + view_details: Lihat Rincian + relation_member: + entry_role: "%{type} %{name} sebagai %{role}" + type: + node: Node/Titik + relation: Relasi + way: Way/Garis + start: + manually_select: Pilih wilayah yang berbeda secara manual + view_data: Lihat data untuk tampilan peta saat ini + start_rjs: + data_frame_title: Data + data_layer_name: Telusuri Data Peta + details: Rincian + drag_a_box: Gambar sebuah kotak pada peta untuk memilih wilayah + edited_by_user_at_timestamp: Diedit oleh %{user} pada %{timestamp} + hide_areas: Sembunyikan wilayah + history_for_feature: Riwayat untuk %{feature} + load_data: Memuat Data + loaded_an_area_with_num_features: "Anda telah memuat wilayah yang berisi %{num_features} fitur. Secara umum, beberapa browser mungkin tidak dapat mengatasi dengan baik untuk menampilkan sejumlah data tersebut, browser akan bekerja dengan baik dalam menampilkan data kurang dari %{max_features} fitur pada saat yang sama: lebih daripada itu akan membuat browser anda menjadi lamban/tidak responsif. Jika anda yakin ingin menampilkan data ini, anda dapat melakukannya dengan mengklik tombol di bawah." + loading: Memuat... + manually_select: Pilih wilayah berbeda secara manual + object_list: + api: Menerima wilayah ini dari API + back: Tampilkan daftar objek + details: Rincian + heading: Daftar objek + history: + type: + node: Node/Titik %{id} + way: Garis %{id} + selected: + type: + node: Node/Titik %{id} + way: Garis %{id} + type: + node: Node/Titik + way: Way/Garis + private_user: pengguna pribadi + 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})" + wait: Tunggu... + zoom_or_select: Perbesar atau pilih sebuah wilayah dari peta untuk melihatnya + tag_details: + tags: "Tag:" + wiki_link: + key: Deskripsi halaman wiki untuk tag % {key} + tag: Deskripsi halaman wiki untuk %{key}=% tag {value} + wikipedia_link: Artikel %{page} di Wikipedia + timeout: + sorry: Maaf, data untuk %{type} dengan id %{id}, terlalu lama untuk dibuka. + type: + changeset: set perubahan + node: node/titik + relation: relasi + way: way/garis + way: + download_xml: Download XML + edit: Edit way/garis + view_history: Lihat riwayat + way: Garis + way_title: "Garis: %{way_name}" + way_details: + also_part_of: + one: also part of way %{related_ways} + other: also part of ways %{related_ways} + nodes: "Nodes/Titik:" + part_of: "Bagian dari:" + way_history: + download_xml: Download XML + view_details: Lihat rincian + way_history: Riwayat Garis + way_history_title: "Riwayat Garis: %{way_name}" + changeset: + changeset: + anonymous: Anonim + big_area: (big) + no_comment: (tidak ada) + no_edits: (tidak ada edit) + show_area_box: tampilkan kotak daerah + still_editing: (masih mengedit) + view_changeset_details: Lihat detail dari set perubahan + changeset_paging_nav: + next: Berikutnya » + previous: « Sebelumnya + showing_page: Menampilkan halaman %{page} + changesets: + area: Wilayah + comment: Komentar + id: ID + saved_at: Disimpan di + user: Pengguna + list: + description: Perubahan terbaru + description_bbox: Set perubahan diantara %{bbox} + description_friend: Set perubahan oleh teman Anda + description_nearby: Set perubahan oleh pengguna terdekat + description_user: Perubahan oleh %{user} + description_user_bbox: Set perubahan oleh %{user} dalam %{bbox} + empty_anon_html: Belum ada edit yang dibuat + empty_user_html: Tampaknya Anda belum melakukan edit. Untuk memulainya, silahkan buka Beginners Guide. + heading: Set perubahan + heading_bbox: Set perubahan + heading_friend: Set perubahan + heading_nearby: Set perubahan + heading_user: Set perubahan + heading_user_bbox: Set perubahan + title: Set perubahan + title_bbox: Set perubahan diantara %{bbox} + title_friend: Set perubahan oleh teman Anda + title_nearby: Set perubahan oleh pengguna terdekat + title_user: Set perubahan oleh %{user} + title_user_bbox: Set perubahan oleh %{user} diantara %{bbox} + timeout: + sorry: Maaf, daftar kumpulan set perubahan yang Anda minta terlalu lama untuk diambil. + diary_entry: + comments: + ago: "%{ago} yang lalu" + comment: Komentar + has_commented_on: "%{display_name} telah mengomentari entri catatan harian berikut" + newer_comments: Komentar Baru + older_comments: Komentar Lama + post: Posting + when: Kapan + diary_comment: + comment_from: Komentar dari %{link_user} pada %{comment_created_at} + confirm: Konfirmasi + hide_link: Sembunyikan komentar ini + diary_entry: + comment_count: + one: 1 comment + other: "%{count} comments" + comment_link: Komentar pada entri ini + confirm: Konfirmasi + edit_link: Edit entri ini + hide_link: Sembunyikan entri ini + posted_by: Dipost oleh %{link_user} pada %{created} dalam %{language_link} + reply_link: Balasan untuk entri ini + edit: + body: "Isi:" + language: "Bahasa:" + latitude: Lintang + location: Lokasi + longitude: Bujur + marker_text: Lokasi entri catatan harian + save_button: Simpan + subject: Subjek + title: Edit entri catatan harian + use_map_link: Gunakan peta + feed: + all: + description: Entri catatan harian terbaru dari pengguna OpenStreetMap + title: Entri catatan harian OpenStreetMap + language: + description: Entri catatan harian terbaru dari pengguna OpenStreetMap dalam %{language_name} + title: Entri catatan harian OpenStreetMap dalam %{language_name} + user: + description: Entri catatan harian OpenStreetMap terbaru dari %{user} + title: Entri catatan harian OpenStreetMap untuk %{user} + list: + in_language_title: Entri catatan harian dalam %{language} + new: Entri baru catatan harian + new_title: Buat entri baru dalam catatan harian Anda + newer_entries: Entri baru + no_entries: Tidak ada entri catatan harian + older_entries: Entri Lama + recent_entries: "Entri buku harian terbaru:" + title: Catatan harian pengguna + title_friends: Catatan harian teman + title_nearby: Catatan harian pengguna terdekat + user_title: Catatan harian %{user} + location: + edit: Edit + location: "Lokasi:" + view: Lihat + new: + title: Entri Baru Catatan Harian + no_such_entry: + body: Maaf, tidak ada catatan harian atau komentar dengan id % {id}. Harap memeriksa ejaan, atau mungkin Anda mengklik link yang salah. + heading: "Tidak ada entri dengan id: % {id}" + title: Tidak ada entri catatan harian tersebut + view: + leave_a_comment: Tinggalkan komentar + login: Masuk + login_to_leave_a_comment: "%{login_link} untuk meninggalkan komentar" + save_button: Simpan + title: Catatan harian %{user) | %{title} + user_title: Catatan harian %{user} + editor: + default: Standar (saat ini %{name}) + potlatch: + description: Potlatch 1 (editor di dalam browser) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (editor di dalam browser) + name: Potlatch 2 + remote: + description: Remote Control (JOSM atau Merkaartor) + name: Remote Control + export: + start: + add_marker: Tambahkan penanda ke peta + area_to_export: Wilayah untuk diekspor + embeddable_html: HTML yang terkait + export_button: Ekspor + export_details: Data OpenStreetMap memiliki lisensi Open Data Commons Open Database License (ODbL). + format: Format + format_to_export: Format untuk diekspor + image_size: Ukuran gambar + latitude: "Lintang:" + licence: Lisensi + longitude: "Bujur:" + manually_select: Pilih wilayah berbeda secara manual + map_image: Gambar Peta (menunjukkan layer standar) + max: Maks + options: Pilihan + osm_xml_data: Data XML OpenStreetMap + output: Hasil + paste_html: Salin HTML untuk menyimpan di website + scale: Skala + too_large: + body: Wilayah ini terlalu besar untuk dieskspor sebagai data XML OpenStreetMap. Silahkan perbesat atau pilih wilayah yang lebih kecil. + heading: Area Terlalu Besar + zoom: Perbesar + start_rjs: + add_marker: Tambahkan penanda pada peta + change_marker: Ubah posisi penanda + click_add_marker: Klik pada peta untuk menambahkan penanda + drag_a_box: Gambar sebuah kotak pada peta untuk memilih suatu wilayah + export: Ekspor + manually_select: Pilih wilayah lain secara manual + view_larger_map: Lihat Peta yang Lebih Besar + geocoder: + description: + title: + geonames: Hasil dari GeoNames + osm_nominatim: Hasil dari OpenStreetMap Nominatim + types: + cities: Kota (jamak) + places: Tempat (jamak) + towns: Desa (jamak) + direction: + east: timur + north: utara + north_east: timur laut + north_west: barat laut + south: selatan + south_east: tenggara + south_west: barat daya + west: barat + distance: + one: sekitar 1km + other: about km %{count} + zero: kurang daripada 1km + results: + more_results: Hasil lainnya... + no_results: Tidak ada hasil yang ditemukan + search: + title: + ca_postcode: Hasil dari Geocoder.CA + geonames: Hasil dari GeoNames + latlon: Hasil dari Internal + osm_nominatim: Hasil dari OpenStreetMap Nominatim + uk_postcode: Hasil dari NPEMap / FreeThe Postcode + us_postcode: Hasil dari Geocoder.us + search_osm_nominatim: + prefix: + aeroway: + aerodrome: Lapangan Terbang + apron: Landasan Lapangan Udara + gate: Gerbang + helipad: Helipad + runway: Landasan pacu + taxiway: Jalur taxi + terminal: Terminal + amenity: + WLAN: Akses WiFi + airport: Bandara + arts_centre: Pusat Kesenian + artwork: Karya Seni + atm: ATM + auditorium: Auditorium + bank: Bank + bar: Bar + bbq: BBQ + bench: Bangku + bicycle_parking: Parkir Sepeda + bicycle_rental: Penyewaan Sepeda + biergarten: Beer Garden + brothel: Bordil + bureau_de_change: Penukaran Valuta Asing + bus_station: Terminal Bus + cafe: Kafe + car_rental: Penyewaan Mobil + car_sharing: Penyewaan Mobil (per jam) + car_wash: Tempat Cuci Mobil + casino: Kasino + charging_station: Stasiun Pengisian + cinema: Bioskop + clinic: Klinik + club: Klub + college: Perguruan Tinggi + community_centre: Gedung Serbaguna + courthouse: Gedung Pengadilan + crematorium: Tempat Kremasi (Pembakaran Mayat) + dentist: Dokter Gigi + doctors: Dokter + dormitory: Asrama + drinking_water: Air Minum + driving_school: Sekolah Mengemudi + embassy: Kedutaan Besar + emergency_phone: Telepon Darurat + fast_food: Makanan Cepat Saji + ferry_terminal: Terminal Kapal Feri + fire_hydrant: Hidran/Keran Kebakaran + fire_station: Stasiun Pemadam Kebakaran + food_court: Food Court + fountain: Air Mancur + fuel: Stasiun Pengisian Bahan Bakar + grave_yard: Kuburan + gym: Pusat Kebugaran / Gym + hall: Aula/Gedung Pertemuan + health_centre: Pusat Kesehatan + hospital: Rumah Sakit + hotel: Hotel + hunting_stand: Pos Berburu + ice_cream: Es Krim + kindergarten: TK + library: Perpustakaan + market: Pasar + marketplace: Pasar + mountain_rescue: Penyelamat Hutan (SAR) + nightclub: Klub Malam + nursery: Pendidikan Anak Usia Dini (PAUD) + nursing_home: Panti Jompo + office: Kantor + park: Taman + parking: Parkir + pharmacy: Apotek + place_of_worship: Tempat Ibadah + police: Polisi + post_box: Kotak Pos + post_office: Kantor Pos + preschool: Pra-sekolah + prison: Penjara + pub: Pub + public_building: Bangunan Publik + public_market: Pasar Publik + reception_area: Area Bagian Penerima Tamu + recycling: Titik Daur Ulang + restaurant: Restoran + retirement_home: Rumah Jompo + sauna: Sauna + school: Sekolah + shelter: Tempat Berlindung + shop: Toko + shopping: Pusat Perbelanjaan + shower: Tempat Pemandian Umum + social_centre: Pusat Sosial + social_club: Klub Sosial + studio: Studio + supermarket: Supermarket + swimming_pool: Kolam Renang + taxi: Taxi + telephone: Telepon Umum + theatre: Teater + toilets: Toilet + townhall: Balai Kota + university: Universitas + vending_machine: Mesin Penjual + veterinary: Bedah Hewan + village_hall: Balai Desa + waste_basket: Keranjang Sampah + wifi: Akses WiFi + youth_centre: Pusat Pemuda + boundary: + administrative: Batas Administratif + census: Batas Sensus + national_park: Taman Nasional + protected_area: Kawasan lindung + bridge: + aqueduct: Saluran Air + suspension: Jembatan Suspensi + swing: Jembatan Gantung + viaduct: Jembatan Viaduct (di atas jalan) + "yes": Jembatan + building: + "yes": Bangunan + highway: + bus_guideway: Jalur Bus Terpandu + bus_stop: Halte Bus + construction: Jalan raya sedang dalam perbaikan + cycleway: Jalur Sepeda + emergency_access_point: Titik Akses Darurat + footway: Jalan setapak + living_street: Jalan Permukiman + motorway: Jalan Tol + path: Jalan Setapak + pedestrian: Jalur Pejalan Kaki + primary: Jalam Primer + primary_link: Jalan Primer + raceway: Jalur Sirkuit + residential: Jalan Permukiman + rest_area: Area Peristirahatan + road: Jalan + secondary: Jalan Sekunder + secondary_link: Jalan Sekunder + service: Jalan Pelayanan + services: Pelayanan Jalan Tol + speed_camera: Kamera Pendeteksi Kecepatan + tertiary: Jalan Tersier + tertiary_link: Jalan Tersier + track: Trek + trail: Jejak + trunk: Jalan Utama Bukan Tol + trunk_link: Jalan Utama Bukan Tol + unclassified: Jalan Tidak Terklasifikasi + unsurfaced: Jalan Tanpa Permukaan + historic: + archaeological_site: Situs arkeologi + battlefield: Medan perang + boundary_stone: Batas batu + building: Bangunan + castle: Kastil + church: Gereja + fort: Benteng + house: Rumah + icon: Ikon + manor: Tanah Bangsawan + memorial: Memorial + mine: Tambang + monument: Monumen + museum: Museum + ruins: Reruntuhan + tower: Menara + wayside_cross: Pinggir persimpangan + wayside_shrine: Kuil pinggir jalan + wreck: Rongsokan + landuse: + allotments: Tanah garap + basin: Cekungan + brownfield: Lahan industri + cemetery: Pemakaman + commercial: Wilayah Komersial + conservation: Konservasi + construction: Konstruksi + farm: Pertanian + farmland: Lahan Pertanian + farmyard: Lahan Peternakan + forest: Hutan + garages: Garasi + grass: Rumput + greenfield: Lahan Perkebunan + industrial: Wilayah Industri + landfill: Tempat Pembuangan Akhir + meadow: Padang rumput + military: Kawasan militer + mine: Tambang + nature_reserve: Cagar Alam + orchard: Kebun buah-buahan + park: Taman + quarry: Tempat Penggalian + railway: Rel Kereta + recreation_ground: Taman Rekreasi + reservoir: Wilayah Serapan (Reservoir) + reservoir_watershed: DAS reservoir + residential: Wilayah Permukiman + retail: Wilayah Perdagangan + road: Wilayah Jalan + village_green: Desa Hijau + vineyard: Kebun anggur + wetland: Lahan Basah + wood: Kayu + leisure: + beach_resort: Resort Pantai + bird_hide: Tempat Observasi Burung + common: Lahan Publik + fishing: Tempat Pemancingan + fitness_station: Stasiun Kebugaran + garden: Kebun + golf_course: Taman Golf + ice_rink: Gelanggang Es (Ice Rink) + marina: Pantai + miniature_golf: Mini Golf + nature_reserve: Cagar Alam + park: Taman + pitch: Lapangan Olahraga + playground: Taman Bermain + recreation_ground: Taman Rekreasi + sauna: Sauna + slipway: Tempat Peluncuran Kapal + sports_centre: Pusat Olahraga + stadium: Stadion + swimming_pool: Kolam Renang + track: Trek Lari + water_park: Taman Air + military: + airfield: Lapangan Udara Militer + barracks: Barak + bunker: Bunker + natural: + bay: Teluk + beach: Pantai + cape: Tanjung + cave_entrance: Pintu Masuk Gua + channel: Kanal + cliff: Tebing + crater: Kawah + dune: Bukit Pasir + feature: Fitur + forest: Hutan + geyser: Mata air panas + glacier: Gletser + heath: Padang Rumpur + hill: Bukit + island: Pulau + land: Lahan + marsh: Rawa + moor: Tegalan + mud: Lumpur + peak: Puncak + point: Titik + reef: Batu Karang + ridge: Punggung Bukit + river: Sungai + rock: Batu + scree: Kerikil + scrub: Semak Belukar + shoal: Beting + spring: Mata Air + stone: Batu + strait: Selat + tree: Pohon + valley: Lembah + volcano: Gunung berapi + water: Air + wetland: Lahan Basah + wetlands: Lahan Basah (jamak) + wood: Kayu + office: + accountant: Akuntan + architect: Arsitek + company: Perusahaan + employment_agency: Badan Tenaga Kerja + estate_agent: Agen Pengurus Pertanahan + government: Kantor Pemerintah + insurance: Kantor Asuransi + lawyer: Pengacara + ngo: Kantor LSM + telecommunication: Kantor Telekomunikasi + travel_agent: Agen Perjalanan + "yes": Kantor + place: + airport: Bandara + city: Kota + country: Negara + county: Provinsi + farm: Pertanian + hamlet: Desa + house: Rumah + houses: Rumah (jamak) + island: Pulau + islet: Pulau Kecil + isolated_dwelling: Daerah Terisolasi + locality: Lokal + moor: Tegalan + municipality: Kotamadya/Kabupaten + postcode: Kode Pos + region: Wilayah + sea: Laut + state: Negara Bagian + subdivision: Cabang + suburb: Pinggiran kota + town: Kota + unincorporated_area: Wilayah lepas + village: Desa + railway: + abandoned: Rel kereta yang diabaikan + construction: Rel kereta yang diperbaiki + disused: Rel kereta yang bekas + disused_station: Bekas Stasiun Kereta + funicular: Trem yang digerakan dengan kabel + halt: Pemberhentian kereta + historic_station: Stasiun Kereta Bersejarah + junction: Persimpangan Rel + level_crossing: Perlintasan Bertingkat + shop: + antiques: Toko Benda Antik + art: Toko Kerajinan Tangan + bakery: Toko Roti + beauty: Toko Kecantikan + beverages: Toko Minuman + bicycle: Toko Sepeda + books: Toko Buku + butcher: Toko Daging + car: Showroom Mobil + car_parts: Toko Onderdil Mobil + car_repair: Bengkel Mobil + carpet: Toko Karpet + charity: Toko Amal + chemist: Toko Kimia + clothes: Toko Baju + computer: Toko Komputer + confectionery: Toko Konfeksi + copyshop: Fotocopy + cosmetics: Toko Kosmetik + department_store: Department Store + discount: Toko Barang Obral + doityourself: Toko Perkakas + dry_cleaning: Dry Cleaning + electronics: Toko Elektronik + estate_agent: Agen Properti + farm: Toko Pertanian + fashion: Toko Mode + fish: Toko Ikan + florist: Toko Bunga + food: Toko Makanan + furniture: Toko Meubel + gallery: Galeri + garden_centre: Pusat Kebun + general: Toko Umum + gift: Toko Hadiah + greengrocer: Toko Sayuran + grocery: Toko Sembako + hairdresser: Penata Rambut + hardware: Toko Perangkat Keras + hifi: Hi-Fi + insurance: Asuransi + jewelry: Toko Perhiasan + kiosk: Warung + laundry: Binatu + mall: Mall + market: Pasar + mobile_phone: Toko Handphone + motorcycle: Toko Sepeda Motor + music: Toko Musik + newsagent: Agen Surat Kabar + optician: Optik + organic: Toko Makanan Organic + outdoor: Toko Barang-Barang Outdoor + pet: Toko Hewan + photo: Studio Foto + salon: Salon + shoes: Toko Sepatu + shopping_centre: Pusat Perbelanjaan + sports: Toko Olahraga + stationery: Toko Alat Tulis + supermarket: Supermarket + toys: Toko Mainan + travel_agency: Agen Perjalanan + tourism: + artwork: Karya Seni + attraction: Atraksi + bed_and_breakfast: Tidur dan Sarapan + cabin: Kabin + camp_site: Perkemahan + caravan_site: Tempat Karavan + chalet: Vila + guest_house: Rumah Tamu + hostel: Hostel + hotel: Hotel + information: Informasi + motel: Motel + museum: Museum + picnic_site: Tempat Piknik + valley: Lembah + zoo: Kebun Binatang + tunnel: + "yes": Terowongan + waterway: + canal: Kanal + river: Sungai + riverbank: Bantaran Sungai + waterfall: Air Terjun + layouts: + community: Komunitas + community_blogs: Blog Komunitas + community_blogs_title: Blog dari anggota komunitas OpenStreetMap + copyright: Hak Cipta & Lisensi + documentation: Dokumentasi + documentation_title: Dokumentasi proyek + donate: Dukung OpenStreetMap %{link} untuk biaya upgrade Hardware. + donate_link_text: menyumbang + edit: Edit + edit_with: Edit menggunakan %{editor} + export: Ekspor + export_tooltip: Ekspor data peta + foundation: Foundation (Yayasan) + foundation_title: The OpenStreetMap Foundation + gps_traces: Trek GPS + gps_traces_tooltip: Kelola trek GPS + help: Bantuan + help_centre: Pusat Bantuan + help_title: Situs Bantuan untuk proyek + history: Riwayat + home: Halaman Utama + home_tooltip: Pergi ke lokasi rumah + inbox_html: kotak masuk %{count} + inbox_tooltip: + one: kotak masuk Anda berisi 1 pesan yang belum dibaca message + other: kotak masuk Anda berisi %{count} pesan yang belum dibaca + zero: tidak ada surat yang belum dibaca dalam kotak masuk Anda messages + intro_1: OpenStreetMap adalah peta dunia gratis, dibuat oleh orang-orang seperti Anda. + intro_2_create_account: Buat Akun + intro_2_download: download + intro_2_html: Data ini bebas untuk %{download} dan %{use} di bawah %{license}. %{create_account} untuk meningkatkan peta. + intro_2_license: lisensi terbuka + intro_2_use: menggunakan + log_in: Masuk + log_in_tooltip: Masuk dengan akun yang sudah ada + logo: + alt_text: logo OpenStreetMap + logout: Keluar log + logout_tooltip: Keluar log + make_a_donation: + text: Menyumbang + title: Dukung OpenStreetMap dengan donasi finansial + osm_offline: OpenStreetMap database sedang offline saat ini sementara pekerjaan pemeliharaan database penting sedang dilakukan. + osm_read_only: OpenStreetMap database saat ini adalah pada mode read-only (hanya dapat dilihat) sementara pekerjaan pemeliharaan database penting sedang dilakukan. + partners_bytemark: Hosting Bytemark + partners_html: Hosting didukung oleh %{ucl}, %{ic} dan %{bytemark} dan %{partners} lainnya. + partners_ic: Imperial College London + partners_partners: mitra + partners_ucl: Pusat UCL VR + sign_up: Daftar + sign_up_tooltip: Buat akun untuk mengedit + tag_line: Peta Dunia Wiki Gratis + user_diaries: Catatan Harian Pengguna + user_diaries_tooltip: Lihat catatan harian pengguna + view: Tampilkan + view_tooltip: Tampilkan peta + welcome_user: Selamat Datang, %{user_link} + welcome_user_link_tooltip: Halaman Anda + wiki: Wiki + wiki_title: Situs wiki untuk proyek + license_page: + foreign: + english_link: Bahasa Inggris asli + text: Saat terjadi konflik antara halaman diterjemahkan dan %{english_original_link}, halaman bahasa Inggris akan diutamakan + title: Tentang terjemahan ini + legal_babble: + attribution_example: + alt: Contoh tentang bagaimana mengatribusi OpenStreetMap pada halaman web + title: Contoh atribusi + contributors_title_html: Kontributor kami + 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 + intro_1_html: Data OpenStreetMap memiliki lisensi Open Data Commons Open Database License (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.\nkode legal\ncode akan menjelaskan hak dan kewajiban Anda" + intro_3_html: "Kartografi dalam tampilan peta dan dokumentasi kami\n berlisensi di bawah Creative\nCommons Attribution-ShareAlike 2.0 lisensi (CC-BY-SA)." + more_1_html: "Baca lebih lanjut tentang menggunakan data kami, dan cara kredit kita, di Pertanyaan Legal yang sering diajukan (FAQ)" + more_title_html: Mengetahui lebih lanjut + title_html: Hak Cipta & Lisensi + native: + mapping_link: memulai pemetaan + native_link: Versi THIS_LANGUAGE_NAME_HERE + text: Anda melihat versi bahasa Inggris dari halaman hak cipta. Anda dapat kembali ke %{native_link} dari Halaman ini atau Anda dapat berhenti membaca tentang hak cipta dan %{mapping_link}. + title: Tentang Halaman ini + message: + delete: + deleted: Pesan dihapus + inbox: + date: Tanggal + from: Dari + messages: Anda memiliki %{new_messages} dan %{old_messages} + my_inbox: Kotak Masuk Saya + outbox: Kotak keluar + people_mapping_nearby: orang-orang disekitar Anda yang melakukan pemetaan + subject: Subyek + title: Kotak Masuk + mark: + as_read: Pesan ditandai telah dibaca + as_unread: Pesan ditandai belum dibaca + message_summary: + delete_button: Hapus + read_button: Tandai sudah dibaca + reply_button: Balas + unread_button: Tandai belum dibaca + new: + back_to_inbox: Kembali ke kotak masuk + limit_exceeded: Anda telah mengirim banyak sekali pesan baru akhir-akhir ini. Silahkan tunggu sebentar sebelum mencoba mengirimkan lagi. + message_sent: Pesan terkirim + send_button: Kirim + send_message_to: Kirim pesan baru ke %{name} + subject: Subyek + title: Kirim Pesan + no_such_message: + body: Maaf tidak ada pesan dengan id tersebut. + outbox: + date: Tanggal + inbox: kotak masuk + my_inbox: "%{inbox_link} saya" + outbox: kotak keluar + subject: Subjek + title: Kotak keluar + to: Kepada + read: + back_to_inbox: Kembali ke kotak masuk + back_to_outbox: Kembali ke kotak keluar + date: Tanggal + from: Dari + reading_your_messages: Membaca pesan Anda + reading_your_sent_messages: Membaca pesan terkirim Anda + reply_button: Balas + subject: Subjek + title: Baca pesan + to: Kepada + unread_button: Tandai belum dibaca + sent_message_summary: + delete_button: Hapus + notifier: + diary_comment_notification: + hi: Halo %{to_user}, + email_confirm: + subject: "[OpenStreetMap] Konfirmasi alamat email Anda" + email_confirm_html: + click_the_link: Jika ini adalah Anda, silahkan klik link di bawah ini untuk mengkonfirmasi perubahan. + greeting: Halo, + email_confirm_plain: + click_the_link: Jika ini adalah Anda, silahkan klik link di bawah ini untuk mengkonfirmasi perubahan. + greeting: Halo, + 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: + failure: + failed_to_import: "gagal melakukan impor. Berikut ini adalah kesalahannya:" + subject: "[OpenStreetMap] gagal impor GPX" + greeting: Halo, + your_gpx_file: Kelihatannya ini file GPX Anda + lost_password_html: + click_the_link: Jika ini Anda, silahkan klik link di bawah ini untuk menyetel ulang kata sandi. + greeting: Halo, + lost_password_plain: + click_the_link: Jika ini Anda, silahkan klik link di bawah ini untuk menyetel ulang kata sandi. + greeting: Halo, + message_notification: + footer1: Anda juga dapat membaca pesan pada %{readurl} + footer2: dan Anda juga dapat membalas pada %{replyurl} + hi: Halo %{to_user}, + signup_confirm_html: + ask_questions: Anda dapat mengajukan pertanyaan yang Anda miliki tentang OpenStreetMap pada situs pertanyaan dan jawaban. + get_reading: Mulai membaca tentang OpenStreetMap pada wiki, lihat berita terbaru melalui OpenStreetMap blog atau Twitter, atau cari tahu tentang pendiri OpenStreetMap Steve Coast melalui OpenGeoData blog untuk sejarah proyek ini, yang memiliki podcasts yang dapat didengarkan pula! + introductory_video: Anda dapat menonton % {introductory_video_link}. + more_videos: Ada %{more_videos_link}. + more_videos_here: lebih banyak video di sini + video_to_openstreetmap: video pengantar OpenStreetMap + signup_confirm_plain: + introductory_video: "Anda dapat menonton video pengantar OpenStreetMap di sini:" + more_videos: "Ada lebih banyak video di sini:" + the_wiki: "Baca mengenai OpenStreetMap di wiki:" + wiki_signup: "Anda juga dapat mendaftar wiki OpenStreetMap di:" + oauth: + oauthorize: + allow_read_gpx: baca trek GPS pribadi Anda. + allow_write_api: memodifikasi peta. + allow_write_gpx: Upload trek GPS + oauth_clients: + create: + flash: Informasi telah terdaftar dengan sukses. + destroy: + flash: Registrasi aplikasi klien telah dibatalkan. + edit: + submit: Edit + title: Edit aplikasi Anda + form: + allow_write_api: modifikasi peta + allow_write_gpx: upload trek GPS + name: Nama + new: + submit: Daftar + title: Daftar aplikasi baru + not_found: + sorry: Maaf, %{type} tidak dapat ditemukan. + show: + allow_write_api: modifikasi peta. + allow_write_gpx: upload trek GPS. + confirm: Apakah Anda yakin? + edit: Edit Rincian + update: + flash: Informasi klien telah sukses diperbarui. + redaction: + edit: + description: Deskripsi + site: + edit: + not_public: Anda belum mengatur hasil edit Anda menjadi publik. + user_page_link: halaman pengguna + index: + js_1: Anda menggunakan browser yang tidak mendukung JavaScript, atau Anda telah menonaktifkan JavaScript. + js_2: OpenStreetMap menggunakan JavaScript untuk slippy map nya. + key: + table: + entry: + forest: Hutan + school: + - Sekolah + - universitas + markdown_help: + image: Gambar + url: URL + richtext_area: + edit: Edit + search: + search: Pencarian + where_am_i: Di mana saya? + where_am_i_title: Deskripsikan lokasi Anda saat ini menggunakan mesin pencari + sidebar: + close: Tutup + search_results: Hasil Pencarian + time: + formats: + friendly: "%e %B %Y pada %H:%M" + trace: + create: + upload_trace: Upload trek GPS + delete: + scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus + edit: + description: "Deskripsi:" + download: download + edit: edit + filename: "Nama File:" + map: peta + points: "Poin/Titik:" + save_button: Simpan Perubahan + start_coord: "Mulai koordinat:" + uploaded_at: "Diupload:" + visibility_help: apa artinya ini? + list: + public_traces: Trek GPS umum + public_traces_from: Trek GPS umum dari %{user} + tagged_with: di tag dengan %{tags} + your_traces: Trek GPS Anda + trace: + by: oleh + edit: edit + edit_map: Edit Peta + in: dalam + map: peta + view_map: Lihat peta + trace_form: + help: Bantuan + upload_button: Upload + upload_gpx: "Upload File GPX:" + view: + delete_track: Hapus trek ini + description: "Deskripsi:" + download: download + edit: edit + edit_track: "Edit trek ini:" + filename: "Nama File:" + map: peta + owner: "Pemilik:" + points: "Poin/Titik:" + start_coordinates: "Mulai Koordinat:" + tags: "Tag:" + trace_not_found: Trek tidak ditemukan! + uploaded: "Diupload:" + user: + account: + contributor terms: + agreed: Anda telah menyetujui Persyaratan Kontributor yang baru. + heading: "Syarat-syarat Kontributor:" + link text: Apa ini? + not yet agreed: Anda belum menyetujui Persyaratan Kontributor yang baru. + review link text: Silahkan ikuti link ini untuk kenyamanan Anda untuk meninjau dan menyetujui Persyaratan Kontributor yang baru. + current email address: "Alamat Email Saat Ini:" + delete image: Hapus gambar saat ini + email never displayed publicly: (jangan pernah ditampilkan ke publik) + gravatar: + gravatar: Gunakan Gravatar + link text: apa ini? + home location: "Lokasi Rumah:" + image: "Gambar:" + image size hint: (kotak gambar yang dapat bekerja terbaik paling tidak berukuran 100x100) + keep image: Gunakan gambar saat ini + latitude: "Garis Lintang:" + longitude: "Garis Bujur:" + my settings: Pengaturan saya + new email address: "Alamat Email Baru:" + new image: Tambahkan gambar + no home location: Anda telah memasukkan lokasi rumah Anda. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: Apa ini? + openid: "OpenID:" + preferred editor: "Editor yang Dipilih:" + preferred languages: "Bahasa yang Dipilih:" + profile description: "Deskripsi Profil:" + public editing: + disabled link text: mengapa saya tidak bisa mengedit? + enabled link text: Apa ini? + heading: "Mengedit secara publik:" + public editing note: + heading: Mengedit secara publik + replace image: Ganti gambar saat ini + title: Edit akun + confirm: + already active: Akun ini telah dikonfirmasi. + before you start: Kami tahu Anda mungkin sudah tidak sabar untuk melakukan pemetaan, namun sebelumnya Anda sebaiknya mengisi beberapa informasi tambahan mengenai diri Anda dalam formulir di bawah ini. + button: Konfirmasi + press confirm button: Tekan tombol konfirmasi di bawah ini untuk mengaktifkan akun Anda. + reconfirm: Jika sudah beberapa saat sejak Anda mendaftar, Anda mungkin perlu mengirim lagi sebuah email konfirmasi baru. + success: Akun Anda telah dikonfirmasi, terima kasih telah mendaftar! + unknown token: Token tersebut tampaknya tidak ada. + confirm_email: + button: Konfirmasi + failure: Sebuah alamat email telah dikonfirmasikan dengan token ini. + heading: Konfirmasi perubahan alamat email + press confirm button: Tekan tombol konfirmasi di bawah ini untuk melakukan konfirmasi alamat email baru Anda. + success: Mengkonfirmasi alamat email Anda, terima kasih telah mendaftar! + confirm_resend: + failure: Pengguna %{name} tidak ditemukan. + success: Kami telah mengirim catatan konfirmasi baru ke %{email} dan setelah Anda mengkonfirmasi akun, Anda akan dapat mulai melakukan pemetaan.

    Jika Anda menggunakan sistem anti spam yang mengirimkan permintaan konfirmasi silahkan pastikan Anda memasukkan webmaster@openstreetmap.org ke dalam daftar putih karena kami tidak dapat membalas permintaan konfirmasi Anda. + filter: + not_an_administrator: Anda harus merupakan administrator untuk melakukan tindakan ini. + go_public: + flash success: Semua hasil edit Anda sekarang sudah publik, dan Anda diperbolehkan untuk mengedit. + list: + confirm: Konfirmasi Pengguna yang Dipilih + empty: Tidak ditemukan pengguna yang sesuai + heading: Pengguna + hide: Sembunyikan Pengguna yang Dipilih + showing: + one: Showing page %{page} (%{first_item} of %{items}) + other: Showing page %{page} (%{first_item}-%{last_item} of %{items}) + summary: "%{name} dibuat dari %{ip_address} pada %{date}" + summary_no_ip: "%{name} dibuat pada %{date}" + title: Pengguna + login: + account is suspended: Maaf, akun Anda telah dihentikan karena adanya aktivitas mencurigakan.
    Silahkan kontak/hubungiwebmaster jika Anda ingin mendiskusikannya. + account not active: Maaf, akun Anda belum aktif.
    Silahkan gunakan link pada email konfirmasi untuk mengaktifkan akun Anda, atau minta email konfirmasi yang baru. + auth failure: Maaf, tidak bisa login dengan rincian tersebut. + create account minute: Buat sebuah akun. Hanya membutuhkan satu menit. + email or username: "Alamat Email atau Nama Pengguna:" + heading: Login + login_button: Login + lost password link: Kehilangan kata sandi Anda? + new to osm: Baru di OpenStreetMap? + no account: Belum memiliki akun? + openid: "%{logo} OpenID:" + openid invalid: Maaf, OpenID Anda tampaknya cacat. + openid missing provider: Maaf, tidak bisa menghubungi penyedia OpenID Anda + openid_logo_alt: Login dengan OpenID + openid_providers: + aol: + alt: Login dengan AOL OpenID + title: Login dengan AOL + google: + alt: Login dengan Google OpenID + title: Login dengan Google + myopenid: + alt: Login dengan myOpenID OpenID + title: Login dengan myOpenID + openid: + alt: Login menggunakan URL OpenID + title: Login dengan OpenID + wordpress: + alt: Login dengan Wordpress OpenID + title: Login dengan Wordpress + yahoo: + alt: Login dengan Yahoo OpenID + title: Login dengan Yahoo + password: "Kata Sandi:" + register now: Daftar sekarang + remember: Inget saya + title: Login + to make changes: Untuk membuat perubahan data OpenStreetMap, Anda harus memiliki sebuah akun. + with openid: "Sebagai alternatif silahkan gunakan OpenID Anda untuk melakukan login:" + with username: "Sudah memiliki akun OpenStreetMap? Silahkan login menggunakan nama pengguna dan kata sandi Anda:" + logout: + heading: Logout dari OpenStreetMap + logout_button: Logout + title: Logout + lost_password: + email address: "Alamat Email:" + heading: Lupa Kata Sandi? + help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang kata sandi Anda. + new password button: Setel ulang kata sandi + notice email cannot find: Tidak dapat menemukan alamat email tersebut, maaf. + notice email on way: Maaf sudah hilang :-( namun sebuah email telah dikirimkan agar Anda dapat segera mengatur ulang. + title: Kehilangan kata sandi + make_friend: + already_a_friend: Anda sudah berteman dengan %{name}. + button: Tambahkan sebagai teman + failed: Maaf, gagal menambahkan %{name} sebagai teman. + heading: Tambahkan %{user} sebagai teman? + success: "%{name} sekarang adalah teman Anda." + new: + confirm email address: "Konfirmasi Alamat Email:" + confirm password: "Konfirmasi Kata Sandi:" + contact_webmaster: Silahkan kontak webmaster untuk mengatur sebuah akun untuk dibuat - kami akan mencoba menangani permintaan ini secepat mungkin. + continue: Lanjut + display name: "Tampilan Nama:" + display name description: Username Anda yang ditampilkan pada publik. Anda dapat mengubahnya dalam pengaturan. + email address: "Alamat Email:" + fill_form: Isi formulir ini dan kami akan segera mengirimkan email untuk mengaktifkan akun Anda. + flash create success message: Terima kasih telah mendaftar. Kami telah mengirim sebuah catatan konfirmasi ke %{email} dan setelah Anda melakukan konfirmasi akun Anda akan dapat melakukan pemetaan.

    Jika Anda menggunakan sistem anti spam yang mengirimkan permintaan konfirmasi, silahkan pastikan memasukkan webmaster@openstreetmap.org ke dalam daftar putih karena kami tidak dapat membalas permintaan konfirmasi Anda. + flash welcome: Terima kasih sudah mendaftar. Kami telah mengirim pesan selamat datang ke %{email} dengan beberapa petunjuk untuk memulai. + heading: Buat sebuah Akun Pengguna + license_agreement: Ketika Anda mengkonfirmasi akun Anda, Anda harus setuju dengan persyaratan kontributor. + no_auto_account_create: Sayangnya saat ini kami tidak dapat membuatkan akun secara otomatis untuk Anda. + openid: "%{logo} OpenID:" + openid association: "

    OpenID Anda belum diasosiasikan dengan akun OpenStreetMap.

    \n
      \n
    • Jika Anda baru di OpenStreetMap, silahkan buat sebuah akun baru menggunakan formulir di bawah ini.
      • \n
    • \n Jika Anda telah memiliki akun, Anda dapat login ke akun Anda\n menggunakan username (nama pengguna) dan kata sandi kemudian asosiasikan akun tersebut\n dengan OpenID Anda pada pegaturan pengguna.\n
      • \n
    " + openid no password: Dengan OpenID, kata sandi tidak diperlukan, namun untuk beberapa alat tambahan atau server mungkin masih membutuhkannya. + password: "Kata Sandi:" + terms accepted: Terima kasih telah menerima persyaratan kontributor yang baru! + terms declined: Kami mohon maaf Anda tidak menerima Persyaratan Kontributor baru. Untuk informasi lebih lanjut, silahkan lihat this wiki page. + title: Buat akun + use openid: Atau gunakan %{logo} OpenID untuk login + no_such_user: + body: Maaf, tidak ada pengguna dengan nama %{user}. Silahkan cek kembali ejaan, atau mungkin link yang Anda klik salah. + heading: Pengguna %{user} tidak dapat ditemukan + title: Pengguna tersebut tidak ditemukan + popup: + friend: Teman + nearby mapper: Pembuat peta disekitar Anda + your location: Lokasi Anda + remove_friend: + button: Hapus sebagai teman + heading: Hapus %{user} sebagai teman? + not_a_friend: "%{name} bukanlah salah satu dari teman Anda." + success: "%{name} telah dihapus dari daftar teman Anda." + reset_password: + confirm password: "Konfirmasi Kata Sandi:" + flash changed: Kata sandi Anda telah diubah. + flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin? + heading: Setel ulang kata sandi untuk %{user} + password: "Kata Sandi:" + reset: Setel Ulang Kata Sandi + title: Setel ulang kata sandi + set_home: + flash success: Lokasi rumah berhasil disimpan + suspended: + body: "

    \n Maaf, akun Anda telah ditangguhkan secara otomatis dikarenakan \n aktivitas yang mencurigakan. \n

    \n

    \n Keputusan ini akan ditinjau ulang oleh seorang administrator sesaat lagi, atau\n anda dapat menghubungi %{webmaster} jika Anda ingin mendiskusikannya.\n

    " + heading: Akun Ditangguhkan + title: Akun Ditangguhkan + webmaster: webmaster + terms: + agree: Setuju + consider_pd: Sebagai tambahan perjanjian di atas, saya menganggap kontribusi saya berada di dalam Domain Publik + consider_pd_why: Apa ini? + decline: Tolak + guidance: "Informasi untuk membantu Anda memahami persyaratan ini: sebuah ringkasan yang mudah dibaca dan beberapa terjemahan informal" + heading: Persyaratan Kontributor + legale_names: + france: Prancis + italy: Italia + rest_of_world: Bagian Lainnya dari Dunia + legale_select: "Silahkan pilih negara tempat tinggal Anda:" + read and accept: Silahkan baca perjanjian di bawah dan tekan tombol setuju untuk mengkonfirmasi bahwa Anda menerima persyaratan dari perjanjian ini untuk kontribusi Anda yang sudah ada dan di masa yang akan datang. + title: Persyaratan Kontributor + you need to accept or decline: Silahkan baca dan setujui atau tolak Persyaratan Kontributor yang baru untuk melanjutkan. + view: + activate_user: aktifkan pengguna ini + add as friend: tambahkan sebagai teman + ago: (%{time_in_words_ago} yang lalu) + blocks by me: blokir oleh saya + blocks on me: blokir pada saya + comments: komentar + confirm: Konfirmasi + confirm_user: konfirmasi pengguna ini + create_block: Blokir pengguna ini + created from: "Dibuat pada:" + ct accepted: Telah diterima %{ago} yang lalu + ct status: "Syarat-syarat kontributor:" + ct undecided: Belum diputuskan + deactivate_user: nonaktifkan pengguna ini + delete_user: hapus pengguna ini + description: Deskripsi + diary: catatan harian + edits: hasil edit + email address: "Alamat email:" + friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman + friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman + hide_user: sembunyikan pengguna ini + if set location: Jika Anda mengatur lokasi Anda, sebuah peta cantik akan muncul di sini. Anda dapat menetapkan lokasi rumah Anda pada halaman %{settings_link}. + latest edit: "Hasil edit terakhir %{ago}:" + mapper since: "Melakukan pemetaan sejak:" + my comments: komentar saya + my diary: catatan harian saya + my edits: hasil edit saya + my settings: pengaturan saya + my traces: trek saya + nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat + nearby_diaries: Telurusi seluruh entri catatan harian oleh pengguna terdekat + new diary entry: Entri baru catatan harian + no friends: Anda belum menambahkan teman. + oauth settings: Pengaturan oauth + remove as friend: hapus sebagai teman + role: + administrator: Pengguna ini merupakan administrator + moderator: Pengguna ini adalah moderator + send message: kirim pesan + settings_link_text: pengaturan + spam score: "Jumlah Spam:" + status: "Status:" + traces: trek + unhide_user: munculkan kembali pengguna ini + user location: Lokasi pengguna + your friends: Teman Anda + user_block: + blocks_by: + empty: "%{name} belum membuat blokir apapun." + heading: Daftar blokir oleh %{name} + title: Blokir oleh %{name} + blocks_on: + empty: "%{name} belum diblokir." + heading: Daftar blokir pada %{name} + title: Diblokir pada %{name} + create: + flash: Telah melakukan blokir pada pengguna %{name}. + try_contacting: Silahkan coba untuk menghubungi pengguna sebelum memblokir mereka dan memberi waktu yang wajar bagi mereka untuk menanggapi. + try_waiting: Cobalah berikan waktu yang wajar bagi pengguna untuk merespon sebelum memblokir mereka. + edit: + back: Lihat semua blokir + heading: Mengedit blokir pada %{name} + needs_view: Apakah pengguna harus login sebelum blokirnya dihapus? + show: Lihat blokir ini + submit: Perbarui blokir + title: Mengedit blokir pada %{name} + filter: + block_expired: Blokir sudah kadaluwarsa dan tidak bisa diedit. + block_period: Periode blokir harus merupakan salah satu nilai yang dapat dipilih dari daftar drop-down atau pilihan. + helper: + time_future: Berakhir pada %{time}. + time_past: Berakhir %{time} yang lalu. + index: + empty: Belum ada blokir yang dibuat. + heading: Daftar blokir oleh pengguna + title: Blokir oleh pegguna + model: + non_moderator_revoke: Harus merupakan moderator untuk mencabut blokir. + non_moderator_update: Harus merupakan moderator untuk membuat atau memperbarui blokir. + new: + back: Lihat semua blokir + heading: Membuat blokir pada %{name} + needs_view: Pengguna perlu log in sebelum blokir ini dihapus + submit: Buat blokir + title: Membuat blokir pada %{name} + tried_contacting: Saya telah menghubungi pengguna tersebut dan memintanya untuk berhenti. + tried_waiting: Saya telah memberi jumlah waktu yang wajar kepada pengguna untuk menanggapi komunikasi tersebut. + not_found: + back: Kembali ke indeks + sorry: Maaf, blokir pengguna dengan ID %{id} tidak dapat ditemukan. + partial: + confirm: Apakah Anda yakin? + creator_name: Pencipta + display_name: Pengguna yang Diblokir + edit: Edit + next: Berikutnya » + previous: « Sebelumnya + reason: Alasan untuk blokir + revoke: Batalkan! + revoker_name: Dibatalkan oleh + show: Tampilkan + showing_page: Menunjukkan halaman %{page} + status: Status + period: + one: 1 hour + other: "%{count} hours" + revoke: + confirm: Apakah Anda yakin untuk membatalkan blokir ini? + flash: Blokir ini telah dibatalkan. + heading: Membatalkan blokir pada %{block_on} oleh %{block_by} + past: Blokir ini telah berakhir %{time} yang lalu dan tidak dapat dibatalkan kembali sekarang. + revoke: Batalkan! + time_future: Blokir ini akan berakhir pada %{time}. + title: Membatalkan lokir pada %{block_on} + show: + back: Lihat semua blokir + confirm: Apakah Anda yakin? + edit: Edit + heading: "%{block_on} diblokir oleh %{block_by}" + needs_view: Pengguna harus log in sebelum blokir ini dihapus. + reason: "Alasan untuk blokir:" + show: Tampilkan + status: Status + time_future: Berakhir dalam %{time} + time_past: Berakhir %{time} yang lalu + title: "%{block_on} diblokir oleh %{block_by}" + update: + only_creator_can_edit: Hanya moderator yang membuat blokir ini yang dapat mengeditnya. + success: Blokir diperbarui. + user_role: + filter: + already_has_role: Pengguna telah memiliki peran %{role}. + doesnt_have_role: Pengguna tidak memiliki peran %{role}. + not_a_role: String `%{role}' bukan merupakan peran yang valid. + not_an_administrator: Hanya administrator yang dapat melakukan peran manajemen pengguna, dan Anda bukan administrator. + grant: + are_you_sure: Apakah Anda yakin ingin memberikan peran `%{role}' kepada pengguna `%{name}'? + confirm: Konfirmasi + fail: Tidak bisa memberikan peran `%{role}' kepada pengguna `%{name}'. Silahkan periksa bahwa pengguna dan perannya valid. + heading: Konfirmasi pemberian peran + title: Konfirmasi pemberian peran + revoke: + are_you_sure: Apakah Anda yakin Anda ingin mencabut peran `%{role}' dari pengguna `%{name}'? + confirm: Konfirmasi + fail: Tidak dapat mencabut peran `%{role}' dari pengguna `%{name}'. Silahkan periksa bahwa pengguna dan perannya valid. + heading: Konfirmasi pencabutan peran + title: Konfirmasi pencabutan peran diff --git a/config/locales/is.yml b/config/locales/is.yml index 26a400dbe..d00c2e30b 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -751,11 +751,8 @@ is: signup_confirm: subject: "[OpenStreetMap] Staðfestu netfangið þitt" signup_confirm_html: - click_the_link: Ef þetta ert þú þá vertu velkomin(n)! vinsamlegast fylgdu tenglinum til að staðfesta reikningin þinn og haltu áfrám að lesa til að fá frekari upplýsingar um OpenStreetMap. current_user: Í flokkakerfinu getur þú einnig séð hvar í heiminum OpenStreetMap notendur eru staðsettir. get_reading: "Þú getur lesið um OpenStreetMap verkefnið á wiki-síðunni okkar eða OpenGeoData blogginu þar sem einnig er að finna hljóðvarp.\n\nEinnig er hægt að fylgjast með OpenStreetMap á Twitter eða skoða almennan bloggstraum fyrir verkefnið." - greeting: Hæ! - hopefully_you: "Einhver (vonandi þú) vill búa til notanda á þessari vefsíðu:" introductory_video: Þú getur horft á %{introductory_video_link}. more_videos: Fleiri myndbönd er %{more_videos_link}. more_videos_here: hægt að finna hér @@ -764,19 +761,11 @@ is: wiki_signup: Kannski viltu einnig skrá þig á wiki-síðuna. signup_confirm_plain: blog_and_twitter: "Fylgdust með fréttum á OpenStreetMap blogginu eða á Twitter:" - click_the_link_1: Ef þetta ert þú þá vertu velkomin(n)! vinsamlegast fylgdu tenglinum til að staðfesta - click_the_link_2: reikningin þinn og haltu áfrám að lesa til að fá frekari upplýsingar um OpenStreetMap. - current_user_1: Í flokkakerfinu getur þú séð hvar í heiminum OpenStreetMap notendur eru. - current_user_2: "Hér er tengill á rótina á notendaflokkunum:" - greeting: Hæ! - hopefully_you: "Einhver (vonandi þú) vill búa til notanda á þessari vefsíðu:" introductory_video: "Þú getur horft á kynningarmyndband um OpenStreetMap hér:" more_videos: "Og fleiri kynningarmyndbönd er að finna hér:" opengeodata: "OpenGeoData.org er OpenStreetMap blog Steve Coast sem stofnaði OpenStreetMap, þar er líka hljóðvarp:" the_wiki: "Þú getur lesið um OpenStreetMap verkefnið á wiki-síðunni okkar:" the_wiki_url: http://wiki.openstreetmap.org/index.php?uselang=is&title=Beginners%27_Guide - user_wiki_1: Það er mælt með því að þú búir til notandasíðu á wiki-inu - user_wiki_2: og takir fram hvar þú ert, t.d. með því að bæta við á hana [[Category:Users_in_Iceland]]. wiki_signup: "Kannski viltu einnig skrá þig á wiki-síðuna:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Fors%C3%AD%C3%B0a&uselang=is oauth: diff --git a/config/locales/it.yml b/config/locales/it.yml index a42ff3019..6ce0f5aaa 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -789,7 +789,7 @@ it: suburb: Quartiere town: Paese unincorporated_area: Area non inclusa - village: Piccolo paese + village: Frazione railway: abandoned: Linea ferroviaria abbandonata construction: Ferrovia in costruzione @@ -994,7 +994,6 @@ it: partners_ucl: UCL VR Centre sign_up: iscriviti sign_up_tooltip: Crea un profilo utente per apportare modifiche - sotm2012: Vieni alla conferenza di OpenStreetMap Stati Uniti 2012, lo State of the Map US, il 13-14 ottobre a Portlan, Oregon! tag_line: La wiki-mappa Libera del Mondo user_diaries: Diari degli utenti user_diaries_tooltip: Visualizza diari utente @@ -1010,6 +1009,9 @@ it: text: In caso di incoerenza fra questa pagina di traduzione e %{english_original_link}, fa fede la pagina in inglese title: A proposito di questa traduzione legal_babble: + attribution_example: + alt: Esempio di come attribuire ad OpenStreetMap su una pagina web + title: Esempio di attribuzione contributors_at_html: "Austria: contiene i dati della\nStadt Wien (sotto\nCC BY),\nLand Vorarlberg e\nLand Tirol (sotto CC-BY AT con emendamenti)." contributors_ca_html: "Canada: contiene i dati della\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), e della StatCan (Geography Division,\nStatistics Canada)." contributors_footer_1_html: "Per ulteriori dettagli di queste e altre fonti che sono state utilizzate\nper aiutare a migliorare OpenStreetMap, consulta la pagina dei\ncollaboratori sul wiki di OpenStreetMap." @@ -1023,6 +1025,7 @@ it: contributors_za_html: "Sud Africa: contiene i dati provenienti dalla\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." credit_1_html: Si richiede che l'attribuzione sia “© OpenStreetMap contributors ”. credit_2_html: "Inoltre devi specificare chiaramente che i dati sono disponibili sotto la Open Database Licese e, se usi le nostre tavole, che la cartografia è pubblicata con licenza CC-BY-SA. Puoi fare ciò mettendo un collegamento URL a questa pagina di copyright.\nIn alternativa, e necessariamente se stai distribuendo OSM sotto forma di dati, puoi citare e creare un collegamento diretto alle licenze. In mezzi di comunicazione dove i collegamenti URL non sono possibili (per esempio un'opera stampata), ti suggeriamo di indirizzare i lettori verso openstreetmap.org (magari esplicitando 'OpenStreetMap' come nome completo), verso opendatacommons.org e, se necessario, verso creativecommons.org." + credit_3_html: "In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa.\nAd esempio:" credit_title_html: Come si attribuisce a OpenStreetMap infringement_1_html: Ai contributori OSM si ricorda di non aggiungere dati da qualsiasi fonte protetta da copyright (ad esempio Google Maps o mappe stampate) senza esplicita autorizzazione dei titolare del copyright. infringement_2_html: "Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra\n procedura di rimozione per violazione del copyright o segnalacelo direttamente alla nostra\npagina di segnalazione on-line." @@ -1162,14 +1165,15 @@ it: header: "%{from_user} ti ha inviato un messaggio tramite OpenStreetMap con l'oggetto %{subject}:" hi: Ciao %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Conferma il tuo indirizzo email" + confirm: "Prima di qualsiasi altra cosa, abbiamo bisogno di confermare che tale richiesta è effettivamente venuta da te, quindi se è così clicca sul link qui sotto per confermare il tuo account:" + created: Qualcuno (si spera che sia tu) ha appena creato un account in %{site_url}. + greeting: Ehilà! + subject: "[OpenStreetMap] Benvenuti su OpenStreetMap" + welcome: Siamo lieti di accoglierti e fornirti alcune informazioni aggiuntive per iniziare. signup_confirm_html: ask_questions: È possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte. - click_the_link: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap. current_user: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui essi operano, è disponibile su Category:Users_by_geographical_region. get_reading: Leggi di OpenStreetMap sul wiki, non perdere le ultime notizie sul blog di OpenStreetMap o su Twitter, oppure sfoglia il blog OpenGeoData di Steve Coast, fondatore di OpenStreetMap, per una storia completa del progetto; ci sono anche dei podcast da ascoltare! - greeting: Benvenuto! - hopefully_you: Qualcuno (si spera proprio tu) vuole creare un profilo introductory_video: Puoi guardare un %{introductory_video_link}. more_videos: Ci sono %{more_videos_link}. more_videos_here: ulteriori video qui @@ -1179,18 +1183,12 @@ it: signup_confirm_plain: ask_questions: "È possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte:" blog_and_twitter: "Ottieni le ultime notizie tramite il blog di OpenStreetMap oppure Twitter:" - click_the_link_1: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante - click_the_link_2: per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap. - current_user_1: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui - current_user_2: "essi operano, è disponibile su:" - greeting: Benvenuto! - hopefully_you: Qualcuno (si spera proprio tu) vuole creare un profilo + current_user: "Un elenco degli utenti attualmente categorizzati in base al luogo in cui si trovano, è disponibile da:" introductory_video: "Puoi guardare un video introduttivo su OpenStreetMap qui:" more_videos: "Ci sono ulteriori video qui:" opengeodata: "OpenGeoData.org è il blog del fondatore di OpenStreetMap, Steve Coast, che mette a disposizione anche dei podcast:" the_wiki: "Puoi avere altre informazioni su OpenStreetMap sul wiki:" - user_wiki_1: È consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria - user_wiki_2: che si riferiscano al luogo in si opera, come ad esempio [[Category:Users_in_Friuli-Venezia_Giulia]]. + user_wiki_page: Si suggerisce di creare una pagina utente wiki, che includa i tag delle categorie che indicano dove ti trovi, ad esempio [[Categoria:Users_in_London]]. wiki_signup: "Ci si può anche iscrivere al wiki di OpenStreetMap a:" oauth: oauthorize: @@ -1519,6 +1517,9 @@ it: email never displayed publicly: (mai visualizzato pubblicamente) flash update success: Informazioni sull'utente aggiornate con successo. flash update success confirm needed: Informazioni sull'utente aggiornate con successo. Controllare la propria email per la conferma del nuovo indirizzo di posta elettronica. + gravatar: + gravatar: Usa Gravatar + link text: cos'è questo? home location: "Posizione:" image: "Immagine:" image size hint: (immagini quadrate di almeno 100x100 funzionano meglio) @@ -1654,6 +1655,7 @@ it: email address: "Indirizzo email:" fill_form: Riempi il modulo e noi ti invieremo velocemente una email per attivare il tuo profilo. flash create success message: Grazie per l'iscrizione. Abbiamo spedito un messaggio di conferma all'indirizzo %{email} e non appena sarà confermato il proprio profilo sarà possibile mappare.

    Se si utilizzano dei filtri antispam che inviano delle richieste di conferma assicurarsi che l'indirizzo webmaster@openstreetmap.org sia nella whitelist, altrimenti non saremo in grado di rispondere ad alcuna richiesta di conferma. + flash welcome: Grazie per esserti registrato. Ti abbiamo inviato un messaggio a %{email} con alcuni suggerimenti per come iniziare. heading: Crea un profilo utente license_agreement: Quando confermi il tuo profilo devi accettare le regole per contribuire. no_auto_account_create: Sfortunatamente in questo momento non è possibile creare automaticamente per te un profilo. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 7a8293e45..baabca81a 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -115,7 +115,7 @@ ja: show_area_box: 領域のボックスを表示 common_details: changeset_comment: "コメント:" - deleted_at: "削除日:" + deleted_at: "削除日時:" deleted_by: "削除者:" edited_at: "編集日時:" edited_by: "編集者:" @@ -213,7 +213,7 @@ ja: hide_areas: 領域を隠す history_for_feature: "%{feature}の履歴" load_data: データの読み込み - loaded_an_area_with_num_features: "%{num_features}個の地物を含む領域を読み込みました。一般に、一部のブラウザーでは、この量のデータ表示をうまく処理できないことがあるようです。通常、ブラウザは一度に100未満の地物を表示させるとよいようです: 何かすると、ブラウザが遅くなったり、反応しなくなったりします。それでも、このデータを表示したいならば、以下のボタンをクリックしてください。" + loaded_an_area_with_num_features: "%{num_features}件の地物を含む領域を読み込みました。一般に、ブラウザーによっては、この量のデータを表示するとうまく処理できないかもしれません。通常、ブラウザーは一度に100件未満の地物を表示させるとうまく動作します。このままでは、ブラウザーが遅くなったり、反応しなくなったりします。それでもこのデータを表示したいならば、以下のボタンをクリックしてください。" loading: 読み込み中... manually_select: ドラッグして別の領域を選択 object_list: @@ -241,8 +241,8 @@ ja: tag_details: tags: "タグ:" wiki_link: - key: "%{key} タグの wiki での説明ページ" - tag: "%{key}=%{value} タグの wiki での説明ページ" + key: "%{key} タグのウィキでの説明ページ" + tag: "%{key}=%{value} タグのウィキでの説明ページ" wikipedia_link: ウィキペディアの %{page} 記事 timeout: sorry: 申し訳ありませんが、ID %{id} の %{type} のデータは大きすぎるため取得できません。 @@ -311,7 +311,7 @@ ja: comments: ago: "%{ago}前" comment: コメント - has_commented_on: "%{display_name} が以下の日記エントリにコメントしました" + has_commented_on: "%{display_name} は以下の日記エントリにコメントしました" newer_comments: 新しいコメント older_comments: 古いコメント post: 投稿 @@ -353,10 +353,10 @@ ja: title: "%{user} さんの OpenStreetMap 日記エントリ" list: in_language_title: "%{language} の日記エントリ" - new: 新しい日記エントリ + new: 日記エントリを新規作成 new_title: 自分の日記にエントリを新規作成 newer_entries: 以降のエントリ - no_entries: 日記エントリがありません + no_entries: 日記エントリはありません older_entries: 以前のエントリ recent_entries: "最近の日記エントリ:" title: ユーザーの日記 @@ -368,7 +368,7 @@ ja: location: "場所:" view: 表示 new: - title: 新しい日記エントリ + title: 日記エントリの新規作成 no_such_entry: body: ID が %{id} のコメントや日記は存在しません。URLにスペルミスが無いか確認をしてください。もしくはリンク元が間違ってます。 heading: ID %{id} にコメントはまだありません。 @@ -601,6 +601,7 @@ ja: platform: プラットフォーム primary: 主要地方道 primary_link: 主要地方道 + raceway: 競技コース residential: 住宅 rest_area: 休憩所 road: 道路 @@ -610,6 +611,7 @@ ja: services: 高速道路のSA speed_camera: 高速度カメラ steps: 階段 + stile: 踏み越し段 tertiary: 周辺道路 tertiary_link: 周辺道路 track: 農道・林道 @@ -635,6 +637,8 @@ ja: museum: 博物館 ruins: 廃墟 tower: 塔 + wayside_cross: 道路際の十字架 + wayside_shrine: 道祖神 wreck: 沈没船 landuse: allotments: 家庭菜園 @@ -667,11 +671,14 @@ ja: reservoir_watershed: 貯水池流域 residential: 住宅地 retail: 小売店 + road: 道路エリア + village_green: 緑地広場 vineyard: Vineyard wetland: 湿地帯 wood: 森林 leisure: beach_resort: ビーチ リゾート + bird_hide: 観察小屋 common: 共有地 fishing: 釣り場 fitness_station: フィットネス ステーション @@ -772,19 +779,24 @@ ja: subdivision: 区分 suburb: 郊外 town: 町 + unincorporated_area: 国有地 village: 村 railway: abandoned: 廃止鉄道 construction: 建設中の鉄道 disused: 廃線跡 + disused_station: 廃駅 funicular: ケーブル鉄道 halt: 列車停止 junction: 鉄道連絡駅 level_crossing: 踏切 light_rail: ライトレール + miniature: ミニ鉄道 monorail: モノレール narrow_gauge: 狭軌鉄道 platform: 鉄道プラットフォーム + preserved: 保存鉄道 + spur: 支線 station: 鉄道駅 subway: 地下鉄駅 subway_entrance: 地下鉄駅入口 @@ -810,7 +822,9 @@ ja: chemist: 化学者 clothes: 洋服店 computer: コンピューターショップ + confectionery: 駄菓子屋 convenience: コンビニエンス ストア + copyshop: コピー店 cosmetics: 化粧品販売店 department_store: デパート discount: 安売り店 @@ -818,10 +832,12 @@ ja: dry_cleaning: クリーニング electronics: 電気製品販売店 estate_agent: 不動産代理店 + farm: 農産物店 fashion: ファッション ショップ fish: 鮮魚販売店 florist: 花屋 food: 食品販売店 + funeral_directors: 葬儀屋 furniture: 家具店 gallery: ギャラリー general: 雑貨屋 @@ -829,6 +845,7 @@ ja: greengrocer: 八百屋 grocery: 食料品店 hairdresser: 美容室 + hardware: ホームセンター hifi: 高級オーディオ insurance: 保険 jewelry: 宝石店 @@ -868,11 +885,13 @@ ja: hostel: ホステル hotel: ホテル information: 案内所 + lean_to: 東屋 motel: モーテル museum: 博物館 picnic_site: ピクニック サイト theme_park: テーマパーク valley: 谷 + viewpoint: 景勝地 zoo: 動物園 tunnel: "yes": トンネル @@ -935,8 +954,8 @@ ja: home_tooltip: ホームに戻る inbox_html: 受信箱 %{count} inbox_tooltip: - one: 受信箱には１通の未読メッセージがあります - other: 受信箱には %{count} 通の未読メッセージがあります + one: 受信箱に 1 通の未読メッセージがあります + other: 受信箱に %{count} 通の未読メッセージがあります zero: 受信箱に未読メッセージはありません intro_1: OpenStreetMap は自由に編集できる世界地図です。あなたのような人々が作りました。 intro_2_create_account: ユーザー アカウントを作成 @@ -960,25 +979,29 @@ ja: partners_ic: インペリアル カレッジ ロンドン partners_partners: パートナー partners_ucl: UCL VR センター - sign_up: 登録 + sign_up: ユーザー登録 sign_up_tooltip: 編集のためのアカウントを作成 tag_line: 自由なウィキ世界地図 user_diaries: 日記 user_diaries_tooltip: ユーザーの日記を閲覧する view: 閲覧 view_tooltip: 地図を閲覧 - welcome_user: "%{user_link} さん、ようこそ。" + welcome_user: ようこそ、%{user_link} さん welcome_user_link_tooltip: 自分のユーザー ページ wiki: ウィキ - wiki_title: プロジェクトの Wiki サイト + wiki_title: プロジェクトのウィキサイト license_page: foreign: english_link: 英語の原文 text: 翻訳したページと、%{english_original_link} の間で競合が発生しました。英語版の内容が優先されるでしょう。 title: この翻訳について legal_babble: + contributors_intro_html: 協力者は数千人もの個人です。それに加え、国立の地図作成組織や、次のようなその他の情報源による公開できるライセンスによるデータを含みます。 + contributors_title_html: 協力者 credit_title_html: OpenStreetMap のクレジット表記の仕方 + infringement_1_html: OSMの協力者は、著作権者から明確な許諾を得ずに、著作権のある情報源（例：Google Mapsや印刷された地図）からデータを持ち込まないよう注意するものとします。 infringement_title_html: 著作権侵害 + intro_1_html: "OpenStreetMap はオープンデータであり、Open Data\nCommons Open Database License（ODbL）の下にライセンスされています。" title_html: 著作権とライセンス native: mapping_link: マッピングを開始 @@ -1018,7 +1041,7 @@ ja: limit_exceeded: 短い間隔で大量のメッセージを送っていますね。次を送る前にしばらくお待ちください。 message_sent: 送信したメッセージ send_button: 送信 - send_message_to: "%{name}に新しいメッセージを送信" + send_message_to: "%{name} への新規メッセージ送信" subject: タイトル title: メッセージの送信 no_such_message: @@ -1073,9 +1096,10 @@ ja: hopefully_you_1: "誰か (おそらくあなた) がメール アドレスを変更しようとしています:" hopefully_you_2: "%{server_url}から%{new_address}へ。" friend_notification: - had_added_you: OpenStreetMap で %{user} さんがあなたを友達に登録しました。 + befriend_them: "%{befriendurl}で友達になることができます。" + had_added_you: OpenStreetMap で %{user} さんがあなたを友達に追加しました。 see_their_profile: ％{userurl} でプロファイルを見ることができます。 - subject: "[OpenStreetMap] %{user} さんがあなたを友達に登録しました。" + subject: "[OpenStreetMap] %{user} さんがあなたを友達に追加しました。" gpx_notification: and_no_tags: とタグなし。 and_the_tags: "と以下のタグ:" @@ -1107,28 +1131,27 @@ ja: header: "%{from_user} さんが、OpenStreetMap であなたに件名 %{subject} のメッセージを送信しました:" hi: やあ %{to_user} さん、 signup_confirm: - subject: "[OpenStreetMap] あなたのメール アドレスの確認" + created: 誰か (おそらくあなた) が %{site_url} でアカウントを作成しました。 + greeting: やあ、皆さん! + subject: "[OpenStreetMap] OpenStreetMapへようこそ" signup_confirm_html: ask_questions: "質問サイトでは、OpenStreetMap についてどんなことでも質問できます:" get_reading: まずは、OpenStreetMap について知るために、ウィキを読みましょう。そして、最新ニュースをOpenStreetMap ブログかTwitterで追いかけましょう。また、OpenStreetMap 創設者 Steve Coast のOpenGeoData ブログを見て、このプロジェクトの歴史を味わってみましょう。これは、podcastsで聞くこともできます。(英語です) - greeting: やあ、皆さん! - hopefully_you: "誰か (おそらくあなた) がアカウントを作成しようとしています:" introductory_video: "%{introductory_video_link} で動画をご覧いただけます。" more_videos: ビデオがあります。%{more_videos_link}. more_videos_here: その他の動画はこちら - user_wiki_page: ユーザー wiki ページを作成して、あなたがどこにいるかを示すカテゴリ タグを入れることをお勧めします。例えば、[[Category:Users_in_Tokyo]]などです。 + user_wiki_page: ユーザー ウィキページを作成して、あなたがどこにいるかを示すカテゴリ タグを入れることをお勧めします。例えば、[[Category:Users_in_Tokyo]]などです。 video_to_openstreetmap: OpenStreetMap の紹介動画 - wiki_signup: また、OpenStreetMap wiki のユーザー登録をすることもできます。 + wiki_signup: また、OpenStreetMap ウィキのユーザー登録をすることもできます。 signup_confirm_plain: ask_questions: "質疑用サイトでは、OpenStreetMap について何でもご質問いただけます:" blog_and_twitter: "OpenStreetMap ブログや Twitter では最新のニュースをご覧いただけます:" - greeting: やあ、皆さん! - hopefully_you: "誰か (おそらくあなた) がアカウントを作成しようとしています:" introductory_video: "OpenStreetMap の紹介動画をこちらでご覧いただけます:" more_videos: "その他の動画がこちらにあります:" opengeodata: "OpenGeoData.org は OpenStreetMap の創設者 Steve Coast さんのブログであり、ポッドキャストも行なっています:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Ja:Beginners%27_Guide - wiki_signup: "OpenStreetMap wiki でユーザー登録する場合は:" + user_wiki_page: ユーザー ウィキページを作成して、あなたがどこにいるかを示すカテゴリ タグを入れることをお勧めします。例えば、[[Category:Users_in_Tokyo]] などです。 + wiki_signup: "OpenStreetMap ウィキでユーザー登録する場合は:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page&uselang=ja oauth: oauthorize: @@ -1242,8 +1265,6 @@ ja: index: js_1: JavaScript に対応していないブラウザーを使用しているか、JavaScript を無効にしているかのどちらかです。 js_2: OpenStreetMap は地図の表示に JavaScript を使用します。 - license: - license_url: http://openstreetmap.org/copyright permalink: パーマリンク remote_failed: 編集に失敗しました - JOSM または Merkaartor が読み込まれていること、遠隔制御オプションが有効になっていることを確認してください shortlink: 短縮リンク @@ -1348,7 +1369,7 @@ ja: trace: create: trace_uploaded: GPX ファイルをアップロードしました。データベースへの登録に多少時間がかかります。通常この作業は 30 分以内に完了し、それをお知らせするメールをお送りします。 - upload_trace: GPS トレースをアップロード + upload_trace: GPS トレースのアップロード delete: scheduled_for_deletion: トレースの削除準備を行いました edit: @@ -1403,7 +1424,7 @@ ja: tags: "タグ:" tags_help: カンマ区切り upload_button: アップロード - upload_gpx: "GPX ファイルのアップロード:" + upload_gpx: "アップロードする GPX ファイル:" visibility: "可視性:" visibility_help: これはどういう意味? visibility_help_url: http://wiki.openstreetmap.org/wiki/Ja:Visibility_of_GPS_traces @@ -1456,6 +1477,10 @@ ja: email never displayed publicly: (非公開) flash update success: ユーザー情報を更新しました。 flash update success confirm needed: ユーザー情報を更新しました。新しいメール アドレスを検証するため、メールを確認してください。 + gravatar: + gravatar: Gravatar を使用 + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: これは何ですか? home location: "活動地域:" image: "画像:" image size hint: (100x100 以下の正方形の画像が最適) @@ -1576,7 +1601,7 @@ ja: title: パスワードを忘れた make_friend: already_a_friend: あなたは %{name} と既に友達です。 - button: 友達に登録 + button: 友達に追加 failed: "%{name} を友達と登録できませんでした。" heading: "%{user} を友達に追加しますか?" success: "%{name} はあなたの友達になりました。" @@ -1593,7 +1618,7 @@ ja: heading: ユーザー アカウントの作成 license_agreement: アカウントを確認するときには contributor terms に同意する必要があります。 no_auto_account_create: 残念ながら、現在、自動ではアカウントを作成できません。 - not displayed publicly: 非公開です (詳細は プライバシー ポリシーを参照してください) + not displayed publicly: 非公開です (詳細は プライバシー ポリシーを参照してください) openid: "%{logo} OpenID:" openid association: "

    あなたの OpenID は、まだ OpenStreetMap のどのアカウントとも関連付けられていません。

    \n
      \n
    • OpenStreetMap が初めての場合は、下のフォームで新規アカウントを作成してください。
      • \n
    • \n 既にアカウントを持っている場合は、あなたのユーザー名とパスワードでログインしてください。\n ログイン後、ユーザー設定であなたの OpenID と関連付けることができます。\n
      • \n
    " openid no password: OpenID ではパスワードは不要ですが、特殊なツール/サーバーでは必要な場合があります。 @@ -1612,9 +1637,9 @@ ja: your location: 自分の場所 remove_friend: button: 友達を解除 - heading: "%{user} を友達から削除しますか?" - not_a_friend: "%{name} はあなたの友達ではありません。" - success: "%{name} はあなたの友達から外しました。" + heading: "%{user} との友達を解除しますか?" + not_a_friend: "%{name} は友達ではありません。" + success: "%{name} との友達を解除しました。" reset_password: confirm password: "パスワードの確認:" flash changed: あなたのパスワードは変更されました。 @@ -1647,7 +1672,7 @@ ja: you need to accept or decline: 続行するには新しい投稿規約を読んで同意または拒否してください。 view: activate_user: このユーザーを有効にする - add as friend: 友達に登録 + add as friend: 友達に追加 ago: (%{time_in_words_ago}前) block_history: 受けたブロック blocks by me: 自分が実行したブロック @@ -1685,7 +1710,7 @@ ja: nearby_changesets: ユーザーの周辺のすべての変更セットを参照 nearby_diaries: ユーザーの周辺のすべての日記エントリを参照 new diary entry: 新しい日記エントリ - no friends: あなたは誰も友達として登録されていません。 + no friends: あなたはまだ誰も友達として登録していません。 no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。 oauth settings: OAuth 設定 remove as friend: 友達を解除 @@ -1698,7 +1723,7 @@ ja: revoke: administrator: 管理者権限を剥奪 moderator: モデレーター権限を剥奪 - send message: メッセージ送信 + send message: メッセージを送信 settings_link_text: 設定 spam score: "スパム評価:" status: "状態:" diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 69351cc26..c9a205be0 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -896,11 +896,8 @@ ka: signup_confirm: subject: "[OpenStreetMap] დაადასტურეთ ელ.ფოსტის მისამართი" signup_confirm_html: - greeting: გამარჯობა! more_videos: აქ არის %{more_videos_link}. more_videos_here: მეტი ვიდეო აქ - signup_confirm_plain: - greeting: გამარჯობა! oauth: oauthorize: allow_write_api: რუკის შეცვლა. diff --git a/config/locales/ko.yml b/config/locales/ko.yml index e738a687e..5d8ce33df 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -118,7 +118,7 @@ ko: node: 큰 지도에서 노드 보기 relation: 큰 지도에서 관계 보기 way: 큰 지도에서 길 보기 - loading: 불러 오는 중... + loading: 불러오는 중... navigation: all: next_changeset_tooltip: 다음 바뀜집합 @@ -791,6 +791,7 @@ ko: tram_stop: 전차 정류장 yard: 철도 기지 shop: + alcohol: 주점 antiques: 골동품 상점 art: 아트 상점 bakery: 제과점 @@ -857,6 +858,7 @@ ko: toys: 장난감 가게 travel_agency: 여행사 video: 비디오 가게 + wine: 주점 tourism: alpine_hut: 알파인 오두막 artwork: 예술 작품 @@ -870,6 +872,7 @@ ko: hostel: 호스텔 hotel: 호텔 information: 안내소 + lean_to: 오두막 motel: 모텔 museum: 박물관 picnic_site: 피크닉 사이트 @@ -899,6 +902,7 @@ ko: stream: 하류 water_point: 급수소 waterfall: 폭포 + weir: 댐 javascripts: map: base: @@ -1105,25 +1109,16 @@ ko: header: "%{from_user} 님이 OpenStreetMap을 통해 %{subject} 쪽지를 보냈습니다." hi: "%{to_user}님 안녕하세요." signup_confirm: - subject: "[OpenStreetMap] 이메일 주소 확인" + subject: "[OpenStreetMap] OpenStreetMap에 오신 것을 환영합니다" signup_confirm_html: - greeting: 안녕하세요! more_videos: "%{more_videos_link}이 있습니다." more_videos_here: 여기에 더 많은 동영상이 있습니다 video_to_openstreetmap: OpenStreetMap 소개 동영상 signup_confirm_plain: blog_and_twitter: "OpenStreetMap 블로그 또는 트위터를 통해 최신 뉴스 보기:" - click_the_link_1: 당신이라면 환영합니다! - click_the_link_2: 계정을 확인하고 OpenStreetMap에 대한 자세한 정보를 읽어 보려면 아래 링크를 클릭하세요. - current_user_1: 세계 어디서 바탕을 둔 분류에 대한 현재 사용자의 목록은 - current_user_2: "다음에서 사용할 수 있습니다:" - greeting: 안녕하세요! - hopefully_you: 누군가(바라는 데 당신)가 여기를 통해 계정을 만들고 싶습니다 introductory_video: "여기서 OpenStreetMap 소개 동영상을 ë³¼ 수 있습니다:" more_videos: "여기에 더 많은 동영상이 있습니다:" the_wiki: "위키에서 OpenStreetMap에 대하여 읽어보기:" - user_wiki_1: 당신이 어디에 있는지 염두하여 - user_wiki_2: "[[Category:Users_in_London]]ê³¼ 같이 분류 태그를 포함하는 사용자 위키 문서를 만드는 것이 좋습니다." oauth: oauthorize: allow_read_gpx: 비공개 GPS 추적을 읽습니다. @@ -1558,7 +1553,7 @@ ko: fill_form: 양식을 채우고 우리에게 계정을 활성화하기 위해 신속하게 이메일을 보내드립니다. heading: 사용자 계정 만들기 license_agreement: 계정을 확인하면 당신은 기여자 약관에 동의해야합니다. - not displayed publicly: 공개적으로 보여지지 않습니다 (개인정보 정책을 참고하세요) + not displayed publicly: 공개적으로 보여지지 않습니다 (개인정보 정책을 참고하세요) openid: "%{logo} OpenID:" openid no password: OpenID로 비밀번호가 필요하지 않지만 몇가지 추가 도구나 서버는 여전히 비밀번호가 필요할 수 있습니다. password: "비밀번호:" diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 866522c81..f5d0976c6 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -510,7 +510,6 @@ lb: footer1: Dir kënnt de Message och op %{readurl} liesen hi: Salut %{to_user}, signup_confirm_html: - greeting: Bonjour ! more_videos: Et gëtt nach méi %{more_videos_link}. more_videos_here: méi Videoen hei signup_confirm_plain: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index e11b2c475..2c7ee70da 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1092,11 +1092,8 @@ lt: subject: "[OpenStreetMap] Patvirtinkite savo elektroninio paÅ¡to adresą" signup_confirm_html: ask_questions: Klausimus, susijusius su OpenStreetMap, galite užduoti klausimų ir atsakymų svetainėje. - click_the_link: Jei tai jÅ«s - sveikiname! Paspauskite žemiau esančią nuorodą, kad patvirtintumėte paskyra. Tada paskaitykite daugiau apie OpenStreetMap. current_user: "Å iuo metu pagal pasaulio vietas sukurtose kategorijose esančių naudotojų sąrašą galite rasti čia: Category:Users_by_geographical_region." get_reading: Informacijos apie OpenStreetMap rasite wikyje. Sekite naujienas OpenStreetMap dienoraÅ¡tyje, Twitteryje arba panarÅ¡ykite po OpenStreetMap įkÅ«rėjo Steve'o Coast'o OpenGeoData dienoraÅ¡tį, kur rasite projekto istoriją, kurią galite net ir paklausyti! - greeting: Sveiki! - hopefully_you: Kažkas (tikėkimės tai jÅ«s) nori sukurti paskyrą introductory_video: Galite pažiÅ«rėti %{introductory_video_link} more_videos: Yra ir %{more_videos_link} more_videos_here: daugiau vaizdo medžiagos @@ -1106,18 +1103,10 @@ lt: signup_confirm_plain: ask_questions: "Bet kokius klausimus apie OpenStreetMap galite užduoti mÅ«sų klausimų ir atsakymų svetainėje:" blog_and_twitter: "Sekite paskutines naujienas OpenStreetMap dienoraÅ¡tyje arba Twitteryje:" - click_the_link_1: Jei tai jÅ«s - sveikiname prisijungus! Spustelėkite žemiau esančią nuorodą, kad patvirtintumėte jÅ«sų - click_the_link_2: paskyrą, tada paskaitykite daugiau apie OpenStreetMap. - current_user_1: Naudotojų kategorijose, nurodančiose kurioje pasaulio vietoje jie yra, sąrašą - current_user_2: "galite rasti čia:" - greeting: Sveiki! - hopefully_you: Kažkas (tikėkimės tai jÅ«s) nori sukurti paskyrą introductory_video: "Ä®vadinį vaizdo klipą apie OpenStreetMap rasite čia:" more_videos: "Daugiau video medžiagos rasite čia:" opengeodata: "OpenGeoData.org - tai OpenStreetMap įkÅ«rėjo Steve Coast'o dienoraÅ¡tis, jame taipogi rasite transliacijų:" the_wiki: "Daugiau informacijos apie OpenStreetMap rasite wikyje:" - user_wiki_1: Rekomenduojama sukurti naudotojo wiki puslapį, kuriame bÅ«tų - user_wiki_2: kategorijos žymos, nurodančios, kur esate. Pavyzdžiui [[Category:Users_in_Lithuania]] ir/ar [[Category:Users_in_Vilnius]] wiki_signup: "Taipogi galite norėti prisiregistruoti prie OpenStreetMap wikio Å¡iuo adresu:" oauth: oauthorize: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 97873a452..138234b6f 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -988,7 +988,6 @@ lv: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: piereÄ£istrēties sign_up_tooltip: Izveidot kontu rediģēšanai - sotm2012: Nāc uz 2012 OpenStreetMap Konferenci, Kartes Stāvoklis, 6.-8. septembrÄ« Tokijā! tag_line: Atvērtā Wiki pasaules karte user_diaries: Lietotāju dienasgrāmatas user_diaries_tooltip: SkatÄ«t lietotāju dienasgrāmatas @@ -1155,11 +1154,8 @@ lv: subject: "[OpenStreetMap] Apstipriniet savu e-pasta adresi" signup_confirm_html: ask_questions: Tu vari jautāt jebkurus jautājumus par OpenStreetMap mÅ«su jautājumu un atbilžu lapā. - click_the_link: Ja tas esat jÅ«s, laipni aicināti! LÅ«dzu klikÅ¡Ä·iniet uz zemāk esošās saites lai apstiprinātu lietotāja kontu un uzzinātu vairāk par OpenStreetMap current_user: Saraksts ar paÅ¡reizējiem lietotājiem kategorijās, pamatojoties uz to, kur tie atrodas pasaulē, ir pieejams no Category:Users_by_geographical_region. get_reading: Izlasi par OpenStreetMap iekÅ¡ wiki, panāc ar jaunākajām ziņām, izmantojot OpenStreetMap blogu vai Twitter, vai pārlÅ«ko caur OpenStreetMap dibinātāja Steve Coast's OpenGeoData blogu priekÅ¡ projekta vēstures, kuram ir podcasti, kurus klausÄ«ties! - greeting: Sveicināti! - hopefully_you: Kāds (cerams, jÅ«s) vēlas izveidot lietotāja kontu introductory_video: Iespējams noskatÄ«ties %{introductory_video_link}. more_videos: Ir vēl citi %{more_videos_link}. more_videos_here: video Å¡eit @@ -1169,18 +1165,10 @@ lv: 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:" - click_the_link_1: Ja tas esat jÅ«s, laipni aicināti! LÅ«dzu sekojiet saitei zemāk lai apstiprinātu savu - click_the_link_2: lietotāja kontu un uzzinātu vairāk par OpenStreetMap. - current_user_1: EsoÅ¡o lietotāju saraksts kategorijās, atkarÄ«bā no tā, kur pasaulē - current_user_2: "viņi atrodas, ir pieejama:" - greeting: Sveicināti! - hopefully_you: Kāds (cerams, jÅ«s) vēlas izveidot lietotāja kontu 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_1: Tas ir ieteicams, ka tu izveido sava lietotāja wiki lapu, kura satur - user_wiki_2: kategoriju tagus, norādot, kas tu esi, kā 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: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 77a8baff9..743fea47e 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -986,7 +986,6 @@ mk: partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=mk sign_up: регистрација sign_up_tooltip: Создај сметка за уредување - sotm2012: Повелете на конференцијата на OpenStreetMap во САД за 2012 „The State of the Map US“ што ќе се одржи на 13 и 14 октомври во Портленд, Орегон! tag_line: Слободна вики-карта на светот user_diaries: Кориснички дневници user_diaries_tooltip: Види кориснички дневници @@ -1003,6 +1002,9 @@ mk: text: Во случај на спротиставеност помеѓу оваа преведена страница и %{english_original_link}, предност има англиската страница title: За овој превод legal_babble: + attribution_example: + alt: Пример за тоа како да ја наведете OpenStreetMap на некоја страница + title: Пример за наведување contributors_at_html: "Австрија: Содржи податоци од\nГрад Виена (под\nCC BY),\nПокраина Предарлска и\nПокраина Тирол (под CC-BY AT со исправки)." contributors_ca_html: "Canada: Содржи податоци од\nGeoBase®, GeoGratis (© Министерство за природни ресурси на Канада), CanVec (© Министерство за природни ресурси на Канада), and StatCan (Географско одделение,\nСтатистичка служба на Канада)." contributors_footer_1_html: "Повеќе информации за овие и други извори искористени\nза подобрување на OpenStreetMap ќе најдете на страницата Учесници на викито на OpenStreetMap." @@ -1016,6 +1018,7 @@ mk: contributors_za_html: "ЈАР: Содржи податоци од\nГлавната управа:\nНационална катастарска служба, државни авторски права задржани." credit_1_html: "Задолжително наведувајте нè со “© Учесници на\nOpenStreetMap ”." credit_2_html: "Исто така мора јасно да истакнете дека податоците се нудат под \nЛиценцата за отворени бази, и, доколку ги користите нашите полиња на картите, дека\nкартографијата е под лиценцата CC-BY-SA. Ова може да го сторите со ставање на врска\nдо оваа страница за авторство. \nДруга можност (задолжителна ако го распространувате OSM во \nподаточен облик) е непосредно да го наведете името на лиценцата и да ставите врска. \nВо медиумите каде врските не се можни are not possible (на пр. печатени дела), предлагаме \nда ги упатите читателите кон openstreetmap.org (можеби со проширување на \n'OpenStreetMap' на оваа полна адреса), кон opendatacommons.org и\n(ако е релевантно) кон creativecommons.org." + credit_3_html: "Кај пребарливата електронска карта, припишувањето треба да се прикаже во аголот од картата.\nНа пример:" credit_title_html: Како да ја наведете OpenStreetMap infringement_1_html: "Би сакале да ги потсетиме учесниците на OSM дека никогаш не смеат да ставаат\nподатоци од извори заштитени со авторски права (на пр. Google Карти или печатени карти) без\nизрична дозвола од имателите на тие права." infringement_2_html: "Доколку сметате дека базата на OpenStreetMap или ова мрежно место\nсодржи бесправно или неисправно поставени податоци, погледајте ја\nпроцедурата \nза отстранување или поднесете жалба на \nоваа наменска страница." @@ -1157,14 +1160,15 @@ mk: hi: Здраво %{to_user}, subject_header: "[OpenStreetMap] — %{subject}" signup_confirm: - subject: "[OpenStreetMap] Потврдете ја вашата е-поштенска адреса" + confirm: "Најнапред треба да потврдиме дека вие сте оној што го поставил барањето. Ако сте вие, тогаш стиснете на долунаведената врска за да ја потврдите сметката:" + created: Некој (се надеваме, вие) штотуку направи сметка на %{site_url}. + greeting: Здраво! + subject: "[OpenStreetMap] Добредојдовте на OpenStreetMap" + welcome: Би сакале да ви пожелиме добредојде и да ви понудиме уште некои информации за да можете да почнете. signup_confirm_html: ask_questions: Можете да поставувате прашања за OpenStreetMap на нашата страница за прашања и одговори. - click_the_link: Ако ова сте вие, добредојдовте! Кликнете на врската подолу за да ја потврдите таа сметка и да прочитате повеќе информации за OpenStreetMap current_user: На Category:Users_by_geographical_region ќе најдете список на тековни корисници во категории, зависно од нивната местоположба во светот. get_reading: Читајте за OpenStreetMap на викито, информирајте се за најновите збиднувања преку OpenStreetMap блогот или Twitter, или пак прелистајте гоблогот „OpenGeoData“ на основачот на OpenStreetMap, Стив Коуст за историја на проектот, заедно со под-емитувања! - greeting: Здраво! - hopefully_you: Некој (се надеваме, Вие) сака да отвори сметка на introductory_video: Можете да погледате %{introductory_video_link}. more_videos: Имаме %{more_videos_link}. more_videos_here: повеќе видеоклипови овде @@ -1174,19 +1178,13 @@ mk: signup_confirm_plain: ask_questions: "Можете да поставувате прашања за OpenStreetMap на нашата страница за прашања и одговори:" blog_and_twitter: "Бидете информирани за најновите збиднувања преку блогот на OpenStreetMap blog или Twitter:" - click_the_link_1: Ако ова сте вие, добредојдовте! Кликнете на врската подолу за да ја потврдите - click_the_link_2: сметка и прочитајте повеќе за дополнителни информации за OpenStreetMap. - current_user_1: Список на тековни корисници во категории, врз основа на нивната местоположба во светот - current_user_2: "местоположба во светот ќе најдете на:" - greeting: Здраво! - hopefully_you: Некој (се надеваме, Вие) сака да отвори сметка на + current_user: "Тука ќе најдете категориски список на корисници подредени според место:" introductory_video: "Погледајте го воведниот видеоклип за OpenStreetMap тука:" more_videos: "Повеќе видеоклипови ќе најдете тука:" opengeodata: "OpenGeoData.org е блогот на основачот на OpenStreetMap, Стив Коуст, а таму има и под-емитувања:" the_wiki: "Читајте за OpenStreetMap на викито:" the_wiki_url: http://wiki.openstreetmap.org/wiki/MK:Beginners%27_Guide?uselang=mk - user_wiki_1: Се препорачува да отворите корисничка вики-страница, каде ќе стојат - user_wiki_2: ознаки за категории на кои ќе стои вашето место на живеење, како да речеме [[Category:Users_in_London]]. + user_wiki_page: Се препорачува да создадете корисничка страница и да ставите категорија за местото во кое се наоѓате, како на пр. [[Категорија:Корисници од Прилеп]]. wiki_signup: "Препорачуваме да се регистрирате на викито на OpenStreetMap на:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=mk oauth: @@ -1522,6 +1520,10 @@ mk: email never displayed publicly: (никогаш не се прикажува јавно) flash update success: Корисничките информации се успешно подновени. flash update success confirm needed: Корисничките информации се успешно подновени. Проверете ја вашата е-пошта за да ја потврдите на адресата. + gravatar: + gravatar: Користи Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar?uselang=mk + link text: што е ова? home location: "Матична местоположба:" image: "Слика:" image size hint: (најдобро работат квадратни слики, барем 100x100) @@ -1657,6 +1659,7 @@ mk: email address: "Е-пошта:" fill_form: Пополнете го образецот, и ние ќе ви пратиме кратка порака по е-пошта за да си ја активирате сметката. flash create success message: Ви благодариме што се пријавивте. Испративме поврдна порака на %{email}, и штом ќе ја потврдите сметката, ќе можете да почнете со картографска работа.

    Ако користите систем против спам кој испраќа барања за потврда, тогаш ќе морате да ја дозволите адресата webmaster@openstreetmap.org бидејќи ние немаме начин да одговараме на такви потврди. + flash welcome: Ви благодариме што се регистриравте. Ви испративме порака на %{email} со некои совети за тоа како да почнете. heading: Создајте корисничка сметка license_agreement: Кога ќе ја потврдите вашата сметка, ќе треба да се согласите со условите за учесници. no_auto_account_create: Нажалост моментално не можеме автоматски да ви создадеме сметка. diff --git a/config/locales/ms.yml b/config/locales/ms.yml index b79aa1329..683726f54 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -973,7 +973,6 @@ ms: partners_ucl: Pusat VR UCL sign_up: daftar diri sign_up_tooltip: Buka akaun untuk menyunting - sotm2012: Datanglah ke Persidangan OpenStreetMap Amerika Syarikat 2012, The State of the Map US, di Portland, Oregon pada 13-14hb Oktober! tag_line: Peta Dunia Wiki Bebas user_diaries: Diari Pengguna user_diaries_tooltip: Lihat diari pengguna @@ -989,6 +988,9 @@ ms: text: Sekiranya terdapat percanggahan antara halaman yang diterjemah ini dengan %{english_original_link}, maka versi bahasa Inggeris itu akan diberi keutamaan title: Perihal terjemahan ini legal_babble: + attribution_example: + alt: Contoh mengatribusikan OpenStreetMap pada halaman sesawang + title: Contoh atribusi contributors_at_html: "Austria: Mengandungi data daripada Stadt Wien (di bawah CC BY) dan Land Vorarlberg, dan Land Tirol (under CC-BY AT dengan pindaan)." contributors_ca_html: "Kanada: Mengandungi data daripada GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada)." contributors_footer_1_html: " Untuk keterangan lanjut tentang semua ini, serta sumber-sumber lain yang telah digunakan untuk membantu menambah baik OpenStreetMap, sila rujuk Halaman penyumbang di Wiki OpenStreetMap." @@ -1002,6 +1004,7 @@ ms: contributors_za_html: "Afrika Selatan: Mengandungi data yang disumberkan daripada\n Pejabat Ketua Pengarah:\n National Geo-Spatial Information, Hak cipta kerajaan dipelihara." credit_1_html: Kami memerlukan anda menggunakan dikenali sebagai “© penyumbang OpenStreetMap” dalam penghargaan. credit_2_html: "Anda juga mesti memperjelas bahawa data ini tersedia di bawah Open Database License, dan juga kartografinya berada di bawah lesen CC-BY-SA jika jubin peta kami turut digunakan. Anda boleh berbuat demikian dengan membuat pautan ke halaman hak cipta ini.\nSelain itu, dan sebagai kemestian untuk mengedarkan OSM dalam bentuk data, anda boleh menyatakan nama dan membuat pautan secara terus kepada lesen. Untuk media yang tidak membolehkan pautan (cth. bahan cetakan), kami mencadangkan supaya anda menghalakan pembaca-pembaca ke openstreetmap.org (misalnya, dengan meluaskan 'OpenStreetMap' ke alamat penuh ini), ke opendatacommons.org, dan juga creativecommons.org jika berkenaan." + credit_3_html: "Untuk peta elektronik yang boleh disemak imbas, kredit seharusnya disiarkan di sudut peta.\nContoh:" credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap 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 prosedur penarikan atau laporkan secara terus ke dalam \nhalaman laporan on-line." @@ -1135,14 +1138,15 @@ ms: header: "%{from_user} telah menghantar sepucuk pesanan kepada anda melalui OpenStreetMap dengan subjek %{subject}:" hi: Apa khabar %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Sahkan alamat e-mel anda" + confirm: "Sebelum kami berbuat apa-apa lagi, kami perlu memastikan bahawa permintaan ini datang daripada anda; jika betul, sila klik pautan di bawah untuk mengesahkan akaun anda:" + created: Seseorang (harap-harap anda) baru membuka akaun di %{site_url}. + greeting: Apa khabar! + subject: "[OpenStreetMap] Selamat datang ke OpenStreetMap" + welcome: Kami ingin menyambut kedatangan anda serta memberi anda maklumat tambahan sebagai permulaan. signup_confirm_html: ask_questions: Anda boleh menanyakan sebarang soalan tentang OpenStreetMap di tapak soal jawab kami. - click_the_link: Jika anda orangnya, selamat datang! Sila klik pautan di bawah untuk mengesahkan akaun anda dan teruskan membaca untuk maklumat lanjut tentang OpenStreetMap. current_user: Senarai pengguna semasa dalam kategori berasaskan kedudukan mereka di dunia, terdapat di Category:Users_by_geographical_region. get_reading: Bacalah maklumat tentang OpenStreetMap di wiki ini, ikutilah perkembangan terbaru melalui blog atau Twitter OpenStreetMap, ataupun layari blog OpenGeoData oleh Steve Coast, pengasas OpenStreetMap untuk mempelajari sejarah ringkas projek ini, lengkap dengan podcast juga! - greeting: Apa khabar! - hopefully_you: Seseorang (harap-harap iaitu anda) ingin membuka akaun di introductory_video: Anda boleh menonton %{introductory_video_link}. more_videos: Terdapat %{more_videos_link}. more_videos_here: banyak lagi video di sini @@ -1152,18 +1156,12 @@ ms: signup_confirm_plain: ask_questions: "Anda boleh menanyakan sebarang soalan tentang OpenStreetMap di tapak soal jawab kami:" blog_and_twitter: "Dapatkan berita mutakhir melalui blog OpenStreetMap blog atau Twitter:" - click_the_link_1: Jika anda orangnya, selamat datang! Sila klik pautan di bawah untuk mengesahkan akaun - click_the_link_2: anda dan teruskan membaca untuk maklumat lanjut tentang OpenStreetMap. - current_user_1: Senarai pengguna semasa dalam kategori berasaskan kedudukan mereka di dunia, - current_user_2: "boleh didapati di:" - greeting: Apa khabar! - hopefully_you: Seseorang (harap-harap iaitu anda) ingin membuka akaun di + current_user: "Senarai pengguna semasa mengikut kategori, berasaskan kedudukan mereka di dunia, terdapat di:" introductory_video: "Anda boleh menonton video pengenalan OpenStreetMap di sini:" more_videos: "Ada banyak lagi video di sini:" opengeodata: "OpenGeoData.org merupakan blog milik pengasas OpenStreetMap, Steve Coast, dan juga mempunyai podcast:" the_wiki: "Bacalah perihal OpenStreetMap di wiki:" - user_wiki_1: Anda disaran supaya mewujudkan laman wiki pengguna yang merangkumi - user_wiki_2: tag-tag kategori yang menyatakan kedudukan anda, seperti [[Category:Users_in_London]]. + user_wiki_page: Anda disyorkan supaya membentuk sebuah halaman wiki pengguna yang merangkumi tag-tag kategori yang menyatakan kedudukan anda, seperti [[Category:Users_in_Kuala_Lumpur]]. wiki_signup: "Anda juga boleh mendaftarkan diri untuk menyertai wiki OpenStreetMap di:" oauth: oauthorize: @@ -1492,6 +1490,10 @@ ms: email never displayed publicly: (tidak sesekali dipaparkan kepada umum) flash update success: Maklumat pengguna berjaya dikemaskinikan. flash update success confirm needed: Maklumat pengguna berjaya dikemaskinikan. Semak e-mel anda untuk pesanan untuk mengesahkan alamat e-mel baru anda. + gravatar: + gravatar: Gunakan Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: apakah ini? home location: "Lokasi Rumah:" image: "Imej:" image size hint: (imej segi empat sama yang sekurang-kurangnya 100x100 adalah paling bagus) @@ -1627,6 +1629,7 @@ ms: email address: "Alamat E-mel:" fill_form: Isi borang ini, dan kami akan segera menghantar pesanan e-mel kepada anda untuk mengaktifkan akaun anda. flash create success message: Terima kasih kerana mendaftar. Kami telah menghantar pesanan pengesahan kepada %{email}. Sebaik sahaja anda mengesahkan akaun anda, anda akan boleh menyunting peta.

    Jika anda menggunakan sistem anti-spam yang menghantar permohonan untuk pengesahan, sila pastikan anda membenarkan webmaster@openstreetmap.org kerana kami tidak dapat membalas sebarang permohonan untuk pengesahan. + flash welcome: Terima kasih kerana mendaftar. Kami telah menghantar pesanan selamat datang ke %{email} dengan beberapa petua sebagai permulaan. heading: Buka Akaun Pengguna license_agreement: Ketika mengesahkan akaun anda, anda perlu bersetuju dengan terma-terma penyumbang. no_auto_account_create: Sayang sekali, kami tidak dapat membuka akaun secara automatik untuk anda buat masa ini. diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 439bd4e4e..3840aca2d 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -996,7 +996,6 @@ nb: title: OpenStreetMap sign_up: registrer sign_up_tooltip: Opprett en konto for redigering - sotm2012: Kom til 2012 OpenStreetMap-konferansen, «Kartets tilstand», 6.-8. september i Tokyo! tag_line: Fritt Wiki-verdenskart user_diaries: Brukerdagbok user_diaries_tooltip: Vis brukerens dagbok @@ -1165,11 +1164,8 @@ nb: subject: "[OpenStreetMap] Bekreft din e-postadresse" signup_confirm_html: ask_questions: Du kan stille spørsmÃ¥l du har om OpenStreetMap pÃ¥ vÃ¥rt spørsmÃ¥l og svar-nettsted. - click_the_link: Hvis dette er deg, sÃ¥ er du velkommen! Klikke lenka nedenfor for Ã¥ bekrefte kontoen og les videre for mer informasjon om OpenStreetMap current_user: En liste over nÃ¥værende brukere i kategorier, basert pÃ¥ hvor i verden de er, er tilgjengelig fra Category:Users_by_geographical_region. get_reading: Start Ã¥ lese om OpenStreetMap pÃ¥ wikien, fÃ¥ med deg de siste nyhetene via OpenStreetMap-bloggen eller Twitter. Eller bla gjennom OpenStreetMaps grunnlegger Steve Coasts OpenGeoData-blogg for hele historien til prosjektet, som ogsÃ¥ har engelske podkaster du kan lytte til. - greeting: Hei der! - hopefully_you: Noen (forhÃ¥pentligvis deg) ønsker Ã¥ opprette en konto pÃ¥ introductory_video: Du kan se en %{introductory_video_link}. more_videos: Det er %{more_videos_link}. more_videos_here: flere videoer her @@ -1179,18 +1175,10 @@ nb: signup_confirm_plain: ask_questions: "Du kan stille spørsmÃ¥l du har om OpenStreetMap pÃ¥ vÃ¥rt spørsmÃ¥l og svar-nettsted:" blog_and_twitter: "FÃ¥ med deg de siste nyhetene gjennom OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Om dette er deg, velkommen! Vennligst klikk pÃ¥ lenken under for Ã¥ bekrefte din - click_the_link_2: konto og les videre for mer informasjon om OpenStreetMap. - current_user_1: En liste over nÃ¥værende brukere i kategorier, basert pÃ¥ hvor i verden - current_user_2: "de er, er tilgjengelig fra:" - greeting: Hei der! - hopefully_you: Noen (forhÃ¥pentligvis deg) ønsker Ã¥ opprette en konto pÃ¥ introductory_video: "Du kan se en introduksjonsvideo for OpenStreetMap her:" more_videos: "Det er flere videoer her:" opengeodata: "OpenGeoData.org er bloggen til OpenStreetMap-grunnlegger Steve Coast, og den har podcast-er ogsÃ¥:" the_wiki: "Les mer om OpenStreetMap pÃ¥ wikien:" - user_wiki_1: Det anbefales at du oppretter en brukerside pÃ¥ wiki-en som inkluderer - user_wiki_2: kategorimerker som viser hvor du er, f.eks [[Category:Users_in_London]]. wiki_signup: "Du vil kanskje ogsÃ¥ melde deg inn i OpenStreetMap-wikien pÃ¥:" oauth: oauthorize: diff --git a/config/locales/nds.yml b/config/locales/nds.yml index d151fecc2..a66abe357 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -574,10 +574,6 @@ nds: greeting: Moin, message_notification: hi: Moin %{to_user}, - signup_confirm_html: - greeting: Moin! - signup_confirm_plain: - greeting: Moin! oauth_clients: edit: submit: Ännern diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c87281d91..22c82bca6 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -988,7 +988,6 @@ nl: partners_ucl: het UCL VR Centre sign_up: registreren sign_up_tooltip: Gebruiker voor bewerken aanmaken - sotm2012: Kom naar de OpenStreetMap-conferentie 2012, de staat van de kaart, 6-8 september in Tokyo! tag_line: De vrije wikiwereldkaart user_diaries: Gebruikersdagboeken user_diaries_tooltip: Gebruikersdagboeken bekijken @@ -1004,6 +1003,9 @@ nl: text: In het geval deze taalversie en het %{english_original_link} elkaar tegenspreken, hebben de bepalingen op de Engelstalige pagina voorrang. title: Over deze vertaling legal_babble: + attribution_example: + alt: Voorbeeld van hoe de naamsvermelding voor OpenStreetMap toe te passen op een webpagina + title: Voorbeeld naamsvermelding contributors_at_html: "Austria: Bevat gegevens van de\nStad Wenen (onder\nCC BY), Land Vorarlberg en\nLand Tirol (onder CC-BY AT met aanvullingen)." contributors_ca_html: "Canada: Bevat gegevens van\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), en StatCan (Geography Division,\nStatistics Canada)." contributors_footer_1_html: "Voor meer gegevens over deze en andere bronnen die gebruikt zijn\nvoor het verbeteren van OpenStreetMap, kunt u de pagina met Bijdragers\nop de OpenStreetMap Wiki raadplegen." @@ -1015,14 +1017,18 @@ nl: contributors_nz_html: "Nieuw-Zeeland: Bevat gegevens van\nLand Information New Zealand. Crown Copyright voorbehouden." contributors_title_html: Onze bijdragers contributors_za_html: "Zuid-Afrika: Bevat gegevens afkomstig uit\nChief Directorate:\nNational Geo-Spatial Information, auteursrechten voor de Staat voorbehouden." - credit_1_html: "Als u kaartmateriaal van OpenStreetMap gebruikt, vragen we u als\nnaamsvermelding tenminste op te nemen “© OpenStreetMap-auteurs, CC BY-SA”.\nAls u alleen kaartgegevens gebruikt, vragen we u te vermelden\n“Kaartgegevens © OpenStreetMap-auteurs,\nCC BY-SA”." - credit_2_html: "Waar mogelijk moet u verwijzen naar OpenStreetMap met een hyperlink naar http://www.openstreetmap.org/\nen CC BY-SA naar http://creativecommons.org/licenses/by-sa/2.0/. Als\nu een medium gebruikt waarin u niet met hyperlinks kunt verwijzen (bijvoorbeeld in\ndrukwerk), dan verzoeken we u uw lezers te verwijzen naar \nwww.openstreetmap.org (wellicht door \n‘OpenStreetMap’ uit te schrijven als het complete webadres) en naar\nwww.creativecommons.org." + credit_1_html: "Wij vereisen dat u het volgende vermeld bij gebruik:\n“Kaartgegevens © OpenStreetMap-auteurs”." + credit_2_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn onder de Open\nDatabase License en als u onze kaarttegels gebruikt, dat de cartografie\nde licentie CC-BY-SA heeft. U kunt dit doen door te verwijzen naar\ndeze pagina over auteursrechten. \nAls alternatief, en verplicht als u de gegevens van OSM distribueert, kunt u\ndirect verwijzen naar de licentie(s). In media waar\nverwijzen niet mogelijk is, bijvoorbeeld in gedrukte werken, raden we u aan\nuw lezer te verwijzen naar openstreetmap.org, mogelijk door \n\"OpenStreetMap\" hiernaar uit te breiden, naar opendatacommons.org en\nals van toepassing, naar creativecommons.org." + credit_3_html: "Voor een doorbladerbare kaart, moet de naamsvermelding in een hoek van de kaart weergegeven worden.\nBijvoorbeeld:" credit_title_html: Hoe OpenStreetMap te vermelden + 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 takedownprocedure\nof meld het direct en formeel via onze online claimpagina." infringement_title_html: Auteursrechtenschending intro_1_html: "OpenStreetMap is open data, gelicenceerd onder de licentie Creative\nCommons Naamsvermelding-Gelijk delen 2.0 (CC BY-SA)." 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 juridische\ntekst worden uw rechten en verantwoordelijkheden uitgelegd." - more_1_html: "U kunt meer lezen over onze gegevens in de Veel gestelde juridische\nvragen." - more_2_html: "OSM-auteurs worden er continu aan herinnerd nooit gebruik te maken van enige\nauteursrechtelijk beschermde bron (zoals bijvoorbeeld Google Maps of gedrukte kaarten) zonder\nexpliciete toestemming van de auteursrechthebbenden." + intro_3_html: "De cartografie in onze kaarttegels en onze documentatie zijn\ngelicenseerd onder de licentie Creative\nCommons Naamsvermelding-Gelijk delen 2.0 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 Veel gestelde juridische\nvragen." + more_2_html: "Hoewel OpenStreetMap open data is, kunnen we geen gratis\nkaart-API voor derde partijen aanbieden.\nZie ons API-gebruikbeleid,\nTegelgebruikbeleid\nen Nominatimgebruikbeleid." more_title_html: Meer informatie title_html: Auteursrechten en licentie native: @@ -1153,14 +1159,15 @@ nl: header: "%{from_user} heeft u een bericht gezonden via OpenStreetMap met het onderwerp %{subject}:" hi: Hallo %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Bevestig uw e-mailadres" + 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:" + created: Iemand (hopelijk u) heeft zojuist een gebruiker aangemaakt op %{site_url}. + greeting: Hallo! + subject: "[OpenStreetMap] Welkom bij OpenStreetMap" + welcome: Van harte welkom. We willen u graag wat extra informatie geven zodat u aan de slag kunt. signup_confirm_html: ask_questions: U kunt vragen stellen over OpenStreetMap op onze vraag en antwoordsite. - click_the_link: Als u dat bent, welkom! Volg de verwijzing hieronder beneden om uw gebruiker bevestigen en om meer over OpenStreetMap te weten te komen current_user: Een lijst van gebruikers, gesorteerd op woonplaats, is te zien op Category:Users_by_geographical_region. get_reading: Lees over OpenStreetMap op de wiki, volg het laatste nieuws op de OpenStreetMap-blog of via Twitter. Lees ook de OpenGeoData-blog van OpenSteetMap-grondlegger Steve Coast, die ook podcasts aanbiedt! - greeting: Hallo! - hopefully_you: Iemand (waarschijnlijk u) wil een gebruiker aanmaken op introductory_video: U kunt een %{introductory_video_link}. more_videos: Er zijn %{more_videos_link}. more_videos_here: Er zijn nog meer video's @@ -1170,18 +1177,12 @@ nl: signup_confirm_plain: ask_questions: "U kunt vragen stellen over OpenStreetMap op onze vraag en antwoordsite:" blog_and_twitter: "Volg het laatste nieuws via de OpenStreetMap-blog of Twitter:" - click_the_link_1: Als u dat bent, welkom! Volg de verwijzing hieronder om uw gebruiker te bevestigen - click_the_link_2: en om meer informatie over OpenStreetMap te krijgen. - current_user_1: Een lijst van gebruikers, gesorteerd op woonplaats - current_user_2: "is beschikbaar op:" - greeting: Hallo! - hopefully_you: Iemand (waarschijnlijk u) wil een gebruiker aanmaken op + 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:" 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_1: We adviseren u een gebruikerspagina aan te maken met onder andere - user_wiki_2: categorieën die aangeven waar u verblijft, zoals [[Category:Users_in_Amsterdam]]. + 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]]. wiki_signup: "U kunt zich ook registreren bij de OpenStreetMap-wiki:" oauth: oauthorize: @@ -1297,6 +1298,8 @@ nl: index: js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript uitgeschakeld. js_2: OpenStreetMap gebruikt JavaScript voor de slippy-kaart. + license: + copyright: Copyright OpenStreetMap en bijdragers, onder een open licentie permalink: Permanente verwijzing remote_failed: Bewerken is mislukt. Zorg dat JOSM of Merkaartor is geladen en dat de instelling voor Remote Control is ingeschakeld shortlink: Korte verwijzing @@ -1509,6 +1512,9 @@ nl: email never displayed publicly: (nooit openbaar gemaakt) flash update success: De gebruikersinformatie is bijgewerkt. flash update success confirm needed: De gebruikersinformatie is bijgewerkt. Controleer uw e-mail om uw nieuwe e-mailadres te bevestigen. + gravatar: + gravatar: Gravatar gebruiken + link text: wat is dit? home location: "Thuislocatie:" image: "Afbeelding:" image size hint: (vierkante afbeeldingen van minstens 100x100 pixels werken het beste) @@ -1644,6 +1650,7 @@ nl: email address: "E-mailadres:" fill_form: Vul het formulier in en we sturen u dan zo snel mogelijk een e-mail met gegevens over hoe u uw gebruiker kunt activeren. flash create success message: Bedankt voor uw aanmelding. Er is een bevestigingse-mail verstuurd naar %{email} en als u uw gebruiker hebt bevestigd, kunt u gaan mappen.

    Als u een spamfilter gebruikt die bevestigingse-mails stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken. + flash welcome: Dan u wel voor uw registratie. We hebben een welkomstbericht verzonden aan %{email} met wat tips om aan de slag te gaan. heading: Gebruiker aanmaken license_agreement: Als u een gebruiker aan wilt maken, moet u akkoord gaan met de voorwaarden voor bijdragen. no_auto_account_create: Helaas is het niet mogelijk om automatisch een gebruiker voor u aan te maken. diff --git a/config/locales/nn.yml b/config/locales/nn.yml index a48e87c50..82b083733 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -334,8 +334,9 @@ nn: hide_link: Skjul denne kommentaren diary_entry: comment_count: - one: 1 kommentar + one: "%{count} kommentar" other: "%{count} kommentarar" + zero: Ingen kommentarar comment_link: Kommenter denne oppføringa confirm: Stadfest edit_link: Rediger denne oppføringa @@ -1006,7 +1007,6 @@ nn: title: OpenStreetMap sign_up: registrer sign_up_tooltip: Opprett ein konto for redigering - sotm2012: Kom til 2012 USA OpenStreetMap-konferansen, «Tilstanden til kartet i USA», 13.-14. Oktober i Oregon! tag_line: Fritt Wiki-verdenskart user_diaries: Brukardagbok user_diaries_tooltip: Vis brukaren si dagbok @@ -1023,6 +1023,9 @@ nn: text: I tilfellet konflikt mellom denne omsette sida og %{english_original_link} har den engelske presedensen title: Om denne omsetjinga legal_babble: + attribution_example: + alt: Døme pÃ¥ korleis ein syner OpenStreetMap som kjelde pÃ¥ ei vevside + title: Døme pÃ¥ kjeldehenvising contributors_at_html: "Austerrike: Inneheld data henta frÃ¥\n Stadt Wien under\n CC BY,\n Land Vorarlberg og\n Land Tirol (under CC-BY AT med tilleg)." contributors_ca_html: "Canada: Inneheld data frÃ¥\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 detaljar om desse og andre kjelder som har blitt brukt for Ã¥ forbetra\n OpenStreetMap, sjÃ¥ Bidragsytarar\n sida pÃ¥ OpenStreetMap Wikien." @@ -1036,6 +1039,7 @@ nn: contributors_za_html: "Sør-Afrika: Inneheld data frÃ¥ Chief Directorate: National Geo-Spatial Information, 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 denne sida. 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_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 takedown \nprosedyre eller direkte til vÃ¥rt online skjema." @@ -1177,14 +1181,15 @@ nn: hi: Hei %{to_user}, subject_header: "[OpenStreetMap] %{subject}" signup_confirm: - subject: "[OpenStreetMap] Stadfest di e-postadresse" + confirm: "Før me kan gjere noko mÃ¥ me bekrefta at denne forespørselen kom frÃ¥ deg, om den gjer det ver god Ã¥ klikk linken nedanfor for Ã¥ bekrefte kontoen din:" + created: Nokon (forhÃ¥pentligvis deg) laga nettop ein konto pÃ¥ %{site_url}. + greeting: Hei der! + subject: "[OpenStreetMap] Velkommen til OpenStreetMap" + welcome: Me vil ynskje velkommen og gje deg litt meir informasjon for Ã¥ fÃ¥ deg igang. signup_confirm_html: ask_questions: Du kan stille spørsmÃ¥l du har om OpenStreetMap pÃ¥ vÃ¥rt spørsmÃ¥l og svar-nettsted. - click_the_link: Viss dette er deg, sÃ¥ er du velkomen! Klikke lenkja nedanfor for Ã¥ stadfeste kontoen og les litt vidare for meir informasjon om OpenStreetMap current_user: Ei liste over noverande brukarar i kategoriar, basert pÃ¥ kor i verda dei er, er tilgjengeleg frÃ¥ Category:Users_by_geographical_region. get_reading: Start Ã¥ lese om OpenStreetMap pÃ¥ wikien, fÃ¥ med deg dei siste nyhenda via OpenStreetMap-bloggen eller Twitter. Eller bla gjennom OpenStreetMaps grunnlegg Steve Coasts OpenGeoData-blogg for heile historia til prosjektet, som òg har engelske podkaster du kan lytte til. - greeting: Hei der! - hopefully_you: Nokre (vonleg deg) ynskjer Ã¥ opprette ein konto pÃ¥ introductory_video: Du kan sjÃ¥ ein %{introductory_video_link}. more_videos: Det er %{more_videos_link}. more_videos_here: fleire videoar her @@ -1194,19 +1199,13 @@ nn: signup_confirm_plain: ask_questions: "Du kan stille spørsmÃ¥l du har om OpenStreetMap pÃ¥ vÃ¥r spørsmÃ¥l og svar-nettsted:" blog_and_twitter: "FÃ¥ med deg dei siste nyhenda gjennom OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Om dette er deg, velkomen! Vennligst klikk pÃ¥ lenkja under for Ã¥ stadfeste din - click_the_link_2: konto og les litt vidare for meir informasjon om OpenStreetMap. - current_user_1: Ei liste over noverande brukarar i kategoriar, basert pÃ¥ kor i verda - current_user_2: "dei er, er tilgjengeleg frÃ¥:" - greeting: Hei der! - hopefully_you: Nokre (vonleg deg) ynskjer Ã¥ opprette ein konto pÃ¥ + current_user: "Ei liste over brukarar i kategoriar basert pÃ¥ kvar i verda dei er er tilgjenglig pÃ¥:" introductory_video: "Du kan sjÃ¥ ein introduksjonsvideo for OpenStreetMap her:" more_videos: "Det er fleire videoar her:" opengeodata: "OpenGeoData.org er bloggen til OpenStreetMap-grunnlegg Steve Coast, og han har podcast-er òg:" the_wiki: "Les meir om OpenStreetMap pÃ¥ wikien:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide - user_wiki_1: Det er tilrÃ¥dd at du opprettar ei brukarside pÃ¥ wikien som inneheld - user_wiki_2: kategorimerker som viser kor du er, f.eks [[Category:Users_in_norway]]. + user_wiki_page: Det er ambefalt at du òg lagar ei wiki brukar side som inneheld kategori for kvar du er, til dømes [[Category:Users_in_Norway]]. wiki_signup: "Du vil kanskje òg melde deg inn i OpenStreetMap-wikien pÃ¥:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_page oauth: @@ -1279,8 +1278,6 @@ nn: update: flash: Oppdaterte klientinformasjonen printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" with_version: "%{id}, v%{version}" redaction: create: @@ -1316,7 +1313,6 @@ nn: site: edit: anon_edits: (%{link}) - anon_edits_link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits anon_edits_link_text: Finn ut kvifor dette er tilfellet. flash_player_required: Du treng ein Flash-spelar for Ã¥ kunne bruke Potlatch, Flasheditoren for OpenStreetMap. Du kan laste ned Flash Player frÃ¥ Adobe.com. Fleire andre alternativ er òg tilgjengeleg for redigering av OpenStreetMap. no_iframe_support: Nettlesaren din støttar ikkje HTML iframes som er naudsynt for denne eigenskapen. @@ -1331,8 +1327,6 @@ nn: js_2: OpenStreetMap brukar JavaScript pÃ¥ kartsidene. license: copyright: Kopibeskytta OpenStreetMap og bidragsytarar, under ein Ã¥pen lisens - license_url: https://creativecommons.org/licenses/by-sa/2.0/deed.no - project_url: http://openstreetmap.org permalink: Permanent lenkje remote_failed: Klarte ikkje redigere - forsikre deg at JOSM eller Merkaartor er lasta og fjernkontrollvalget er aktivert shortlink: Kort lenkje @@ -1548,6 +1542,10 @@ nn: email never displayed publicly: " (vis aldri offentleg)" flash update success: Brukerinformasjon oppdatert. flash update success confirm needed: Brukerinformasjon oppdatert. Sjekk eposten din for Ã¥ stadfeste din epostadresse. + gravatar: + gravatar: Bruk Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: kva er dette? home location: "Heimeposisjon:" image: "Bilete:" image size hint: (kvadratiske bilete som er minst 100x100 fungerer best) @@ -1683,6 +1681,7 @@ nn: email address: "E-postadresse:" fill_form: Fyll ut skjemaet og me vil sende deg ein e-post for Ã¥ aktivare kontoen din. flash create success message: Takk for at du registrerte deg. Me har sendt ein bekreftelsesmelding til %{email} og sÃ¥ snart du stadfestar kontoen din kan du byrje Ã¥ lage kart.

    Om du brukar eit antispamsystem som sender bekreftelsesforspørsler, kontrollar at du har hvitelistet webmaster@openstreetmap.org sidan me ikkje kan svare pÃ¥ bekreftelsesforespørsler. + flash welcome: Takk for at du blei medlem. Me har sendt deg ei velkomstmelding til %{email} med nokre hint om korleis du kjem igang. heading: Opprett ein brukerkonto license_agreement: NÃ¥r du stadfestar kontoen din mÃ¥ du godkjenne bidragsytervilkÃ¥ra. no_auto_account_create: Beklagelegvis kan me for augneblunken ikkje opprette ein konto for deg automatisk. diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 2978e65a6..4f3a9eed0 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1123,11 +1123,8 @@ pl: subject: "[OpenStreetMap] Prośba o potwierdzenie adresu e-mail" signup_confirm_html: ask_questions: Możesz zadać nurtujące Cię pytania dotyczące OpenStreetMap na naszej stronie pytań i odpowiedzi. - click_the_link: Jeśli to Ty, witamy! Kliknij poniższy link żeby potwierdzić Twoje nowe konto i dowiedzieć się więcej o OpenStreetMap. current_user: Aktualne listy użytkowników według ich położenia na Ziemi znajdziesz na stronie Category:Users_by_geographical_region. get_reading: Zacznij czytać o OpenStreetMap na naszej wiki i na blogu opengeodata który ma nawet podcasty do posłuchania! - greeting: Cześć! - hopefully_you: Ktoś (prawdopodobnie Ty sam(a)) chciałby utworzyć konto na introductory_video: To dobry moment żeby obejrzeć %{introductory_video_link}. more_videos: Mamy %{more_videos_link}. more_videos_here: więcej materiału wideo tutuaj @@ -1137,18 +1134,10 @@ pl: 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:" - click_the_link_1: Jeśli to Ty, witamy! Kliknij poniższy link żeby potwierdzić - click_the_link_2: Twoje nowe konto i dowiedzieć się więcej o OpenStreetMap. - current_user_1: Aktualne listy użytkowników według ich położenia na Ziemi znajdziesz - current_user_2: "tu:" - greeting: Cześć! - hopefully_you: Ktoś (prawdopodobnie Ty sam(a)) chciałby utworzyć konto na 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_1: Najlepiej stwórz swoją stronę użytkownika na wiki zawierającą odpowiednie - user_wiki_2: kategorie wskazujące twoją lokalizację, np. [[Category:Users_in_Warszawa]]. wiki_signup: "Załóż sobie konto na wiki projektu OpenStreetMap jeśli chcesz:" oauth: oauthorize: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index d3ae945e9..0b8579b08 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1168,11 +1168,8 @@ pt-BR: subject: "[OpenStreetMap] Confirme seu endereço de e-mail" signup_confirm_html: ask_questions: Você pode perguntar o que quiser sobre o OpenStreetMap em nosso site de perguntas e respostas. - click_the_link: Se esta pessoa é você, bem-vindo! Por favor, clique no link abaixo para confirmar sua inscrição e ler mais informações sobre o OpenStreetMap. current_user: A lista de usuários, baseada em suas localizações no mundo, está disponível em Category:Users_by_geographical_region. get_reading: Continue lendo sobre o OpenStreetMap no wiki, mantenha-se informado via o blog OpenStreetMap(em inglês) ou pelo Twitter(em inglês), ou então navegue pelo blog do fundador do OSM(em inglês), Steve Coast, que também tem podcasts(em inglês). - greeting: Olá! - hopefully_you: Alguém (esperamos que você) quer criar uma conta em introductory_video: Você pode ver um vídeo introdutório (em inglês) em %{introductory_video_link}. more_videos: Há também %{more_videos_link}. more_videos_here: mais vídeos aqui @@ -1182,19 +1179,11 @@ pt-BR: 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:" - click_the_link_1: Se esta pessoa é você, bem-vindo! Clique abaixo para confirmar sua - click_the_link_2: conta e ler mais informações sobre o OpenStreetMap. - current_user_1: Uma lista atualizada de usuários em categorias, baseada em onde eles - current_user_2: "estão, está disponível aqui:" - greeting: Olá! - hopefully_you: Alguém (esperamos que você) quer criar uma conta 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_1: É recomendável que você crie sua página no wiki, incluindo tags de - user_wiki_2: categorias marcando onde você está, como [[Category:Users_in_Brazil]]. 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: @@ -1267,8 +1256,6 @@ pt-BR: update: flash: As informações do cliente foram atualizadas com sucesso printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" with_version: "%{id}, v%{version}" redaction: edit: @@ -1291,7 +1278,6 @@ pt-BR: site: edit: anon_edits: (%{link}) - anon_edits_link: http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits anon_edits_link_text: Descubra se é esse o seu caso. flash_player_required: Você precisa de um tocador Flash para usar o Potlatch, o editor Flash do OpenStreetMap. Você pode baixar o Flash Player da Adobe.com. Outras opções estão disponíveis para editar o OpenStreetMap. no_iframe_support: Seu navegador não suporta iframes HTML, que são necessários para que esse recurso. @@ -1304,9 +1290,6 @@ pt-BR: 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: - license_url: http://creativecommons.org/licenses/by-sa/2.0/ - project_url: http://openstreetmap.org 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 diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 058a29bb7..e4b5c209b 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -13,6 +13,7 @@ # Author: McDutchie # Author: Nemo bis # Author: Rsbarbosa +# Author: Ruben # Author: SandroHc # Author: Waldir pt: @@ -181,7 +182,7 @@ pt: of: de showing_page: Mostrando página redacted: - message_html: A versão %{version} do elemento %{type} não pode ser mostrado porque foi redigido. Por favor consulte %{redaction_link} para obter mais informações. + message_html: A versão %{version} do elemento %{type} não pode ser mostrada porque foi suprimida. Por favor consulte %{redaction_link} para obter mais informações. redaction: Revisão %{id} type: node: nó @@ -994,9 +995,12 @@ pt: license_page: foreign: english_link: o original em inglês - text: Caso haja um conflito entre esta página traduzida e a %{english_original_link}, a página em inglês tem prevalência + text: Caso haja um conflito entre esta página traduzida e %{english_original_link}, a página em inglês tem prevalência title: Sobre esta tradução legal_babble: + attribution_example: + alt: Exemplo de como indicar os créditos do OpenStreetMap numa página web + title: Exemplo de atribuição contributors_at_html: "Áustria: Contém dados de Stadt Wien (sob a licença CC BY), Land Vorarlberg e Land Tirol (sob a licença CC-BY AT com emendas)." contributors_ca_html: "Canadá: Contém dados de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), e StatCan (Geography Division, Statistics Canada)." contributors_footer_1_html: Para mais informações sobre estas e outras fontes utilizadas para melhorar o OpenStreetMap, consulte a página de contribuidores (em inglês) na wiki do OpenStreetMap. @@ -1006,10 +1010,11 @@ pt: contributors_intro_html: "Os contribuidores do OpenStreetMap são milhares. Também são utilizados dados de agências cartográficas nacionais e outras fontes, entre elas:" contributors_nl_html: "Países Baixos: Contém dados © AND, 2007 (www.and.com)" contributors_nz_html: "Nova Zelândia: Contém dados provenientes de Land Information New Zealand. Crown Copyright reserved." - contributors_title_html: os nossos contribuidores + contributors_title_html: Os nossos contribuidores contributors_za_html: "África do Sul: Contém dados provenientes de Chief Directorate: National Geo-Spatial Information, State copyright reserved." - credit_1_html: É necessário indicar “© contribuidores do OpenStreetMap”. + credit_1_html: É necessário indicar “© contribuidores do OpenStreetMap” ou caso seja mais adequado em inglês “© OpenStreetMap contributors”. credit_2_html: Também tem de indicar claramente que os dados estão disponíveis sob a Open Database License (ODbL), e caso utilize as telas de mapas (imagens dos mapas), que a cartografia é disponibilizada sob a licença CC-BY-SA. Pode fazer isto colocando uma hiperligação para esta página sobre licença e direitos de autor. Como alternativa, e obrigatório caso distribua o OpenStreetMap em formato de dados, pode indicar as licenças e colocar hiperligações a apontar para as páginas das licenças. Em suportes que não seja possível colocar hiperligações (por exemplo, obras impressas) sugerimos que indique o endereço do sítio www.openstreetmap.org (talvez substituindo ‘OpenStreetMap’ por este endereço web), para www.opendatacommons.org e, caso se aplique, para www.creativecommons.org + credit_3_html: "Num mapa eletrónico navegável, os créditos devem aparecer num canto do mapa.\nPor exemplo (em inglês):" credit_title_html: Como creditar o OpenStreetMap 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 procedimento para retirar dados protegidos (em inglês) ou preencha os dados diretamente no formulário (em inglês). @@ -1152,11 +1157,8 @@ pt: subject: "[OpenStreetMap] Confirme o seu endereço de e-mail" signup_confirm_html: ask_questions: Pode fazer qualquer pergunta sobre o OpenStreetMap no nosso fórum de ajuda. - click_the_link: Se foi você que pediu, clique na ligação abaixo para confirmar a conta de utilizador e ver mais informações sobre o OpenStreetMap current_user: Está disponível uma lista de utilizadores por categorização conforme o local onde se encontram em Category:Users_by_geographical_region. get_reading: Saiba mais sobre o OpenStreetMap no wiki, Ponha-se em dia com as últimas notícias com o blogue OpenStreetMap ou o Twitter, ou veja o blogue OpenGeoData de Steve Coast, fundador do OpenStreetMap com alguma história sobre o projeto, que também tem podcasts para ouvir! - greeting: Olá! - hopefully_you: Foi feito um pedido para criar uma conta em introductory_video: Pode ver um %{introductory_video_link}. more_videos: Existem %{more_videos_link} more_videos_here: mais vídeos aqui @@ -1166,18 +1168,10 @@ pt: signup_confirm_plain: ask_questions: "Pode fazer qualquer pergunta que queira sobre o OpenStreetMap no nosso fórum de ajuda:" blog_and_twitter: "Ponha-se em dia com as últimas notícias com o blogue OpenStreetMap ou o Twitter:" - click_the_link_1: Se foi você que fez o pedido, bem vindo! Por favor clique na ligação seguinte para confirmar - click_the_link_2: a conta e ver mais informação sobre o OpenStreetMap - current_user_1: Está disponível uma lista de utilizadores por categorização, - current_user_2: "conforme o local onde se encontram em:" - greeting: Olá! - hopefully_you: Foi feito um pedido para criar uma conta em introductory_video: "Pode ver um vídeo de introdução sobre o OpenStreetMap em:" more_videos: "Há mais vídeos em:" opengeodata: "OpenGeoData.org é o blogue do fundador do OpenStreetMap, que também tem podcasts disponíveis:" the_wiki: "Leia mais sobre o OpenStreetMap em:" - user_wiki_1: É recomendável criar uma página de utilizador no wiki, o que inclui - user_wiki_2: etiquetas de categorização que indiquem de onde é, como a [[Category:Users_in_Lisboa]]. wiki_signup: "Também pode querer criar uma conta no wiki OpenStreetMap em:" oauth: oauthorize: @@ -1250,32 +1244,32 @@ pt: flash: A atualização da informação do programa foi feita com sucesso redaction: create: - flash: A redação foi criada. + flash: A supressão foi criada. destroy: - error: Ocorreu um erro ao tentar eliminar esta redação. - flash: Redação eliminada. - not_empty: A redação não está vazia. Por favor retire a redação de todas as versões pertencentes a esta redação antes de a eliminar + error: Ocorreu um erro ao tentar eliminar esta supressão. + flash: Supressão eliminada. + not_empty: A supressão não está vazia. Por favor retire a supressão de todas as versões pertencentes a esta supressão antes de a eliminar edit: description: Descrição - heading: Editar redação - submit: Gravar redação - title: Editar redação + heading: Editar supressão + submit: Gravar supressão + title: Editar supressão index: - empty: Não existem redações a mostrar. - heading: Lista de redações - title: Lista de redações + empty: Não existem supressões a mostrar. + heading: Lista de supressões + title: Lista de supressões new: description: Descrição - heading: Introduza a informação da nova redação - submit: Criar redação - title: A criar uma nova redação + heading: Introduza a informação da nova supressão + submit: Criar supressão + title: A criar uma nova supressão show: confirm: Tem a certeza? description: "Descrição:" - destroy: Remover esta redação - edit: Editar esta redação - heading: A mostrar a redação "%{title}" - title: A mostrar a redação + destroy: Remover esta supressão + edit: Editar esta supressão + heading: A mostrar a supressão "%{title}" + title: A mostrar a supressão user: "Criador:" update: flash: As alterações foram gravadas. @@ -1506,6 +1500,9 @@ pt: email never displayed publicly: (nunca é mostrado publicamente) flash update success: As informações do utilizador foram actualizadas com sucesso. flash update success confirm needed: As informações do utilizador foram actualizadas com sucesso. Verifica o teu e-mail para confirmar o teu endereço de e-mail. + gravatar: + gravatar: Usar imagem do site Gravatar + link text: o que é isto? home location: Localização Habitual image: "Imagem:" image size hint: (funcionam melhor as imagens quadradas com pelo menos 100x100 pixeis) @@ -1839,7 +1836,7 @@ pt: needs_view: O utilizador necessita de autenticar-se antes deste bloqueio terminar. reason: "Razão do bloqueio:" revoke: Revogar! - revoker: "Revocador:" + revoker: "Revogador:" show: Mostrar status: Estado time_future: Termina em %{time} diff --git a/config/locales/ro.yml b/config/locales/ro.yml index d5372cbc5..8d0c858a5 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -862,16 +862,10 @@ ro: title: Înregistrare aplicație nouă show: allow_write_api: modifică harta. - printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" site: edit: user_page_link: pagină de utilizator index: - license: - license_url: http://creativecommons.org/licenses/by-sa/2.0/ - project_url: http://openstreetmap.org permalink: Legătură permanentă shortlink: Legătură scurtată time: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 55625507b..4680779dc 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -22,6 +22,7 @@ # Author: Mechano # Author: Mixaill # Author: Nemo bis +# Author: Spider # Author: TarzanASG # Author: Yuri Nazarov # Author: Zverik @@ -1013,7 +1014,6 @@ ru: partners_ucl: UCL VR Centre sign_up: регистрация sign_up_tooltip: Создать учётную запись для редактирования - sotm2012: Приезжайте на конференцию OpenStreetMap 2012 «The State of the Map», 6-8 сентября, Токио! tag_line: Свободная вики-карта мира user_diaries: Дневники участников user_diaries_tooltip: Посмотреть дневники участников @@ -1030,6 +1030,9 @@ ru: text: В случае конфликта между этой переведённой страницей и %{english_original_link}, английская страница должна иметь приоритет title: Об этом переводе legal_babble: + attribution_example: + alt: Пример того, как сослаться на OpenStreetMap с веб-страницы + title: Пример указания авторства contributors_at_html: "Австрия. Данные города Вена (на условиях CC BY), а также земель Форарльберга и\n Тироля (на условиях CC-BY AT с дополнениями)." contributors_ca_html: Канада. Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады). contributors_footer_1_html: Более подробную информацию об этих и других источниках, использованных для наполнения OpenStreetMap, смотрите на странице Contributors вики-сервера OpenStreetMap. @@ -1044,11 +1047,13 @@ ru: credit_1_html: Мы требуем, чтобы вы указывали «© Участники OpenStreetMap». credit_2_html: Где это возможно, текст «OpenStreetMap» должен быть гиперссылкой на http://www.openstreetmap.org/, «CC BY-SA» — на http://creativecommons.org/licenses/by-sa/2.0/deed.ru. Если вы используете носители, где гиперссылки невозможны (например, печатная работа), мы предлагаем вам направлять ваших читателей непосредственно к www.openstreetmap.org (возможно, расширяя «OpenStreetMap» до полного адреса) и к www.creativecommons.org. credit_title_html: Как сослаться на OpenStreetMap + infringement_1_html: Напоминаем участникам сообщества OSM, что добавление данных из любых защищённых авторским правом источников (например, с Google Maps или печатных карт) не должно проводиться без явного предварительного согласия правообладателей. + infringement_2_html: "Если вы считаете, что защищённый авторским правом материал был неправомерно\n добавлен к базе OpenStreetMap или к этому сайту, пожалуйста, обратитесь\n к нашей процедуре\n изымания или непосредственно на нашу\nвебстраницу регистрации." infringement_title_html: Нарушение авторских прав intro_1_html: OpenStreetMap — это открытые данные доступные по лицензии Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA). intro_2_html: Вы можете свободно копировать, распространять, передавать и дорабатывать наши данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество. Если вы изменяете или берёте наши данные за основу, то вы должны распространять результат только по такой же лицензии. Полный юридический текст лицензии разъясняет ваши права и обязанности. - more_1_html: Прочитайте больше об использовании наших данных на странице ответов на юридические вопросы. - more_2_html: Участники сообщества OSM должны всегда помнить о том, что запрещается добавлять данные из любых защищенных авторским правом источников (например, с Google Maps или печатных карт) без явного предварительного согласия правообладателей. + more_1_html: Прочитайте больше об использовании наших данных и о поддержке на странице ответов на юридические вопросы. + more_2_html: Хотя данные OpenStreetMap открыты для использования, мы не в состоянии предоставить бесплатный API к нашим картам для сторонних разработчиков. См. Правила использования API, Правила использования частей карты и Правила использования службы Nominatim . more_title_html: Узнайте больше title_html: Авторские права и лицензирование native: @@ -1189,11 +1194,8 @@ ru: subject: "[OpenStreetMap] Подтвердите ваш адрес электронной почты" signup_confirm_html: ask_questions: Вы можете задать интересующие Вас вопросы о OpenStreetMap на нашем сайте вопросов и ответов . - click_the_link: Если это действительно вы — добро пожаловать! Пожалуйста, перейдите по ссылке ниже, чтобы подтвердить регистрацию и просмотреть дополнительную информацию об OpenStreetMap current_user: "Список пользователей, основанный на их местоположении, доступен здесь: Category:Users_by_geographical_region." get_reading: Прочтите об OpenStreetMap в вики, узнайте последние новости в блоге OpenStreetMap или в Twitter. Ознакомьтесь с историей проекта в блоге OpenGeoData, автором которого является основатель OpenStreetMap Стив Кост (Steve Coast), в этом блоге есть подкасты, которые также можно прослушать! - greeting: Здравствуйте! - hopefully_you: Кто-то (надеемся, что вы) хотел создать учетную запись на introductory_video: Вы можете просмотреть %{introductory_video_link}. more_videos: Посмотрите %{more_videos_link}. more_videos_here: больше видео здесь @@ -1203,19 +1205,11 @@ ru: signup_confirm_plain: ask_questions: "Вы можете задать интересующие Вас вопросы об OpenStreetMap на нашем сайте вопросов и ответов:" blog_and_twitter: "Ознакомиться с последними новостями через блог OpenStreetMap или Twitter:" - click_the_link_1: Если это действительно вы — добро пожаловать! Пожалуйста, перейдите по ссылке ниже, чтобы подтвердить - click_the_link_2: регистрацию и прочитать больше об OpenStreetMap. - current_user_1: Список пользователей, основанный на их местонахождении, - current_user_2: "доступен здесь:" - greeting: Здравствуйте! - hopefully_you: Кто-то (надеемся, что вы) хотел создать учетную запись на 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_1: Рекомендуется создать свою пользовательскую вики-страницу, включив в неё - user_wiki_2: теги категорий, описывающих ваше местонахождение, например, [[Category:Users_in_Moscow]]. wiki_signup: "Вы также можете зарегистрироваться в вики OpenStreetMap здесь:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=RU:Заглавная_страница&uselang=ru oauth: @@ -1549,6 +1543,9 @@ ru: email never displayed publicly: (не будет показан) flash update success: Информация о пользователе успешно обновлена. flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту, чтобы подтвердить ваш новый адрес. + gravatar: + gravatar: Использовать Gravatar + link text: Что это? home location: "Основное местоположение:" image: "Изображение:" image size hint: (квадратные изображения, по крайней мере 100×100 работают лучше) diff --git a/config/locales/sk.yml b/config/locales/sk.yml index c8ec8fcc5..5e293a288 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -5,6 +5,7 @@ # Author: Jose1711 # Author: Kusavica # Author: Lesny skriatok +# Author: MichalP # Author: Nemo bis # Author: Rudko # Author: Teslaton @@ -599,8 +600,8 @@ sk: minor: VedľajÅ¡ia cesta motorway: Diaľnica motorway_junction: Diaľničná križovatka - motorway_link: Diaľnica - path: Cesta + motorway_link: Diaľničný privádzač + path: Nespevnený chodník pedestrian: Chodník pre chodcov platform: NástupiÅ¡te primary: Cesta I. triedy @@ -621,7 +622,7 @@ sk: track: Nespevnená cesta trail: Chodník trunk: Cesta pre motorové vozidlá - trunk_link: Cesta pre motorové vozidlá + trunk_link: Privádzač k ceste pre motorové vozidlá unclassified: Neklasifikovaná cesta unsurfaced: Nespevnená cesta historic: @@ -673,8 +674,8 @@ sk: recreation_ground: Rekreačná oblasÅ¥ reservoir: Zásobník na vodu reservoir_watershed: Povodie nádrže - residential: Residential Area (Obytná oblasÅ¥) - retail: Retail (Obchodná zóna) + residential: Obytná oblasÅ¥ + retail: Obchodná zóna road: Cesty village_green: Verejná zeleň vineyard: Vinica @@ -816,7 +817,7 @@ sk: bakery: Pekáreň beauty: Salón krásy beverages: Občerstvenie - bicycle: Obchod s bicylkami + bicycle: Obchod s bicyklami books: Kníhkupectvo butcher: Mäsiarstvo car: Predajňa automobilov @@ -869,7 +870,7 @@ sk: pet: Chovprodukt photo: Fotokino salon: Salón - shoes: Obuva + shoes: Obuv shopping_centre: Nákupné stredisko sports: Å portový obchod stationery: Papierníctvo @@ -991,7 +992,6 @@ sk: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: zaregistrovaÅ¥ sa sign_up_tooltip: VytvoriÅ¥ si používateľské konto pre úpravy - sotm2012: Príďte na konferenciu 2012 OpenStreetMap Conference, The State of the Map, 6.-8. septembra do Tokia tag_line: Slobodná wiki-mapa sveta user_diaries: Denníky používateľov user_diaries_tooltip: ZobraziÅ¥ denníky používateľov @@ -1007,6 +1007,9 @@ sk: text: V prípade rozporu mezi touto preloženou verziou a %{english_original_link} má anglická stránka prednosÅ¥ title: O tomto preklade legal_babble: + attribution_example: + alt: Príklad, ako uvádzaÅ¥ autorstvo OpenStreetMap na webovej stránke + title: Príklad uvedenia autorstva contributors_at_html: "Rakúsko: Obsahuje dáta od\nmesta Viedeň (pod licenciou\nCC BY),\nkrajiny Vorarlberg a\nkrajiny Tirol (pod licenciou CC-BY AT s úpravami)." contributors_ca_html: "Kanada: Obsahuje dáta z GeoBase ®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada)." contributors_footer_1_html: "Podrobnosti o týchto a ďalších zdrojoch, ktoré boli použité pre vylepÅ¡enie OpenStreetMap, nájdete na stránke Contributors na OpenStreetMap wiki." @@ -1020,6 +1023,7 @@ sk: contributors_za_html: "Juhoafrická republika: Obsahuje dáta pochádzajúce z Chief Directorate: National Geo-Spatial Information, State copyright reserved." credit_1_html: Vyžadujeme uviesÅ¥ „© Prispievatelia OpenStreetMap“. credit_2_html: " Ak je to možné, mal byÅ¥ text OpenStreetMap uvedený ako hypertextový odkaz na http://www.openstreetmap.org/ a CC BY-SA na http://creativecommons.org/licenses/by-sa/2.0/. Ak používate médium, ktoré odkazy neumožňuje (napr. v tlačenom diele), navrhujeme, aby ste svojho čitateľa nasmerovali na www.openstreetmap.org (zrejme doplnením OpenStreetMap o túto internetovú adresu) a analogicky CC BY-SA na www.creativecommons.org." + credit_3_html: "V prípade interaktívnej elektronickej mapy by autorstvo malo byÅ¥ uvedené v rohu mapy.\nNapríklad:" credit_title_html: Ako uvádzaÅ¥ OpenStreetMap 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áš postup odstraňovania alebo podajte žiadosÅ¥ priamo na stránke pre podávanie sÅ¥ažností. @@ -1120,11 +1124,11 @@ sk: email_confirm_html: click_the_link: Ak ste to vy, kliknite prosím na nižšie uvedený odkaz pre potvrdenie zmeny. greeting: Ahoj, - hopefully_you: Niekto (dúfajme, že vy) chcel zmeniÅ¥ e-mailovú adresu na %{server_url} do %{new_address}. + hopefully_you: Niekto (dúfame, že vy) požiadal o zmenu e-mailovej adresy na serveri %{server_url} na %{new_address}. email_confirm_plain: click_the_link: Ak ste to boli vy, potvrďte prosím zmenu kliknutím na nasledovný odkaz. greeting: Ahoj, - hopefully_you_1: Niekto (dúfajme, že vy) chce zmeniÅ¥ svoju e-mailovú adresu, na viac ako + hopefully_you_1: Niekto (dúfame, že vy) chce zmeniÅ¥ svoju e-mailovú adresu na serveri hopefully_you_2: "%{server_url} na %{new_address}." friend_notification: befriend_them: Môžete ich tiež pridaÅ¥ ako priateľov na %{befriendurl}. @@ -1154,22 +1158,23 @@ sk: lost_password_plain: click_the_link: Ak ste to vy, kliknite prosím na odkaz nižšie pre obnovenie svojho hesla. greeting: Ahoj, - hopefully_you_1: Niekto (dúfajme že vy) požiadal o obnovu hesla - hopefully_you_2: e-mailové adresy openstreetmap.org účtu. + hopefully_you_1: Niekto (dúfame, že vy) požiadal o obnovu hesla pre používateľa + hopefully_you_2: serveru openstreetmap.org s touto e-mailovou adresou. message_notification: footer1: Môžete si tiež prečítaÅ¥ správy na %{readurl} footer2: a môžete odpovedaÅ¥ na %{replyurl} header: "%{from_user} vám zaslal správu cez OpenStreetMap s predmetom %{subject}:" hi: Ahoj %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Potvrďte svoju e-mailovú adresu" + confirm: "Predtým, než urobíme čokoľvek ďalÅ¡ie, potrebujeme potvrdiÅ¥, že táto žiadosÅ¥ priÅ¡la od vás. Ak je to tak, kliknutím na nasledovný odkaz potvrdíte svoje konto:" + created: Niekto (dúfame, že vy) si práve vytvoril konto na %{site_url}. + greeting: Ahoj! + subject: "[OpenStreetMap] Vitajte v OpenStreetMap" + welcome: Dovoľujeme si vás privítaÅ¥ a poskytnúť vám niektoré ďalÅ¡ie informácie, ktoré vám pomôžu začaÅ¥. signup_confirm_html: ask_questions: Prípadné otázky k OpenStreetMap môžete položiÅ¥ na naÅ¡om webe otázok a odpovedí. - click_the_link: Ak ste to vy, vitajte! Kliknutím na nasledovný odkaz potvrdíte svoje konto, nižšie sa dozviete ďalÅ¡ie informácie o OpenStreetMap current_user: Zoznam existujúcich používateľov v kategóriách podľa miesta bydliska je dostupný v kategórii Users by geographical region. get_reading: Prečítajte si niečo o OpenStreetMap na wiki, sledujte aktuálne dianie na naÅ¡om blogu alebo Twitteri, alebo si prebehnite blog zakladateľa OpenStreetMap Steva Coasta OpenGeoData so stručnou históriou projektu aj vo forme podcastov! - greeting: Ahoj! - hopefully_you: Niekto (dúfame že vy) chcel vytvoriÅ¥ účet po dobu introductory_video: Môžete sledovaÅ¥ %{introductory_video_link}. more_videos: Je tam %{more_videos_link}. more_videos_here: viac videí tu @@ -1179,18 +1184,12 @@ sk: signup_confirm_plain: ask_questions: "Prípadné otázky k OpenStreetMap môžete položiÅ¥ na naÅ¡om webe otázok a odpovedí:" blog_and_twitter: "Sledujte aktuálne dianie na naÅ¡om blogu alebo Twitteri:" - click_the_link_1: Ak je to vám, vitajte! Prosím kliknite na odkaz nižšie pre potvrdenie vášho - click_the_link_2: svoje konto, nižšie sa dozviete ďalÅ¡ie informácie o OpenStreetMap. - current_user_1: Zoznam aktuálnych používateľov v kategóriách podľa miesta, kde sa vo svete nachádzajú - current_user_2: "sú k dispozícii na:" - greeting: Ahoj! - hopefully_you: Niekto (dúfame že vy) si chce založiÅ¥ konto na + current_user: "Zoznam existujúcich kategórií pre klasifikáciu používateľov podľa bydliska je k dispozícii na:" introductory_video: "Môžete sledovaÅ¥ úvodné video k OpenStreetMap tu:" more_videos: "Existujú ďalÅ¡ie videá tu:" opengeodata: "OpenGeoData.org je blog zakladateľa OpenStreetMap Steva Coasta, ponúka aj podcasty:" the_wiki: "Prečítajte si niečo o OpenStreetMap na wiki:" - user_wiki_1: Odporúčame, aby ste si na wiki vytvorili používateľskú stránku, ktorá obsahuje - user_wiki_2: kategóriami označíte, odkiaľ pochádzate, napríklad [[Category:Users in Bratislava]]. + user_wiki_page: Odporúčame, aby ste si na wiki založili používateľskú stránku, na ktorej si kategóriami označíte, odkiaľ pochádzate, napr. [[Category:Users in Bratislava]]. wiki_signup: "Môžete tiež prihlásiÅ¥ do wiki OpenStreetMap na adrese:" oauth: oauthorize: @@ -1507,6 +1506,10 @@ sk: email never displayed publicly: (nikde se verejne nezobrazuje) flash update success: Používateľské údaje boli úspeÅ¡ne aktualizované. flash update success confirm needed: Používateľské údaje boli úspeÅ¡ne aktualizované. Skontrolujte si e-mail, mala by Vám prísÅ¥ výzva na potvrdenie novej e-mailovej adresy. + gravatar: + gravatar: PoužívaÅ¥ Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: čo to znamená? home location: "Domovské miesto:" image: "Obrázok:" image size hint: (najvhodnejÅ¡ie sú Å¡tvorcové obrázky s veľkosÅ¥ou najmenej 100×100) @@ -1642,6 +1645,7 @@ sk: email address: "Emailová adresa:" fill_form: Vyplňte formulár a my vám rýchlo poÅ¡leme email na aktiváciu vášho účtu. flash create success message: Používateľ bol úspeÅ¡ne vytvorený. Skontrolujte váš email, kvôli potvrdzujúcej správe, a budete môcÅ¥ mapovaÅ¥ ihneď :-)

    Majte prosím na pamäti, že nebudete schopný prihlásiť sa až do prijatia a potvrdenie vašej emailovej adresy.

    Ak používate antispamový systém, ktorý posiela žiadosÅ¥ o potvrdenie, potom sa uistite či je emailová adresa webmaster@openstreetmap.org na whiteliste, inak nie sme schopný odpovedaÅ¥ na potvrdenie požiadavky. + flash welcome: Vďaka za registráciu. Na %{email} sme poslali uvítanie a niekoľko tipov pre žačiatok. heading: VytvoriÅ¥ používateľský účet license_agreement: Pri potvrdení konta budete musieÅ¥ vyjadriÅ¥ súhlas s Podmienkami prispievania. no_auto_account_create: Bohužiaľ teraz nie sme schopný vytvoriÅ¥ pre vás účet automaticky. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index d755860c5..a648cf073 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1103,14 +1103,11 @@ sl: header: "Uporabnik %{from_user} vam je prek OpenStreetMap poslal novo sporočilo glede %{subject}:" hi: Pozdravljeni, %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Potrdite svoj elektronski naslov" + subject: "[OpenStreetMap] DobrodoÅ¡li na OpenStreetMap" signup_confirm_html: ask_questions: Vsa vpraÅ¡anja, ki jih imate o OpenStreetMap lahko vpraÅ¡ate na naÅ¡i strani vpraÅ¡anja in odgovori. - click_the_link: Če ste to vi, dobrodoÅ¡li! Kliknite na spodnjo povezavo za potrditev računa in več informacij o projektu OpenStreetMap. current_user: Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski položaj je na razpolago v kategoriji Category:Users_by_geographical_region. - get_reading: Preberite več o OpenStreetMap na wikiju, bodite na tekočem z najnovejÅ¡imi novicami preko bloga OpenStreetMap ali Twitterja, ali prebrskajte blog ustanovitelja OpenStreetMap Steva Coasta OpenGeoData za povzeto zgodovino projekta, ki vsebuje tudi zvočne podcaste! - greeting: Pozdravljeni! - hopefully_you: Nekdo (najverjetneje vi) bi rad naredil uporabniÅ¡ki račun na + get_reading: Preberite si več o spletišču OpenStreetMap na wikiju, seznanite se z najnovejÅ¡imi novicami prek bloga OpenStreetMap ali Twitterja ali prebrskajte blog Steva Coasta, ustanovitelja OpenStreetMap OpenGeoData za povzeto zgodovino projekta, ki vsebuje tudi zvočne poddaje! introductory_video: Ogledate si lahko %{introductory_video_link}. more_videos: Ogledate si lahko %{more_videos_link}. more_videos_here: Å¡e več video posnetkov @@ -1120,18 +1117,10 @@ sl: signup_confirm_plain: ask_questions: "Vsa vpraÅ¡anja, ki jih imate o OpenStreetMap lahko vpraÅ¡ate na naÅ¡i strani vpraÅ¡anja in odgovori:" blog_and_twitter: "Spremljajte novice preko OpenStreetMap bloga ali Twitterja:" - click_the_link_1: Če ste to vi, dobrodoÅ¡li! Kliknite na spodnjo povezavo za - click_the_link_2: potrditev računa in več informacij o projektu OpenStreetMap. - current_user_1: Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski - current_user_2: "položaj je na razpolago na naslovu:" - greeting: Pozdravljeni! - hopefully_you: Nekdo (najverjetneje vi) bi rad naredil uporabniÅ¡ki račun na introductory_video: "Uvodni video posnetek si lahko pogledate na naslovu:" more_videos: "Več video posnetkov je na naslovu:" opengeodata: "OpenGeoData.org je blog ustanovitelja OpenStreetMap Steva Coasta, ima pa tudi podcaste:" the_wiki: "Več o projektu OpenStreetMap si preberite v wiki-ju:" - user_wiki_1: Priporočljivo je, da si naredite svojo uporabniÅ¡ko wiki stran, ki naj vsebuje - user_wiki_2: oznako kategorije, ki določa vaÅ¡ položaj, npr [[Category:Users_in_Slovenia]]. wiki_signup: "Lahko ustvarite račun tudi na wiki projektu OpenStreetMap na naslovu:" oauth: oauthorize: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index e7778cba1..b7f965d51 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -629,14 +629,11 @@ sq: hi: Tung %{to_user}, subject_header: "[OpenStreetMap] %{subject}" signup_confirm_html: - click_the_link: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu atë llogari dhe lexoni ma shumë informata rreth OpenStreetMap introductory_video: Ju muni me shiku një %{introductory_video_link}. more_videos_here: më shumë video këtu wiki_signup: Ju mund të dëshironi të regjistroheni në OpenStreetMap wiki. signup_confirm_plain: blog_and_twitter: "Njoftohu me lajmet ma të fundit nëpërmjet blogut të OpenStreetMap ose Twitter-it:" - click_the_link_1: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu - click_the_link_2: llogarin tonde dhe lexo ma shumë informata për OpenStreetMap. introductory_video: "Këtu ju muni me shiku një video hyrëse për në OpenStreetMap:" more_videos: "Ma shumë video keni këtu:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 8a7fea0ec..5653796c6 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1003,7 +1003,6 @@ sr-Latn: title: Openstritmap sign_up: otvori nalog sign_up_tooltip: Otvorite nalog da biste uređivali - sotm2012: Dođite na konferenciju Openstritmapa 2012, „The State of the Map“, koja se održava od 9. do 11. septembra u Tokiju! tag_line: Slobodna viki mapa sveta user_diaries: Dnevnici user_diaries_tooltip: Pogledajte korisničke dnevnike @@ -1173,11 +1172,8 @@ sr-Latn: subject: "[OpenStreetMap] Potvrdite vaÅ¡u e-adresu" signup_confirm_html: ask_questions: Možete postaviti bilo koje pitanje o Openstritmapu na naÅ¡im stranicama za pitanja i odgovore. - click_the_link: Ako ste to vi, dobro doÅ¡li! Kliknite na vezu ispod da biste potvrdili vaÅ¡ nalog i pročitali viÅ¡e o Openstritmapu current_user: Spisak trenutnih korisnika u kategorijama, zasnovan na tome gde se oni nalaze, dostupan je na Category:Users_by_geographical_region. get_reading: Pročitajte viÅ¡e o Openstritmapu na vikiju, budite u toku s najnovijim vestima preko bloga ili Tvitera ili pretražite OpenGeoData, blog osnivača Openstritmapa za istoriju projekata. Možete da sluÅ¡ate i podemisije! - greeting: Pozdrav! - hopefully_you: Neko (verovatno vi) želeo bi da otvori nalog na introductory_video: Možete pogledati %{introductory_video_link}. more_videos: Postoji %{more_videos_link}. more_videos_here: viÅ¡e video-snimaka ovde @@ -1187,19 +1183,11 @@ sr-Latn: signup_confirm_plain: ask_questions: "Možete postaviti bilo koje pitanje o Openstritmapu na naÅ¡im stranicama za pitanja i odgovore:" blog_and_twitter: "Budite u toku s najnovijim vestima preko bloga ili Tvitera:" - click_the_link_1: Ako ste to vi, dobro doÅ¡li! Kliknite na vezu ispod da biste potvrdili svoj - click_the_link_2: korisnički nalog. Pročitajte viÅ¡e o Openstritmapu. - current_user_1: Spisak trenutnih korisnika u kategorijama, na osnovu položaja u svetu - current_user_2: "gde žive, dostupan je na:" - greeting: Pozdrav! - hopefully_you: Neko (verovatno vi) želeo bi da otvori nalog na introductory_video: "Pogledajte uvodni video-snimak za Openstritmap ovde:" more_videos: "ViÅ¡e video-snimaka možete naći ovde:" opengeodata: "OpenGeoData.org je blog Stiva Kosta, osnivača Openstritmapa:" the_wiki: "Pročitajte viÅ¡e o Openstritmapu na vikiju:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Beginners'_guide?uselang=sr-ec - user_wiki_1: Preporučujemo vam da napravite korisničku stranicu koja uključuje - user_wiki_2: oznake kategorija koje označavaju odakle ste, kao na primer [[Category:Users_in_London]]. wiki_signup: "Možete i otvoriti nalog na naÅ¡em vikiju:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=sr-ec oauth: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 11ca4cb8f..10e472444 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -410,7 +410,7 @@ sr: area_to_export: Подручје за извоз embeddable_html: Уградиви HTML код export_button: Извези - export_details: Подаци Опенстритмапа су доступни под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0. + export_details: Подаци Опенстритмапа су доступни под лиценцом Open Data Commons Open Database License (ODbL). format: Формат format_to_export: Формат за извоз image_size: Величина слике @@ -1007,7 +1007,6 @@ sr: title: Опенстритмап sign_up: отвори налог sign_up_tooltip: Отворите налог да бисте уређивали - sotm2012: Дођите на конференцију Опенстритмапа 2012, „The State of the Map“, која се одржава од 9. до 11. септембра у Токију! tag_line: Слободна вики мапа света user_diaries: Дневници user_diaries_tooltip: Погледајте корисничке дневнике @@ -1024,25 +1023,30 @@ sr: text: У случају сукоба између преведене странице и %{english_original_link}, енглеска страница има предност title: О преводу legal_babble: + attribution_example: + alt: Пример како да наведете Опенстритмап на некој страници + title: Пример за навођење contributors_at_html: "Аустрија: садржи податке из\n Штата Виена под лиценцом\n CC BY),\n Ланд Форарлберг и\n \t+ \t\nЛанд Тирол (под лиценцом CC-BY AT са изменама и допунама)." contributors_ca_html: "Канада: садржи податке из\n Беобазе®, Геогратиса (© Одељење за природне\n ресурсе Канаде), Канвек (© Одељење за природне\n ресурсе Канаде) и Статкан (Географски одсек,\n Завод за статистику Канаде)." contributors_footer_1_html: "Више информација о овим и другим изворима коришћеним\nза побољшавање Опенстритмапа можете наћи на страници Доприносиоци на нашем викију." contributors_footer_2_html: " Укључивање података у Опенстритмап не подразумева да изворни\n власник података прихвата Опенстритмап, обезбеђује било какву\n гаранцију или прихвата одговорност." contributors_fr_html: "Француска: садржи податке који потичу од\n Генералне дирекције за опорезивање." - contributors_gb_html: "Уједињено Краљевство: садржи Званичне\n податке геодетског премеравања © Ауторска права 2010." - contributors_intro_html: " Наша лиценца CC BY-SA захтева од вас да “морате\n навести име изворног аутора или даваоца лиценце”.\n Појединачни картографи не захтевају истицање заслуга осим\n “Опенстритмап доприносиоца”, али када подаци\n припадају националној географској агенцији или другом\n већем извору који је укључен у Опенстритмап, разумно је\n навести извор или оставити хипервезу до њега." + contributors_gb_html: "Уједињено Краљевство: Садржи податке\nКартографског завода Уједињеног Краљевства© Крунска ауторска права и\nправа базе 2010-12." + contributors_intro_html: "У нашем пројекту учествује на хиљаде појединаца. Користимо и\nподатке с отвореном лиценцом од државних картографских установа\nи других извора, међу којима су:" contributors_nl_html: "Холандија: садржи © AND подаци, 2007\n \t+ \t\n (www.and.com)" contributors_nz_html: "Нови Зеланд: садржи податке који потичу од\n Land Information New Zealand. Крунска ауторска права задржана." contributors_title_html: Наши сарадници contributors_za_html: "Јужноафричка Република: садржи податке из\nГлавне управе:\nНационална катастарска служба, државна ауторска права задржана." credit_1_html: " Ако користите наше слике мапа, тражимо да заслуге садрже\n бар “© Доприносиоци\n Опенстритмапа, CC BY-SA”. Ако користите само податке мапа,\n наведите “Картографски подаци © Доприносиоци Опенстритмапа,\n CC BY-SA”." credit_2_html: " Где је могуће, Опенстритмап би требало да води до адресе http://www.openstreetmap.org/\n и CC BY-SA до http://creativecommons.org/licenses/by-sa/2.0/.\n Ако користите медијум у ком се везе не могу поставити\n (нпр. штампани рад), предлажемо да усмерите ваше\n читаоце на www.openstreetmap.org (по могућству\n проширавањем ‘Опенстритмапа’ на целу адресу)\n и на www.creativecommons.org." + credit_3_html: "Ради прегледније електронске мапе, приписивање би требало да се прикаже у углу мапе.\nНа пример:" credit_title_html: Како да именујете Опенстритмап infringement_title_html: Кршење ауторских права intro_1_html: " Опенстритмап чине слободни подаци који су објављени под\n лиценцом \n Кријејтив комонс Ауторство-Делити под истим условима 2.0 (CC BY-SA)." - intro_2_html: " Можете да умножавате, делите, преносите и прилагођавате\n наше мапе и податке, све док именујете Опенстритмап и њене\n уреднике. Ако желите да мењате и дограђујете наше податке,\n можете их делити само под истом лиценцом.\n Цео \n текст уговора објашњава вам ваша права и одговорности." - more_1_html: " Прочитајте више о коришћењу наших података на ЧПП." - more_2_html: " Подсећамо уреднике Опенстритмапа да никада не додају податке\n од било ког извора заштићеног ауторским правима (нпр.\n Гугл мапе или штампане мапе) без изричите дозволе\n носиоца ауторског права." + intro_2_html: " Можете да умножавате, делите, преносите и прилагођавате\n наше податке, све док именујете Опенстритмап и њене\n уреднике. Ако желите да мењате и дограђујете наше податке,\n можете их делити само под истом лиценцом.\n Цео \n текст уговора објашњава вам ваша права и одговорности." + intro_3_html: "Картографија у нашим пољима мапа и документацији\nнуди се под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0 (CC-BY-SA)." + more_1_html: "Више о употреби података и како да нас наводите можете пронаћи на Правним ЧПП." + more_2_html: "Иако Опенстритмап ради с отвореним подацима, не можемо\nпонудити бесплатан АПИ за мапе независним програмерима.\nПогледајте правила о употреби АПИ-ја,\nправила о употреби поља\nи Номинатим." more_title_html: Сазнајте више title_html: Ауторска права и лиценца native: @@ -1178,11 +1182,8 @@ sr: subject: "[OpenStreetMap] Потврдите вашу е-адресу" signup_confirm_html: ask_questions: Можете поставити било које питање о Опенстритмапу на нашим страницама за питања и одговоре. - click_the_link: Ако сте то ви, добро дошли! Кликните на везу испод да бисте потврдили ваш налог и прочитали више о Опенстритмапу current_user: Списак тренутних корисника у категоријама, заснован на томе где се они налазе, доступан је на Category:Users_by_geographical_region. get_reading: Прочитајте више о Опенстритмапу на викију, будите у току с најновијим вестима преко блога или Твитера или претражите OpenGeoData, блог оснивача Опенстритмапа за историју пројеката. Можете да слушате и подемисије! - greeting: Поздрав! - hopefully_you: Неко (вероватно ви) желео би да отвори налог на introductory_video: Можете погледати %{introductory_video_link}. more_videos: Постоји %{more_videos_link}. more_videos_here: више видео-снимака овде @@ -1192,19 +1193,11 @@ sr: signup_confirm_plain: ask_questions: "Можете поставити било које питање о Опенстритмапу на нашим страницама за питања и одговоре:" blog_and_twitter: "Будите у току с најновијим вестима преко блога или Твитера:" - click_the_link_1: Ако сте то ви, добро дошли! Кликните на везу испод да бисте потврдили свој - click_the_link_2: кориснички налог. Прочитајте више о Опенстритмапу. - current_user_1: Списак тренутних корисника у категоријама, на основу положаја у свету - current_user_2: "где живе, доступан је на:" - greeting: Поздрав! - hopefully_you: Неко (вероватно ви) желео би да отвори налог на introductory_video: "Погледајте уводни видео-снимак за Опенстритмап овде:" more_videos: "Више видео-снимака можете наћи овде:" opengeodata: "OpenGeoData.org је блог Стива Коста, оснивача Опенстритмапа:" the_wiki: "Прочитајте више о Опенстритмапу на викију:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Beginners'_guide?uselang=sr-ec - user_wiki_1: Препоручујемо вам да направите корисничку страницу која укључује - user_wiki_2: ознаке категорија које означавају одакле сте, као на пример [[Category:Users_in_London]]. wiki_signup: "Можете и отворити налог на нашем викију:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=sr-ec oauth: @@ -1324,6 +1317,8 @@ sr: index: js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили. js_2: Опенстритмап користи јаваскрипт за приказивање мапа. + license: + copyright: Ауторска права Опенстритмап и доприносиоци, под отвореном лиценцом permalink: Трајна веза remote_failed: Уређивање није успело. Проверите да ли је JOSM или Merkaartor учитан и да је могућност даљинског управљања омогућена shortlink: Кратка веза @@ -1539,6 +1534,9 @@ sr: email never displayed publicly: (никада се не приказује јавно) flash update success: Подаци о кориснику су успешно ажурирани. flash update success confirm needed: Подаци о кориснику су успешно ажурирани. Проверите е-пошту да бисте потврдили своју нову е-адресу. + gravatar: + gravatar: Користи Граватар + link text: шта је ово? home location: "Место становања:" image: "Слика:" image size hint: (квадратне слике од барем 100×100 пиксела раде најбоље) diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 3a8363640..33fb05b35 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -414,7 +414,7 @@ sv: area_to_export: Yta som ska exporteras embeddable_html: Inbäddad HTML export_button: Exportera - export_details: Data frÃ¥n OpenStreetMap har gjorts tillgänglig under licensen Creative Commons Erkännande-DelaLika 2.0. + export_details: Data frÃ¥n OpenStreetMap har gjorts tillgänglig under licensen Open Data Commons Open Database License (ODbL). format: "Format:" format_to_export: Format för export image_size: "Bildstorlek:" @@ -972,6 +972,7 @@ sv: history: Historik home: hem 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 @@ -982,7 +983,7 @@ sv: intro_2_html: Informationen är fri att %{download} och %{use} under dess %{license}. %{create_account} för att förbättra kartan. intro_2_license: Öppna licens intro_2_use: använda - intro_2_use_url: http://wiki.OpenStreetMap.org/wiki/Using_OpenStreetMap + intro_2_use_url: http://wiki.openstreetmap.org/wiki/Sv:Using_OpenStreetMap log_in: logga in log_in_tooltip: Logga in med ditt konto logo: @@ -1017,22 +1018,33 @@ sv: text: I händelse av en konflikt mellan denna översatta sida och %{english_original_link} har den engelska texten företräde title: Om denna översättning legal_babble: - contributors_at_html: "Austria: InnehÃ¥ller data frÃ¥n\n Stadt Wien under\n CC BY),\n Land Vorarlberg och\n Land Tirol (under CC-BY AT med ändringar)." + attribution_example: + alt: Exempel pÃ¥ hur en webbsida kan ange OpenStreetMap som källa + title: Exempel pÃ¥ källhänvisning. + contributors_at_html: "Österrike: InnehÃ¥ller data frÃ¥n\nStadt Wien (under licensen\nCC BY),\nLand Vorarlberg och\nLand Tirol (under licensen CC-BY AT med ändringar)." contributors_ca_html: "Kanada: InnehÃ¥ller data frÃ¥n\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), och StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: "För ytterligare detaljer om dessa och andra källor som använts\nför att förbättra OpenStreetMap, var god se sidan om bidragsgivare\npÃ¥ OpenStreetMaps Wiki." contributors_footer_2_html: " Införandet av uppgifter i OpenStreetMap innebär inte att den ursprungliga \n datagivaren stödjer OpenStreetMap, ger nÃ¥gon som helst garanti eller\n tar pÃ¥ sig nÃ¥got ansvar." contributors_fr_html: "Frankrike: InnehÃ¥ller data\n frÃ¥n Direction Générale des Impôts." - contributors_intro_html: " VÃ¥r CC BY-SA-licens kräver att du “ger den ursprungliga\n författaren ett erkännande skäligt nog för det medium eller det syfte du \n nyttjar det för\". Enskilda OSM-kartografer begär inte ett erkännande utöver “OpenStreetMaps\n bidragsgivare”, men där data frÃ¥n en nationell kartläggningsbyrÃ¥ eller annan viktig källa har inkluderats i\n OpenStreetMap kan det vara rimligt att kreditera dem genom att direkt\n lägga till deras erkännande eller genom att länka till det pÃ¥ den här sidan." + contributors_gb_html: "Storbritannien: InnehÃ¥ller Ordnance\nSurvey data © Crown copyright and database right\n2010-12." + contributors_intro_html: "VÃ¥ra bidragsgivare är tusentals individer. Vi inkluderar ocksÃ¥\nöppen data frÃ¥n nationella karttjänster,\nbland annat frÃ¥n:" contributors_nl_html: "Nederländerna: InnehÃ¥ller © AND data, 2007\n(www.and.com)" - contributors_nz_html: "Nya Zeeland: InnehÃ¥ller data frÃ¥n\n Land Information New Zealand. Crown äger upphovsrätten." + contributors_nz_html: "Nya Zeeland: InnehÃ¥ller data frÃ¥n\nLand Information New Zealand. Crown Copyright reserved." contributors_title_html: VÃ¥ra bidragsgivare - credit_1_html: " Om du använder OpenStreetMaps kartbilder begär vi att\n din hänvisning innehÃ¥ller minst “© OpenStreetMaps\n bidragsgivare, CC BY-SA”. Om du enbart använder kartdata\n begär vi “Kartdata © OpenStreetMaps bidragsgivare,\n CC BY-SA”." - credit_2_html: " Där sÃ¥ är möjligt, bör OpenStreetMap bli länkat till http://www.openstreetmap.org/\n och CC BY-SA till http://creativecommons.org/licenses/by-sa/2.0/. Om\n du använder ett medium där länkar inte är möjligt (exempelvis ett\n tryckt arbete), föreslÃ¥r vi att du hänvisar läsarna till\n www.openstreetmap.org (kanske genom att expandera\n ‘OpenStreetMap’ till dess fullständiga adress) och till\n www.creativecommons.org." - credit_title_html: Hur du hänvisar till OpenStreetMap - intro_1_html: " OpenStreetMap är öppen data, gjord tillgänglig under licensenCreative\n Commons Erkännande-DelaLika 2.0 (CC BY-SA)." - intro_2_html: " Du är fri att kopiera, distribuera, överföra och anpassa vÃ¥ra kartor\n och data, sÃ¥ länge du hänvisar till OpenStreetMap och dess\n bidragsgivare. Om du ändrar eller bygger pÃ¥ vÃ¥ra kartor eller data kan du\n distribuera resultatet endast under samma licens. Den\n fullständig juridiska\n texten förklarar dina rättigheter och skyldigheter." - more_1_html: " Läs mer om hur du använder vÃ¥r data pÃ¥ vÃ¥r juridiska\n FAQ." - more_2_html: " OSM bidragsgivare pÃ¥minns att aldrig att lägga till data frÃ¥n nÃ¥gra\n upphovsrättsskyddade källor (t.ex. Google Maps eller tryckta kartor) utan\n uttryckligt tillstÃ¥nd frÃ¥n upphovsrättsinnehavarna." - more_title_html: Hitta mer + contributors_za_html: "Sydafrika: InnehÃ¥ller data frÃ¥n\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: "Vi kräver att din källhänvisning bestÃ¥r av “© OpenStreetMaps\nbidragsgivare”." + credit_2_html: "Du mÃ¥ste ocksÃ¥ göra klart att datat är tillgängligt under licensen\nOpen Database License, och om du använder vÃ¥ra kartrutor, att kartografin är\ntillgängligt under licensen CC-BY-SA. Du kan göra detta genom att länka till\ndenna sida om upphovsrätt.\nAlternativt, och som krav om du distribuerar OSM i dataform, kan du namnge\noch länka direkt till licenserna. I media där länkar ej är möjliga\n(t.ex. tryckt material), förslÃ¥r vi att du hänvisar dina läsare till openstreetmap.org\n(förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org,\noch om relevant till creativecommons.org." + credit_3_html: "För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.\nTill exempel:" + credit_title_html: Hur du anger OpenStreetMap som källa + infringement_1_html: "Bidragsgivare till OSM pÃ¥minns om att aldrig lägga till data frÃ¥n\nupphovsrättsskyddade källor (t.ex. Google Maps och tryckta kartor) utan\nuttryckligt tillstÃ¥nd frÃ¥n upphovsrättsinnehavarna." + infringement_2_html: "Om du tror att upphovsrättsskyddat material felaktigt\nlagts in i OpenStreetMaps databas eller till denna webbsidan, var god se\nvÃ¥rt borttagningsförfarande\neller fyll direkt i vÃ¥rt online-formulär." + infringement_title_html: UpphovsrättsintrÃ¥ng + intro_1_html: "OpenStreetMap är öppen data, gjord tillgänglig under licensen Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Du är fri att kopiera, distribuera, överföra och anpassa vÃ¥r data,\nsÃ¥ länge du anger OpenStreetMap och dess bidragsgivare som källa.\nOm du ändrar eller bygger vidare pÃ¥ vÃ¥r data kan du\nendast distribuera resultatet under samma licens. Den\nfullständiga juridiska\ntexten förklarar dina rättigheter och skyldigheter." + intro_3_html: "Kartografin i vÃ¥ra kartrutor, och vÃ¥r dokumentation, är\ntillgängliga under licensen Creative\nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." + more_1_html: "Läs mer om användning av vÃ¥r data, och hur du anger oss som källa, pÃ¥ vÃ¥r juridisk\nFAQ." + more_2_html: "Även om OpenStreetMap är öppen data, kan vi inte tillhandahÃ¥lla nÃ¥got\ngratis kart-API för tredjepartsutvecklare.\nSe vÃ¥ran användningspolicy för API,\nanvändningspolicy för kartrutor\noch användningspolicy för Nominatim." + more_title_html: Mer information title_html: Upphovsrätt och licens native: mapping_link: börja kartlägga @@ -1162,14 +1174,15 @@ sv: header: "%{from_user} har skickat ett meddelande via OpenStreetMap med ämnet %{subject}:" hi: Hej %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Bekräfta din e-postadress" + confirm: "Innan vi gör nÃ¥got annat, mÃ¥ste vi bekräfta att denna begäran kom frÃ¥n dig. Om den gjorde det, var vänligen klicka pÃ¥ länken nedan för att bekräfta ditt konto:" + created: NÃ¥gon (förhoppningsvis du) skapade just ett konto pÃ¥ %{site_url}. + greeting: Hej där! + subject: "[OpenStreetMap] Välkommen till OpenStreetMap" + welcome: Vi välkomnar dig och vill ge dig ytterligare information om hur du kommer igÃ¥ng. signup_confirm_html: ask_questions: Du kan ställa vilken frÃ¥ga du vill om OpenStreetMap pÃ¥ vÃ¥r frÃ¥gor- och svarsida. - click_the_link: Om detta är du, Välkommen! Klicka pÃ¥ länken nedan för att bekräfta kontot och läsa vidare för mer information om OpenStreetMap current_user: En lista över nuvarande användare i kategorier, baserat pÃ¥ var i världen de är, finns pÃ¥ Category:Users_by_geographical_region. get_reading: Kom igÃ¥ng med OpenStreetMap pÃ¥ wikin, blir uppdaterad om de senaste nyheterna via OpenStreetMaps blogg eller Twitter, eller skumma genom OpenStreetMaps grundare Steve Coasts OpenGeoData blog för en kortfattad historisk genomgÃ¥ng, som ocksÃ¥ har en poddradio att lyssna pÃ¥! - greeting: Hej där! - hopefully_you: NÃ¥gon (förhoppningsvis du) vill skapa ett konto pÃ¥ introductory_video: Du kan titta pÃ¥ en %{introductory_video_link}. more_videos: Det finns %{more_videos_link}. more_videos_here: fler videoklipp här @@ -1179,18 +1192,12 @@ sv: signup_confirm_plain: ask_questions: "Du kan ställa valfria frÃ¥gor om OpenStreetMap pÃ¥ vÃ¥r frÃ¥gesida:" blog_and_twitter: "HÃ¥ll dig uppdaterad med de sensate nyheterna via OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Om detta är du, välkommen! Klicka pÃ¥ länken nedan för att bekräfta ditt - click_the_link_2: konto och läs vidare för mer information om OpenStreetMap. - current_user_1: En lista över aktuella användare i kategorier, baserat pÃ¥ var i världen - current_user_2: "de är, finns tillgänglig frÃ¥n:" - greeting: Hej där! - hopefully_you: NÃ¥gon (förhoppningsvis du) vill skapa ett konto pÃ¥ + current_user: "En lista över användare i kategorier, baserad pÃ¥ var i världen de befinner sig, är tillgänglig frÃ¥n:" introductory_video: "Du kan titta pÃ¥ en introduktionsvideo till OpenStreetMap här:" more_videos: "Det finns fler filmer här:" opengeodata: "OpenGeoData.org är OpenStreetMap-grundarens Steve Coasts blogg, och den har även podcasts:" the_wiki: "Läs mer om OpenStreetMap pÃ¥ wikin:" - user_wiki_1: Det rekommenderas att du skapar en användarsida pÃ¥ wikin som innehÃ¥ller - user_wiki_2: "kategorietiketter som visar var du befinner dig, t.ex. [[Category: Users_in_London]]." + user_wiki_page: Det rekommenderas att du skapar en användarsida pÃ¥ wikin innehÃ¥llandes kategori som visar var du är, till exempel [[Category:Users_in_Stockholm]]. wiki_signup: "Du kan ocksÃ¥ registrera dig pÃ¥ OpenStreetMap wikin pÃ¥:" oauth: oauthorize: @@ -1306,6 +1313,8 @@ sv: index: js_1: Du mÃ¥ste ha javascript pÃ¥slaget, alternativt en webbläsare som stödjer javascript. js_2: OpentStreetMap använder javascript för slippymapen + 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 shortlink: Kortlänk @@ -1431,6 +1440,7 @@ sv: visibility: "Synlighet:" visibility_help: vad betyder detta? list: + empty_html: Ingenting här ännu. Ladda upp ett nytt spÃ¥r eller lär dig om GPS-spÃ¥r pÃ¥ wikin. public_traces: Publika GPS-spÃ¥r public_traces_from: Publika GPS-spÃ¥r frÃ¥n %{user} tagged_with: " taggad med %{tags}" @@ -1516,6 +1526,9 @@ sv: email never displayed publicly: (Visas aldrig offentligt) flash update success: Användarinformation uppdaterades. flash update success confirm needed: Användarinformation uppdaterades. Kontrollera din e-post för att bekräfta din e-postadress. + gravatar: + gravatar: Använd Gravatar + link text: vad är detta? home location: "Hemposition:" image: "Bild:" image size hint: (kvadratiska bilder pÃ¥ minst 100x100 fungerar bäst) @@ -1651,6 +1664,7 @@ sv: email address: "E-postadress:" fill_form: Fyll i formuläret sÃ¥ skickar vi ett e-brev för att aktivera ditt konto. 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.

    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 bidragsgivarvillkoren . no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto Ã¥t dig automatiskt. diff --git a/config/locales/tl.yml b/config/locales/tl.yml index d5a63fbf1..501869e8a 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -1001,7 +1001,6 @@ tl: title: OpenStreetMap sign_up: magpatala sign_up_tooltip: Lumikha ng isang akawnt para sa pamamatnugot - sotm2012: Pumunta sa Pulong ng OpenStreetMap ng 2012, Ang Katayuan ng Mapa, ika-6 hanggang ika-8 ng Setyembre sa Tokyo! tag_line: Ang Malayang Mapa sa Daigdig ng Wiki user_diaries: Mga Talaarawan ng mga Tagagamit user_diaries_tooltip: Tingnan ang mga talaarawan ng tagagamit @@ -1172,11 +1171,8 @@ tl: subject: "[OpenStreetMap] Tiyakin ang iyong tirahan ng e-liham" signup_confirm_html: ask_questions: Maaari kang magtanong ng anumang mga katanungang mayroon ka hinggil sa OpenStreetMap doon sa aming pook ng katanungan at kasagutan. - click_the_link: Kung ikaw ito, maligayang pagdating! Mangyaring pindutin ang kawing na nasa ibaba upang tiyakin ang akawnt na iyan at magbasa pa para sa mas marami pang kabatiran hinggil sa OpenStreetMap current_user: Isang talaan ng pangkasalukuyang mga tagagamit sa loob ng mga kategorya, na nakabatay kung saan sa mundo sila naroroon, ang makukuha mula sa Kategorya:Mga_tagagamit_ayon_sa_rehiyong_pangheograpiya. get_reading: Kumuha ng mababasa tungkol sa OpenStreetMap doon sa wiki, humabol sa pinakahuling mga balita sa pamamagitan ng blog ng OpenStreetMap o Twitter, o tumingin-tingin sa kahabaan ng blog ng OpenGeoData ng tagapagtatag ng OpenStreetMap na si Steve Coast para sa nakatapayang kasaysayan ng proyekto, na mayroon ding mga podkast na mapakikinggan! - greeting: Kumusta ka diyan! - hopefully_you: May isang tao (ikaw sana) ang may nais na lumikha ng isang akawnt doon sa introductory_video: Maaari kang manood ng isang %{introductory_video_link}. more_videos: Mayroong mga %{more_videos_link}. more_videos_here: marami pang mga bidyo rito @@ -1186,19 +1182,11 @@ tl: signup_confirm_plain: ask_questions: "Maaari kang magtanong ng anumang mga katanungang mayroon ka hinggil sa OpenStreetMap doon sa aming lugar ng katanungan at kasagutan:" blog_and_twitter: "Humabol sa pinakahuling mga balita sa pamamagitan ng blog ng OpenStreetMap o Twitter:" - click_the_link_1: Kung ikaw ito, maligayang pagdating! Mangyaring pindutin ang kawing na nasa ibaba upang tiyakin ang iyong - click_the_link_2: akawnt at magbasa pa para sa mas marami pang kabatiran tungkol sa OpenStreetMap. - current_user_1: Isang talaan ng pangkasalukuyang mga tagagamit na nasa mga kategorya, na nakabatay sa kung saan sa mundo - current_user_2: "sila naroroon, ay makukuha magmula sa:" - greeting: Kumusta ka diyan! - hopefully_you: May isang tao (ikaw sana) ang may nais na lumikha ng isang akawnt doon sa introductory_video: "Maaari kang makapanood ng isang bidyo ng pagpapakilala sa OpenStreetMap dito:" more_videos: "May marami pang mga bidyo rito:" opengeodata: "Ang OpenGeoData.org ay ang blog ng tagapagtatag ng OpenStreetMap na si Steve Coast, at mayroon din itong mga podkast:" the_wiki: "Kumuha ng mababasa tungkol sa OpenStreetMap doon sa wiki:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide - user_wiki_1: Iminumungkahing lumikha ka ng isang pahina ng wiki ng tagagamit, na may kasamang - user_wiki_2: mga tatak ng kategorya na nagtatala kung nasaan ka, katulad ng [[Kategorya:Mga tagagamit_sa_Londres]]. wiki_signup: "Marahil ay nais mo ring magpatala sa wiki ng OpenStreetMap doon sa:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page oauth: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index a7b53dc83..b272fa78c 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -998,12 +998,10 @@ tr: signup_confirm: subject: "[OpenStreetMap] e-posta adresi onaylama mesajı" signup_confirm_html: - greeting: Merhaba! introductory_video: "%{introductory_video_link} seyretebilirsin." more_videos_here: daha fazla video video_to_openstreetmap: OpenStreetMap tanıtım filmi signup_confirm_plain: - greeting: Merhaba! more_videos: "Burada daha fazla video var:" oauth_clients: edit: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index ea914e9eb..e9bf6ba71 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -230,11 +230,11 @@ uk: heading: Перелік об’єктів history: type: - node: Вузол %{id} + node: Точка %{id} way: Лінія %{id} selected: type: - node: Вузол %{id} + node: Точка %{id} way: Лінія %{id} type: node: Точка @@ -268,7 +268,7 @@ uk: also_part_of: one: також є частиною лінії %{related_ways} other: також є частиною ліній %{related_ways} - nodes: "Вузли:" + nodes: "Точки:" part_of: "Частина з:" way_history: download_xml: Завантажити XML @@ -298,7 +298,7 @@ uk: description: Останні зміни description_bbox: Набір змін в межах %{bbox} description_friend: Набори змін ваших друзів - description_nearby: Набори змін близьких користувачів + description_nearby: Набори змін користувачів поряд з вами description_user: Набір змін користувача %{user} description_user_bbox: Набір змін користувача %{user} в межах %{bbox} empty_anon_html: Ще не було правок @@ -312,7 +312,7 @@ uk: title: Набір змін title_bbox: Набір змін в межах %{bbox} title_friend: Набори змін ваших друзів - title_nearby: Набори змін близьких користувачів + title_nearby: Набори змін користувачів поряд з вами title_user: Набір змін користувача %{user} title_user_bbox: Набір змін користувача %{user} в межах %{bbox} timeout: @@ -372,7 +372,7 @@ uk: recent_entries: "Останні записи:" title: Щоденник title_friends: Щоденники друзів - title_nearby: Щоденники близьких користувачів + title_nearby: Щоденники користувачів поряд з вами user_title: Щоденник користувача %{user} location: edit: Редагувати @@ -454,9 +454,9 @@ uk: south_west: на південний захід west: на захід distance: - one: близько 1 км - other: близько %{count} км - zero: менше ніж 1 км + one: менше ніж 1 км + other: майже %{count} км + zero: майже 1 км results: more_results: Більше результатів no_results: Нічого не знайдено @@ -998,7 +998,6 @@ uk: partners_ucl: UCL VR Centre sign_up: реєстрація sign_up_tooltip: Створити обліковий запис для редагування - sotm2012: Відвідайте конференцію OpenStreetMap 2012, «The State of the Map», яка відбудеться в Портленді (штат Орегон) 13-14 жовтня! tag_line: Вільна Вікі-мапа Світу user_diaries: Щоденники user_diaries_tooltip: Подивитись щоденники @@ -1015,6 +1014,9 @@ uk: text: У разі суперечностей між цим перекладом та %{english_original_link}, оригінал англійською має перевагу. title: Про цей переклад legal_babble: + attribution_example: + alt: Приклад того, як треба посилатись на OpenStreetMap на веб-сторінці + title: Приклад зазначення авторства contributors_at_html: "Австрія: дані від\n Stadt Wien (на умовах ліцензії\n CC BY), Land Vorarlberg та Земля Тіроль (на умовах CC-BY AT з виправленнями)." contributors_ca_html: "Канада: дані від GeoBase®, GeoGratis (© Департамент природних ресурсів Канади), CanVec (© Департамент природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство Канади)." contributors_footer_1_html: Щоб отримати більш докладну інформацію про ці та інші джерела, що були використані для покращення мапи OpenStreetMap, будь ласка, перегляньте сторінку Учасники у OpenStreetMap Вікі. @@ -1028,11 +1030,12 @@ uk: contributors_za_html: "Південна Африка: Містить дані з \n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved." credit_1_html: Ми вимагаємо, щоб ви зазначали “© OpenStreetMap contributors”. credit_2_html: Ви повинні також чітко розуміти, що дані доступні на умовах ліцензії Open Database License, а у разі, коли ви використовуєте графічні мапи з нашого сервера, на них розповсюджуються умови CC-BY-SA. Ви можете зробити це надавши посилання на цю сторінку з роз’ясненням ліцензійних вимог. Або ж, для виконання наших вимог під час розповсюдження даних OSM, ви можете безпосередньо вказувати назву ліцензії(й) та посилання на її(їх) текст. Якщо ви користуєтесь носіями, де використання гіпертекстових посилань неможливе (наприклад друковані матеріали), ми пропонуємо посилатися безпосередньо на www.openstreetmap.org (або розширено "www.openstreetmap.org, OpenStreetMap"), opendatacommons.org, а якщо треба, і на creativecommons.org. + credit_3_html: "Для електронних мап, згадка про джерело даних повинна знаходитись у кутку мапи.\nНаприклад:" credit_title_html: Як вказати посилання на OpenStreetMap infringement_1_html: Члени спільноти OSM повинні завжди пам’ятати про те, що забороняється додавати дані з будь-яких захищених авторським правом джерел (наприклад, з Google Maps чи з друкованих мап) без отримання попереднього дозволу правовласників. infringement_2_html: Якщо ви вважаєте, що захищений авторським правом матеріал був недоречно доданий до бази даних OpenStreetMap або до цього сайту, ознайомтесь із нашим порядком з вилучення таких даних або скористуйтесь безпосередньо нашою сторінкою для онлайн звернень. infringement_title_html: Порушення авторських прав - intro_1_html: " Дані OpenStreetMap є відкрити даними, що ліцензуються на\n умовах Ліцензії Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA)." + intro_1_html: " Дані OpenStreetMap є відкрити даними, що ліцензуються на\n умовах Ліцензії Open Data Commons Open Database License (ODbL)" intro_2_html: Ви можете вільно копіювати, поширювати, передавати й змінювати наші дані, посилаючись при цьому на OpenStreetMap та його спільноту. Якщо ви змінюєте наші дані чи створюєте на їх основі свої, ви повинні розповсюджувати результати під такою ж Ліцензією. Повний чинний текст Ліцензії пояснює ваші права та обов’язки. intro_3_html: "Мапи в графічному вигляді, а також документація розповсюджуються на умовах Ліцензії Creative \nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." more_1_html: Дізнайтеся більше про використання наших даних та про те, як вказувати нас як джерело походження даних у відповідях з правових питань. @@ -1170,11 +1173,8 @@ uk: subject: "[OpenStreetMap] Підтвердіть вашу адресу електронної пошти" signup_confirm_html: ask_questions: Ви можете задати питання про OpenStreetMap на нашому сайті питань і відповідей. - click_the_link: Якщо це Ви, ласкаво просимо! Будь ласка, клацніть на посилання нижче, щоб підтвердити цей обліковий запис і ознайомтеся з додатковою інформацією про OpenStreetMap current_user: "Перелік користувачів, за їх місцем знаходження, можна отримати тут: Category:Users_by_geographical_region." get_reading: Прочитайте про OpenStreetMap у Вікі, дізнайтесь про останні новини у Блозі OpenStreetMap або Twitter, чи перегляньте OpenGeoData blog — блог засновника OpenStreetMap Стіва Коуста (Steve Coast) у якому змальовано історію розвитку проекту та є підкасти, які також можливо послухати! - greeting: Привіт! - hopefully_you: Хтось (сподіваємось, ви) бажає створити обліковий запис на introductory_video: Ви можете переглянути %{introductory_video_link}. more_videos: Перегляньте %{more_videos_link}. more_videos_here: більше відео тут @@ -1184,19 +1184,11 @@ uk: signup_confirm_plain: ask_questions: "Ви можете задати питання про OpenStreetMap на нашому сайті питань та і відповідей:" blog_and_twitter: "Ознайомитися з останніми новинами через блог OpenStreetMap або Twitter:" - click_the_link_1: Якщо це ві, ласкаво просимо! Будь ласка, клацніть на посилання нижче, щоб підтвердити - click_the_link_2: реєстрацію та прочитати більше про OpenStreetMap. - current_user_1: Список користувачів, заснований на їх місці знаходження, - current_user_2: "доступний тут:" - greeting: Привіт! - hopefully_you: Хтось (сподіваємось, що ви) бажає створити обліковий запис на 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_1: Ми рекомендуємо вам створити сторінку користувача Віки, яка містить - user_wiki_2: теґи категорій, які пояснюють ваше місце знаходження, наприклад, [[Category:Users_in_Дніпропетровськ]]. wiki_signup: "Ви також можете зареєструватися в вікі OpenStreetMap тут:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Uk:Main_Page oauth: @@ -1578,7 +1570,7 @@ uk: success: Адресу вашої електронної пошти підтверджено, дякуємо за реєстрацію! confirm_resend: failure: Користувача %{name} не знайдено. - success: Користувача успішно зареєстровано. Перевірте вашу електрону пошту (%{email}) на наявність листа з підтвердженням, натисніть на посилання в ньому та можете негайно починати редагувати мапу :-).

    Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти.

    Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити. + success: Користувача успішно зареєстровано. Перевірте вашу електрону пошту (%{email}) на наявність листа з підтвердженням, натисніть на посилання в ньому та можете негайно починати створювати мапу.

    Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти.

    Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити. filter: not_an_administrator: Тільки адміністратор може виконати цю дію. go_public: @@ -1795,20 +1787,20 @@ uk: try_waiting: Будь ласка, спробуйте дати користувачеві розумний період часу, перед тим як блокувати його. edit: back: Переглянути всі блокування - heading: Правити блокування для %{name} + heading: Редагування блокування для %{name} needs_view: Дозволити користувачу входити в систему, перш, ніж блокування буде знято? period: Як довго, починаючи з поточного моменту, користувач буде заблокований від API. reason: Причина з якої користувача %{name} було заблоковано. Будь ласка, будьте терпимі і дійте розумно, надаючи користувачеві, як можна більше інформації про ситуацію. Майте на увазі, що не всі користувачі розуміють жаргон спільноти, тому, будь ласка, спробуйте використовувати прості пояснення. show: Переглянути блокування submit: Оновити блокування - title: Правити блокування для %{name} + title: Редагування блокування для %{name} filter: block_expired: Блокування вже закінчилось і не може бути змінено. block_period: Період блокування повинен бути одним із значень з списку, що розкривається. helper: time_future: Закінчується в %{time}. time_past: Закінчилось %{time} тому. - until_login: Активне до тих пір, доки користувача не увійде до системи. + until_login: Активне до тих пір, доки користувач не увійде в систему. index: empty: Ще не накладено жодного блокування. heading: Перелік блокувань користувача @@ -1875,7 +1867,7 @@ uk: user_role: filter: already_has_role: Користувач вже має роль — %{role}. - doesnt_have_role: Користувач не маж ролі %{role}. + doesnt_have_role: Користувач не має ролі %{role}. not_a_role: Рядок «%{role}» не є припустимою роллю. not_an_administrator: Тільки адміністратори можуть керувати ролями користувачів, а ви не є адміністратором. grant: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 8e422c6ab..52ed6ce21 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -985,9 +985,8 @@ vi: partners_partners: các công ty bảo trợ partners_ucl: Trung tâm VR tại UCL partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=vi - sign_up: đăng ký + sign_up: mở tài khoản sign_up_tooltip: Mở tài khoản để sửa đổi - sotm2012: Mời tham dự Hội nghị OpenStreetMap Hoa Kỳ 2012, Tình trạng Bản đồ Mỹ, 13–14 tháng 10 tại Portland, Oregon! tag_line: Bản đồ Thế giới trên Wiki Mở user_diaries: Nhật ký Cá nhân user_diaries_tooltip: Đọc các nhật ký cá nhân @@ -1004,6 +1003,9 @@ vi: text: Trong trường hợp có xung đột giữa trang dịch và trang %{english_original_link}, trang tiếng Anh sẽ được ưu tiên title: Thông tin về bản dịch này legal_babble: + attribution_example: + alt: Ví dụ ghi công OpenStreetMap trên một trang Web + title: Ví dụ ghi công contributors_at_html: "Áo: Bao gồm dữ liệu từ Bang Viên (theo CC BY), Bang Vorarlberg, và Bang Tyrol (theo bản sửa đổi CC BY Áo)." contributors_ca_html: "Canada: Bao gồm dữ liệu từ GeoBase®, GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở Địa lý, Statistics Canada)." contributors_footer_1_html: "Xem thêm chi tiết và các nguồn gốc khác dùng để cải tiến OpenStreetMap tại trang Người đóng góp trên OpenStreetMap Wiki." @@ -1017,6 +1019,7 @@ vi: contributors_za_html: "Nam Phi: Bao gồm dữ liệu từ Tổng cục: Thông tin Không gian địa lý Quốc gia, bản quyền nhà nước được bảo lưu." credit_1_html: Chúng tôi bắt bạn phải sử dụng lời ghi công “© những người đóng góp vào OpenStreetMap”. credit_2_html: Bạn cũng phải giải thích rõ rằng dữ liệu được phát hành theo Giấy phép Cơ sở dữ liệu Mở, và, nếu bạn đang sử dung các hình ảnh bản đồ của chúng tôi, rằng các hình ảnh này được phát hành theo giấy phép CC BY-SA. Bạn có thể thỏa mãn điều này bằng cách đặt liên kết đến trang bản quyền này. Nếu bạn đang phân phối nguyên dữ liệu của OSM hoặc không muốn đặt liên kết đến trang bản quyền của OSM, bạn có thể nói đến và đặt liên kết trực tiếp đến (các) giấy phép. Nếu bạn đang sử dụng phương tiện không cho phép đặt liên kết, chẳng hạn trong tác phẩm in giấy, chúng tôi gợi ý chỉ các độc giả đến openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap” trở thành địa chỉ đầy đủ này), đến opendatacommons.org, và nếu hợp lý, đến creativecommons.org. + credit_3_html: "Đối với một bản đồ điện tử tương tác, lời ghi công nên xuất hiện ở góc bản đồ.\nVí dụ:" credit_title_html: Cách ghi công OpenStreetMap 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 quá trình takedown hoặc nộp đơn trực tiếp tại trang khiếu nại trực tuyến của chúng tôi. @@ -1151,14 +1154,15 @@ vi: header: "%{from_user} đã gửi thư cho bạn dùng OpenStreetMap có tiêu đề %{subject}:" hi: Chào %{to_user}, signup_confirm: - subject: "[OpenStreetMap] Xác nhận địa chỉ thư điện tử của bạn" + confirm: "Trước tiên, chúng tôi cần xác nhận bạn là người mở tài khoản này. Nếu phải, xin vui lòng sử dụng liên kết ở dưới để xác nhận tài khoản mới của bạn:" + created: Ai đó (có lẽ là bạn) vừa mở tài khoản tại %{site_url}. + greeting: Chào bạn! + subject: "[OpenStreetMap] Chào mừng bạn đã tham gia OpenStreetMap" + welcome: Chúng tôi xin chào mừng bạn. Thư này có một số thông tin về cách bắt đầu. signup_confirm_html: ask_questions: Có thể đặt bất kỳ câu hỏi mà bạn có về OpenStreetMap tại trang hỏi đáp. - click_the_link: Nếu bạn là người đó, hoan nghênh! Xin hãy nhấn chuột vào liên kết ở dưới để xác nhân tài khoản đó và đọc tiếp để tìm hiểu thêm về OpenStreetMap. current_user: Có danh sách các người dùng, xếp thể loại theo nơi ở, tại Category:Users by geographical region. get_reading: Bắt đầu tìm hiểu về OpenStreetMap tại wiki, theo dõi tin tức gần đây tại blog OpenGeoData hay Twitter, hoặc đọc blog và nghe podcast của nhà sáng lập Steve Coast! - greeting: Chào bạn! - hopefully_you: Ai (chắc bạn) muốn mở tài khoản bên introductory_video: Bạn có thể coi %{introductory_video_link}. more_videos: Cũng có %{more_videos_link}. more_videos_here: thêm video tại đây @@ -1168,19 +1172,13 @@ vi: signup_confirm_plain: ask_questions: "Có thể đặt bất kỳ câu hỏi mà bạn có về OpenStreetMap tại trang hỏi đáp:" blog_and_twitter: "Theo dõi tin tức gần đây tại blog OpenStreetMap và Twitter:" - click_the_link_1: Nếu bạn là người đó, hoan nghênh! Xin hãy nhấn chuột vào liên kết ở dưới để - click_the_link_2: xác nhận tài khoản của bạn và đọc tiếp để tìm hiểu thêm về OpenStreetMap. - current_user_1: Có danh sách các người dùng, xếp thể loại theo nơi ở, - current_user_2: "tại:" - greeting: Chào bạn! - hopefully_you: Ai (chắc bạn) muốn mở tài khoản bên + current_user: "Có danh sách những người dùng được xếp theo nơi ở tại:" introductory_video: "Bạn có thể coi video giới thiệu OpenStreetMap tại đây:" more_videos: "Có thêm video tại đây:" opengeodata: "OpenGeoData.org là blog của nhà sáng lập OpenStreetMap, Steve Coast, cũng chứa podcast:" the_wiki: "Bắt đầu tìm hiểu về OpenStreetMap trên wiki:" the_wiki_url: http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_Guide?uselang=vi - user_wiki_1: Bạn nên tạo ra trang cá nhân trên wiki và gắn các thẻ thể loại để cho - user_wiki_2: người ta biết bạn ở đâu, thí dụ như [[Category:Users in Hanoi]]. + user_wiki_page: Bạn nên tạo ra trang cá nhân trên wiki và gắn các thẻ thể loại để cho người ta biết bạn ở đâu, thí dụ như [[Category:Users in Hanoi]]. wiki_signup: "Có lẽ bạn cũng muốn mở tài khoản ở wiki OpenStreetMap tại:" wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Vi:Main_Page&uselang=vi oauth: @@ -1222,7 +1220,7 @@ vi: list_tokens: "Các dấu ở dưới được gửi cho chương trình dùng tên của bạn:" my_apps: Trình khách của Tôi my_tokens: Chương trình Tôi Cho phép - no_apps: Bạn có muốn đăng ky chương trình của bạn với chúng tôi dùng tiêu chuẩn %{oauth}? Bạn cần phải đăng ký chương trình Web trước khi gửi yêu cầu OAuth được. + no_apps: Bạn có muốn đăng ký chương trình của bạn với chúng tôi dùng tiêu chuẩn %{oauth}? Bạn cần phải đăng ký chương trình Web trước khi gửi yêu cầu OAuth được. register_new: Đăng ký chương trình của bạn registered_apps: "Các trình khá ở dưới đã được đăng ký:" revoke: Thu hồi! @@ -1514,6 +1512,9 @@ vi: email never displayed publicly: (không lúc nào hiện công khai) flash update success: Đã cập nhật thông tin cá nhân thành công. flash update success confirm needed: Đã cập nhật thông tin cá nhân thành công. Kiểm tra thư điện tử xác nhận địa chỉ thư điện tử mới. + gravatar: + gravatar: Sử dụng Gravatar + link text: đây là gì? home location: "Vị trí Nhà:" image: "Hình:" image size hint: (hình vuông ít nhất 100×100 điểm ảnh là tốt nhất) @@ -1554,14 +1555,14 @@ vi: heading: Xác nhận tài khoản người dùng press confirm button: Bấm nút Xác nhận ở dưới để xác nhận tài khoản. reconfirm: Nếu mở tài khoản lâu rồi có thể cần gửi mình một thư xác nhận mới. - success: Đã xác nhận tài khoản của bạn. Cám ơn bạn đã đăng ký! + success: Đã xác nhận tài khoản của bạn. Cám ơn bạn đã mở tài khoản! unknown token: Hình như dấu hiệu đó không tồn tại. confirm_email: button: Xác nhận failure: Một địa chỉ thư điện tử đã được xác nhận dùng dấu hiệu này. heading: Xác nhận thay đổi địa chỉ thư điện tử press confirm button: Bấm nút Xác nhận ở dưới để xác nhận địa chỉ thư điện tử mới. - success: Đã xác nhận địa chỉ thư điện tử mới. Cám ơn bạn đã đăng ký! + success: Đã xác nhận địa chỉ thư điện tử mới. Cám ơn bạn đã mở tài khoản! confirm_resend: failure: Không tìm thấy người dùng %{name}. success: Chúng tôi đã gửi thư xác nhận đến %{email}; ngay khi xác nhận tài khoản, bạn sẽ có thể vẽ bản đồ.

    Nếu hộp thư của bạn gửi thư yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này. @@ -1585,7 +1586,7 @@ vi: account not active: Rất tiếc, tài khoản của bạn chưa được kích hoạt.
    Xin hãy nhấn chuột vào liên kết trong thư điện tử xác nhận tài khoản để kích hoạt tài khoản, hoặc yêu cầu thư xác nhận mới. auth failure: Rất tiếc, không thể đăng nhập với những chi tiết đó. create account minute: Chỉ mất một phút để mở tài khoản mới. - email or username: "Địa chỉ Thư điện tử hoặc Tên đăng ký:" + email or username: "Địa chỉ Thư điện tử hoặc Tên người dùng:" heading: Đăng nhập login_button: Đăng nhập lost password link: Quên mất Mật khẩu? @@ -1615,7 +1616,7 @@ vi: alt: Đăng nhập với OpenID của Yahoo! title: Đăng nhập với Yahoo! password: "Mật khẩu:" - register now: Đăng ký ngay + register now: Mở tài khoản ngay remember: Nhớ tôi title: Đăng nhập to make changes: Bạn phải có tài khoản để thay đổi dữ liệu OpenStreetMap. @@ -1628,7 +1629,7 @@ vi: lost_password: email address: "Địa chỉ Thư điện tử:" heading: Quên mất Mật khẩu? - help_text: Điền vào địa chỉ thư điện tử của bạn khi đăng ký, rồi chúng tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu. + help_text: Nhập địa chỉ thư điện tử mà bạn đã dùng để mở tài khoản, rồi chúng tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu. new password button: Đặt lại mật khẩu notice email cannot find: Rất tiếc, không tìm thấy địa chỉ thư điện tử. notice email on way: Đáng tiếc là bạn quên nó. :-( May là thư điện tử sắp tới để bạn đặt nó lại. @@ -1645,10 +1646,11 @@ vi: contact_webmaster: Xin hãy liên lạc với webmaster để xin họ tạo ra tài khoản - chúng tôi sẽ cố gắng thỏa mãn yêu cầu nhanh lẹ. continue: Tiếp tục display name: "Tên hiển thị:" - display name description: Tên đăng ký của bạn được hiển thị công khai. Bạn có thể thay đổi tên này về sau trong tùy chọn. + display name description: Tên người dùng của bạn được hiển thị công khai. Bạn có thể thay đổi tên này về sau trong tùy chọn. email address: "Địa chỉ Thư điện tử:" fill_form: Điền biểu mẫu rồi chúng tôi sẽ gửi thư điện tử cho bạn để kích hoạt tài khoản. - flash create success message: Cám ơn bạn đã đăng ký. Chúng tôi đã gửi thư xác nhận đến %{email}; ngay khi xác nhận tài khoản, bạn sẽ có thể vẽ bản đồ.

    Nếu hộp thư của bạn gửi thư yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này. + flash create success message: Cám ơn bạn đã mở tài khoản. Chúng tôi đã gửi thư xác nhận đến %{email}; ngay khi xác nhận tài khoản, bạn sẽ có thể vẽ bản đồ.

    Nếu hộp thư của bạn gửi thư yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này. + flash welcome: Cám ơn bạn đã mở tài khoản. Chúng tôi đã gửi thư chào mừng cho %{email} có một số gợi ý về cách bắt đầu. 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 các Điều kiện Đóng góp. 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. diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index f784fd8b4..1a0ab0a07 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Anakmalaysia +# Author: Dimension # Author: Hydra # Author: Liangent # Author: Mmyangfl @@ -745,6 +746,7 @@ zh-CN: wood: 林 office: accountant: 会计事务所 + architect: 设计院 company: 公司 employment_agency: 职业中介 estate_agent: 房产中介 @@ -774,7 +776,7 @@ zh-CN: region: 区 sea: 海 state: 国家 - subdivision: 细分 + subdivision: 次级 suburb: 郊区 town: 镇 unincorporated_area: 团的区 @@ -1009,6 +1011,8 @@ zh-CN: title: 关于这个翻译 legal_babble: contributors_title_html: 我们的贡献者 + infringement_1_html: "OSM 的贡献者会被提醒，在没有\n版权持有人的明确许可下，绝不添加任何受版权保护的数据\n（例如：谷歌地图，或印刷地图）。" + infringement_title_html: 侵权问题 intro_1_html: " OpenStreetMap 是开放数据的，采用知识\n 共享 署名-相同方式共享 2.0协议(CC BY-SA)授权。" intro_2_html: " 您可以自由地复制、发行、传播和创作演绎我们的地图\n 和数据，只要您信任 OpenStreetMap 和它的\n 贡献者。如果您改变、转换或者以我们的地图或数据为基础进行创作，您\n 只能采用与本协议相同的许可协议发布您的作品。完整\n 的法律\n 文本阐明了您的权利和义务。" more_1_html: " 阅读更多关于使用我们数据的 常见\n 法律问题。" @@ -1138,14 +1142,15 @@ zh-CN: hi: "%{to_user} 您好，" subject_header: "[OpenStreetMap] %{subject}" signup_confirm: - subject: "[OpenStreetMap] 确认您的电子邮件地址" + confirm: 在开始之前，我们需要确认这个请求来自于您。如果确实这样，那么请点击以下链接以确认您的帐户： + created: 某人(希望是您)刚在 %{site_url} 创建了一个帐户。 + greeting: 您好！ + subject: "[OpenStreetMap] 欢迎加入 OpenStreetMap" + welcome: 我们欢迎您，并提供一些额外的信息，帮助您开始使用。 signup_confirm_html: ask_questions: 您可以在我们的问答站点问关于 OpenStreetMap 的任何问题。 - click_the_link: 如果这是您，欢迎您！请点击下面的链接来确认帐户，并阅读更多关于 OpenStreetMap 的信息 - current_user: 一个基于其所处位置的，当前用户分类列表可从这里获得Category：Users_by_geographical_region. + current_user: 一个基于其所处位置的，当前用户分类列表可从这里获得：Category:Users_by_geographical_region. get_reading: 在维基中阅读更多关于 OpenStreetMap 的资料或通过 OpenStreetMap 博客及 Twitter 了解最新的消息，或者浏览 OpenStreetMap 创始人 Steve Coast 的 OpenGeoData 博客了解这个计划的历史，其中也有播客可以听！ - greeting: 您好！ - hopefully_you: 某人(希望是您)想要建立一个账户 introductory_video: 您可以观看一部%{introductory_video_link}。 more_videos: 这里有%{more_videos_link}。 more_videos_here: 更多的影片 @@ -1155,19 +1160,13 @@ zh-CN: signup_confirm_plain: ask_questions: 您可以在我们的问答站点问关于 OpenStreetMap 的任何问题： blog_and_twitter: 通过 OpenStreetMap 的博客或 Twitter 以了解最新消息： - click_the_link_1: 如果这是您，欢迎您！请点击下面的链接来确认您的 - click_the_link_2: 帐户，并阅读更多 OpenStreetMap 的信息。 - current_user_1: 一个基于所在位置分类的当前用户列表 - current_user_2: 在此： - greeting: 您好！ - hopefully_you: 某人(希望是您)希望创建一个账号 + current_user: 一个基于其所处位置的，当前用户分类列表可从这里获得： introductory_video: 您可以在这里观看 OpenStreetMap 的介绍视频： more_videos: 更多的视频请看这里： opengeodata: OpenGeoData.org 是 OpenStreetMap 创始人 Steve Coast 的博客，在上面也有播客： the_wiki: 在维基上阅读 OpenStreetMap 的介绍： the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide - user_wiki_1: 推荐您创建一个维基的用户页，它包括 - user_wiki_2: 分类标签以表明您的位置，例如 [[Category:Users_in_London]]。 + 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=Main_Page oauth: @@ -1229,6 +1228,7 @@ zh-CN: allow_write_prefs: 修改他们的用户首选项。 authorize_url: 授权 URL： confirm: 您确定吗？ + delete: 删除客户端 edit: 编辑详细信息 key: 用户键： requests: 要向用户要求下列权限： @@ -1239,8 +1239,6 @@ zh-CN: update: flash: 更新客户端信息成功 printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" with_version: "%{id}，版本 %{version}" redaction: edit: @@ -1256,7 +1254,6 @@ zh-CN: site: edit: anon_edits: (%{link}) - anon_edits_link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits anon_edits_link_text: 了解为什么这很重要。 flash_player_required: 您需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。您可以从 Adobe.com 下载 Flash Player。其他几种选择也可以用来编辑 OpenStreetMap。 no_iframe_support: 您的浏览器不支持 HTML 嵌入式框架，这是此功能所需要的。 @@ -1270,8 +1267,7 @@ zh-CN: js_1: 您或许正在使用不支持 JavaScript 的浏览器，或许您禁用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。 license: - license_url: http://creativecommons.org/licenses/by-sa/2.0/ - project_url: http://openstreetmap.org + copyright: 版权 OpenStreetMap 及其贡献者，在开放许可协议下授权 permalink: 固定链接 remote_failed: 编辑失败 - 请确保已加载 JOSM 或 Merkaartor 并启用了远程控制 shortlink: 短链接 @@ -1444,6 +1440,8 @@ zh-CN: trace_optionals: tags: 标签 trace_paging_nav: + newer: 较新轨迹 + older: 较旧轨迹 showing_page: 显示第 %{page} 页 view: delete_track: 删除这条轨迹 @@ -1484,6 +1482,9 @@ zh-CN: email never displayed publicly: (从不公开显示) flash update success: 成功更新用户信息。 flash update success confirm needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。 + gravatar: + gravatar: 使用 Gravatar + link text: 这是什么？ home location: 所在位置： image: 图像： image size hint: (方形图片的大小至少为 100x100 时效果最好) @@ -1619,6 +1620,7 @@ zh-CN: email address: 邮箱： fill_form: 填写表格，我们将尽快向您发送一封邮件来激活您的帐户。 flash create success message: 感谢您的注册。我们已经寄出确认邮件到 %{email}，只要您确认您的帐户后就可以制作地图了。

    如果您使用会送出确认要求的防垃圾信系统，请确定您将 webmaster@openstreetmap.org 加入白名单中，因为我们无法回复任何确认请求。 + flash welcome: 感谢您的注册。我们已经寄出确认邮件到 %{email}，并附有一些使用提示。 heading: 创建用户帐户 license_agreement: 当您确认您的帐户时，您需要同意贡献者条款。 no_auto_account_create: 很遗憾，我们目前无法为您自动创建一个帐户。 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index b17d4ee8a..ae3994d47 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -630,7 +630,6 @@ zh-TW: partners_ucl: 倫敦大學學院 VR 中心 sign_up: 註冊 sign_up_tooltip: 建立一個帳號以便能編輯 - sotm2012: 歡迎參加九月六日至八日在東京舉辦的 2012 OpenStreetMap 會議，The State of the Map！ tag_line: 自由的 Wiki 世界地圖 user_diaries: 日記 user_diaries_tooltip: 檢視日記 @@ -769,11 +768,8 @@ zh-TW: signup_confirm: subject: "[OpenStreetMap] 確認您的電子郵件" signup_confirm_html: - click_the_link: 如果這是您，歡迎！請按下列連結來確認您的帳號並了解更多 OpenStreetMap 的資訊。 current_user: 一份目前使用者的清單，以他們在世界上何處為基礎的分類，可在這裡取得：Category:Users_by_geographical_region。 get_reading: 在 wiki 中閱讀更多關於 OpenStreetMap 的資料或透過 OpenStreetMap 部落格及 Twitter 了解最新的消息。或是瀏覽 OpenStreetMap 創始人 Steve Coast 的 OpenGeoData blog 了解這個計畫的歷史，其中也有 podcasts 可以聽！ - greeting: 您好！ - hopefully_you: 有人 (希望是您) 想要建立一個新帳號到 introductory_video: 您可以在 %{introductory_video_link}。 more_videos: 這裡還有更多 %{more_videos_link}。 more_videos_here: 影片 @@ -782,18 +778,10 @@ zh-TW: wiki_signup: 您可能也想在 OpenStreetMap wiki 註冊。 signup_confirm_plain: blog_and_twitter: 透過 OpenStreetMap部落格或 Twitter 了解最新消息： - click_the_link_1: 如果這是您，歡迎！請按下列連結來確認您的 - click_the_link_2: 帳號並了解更多 OpenStreetMap 的資訊。 - current_user_1: 一份目前使用者的清單，以他們在世界上何處為基礎 - current_user_2: 的分類，可在這裡取得： - greeting: 您好！ - hopefully_you: 有人 (希望是您) 想要建立一個新帳號到 introductory_video: 您可以在這裡觀看 OpenStreetMap 的導覽影片： more_videos: 這裡還有更多影片： opengeodata: OpenGeoData.org 是 OpenStreetMap 的創始人 Steve Coast 的部落格，它也有 podcasts： the_wiki: 在 wiki 中閱讀更多 OpenStreetMap 訊息： - user_wiki_1: 建議您建立一個使用者 wiki 頁面，其中包含 - user_wiki_2: 註記您住哪裡的分類標籤，如 [[Category:Users_in_London]]。 wiki_signup: 您可能也想在 OpenStreetMap wiki 註冊： oauth: oauthorize: diff --git a/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb new file mode 100644 index 000000000..e430d5b3c --- /dev/null +++ b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb @@ -0,0 +1,14 @@ +class AddImageUseGravatarToUsers < ActiveRecord::Migration + def self.up + add_column :users, :image_use_gravatar, :boolean, :null => false, :default => false + + # For people who don't have images on osm.org, enable Gravatar. + User.where(:image_file_name => nil).update_all(:image_use_gravatar => true) + + change_column_default :users, :image_use_gravatar, true + end + + def self.down + remove_column :users, :image_use_gravatar + end +end diff --git a/db/structure.sql b/db/structure.sql index 102a95cf2..84c38c86e 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1103,7 +1103,8 @@ CREATE TABLE users ( image_fingerprint character varying(255), changesets_count integer DEFAULT 0 NOT NULL, traces_count integer DEFAULT 0 NOT NULL, - diary_entries_count integer DEFAULT 0 NOT NULL + diary_entries_count integer DEFAULT 0 NOT NULL, + image_use_gravatar boolean DEFAULT true NOT NULL ); @@ -2444,6 +2445,8 @@ INSERT INTO schema_migrations (version) VALUES ('20120808231205'); INSERT INTO schema_migrations (version) VALUES ('20121005195010'); +INSERT INTO schema_migrations (version) VALUES ('20121012044047'); + INSERT INTO schema_migrations (version) VALUES ('21'); INSERT INTO schema_migrations (version) VALUES ('22'); diff --git a/lib/potlatch.rb b/lib/potlatch.rb index 919eb0122..359492fa7 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -106,7 +106,8 @@ module Potlatch end # Encode string with two-byte length - def self.encodestring(n) + def self.encodestring(n) + n=n.dup.force_encoding("ASCII-8BIT") if n.respond_to?("force_encoding") a,b=n.size.divmod(256) a.chr+b.chr+n end diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb index 86d5e4537..5b95dfca9 100644 --- a/lib/potlatch2.rb +++ b/lib/potlatch2.rb @@ -2,7 +2,8 @@ module Potlatch2 LOCALES = { "ar" => "ar", "ast" => "ast", - "be" => "be-tarask", + "be" => "be", + "be-Tarask" => "be-tarask", "br" => "br", "ca" => "ca", "cs" => "cs_CZ", diff --git a/public/robots.txt b/public/robots.txt index c0e70dfd8..e4dc2e0d2 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -2,6 +2,7 @@ Sitemap: http://www.openstreetmap.org/sitemap.xml.gz User-agent: * Disallow: /user/ +Disallow: /user_blocks/ Disallow: /traces/tag/ Disallow: /traces/page/ Disallow: /api/ diff --git a/script/statistics b/script/statistics index 4ceb92cfc..c201f6c57 100755 --- a/script/statistics +++ b/script/statistics @@ -1,7 +1,6 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/environment' -require 'generator' start_time = Time.now @@ -79,7 +78,7 @@ begin :joins => :changeset, :group => :user_id, :order => "count_all DESC", :limit => 60) - SyncEnumerator.new(day_users, week_users, month_users).each do |row| + day_users.zip(week_users, month_users).each do |row| puts "" row.each do |column| if column.nil? diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 606924b35..17642b149 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -216,7 +216,13 @@ class UserControllerTest < ActionController::TestCase display_name = "new_tester" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size') do - post :save, {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => new_email, :email_confirmation => new_email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end @@ -237,7 +243,13 @@ class UserControllerTest < ActionController::TestCase display_name = "new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success @@ -251,7 +263,13 @@ class UserControllerTest < ActionController::TestCase display_name = "new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success @@ -265,7 +283,13 @@ class UserControllerTest < ActionController::TestCase display_name = users(:public_user).display_name assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success @@ -279,7 +303,13 @@ class UserControllerTest < ActionController::TestCase display_name = users(:public_user).display_name.upcase assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb new file mode 100644 index 000000000..827db7c93 --- /dev/null +++ b/test/integration/cors_test.rb @@ -0,0 +1,32 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class CORSTest < ActionController::IntegrationTest + # Rails 4 adds a built-in `options` method. When we upgrade, we can remove + # this definition. + unless instance_method_names.include?("options") + def options(*args) + reset! unless integration_session + @html_document = nil + integration_session.send(:process, :options, *args).tap do + copy_session_variables! + end + end + end + + def test_api_routes_allow_cross_origin_requests + options "/api/capabilities", nil, + 'HTTP_ORIGIN' => "http://www.example.com", + 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET' + + assert_response :success + assert_equal "http://www.example.com", response.headers['Access-Control-Allow-Origin'] + end + + def test_non_api_routes_dont_allow_cross_origin_requests + assert_raises ActionController::RoutingError do + options "/", nil, + 'HTTP_ORIGIN' => "http://www.example.com", + 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET' + end + end +end diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index b5b3e91c7..7f3e921f9 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -21,7 +21,7 @@ class UserCreationTest < ActionController::IntegrationTest display_name = "#{localer.to_s}_new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post '/user/save', + post '/user/terms', {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, {"HTTP_ACCEPT_LANGUAGE" => localer.to_s} end @@ -41,7 +41,7 @@ class UserCreationTest < ActionController::IntegrationTest email = "#{locale.to_s}_new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post '/user/save', + post '/user/terms', {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s} end @@ -58,10 +58,20 @@ class UserCreationTest < ActionController::IntegrationTest I18n.available_locales.each do |locale| new_email = "#{locale.to_s}newtester@osm.org" display_name = "#{locale.to_s}_new_tester" + + assert_difference('User.count', 0) do + assert_difference('ActionMailer::Base.deliveries.size', 0) do + post "/user/terms", + {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}} + end + end + + assert_response :success + assert_template 'user/terms' + assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post_via_redirect "/user/save", - {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, + post_via_redirect "/user/save", {}, {"HTTP_ACCEPT_LANGUAGE" => "#{locale.to_s}"} end end diff --git a/test/unit/changeset_tag_test.rb b/test/unit/changeset_tag_test.rb index 2939613c8..cff75a5be 100644 --- a/test/unit/changeset_tag_test.rb +++ b/test/unit/changeset_tag_test.rb @@ -59,7 +59,7 @@ class ChangesetTagTest < ActiveSupport::TestCase def test_uniqueness tag = ChangesetTag.new - tag.changeset_id = changeset_tags(:changeset_1_tag_1).id + tag.changeset_id = changeset_tags(:changeset_1_tag_1).changeset_id tag.k = changeset_tags(:changeset_1_tag_1).k tag.v = changeset_tags(:changeset_1_tag_1).v assert tag.new_record? diff --git a/vendor/assets/potlatch2/potlatch2.swf b/vendor/assets/potlatch2/potlatch2.swf index 88e3f183a..97c9b412c 100644 Binary files a/vendor/assets/potlatch2/potlatch2.swf and b/vendor/assets/potlatch2/potlatch2.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/assets.zip b/vendor/assets/potlatch2/potlatch2/assets.zip index 98a647974..6c42d1b69 100644 Binary files a/vendor/assets/potlatch2/potlatch2/assets.zip and b/vendor/assets/potlatch2/potlatch2/assets.zip differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/be.swf b/vendor/assets/potlatch2/potlatch2/locales/be.swf new file mode 100644 index 000000000..49e650e04 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/be.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/bg.swf b/vendor/assets/potlatch2/potlatch2/locales/bg.swf new file mode 100644 index 000000000..ae7fad5f3 Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/bg.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ca.swf b/vendor/assets/potlatch2/potlatch2/locales/ca.swf index 94a5ea872..fabe98a6b 100644 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ca.swf and b/vendor/assets/potlatch2/potlatch2/locales/ca.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/diq.swf b/vendor/assets/potlatch2/potlatch2/locales/diq.swf index 99ec21743..cdde5f191 100644 Binary files a/vendor/assets/potlatch2/potlatch2/locales/diq.swf and b/vendor/assets/potlatch2/potlatch2/locales/diq.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/el.swf b/vendor/assets/potlatch2/potlatch2/locales/el.swf index 0d5403003..3b0d5ad0e 100644 Binary files a/vendor/assets/potlatch2/potlatch2/locales/el.swf and b/vendor/assets/potlatch2/potlatch2/locales/el.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf index d1535d73c..8502cdc64 100644 Binary files a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf and b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fi.swf b/vendor/assets/potlatch2/potlatch2/locales/fi.swf index b49479aa1..b2994d6ad 100644 Binary files a/vendor/assets/potlatch2/potlatch2/locales/fi.swf and b/vendor/assets/potlatch2/potlatch2/locales/fi.swf differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf index 239fcaf0d..3fd424670 100644 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf and b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf differ