Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 886e9c649ead9a0320aafd8a9c3c4841b70e7044..0eb7724d1ebb41ea615f536dbffc47413f4a64fb 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2580,6 +2580,8 @@ ar:
         out: بَعِّدْ
       locate:
         title: أظهر موقعي
+        metersUnit: متر
+        feetUnit: أقدام
         popup: أنت ضمن {distance} {unit} من هذه النقطة
       base:
         standard: قياسي

diff --git a/config/locales/be.yml b/config/locales/be.yml
index d4e98573268a9471aa353079bab25d94ea3d93f0..650ac9b04928889228922e59323a6f63e326ac06 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -23,6 +23,9 @@ be:
         create: Захаваць
       diary_entry:
         create: Апублікаваць
+        update: Абнавіць
+      issue_comment:
+        create: Дадаць каментар
       message:
         create: Даслаць
       client_application:
@@ -109,6 +112,11 @@ be:
         description: Апісанне
         languages: Мовы
         pass_crypt: Пароль
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: прыкладна гадзіну таму
+        other: прыкладна %{count} гадзін(ы) таму
   editor:
     default: Тыповы (зараз %{name})
     potlatch:
@@ -149,12 +157,12 @@ be:
   browse:
     created: Створаны
     closed: Зачынены
-    created_html: Створаны <abbr title='%{title}'>%{time} таму</abbr>
-    closed_html: Закрыты <abbr title='%{title}'>%{time} таму</abbr>
-    created_by_html: Створаны <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
-    deleted_by_html: Выдалены <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
-    edited_by_html: Зменены <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
-    closed_by_html: Закрыты <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
+    created_html: Створаны <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Закрыты <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Створаны <abbr title='%{title}'>%{time}</abbr> %{user}'ам
+    deleted_by_html: Выдалены <abbr title='%{title}'>%{time}</abbr> %{user}'ам
+    edited_by_html: Зменены <abbr title='%{title}'>%{time}</abbr> %{user}'ам
+    closed_by_html: Закрыты <abbr title='%{title}'>%{time}</abbr> %{user}'ам
     version: Версія
     in_changeset: Пакет правак
     anonymous: ананімны
@@ -247,6 +255,7 @@ be:
       wikidata_link: Элемент %{page} у Вікідадзеных
       wikipedia_link: Артыкул %{page} на Вікіпедыі
       telephone_link: Патэлефанаваць %{phone_number}
+      colour_preview: Прагляд колеру %{colour_value}
     note:
       title: 'Заўвага: %{id}'
       new_note: Новая заўвага
@@ -1122,6 +1131,7 @@ be:
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: партнёрамi
+    tou: Умовы карыстання
     osm_offline: База дадзеных OpenStreetMap зараз па-за сецівам, таму што праходзіць
       неабходная тэхнічная праца.
     osm_read_only: База дадзеных OpenStreetMap зараз даступная толькі для чытання,
@@ -1593,7 +1603,7 @@ be:
         дакументацыі па картаграфаванні.
       welcome:
         url: /welcome
-        title: Вітаем у OSM
+        title: Вітаем у OpenStreetMap
         description: Пачніце з гэтага кароткага кіраўніцтва, што ахоплівае асновы
           OpenStreetMap.
       beginners_guide:
@@ -1623,11 +1633,11 @@ be:
       welcomemat:
         url: https://welcome.openstreetmap.org/
         title: Для арганізацый
-        description: Вы з арганізацыі, якая хоча работать з OpenStreetMap? Азнаёмцеся
+        description: Вы з арганізацыі, якая хоча працаваць з OpenStreetMap? Азнаёмцеся
           з інфармацыяй у раздзеле Welcome Mat.
       wiki:
         url: http://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
+        title: Вікі OpenStreetMap
         description: Паглядзець вікі з падрабязнай дакументацыяй па OSM
     sidebar:
       search_results: Вынікі пошуку
@@ -2110,14 +2120,16 @@ be:
         вікі-старонку</a>.
       terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
-      title: Умовы ўдзелу
-      heading: Умовы ўдзелу
+      title: Умовы
+      heading: Умовы
+      heading_ct: Умовы ўдзелу
       consider_pd: У дадатак да прыведзенага пагаднення, я пацвярджаю, што мой уклад
         знаходзіцца ў грамадскім набытку
       consider_pd_why: што гэта?
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Інфармацыя, якая дапаможа зразумець гэтыя ўмовы: <a href="%{summary}">кароткае
         апісанне</a> і некалькі <a href="%{translations}">неафіцыйных перакладаў</a>'
