]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/ko.yml
Pacify rubocop
[rails.git] / config / locales / ko.yml
index 714acccaa37924a9035d178958f2269df49ad510..4fbd2789968d987214548b61828bd1a71f93a427 100644 (file)
@@ -2,11 +2,14 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Alex00728
+# Author: Asdfqwer51
 # Author: B891202
 # Author: Freebiekr
 # Author: Hym411
 # Author: IRTC1015
+# Author: Idh0854
 # Author: Kwj2772
+# Author: Macofe
 # Author: Priviet
 # Author: Revi
 # Author: Ruila
@@ -14,7 +17,9 @@
 # Author: Stleamist
 # Author: Twotwo2019
 # Author: Wrightbus
+# Author: Ykhwong
 # Author: Ysjbserver
+# Author: 고솜
 # Author: 아라
 ---
 ko:
@@ -24,11 +29,11 @@ ko:
       blog: '%Y년 %B %e일'
   activerecord:
     models:
-      acl: í\86µí\96\89 ì \9cí\95\9c ëª©ë¡\9d
+      acl: ì \91ê·¼ í\86µì \9c ëª©ë¡\9d
       changeset: 바뀜집합
       changeset_tag: 바뀜집합 태그
       country: 국가
-      diary_comment: ì\9d¼ê¸° ë\8d§
+      diary_comment: ì\9d¼ê¸° ë\8c\93
       diary_entry: 일기 항목
       friend: 친구
       language: 언어
@@ -49,7 +54,7 @@ ko:
       relation_tag: 관계 태그
       session: 세션
       trace: 추적
-      tracepoint: ì¶\94ì \81 ì§\80ì \90
+      tracepoint: 추적 점
       tracetag: 추적 태그
       user: 사용자
       user_preference: 사용자 환경 설정
@@ -116,7 +121,7 @@ ko:
     version: 버전
     in_changeset: 바뀜집합
     anonymous: 익명
-    no_comment: (ì\9d\98견 없음)
+    no_comment: (ì½\94ë©\98í\8a¸ 없음)
     part_of: '다음의 일부:'
     download_xml: XML 다운로드
     view_history: 역사 보기
@@ -131,11 +136,11 @@ ko:
       way_paginated: 길 (%{count} 중 %{x}-%{y})
       relation: 관계 (%{count})
       relation_paginated: 관계 (%{count} 중 %{x}-%{y})
-      comment: ì\9d\98견 (%{count})
+      comment: ì½\94ë©\98í\8a¸ (%{count})
       hidden_commented_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에
-        ë\82¨ê¸´ ì\88¨ê²¨ì§\84 ë\8d§글'
+        ë\82¨ê¸´ ì\88¨ê²¨ì§\84 ë\8c\93글'
       commented_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에
-        ë\8d§글을 남김'
+        ë\8c\93글을 남김'
       changesetxml: 바뀜집합 XML
       osmchangexml: osmChange XML
       feed:
@@ -173,6 +178,7 @@ ko:
         way: 길
         relation: 관계
         changeset: 바뀜집합
+        note: 참고
     timeout:
       sorry: 죄송합니다, %{id} id인 %{type}에 대한 데이터를 얻는데 너무 오래 걸립니다.
       type:
@@ -180,10 +186,11 @@ ko:
         way: 길
         relation: 관계
         changeset: 바뀜집합
+        note: 참고
     redacted:
       redaction: 개정 %{id}
       message_html: 이 %{type}의 %{version}판은 비공개 처리되었기 때문에 볼 수 없습니다. 자세한 내용은 %{redaction_link}(을)를
-        참하세요.
+        참하세요.
       type:
         node: 노드
         way: 길
@@ -211,9 +218,9 @@ ko:
       open_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에 만듦'
       open_by_anonymous: 익명 사용자가 <abbr title='%{exact_time}'>%{when} 전</abbr>에 만듦
       commented_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에
-        ë\8d§글을 남김'
+        ë\8c\93글을 남김'
       commented_by_anonymous: 익명 사용자가 <abbr title='%{exact_time}'>%{when} 전</abbr>에
-        ë\8d§글을 남김
+        ë\8c\93글을 남김
       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>에 다시
@@ -239,8 +246,8 @@ ko:
       id: ID
       saved_at: 저장된 시간
       user: 사용자
-      comment: ë\8d§
-      area: 
+      comment: ë\8c\93
+      area: 
     list:
       title: 바뀜집합
       title_user: '%{user} 사용자의 바뀜집합'
@@ -258,13 +265,14 @@ ko:
     rss:
       title_all: OpenStreetMap 바뀜집합 토론
       title_particular: 'OpenStreetMap 바뀜집합 #%{changeset_id} 토론'
-      comment: 'ë°\94ë\80\9cì§\91í\95© #%{changeset_id}ì\97\90 %{author}ë\8b\98ì\9d´ ì\83\88 ë\8d§글을 남김'
+      comment: 'ë°\94ë\80\9cì§\91í\95© #%{changeset_id}ì\97\90 %{author}ë\8b\98ì\9d´ ì\83\88 ë\8c\93글을 남김'
       commented_at_html: '%{when} 전에 업데이트함'
       commented_at_by_html: '%{user} 사용자가 %{when} 전에 업데이트함'
       full: 전체 토론
   diary_entry:
     new:
       title: 새 일기 항목
+      publish_button: 발행
     list:
       title: 사용자의 일기
       title_friends: 친구의 일기
@@ -291,28 +299,28 @@ ko:
     view:
       title: '%{user}의 일기 | %{title}'
       user_title: '%{user}의 일기'
-      leave_a_comment: ë\8d§글 남기기
-      login_to_leave_a_comment: ë\8d§글을 남기려면 로그인해야 합니다. %{login_link}
+      leave_a_comment: ë\8c\93글 남기기
+      login_to_leave_a_comment: ë\8c\93글을 남기려면 로그인해야 합니다. %{login_link}
       login: 로그인
       save_button: 저장
     no_such_entry:
       title: 이러한 일기 항목이 없음
       heading: 'id에 항목 없음: %{id}'
-      body: ì£\84ì\86¡í\95©ë\8b\88ë\8b¤, %{id} idë¡\9c ë\90\9c ì\9d¼ê¸° í\95­ëª©ì\9d´ë\82\98 ë\8d§글이 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요.
+      body: ì£\84ì\86¡í\95©ë\8b\88ë\8b¤, %{id} idë¡\9c ë\90\9c ì\9d¼ê¸° í\95­ëª©ì\9d´ë\82\98 ë\8c\93글이 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요.
     diary_entry:
       posted_by: '%{link_user} 사용자가 %{language_link}로 %{created}에 게시함'
-      comment_link: ì\9d´ í\95­ëª©ì\97\90 ë\8d§글 남기기
+      comment_link: ì\9d´ í\95­ëª©ì\97\90 ë\8c\93글 남기기
       reply_link: 이 항목에 답변하기
       comment_count:
-        zero: ë\8d§글 없음
-        one: ë\8d§글 %{count}개
-        other: ë\8d§글 %{count}개
+        zero: ë\8c\93글 없음
+        one: ë\8c\93글 %{count}개
+        other: ë\8c\93글 %{count}개
       edit_link: 이 항목 편집
       hide_link: 이 항목 숨기기
       confirm: 확인
     diary_comment:
