Merge branch 'contextmenu'

diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index 88a9c15c1215b00ae19ba6a7373eb88dff1efd7c..7a5d77d9bd50eae15c8be46df1cffdf5711553e2 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -49,12 +49,16 @@ function GraphHopperEngine(id, vehicleType) {
             instrText += instr.text;
             var latLng = line[instr.interval[0]];
             var distInMeter = instr.distance;
+            var lineseg = [];
+            for (var j = instr.interval[0]; j <= instr.interval[1]; j++) {
+              lineseg.push({lat: line[j][0], lng: line[j][1]});
+            }
             steps.push([
-              {lat: latLng.lat, lng: latLng.lng},
+              {lat: latLng[0], lng: latLng[1]},
               instrCode,
               instrText,
               distInMeter,
-              []
+              lineseg
             ]); // TODO does graphhopper map instructions onto line indices?
           }
 

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 4b50cc78c4ca0660b3ff5cfe484b95a53e417b94..b87764b1d06a759dc171cdda62bdc25ef9a48e39 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -107,7 +107,7 @@ L.OSM.Map = L.Map.extend({
       params.mlon = latLng.lng.toFixed(precision);
     }
 
-    var url = 'http://' + OSM.SERVER_URL + '/',
+    var url = window.location.protocol + '//' + OSM.SERVER_URL + '/',
       query = querystring.stringify(params),
       hash = OSM.formatHash(this);
 
@@ -121,7 +121,8 @@ L.OSM.Map = L.Map.extend({
     var zoom = this.getZoom(),
       latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
       str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
-        'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/',
+        window.location.protocol + '//osm.org/go/' :
+        window.location.protocol + '//' + window.location.hostname + '/go/',
       char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
       x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
       y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 354fcc7c0cba1b61e3a3d04f73e0e9ddcf0f3fbf..8eb5f240906579f6fdb21fff01a293fc8c0483ea 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -152,9 +152,14 @@ class ApplicationController < ActionController::Base
     # have we identified the user?
     if @user
       # check if the user has been banned
-      if @user.blocks.active.exists?
-        # NOTE: need slightly more helpful message than this.
-        report_error t("application.setup_user_auth.blocked"), :forbidden
+      user_block = @user.blocks.active.take
+      unless user_block.nil?
+        set_locale
+        if user_block.zero_hour?
+          report_error t("application.setup_user_auth.blocked_zero_hour"), :forbidden
+        else
+          report_error t("application.setup_user_auth.blocked"), :forbidden
+        end
       end
 
       # if the user hasn't seen the contributor terms then don't

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index e41bd01f31008e4bcf1c1c204555569b874c5350..8d9b670c5eb4b9f8419b3c59e70ac9f6c3bcf9c2 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -170,7 +170,7 @@ class TraceController < ApplicationController
     else
       @title = t "trace.edit.title", :name => @trace.name
 
-      if request.post?
+      if request.post? && params[:trace]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
         @trace.visibility = params[:trace][:visibility]

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index de14dcaa9617f351941b93925cc7b1453ee6357b..eb0daba6569731cad0fe0486b6ea814099e6d2d5 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -26,6 +26,13 @@ class UserBlock < ActiveRecord::Base
     needs_view || ends_at > Time.now.getutc
   end
 
+  ##
+  # returns true if the block is a "zero hour" block
+  def zero_hour?
+    # if the times differ more than 1 minute we probably have more important issues
+    needs_view && (ends_at.to_i - updated_at.to_i) < 60
+  end
+
   ##
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 6607bf7a5879eba6d026edbe809fc42835947516..3f11edf59cfd275a0323bb9b20031a63653e0919 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -49,6 +49,12 @@
         <h2><%= t 'layouts.intro_header' %></h2>
         <div class="close-wrap"><span class="icon close"></span></div>
         <p><%= t 'layouts.intro_text' %></p>
+        <p><%= t 'layouts.partners_html',
+               :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"),
+               :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
+               :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
+               :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
+        </p>
         <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
         <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
       </div>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 07b2f9e52170d18f923847cf168119813649c9da..9847cf5aa9a9ea7745a130e629583510df5e979c 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -36,7 +36,7 @@
              :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"),
              :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
              :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
-             :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
+             :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
     </p>
   </div>
 </div>

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 671d4a77c9f024586aab874053c609d624073419..602975ec711f22a968869632a101c3b5225400b7 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1308,6 +1308,7 @@ ast:
           La nota ta cerca de %{place}.'
       details: Pue alcontrar más detalles sobro la nota en %{url}.
     changeset_comment_notification:
+      hi: Bones %{to_user},
       greeting: Bones,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} comentó unu de los tos conxuntos
@@ -1321,6 +1322,8 @@ ast:
         partial_changeset_with_comment: col comentariu '%{changeset_comment}'
         partial_changeset_without_comment: ensin comentarios
       details: Puen alcontrase más detalles del conxuntu de cambios en %{url}
+      unsubscribe: Pa date de baxa de les actualizaciones d'esti conxuntu de cambeos,
+        visita %{url} y fai clic en «dase de baxa».
   message:
     inbox:
       title: Buzón

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index dfbd128bbc7691906a13d77b53b49a5c0db5ec5c..df6e6c3b72c714a71e94f1838aede669ae2d7119 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -738,6 +738,7 @@ bg:
     note_comment_notification:
       greeting: Здравейте,
     changeset_comment_notification:
+      hi: Здравейте %{to_user},
       greeting: Здравейте,
   message:
     inbox:
@@ -902,6 +903,7 @@ bg:
   user:
     login:
       title: Вписване
+      heading: Вписване
       email or username: 'Електронна поща или потребителско име:'
       password: 'Парола:'
       remember: Запомни ме
@@ -916,8 +918,11 @@ bg:
           title: Вписване с Фейсбук
         wikipedia:
           title: Вписване с Уикипедия
+          alt: Вписване със сметка от Уикипедия
         yahoo:
           title: Вписване с Яху
+        wordpress:
+          title: Вписване с Уърдпрес
     lost_password:
       email address: 'Електронна поща:'
     reset_password:
@@ -926,8 +931,11 @@ bg:
       flash changed: Паролата е променена успешно.
     new:
       title: Регистриране
+      about:
+        header: Безплатна и достъпна за редактиране
       email address: 'Електронна поща:'
       confirm email address: 'Потвърждаване на електронната поща:'
+      display name: Видимо потребителско имеː
       password: 'Парола:'
       confirm password: 'Потвърждаване на паролата:'
       continue: Регистриране

diff --git a/config/locales/br.yml b/config/locales/br.yml
index c1e9bf6cc32543fab541f8c83c5c0237de1fe5b2..b2c7ecd05b70cb69ff32f31c618927da24ae863d 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -662,6 +662,7 @@ br:
           pitch: Tachenn sport
           playground: Tachenn c'hoari
           recreation_ground: Tachenn c'hoari
+          resort: Lec'h hañviñ
           sauna: Saona
           slipway: Kal
           sports_centre: Kreizenn sport
@@ -1024,12 +1025,13 @@ br:
       more_1_html: Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor
         roadennoù, lennit  <a href="http://osmfoundation.org/Licence"> Licence OSMF
         Licence page</a> hag ar gumuniezh <a
-      more_2_html: |-
-        Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas
-          un API digoust evit an diorroerien diavaez.
-          Sellit ouzh hor <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">reolennoù evit implijout an API</a>,
-          <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">reolennoù evit implijout ar gartenn</a>
-          ha <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">reolennoù evit implijout Nominatim</a>.
+      more_2_html: "Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp
+        ket evit pourchas un API digoust evit an dredeourien.\n   Sellit ouzh hor
+        <a href=\"https://operations.osmfoundation.org/policies/api/\"></a> reolennoù
+        evit implijout an API</a>, \n  Sellit ouzh hor <a href=\"https://operations.osmfoundation<a
+        href=\"https://operations.osmfoundation.org/policies/tiles/\">reolennoù evit
+        implijout an teolennoù</a>, ha\n<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">reolennoù
+        evit implijout Nominatin</a>"
       contributors_title_html: Hor c'henlabourerien
       contributors_intro_html: 'Miliadoù a hiniennoù a labour ganimp. Ebarzhiñ a reomp
         ivez roadennoù digor eus ajañsoù kartennañ hag eus mamennoù all, hag en o
@@ -1085,6 +1087,10 @@ br:
         dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="http://dmca.openstreetmap.org/">furmskrid
         enlinenn</a>.
       trademarks_title_html: <span id="merkoù"></span>Merkoù
+      trademarks_1_html: Openstreet, al logo brasaer ha State of the Map zo merkoù
+        marilhet gant OpenStreetMap Foundation. M'ho pez goulennoù da sevel diwar-benn
+        implij ar merkoù-se, kit e darempred gant <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+        Working Group</a>, mar plij.
   welcome_page:
     title: Deuet-mat oc'h !
     introduction_html: Degemer mat en OpenStreetMap, ar gartenn digoust eus ar bed
@@ -1114,6 +1120,12 @@ br:
         un hent, evel anv ur preti pe an tizh bevennet war un hent.
     rules:
       title: Reolennoù !
+      paragraph_1_html: OpenStreetMap en deus un nebeud reolennoù furmel, met gortoz
+        a reomp ma vo kemeret perzh gant an holl berzhidi ha ma vo darempredoù gant
+        ar gumuniezh. Ma vezit e-sell d'ober traoù all estreget ober cheñchamantoù
+        gant an dorn, lennit ha heuilhit ar sturiadoù, mar plij, e <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'></a>An
+        ezporzhiadurioù</> ha<a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'></a>
+        Ar c'hemmoù emgefre>/a>.
     questions:
       title: Traoù da c'houlenn ?
       paragraph_1_html: Ezhomm ho peus sikour evit kartennaouiñ, pe n'eo ket sklaer
@@ -1209,10 +1221,13 @@ br:
     legal_title: Lezennel
     legal_html: "Al lec'hienn-mañ hag e-leizh a servijoù all kar zo korvoet ent furmel
       gant an <a href=\"http://osmfoundation.org/\">Diazezaddur OpenStreetMap</a>
-      (OSMF) \nen anv ar gumuniezh.\n<br>\nKit <a href=\"http://osmfoundation.org/Contact\">contacter
+      (OSMF) \nen anv ar gumuniezh.\nEvit implijout an holl servijoù kinniget gant
+      an OSMF e ranker doujañ d'hor \n<a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">
+      Politikerezh war an implijoù degemeret</a> ha d'hor <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Politikerzh
+      prevezded</a>.\n<br>\nKit <a href=\"http://osmfoundation.org/Contact\">contacter
       l'OSMF</a> e darempred gant an OSMF</a>, mar plij, m'ho peus goulennoù da sevel
       diwar-benn an aotreoù-implijout, ar gwirioù oberour pe diwar-benn goulennoù
-      lezennel all."
+      lezennel all.\n<br>"
     partners_title: Kevelerien
   notifier:
     diary_comment_notification:
@@ -1320,6 +1335,7 @@ br:
           hoc''h eus addispleget. Emañ an notenn tost da %{place}.'
       details: Munudoù ouzhpenn diwar-benn an notenn a c'hall bezañ kavet e %{url}.
     changeset_comment_notification:
+      hi: Demat %{to_user},
       greeting: Demat,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} en deus addispleget unan eus ho
@@ -1334,6 +1350,8 @@ br:
         partial_changeset_with_comment: gant an addispleg '%{changeset_comment}'
         partial_changeset_without_comment: Hep evezhiadenn
       details: Muioc'h a ditouroù war an holl cheñchamantoù e %{url}.
+      unsubscribe: Evit digoumanantiñ diouzh hizivadurioù an holl gemmoù, gweladennit
+        %{url} ha klikit war « Digoumanantiñ ».
   message:
     inbox:
       title: Boest resev
@@ -1468,6 +1486,7 @@ br:
           bridleway: Hent evit kezeg
           cycleway: Roudenn divrodegoù
           cycleway_national: roudenn vroadel evit an divrodegoù
+          cycleway_regional: Roudenn divrodegoù rannvroel
           cycleway_local: roudenn lec'hel evit an divrodegoù
           footway: Hent evit an dud war droad
           rail: Hent-houarn
@@ -1522,6 +1541,7 @@ br:
           destination: Moned d'ar pal
           construction: Hentoù war ar stern
           bicycle_shop: Stal varc'hoù-houarn
+          bicycle_parking: Parklec'h belioù
           toilets: Privezioù
     richtext_area:
       edit: Aozañ
@@ -1678,6 +1698,7 @@ br:
       allow_read_gpx: lenn ho roudoù GPS prevez.
       allow_write_gpx: kas roudoù GPS.
       allow_write_notes: kemmañ notennoù
+      grant_access: Grataat ar monet
     oauthorize_success:
       title: Reked aotre roet
       allowed: Aotreet ho peus an arload %{app_name} da vont d'ho kont.
@@ -1762,6 +1783,7 @@ br:
       register now: En em enskrivañ bremañ
       with username: 'Ur gont OpenStreetMap hoc''h eus dija ? Digorit un dalc''h en
         ur verkañ hoc''h anv implijer hag ho ker-tremen :'
+      with external: 'Peotramant, implijit un tredeour evit kevreañ :'
       new to osm: Nevez war OpenStreetMap ?
       to make changes: Evit kemmañ roadennoù OpenStreetMap e rankit kaout ur gont.
       create account minute: Krouiñ ur gont. Ne bad nemet ur vunutenn.
@@ -1840,15 +1862,20 @@ br:
         ar c'henlabourer</a>.
       email address: 'Chomlec''h postel :'
       confirm email address: 'Kadarnaat ar chomlec''h postel :'
-      not displayed publicly: N'eo ket diskwelet d'an holl (gwelet <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="wiki privacy policy including section on email addresses">hor c'harta
-        prevezded</a>)
+      not displayed publicly: N'eo ket diskwelet ho chomlec'h d'an holl (gwelet <a
+        href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy
+        policy including section on email addresses">hor c'harta prevezded</a>) evit
+        gouzout hiroc'h
       display name: 'Anv diskwelet :'
       display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit
         cheñch diwezhatoc'h en ho penndibaboù.
       external auth: 'Dilesadur trede :'
       password: 'Ger-tremen :'
       confirm password: 'Kadarnaat ar ger-tremen :'
+      use external auth: 'Peotramant, implijit un tredeour evit kevreañ :'
+      auth no password: Gant dilesadur un tredeour n'eus ket ezhomm d'ober gant ur
+        ger-tremen, met evit binvioù ouzhpenn pe evit ur servijer e c'haller bepred
+        goulenn unan diganeco'h.
       continue: En em enskrivañ
       terms accepted: Trugarez deoc'h evit bezañ asantet da ziferadennoù nevez ar
         c'henlabourer !
@@ -1996,6 +2023,8 @@ br:
         gravatar: Implijout Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: petra eo se ?
+        disabled: Diweredekaet eo bet Gravatar.
+        enabled: Gweredekaet eo bet diskwel ho Kravatar.
       new image: Ouzhpennañ ur skeudenn
       keep image: Derc'hel ar skeudenn a-vremañ
       delete image: Dilemel ar skeudenn a-vremañ
@@ -2091,6 +2120,9 @@ br:
       heading: N'eo ket kevredet ho ID ouzh ur gont OpenStreetMap.
       option_1: Ma'z oc'h un den nevez en OpenStreetMap, krouit ur gont nevez, mar
         plij, war-bouez ar furmskrid amañ dindan.
+      option_2: M'ho pez ur gont dija e c'hallit kevreañ outi en ur implijout hoc'h
+        anv implijer hag ho ker-tremen, ha goude-se kevrediñ ho kont gant hoc'h ID
+        en ho tibaboù implijer.
   user_role:
     filter:
       not_an_administrator: N'eus nemet ar verourien a c'hall merañ ar rolloù, ha
@@ -2272,12 +2304,15 @@ br:
       center_marker: Kreizañ ar gartenn war ar merker
       paste_html: Pegañ HTML evit bezañ enkorfet en ul lec'hienn web
       view_larger_map: Gwelet ur gartenn vrasoc'h
+      only_standard_layer: Ar gwiskad standart hepken a c'hall bezañ ezporzhiet evel
+        ur skeudenn.
     embed:
       report_problem: Menegiñ ur gudenn
     key:
       title: Alc'hwez ar gartenn
       tooltip: Alc'hwez ar gartenn
-      tooltip_disabled: Alc'hwez kartenn da gaout evit ar gwiskad standart hepken
+      tooltip_disabled: Ne c'haller ket kaout an alc'hwez kartenn evit ar gwiskad
+        stantart
     map:
       zoom:
         in: Zoumañ
@@ -2294,6 +2329,7 @@ br:
         header: Gwiskadoù kartenn
         notes: Notennoù kartenn
         data: Roadennoù ar gartenn
+        gps: Roudoù GPS foran
         overlays: Gweredekaat an adwiskadoù evit dresañ ar gartenn
         title: Gwiskadoù
       copyright: © <a href='%{copyright_url}'>Kenlabourerien OpenStreetMap</a>
@@ -2351,11 +2387,21 @@ br:
       instructions:
         continue_without_exit: Kenderc'hel war%{name}
         slight_right_without_exit: Troit un tammig a-zehoù war %{name}
+        offramp_right_without_exit: Kemer ar vretell dehoù %{name}
+        onramp_right_without_exit: Troit a-zehoù war ar bretell war %{name}
+        endofroad_right_without_exit: E penn an hent, troit a-zezhoù war %{name}
+        merge_right_without_exit: Mont a-zehoù war %{name}
+        fork_right_without_exit: Er forc'h-hent, troit a-zehoù war %{name}
         turn_right_without_exit: Treiñ a-zehoù war %{name}
         sharp_right_without_exit: Troit prim a-zehoù war %{name}
         uturn_without_exit: Grit hanter dro war %{name}
         sharp_left_without_exit: Troit prim a-gleiz war %{name}
         turn_left_without_exit: Treiñ a-gleiz war %{name}
+        offramp_left_without_exit: Kemer ar vretell gleiz betek %{name}
+        onramp_left_without_exit: Troit a-gleiz war ar vretell war %{name}
+        endofroad_left_without_exit: E penn an hent, troit a-gleiz war %{name}
+        merge_left_without_exit: Mont a-gleiz war %{name}
+        fork_left_without_exit: Er forc'h-hent, troit a-gleiz war %{name}
         slight_left_without_exit: Troit un tammig a-gleiz war %{name}
         via_point_without_exit: (dre ar poent)
         follow_without_exit: Heuliañ %{name}
@@ -2367,6 +2413,11 @@ br:
         against_oneway_without_exit: Mont gant ar straed untu war %{name}
         end_oneway_without_exit: Dibenn an tremen untun war %{name}
         roundabout_with_exit: Er c'hroashent-tro, kemer an hent-maez %{exit} war %{name}
+        turn_left_with_exit: Er c'hroashent-tro, troit a-gleiz war %{name}
+        slight_left_with_exit: Er c'hroashent, treiñ un tamm a-gleiz war %{name}
+        turn_right_with_exit: Er c'hroashent-tro, treiñ a-zehoù war %{name}
+        slight_right_with_exit: Er c'hroashent-tro, treiñ un tamm a-zehoù war %{name}
+        continue_with_exit: Er c'hroashent-tro, kenderc'hel war-eeun war %{name}
         unnamed: hep anv
         courtesy: Hent a-berzh %{link}
       time: Eur

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f9e647fa6587d700490424c0a20b98ec5e2febb8..315993ee5549d2f4aa82c0adf8721a6f1d2d1fda 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -19,6 +19,7 @@
 # Author: Micru
 # Author: Mlforcada
 # Author: Nemo bis
+# Author: Netol
 # Author: PerroVerd
 # Author: Pitort
 # Author: Ruila
@@ -1399,7 +1400,7 @@ ca:
       reply_button: Respon
       delete_button: Suprimeix
     new:
-      title: Envia el missatge
+      title: Envia un missatge
       send_message_to: Envia un missatge nou per a %{name}
       subject: Assumpte
       body: Cos
@@ -1947,7 +1948,7 @@ ca:
       oauth settings: configuració OAuth
       blocks on me: Blocs sobre mi
       blocks by me: Blocs fets per mi
-      send message: Envia el missatge
+      send message: Envia un missatge
       diary: Diari
       edits: Modificacions
       traces: Traces

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ca65c0af2717b82fc5ce4d42469105f9ebe00739..b4af8917ef4023ee0c493a58c17fdc479af3392f 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1326,6 +1326,7 @@ cs:
           Poznámka je umístěna poblíž %{place}.'
       details: Podrobnosti k poznámce můžete najít na %{url}.
     changeset_comment_notification:
+      hi: Dobrý den, uživateli %{to_user},
       greeting: Ahoj,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} okomentoval jednu z vašich sad