+      continue: Працягнуць
       declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Адхіліць
       you need to accept or decline: Калі ласка, прачытайце, а потым згадзіцеся ці
@@ -2429,11 +2441,27 @@ be:
       until_login: Актыўная да моманту ўваходу ўдзельніка ў сістэму.
       time_future_and_until_login: Заканчваецца праз %{time} і пасля таго, як карыстальнік
         увойдзе ў сістэму.
-      time_past: Скончылася %{time} таму.
+      time_past: Скончылася %{time}.
       block_duration:
         hours:
           one: 1 гадзіна
           other: '%{count} гадзін'
+        days:
+          one: 1 дзень
+          few: '%{count} дні'
+          other: '%{count} дзён'
+        weeks:
+          one: 1 тыдзень
+          few: '%{count} тыдні'
+          other: '%{count} тыдняў'
+        months:
+          one: 1 месяц
+          few: '%{count} месяцы'
+          other: '%{count} месяцаў'
+        years:
+          one: 1 год
+          few: '%{count} гады'
+          other: '%{count} гадоў'
     blocks_on:
       title: Блакіроўкі для %{name}
       heading: Спіс блакіровак %{name}

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 8d57c2608cd6debbafe410edad45a7d644714af2..59fd42a47f7ca00b86ddea7bbfba1f5d12f44bd2 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -36,6 +36,7 @@
 # Author: Urbanecm
 # Author: Veritaslibero
 # Author: Walter Klosse
+# Author: YjM
 # Author: Zbycz
 ---
 cs:
@@ -2525,6 +2526,8 @@ cs:
         out: Oddálit
       locate:
         title: Ukázat moji polohu
+        metersUnit: metry
+        feetUnit: stopy
         popup: Jste do {distance} {unit} od tohoto bodu
       base:
         standard: Standardní

diff --git a/config/locales/de.yml b/config/locales/de.yml
index e28ff0e90ef96c2b75eddb4df85bc3b72966a159..294a69ccc32d831eb02ef5e37d25d41f743dfb06 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -53,6 +53,7 @@
 # Author: Raymond
 # Author: Reneman
 # Author: Schmackes
+# Author: Simon04
 # Author: SimonPoole
 # Author: Snocker15
 # Author: Str4nd
@@ -2691,6 +2692,8 @@ de:
         out: Verkleinern
       locate:
         title: Aktuellen Standort anzeigen
+        metersUnit: Meter
+        feetUnit: Fuß
         popup: Du bist innerhalb von {distance} {unit} um diesen Punkt
       base:
         standard: Standard

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 3d9c74887fa5ad361a9b1224fd4237831974e648..7b07f66cac4c54c74719392376989fc6aa8fe817 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2622,6 +2622,8 @@ el:
         out: Σμίκρυνση
       locate:
         title: Προβολή της Τοποθεσίας μου
+        metersUnit: μέτρα
+        feetUnit: πόδια
         popup: Είστε μεταξύ {distance} {unit} από αυτό το σημείο
       base:
         standard: Κανονικός

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index aac204a73224215b28cca4da953f15f2590f0d61..81ecc957d67086d4a2029a56d154de3bbc148c4e 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -615,16 +615,19 @@ en-GB:
           bus_guideway: Guided Bus Lane
           bus_stop: Bus Stop
           construction: Highway under construction
+          corridor: Corridor
           cycleway: Cycle Path
           elevator: Elevator
           emergency_access_point: Emergency Access Point
           footway: Footpath
           ford: Ford
+          give_way: Give Way Sign
           living_street: Living Street
           milestone: Milestone
           motorway: Motorway
           motorway_junction: Motorway Junction
           motorway_link: Motorway Road
+          passing_place: Passing Place
           path: Path
           pedestrian: Pedestrian Way
           platform: Platform
@@ -641,6 +644,7 @@ en-GB:
           services: Motorway Services
           speed_camera: Speed Camera
           steps: Steps
+          stop: Stop Sign
           street_lamp: Street Lamp
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
@@ -649,6 +653,7 @@ en-GB:
           trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
