Localisation updates from https://translatewiki.net.

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index ea1ee31926528bbac0c7e4f11fcc46b4d71aba56..c909786526b78743071ca3238ed5a5befabf8bd4 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -7,21 +7,29 @@
 cy:
   time:
     formats:
-      friendly: '%e %B %Y am %H:%M'
+      friendly: '%e %B %Y at %H:%M'
   activerecord:
     models:
       acl: Rhestr Rheoli Mynediad
+      changeset: Changeset
+      changeset_tag: Tag Changeset
       country: Gwlad
       diary_comment: Nodyn Dyddiadur
       diary_entry: Cofnod Dyddiadur
       friend: Ffrind
       language: Iaith
       message: Neges
+      node: Nod
+      node_tag: Tag Nod
       notifier: Hysbysydd
+      old_node: Hen Nod
+      old_node_tag: Tag Hen Nod
       old_relation: Hen Berthynas
       old_relation_member: Aelod o Hen Berthynas
       old_relation_tag: Tag Hen Berthynas
       old_way: Hen Lwybr
+      old_way_node: Nod Hen Ffordd
+      old_way_tag: Tag Hen Ffordd
       relation: Perthynas
       session: Sesiwn
       trace: Dargopïo
@@ -71,6 +79,8 @@ cy:
     id:
       name: iD
       description: iD (golygydd y porwr)
+    remote:
+      name: Rheolaeth o bell
   browse:
     created: Crewyd
     closed: Wedi cau
@@ -293,14 +303,20 @@ cy:
     search_osm_nominatim:
       prefix:
         aerialway:
+          cable_car: Car Cebl
           chair_lift: Cadair godi
           drag_lift: Cadair lusg
+          gondola: Lifft Gondola
+          station: Gorsaf Awyr
         aeroway:
           aerodrome: Maesawyr
           apron: Ffedog
           gate: Giat
           helipad: Pad Hofrennydd
+          runway: Rhedfa Awyr
+          terminal: Terfynell
         amenity:
+          animal_shelter: Cysgod Anifeiliaid
           arts_centre: Canolfan Grefftau
           atm: Peiriant Codi Arian
           bank: Banc
@@ -310,6 +326,7 @@ cy:
           bicycle_parking: Man Cadw Beic
           bicycle_rental: Man Llogi Beic
           biergarten: Gardd Gwrw
+          boat_rental: Llogi Cychod
           brothel: Puteindy
           bureau_de_change: Bureau de Change
           bus_station: Gorsaf Fysiau
@@ -319,19 +336,23 @@ cy:
           car_wash: Golchwr Cerbyd
           casino: Casino
           charging_station: Gorsaf Gwefru
+          childcare: Man Gwarchod Plant
           cinema: Sinema
           clinic: Clinic
+          clock: Cloc
           college: Coleg
           community_centre: Canolfan Cymunedol
           courthouse: Llys
           crematorium: Amlosgfa
           dentist: Deintydd
           doctors: Meddygfa
+          dormitory: Noswylfa
           drinking_water: Dŵr Yfed
           driving_school: Ysgol Yrru
           embassy: Llysgenhadaeth
           emergency_phone: Ffôn Argyfwng
           fast_food: Bwyd Parod
+          ferry_terminal: Terfynell Fferi
           fire_station: Gorsaf Dân
           food_court: Cwrt Fwydydd
           fountain: Ffynnon
@@ -345,11 +366,14 @@ cy:
           library: Llyfrgell
           market: Marchnad
           marketplace: Marchnad
+          monastery: Mynachdy
+          motorcycle_parking: Man Parcio Beiciau Modur
           nightclub: Clwb Nôs
           nursery: Meithrinfa
           nursing_home: Cartref Nyrsio
           office: Swyddfa
           parking: Parcio
+          parking_entrance: Mynedfa Man Parcio
           pharmacy: Fferyllfa
           place_of_worship: Man addoli
           police: Heddlu