@@ -1339,6 +1340,8 @@ cs:
         partial_changeset_with_comment: s komentářem „%{changeset_comment}“
         partial_changeset_without_comment: bez komentáře
       details: Více informací o této sadě změn lze nalézt na %{url}.
+      unsubscribe: Pro odhlášení z aktualizací této sady změn jděte na %{url} a klikněte
+        na „Zrušit odebírání“.
   message:
     inbox:
       title: Doručená pošta

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 58c21db0050b331c34f8ab98ed7daa3ca1c40a64..b2ebffd61a273f7d4d329886ca0c07b8b6a34272 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -933,12 +933,11 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
-    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."
     partners_ucl: "the UCL VR Centre"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
-    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
@@ -1626,6 +1625,7 @@ en:
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
+      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 62034ca63f91e375b288abb1fce28c99317ce6ad..469a2842057bfe192dde7a541d1ef92e7fe7c223 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1022,7 +1022,7 @@ eo:
       attribution_example:
         alt: Ekzemplo kiel atribui OpenStreetMap sur retpaĝo
         title: Ekzemplo de aŭtorec-atribuado
-      more_title_html: Sciigi pli
+      more_title_html: Sciiĝi pli
       more_1_html: |-
         Legu pli pri uzado de niaj datumoj kaj kiel atribui aŭtorecon je la <a
         href="http://osmfoundation.org/Licence">retpaĝo de OSMF permesilo</a> kaj je la <a