+          turning_loop: Turning Loop
           unclassified: Unclassified Road
           "yes": Road
         historic:
@@ -668,6 +673,7 @@ en-GB:
           manor: Manor
           memorial: Memorial
           mine: Mine
+          mine_shaft: Mine Shaft
           monument: Monument
           roman_road: Roman Road
           ruins: Ruins
@@ -677,6 +683,7 @@ en-GB:
           wayside_cross: Wayside Cross
           wayside_shrine: Wayside Shrine
           wreck: Wreck
+          "yes": Historic Site
         junction:
           "yes": Junction
         landuse:
@@ -716,6 +723,7 @@ en-GB:
           bird_hide: Bird Hide
           common: Common Land
           dog_park: Dog Park
+          firepit: Fire Pit
           fishing: Fishing Area
           fitness_centre: Fitness Centre
           fitness_station: Fitness Station
@@ -740,16 +748,46 @@ en-GB:
           water_park: Water Park
           "yes": Leisure
         man_made:
+          adit: Adit
+          beacon: Beacon
+          beehive: Bee Hive
+          breakwater: Breakwater
+          bridge: Bridge
+          bunker_silo: Bunker
+          chimney: Chimney
+          crane: Crane
+          dolphin: Mooring Post
+          dyke: Dyke
+          embankment: Embankment
+          flagpole: Flagpole
+          gasometer: Gasometer
+          groyne: Groyne
+          kiln: Kiln
           lighthouse: Lighthouse
+          mast: Mast
+          mine: Mine
+          mineshaft: Mine Shaft
+          monitoring_station: Monitoring Station
           petroleum_well: Oil Well
+          pier: Pier
           pipeline: Pipeline
+          silo: Silo
+          storage_tank: Storage Tank
+          surveillance: Surveillance
           tower: Tower
+          wastewater_plant: Wastewater Plant
+          watermill: Water Mill
+          water_tower: Water Tower
+          water_well: Well
+          water_works: Water Works
+          windmill: Windmill
           works: Factory
           "yes": Man-made
         military:
           airfield: Military Airfield
           barracks: Barracks
           bunker: Bunker
+          "yes": Military
         mountain_pass:
           "yes": Mountain Pass
         natural:
@@ -795,11 +833,14 @@ en-GB:
           accountant: Accountant
           administrative: Administration
           architect: Architect
+          association: Association
           company: Company
+          educational_institution: Educational Institution
           employment_agency: Employment Agency
           estate_agent: Estate Agent
           government: Governmental Office
           insurance: Insurance Office
+          it: IT Office
           lawyer: Lawyer
           ngo: NGO Office
           telecommunication: Telecommunication Office
@@ -808,6 +849,7 @@ en-GB:
         place:
           allotments: Allotments
           city: City
+          city_block: City Block
           country: Country
           county: County
           farm: Farm
@@ -821,8 +863,10 @@ en-GB:
           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode
+          quarter: Quarter
           region: Region
           sea: Sea
+          square: Square
           state: State
           subdivision: Subdivision
           suburb: Suburb
@@ -861,6 +905,7 @@ en-GB:
           beauty: Beauty Shop
           beverages: Beverages Shop
           bicycle: Bicycle Shop
+          bookmaker: Bookmaker
           books: Book Shop
           boutique: Boutique
           butcher: Butcher
@@ -899,11 +944,16 @@ en-GB:
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi
+          houseware: Houseware Shop
+          interior_decoration: Interior Decoration
           jewelry: Jewellers
           kiosk: Kiosk Shop
+          kitchen: Kitchen Shop
           laundry: Laundry
+          lottery: Lottery
           mall: Mall
           market: Market
+          massage: Massage
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Music Shop
@@ -911,15 +961,20 @@ en-GB:
           optician: Optician
           organic: Organic Food Shop
           outdoor: Outdoor Shop
+          paint: Paint Shop
+          pawnbroker: Pawnbroker
           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop
+          seafood: Sea Food
           second_hand: Second-hand Shop
           shoes: Shoe Shop
           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket
           tailor: Tailor
+          ticket: Ticket Shop
+          tobacco: Tobacconist
           toys: Toy Shop
           travel_agency: Travel Agency
           video: Video Shop

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2f46a51a7a5c1bd22e36ed94513b266de6712919..8dcab25c588bd97962e629dc57689c241324d62a 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2657,6 +2657,7 @@ es:
         out: Alejar
       locate:
         title: Mostrar mi ubicación