-      comment_from: '%{comment_created_at}ì\97\90 %{link_user}ì\97\90 ë\8c\80í\95\9c ë\8d§글'
-      hide_link: ì\9d´ ë\8d§글 숨기기
+      comment_from: '%{comment_created_at}ì\97\90 %{link_user}ì\97\90 ë\8c\80í\95\9c ë\8c\93글'
+      hide_link: ì\9d´ ë\8c\93글 숨기기
       confirm: 확인
     location:
       location: '위치:'
@@ -329,13 +337,13 @@ ko:
         title: OpenStreetMap 일기 항목
         description: OpenStreetMap의 사용자의 최근 일기 항목
     comments:
-      has_commented_on: '%{display_name} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¤ì\9d\8c ì\9d¼ê¸° í\95­ëª©ì\97\90 ë\8d§글을 남겼습니다'
+      has_commented_on: '%{display_name} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¤ì\9d\8c ì\9d¼ê¸° í\95­ëª©ì\97\90 ë\8c\93글을 남겼습니다'
       post: 게시물
       when: 날짜
-      comment: ë\8d§
+      comment: ë\8c\93
       ago: '%{ago} 전'
-      newer_comments: ì\83\88 ë\8d§
-      older_comments: ì\9d´ì \84 ë\8d§
+      newer_comments: ì\83\88 ë\8c\93
+      older_comments: ì\9d´ì \84 ë\8c\93
   export:
     title: 내보내기
     start:
@@ -400,7 +408,7 @@ ko:
           chair_lift: 체어 리프트
           drag_lift: 드래그 리프트
           gondola: 곤돌라 리프트
-          station: ì\82­ë\8f\84
+          station: ì¼\80ì\9d´ë¸\94 ì¹´ ì \95ë¥\98
         aeroway:
           aerodrome: 비행장
           apron: 에이프런
@@ -415,34 +423,34 @@ ko:
           atm: ATM
           bank: 은행
           bar: 주점
-          bbq: BBQ
+          bbq: 바베큐
           bench: 벤치
           bicycle_parking: 자전거 주차장
           bicycle_rental: 자전거 대여
-          biergarten: 비어 가든
-          boat_rental: 보트 대여
+          biergarten: 옥외 탁자
+          boat_rental: 보트 대여
           brothel: 매음굴
           bureau_de_change: 환전소
-          bus_station: 버스 정류장
+          bus_station: 버스 터미널
           cafe: 카페
-          car_rental: 자동차 대여
+          car_rental: 자동차 대여
           car_sharing: 카 셰어링
           car_wash: 세차장
           casino: 카지노
-          charging_station: ì¶©ì \84 ì\8a¤í\85\8cì\9d´ì\85\98
+          charging_station: ì \84기 ì\9e\90ë\8f\99ì°¨ ì¶©ì \84ì\86\8c
           childcare: 육아
           cinema: 영화관
-          clinic: ì§\84ë£\8cì\86\8c
+          clinic: ì\9d\98ì\9b\90
           clock: 시계
-          college: 전문대학
-          community_centre: ì»¤ë®¤ë\8b\88í\8b° 센터
+          college: 대학
+          community_centre: ì£¼ë¯¼센터
           courthouse: 법원
           crematorium: 화장장
           dentist: 치과
           doctors: 의원
           dormitory: 기숙사
-          drinking_water: ì\8b\9dì\88\98
-          driving_school: 운전 학êµ\90
+          drinking_water: ì\9d\8cì\88\98ë\8c\80
+          driving_school: 운전 학ì\9b\90
           embassy: 대사관
           emergency_phone: 긴급 전화
           fast_food: 패스트 푸드
@@ -464,11 +472,11 @@ ko:
           market: 시장
           marketplace: 시장
           monastery: 수도원
-          motorcycle_parking: 모터사이클 주차장
+          motorcycle_parking: 이륜자동차(오토바이) 주차장
           nightclub: 나이트 클럽
           nursery: 보육원
           nursing_home: 복지관
-          office: 사무실
+          office: 사
           parking: 주차장
           parking_entrance: 주차장 입구
           pharmacy: 약국
@@ -480,7 +488,7 @@ ko:
           prison: 교도소
           pub: 술집
           public_building: 공공 건물
-          reception_area: 리셉션 지
+          reception_area: 접수 구
           recycling: 재활용장
           restaurant: 음식점
           retirement_home: 노인정
@@ -520,7 +528,7 @@ ko:
         building:
           "yes": 건물
         craft:
-          brewery: 주조공
+          brewery: 맥주 공장
           carpenter: 목수
           electrician: 전기공
           gardener: 정원사
@@ -529,9 +537,9 @@ ko:
           plumber: 배관공
           shoemaker: 구두공
           tailor: 재단사
-          "yes": 공예 가게
+          "yes": 공예품점
         emergency:
-          ambulance_station: 구급차 스테이션
+          ambulance_station: 구급 의료 센터
           defibrillator: 제세동기
           landing_site: 비상 착륙지
           phone: 긴급 전화
@@ -541,29 +549,29 @@ ko:
           bus_guideway: 가이드 버스 차선
           bus_stop: 버스 정류장
           construction: 건설 중인 고속도로
-          cycleway: 자전거로
+          cycleway: 자전거 전용도
           elevator: 엘리베이터
-          emergency_access_point: ê¸´ê¸\89 ì \91ê·¼ ì§\80ì \90
+          emergency_access_point: ê¸´ê¸\89 ì\95¡ì\84¸ì\8a¤ í\8f¬ì\9d¸í\8a¸
           footway: 보도
           ford: 여울
-          living_street: 주택가
+          living_street: 주택가 도로
           milestone: 이정표
           motorway: 고속도로
           motorway_junction: 고속도로 교차점
           motorway_link: 고속도로
-          path: 
-          pedestrian: 보행자 
+          path: 보행
+          pedestrian: 보행자 도로
           platform: 플랫폼
-          primary: 주요 도로
+          primary: 대로 또는 국도, 지방도
           primary_link: 주요 도로
-          proposed: 제안 도로
+          proposed: 제안 도로
           raceway: 경마장
-          residential: 주거 도로
+          residential: 길 또는 주거 지역 도로
           rest_area: 휴게소
           road: 도로
-          secondary: 보조 도로
+          secondary: ë¡\9c ê¸\89ì\9d\98 ë³´ì¡° ë\8f\84ë¡\9c
           secondary_link: 보조 도로
-          service: 취부 도로
+          service: 관내 도로
           services: 고속도로 휴게소
           speed_camera: 속도 카메라
           steps: 계단
@@ -573,16 +581,16 @@ ko:
           track: 추적
           traffic_signals: 교통 신호
           trail: 샛길
-          trunk: 간선 도로
+          trunk: 대로 또는 간선 도로
           trunk_link: 간선 도로
-          unclassified: 분류í\95\98ì§\80 ì\95\8aì\9d\80 ë\8f\84ë¡\9c
+          unclassified: 분류ë\90\98ì§\80 ì\95\8aì\9d\80 ë\8f\84ë¡\9c
           unsurfaced: 비포장 도로
           "yes": 도로
         historic:
-          archaeological_site: 고고학장
+          archaeological_site: 유적지
           battlefield: 전쟁터
           boundary_stone: 경계석