@@ -1415,7 +1415,7 @@ eo:
       not_public_description: Vi ne povas plu redakti la mapon. Vi povas agordi ilin
         kiel publikan ĉe via %{user_page}.
       user_page_link: uzantpaĝo
-      anon_edits_link_text: Tie ĉi vi sciigis kiel.
+      anon_edits_link_text: Tie ĉi vi sciiĝis kiel.
       flash_player_required: Por uzi laOpenStreetMap-redaktilon 'Potlatch', vi bezonas
         la kromprogramon Flash. Vi povas <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">elŝuti
         Flash Player el Adobe.com retpaĝo</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Kelkaj
@@ -1649,7 +1649,7 @@ eo:
       not_a_moderator: Vi devas esti kontrolanto por fari ĉi tiun agon.
     setup_user_auth:
       blocked: Via aliro al API estas blokita. Bonvolu ensaluti al reta interfaco
-        por sciigi pli.
+        por sciiĝi pli.
       need_to_see_terms: Via aliro al API estas dumtempe provizore haltigita. Bonvolu
         ensaluti al reta fasado por legi interkonsenton pri kontribuado. Vi ne devas
         akcepti ĝin, sed vi devas legi ĝin.
@@ -1967,7 +1967,7 @@ eo:
         text: Nuntempe viaj redaktoj estas anonimaj kaj aliuloj ne povas sendi mesaĝojn
           al vi kaj vidi vian lokon. Por montri kion vi redaktis kaj ebligi al aliuloj
           kontakti vin per la retejo, alklaku la butonon sube. <b>Ekde la versio 0.6