+        metersUnit: metros
         popup: Estás a {distance} {unit} de este punto
       base:
         standard: Estándar

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b2b6a79930471b39c5d5f3ab0eeb7499dd76aff6..d92a53877af0cb951bbe3ead2c8de9dabbeda675 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2693,6 +2693,8 @@ fr:
         out: Vue éloignée
       locate:
         title: Afficher mon emplacement
+        metersUnit: mètres
+        feetUnit: pieds
         popup: Vous êtes à {distance} {unit} de ce point
       base:
         standard: Standard

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ee94107ba904493782613d025a5a129c8bba0b39..585c980ebba99dddf1e057650770c483cbcaaa3d 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -203,13 +203,13 @@ ja:
   api:
     notes:
       comment:
-        opened_at_html: '%{when}前に作成'
+        opened_at_html: '%{when}に作成'
         opened_at_by_html: '%{user}さんが%{when}に作成'
         commented_at_html: '%{when}に更新'
-        commented_at_by_html: '%{user}さんが%{when}前に更新'
-        closed_at_html: '%{when}前に解決'
-        closed_at_by_html: '%{user}さんが%{when}前に解決'
-        reopened_at_html: '%{when}前に再開'
+        commented_at_by_html: '%{user}さんが%{when}に更新'
+        closed_at_html: '%{when}に解決'
+        closed_at_by_html: '%{user}さんが%{when}に解決'
+        reopened_at_html: '%{when}に再開'
         reopened_at_by_html: '%{user}さんが%{when}に再開'
       rss:
         title: OpenStreetMap メモ
@@ -226,12 +226,12 @@ ja:
   browse:
     created: 作成
     closed: クローズ
-    created_html: <abbr title='%{title}'>%{time}前</abbr>に作成
-    closed_html: <abbr title='%{title}'>%{time}前</abbr>にクローズ
-    created_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}前</abbr>に作成'
-    deleted_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}前</abbr>に削除'
-    edited_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}前</abbr>に編集'
-    closed_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}前</abbr>にクローズ'
+    created_html: <abbr title='%{title}'>%{time}</abbr>に作成
+    closed_html: <abbr title='%{title}'>%{time}</abbr>にクローズ
+    created_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}</abbr>に作成'
+    deleted_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}</abbr>に削除'
+    edited_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}</abbr>に編集'
+    closed_by_html: '%{user}さんが<abbr title=''%{title}''>%{time}</abbr>にクローズ'
     version: バージョン
     in_changeset: 変更セット
     anonymous: 匿名
@@ -251,8 +251,8 @@ ja:
       relation: リレーション (%{count})
       relation_paginated: リレーション (%{x}-%{y} / %{count})
       comment: コメント (%{count}件)
-      hidden_commented_by: '%{user}さんからの<abbr title=''%{exact_time}''>%{when}前</abbr>の非表示のコメント'
-      commented_by: '%{user}さんからの<abbr title=''%{exact_time}''>%{when}前</abbr>のコメント'
+      hidden_commented_by: '%{user}さんからの<abbr title=''%{exact_time}''>%{when}</abbr>の非表示のコメント'
+      commented_by: '%{user}さんからの<abbr title=''%{exact_time}''>%{when}</abbr>のコメント'
       changesetxml: 変更セット XML
       osmchangexml: OSM 差分 XML
       feed:
@@ -327,15 +327,15 @@ ja:
       open_title: '未解決のメモ #%{note_name}'
       closed_title: '解決済のメモ #%{note_name}'
       hidden_title: '非表示のメモ #%{note_name}'