@@ -394,10 +418,21 @@ cy:
           "yes": Pont
         building:
           "yes": Adeilad
+        craft:
+          brewery: Bragdy
+          carpenter: Saer
+          electrician: Trydanydd
+          gardener: Garddwr
+          painter: Peintiwr
+          photographer: Ffotograffydd
+          plumber: Plymar
+          "yes": Siop Grefftau
         emergency:
+          ambulance_station: Gorsaf Ambiwlans
           phone: Ffôn Argyfwng
         highway:
           bridleway: Llwybr Ceffyl
+          bus_guideway: Lon Bysiau
           bus_stop: Stop Bysiau
           construction: Priffordd yn cael ei Adeiladu
           cycleway: Llwybr Beicio
@@ -414,10 +449,12 @@ cy:
           primary: Priffordd
           primary_link: Priffordd
           proposed: Ffordd Arfaethedig
+          residential: Ffordd
           rest_area: Man Gorffwys
           road: Ffordd
           secondary: Ffordd Eilaidd
           secondary_link: Ffordd Eilaidd
+          service: Ffordd Waith
           services: Gwasanaethau Traffordd
           speed_camera: Camera Cyflymder
           steps: Grisiau
@@ -425,32 +462,41 @@ cy:
           tertiary: Ffordd Trydyddol
           tertiary_link: Ffordd Trydyddol
           track: Trac
+          traffic_signals: Goleuadau Traffig
           trail: Llwybr
           trunk: Cefnffordd
           trunk_link: Cefnffordd
           unclassified: Ffordd Diddosbarth
           unsurfaced: Ffordd Heb Wyneb
+          "yes": Ffordd
         historic:
           archaeological_site: Safle Archaeolegol
           battlefield: Maes Brwydr
           boundary_stone: Maen Terfyn
-          building: Adeilad
+          building: Adeilad Hanesyddol
+          bunker: Byncar
           castle: Castell
           church: Eglwys
+          city_gate: Gat y Ddinas
           citywalls: Waliau Ddinas
           fort: Caer
+          heritage: Safle Dreftadaeth
           house: Tŷ
           icon: Eicon
           manor: Maenor
           memorial: Cofeb
           mine: Mwynfa
           monument: Cofadail
+          roman_road: Ffordd Rufeinig
           ruins: Adfeilion
+          stone: Carreg
           tomb: Beddrod
           tower: Tŵr
           wayside_cross: Croes Min Ffordd
           wayside_shrine: Cysegrfa Min Ffordd
           wreck: Llongddrylliad
+        junction:
+          "yes": Cyffordd
         landuse:
           allotments: Rhandiroedd
           basin: Basn
@@ -481,8 +527,11 @@ cy:
           vineyard: Gwinllan
         leisure:
           beach_resort: Ardal Wyliau
+          club: Clwb
           common: Tir Comin
+          dog_park: Parc Cwn
           fishing: Man Pysgota
+          fitness_centre: Canolfan Gadw'n Heini
           garden: Gardd
           golf_course: Cwrs Golff
           ice_rink: Llawr Sglefrio
@@ -500,6 +549,11 @@ cy:
           swimming_pool: Pwll Nofio
           track: Trac Rhedeg
           water_park: Parc Dŵr
+        man_made:
+          lighthouse: Goleudy
+          pipeline: Pibell
+          works: Ffatri
+          "yes": Wnaed gan Ddyn
         military:
           airfield: Maes Awyr Milwrol
           barracks: Barics
@@ -518,6 +572,7 @@ cy:
           forest: Coedwig
           geyser: Geiser
           glacier: Rhewlif
+          grassland: Caeau
           heath: Rhos
           hill: Bryn
           island: Ynys
@@ -530,7 +585,9 @@ cy:
           reef: Riff
           ridge: Cefn
           rock: Craig
+          sand: Tywod
           scree: Sgri
+          scrub: Llwyni
           spring: Ffynnon
           stone: Carreg
           strait: Culfor
@@ -542,6 +599,7 @@ cy:
           wood: Coed
         office:
           accountant: Cyfrifydd