-          de API, nur publikaj uzantoj povas redakti map-datumojn.</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">sciigi
+          de API, nur publikaj uzantoj povas redakti map-datumojn.</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">sciiĝi
           kial</a>).<ul><li>Via retpoŝta adreso ne estos publikigita.</li><li>Ĉi tio
           ago ne povos esti malfarita kaj ĉiuj novaj uzantoj estas publikaj implicite.</li></ul>
       contributor terms:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index d2a4e5912aca2ddbc8590754c8a4e97f4c19249a..c2e072a21f22f5f42b796fe67948000ccf4bf6d3 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -280,6 +280,7 @@ fi:
         kauan.
     rss:
       title_all: Keskustelu OpenStreetMapin muutoskokoelmasta
+      title_particular: 'OpenStreetMap muutoskokoelma #%{changeset_id} keskustelu'
       comment: 'Käyttäjä %{author} kommentoi muutoskokoelmaa #%{changeset_id}'
       commented_at_html: Päivitetty %{when} sitten
       commented_at_by_html: '%{user} päivittänyt %{when} sitten'
@@ -1196,6 +1197,8 @@ fi:
         aiheita koskevilla tai alueellisilla sähköpostilistoilla.
     forums:
       title: Keskustelupalsta
+      description: Kysymykset ja keskustelut niille, jotka haluavat mielummin ilmoitustaulutyylisen
+        käyttöliittymän.
     irc:
       title: IRC
       description: Interaktiivinen chat monilla eri kielillä ja monista eri aiheista.
@@ -1337,8 +1340,16 @@ fi:
       hi: Hei %{to_user},
       greeting: Hei,
       commented:
+        subject_own: '[OpenStreetMap] %{commenter} on kommentoinut yhtä muutoskokoelmaasi'
+        subject_other: '[OpenStreetMap] %{commenter} on kommentoinut muutoskokoelmaa
+          josta olet kiinnostunut'
+        your_changeset: '%{commenter} on jättänyt kommentin yhteen muutoskokoelmistasi
+          joka on luotu %{time}'
+        partial_changeset_with_comment: kommentin kanssa '%{changeset_comment}'
         partial_changeset_without_comment: ei kommenttia
       details: 'Lisätietoja muutoskokoelmasta: %{url}'
+      unsubscribe: Peruaksesi tilauksen päivityksistä tähän muutoskokoelmaan, vieraile
+        sivulla %{url} ja klikkaa "Unsubscribe".
   message:
     inbox:
       title: Saapuneet
@@ -2000,6 +2011,7 @@ fi:
         gravatar: Käytä Gravataria
         link text: mikä tämä on?
         disabled: Gravatar on poistettu käytöstä.
+        enabled: Gravatarisi näyttäminen on otettu käyttöön.
       new image: Lisää kuva
       keep image: Säilytä nykyinen kuva
       delete image: Poista nykyinen kuva
@@ -2258,6 +2270,7 @@ fi:
       link: Linkki tai HTML-koodi
       long_link: Linkki
       short_link: Lyhyt linkki
+      geo_uri: Geo URI
       embed: HTML-koodi
       custom_dimensions: Rajaa alue itse
       format: 'Tiedostomuoto:'

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index bc5d03db02e1c0b66f7bf06bcf7672fc779bb4d0..d2560a94b224390f46a0b1222c9a424753762cd3 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -2,18 +2,22 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Krish Dulal
+# Author: Nirjal stha
 # Author: Njsubedi
 # Author: RajeshPandey
+# Author: राम प्रसाद जोशी
 # Author: सरोज कुमार ढकाल
 ---
 ne:
+  html:
+    dir: ltr
   time:
     formats:
-      friendly: '%e %B %Y at %H:%M'
+      friendly: '%e %B %Y मा %H:%M'
   activerecord:
     models:
       acl: अनुमति नियन्त्रण सूची
-      changeset: परिवरà¥\8dतनहरà¥\81 सूची
+      changeset: परिवरà¥\8dतनहरà¥\82 सूची
       changeset_tag: चेन्जसेट ट्याग
       country: देश
       diary_comment: डायरी टिप्पणी
@@ -76,8 +80,11 @@ ne:
         active: सक्रिय
         display_name: देखाउने नाम
         description: वर्णन
-        languages: भाषाहरà¥\81
+        languages: भाषाहरà¥\82
         pass_crypt: पासवर्ड
+  printable_name:
+    with_version: '%{id}, v%{version}'
+    with_name_html: '%{name} (%{id})'
   editor:
     default: पूर्वस्थापित(अहिलेको %{name})
     potlatch:
@@ -122,11 +129,18 @@ ne:
       way_paginated: बाटोहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
       relation: सम्बन्धहरू (%{count})
       relation_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y})
+      comment: टिप्पणीहरू (%{count})
+      hidden_commented_by: ' %{user} द्वारा गरिएको लुकाइएको टिप्पणी <abbr title=''%{exact_time}''>%{when}
+        पहिले</abbr>'
+      commented_by: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
+        गरिएको टिप्पणी'
       changesetxml: चेन्जसेट XML
       osmchangexml: osmChange XML
       feed:
         title: 'परिवर्तनहरू: %{id}'
         title_comment: परिवर्तनहरू %{id} - %{comment}
+      join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस्
+      discussion: छलफल
     node:
       title: 'अंश: %{name}'
       history_title: 'अंशको इतिहास: %{name}'
@@ -156,7 +170,8 @@ ne:
         node: नोड
         way: बाटो
         relation: सम्बन्ध
-        changeset: परिवर्तनसेट \
+        changeset: परिवर्तनसेट
+        note: टिपोट
     timeout:
       sorry: माफ गर्नुहोला, %{id} अाइडि भएको %{type}को लागि तथ्याङ्क प्राप्त गर्न
         निक्कै समय लाग्यो ।
@@ -165,10 +180,11 @@ ne:
         way: बाटो
         relation: सम्बन्ध
         changeset: चेन्जसेट
+        note: टिपोट
     redacted:
       redaction: सम्पादन %{id}
-      message_html: '%{type}को संस्करण %{version} सम्पादित भएकाले देखाउन सकिएन । कृपया
-        विसà¥\8dतà¥\83त à¤\9cानà¤\95ारà¥\80à¤\95à¥\8b लाà¤\97ि %{redaction_link} हà¥\87रà¥\8dनà¥\81हà¥\8bसà¥\8d ।'
+      message_html: संस्करण %{version} यस प्रकारको  %{type}  देखाउन सकिँदैन किनभने
+        यà¥\8b हà¤\9fाà¤\87à¤\8fà¤\95à¥\8b à¤\9b à¤\95à¥\83पया à¤\9cानà¤\95ारà¥\80à¤\96à¥\8b लाà¤\97ि %{redaction_link} हà¥\87रà¥\8dनà¥\81हà¥\8bसà¥\8d
       type:
         node: नोड
         way: बाटो
@@ -180,11 +196,13 @@ ne:
       load_data: डेटा लोडगर्ने
       loading: लोड हुदैछ...
     tag_details:
-      tags: सà¤\82à¤\95à¥\87तहरू
+      tags: à¤\9fà¥\8dयाà¤\97हरू
       wiki_link:
         key: '%{key} संकेतको लागि विकि विवरण पृष्ठ'
         tag: '%{key}=%{value} संकेतको लागि विकि विवरण पृष्ठ'
+      wikidata_link: '%{page} वस्तु Wikidata मा'
       wikipedia_link: '%{page}को बारेमा विकिपीडियामा भएको लेख'
+      telephone_link: '%{phone_number} मा फोन गर्नुहोस्'
     note:
       title: 'टिप्पणी: %{id}'
       new_note: नयाँ टिप्पणी
@@ -210,6 +228,8 @@ ne:
         अगाडि</abbr> पुनःसक्रिय गरिएको
       hidden_by: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
         लुकाइएको'