-      opened_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}前</abbr>に作成'
-      opened_by_anonymous: 誰かが<abbr title='%{exact_time}'>%{when}前</abbr>に作成
-      commented_by: '%{user}さんによる<abbr title=''%{exact_time}''>%{when}前</abbr>のコメント'
-      commented_by_anonymous: 誰かによる<abbr title='%{exact_time}'>%{when}前</abbr>のコメント
-      closed_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}前</abbr>に解決'
-      closed_by_anonymous: 誰かが<abbr title='%{exact_time}'>%{when}前</abbr>に解決
-      reopened_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}前</abbr>に再開'
-      reopened_by_anonymous: 誰かが<abbr title='%{exact_time}'>%{when}前</abbr>に再開
-      hidden_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}前</abbr>に非表示化'
+      opened_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に作成'
+      opened_by_anonymous: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に作成
+      commented_by: '%{user}さんによる<abbr title=''%{exact_time}''>%{when}</abbr>のコメント'
+      commented_by_anonymous: 誰かによる<abbr title='%{exact_time}'>%{when}</abbr>のコメント
+      closed_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に解決'
+      closed_by_anonymous: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に解決
+      reopened_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に再開'
+      reopened_by_anonymous: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に再開
+      hidden_by: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に非表示化'
       report: このメモを報告
     query:
       title: 地物を検索
@@ -374,7 +374,7 @@ ja:
   changeset_comments:
     comment:
       comment: 変更セット#%{changeset_id}への%{author}による新しいコメント
-      commented_at_by_html: '%{when}前に%{user}さんが更新'
+      commented_at_by_html: '%{when}に%{user}さんが更新'
     comments:
       comment: 変更セット#%{changeset_id}への%{author}による新しいコメント
     index:
@@ -746,9 +746,7 @@ ja:
           pitch: 運動場
           playground: 遊び場
           recreation_ground: 遊園地
-          resort: |2-
-
-            リゾート
+          resort: リゾート
           sauna: サウナ
           slipway: 造船台
           sports_centre: スポーツ センター
@@ -1072,9 +1070,8 @@ ja:
       status: 状態
       reports: 報告
       last_updated: 最近の更新
-      last_updated_time_html: <abbr title='%{title}'>%{time}前</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{user}さんによる%{time}前の版</abbr>
-        by
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: '%{user}さんによる<abbr title=''%{title}''>%{time}</abbr>の版'
       link_to_reports: レポートを表示
       reports_count:
         one: 1件のレポート
@@ -2295,7 +2292,7 @@ ja:
       title: '%{block_on} のブロックの取り消し'
       heading: ブロックは %{block_on} に %{block_by} によって取り消されました。
       time_future: このブロックは %{time} に終了します。
-      past: このブロックは%{time}前に終了したため、もう取り消せません。
+      past: このブロックは%{time}に終了したため、もう取り消せません。
       confirm: このブロックを本当に取り消しますか?
       revoke: 取り消す!
       flash: このブロックは取り消されました。
@@ -2303,9 +2300,9 @@ ja:
       time_future: '%{time} に終了します。'
       until_login: 利用者がログインするまで有効です。
       time_future_and_until_login: 利用者のログイン後%{time}で終了します。
-      time_past: '%{time}前に終了しました。'
+      time_past: '%{time}に終了しました。'
       block_duration:
-        hours: '%{count} 時間'
+        hours: '%{count}時間'
         days:
           one: 1日
           other: '%{count}日'
@@ -2397,6 +2394,8 @@ ja:
         out: 縮小
       locate:
         title: 現在地を表示
+        metersUnit: メートル
+        feetUnit: フィート
         popup: あなたはこの位置から{distance}{unit}以内にいます
       base:
         standard: 標準
@@ -2484,9 +2483,7 @@ ja:
         offramp_left: ランプで左車線へ
         offramp_left_with_exit: 左車線で%{exit}出口へ進む
         offramp_left_with_exit_name: 左車線で%{exit}出口から%{name}へ進む
-        offramp_left_with_exit_directions: |-
-          右
-          左車線で%{exit}出口から%{directions}方面へ
+        offramp_left_with_exit_directions: 左車線で%{exit}出口から%{directions}方面へ
         offramp_left_with_exit_name_directions: 左車線で%{exit}出口から%{name}へ進み、%{directions}方面へ
         offramp_left_with_name: 左のランプに進んで%{name}へ
         offramp_left_with_directions: 左車線のランプで%{directions}方面へ

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 46a87395b5ea768b427ae67dcfc0352777fa1654..535ed2351dd11936987a927f0c3ebca020daf202 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2459,6 +2459,7 @@ ko:
         out: 축소
       locate:
         title: 내 위치 보기
+        metersUnit: 미터
         popup: 이 점의 {distance} {unit} 안에 있습니다
       base:
         standard: 표준

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 9ed97be28e0199cf5242b4913a72acfb261cce15..be85617499b07b98115e9d3cbb0940b24aa5ef70 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -2312,6 +2312,8 @@ lv:
         out: Samazināt
       locate:
         title: Rādīt manu atrašanās vietu