-          building: 사적 건물
+          building: ì\97­ì\82¬ì \81 ê±´ë¬¼
           bunker: 벙커
           castle: 성
           church: 교회
@@ -593,11 +601,11 @@ ko:
           house: 주택
           icon: 아이콘
           manor: 장원
-          memorial: 기념
+          memorial: 기념
           mine: 광산
           monument: 기념물
           roman_road: 로마 도로
-          ruins: 유적
+          ruins: 폐허
           stone: 돌
           tomb: 무덤
           tower: 탑
@@ -608,14 +616,14 @@ ko:
           "yes": 분기점
         landuse:
           allotments: 텃밭
-          basin: ì\9b\85ë\8d©ì\9d´
+          basin: ì\9c ì\97­
           brownfield: 재개발지역
           cemetery: 묘지
           commercial: 상업 지역
           conservation: 보존
-          construction: 공사중
+          construction: 공사 
           farm: 농장
-          farmland: 농
+          farmland: 농
           farmyard: 농지
           forest: 숲
           garages: 차고
@@ -624,7 +632,7 @@ ko:
           industrial: 산업 지역
           landfill: 매립지
           meadow: 목초지
-          military: 군사
+          military: 군사 지역
           mine: 광산
           orchard: 과수원
           quarry: 채석장
@@ -640,10 +648,10 @@ ko:
           "yes": 토지 이용
         leisure:
           beach_resort: 해수욕장
-          bird_hide: ì¡°ë¥\98 ê´\80ì°°ì§\80
+          bird_hide: ì¡°ë¥\98 ê´\80ì°°ì\86\8c
           club: 클럽
           common: 공유지
-          dog_park:  공원
+          dog_park: 반려견 공원
           fishing: 낚시터
           fitness_centre: 피트니스 센터
           fitness_station: 피트니스 스테이션
@@ -651,9 +659,9 @@ ko:
           golf_course: 골프장
           horse_riding: 승마
           ice_rink: 아이스 링크
-          marina: 마리나
+          marina: 정박지
           miniature_golf: 미니어처 골프
-          nature_reserve: 자연 보호구
+          nature_reserve: 자연 보호구
           park: 공원
           pitch: 운동장
           playground: 놀이터
@@ -687,8 +695,8 @@ ko:
           cliff: 절벽
           crater: 크레이터
           dune: 모래 언덕
-          fell: 황야
-          fjord: í\94¼ì\9a\94르드
+          fell: 언덕
+          fjord: í\94¼ì\98¤르드
           forest: 숲
           geyser: 간헐천
           glacier: 빙하
@@ -700,14 +708,14 @@ ko:
           marsh: 습지
           moor: 습지
           mud: 진흙
-          peak: 산정상
-          point: ì§\80ì \90
+          peak: 봉우리
+          point: 점
           reef: 암초
           ridge: 산등성이
           rock: 바위
           saddle: 안부
           sand: 모래
-          scree: 급사면
+          scree: 자갈 비탈
           scrub: 우거진 숲
           spring: 온천
           stone: 돌
@@ -719,19 +727,19 @@ ko:
           wetland: 습지
           wood: 산림
         office:
-          accountant: 회계 사무소
+          accountant: 공인회계사 사무소
           administrative: 관리
-          architect: 건축
+          architect: 건축
           company: 회사
           employment_agency: 직업 소개소
           estate_agent: 부동산 중개
-          government: 관청
-          insurance: 보험 사무소
+          government: 정부 기관
+          insurance: 보험 회사 사옥
           lawyer: 변호사 사무실
-          ngo: NGO 사무실
-          telecommunication: 통신 사무실
+          ngo: 비정부 기구 사무실
+          telecommunication: 통신 회사 사옥
           travel_agent: 여행사
-          "yes": 사무실
+          "yes": 사
         place:
           allotments: 텃밭
           block: 벽돌
@@ -749,7 +757,7 @@ ko:
           locality: 지역
           moor: 습지
           municipality: 시정촌
-          neighbourhood: 인근 지역
+          neighbourhood: 마을
           postcode: 우편 번호
           region: 지역
           sea: 바다
@@ -757,20 +765,20 @@ ko:
           subdivision: 구분
           suburb: 교외
           town: 마을
-          unincorporated_area: 비법인 지역
+          unincorporated_area: 비인가 지역
           village: 마을
           "yes": 장소
         railway:
-          abandoned: 버려진 철도
+          abandoned: 폐선된 철도
           construction: 건설 중인 철도
           disused: 폐선된 철도
-          disused_station: í\8f\90ì\84 된 철도역
+          disused_station: í\8f\90ì\97­된 철도역
           funicular: 케이블 카
           halt: 기차 정지
           historic_station: 역사적인 철도역
           junction: 철도 분기점
           level_crossing: 건널목
-          light_rail: ê²½ì² ë\8f\84
+          light_rail: ê²½ì \84ì² 
           miniature: 미니어처 철도
           monorail: 모노레일
           narrow_gauge: 협궤 철도
@@ -780,15 +788,15 @@ ko:
           spur: 지선
           station: 철도역
           stop: 철도 정거장
-          subway: 지하철
-          subway_entrance: 지하철 입구
+          subway: 지하철
+          subway_entrance: 지하철역 출입구
           switch: 철도 분기
-          tram: 전차
+          tram: 전차 선로
           tram_stop: 전차 정거장
         shop:
           alcohol: 주점
           antiques: 골동품 상점
-          art: 예술 상점
+          art: 예술품 가게
           bakery: 제과점
           beauty: 미용실
           beverages: 음료 가게
@@ -801,14 +809,14 @@ ko:
           car_repair: 자동차 수리점
           carpet: 카펫 가게
           charity: 자선 가게
-          chemist: 화학품점
+          chemist: 약국
           clothes: 의류 상점
           computer: 컴퓨터 상점
           confectionery: 과자 가게
           convenience: 편의점
           copyshop: 복사점
           cosmetics: 화장품 상점
-          deli: 델리
+          deli: 델리카트슨
           department_store: 백화점
           discount: 할인점
           doityourself: Do-It-Yourself
@@ -828,7 +836,7 @@ ko:
           gift: 선물 가게
           greengrocer: 청과상
           grocery: 식료품 상점
-          hairdresser: 이발소
+          hairdresser: 미용실
           hardware: 철물점
           hifi: 고급 오디오
           insurance: 보험
@@ -838,7 +846,7 @@ ko:
           mall: 쇼핑몰
           market: 시장
           mobile_phone: 휴대폰 상점
-          motorcycle: 모터사이클 상점
+          motorcycle: 이륜자동차(오토바이) 상점
           music: 음반 가게
           newsagent: 신문 판매소
           optician: 안경점
@@ -851,7 +859,7 @@ ko:
           second_hand: 중고품 가게
           shoes: 신발 가게
           shopping_centre: 쇼핑 센터
-          sports: 스포츠 상
+          sports: 스포츠용품
           stationery: 문구점
           supermarket: 수퍼마켓
           tailor: 양복점
@@ -861,7 +869,7 @@ ko:
           wine: 주점
           "yes": 상점
         tourism:
-          alpine_hut: 산장
+          alpine_hut: 산장
           apartment: 아파트먼트
           artwork: 예술 작품
           attraction: 견인
@@ -869,7 +877,7 @@ ko:
           cabin: 오두막
           camp_site: 캠프장
           caravan_site: 캐러밴 사이트