+    query:
+      title: क्वेरी गुणहरू
   changeset:
     changeset_paging_nav:
       showing_page: पृष्ठ %{page}
@@ -243,6 +263,7 @@ ne:
   diary_entry:
     new:
       title: नयाँ दैनिकी
+      publish_button: प्रकाशन गर्नुहोस्
     list:
       title: प्रयोगकर्ताका डायरीहरू
       title_friends: साथीहरूका डायरीहरू
@@ -264,7 +285,7 @@ ne:
       latitude: 'देशान्तर:'
       longitude: 'अक्षांश:'
       use_map_link: नक्सा प्रयोगर्ने
-      save_button: सà¤\82à¤\97à¥\8dरह à¤\97रà¥\8dनà¥\87
+      save_button: सà¤\99à¥\8dà¤\97à¥\8dरह à¤\97रà¥\8dनà¥\81हà¥\8bसà¥\8d
       marker_text: दैनिकी प्रविष्ठी स्थान
     view:
       title: '%{user}को डायरी | %{title}'
@@ -272,7 +293,7 @@ ne:
       leave_a_comment: टिप्पणी छोड्ने
       login_to_leave_a_comment: '%{login_link} टिप्पणी छोड्नलाई'
       login: प्रवेश
-      save_button: सà¤\82à¤\97à¥\8dरह à¤\97रà¥\8dनà¥\87
+      save_button: सà¤\99à¥\8dà¤\97à¥\8dरह à¤\97रà¥\8dनà¥\81हà¥\8bसà¥\8d
     no_such_entry:
       title: त्यस्तो कुनै दैनिकी भेटिएन
       heading: '%{id} आइडी भएको कुनै अभिलेख भेटिएन'
@@ -292,7 +313,7 @@ ne:
     diary_comment:
       comment_from: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी'
       hide_link: यो टिप्पणी लुकाउनुहोस्
-      confirm: ' निश्चित गर्ने'
+      confirm: निश्चित गर्ने
     location:
       location: 'स्थान:'
       view: अवलोकन गर्ने
@@ -350,7 +371,7 @@ ne:
         other:
           title: अन्य स्रोतहरू
           description: ओपनस्ट्रीटम्याप विकिमा सूचीत थप स्रोतहरू
-      options: विà¤\95लà¥\8dपहरà¥\81
+      options: विà¤\95लà¥\8dपहरà¥\82
       format: ढाँचा
       scale: स्केल
       max: अधिकतम
@@ -379,8 +400,10 @@ ne:
     search_osm_nominatim:
       prefix:
         aerialway:
+          cable_car: केबल कार
           chair_lift: कुर्सी लिफ्ट
           drag_lift: तान्ने लिफ्ट
+          gondola: गोन्डोला लिफ्ट
           station: हवाई मार्ग स्टेशन
         aeroway:
           aerodrome: हवाईड्रोम
@@ -391,11 +414,9 @@ ne:
           taxiway: ट्याक्सीको बाटो
           terminal: टर्मिनल
         amenity:
-          airport: विमानस्थल
+          animal_shelter: पशु आश्रय
           arts_centre: कला केन्द्र
-          artwork: कला
           atm: एटिएम् मेसिन
-          auditorium: प्रेक्षालय
           bank: बैँक
           bar: बार
           bbq: बारबिक्यू
@@ -403,6 +424,7 @@ ne:
           bicycle_parking: साइकिल पार्किङ्
           bicycle_rental: साइकिल भाडामा
           biergarten: बियर पिउने ठाउँ
+          boat_rental: ढुङ्गा भाडा सेवा
           brothel: वेश्यालय
           bureau_de_change: परिवर्तन व्यूरो
           bus_station: बस स्टेसन्
@@ -412,11 +434,12 @@ ne:
           car_wash: कार धुने ठाउँ
           casino: क्यासिनो
           charging_station: चार्ज गर्ने स्टेसन
+          childcare: बालबालिका हेरचाह
           cinema: सिनेमा घर
           clinic: क्लिनिक
-          club: क्लब
+          clock: घन्टाघर
           college: कलेज
-          community_centre: सामà¥\81दायà¥\80क केन्द्र
+          community_centre: सामà¥\81दायिक केन्द्र
           courthouse: अदालत
           crematorium: श्मशान
           dentist: दाँतको डाक्टर
@@ -433,24 +456,246 @@ ne:
           food_court: खाजा घर
           fountain: पानीको फोहोरा
           fuel: इन्धन
+          gambling: जुवाघर
           grave_yard: श्मशान घाट
           gym: जिमखाना
-          hall: हल
           health_centre: स्वास्थ्य केन्द्र
           hospital: अस्पताल
-          hotel: होटेल
           hunting_stand: शिकार क्षेत्र
           ice_cream: बरफ
           kindergarten: बाल आश्रम
           library: पुस्तकालय
           market: बजार
           marketplace: बजार क्षेत्र
+          monastery: चैत्य
+          motorcycle_parking: मोटर साइकल पार्किङ
+          nightclub: रात्री क्लब
+          nursery: नर्सरी
+          nursing_home: नर्सिङ होम
+          office: कार्यलय
+          parking: पार्किङ
+          parking_entrance: पार्किङ प्रवेश
+          pharmacy: औषधी पसल
+          place_of_worship: पूजा गर्ने स्थान
+          police: प्रहरी
+          post_box: हुलाक बाक्सा
+          post_office: हुलाक
+          prison: कारागार
+          pub: पब
+          public_building: सार्वजनिक भवन
+          reception_area: रिसेप्सन क्षे्त्र
+          recycling: पुनः प्रयोग विन्दु
+          restaurant: रेस्टुरेन्ट
+          retirement_home: बृद्ध आश्रम
+          sauna: सौना
+          school: विद्यालय
+          shelter: आश्रय
+          shop: पसल
+          shower: स्नानघर
+          social_centre: सामाजिक केन्द्र
+          social_club: सामाजिक क्लब
+          social_facility: सामाजिक सेवा
+          studio: स्टुडियो
+          swimming_pool: पौली पोखरी
+          taxi: ट्याक्सी
+          telephone: सार्वजनिक टेलिफोन
+          theatre: हल
+          toilets: शौचालय
+          townhall: सभा गृह
+          university: विश्वविद्यालय
+          vending_machine: भेन्डिङ मेसिन
+          veterinary: भेटेरिनरी शल्यक्रिया
+          village_hall: सभा गृह
+          waste_basket: फोहर टोकरी
+          waste_disposal: फोहर फाल्ने ठाउँ
+          youth_centre: युवा केन्द्र
+        boundary:
+          administrative: प्रशासनिक सिमाना
+          census: जनगणना सिमाना
+          national_park: राष्ट्रिय निकुञ्ज
+          protected_area: संरक्षित क्षेत्र
+        bridge:
+          aqueduct: नहर
+          suspension: झोलुङ्गे पुल
+          swing: झोलुङ्गे पुल
+          "yes": पुल
+        building:
+          "yes": भवन
+        craft:
+          brewery: ब्रुएरी
+          carpenter: सिकर्मी
+          electrician: विद्युतकर्मी
+          gardener: माली
+          painter: पेन्टर
+          photographer: फोटोग्रा
+          plumber: प्लमर
+          shoemaker: जुत्ताबनाउने
+          tailor: सुचीकार
+          "yes": कला पसल
+        emergency:
+          ambulance_station: एम्बुलेन्स पार्क
+          phone: आकस्मिक फोन
+        highway:
+          path: पथ
+          primary: प्राथमिक सडक
+          primary_link: प्राथमिक सडक
+          proposed: प्रस्तावित सडक
+          raceway: रेसवे
+          residential: आवासीय सडक
+          road: सडक
+          secondary: माध्यमिक सडक
+          secondary_link: माध्यमिक सडक
+          service: सर्भिस सडक
+          speed_camera: गति क्यामेरा
+          steps: खुट्किलाहरू
+          street_lamp: सडक बत्ती
+          track: ट्रयाक
+          "yes": सडक
+        historic:
+          house: घर
+          icon: प्रतिमा
+          stone: पत्थर
+          tower: टावर
+        landuse:
+          farm: खेती
+          forest: वन
+        leisure:
+          club: कल्ब
+          sauna: सौना
+          swimming_pool: पौली पोखरी
+        man_made:
+          tower: टावर
+        natural:
+          forest: वन
+          point: बिन्दु
+          rock: रक
+          spring: स्प्रिङ
+          stone: पत्थर
+          water: पानी
+        office:
+          company: कम्पनी
+          "yes": कार्यलय
+        place:
+          block: खण्ड
+          city: शहर
+          country: देश
+          farm: खेती
+          house: घर
+          state: राज्य
+          "yes": स्थानहरू
+        shop:
+          gallery: सङ्ग्रहालय
+          market: बजार
+          pharmacy: औषधी पसल
+          tailor: सुचीकार
+          "yes": पसल
+        tourism:
+          gallery: सङ्ग्रहालय
+          information: सूचना
+        waterway:
+          dock: डक गर्नुहोस्
+          stream: प्रवाह
+    description:
+      types:
+        places: स्थानहरू
+    results:
+      no_results: कुनै नतिजाहरू भेटिएनन्
+  layouts:
+    edit: सम्पादन
+    history: इतिहास
+    export: निर्यात गर्नुहोस्
+    data: डेटा
+    help: सहायता
+    about: बारेमा
+    copyright: प्रतिलिपि अधिकार
+    learn_more: थप जान्नुहोस्
+    more: थप
+  help_page:
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: शिकारूको लागी मार्गदर्शन
+      description: शिकारूको लागी समुदायले मार्गदर्शन कायम गरेकोछ
+    mailing_lists:
+      title: मेलिङ्ग सूचीहरू
+    forums:
+      title: मञ्च
+    irc:
+      title: आईआरसि
+    switch2osm:
+      title: स्विचटु‍ओएसएम
+  about_page:
+    next: अर्को
+    legal_title: कानूनी
+  notifier:
+    gpx_notification:
+      greeting: हाय,
+    email_confirm_plain:
+      greeting: हाय,
+    email_confirm_html:
+      greeting: हाय,
+    lost_password_plain:
+      greeting: हाय,
+    lost_password_html:
+      greeting: हाय,
+    note_comment_notification:
+      anonymous: एक अज्ञात प्रयोगकर्ता
+      greeting: हाय,
+    changeset_comment_notification:
+      greeting: हाय,
+  message:
+    inbox:
+      from: बाट
+      subject: विषय
+      date: मिति
+    message_summary:
+      delete_button: हटाउनुहोस्
+    new:
+      title: सान्देस पठाउ
+      subject: विषय
+      body: बडी
+      send_button: पठाउनुहोस्
+    outbox:
+      to: लाई
+      subject: विषय
+      date: मिति
+    read:
+      from: बाट
+      subject: विषय
+      date: मिति
+      back: पछाडि
+      to: लाई
+    sent_message_summary:
+      delete_button: हटाउनुहोस्
   site:
+    sidebar:
+      close: बन्द गर्नुहोस्
     search:
-      search: खोज
+      search: खोज्नुहोस्
+      get_directions: दिशानिर्देशन प्राप्त गर्नुहोस्
+      from: बाट
+      to: लाई
+    key:
+      table:
+        entry:
+          track: ट्रयाक
+          forest: वन
+          farm: खेती
+          school:
+          - विद्यालय
+          toilets: शौचालय
+    richtext_area:
+      edit: सम्पादन
+      preview: पूर्वावलोकन
+    markdown_help:
+      headings: शीर्षकहरू
+      heading: शीर्षक
+      first: पहिलो वस्तु
+      link: लिङ्क
+      text: पाठ
+      image: छवि
   trace:
     create:
-      upload_trace: ' GPS Trace अपलोड गर्ने'
+      upload_trace: GPS Trace अपलोड गर्ने
     edit:
       title: ट्रेस सम्पादन गर्दै %{name}
       heading: ट्रेस सम्पादन गर्दै %{name}
@@ -463,15 +708,15 @@ ne:
       edit: सम्पादन
       owner: 'मालिक:'
       description: विवरण
-      tags: 'ट्यागहरु:'
+      tags: ट्यागहरूः
       tags_help: अल्पविरामले छुट्याएको
-      save_button: परिवरà¥\8dतनहरà¥\81 संग्रह गर्ने
+      save_button: परिवरà¥\8dतनहरà¥\82 संग्रह गर्ने
       visibility: 'दृश्यक्षमता:'
       visibility_help: यसको मतलब के हो ?
     trace_form:
       upload_gpx: 'GPX फाइल अपलोड गर्ने:'
       description: 'विवरण:'
-      tags: 'ट्यागहरु:'
+      tags: ट्यागहरूः
       tags_help: अल्पविरामले छुट्याएको
       visibility: 'दृश्यक्षमता:'
       visibility_help: यसको मतलाब के हो ?
@@ -479,9 +724,9 @@ ne:
       help: सहायता
     trace_header:
       see_all_traces: सबै ट्रेसहरु हेर्ने
-      see_your_traces: तपाà¤\88à¤\95à¥\8b सबà¥\88 à¤\9fà¥\8dरà¥\87सहरà¥\81 हà¥\87रà¥\8dनà¥\81हà¥\8bस \
+      see_your_traces: तपाà¤\88à¤\82à¤\95à¥\8b सबà¥\88 à¤\9fà¥\8dरà¥\87सहरà¥\82 हà¥\87रà¥\8dनà¥\81हà¥\8bसà¥\8d
     trace_optionals:
-      tags: à¤\9fà¥\8dयाà¤\97हरà¥\81
+      tags: à¤\9fà¥\8dयाà¤\97हरà¥\82
     view:
       title: हेर्दै ट्रेस %{name}
       heading: हेर्दै ट्रेस %{name}
@@ -495,12 +740,14 @@ ne:
       edit: सम्पादन
       owner: 'मालिक:'
       description: 'विवरण:'
-      tags: 'ट्यागहरु:'
+      tags: ट्यागहरूः
       none: कुनै पनि होइन
       edit_track: यो ट्रेस सम्पादन गर्ने
       delete_track: यो ट्रेस मेट्ने
       trace_not_found: ट्रेस भेटिएन!
       visibility: 'दृश्यक्षमता:'
+    trace_paging_nav:
+      showing_page: पृष्ठ %{page}
     trace:
       pending: बाँकी रहेको
       count_points: पोइन्टहरु %{count}
@@ -516,27 +763,58 @@ ne:
       in: मा
       map: नक्सा
     list:
-      public_traces: सारवजनिक GPS ट्रेसहरु \
-      your_traces: तपाà¤\88à¤\95à¥\8b GPS à¤\9fà¥\8dरà¥\87सहरà¥\81
+      public_traces: सारवजनिक GPS ट्रेसहरु
+      your_traces: तपाà¤\88à¤\82à¤\95à¥\8b GPS à¤\9fà¥\8dरà¥\87सहरà¥\82
       public_traces_from: '%{user}बाट सार्वकनिक GPS ट्रेसहरु'
       tagged_with: ' %{tags}हरूद्वारा ट्याग गरिएको'
     delete:
       scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस
     make_public:
       made_public: सार्वजनिक बनाइएको ट्रेस
+  oauth_clients:
+    edit:
+      submit: सम्पादन
+    show:
+      confirm: निश्चित हुनुहुन्छ ?
+    form:
+      name: नाम
+      required: आवश्यक पर्दछ
   user:
+    login:
+      title: प्रवेश
+      heading: प्रवेश
+      password: 'पासवर्ड:'
+      login_button: प्रवेश
+      no account: खाता छैन?
+    lost_password:
+      new password button: प्रवेस शब्द परिवर्तन गर्ने
     reset_password:
-      title: प्रवेशशव्द परिवर्तन गर्ने
-      heading: ' %{user}को लागि प्रवेशशव्द परिवर्तन गर्ने \'
-      password: 'प्रवेशशव्द:'
+      title: प्रवेस शब्द परिवर्तन गर्ने
+      heading: '%{user}को लागि प्रवेस शब्द परिवर्तन गर्ने'
+      password: 'पासवर्ड:'
+      confirm password: 'प्रवेशशव्द निश्चित गर्ने:'
+      reset: नयाँ प्रवेशशव्द
+      flash changed: तपाईंको प्रवेश शब्द परिवर्तन गरिएको छ।
+    new:
+      password: 'पासवर्ड:'
       confirm password: 'प्रवेशशव्द निश्चित गर्ने:'
-      reset: नयाँ प्रवेशशव्द \
-      flash changed: तपाईको प्रवेशशव्द परिवर्तन गरिएको छ।
     terms:
       consider_pd_why: यो के हो ?
+      legale_names:
+        france: फ्रान्स
+        italy: इटाली
+    no_such_user:
+      deleted: मेटाईएको
+    view:
+      traces: निशानहरू
+      status: 'स्थिति:'
+      description: वर्णन
+      comments: टिप्पणी
+      confirm: निश्चित गर्ने
     popup:
-      your location: तपाईको स्थान
+      your location: तपाà¤\88à¤\81à¤\95à¥\8b सà¥\8dथान
       nearby mapper: नजिकको मानचित्रकर्मी
+      friend: साथी
     account:
       my settings: मेरो अनुकुलताहरु
       openid:
@@ -549,47 +827,120 @@ ne:
         heading: सार्वजनिक सम्पादन
       contributor terms:
         link text: यो के हो ?
-      preferred languages: 'रुचाइएका भाषाहरु:'
+      preferred languages: 'रुचाइएका भाषाहरू:'
+      gravatar:
+        link text: यो के हो ?
       home location: 'गृह स्थान:'
-      no home location: तपाईले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन।
-      save changes button: परिवर्तनहरु संग्रह गर्नुहोस \
-      flash update success: प्रयोगकर्ताको जानकारीहरु सफलतापूर्वक अध्यावधिक गरियो।
+      no home location: तपाईंले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन।
+      latitude: 'देशान्तर:'
+      longitude: 'अक्षांश:'
+      save changes button: परिवर्तनहरू संग्रह गर्नुहोस्
+      flash update success confirm needed: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक
+        गरियो। Check your email for a note to confirm your new email address.
+      flash update success: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो।
+    confirm:
+      button: निश्चित गर्ने
     confirm_email:
-      heading: इमेल परिवर्तन भएको निश्चित गर्नुहोस् \
+      heading: इमेल परिवर्तन भएको निश्चित गर्नुहोस्
       press confirm button: इमेल निश्चित गर्नको लागि निश्चितमा क्लिक गर्नुहोस् ।
       button: निश्चित
-      success: तपाà¤\88à¤\95à¥\8b à¤\87मà¥\87ल निशà¥\8dà¤\9aित à¤\97रà¥\8dनà¥\81हà¥\8bस, ग्राह्याताको लागि धन्यवाद!
+      success: तपाà¤\88à¤\82à¤\95à¥\8b à¤\87मà¥\87ल निशà¥\8dà¤\9aित à¤\97रà¥\8dनà¥\81हà¥\8bसà¥\8d, ग्राह्याताको लागि धन्यवाद!
       failure: यो टोकन को साथम एक इमेल पहिले नै निश्चित गरिसकिएको छ।
     go_public:
-      flash success: तपाà¤\88à¤\95à¥\8b सबà¥\88 समà¥\8dपादनहरà¥\81 सारà¥\8dवाà¤\9cनिà¤\95 à¤\9bनà¥\8d ,तपाà¤\88 à¤\85ब समà¥\8dपान लायà¤\95 हà¥\81नà¥\81
-        भयो ।
+      flash success: तपाà¤\88à¤\82à¤\95ा सबà¥\88 समà¥\8dपादनहरà¥\82 सारà¥\8dवाà¤\9cनिà¤\95 à¤\9bनà¥\8d , तपाà¤\88à¤\82 à¤\85ब समà¥\8dपादन लायà¤\95
+        हà¥\81नà¥\81 भयà¥\8b ।
     make_friend:
-      success: '%{name} अब तपाईको मित्र हुनुभएको छ!'
+      success: '%{name} à¤\85ब तपाà¤\88à¤\82à¤\95à¥\8b मितà¥\8dर हà¥\81नà¥\81भà¤\8fà¤\95à¥\8b à¤\9b!'
       failed: माफ गर्नुहोला, %{name}लाई मित्रको रुपमा थप्न सकिएन।
-      already_a_friend: ' %{name} सँग तपाई पहिले नै मित्रता गरिसक्नु भएको छ ।'
+      already_a_friend: '%{name} सँग तपाईंले पहिले नै मित्रता गरिसक्नु भएको छ ।'
     filter:
-      not_an_administrator: यो कार्य गर्न तपाई प्रवन्धक हुनुपर्छ .
+      not_an_administrator: यो कार्य गर्न तपाईं प्रवन्धक हुनुपर्छ .
   user_role:
     filter:
-      not_an_administrator: पà¥\8dरवनà¥\8dधà¤\95हरà¥\81लà¥\87 भà¥\82मिà¤\95ा वà¥\8dयवसà¥\8dथापन à¤\97रà¥\8dन सà¤\95à¥\8dà¤\9bनà¥\8d र तपाà¤\88 प्रवन्धक
+      not_an_administrator: पà¥\8dरवनà¥\8dधà¤\95हरà¥\82लà¥\87 भà¥\82मिà¤\95ा वà¥\8dयवसà¥\8dथापन à¤\97रà¥\8dन सà¤\95à¥\8dà¤\9bनà¥\8d र तपाà¤\88à¤\82 प्रवन्धक
         हैन ।
-      not_a_role: ' `%{role}''  मान्य भूमिका हैन ।'
+      not_a_role: '`%{role}''  मान्य भूमिका हैन ।'
       already_has_role: प्रयोगकर्ता सँग %{role} भूमिका पहिले देखि नै छ।
-      doesnt_have_role: ' प्रयोगर्ताको %{role}को भूमिका छैन'
+      doesnt_have_role: प्रयोगर्ताको %{role}को भूमिका छैन
     grant:
-      title: भूमिका प्रदान निश्चित गर्ने \
-      heading: भूमिका प्रदान निश्चित गर्ने \
+      title: भूमिका प्रदान निश्चित गर्ने
+      heading: भूमिका प्रदान निश्चित गर्ने
       are_you_sure: भूमिका `%{role}' प्रयोगकर्ता `%{name}'लाई प्रदान गर्न निश्चित
         हुनुहुन्छ?
       confirm: निश्चित गर्ने
       fail: भूमिका `%{role}' प्रयोगकर्ता  `%{name}'लाई प्रदान गर्न सकिएन । कृपया प्रयोगकर्ता
         र भूमिका दुबै मान्य छन् भनि जाँच गर्नुहोस् ।
     revoke:
-      title: Confirm role revoking
+      title: भूमिका फिर्ता निश्चित गर्ने
       heading: भूमिका फिर्ता निश्चित गर्ने
-      are_you_sure: तपाà¤\88à¤\81 भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा
+      are_you_sure: तपाà¤\88à¤\82 भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा
         निश्चित हुनुहुन्छ'?
       confirm: निश्चित गर्ने
       fail: भूमिका `%{role}' ,`%{name}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका
         दुबै मान्य छन् भन्ने खुलाउनु होस् ।
+  user_block:
+    partial:
+      show: देखाउनुहोस्
+      edit: सम्पादन
+      confirm: निश्चित हुनुहुन्छ ?
+      creator_name: सर्जक
+      status: वस्तुस्थिति
+      showing_page: पृष्ठ %{page}
+      next: अर्को »
+      previous: « अघिल्लो
+    show:
+      created: सृजना गरिएको
+      status: वस्तुस्थिति
+      show: देखाउनुहोस्
+      edit: सम्पादन
+      confirm: निश्चित हुनुहुन्छ ?
+  note:
+    entry:
+      comment: टिप्पणी
+    mine:
+      id: आईडी
+      creator: सर्जक
+      description: वर्णन
+  javascripts:
+    close: बन्द गर्नुहोस्
+    share:
+      title: आदान-प्रदान गर्नुहोस्
+      cancel: रद्द गर्नुहोस्
+      image: छवि
+      long_link: लिङ्क
+      embed: एचटीएमएल
+      format: 'ढाँचा:'
+      download: डाउनलोड
+      paste_html: वेबसाइट इम्बेड गर्न HTML पेस्ट गर्नुहोस्
+    map:
+      zoom:
+        in: ठुलो पार्नुहोस
+        out: सानो पार्नुहोस
+      base:
+        standard: मानक
+    changesets:
+      show:
+        comment: टिप्पणी
+        subscribe: सवस्क्रिप्ट
+        unsubscribe: सदस्यता खारेज गर्नुहोस्
+        hide_comment: लुकाउ
+    notes:
+      show:
+        hide: लुकाउनुहोस्
+        comment: टिप्पणी
+    directions:
+      time: समय
+    query:
+      node: नोड
+      way: बाटो
+      relation: रिलेशन
+  redaction:
+    edit:
+      description: वर्णन
+    new:
+      description: वर्णन
+    show:
+      description: विवरण
+      user: 'सर्जक:'
+      confirm: निश्चित हुनुहुन्छ ?
 ...

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 158fc31400c0739cd4d1a1d52f004abe66bb55af..3e34ff3e62d45187c7dc9024500e5d094bf3c1c7 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1107,12 +1107,13 @@ oc:
     partners_title: Partenaris
   notifier:
     diary_comment_notification:
-      subject: '[OpenStreetMap] %{user} a apondut un comentari sus vòstra entrada
-        del jornal'
+      subject: '[OpenStreetMap] %{user} a postat un comentari sus un article de jornal'
       hi: Bonjorn %{to_user},
+      footer: Tanben podètz legir lo comentari sus %{readurl}, lo comentar sus %{commenturl}
+        o respondre sus %{replyurl}
     message_notification:
       hi: Bonjorn %{to_user},
-      footer_html: Podètz tanben legir lo messatge a %{readurl} e i podètz respondre
+      footer_html: Tanben podètz legir lo messatge a %{readurl} e i podètz respondre
         a %{replyurl}
     friend_notification:
       subject: '[OpenStreetMap] %{user} vos a apondut coma amic'
@@ -1190,7 +1191,7 @@ oc:
     changeset_comment_notification:
       greeting: Bonjorn,
       commented:
-        partial_changeset_with_comment: amb lo comentari '%{changeset_comment}'
+        partial_changeset_with_comment: amb lo comentari  « %{changeset_comment}' »
         partial_changeset_without_comment: sens comentari
   message:
     inbox:
@@ -2015,7 +2016,7 @@ oc:
     key:
       title: Legenda
       tooltip: Legenda
-      tooltip_disabled: La legenda es pas disponibla que pel jaç estandard
+      tooltip_disabled: La legenda es pas disponibla que per aqueste jaç
     map:
       zoom:
         in: Zoom avant

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 352e3b940497bc3154feeb037f36d1c79b6e5492..084556be80d0c2ec9c11b7206baeee8a2f5d7204 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -623,7 +623,7 @@ sl:
           military: Vojaško območje
           mine: Minsko polje
           orchard: Sadovnjak
-          quarry: Dnevni kop
+          quarry: Kamnolom
           railway: Železnica
           recreation_ground: Rekreacijsko območje
           reservoir: Zbiralnik

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 4ab28ea6d628553a014f949127a6d4982c55c8e9..4cb1c3b3dba55ba3cefa3296e6533a5af3dcd2cd 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1366,6 +1366,7 @@ sv:
           på. Noteringen är nära %{place}.'
       details: Mer detaljer om anteckningen finns på %{url}.
     changeset_comment_notification:
+      hi: Hej %{to_user},
       greeting: Hej,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} har kommenterat på en av dina ändringsset'
@@ -1378,6 +1379,8 @@ sv:
         partial_changeset_with_comment: med kommentar '%{changeset_comment}'
         partial_changeset_without_comment: utan kommentar
       details: Mer detaljer om ändringssetet finns på %{url}.
+      unsubscribe: För att avsluta prenumerationen från uppdatering i denna ändringsgrupp,
+        besök %{url} och klicka på "Avprenumerera".
   message:
     inbox:
       title: Inkorg

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 01b6842765044a6f9ed39de7a65fcd0efbceee0f..441f4de0caf505666e437790048157571d08c076 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -95,6 +95,9 @@ te:
       discussion: చర్చ
     node:
       title: 'బిందువు: %{name}'
+    way:
+      title: 'దారి: %{name}'
+      history_title: 'దారి చరిత్ర: %{name}'
     relation:
       title: 'సంబంధం: %{name}'
       history_title: 'సంబంధపు చరిత్ర: %{name}'
@@ -415,6 +418,8 @@ te:
           house: ఇల్లు
           houses: ఇళ్ళు
           island: దీవి
+          postcode: తపాలా సంకేతం
+          region: ప్రాంతం
           sea: సముద్రం
           state: రాష్ట్రం
           subdivision: ఉపవిభాగం
@@ -494,11 +499,17 @@ te:
       title: ఈ పుట గురించి
     legal_babble:
       title_html: కాపీహక్కులు మరియు లైసెన్సు
+      attribution_example:
+        title: ఆపాదింపు ఉదాహరణ
+      more_title_html: మరింత తెలుసుకోవడం
       infringement_title_html: కాపీహక్కుల ఉల్లంఘన
+      trademarks_title_html: <span id="trademarks"></span>ట్రేడుమార్కులు
   welcome_page:
     title: స్వాగతం!
     whats_on_the_map:
       title: పటంలో ఏముంది
+    rules:
+      title: నియమాలు!
     questions:
       title: సందేహాలున్నాయా?
     add_a_note:
@@ -532,6 +543,8 @@ te:
       click_the_link: అది మీరే అయితే, మార్పుని నిర్ధారించడానికి ఈ క్రింది లంకెను నొక్కండి.
     note_comment_notification:
       anonymous: అజ్ఞాత వాడుకరి
+    changeset_comment_notification:
+      hi: '%{to_user} గారూ,'
   message:
     inbox:
       my_inbox: నా ఇన్‌బాక్స్
@@ -869,12 +882,17 @@ te:
     changesets:
       show:
         comment: వ్యాఖ్య
+        subscribe: చందాచేరు
+        unsubscribe: చందావిరమించు
+        hide_comment: దాచు
+        unhide_comment: చూపించు
     notes:
       show:
         hide: దాచు
         comment_and_resolve: వ్యాఖ్యానించి పరిష్కరించండి
         comment: వ్యాఖ్యానించండి
     directions:
+      directions: దిశలు
       distance: దూరం
       time: సమయం
     query:

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index f27129b421d273de45d2886c2607d2d966578356..b238df04c19e5f883db2bbea2c2d9dfc68074bac 100644 (file)
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -557,7 +557,7 @@ class TraceControllerTest < ActionController::TestCase
     assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
   end
 
-  # Test fetching the edit page for a trace
+  # Test fetching the edit page for a trace using GET
   def test_edit_get
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
@@ -584,10 +584,37 @@ class TraceControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  # Test fetching the edit page for a trace using POST
+  def test_edit_post_no_details
+    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
+    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+
+    # First with no auth
+    post :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    assert_response :forbidden
+
+    # Now with some other user, which should fail
+    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id }
+    assert_response :forbidden
+
+    # Now with a trace which doesn't exist
+    post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id }
+    assert_response :not_found
+
+    # Now with a trace which has been deleted
+    post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id }
+    assert_response :not_found
+
+    # Finally with a trace that we are allowed to edit
+    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id }
+    assert_response :success
+  end
+
   # Test saving edits to a trace
-  def test_edit_post
+  def test_edit_post_with_details
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+
     # New details
     new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" }