+        metersUnit: metri
+        feetUnit: pēdas
         popup: Tu esi {distance} {unit} no šī punkta
       base:
         standard: Standarta

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index a340f3509f305393569b3bc47ea14439a01abb62..0da151d32be7f8b73f5cce2d3d10a3c307cb173a 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1,6 +1,7 @@
 # Messages for Norwegian Bokmål (norsk bokmål)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Abbe98
 # Author: Abijeet Patro
 # Author: Citadell
 # Author: Danmichaelo
@@ -153,14 +154,14 @@ nb:
   api:
     notes:
       comment:
-        opened_at_html: Opprettet for %{when} siden
-        opened_at_by_html: Opprettet for %{when} siden av %{user}
-        commented_at_html: Oppdatert for %{when} siden
-        commented_at_by_html: Oppdatert for %{when} siden av %{user}
-        closed_at_html: Løst for %{when} siden
-        closed_at_by_html: Løst for %{when} siden av %{user}
-        reopened_at_html: Gjenåpnet for %{when} siden
-        reopened_at_by_html: Gjenåpnet for %{when} siden av %{user}
+        opened_at_html: Opprettet %{when}
+        opened_at_by_html: Opprettet %{when} av %{user}
+        commented_at_html: Oppdatert %{when}
+        commented_at_by_html: Oppdatert %{when} av %{user}
+        closed_at_html: Løst %{when}
+        closed_at_by_html: Løst %{when} av %{user}
+        reopened_at_html: Gjenåpnet %{when}
+        reopened_at_by_html: Gjenåpnet %{when} av %{user}
       rss:
         title: OpenStreetMap-merknader
         description_area: En liste over merknader, rapportert, kommentert på eller
@@ -176,13 +177,12 @@ nb:
   browse:
     created: Opprettet
     closed: Lukket
-    created_html: Opprettet for <abbr title='%{title}'>%{time} siden</abbr>
-    closed_html: Lukket for <abbr title='%{title}'>%{time} siden</abbr>
-    created_by_html: Opprettet for <abbr title='%{title}'>%{time} siden</abbr> av
-      %{user}
-    deleted_by_html: Slettet for <abbr title='%{title}'>%{time} siden</abbr> av %{user}
-    edited_by_html: Redigert for <abbr title='%{title}'>%{time} siden</abbr> av %{user}
-    closed_by_html: Lukket for <abbr title='%{title}'>%{time} siden</abbr> av %{user}
+    created_html: Opprettet <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Lukket <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Opprettet <abbr title='%{title}'>%{time}</abbr> av %{user}
+    deleted_by_html: Slettet <abbr title='%{title}'>%{time}</abbr> av %{user}
+    edited_by_html: Redigert <abbr title='%{title}'>%{time}</abbr> av %{user}
+    closed_by_html: Lukket <abbr title='%{title}'>%{time}</abbr> av %{user}
     version: Versjon
     in_changeset: Endringssett
     anonymous: anonym
@@ -202,9 +202,8 @@ nb:
       relation: Forbindelser (%{count})
       relation_paginated: Forbindelser (%{x}-%{y} av %{count})
       comment: Kommentarer (%{count})
-      hidden_commented_by: Skjult kommentar fra %{user} <abbr title='%{exact_time}'>%{when}
-        siden</abbr>
-      commented_by: Kommentar fra %{user} <abbr title='%{exact_time}'>%{when} siden</abbr>
+      hidden_commented_by: Skjult kommentar fra %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Kommentar fra %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML for endringssett
       osmchangexml: osmChange-XML
       feed:
@@ -1030,9 +1029,8 @@ nb:
       status: Status
       reports: Rapporter
       last_updated: Sist oppdatert
-      last_updated_time_html: <abbr title='%{title}'>%{time} siden</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} siden</abbr> av
-        %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> av %{user}
       link_to_reports: Se på rapporter
       reports_count:
         other: 1 rapport
@@ -1150,6 +1148,7 @@ nb:
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partnere
+    tou: Bruksvilkår
     osm_offline: OpenStreetMap databasen er for øyeblikket utilgjengelig mens essensielt
       vedlikeholdsarbeid utføres.
     osm_read_only: OpenStreetMap kan ikke redigeres akkurat nå, på grunn av nødvendig