-          chalet: 별장
+          chalet: 샬렛
           gallery: 갤러리
           guest_house: 게스트 하우스
           hostel: 호스텔
@@ -886,11 +894,11 @@ ko:
           "yes": 터널
         waterway:
           artificial: 인공 수로
-          boatyard: 보트야드
+          boatyard: 조선소
           canal: 운하
           dam: 댐
-          derelict_canal: 버려진 운하
-          ditch: 구거
+          derelict_canal: 사용 중단된 운하
+          ditch: 배수로
           dock: 부두
           drain: 배수로
           lock: 갑문
@@ -898,7 +906,7 @@ ko:
           mooring: 계선
           rapids: 급류
           river: 강
-          stream: 개울
+          stream: 하천
           wadi: 와디
           waterfall: 폭포
           weir: 어량
@@ -982,12 +990,12 @@ ko:
     legal_babble:
       title_html: 저작권 및 라이선스
       intro_1_html: |-
-        OpenStreetMap은 <i>오픈 데이터</i>로 <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>은 <i>오픈 데이터</i>로 <a
+        href="http://osmfoundation.org/">OpenStreetMap 재단</a> (OSMF)의 <a
         href="http://opendatacommons.org/licenses/odbl/">오픈 데이터
         커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
       intro_2_html: |-
-        당신은 가능하면 OpenStreetMap 제작진과 기여로
-        자유롭게 복사, 배포, 전송 및 데이터를 적용할 수 있습니다.
+        OpenStreetMap 기여자를 명시하는 한, OpenStreetMap 데이터를 자유롭게 복사, 배포, 전송 및 적용할 수 있습니다.
         데이터를 바꾸거나 데이터에 기초로 할 때는 오로지
         같은 라이선스에 따라서만 결과를 배포할 수 있습니다.
         <a href="http://opendatacommons.org/licenses/odbl/1.0/">전문</a>은
@@ -1026,11 +1034,11 @@ ko:
         지도 API는 무료로 제공할 수 없습니다.
         <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API 사용 정책</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">타일 사용 정책</a>과
-        <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim(이름) 사용 정책</a>를 참하세요.
+        <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim(이름) 사용 정책</a>를 참하세요.
       contributors_title_html: 우리의 기여자
       contributors_intro_html: |-
-        ì\9a°ë¦¬ì\9d\98 ê¸°ì\97¬ì\9e\90ë\8a\94 ì\88\98ì²\9c ëª\85ì\9d\98 ê°\9cì\9d¸ì\9e\85ë\8b\88ë\8b¤. ë\98\90í\95\9c êµ­ë¦½ì§\80ë\8f\84 ì \9cì\9e\91 ê¸°ê´\80ê³¼
-        같은 다른 소스의 공개 가능한 라이센스의 데이터를 포함합니다:
+        우리의 기여자는 수천 명입니다. 또한 국립지도 제작 기관과
+        같은 다른 소스의 공개 라이선스의 데이터를 포함하고 있습니다:
       contributors_at_html: |-
         <strong>오스트리아</strong>: <a href="http://data.wien.gv.at/">Stadt Wien</a>
         (<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>에 따름),
@@ -1068,7 +1076,7 @@ ko:
         자세한 내용과 OpenStreetMap을 개선하는 데 도움이 되는 데 사용한
         기타 자료에 대해서는 OpenStreetMap 위키에 있는 <a
         href="http://wiki.openstreetmap.org/wiki/Contributors">기여자 문서</a>
-        를 참하세요.
+        를 참하세요.
       contributors_footer_2_html: |-
         OpenStreetMap에 포함된 데이터는 원래 데이터 제공자가
         OpenStreetMap을 보증하거나 어떠한 보증도 제공하거나
@@ -1083,6 +1091,10 @@ ko:
         추가되었다고 생각하면 <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">게시
         중단 절차</a>를 참고하거나 <a href="http://dmca.openstreetmap.org/">온라인
         신고 페이지</a>에서 직접 제출하세요.
+      trademarks_title_html: <span id="trademarks"></span>등록 상표
+      trademarks_1_html: 오픈스트리트맵과 돋보기 로고는 오픈스트리트맵 재단의 등록상표입니다. 상표의 사용에 대해 의문이 있는 경우,
+        관련된 질문을 <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">라이선싱
+        작업 그룹</a>으로 보내 주세요.
   welcome_page:
     title: 환영합니다!
     introduction_html: |-
@@ -1104,11 +1116,11 @@ ko:
       paragraph_1_html: OpenStreetMap은 자신의 용어 중 일부가 있습니다. 여기에 편리하게 사용할 수 있는 몇 가지 핵심
         단어가 있습니다.
       editor_html: <strong>편집기</strong>는 지도를 편집하는 데 사용할 수 있는 프로그램이나 웹사이트입니다.
-      node_html: <strong>ë\85¸ë\93\9c</strong>ë\8a\94 ì\9d\8cì\8b\9dì \90 í\95\9c ê³³ì\9d´ë\82\98 ë\82\98무ì\99\80 ê°\99ì\9d\80, ì§\80ë\8f\84ì\97\90 ì\9e\88ë\8a\94 ì§\80ì \90ì\9e\85ë\8b\88ë\8b¤.
+      node_html: <strong>노드</strong>는 음식점 한 곳이나 나무와 같은, 지도에 있는 점입니다.
       way_html: <strong>길</strong>은 도로, 개울, 호수나 건물과 같은, 선이나 지역입니다.
       tag_html: |-
         <strong>태그</strong>는 음식점의 이름이나 도로의 속도 제한과 같은,
-        ë\85¸ë\93\9cë\82\98 ê¸¸ì\97\90 ë\8c\80í\95\9c 보충하는 데이터입니다.
+        ë\85¸ë\93\9cë\82\98 ê¸¸ì\97\90 ë\8c\80í\95´ 보충하는 데이터입니다.
     rules:
       title: 규칙
     questions:
@@ -1170,6 +1182,9 @@ ko:
       title: 포럼들
     irc:
       title: IRC
+    switch2osm:
+      title: switch2osm
+      description: 회사나 단체가 OpenStreetMap와 다른 서비스를 기반으로 전환하는 것에 도움을 주십시오.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1193,21 +1208,22 @@ ko:
       재해 피해를 입은 지역을 매핑하는 인도주의자, 그리고 더 많은 기여자를
       포함합니다.
       공동체에 대해 더 알아보려면, <a href='%{diary_path}'>사용자 일기</a>,
-      <a href='http://blogs.openstreetmap.org/'>공동체 블로그</a>와, <a href='http://www.osmfoundation.org/'>OSM 재단</a> 웹사이트를 참하세요.
+      <a href='http://blogs.openstreetmap.org/'>공동체 블로그</a>와, <a href='http://www.osmfoundation.org/'>OSM 재단</a> 웹사이트를 참하세요.
     open_data_title: 오픈 데이터
     open_data_html: |-
       OpenStreetMap은 <i>오픈 데이터</i>입니다: OpenStreetMap과 기여자를 제작진으로
       어떤 목적으로도 자유롭게 사용할 수 있습니다. 특정 방법으로 바꾸거나
       데이터에 빌드한다면, 동일한 라이선스에 따라 결과를 배포할 수 있습니다.
       자세한 내용은 <a href='%{copyright_path}'>저작권 및 라이선스 페이지</a>를