+          administrative: Gweinyddu
           architect: Pensaer
           company: Cwmni
           employment_agency: Asiantaeth Cyflogi
@@ -593,6 +651,7 @@ cy:
           proposed: Rheilfford Arfaethedig
           spur: Cainc Rheilffordd
           station: Gorsaf Drenau
+          stop: Siop Reilffordd
           subway: Gorsaf Drenau Tanddaearol
           subway_entrance: Mynedfa at Drenau Tanddaearol
           tram: Tramffordd
@@ -681,6 +740,7 @@ cy:
           camp_site: Man Gwersylla
           caravan_site: Parc Carafanau
           chalet: Chalet
+          gallery: Galeri
           guest_house: Llety
           hostel: Hostel
           hotel: Gwesty
@@ -695,6 +755,7 @@ cy:
           culvert: Twnel Ddŵr
           "yes": Twnel
         waterway:
+          boatyard: Iard Gychod
           canal: Camlas
           dam: Argae
           derelict_canal: Camlas Diffaith
@@ -719,6 +780,10 @@ cy:
         level9: Ffin Pentref
         level10: Ffin Maesdref
     description:
+      title:
+        osm_nominatim: Lleoliad o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>
+        geonames: Lleoliad o <a href="http://www.geonames.org/">GeoNames</a>
       types:
         cities: Dinasoedd
         towns: Trefi
@@ -779,6 +844,7 @@ cy:
       english_link: y Saesneg gwreiddiol
     native:
       title: Ynghylch y dudalen hon
+      native_link: Cymraeg
       mapping_link: dechrau mapio
     legal_babble:
       title_html: Hawlfraint a Thrwydded

diff --git a/config/locales/da.yml b/config/locales/da.yml
index d3373c0da0259ade1c3e08d4a8c9b94395075f34..95323c3ce342ae969747507e28b34f25a3c3cbfe 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -8,6 +8,7 @@
 # Author: Freek
 # Author: Gnonthgol
 # Author: Gorbi
+# Author: Hede2000
 # Author: Hein0170
 # Author: Hylle
 # Author: Jens Jensen
@@ -1901,6 +1902,7 @@ da:
       heading: Brugeren %{user} findes ikke
       body: Der findes desværre ingen bruger ved navn %{user}. Tjek venligst stavningen,
         ellers kan linket du trykkede på være forkert.
+      deleted: slettet
     view:
       my diary: Min blog
       new diary entry: nyt blogindlæg

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 0e9f4e08d12c8fe7c68d312f15dbe2f75c12ecac..06fcec7b35f3d44fcebbc8e2bd7a78a10f390725 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -233,14 +233,14 @@ eu:
           bicycle_rental: Txirrindu Alokairua
           biergarten: Terraza
           boat_rental: Txalupen alokairua
-          brothel: Putetxe
+          brothel: Putetxea
           bureau_de_change: Diru-truke Bulegoa
           bus_station: Autobus-geltoki
           cafe: Kafetegi
           car_rental: Ibilgailu-alokairu
           car_sharing: Autoa partekatzea
           car_wash: Auto Garbiketa
-          casino: Kasino
+          casino: Kasinoa
           cinema: Zinema
           clinic: Klinika
           clock: Erlojua
@@ -251,7 +251,7 @@ eu:
           dentist: Dentista
           doctors: Medikuak
           dormitory: Ikasle egoitza
-          drinking_water: Edateko ur
+          drinking_water: Edateko ura
           driving_school: Autoeskola
           embassy: Enbaxada
           emergency_phone: Larrialdi Telefonoa
@@ -262,8 +262,8 @@ eu:
           food_court: Jatetxe-eremua
           fountain: Iturri
           fuel: Gasolindegia
-          grave_yard: Hilerri
-          gym: Osasun Zentroa / Gimnasioa
+          grave_yard: Hilerria
+          gym: Fitness Zentroa / Gimnasioa
           health_centre: Osasun Zentroa
           hospital: Ospitalea
           hunting_stand: Ehiza postua