@@ -1271,8 +1270,7 @@ nb:
         subject_own: '[OpenStreetMap] %{commenter} har kommentert en av dine endringer'
         subject_other: '[OpenStreetMap] %{commenter} har kommentert en endring du
           har vist interesse for'
-        your_changeset: '%{commenter} har kommentert en av dine endringer som ble
-          opprettet %{time}'
+        your_changeset: '%{commenter} har kommentert en av dine endringer %{time}'
         commented_changeset: '%{commenter} har kommentert en kartendring som du holder
           oversikten over, opprettet av %{changeset_author} den %{time}'
         partial_changeset_with_comment: med kommentaren '%{changeset_comment}'

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 07e7b92165739b5ecddfbd8437dd5fd57a281ca2..a408206b0ce6383a1b912495d15a477c16960298 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -552,7 +552,7 @@ pl:
           charging_station: Stacja ładowania pojazdów elektrycznych
           childcare: Opieka nad dziećmi
           cinema: Kino
-          clinic: Przychodnia
+          clinic: Klinika
           clock: Zegar
           college: Szkoła policealna
           community_centre: Centrum społeczności
@@ -947,7 +947,7 @@ pl:
           antiques: Antyki
           art: Sklep z dziełami sztuki
           bakery: Piekarnia
-          beauty: Salon kosmetyczny
+          beauty: Salon urody
           beverages: Sklep z napojami
           bicycle: Sklep rowerowy
           bookmaker: Bukmacher

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 373bc57dca71ed3738968c71a4387dafc9cb5173..e8dbd61d8979abe99d5dc9eecbccb6a5b7563faa 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -2641,6 +2641,8 @@ pt-BR:
         out: Afastar
       locate:
         title: Exibir Minha Localização
+        metersUnit: metros
+        feetUnit: pés
         popup: Você está a menos de {distance} {unit} deste ponto
       base:
         standard: Padrão

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index f6c97898e0253a307b07fab081d761d031aada30..35e1438fdba5a546c93ab3e6be31666d8166cd1d 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -43,31 +43,31 @@ pt-PT:
   helpers:
     submit:
       diary_comment:
-        create: Guardar
+        create: Gravar
       diary_entry:
         create: Publicar
         update: Atualizar
       issue_comment:
-        create: Adicionar Comentário
+        create: Adicionar comentário
       message:
         create: Enviar
       client_application:
         create: Registar
         update: Editar
       redaction:
-        create: Criar redação
-        update: Guardar redação
+        create: Criar supressão
+        update: Gravar supressão
       trace:
         create: Enviar
-        update: Guardar Alterações
+        update: Gravar alterações
       user_block:
         create: Criar bloqueio
         update: Atualizar o bloqueio
   activerecord:
     errors:
       messages:
-        invalid_email_address: não parece ser um endereço de e-mail válido
-        email_address_not_routable: não é possível rotear
+        invalid_email_address: não parece ser um endereço de correio eletrónico válido
+        email_address_not_routable: não é atingível
     models:
       acl: Aceder à lista de controlo
       changeset: Conjunto de alterações
@@ -2626,6 +2626,8 @@ pt-PT:
         out: Afastar
       locate:
         title: Mostrar a minha localização
+        metersUnit: metros
+        feetUnit: pés
         popup: Está a {distance} {unit} deste ponto
       base:
         standard: Mapa Padrão

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e56aa3eafd68ef81cc85e43f214cfe8555a8ae29..65b599ef7020946e734f954d55c67e758d286a29 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2643,6 +2643,8 @@ tr:
         out: Uzaklaştır
       locate:
         title: Konumumu göster
+        metersUnit: metreler
+        feetUnit: ayak
         popup: Bu noktadan {distance} {unit} içeridesin
       base:
         standard: Standart

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index bfd293fb9e65c55d904e2f7e4cb12baed47c965a..63f1239a9032ab309ac861bdc62388cf2b5f3e0b 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -2417,6 +2417,8 @@ zh-TW:
         out: 縮小
       locate:
         title: 顯示我的位置
+        metersUnit: 公尺
+        feetUnit: 英呎
         popup: 你在該點的 {distance}{unit} 範圍內
       base:
         standard: 標準