-      참고하세요.
+      참조하세요.
+    legal_title: 법률
     partners_title: 파트너
   notifier:
     diary_comment_notification:
-      subject: '[OpenStreetMap] %{user}ë\8b\98ì\9d´ ë\8b¹ì\8b ì\9d\98 ì\9d¼ê¸° í\95­ëª©ì\97\90 ë\8d§글을 남겼습니다'
+      subject: '[OpenStreetMap] %{user}ë\8b\98ì\9d´ ë\8b¹ì\8b ì\9d\98 ì\9d¼ê¸° í\95­ëª©ì\97\90 ë\8c\93글을 남겼습니다'
       hi: 안녕하세요 %{to_user}님,
-      header: '%{from_user}ë\8b\98ì\9d´ %{subject} ì \9c목ì\9d\98 OpenStreetMap ì\9d¼ê¸° í\95­ëª©ì\97\90 ë\8d§글을 남겼습니다:'
-      footer: '%{readurl}ì\97\90ì\84\9cë\8f\84 ë\8d§ê¸\80ì\9d\84 í\99\95ì\9d¸í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤. %{commenturl}ì\97\90ì\84\9c ë\8d§글을 남기거나 %{replyurl}에서
+      header: '%{from_user}ë\8b\98ì\9d´ %{subject} ì \9c목ì\9d\98 OpenStreetMap ì\9d¼ê¸° í\95­ëª©ì\97\90 ë\8c\93글을 남겼습니다:'
+      footer: '%{readurl}ì\97\90ì\84\9cë\8f\84 ë\8c\93ê¸\80ì\9d\84 í\99\95ì\9d¸í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤. %{commenturl}ì\97\90ì\84\9c ë\8c\93글을 남기거나 %{replyurl}에서
         답글을 남길 수 있습니다.'
     message_notification:
       hi: 안녕하세요 %{to_user}님,
@@ -1231,8 +1247,7 @@ ko:
         more_info_2: '다음에서 찾을 수 있습니다:'
       success:
         subject: '[OpenStreetMap] GPX 가져오기 성공'
-        loaded_successfully: 가능한 %{possible_points} 지점 중 %{trace_points} 지점을 성공적으로
-          불러왔습니다.
+        loaded_successfully: 가능한 %{possible_points} 점 중 %{trace_points} 점을 성공적으로 불러왔습니다.
     signup_confirm:
       subject: '[OpenStreetMap] OpenStreetMap에 오신 것을 환영합니다'
       greeting: 안녕하세요!
@@ -1264,34 +1279,34 @@ ko:
       anonymous: 익명 사용자
       greeting: 안녕하세요,
       commented:
-        subject_own: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d\98 ì°¸ê³ ì\97\90 ë\8d§글을 남겼습니다'
-        subject_other: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ê´\80ì\8b¬ ì\9e\88ë\8a\94 ì°¸ê³ ì\97\90 ë\8d§글을 남겼습니다'
-        your_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 %{place} ê·¼ì²\98ì\9d\98 ë\8b¹ì\8b ì\9d\98 ì§\80ë\8f\84ì\97\90 ë\8d§글을 남겼습니다.'
-        commented_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ë\8d§ê¸\80ì\9d\84 ë\82¨ê¸´ ì§\80ë\8f\84 ì°¸ê³ ì\97\90 ë\8d§글을 남겼습니다. 참고는 %{place}
+        subject_own: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d\98 ì°¸ê³ ì\97\90 ë\8c\93글을 남겼습니다'
+        subject_other: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ê´\80ì\8b¬ ì\9e\88ë\8a\94 ì°¸ê³ ì\97\90 ë\8c\93글을 남겼습니다'
+        your_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 %{place} ê·¼ì²\98ì\9d\98 ë\8b¹ì\8b ì\9d\98 ì§\80ë\8f\84ì\97\90 ë\8c\93글을 남겼습니다.'
+        commented_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ë\8c\93ê¸\80ì\9d\84 ë\82¨ê¸´ ì§\80ë\8f\84 ì°¸ê³ ì\97\90 ë\8c\93글을 남겼습니다. 참고는 %{place}
           근처에 있습니다.'
       closed:
         subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 참고 중 하나를 해결했습니다'
         subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고를 해결했습니다'
         your_note: '%{commenter} 사용자가 %{place} 근처의 당신의 지도 참고 중 하나를 해결했습니다.'
-        commented_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ë\8d§글을 남긴 지도 참고를 해결했습니다. 참고는 %{place}
+        commented_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ë\8c\93글을 남긴 지도 참고를 해결했습니다. 참고는 %{place}
           근처에 있습니다.'
       reopened:
         subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 참고 중 하나를 다시 활성했습니다'
         subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고를 다시 활성했습니다'
         your_note: '%{commenter} 사용자가 %{place} 근처의 당신의 지도 참고 중 하나를 다시 활성했습니다.'
-        commented_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ë\8d§글을 남긴 지도 참고를 다시 활성했습니다. 참고는 %{place}
+        commented_note: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ë\8c\93글을 남긴 지도 참고를 다시 활성했습니다. 참고는 %{place}
           근처에 있습니다.'
       details: 참고에 대한 자세한 사항은 %{url} 에서 찾을 수 있습니다.
     changeset_comment_notification:
       greeting: 안녕하세요,
       commented:
-        subject_own: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d\98 ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8d§글을 남겼습니다'
-        subject_other: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ê´\80ì\8b¬ ì\9e\88ë\8a\94 ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8d§글을 남겼습니다'
-        your_changeset: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ %{time}ì\97\90 ë§\8cë\93  ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8d§글을 달았습니다'
+        subject_own: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d\98 ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8c\93글을 남겼습니다'
+        subject_other: '[OpenStreetMap] %{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ ê´\80ì\8b¬ ì\9e\88ë\8a\94 ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8c\93글을 남겼습니다'
+        your_changeset: '%{commenter} ì\82¬ì\9a©ì\9e\90ê°\80 ë\8b¹ì\8b ì\9d´ %{time}ì\97\90 ë§\8cë\93  ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8c\93글을 달았습니다'
         commented_changeset: '%{commenter} 사용자가 %{changeset_author}이 %{time}에 만든,