@@ -435,8 +435,8 @@ eu:
           playground: Jolastoki
           sauna: Sauna
           slipway: Harmaila
-          sports_centre: Kiroldegi
-          stadium: Estadio
+          sports_centre: Kiroldegia
+          stadium: Estadioa
           swimming_pool: Igerilekua
           water_park: Ur jolas-parkea
           "yes": Aisialdia
@@ -452,14 +452,14 @@ eu:
         natural:
           bay: Badia
           beach: Hondartza
-          cape: Lurmutur
+          cape: Lurmuturra
           cave_entrance: Kobazulo Sarrera
-          crater: Crater
+          crater: Kraterra
           dune: Duna
-          fjord: Fiordo
+          fjord: Fiordoa
           forest: Basoa
-          geyser: Geiser
-          glacier: Glaziar
+          geyser: Geiserra
+          glacier: Glaziarra
           grassland: Belardia
           hill: Muinoa
           island: Irla
@@ -525,6 +525,7 @@ eu:
           funicular: Funikularra
           halt: Tren Geralekua
           historic_station: Tren Geltoki Historikoa
+          level_crossing: Trenbide-pasagunea
           light_rail: Tren Arina
           monorail: Monoraila
           narrow_gauge: Bide Estuko Trenbidea
@@ -544,7 +545,7 @@ eu:
           bicycle: Bizikleta-denda
           books: Liburudenda
           boutique: Boutique
-          butcher: Harategi
+          butcher: Harategia
           car: Auto-denda
           car_parts: Autoaldagaiak
           car_repair: Autoen konponketa-lantegia
@@ -646,6 +647,7 @@ eu:
     logout: Saioa itxi
     log_in: Saioa hasi
     sign_up: Eman izena
+    start_mapping: Hasi mapeatzen
     edit: Aldatu
     history: Historia
     export: Esportatu
@@ -697,6 +699,7 @@ eu:
       title: Arauak!
     questions:
       title: Galderarik?
+    start_mapping: Hasi mapeatzen
   fixthemap:
     title: Arazo baten berri eman / Mapa zuzendu
     how_to_help:
@@ -709,6 +712,7 @@ eu:
       url: /welcome
       title: Ongi etorri OSM-ra
     beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Eu:Beginners%27_guide
       title: Hasiberrientzako gida
     help:
       url: https://help.openstreetmap.org/
@@ -792,6 +796,9 @@ eu:
       to: Hartzailea
     sent_message_summary:
       delete_button: Ezabatu
+    mark:
+      as_read: Mezua irakurrita gisa markatu da
+      as_unread: Mezua irakurri gabe gisa markatu da
     delete:
       deleted: Mezua ezabatuta
   site:
@@ -802,6 +809,8 @@ eu:
       close: Itxi
     search:
       search: Bilatu
+      from: Abiagunea
+      to: Helmuga
       where_am_i: Non nago?
       submit_text: Joan
     key:
@@ -972,6 +981,9 @@ eu:
         header: Doakoa eta editagarria
       email address: 'Eposta Helbidea:'
       confirm email address: 'Eposta Helbidea baieztatu:'
+      not displayed publicly: Ez da erakutsiko (ikus, <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
+        title="wiki pribatutasun politika, helbide elektronikoei buruzko atala">pribatutasun
+        politika</a>)
       display name: 'Erakusteko izena:'
       password: 'Pasahitza:'
       confirm password: 'Pasahitza berretsi:'
@@ -1100,6 +1112,10 @@ eu:
     map:
       base:
         transport_map: Garraio-mapa
+      layers:
+        title: Geruzak
+    site:
+      edit_tooltip: Editatu mapa
     changesets:
       show:
         subscribe: Harpidetu

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index dfb2a02032cf7a1ba3565a07efc3fe6257ca172a..94667571a8a3b48b128c4e2e839b4b9e5f0097fa 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1577,7 +1577,8 @@ hu:
     georss:
       title: OpenStreetMap GPS nyomvonalak
     description:
-      description_with_count: GPX fájl %{count} ponttal %{user} felhasználótól
+      description_with_count:
+        other: GPX fájl %{count} ponttal %{user} felhasználótól
       description_without_count: GPX fájl %{user} felhasználótól
   application:
     require_cookies:

diff --git a/config/locales/it.yml b/config/locales/it.yml
index c3475bd6991dc3270fe401d5eb865ee700ea12b9..ab145dc8e0089e591d2098a15b5737ee672f0e46 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -954,7 +954,7 @@ it:
         towns: Città
         places: Luoghi
     results:
-      no_results: Nessun risultato
+      no_results: Nessun risultato trovato
       more_results: Altri risultati
   layouts:
     logo:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 88ff8090765987dda377adc6a3bb3872aaef36d6..65f5689adf2bb29d2785a7ffc30ef40a1b7ec65f 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -8,6 +8,7 @@
 # Author: Hiro884
 # Author: Hosiryuhosi
 # Author: Iwai.masaharu
+# Author: Los688
 # Author: Mage Whopper
 # Author: Mfuji
 # Author: Miya
@@ -180,6 +181,7 @@ ja:
         way: ウェイ
         relation: リレーション
         changeset: 変更セット
+        note: 注記
     timeout:
       sorry: 申し訳ありませんが、ID %{id} の %{type} のデータは大きすぎるため取得できません。
       type:
@@ -187,6 +189,7 @@ ja:
         way: ウェイ
         relation: リレーション
         changeset: 変更セット
+        note: 注記
     redacted:
       redaction: 改訂 %{id}
       message_html: この %{type} の %{version} 版は、改訂されたため表示できません。詳細は %{redaction_link}
@@ -579,6 +582,7 @@ ja:
           memorial: 記念碑
           mine: 鉱山
           monument: 記念碑
+          roman_road: ローマ街道
           ruins: 廃墟
           stone: 岩石
           tomb: 墓地
@@ -619,11 +623,13 @@ ja:
           road: 道路エリア
           village_green: 緑地広場
           vineyard: Vineyard
+          "yes": 土地利用
         leisure:
           beach_resort: ビーチ リゾート
           bird_hide: 観察小屋
           club: クラブ
           common: 共有地
+          dog_park: ドッグ・パーク
           fishing: 釣り場
           fitness_station: フィットネス ステーション
           garden: 庭園
@@ -644,6 +650,7 @@ ja:
           track: 陸上競技用トラック
           water_park: 親水公園
         man_made:
+          lighthouse: 灯台
           tower: 塔
           works: 工房
         military:
@@ -868,6 +875,7 @@ ja:
           wadi: 涸れ川
           waterfall: 滝
           weir: ダム
+          "yes": 水路
       admin_levels:
         level2: 国境
         level4: 都道府県・州境
@@ -1019,6 +1027,8 @@ ja:
       node_html: <strong>ノード</strong>は地図上の点です。1 軒のレストランや 1 本の樹木が該当します。
       way_html: <strong>ウェイ</strong>は線または領域です。道路、水路、湖、建物などが該当します。
       tag_html: <strong>タグ</strong>はノードやウェイについて補足するデータです。レストランの名前、道路の制限速度などが該当します。
+    rules:
+      title: ルール
     questions:
       title: 何か質問はありますか?
       paragraph_1_html: |-
@@ -1062,6 +1072,10 @@ ja:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: OSM の質問回答サイトで質問したり回答を検索したりする。
+    mailing_lists:
+      title: メーリング リスト
+    forums:
+      title: フォーラム
     irc:
       title: IRC
     wiki:
@@ -1259,6 +1273,7 @@ ja:
       table:
         entry:
           motorway: 自動車専用道路
+          main_road: 主要道
           trunk: 国道
           primary: 主要地方道
           secondary: 一般県道
@@ -1555,6 +1570,28 @@ ja:
         <a href="%{webmaster}">ウェブマスター</a>にご連絡ください。
       auth failure: 申し訳ありませんが、入力した情報でログインできませんでした。
       openid_logo_alt: OpenID でログイン
+      auth_providers:
+        openid:
+          title: OpenID を使用してログイン
+          alt: OpenID URL を使用してログイン
+        google:
+          title: Google を使用してログイン
+          alt: Google OpenID を使用してログイン
+        facebook:
+          title: Facebook を使用してログイン
+          alt: Facebook アカウントを使用してログイン
+        windowslive:
+          title: Windows Live を使用してログイン
+          alt: Windows Live アカウントを使用してログイン
+        yahoo:
+          title: Yahoo を使用してログイン
+          alt: Yahoo OpenID を使用してログイン
+        wordpress:
+          title: Wordpress を使用してログイン
+          alt: Wordpress OpenID を使用してログイン
+        aol:
+          title: AOL を使用してログイン
+          alt: AOL OpenID を使用してログイン
     logout:
       title: ログアウト
       heading: OpenStreetMap からログアウト
@@ -2011,6 +2048,7 @@ ja:
       instructions:
         unnamed: 名前なし
     query:
+      node: ノード
       nothing_found: 地物が見つかりませんでした
   redaction:
     edit:

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index d340888d3f385cf842eedb42a5810332d8a14fb6..f3a928c399439bc37ad7f7c8a7b8e9374fd1bda7 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1915,6 +1915,7 @@ pt-BR:
       heading: O usuário %{user} não existe
       body: Não há um usuário com o nome %{user}. Confira a digitação, ou talvez o
         link em que você clicou esteja errado.
+      deleted: excluído
     view:
       my diary: Meu Diário
       new diary entry: nova entrada de diário

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 3f978e1d478cbd96656634e781a3c65d8d234f1a..97ca4fcf77d3f229a026cb3014d9842a14f3664a 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -131,6 +131,7 @@ sr:
       feed:
         title: Скуп измена %{id}
         title_comment: Скуп измена %{id} – %{comment}
+      join_discussion: Пријавите се за разговор
       discussion: Разговор
     node:
       title: 'Чвор: %{name}'
@@ -427,6 +428,7 @@ sr:
           library: Библиотека
           market: Продавница
           marketplace: Пијаца
+          monastery: Манастир
           nightclub: Ноћни клуб
           nursery: Јаслице
           nursing_home: Дом за негу
@@ -465,6 +467,7 @@ sr:
           veterinary: Ветеринарска хирургија
           village_hall: Сеоски дом
           waste_basket: Корпа за отпатке
+          waste_disposal: Депонија
           youth_centre: Дом омладине
         boundary:
           administrative: Административна граница
@@ -479,6 +482,10 @@ sr:
           "yes": Мост
         building:
           "yes": Зграда
+        craft:
+          brewery: Пивара
+          carpenter: Пила
+          shoemaker: Обућар
         emergency:
           phone: Телефон за хитне случајеве
         highway:
@@ -487,6 +494,7 @@ sr:
           bus_stop: Аутобуска станица
           construction: Ауто-пут у изградњи
           cycleway: Бициклистичка стаза
+          elevator: Лифт
           emergency_access_point: Приступ за случај опасности
           footway: Пешачка стаза
           ford: Газ
@@ -520,13 +528,16 @@ sr:
           trunk_link: Магистрални пут
           unclassified: Некатегорисани пут
           unsurfaced: Неасфалтирани пут
+          "yes": Пут
         historic:
           archaeological_site: Археолошко налазиште
           battlefield: Бојиште
           boundary_stone: Гранични камен
-          building: Зграда
+          building: Историјска зграда
+          bunker: Бункер
           castle: Дворац
           church: Црква
+          city_gate: Капија
           citywalls: Градски зидови
           fort: Утврђивање
           house: Кућа
@@ -576,7 +587,9 @@ sr:
           beach_resort: Одмаралиште на плажи
           bird_hide: Склониште за птице
           common: Општинско земљиште