-          ì£¼ì\8b\9c ì¤\91ì\9d¸ ì§\80ë\8f\84 ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8d§글을 달았습니다'
+          ì£¼ì\8b\9c ì¤\91ì\9d¸ ì§\80ë\8f\84 ë°\94ë\80\9cì§\91í\95©ì\97\90 ë\8c\93글을 달았습니다'
         partial_changeset_with_comment: '''%{changeset_comment}'' 덧글로'
-        partial_changeset_without_comment: ë\8d§글 없이
+        partial_changeset_without_comment: ë\8c\93글 없이
       details: 바뀜집합에 대한 자세한 사항은 %{url} 에서 찾을 수 있습니다.
   message:
     inbox:
@@ -1385,7 +1400,7 @@ ko:
         플래시 플레이어를 다운로드</a>할 수 있습니다. <a href="http://wiki.openstreetmap.org/wiki/Editing">몇
         가지 다른 설정</a> 또한 OpenStreetMap 편집을 위해 사용할 수 있습니다.
       potlatch_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우,
-        현재의 방식이나 지점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
+        현재 길이나 점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
       potlatch2_not_configured: Potlatch 2가 설정되지 않았습니다 - 자세한 정보는 http://wiki.openstreetmap.org/wiki/The_Rails_Port
       potlatch2_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch 2에서 저장하려면 저장을 클릭해야 합니다.)
       id_not_configured: iD가 설정되지 않았습니다
@@ -1396,7 +1411,7 @@ ko:
     search:
       search: 검색
       get_directions: 길 찾기
-      get_directions_title: ë\91\90 ì§\80ì \90 ì\82¬ì\9d´ì\9d\98 ê¸¸ ì°¾ê¸°
+      get_directions_title: 두 점 사이의 길 찾기
       from: 출발지
       to: 도착지
       where_am_i: 내가 어디있나요?
@@ -1406,20 +1421,19 @@ ko:
       table:
         entry:
           motorway: 고속도로
+          main_road: 주요 도로
           trunk: 간선 도로
-          primary: 주요 도로
+          primary: 대로 또는 국도, 지방도
           secondary: 보조 도로
-          unclassified: 분류하지 않은 도로
-          unsurfaced: 비포장 도로
+          unclassified: 분류되지 않은 도로
           track: 추적
-          byway: 옆길
           bridleway: 승마로
-          cycleway: 자전거로
+          cycleway: 자전거 도
           footway: 보도
           rail: 철도
           subway: 지하철
           tram:
-          - ê²½ì² ë\8f\84
+          - ê²½ì \84ì² 
           - 노면 전차
           cable:
           - 케이블 카
@@ -1428,7 +1442,7 @@ ko:
           - 공항 활주로
           - 공항 유도로
           apron:
-          - 공항 에이프런
+          - 공항 계류장
           - 터미널
           admin: 행정 구역 경계
           forest: 숲
@@ -1436,7 +1450,6 @@ ko:
           golf: 골프장
           park: 공원
           resident: 주거 지역
-          tourist: 관광 명소
           common:
           - 공유지
           - 목초지
@@ -1453,20 +1466,19 @@ ko:
           allotments: 텃밭
           pitch: 운동장
           centre: 스포츠 센터
-          reserve: 자연 보호구
-          military: 군사
+          reserve: 자연 보호구
+          military: 군사 지역
           school:
           - 학교
           - 대학교
-          building: ì¤\91ì\9a\94í\95\9c 건물
+          building: ì£¼ì\9a\94 건물
           station: 철도역
           summit:
           - 산꼭대기
-          - 산정상
+          - 봉우리
           tunnel: 점선 테두리 = 터널
           bridge: 검은 테두리 = 다리
           private: 개인 통행
-          permissive: 허용 통행
           destination: 목적 통행
           construction: 공사 중인 도로
     richtext_area:
@@ -1489,10 +1501,10 @@ ko:
       url: URL
   trace:
     visibility:
-      private: ë¹\84ê³µê°\9c (ì\9dµëª\85ì\9c¼ë¡\9cë§\8c ê³µì\9c , ì \95ë ¬í\95\98ì§\80 ì\95\8aì\9d\80 ì§\80ì \90)
-      public: ê³µê°\9c (ì\9dµëª\85ì\9c¼ë¡\9c ì¶\94ì \81 ëª©ë¡\9d ë³´ì\9e\84, ì \95ë ¬í\95\98ì§\80 ì\95\8aì\9d\80 ì§\80ì \90)
-      trackable: ì¶\94ì \81 ê°\80ë\8a¥ (ì\9dµëª\85ì\9c¼ë¡\9cë§\8c ê³µì\9c , ì\8b\9cê°\84 ê¸°ë¡\9dì\9c¼ë¡\9c ì \95ë ¬í\95\9c ì§\80ì \90)
-      identifiable: ì\8b\9dë³\84 ê°\80ë\8a¥ (ì\8b\9dë³\84 ê°\80ë\8a¥í\95\9c ì¶\94ì \81 ëª©ë¡\9d ë³´ì\9e\84, ì\8b\9cê°\84 ê¸°ë¡\9dì\9c¼ë¡\9c ì \95ë ¬í\95\9c ì§\80ì \90)
+      private: 비공개 (익명으로만 공유, 정렬하지 않은 점)
+      public: 공개 (익명으로 추적 목록 보임, 정렬하지 않은 점)
+      trackable: 추적 가능 (익명으로만 공유, 시간 기록으로 정렬한 점)
+      identifiable: 식별 가능 (식별 가능한 추적 목록 보임, 시간 기록으로 정렬한 점)
     create:
       upload_trace: GPS 추적 올리기
       trace_uploaded: GPX 파일을 올리고 있으며 데이터베이스에 삽입을 기다리고 있습니다. 이 작업은 보통 반 시간 내에 수행하며
@@ -1503,7 +1515,7 @@ ko:
       filename: '파일 이름:'
       download: 다운로드
       uploaded_at: '올려짐:'
-      points: 'ì§\80ì \90:'
+      points: '점:'
       start_coord: '시작 좌표:'
       map: 지도
       edit: 편집
@@ -1541,7 +1553,7 @@ ko:
       filename: '파일 이름:'
       download: 다운로드
       uploaded: '올려짐:'
-      points: 'ì§\80ì \90:'
+      points: '점:'
       start_coordinates: '시작 좌표:'
       map: 지도
       edit: 편집
@@ -1559,7 +1571,7 @@ ko:
       newer: 다음 추적
     trace:
       pending: 보류 중
-      count_points: '%{count} 지점'
+      count_points: 점 %{count}개
       ago: '%{time_in_words_ago} 전'
       more: 더 보기
       trace_details: 추적 자세한 정보 보기
@@ -1594,8 +1606,8 @@ ko:
       title: OpenStreetMap GPS 추적
     description:
       description_with_count:
-        one: '%{user}에서의 %{count} 지점으로 된 GPX 파일'
-        other: '%{user}에서의 %{count} 지점으로 된 GPX 파일'
+        one: '%{user}에서의 점 %{count}개로 된 GPX 파일'
+        other: '%{user}에서의 점 %{count}개으로 된 GPX 파일'
       description_without_count: '%{user}에서의 GPX 파일'
   application:
     require_cookies:
@@ -1614,11 +1626,12 @@ ko:
       allow_to: '다음 클라이언트 애플리케이션을 허용합니다:'
       allow_read_prefs: 사용자 환경 설정을 읽습니다.
       allow_write_prefs: 사용자 환경 설정을 수정합니다.
-      allow_write_diary: ì\9d¼ê¸° í\95­ëª©ì\9d\84 ë§\8cë\93¤ê³  ë\8d§글을 달고 친구를 만듭니다.
+      allow_write_diary: ì\9d¼ê¸° í\95­ëª©ì\9d\84 ë§\8cë\93¤ê³  ë\8c\93글을 달고 친구를 만듭니다.
       allow_write_api: 지도를 수정합니다.
       allow_read_gpx: 비공개 GPS 추적을 읽습니다.
       allow_write_gpx: GPS 추적을 올립니다.
       allow_write_notes: 참고를 수정합니다.
+      grant_access: 권한 부여
     oauthorize_success:
       title: 인증 요청이 허가됨
       allowed: 내 계정에 %{app_name} 애플리케이션 접근이 부여되었습니다.
@@ -1650,7 +1663,7 @@ ko:
       requests: '사용자가 다음 권한을 요청합니다:'
       allow_read_prefs: 사용자 환경 설정을 읽습니다.
       allow_write_prefs: 사용자 환경 설정을 수정합니다.
-      allow_write_diary: ì\9d¼ê¸° í\95­ëª©ì\9d\84 ë§\8cë\93¤ê³  ë\8d§글을 달고 친구를 만듭니다.
+      allow_write_diary: ì\9d¼ê¸° í\95­ëª©ì\9d\84 ë§\8cë\93¤ê³  ë\8c\93글을 달고 친구를 만듭니다.
       allow_write_api: 지도를 수정합니다.
       allow_read_gpx: 비공개 GPS 추적을 읽습니다.
       allow_write_gpx: GPS 추적을 올립니다.
@@ -1676,7 +1689,7 @@ ko:
       requests: '사용자가 다음 권한을 요청합니다:'
       allow_read_prefs: 사용자 환경 설정을 읽습니다.
       allow_write_prefs: 사용자 환경 설정을 수정합니다.
-      allow_write_diary: ì\9d¼ê¸° í\95­ëª©ì\9d\84 ë§\8cë\93¤ê³  ë\8d§글을 달고 친구를 만듭니다.
+      allow_write_diary: ì\9d¼ê¸° í\95­ëª©ì\9d\84 ë§\8cë\93¤ê³  ë\8c\93글을 달고 친구를 만듭니다.
       allow_write_api: 지도를 수정합니다.
       allow_read_gpx: 비공개 GPS 추적을 읽습니다.
       allow_write_gpx: GPS 추적을 올립니다.
@@ -1757,8 +1770,8 @@ ko:
     new:
       title: 가입하기
       no_auto_account_create: 불행하게도 현재로서는 자동으로 계정을 만들 수 없습니다.
-      contact_webmaster: 계정을 만들 수 있도록 <a href="mailto:webmaster@openstreetmap.org">웹마스터</a>에게
-        ë¬¸ì\9d\98í\95\98ì\84¸ì\9a\94. í\9d¬ë§\9dì\97\90 ë\8c\80ì\9d\91í\95\98기 ì\9c\84í\95´ ë\85¸ë ¥í\95\98ê³  ê°\80ë\8a¥í\95\9c ë¹¨ë¦¬ ì\9a\94ì²­ì\9d\84 ì²\98리í\95©ë\8b\88ë\8b¤.
+      contact_webmaster: 계정을 만들 수 있도록 <a href="%{webmaster}">웹마스터</a>에게 문의하세요. 희망에
+        대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다.
       about:
         header: 자유롭고 편집 가능
         html: |-
@@ -1769,28 +1782,19 @@ ko:
         약관</a>에 동의해야합니다.
       email address: '이메일 주소:'
       confirm email address: '이메일 주소 확인:'
-      not displayed publicly: ê³µê°\9cì \81ì\9c¼ë¡\9c ë³´ì\9d´지 않습니다 (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="이메일 주소에 대한 부분을 포함한 위키 개인 정보 정책">개인 정보 정책</a>을 참고하세요)
+      not displayed publicly: ê³µê°\9cì \81ì\9c¼ë¡\9c ë³´ì\97¬ì§\80지 않습니다 (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
+        title="이메일 주소 부분을 포함한 위키 개인정보 정책">개인 정보 정책</a>을 참조하세요)
       display name: '보여줄 이름:'
       display name description: 공개적으로 보여질 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
       external auth: '제3자 인증:'
       password: '비밀번호:'
       confirm password: '비밀번호 확인:'
       use external auth: 다른 제3자 로그인 방식 사용하기
-      auth association: |-
-        <p>당신의 계정은 아직 오픈스트리트맵 계정과 연동되어 있지 않습니다.</p>
-        <ul>
-          <li>오픈스트리트맵에 처음이라면, 아래 폼을 이용하여, 새 계정을 만들어주세요.</li>
-          <li>
-            이미 계정이 있으시다면, 로그인할 수 있습니다.
-            당신의 사용자명과 비밀번호를 사용하여 계정을 연동할 수 있습니다.
-            당신의 사용자 설정에 있는 당신의 ID와 함께
-          </li>
-        </ul>
+      auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
       continue: 가입하기
-      terms accepted: ì\83\88 ê¸°ì\97¬ì\9e\90 ì\95½ê´\80ì\97\90 ë\8f\99ì\9d\98í\95\98셔서 감사합니다!
+      terms accepted: ì\83\88 ê¸°ì\97¬ì\9e\90 ì\95½ê´\80ì\97\90 ë\8f\99ì\9d\98í\95´ ì£¼셔서 감사합니다!
       terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
-        위키 문서</a>를 참하세요.
+        위키 문서</a>를 참하세요.
     terms:
       title: 기여자 약관
       heading: 기여자 약관
@@ -1820,7 +1824,7 @@ ko:
       my messages: 내 메시지
       my profile: 내 프로필
       my settings: 프로필 설정
-      my comments: ë\82´ ë\8d§
+      my comments: ë\82´ ë\8c\93
       oauth settings: oauth 설정
       blocks on me: 나를 차단
       blocks by me: 나한테 차단
@@ -1863,7 +1867,7 @@ ko:
           moderator: 운영자 권한 해제
       block_history: 사용자가 차단을 받았습니다
       moderator_history: 사용자가 차단을 주었습니다
-      comments: ë\8d§
+      comments: ë\8c\93
       create_block: 이 사용자를 차단
       activate_user: 이 사용자 활성화
       deactivate_user: 이 사용자 비활성화
@@ -1886,7 +1890,7 @@ ko:
       current email address: '현재 이메일 주소:'
       new email address: '새 이메일 주소:'
       email never displayed publicly: (절대 공개하지 않습니다)
-      external auth: '외부 인증:'
+      external auth: '바깥 인증:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: 이게 뭐죠?
@@ -1946,8 +1950,7 @@ ko:
       reconfirm_html: 확인 이메일을 다시 보낼 필요가 있다면, <a href="%{reconfirm}">여기를 클릭하세요</a>.
     confirm_resend:
       success: '%{email} 로 새 확인 쪽지를 보냈는데 즉시 계정을 확인하는 대로 매핑을 할 수 있습니다.<br /><br />확인
-        요청을 보낼 때 스팸 방지 시스템을 사용한다면 어떤 확인 요청에 답변할 수 없으므로 화이트리스트에 webmaster@openstreetmap.org
-        가 있는지 확인하세요.'
+        요청을 보낼 때 스팸 방지 시스템을 사용한다면 어떤 확인 요청에 답변할 수 없으므로 화이트리스트에 %{sender} 가 있는지 확인하세요.'
       failure: '%{name} 사용자를 찾을 수 없습니다.'
     confirm_email:
       heading: 이메일 주소 바꾸기 확인
@@ -1998,9 +2001,16 @@ ko:
           이 문제를 토론하려면 %{webmaster}에게 문의할 수 있습니다.
         </p>
     auth_failure:
-      connection_failed: 인증 서버와의 연결에 실패했습니다.
+      connection_failed: 인증 제공자와 연결하는 데 실패했습니다
+      invalid_credentials: 잘못된 인증 자격 증명
       no_authorization_code: 인증 코드가 없습니다.
       unknown_signature_algorithm: 알려지지 않은 인증 알고리즘
+      invalid_scope: 잘못된 범위
+    auth_association:
+      heading: 당신의 아이디는 아직 오픈스트리트맵에 등록되지 않았습니다.
+      option_1: 만약 당신이 오픈스트리트맵에 처음 이라면,  밑의 양식을 써서 새 계정을 만들어 주세요.
+      option_2: 만약 당신이 이미 계정을 가지고 있다면, 당신은 당신의 사용자 이름과 비밀번호를 사용해 로그인 할 수 있고 당신의 아이디를
+        사용자 설정에서 등록 할 수 있습니다.
   user_role:
     filter:
       not_an_administrator: 관리자만 사용자 역할 관리를 수행할 수 있습니다, ​​당신은 관리자가 아닙니다.
@@ -2104,6 +2114,8 @@ ko:
       heading: '%{block_on} 사용자가 %{block_by} 사용자에 의해 차단됨'
       time_future: '%{time}에 끝남'
       time_past: '%{time} 전에 끝남'
+      created: 만들어짐
+      ago: '%{time} 전'
       status: 상태
       show: 보기
       edit: 편집
@@ -2126,19 +2138,19 @@ ko:
     rss:
       title: OpenStreetMap 참고
       description_area: 내 지역[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]에
-        ì°¸ê³ , ë\8d§글 또는 닫힌 참고 목록
+        ì°¸ê³ , ë\8c\93글 또는 닫힌 참고 목록
       description_item: '%{id} 참고에 대한 RSS 피드'
       opened: 새 참고 (%{place} 근처)
-      commented: ì\83\88 ë\8d§글 (%{place} 근처)
+      commented: ì\83\88 ë\8c\93글 (%{place} 근처)
       closed: 닫힌 참고 (%{place} 근처)
       reopened: 다시 활성된 참고 (%{place} 근처)
     entry:
-      comment: ë\8d§
+      comment: ë\8c\93
       full: 전체 참고
     mine:
-      title: '%{user} ì\82¬ì\9a©ì\9e\90ê°\80 ì \9cì¶\9cí\96\88ê±°ë\82\98 ë\8d§글을 남긴 참고'
+      title: '%{user} ì\82¬ì\9a©ì\9e\90ê°\80 ì \9cì¶\9cí\96\88ê±°ë\82\98 ë\8c\93글을 남긴 참고'
       heading: '%{user}의 참고'
-      subheading: '%{user} ì\82¬ì\9a©ì\9e\90ê°\80 ì \9cì¶\9cí\96\88ê±°ë\82\98 ë\8d§글을 남긴 참고'
+      subheading: '%{user} ì\82¬ì\9a©ì\9e\90ê°\80 ì \9cì¶\9cí\96\88ê±°ë\82\98 ë\8c\93글을 남긴 참고'
       id: ID
       creator: 만든이
       description: 설명
@@ -2154,6 +2166,7 @@ ko:
       link: 링크 또는 HTML
       long_link: 링크
       short_link: 짧은 링크
+      geo_uri: 지리 URI
       embed: HTML
       custom_dimensions: 사용자 지정 치수 설정
       format: '형식:'
@@ -2165,6 +2178,9 @@ ko:
       center_marker: 표시의 가운데 지도
       paste_html: HTML을 붙여 넣어 웹사이트에 포함시키세요
       view_larger_map: 큰 지도 보기
+      only_standard_layer: 표준 레이어만 그림으로 내보낼 수 있습니다
+    embed:
+      report_problem: 문제점 보고
     key:
       title: 범례
       tooltip: 범례
@@ -2175,7 +2191,7 @@ ko:
         out: 축소
       locate:
         title: 내 위치 보기
-        popup: ì\9d´ ì§\80ì \90ì\9d\98 {distance} {unit} ì\95\88ì\97\90 ì\9e\88ì\8aµë\8b\88ë\8b¤
+        popup: 이 점의 {distance} {unit} 안에 있습니다
       base:
         standard: 표준
         cycle_map: 사이클 지도
@@ -2197,10 +2213,10 @@ ko:
       map_notes_zoom_in_tooltip: 지도 참고를 보려면 확대
       map_data_zoom_in_tooltip: 지도 데이터를 보려면 확대
       queryfeature_tooltip: 지물 정보
-      queryfeature_disabled_tooltip: 지물 정보를 확인하려면 지도를 확대하세요
+      queryfeature_disabled_tooltip: 지물 정보를 확인하려면 확대
     changesets:
       show:
-        comment: ë\8d§
+        comment: ë\8c\93
         subscribe: 구독
         unsubscribe: 구독 해지
         hide_comment: 숨기기
@@ -2215,8 +2231,8 @@ ko:
         hide: 숨기기
         resolve: 해결
         reactivate: 다시 활성화
-        comment_and_resolve: ë\8d§글 & 해결
-        comment: ë\8d§
+        comment_and_resolve: ë\8c\93글 & 해결
+        comment: ë\8c\93
     edit_help: 편집하려는 위치에 지도를 이동하고 확대한 다음, 여기를 클릭하세요.
     directions:
       engines:
@@ -2226,14 +2242,35 @@ ko:
         mapquest_car: 자동차 (MapQuest)
         mapquest_foot: 도보 (MapQuest)
         osrm_car: 자동차 (OSRM)
+        mapzen_bicycle: 자전거 (Mapzen)
+        mapzen_car: 자동차 (Mapzen)
+        mapzen_foot: 도보 (Mapzen)
       directions: 길
       distance: 거리
       errors:
         no_route: 두 장소 사이의 경로를 찾을 수 없습니다.
         no_place: 죄송합니다 - 그 장소를 찾을 수 없습니다.
       instructions:
-        unnamed: 이름 없음
-        courtesy: '%{link}의 길 풍습'
+        continue_without_exit: '%{name}로 계속가세요'
+        slight_right_without_exit: '%{name}을(를) 따라 오른쪽으로 완만하게 도세요'
+        turn_right_without_exit: '%{name}을(를) 따라 오른쪽으로 도세요'
+        sharp_right_without_exit: '%{name}을(를) 따라 오른쪽으로 꺾으세요'
+        uturn_without_exit: '%{name}을(를) 따라 유턴하세요'
+        sharp_left_without_exit: '%{name}을(를) 따라 왼쪽으로 꺾으세요'
+        turn_left_without_exit: '%{name}을(를) 따라 왼쪽으로 도세요'
+        slight_left_without_exit: '%{name}을(를) 따라 왼쪽으로 완만하게 도세요'
+        via_point_without_exit: (점을 통해)
+        follow_without_exit: '%{name}을(를) 따라가세요'
+        roundabout_without_exit: '%{name}의 회전교차로에서'
+        leave_roundabout_without_exit: 회전교차로를 떠나세요 - %{name}
+        stay_roundabout_without_exit: 회전교차로에 머무세요 - %{name}
+        start_without_exit: '%{name}의 끝에서 시작'
+        destination_without_exit: 목적지에 도달합니다
+        against_oneway_without_exit: '%{name}(으)로 한 방향으로 가세요'
+        end_oneway_without_exit: '%{name}에서의 한 방향의 끝'
+        roundabout_with_exit: '%{name}에서의 회전교차로에서 %{exit} 출구로 떠나세요'
+        unnamed: 이름 없는 도로
+        courtesy: '%{link}의 가는 방향'
       time: 시간
     query:
       node: 노드