+          dog_park: Парк за псе
           fishing: Риболовно подручје
+          fitness_centre: Фитнес центар
           fitness_station: Технички преглед
           garden: Башта
           golf_course: Голф терен
@@ -695,7 +708,7 @@ sr:
           spur: Пруга
           station: Железничка станица
           stop: Станица на прузи
-          subway: Метро станица
+          subway: Метро
           subway_entrance: Улаз у метро
           switch: Скретница
           tram: Трамвај
@@ -784,6 +797,7 @@ sr:
           camp_site: Камп
           caravan_site: Камп-приколице
           chalet: Планинска колиба
+          gallery: Галерија
           guest_house: Гостинска кућа
           hostel: Хостел
           hotel: Хотел
@@ -1051,6 +1065,8 @@ sr:
       description: Почни са овим брзим водичем који покрива основе ОпенСтритМапа
     help:
       description: Постави питање или нађи одговор на ОСМ страници за питања и одговоре.
+    forums:
+      title: Форуми
     wiki:
       url: http://wiki.openstreetmap.org/wiki/Sr:Main_Page
       title: wiki.openstreetmap.org/wiki/Sr:Main_Page
@@ -1249,6 +1265,7 @@ sr:
       table:
         entry:
           motorway: Ауто-пут
+          main_road: Главни пут
           trunk: Мото пут
           primary: Магистрални пут
           secondary: Регионални пут
@@ -1537,6 +1554,11 @@ sr:
         о проблему.
       auth failure: Не могу да вас пријавим с унетим подацима.
       openid_logo_alt: Пријавите се с OpenID-јем
+      auth_providers:
+        openid:
+          title: Пријавити се са OpenID
+        facebook:
+          title: Пријавити се са Facebook-ом
     logout:
       title: Одјава
       heading: Одјава
@@ -1758,8 +1780,9 @@ sr:
       press confirm button: Кликните на дугме за потврду да бисте потврдили Вашу нову
         имејл адресу.
       button: Потврди
-      success: Ð\92аÑ\88а е-адÑ\80еÑ\81а Ñ\98е поÑ\82вÑ\80Ñ\92ена. Хвала вам на Ñ\83пиÑ\81Ñ\83!
+      success: Ð\9fÑ\80омена ваÑ\88е е-адÑ\80еÑ\81е Ñ\98е поÑ\82вÑ\80Ñ\92енаÇ\83
       failure: Е-адреса с овим новчићем је већ потврђена.
+      unknown_token: Вредност кода за потврду је истекла или тај код не постоји.
     set_home:
       flash success: Место становања је успешно сачувано
     go_public:
@@ -2023,6 +2046,8 @@ sr:
         comment_and_resolve: Коментариши и реши
         comment: Коментариши
     edit_help: Помери карту и увећај на место које хоћеш да уредиш, затим кликни овде.
+    directions:
+      distance: Удаљеност
   redaction:
     edit:
       description: Опис

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index fecf78b12123f4482c216c65496dfc86f8f09b0e..24bdc68710cb4615c392f44e4c2acbcb82815225 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -953,7 +953,7 @@ uk:
       alt_text: Логотип OpenStreetMap
     home: Додому
     logout: Вийти
-    log_in: Ð\92війти
+    log_in: Увійти
     log_in_tooltip: Увійти під існуючим обліковим записом
     sign_up: Реєстрація
     start_mapping: Почати мапити

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 9f031bc6a2b5c28c6bead04486158214c5a922e4..91d3a5bea08bc28ac6c7ab2f3be054dba6b0e940 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1624,7 +1624,8 @@ vi:
     georss:
       title: Tuyến đường GPS OpenStreetMap
     description:
-      description_with_count: Tập tin GPX của %{user} có %{count} địa điểm
+      description_with_count:
+        other: Tập tin GPX của %{user} có %{count} địa điểm
       description_without_count: Tập tin GPX của %{user}
   application:
     require_cookies: