]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/ko.yml
Merge remote-tracking branch 'upstream/pull/2680'
[rails.git] / config / locales / ko.yml
index cedd4e97c248436640f5cf580eea412df8f3a106..ea1982d916fb3579f7c9f3d61fbce894f94df810 100644 (file)
@@ -1,12 +1,15 @@
 # Messages for Korean (한국어)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: A Retired User
 # Author: Abijeet Patro
 # Author: Alattalatta
 # Author: Alex00728
 # Author: Asdfqwer51
 # Author: B891202
 # Author: CYAN
+# Author: Codenstory
+# Author: D6283
 # Author: Freebiekr
 # Author: Garam
 # Author: Hym411
 # Author: Wrightbus
 # Author: Ykhwong
 # Author: Ysjbserver
+# Author: 予弦
+# Author: 神樂坂秀吉
 # Author: 고솜
+# Author: 그냥기여자
+# Author: 렌즈
 # Author: 밥풀떼기
 # Author: 아라
 # Author: 한림
@@ -37,6 +44,29 @@ ko:
     formats:
       friendly: '%Y년 %B %e일 %H:%M'
       blog: '%Y년 %B %e일'
+  helpers:
+    submit:
+      diary_comment:
+        create: 저장
+      diary_entry:
+        create: 게시
+        update: 업데이트
+      issue_comment:
+        create: 주석 추가
+      message:
+        create: 보내기
+      client_application:
+        create: 등록
+        update: 편집
+      redaction:
+        create: 교정 만들기
+        update: 교정 저장
+      trace:
+        create: 올리기
+        update: 바뀜 저장
+      user_block:
+        create: 차단 만들기
+        update: 차단 업데이트
   activerecord:
     errors:
       messages:
@@ -50,6 +80,7 @@ ko:
       diary_comment: 일기 의견
       diary_entry: 일기 항목
       friend: 친구
+      issue: 이슈
       language: 언어
       message: 메시지
       node: 교점
@@ -66,6 +97,7 @@ ko:
       relation: 관계
       relation_member: 관계 구성 요소
       relation_tag: 관계 태그
+      report: 보고서
       session: 세션
       trace: 궤적
       tracepoint: 궤적 지점
@@ -105,10 +137,25 @@ ko:
       user:
         email: 이메일
         active: 활성
-        display_name: 이름 보이기
+        display_name: 표시되는 이름
         description: 설명
         languages: 언어
         pass_crypt: 비밀번호
+  datetime:
+    distance_in_words_ago:
+      about_x_hours: 약 %{count}시간 전
+      about_x_months: 약 %{count}개월 전
+      about_x_years: 약 %{count}년 전
+      almost_x_years: 거의 %{count}년 전
+      half_a_minute: 30초 전
+      less_than_x_seconds: '%{count}초 미만 전'
+      less_than_x_minutes: '%{count}분 미만 전'
+      over_x_years: '%{count}년 이상 전'
+      x_seconds: '%{count}초 전'
+      x_minutes: '%{count}분 전'
+      x_days: '%{count}일 전'
+      x_months: '%{count}개월 전'
+      x_years: '%{count}년 전'
   editor:
     default: 기본값 (현재 %{name})
     potlatch:
@@ -122,18 +169,27 @@ ko:
       description: Potlatch 2 (브라우저 내 편집기)
     remote:
       name: 원격 제어
-      description: 원격제어(JOSM 혹은 Merkaartor)
+      description: 원격 제어 (JOSM 또는 Merkaartor)
+  auth:
+    providers:
+      none: 없음
+      openid: OpenID
+      google: 구글
+      facebook: 페이스북
+      windowslive: Windows Live
+      github: 깃허브
+      wikipedia: 위키백과
   api:
     notes:
       comment:
-        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} 전에 다시 활성화함'
-        reopened_at_by_html: '%{user}님이 %{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}에 다시 활성화함'
+        reopened_at_by_html: '%{user}님이 %{when}에 다시 활성화함'
       rss:
         title: OpenStreetMap 참고
         description_area: 내 지역 [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
@@ -149,12 +205,12 @@ ko:
   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: 익명
@@ -174,9 +230,9 @@ ko:
       relation: 관계(%{count})
       relation_paginated: 관계(%{count}개 중 %{x}-%{y})
       comment: 의견(%{count}개)
-      hidden_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> 의견'
+      commented_by: '%{user}님의 <abbr title=''%{exact_time}''>%{when}</abbr> 의견'
       changesetxml: 바뀜집합 XML
       osmchangexml: osmChange XML
       feed:
@@ -186,28 +242,28 @@ ko:
       discussion: 토론
       still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다.
     node:
-      title: '교점: %{name}'
-      history_title: '교점 역사: %{name}'
+      title_html: '교점: %{name}'
+      history_title_html: '교점 역사: %{name}'
     way:
-      title: '길: %{name}'
-      history_title: '길 역사: %{name}'
+      title_html: '길: %{name}'
+      history_title_html: '길 역사: %{name}'
       nodes: 교점
-      also_part_of:
+      also_part_of_html:
         one: '%{related_ways} 길의 일부'
         other: '%{related_ways} 길의 일부'
     relation:
-      title: '관계: %{name}'
-      history_title: '관계 역사: %{name}'
+      title_html: '관계: %{name}'
+      history_title_html: '관계 역사: %{name}'
       members: 구성 요소
     relation_member:
-      entry_role: '%{type}에서 %{role}의 %{name}'
+      entry_role_html: '%{type}에서 %{role}의 %{name}'
       type:
         node: 교점
         way: 길
         relation: 관계
     containing_relation:
-      entry: 관계 %{relation_name}
-      entry_role: (%{relation_role}로서) 관계 %{relation_name}
+      entry_html: 관계 %{relation_name}
+      entry_role_html: (%{relation_role}로서) 관계 %{relation_name}
     not_found:
       sorry: '죄송하지만, %{type} #%{id}을(를) 찾지 못했습니다.'
       type:
@@ -244,7 +300,9 @@ ko:
         tag: '%{key}=%{value} 태그에 대한 위키 설명 문서'
       wikidata_link: 위키데이터 %{page} 항목
       wikipedia_link: 위키백과 %{page} 문서
+      wikimedia_commons_link: 위키미디어 공용에서의 %{page} 항목
       telephone_link: '%{phone_number}(으)로 전화 걸기'
+      colour_preview: '%{colour_value}색 미리 보기'
     note:
       title: '참고: %{id}'
       new_note: 새로운 참고
@@ -252,17 +310,15 @@ ko:
       open_title: '해결되지 않은 참고 #%{note_name}'
       closed_title: '해결된 참고 #%{note_name}'
       hidden_title: '숨겨진 참고 #%{note_name}'
-      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> 의견'
-      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: 지물 정보
@@ -301,7 +357,7 @@ ko:
   changeset_comments:
     comment:
       comment: '바뀜집합 #%{changeset_id}에 %{author}님이 새 덧글을 남김'
-      commented_at_by_html: '%{user}님이 %{when} 전에 업데이트함'
+      commented_at_by_html: '%{user}님이 %{when}에 업데이트함'
     comments:
       comment: '바뀜집합 #%{changeset_id}에 %{author}님이 새 댓글을 남김'
     index:
@@ -312,7 +368,14 @@ ko:
   diary_entries:
     new:
       title: 새 일기 항목
-      publish_button: 게시
+    form:
+      subject: '제목:'
+      body: '본문:'
+      language: '언어:'
+      location: '위치:'
+      latitude: '위도:'
+      longitude: '경도:'
+      use_map_link: 지도 사용
     index:
       title: 사용자의 일기
       title_friends: 친구의 일기
@@ -327,28 +390,19 @@ ko:
       newer_entries: 다음 항목
     edit:
       title: 일기 항목 수정
-      subject: '제목:'
-      body: '본문:'
-      language: '언어:'
-      location: '위치:'
-      latitude: '위도:'
-      longitude: '경도:'
-      use_map_link: 지도 사용
-      save_button: 저장
       marker_text: 일기 항목 위치
     show:
       title: '%{user}의 일기 | %{title}'
       user_title: '%{user}의 일기'
       leave_a_comment: 의견 남기기
-      login_to_leave_a_comment: 덧글을 남기려면 %{login_link}해야 합니다.
+      login_to_leave_a_comment_html: 덧글을 남기려면 %{login_link}해야 합니다.
       login: 로그인
-      save_button: 저장
     no_such_entry:
       title: 해당 일기 항목이 없음
       heading: 'id에 항목 없음: %{id}'
       body: 안타깝게도, %{id} id로 된 일기 항목이나 덧글이 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지를 확인해보세요.
     diary_entry:
-      posted_by: '%{link_user}님이 %{language_link}로 %{created}에 게시함'
+      posted_by_html: '%{link_user}님이 %{language_link}로 %{created}에 게시함'
       comment_link: 이 항목에 의견 남기기
       reply_link: 이 항목에 답변하기
       comment_count:
@@ -357,11 +411,13 @@ ko:
         other: 댓글 %{count}개
       edit_link: 이 항목 편집
       hide_link: 이 항목 숨기기
+      unhide_link: 이 항목 숨기기 취소
       confirm: 확인
       report: 이 항목 신고
     diary_comment:
-      comment_from: '%{comment_created_at}에 %{link_user}님의 의견'
+      comment_from_html: '%{comment_created_at}에 %{link_user}님의 의견'
       hide_link: 이 의견 숨기기
+      unhide_link: 이 댓글 숨기기 취소
       confirm: 확인
       report: 이 의견 신고
     location:
@@ -383,20 +439,32 @@ ko:
       post: 게시물
       when: 날짜
       comment: 의견
-      ago: '%{ago} 전'
       newer_comments: 새 의견
       older_comments: 이전 의견
+  friendships:
+    make_friend:
+      heading: '%{user} 님을 친구로 추가할까요?'
+      button: 친구 추가
+      success: '%{name}님은 이제 친구입니다!'
+      failed: 죄송합니다, %{name}님을 친구로 추가하는 데 실패했습니다.
+      already_a_friend: 이미 %{name}님과 친구입니다.
+    remove_friend:
+      heading: '%{user}님을 친구 제거할까요?'
+      button: 친구 제거
+      success: '%{name}님을 친구에서 제거했습니다.'
+      not_a_friend: '%{name}님은 친구가 아닙니다.'
   geocoder:
     search:
       title:
-        latlon: <a href="https://openstreetmap.org/">내부</a> 결과
-        ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>에서의 결과
-        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon_html: <a href="https://openstreetmap.org/">내부</a> 결과
+        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a>에서의 결과
+        osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과
-        geonames: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과
-        osm_nominatim_reverse: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과
+        osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과
-        geonames_reverse: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과
+        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a>에서의
+          결과
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -446,7 +514,7 @@ ko:
           clinic: 의원
           clock: 시계
           college: 전문대학
-          community_centre: ì£¼ë¯¼센터
+          community_centre: ì»¤ë®¤ë\8b\88í\8b° 센터
           courthouse: 법원
           crematorium: 화장장
           dentist: 치과
@@ -507,14 +575,14 @@ ko:
           university: 대학
           vending_machine: 자동 판매기
           veterinary: 동물병원
-          village_hall: ì£¼ë¯¼센터
+          village_hall: ì»¤ë®¤ë\8b\88í\8b° 센터
           waste_basket: 쓰레기통
           waste_disposal: 폐기물 처리장
           water_point: 워터 포인트
           youth_centre: 청소년 센터
         boundary:
           administrative: 행정 구역 경계
-          census: 국세조사 구역 경계
+          census: 인구조사 구역 경계
           national_park: 국립 공원
           protected_area: 보호 구역
         bridge:
@@ -528,7 +596,7 @@ ko:
           "yes": 건물
         craft:
           brewery: 맥주 공장
-          carpenter: 목
+          carpenter: 목
           electrician: 전기공
           gardener: 정원사
           painter: 화가
@@ -568,14 +636,14 @@ ko:
           pedestrian: 보행자 길
           platform: 승강장
           primary: 1차 도로
-          primary_link: 주요 도로
-          proposed: 제안된 도로
+          primary_link: 1차 도로
+          proposed: 계획 도로
           raceway: 경마장
           residential: 주거 도로
           rest_area: 휴게소
           road: 도로
           secondary: 2차 도로
-          secondary_link: 보조 도로
+          secondary_link: 2차 도로
           service: 접근 도로
           services: 고속도로 휴게소
           speed_camera: 속도 카메라
@@ -587,7 +655,7 @@ ko:
           track: 농·임도
           traffic_signals: 교통 신호
           trail: 샛길
-          trunk: ê³ ì\86\8dí\99\94도로
+          trunk: ê°\84ì\84  도로
           trunk_link: 간선 도로
           turning_loop: 방향전환 운전용 루프선
           unclassified: 분류되지 않은 도로
@@ -621,7 +689,7 @@ ko:
           wreck: 난파선
           "yes": 유적지
         junction:
-          "yes": 분기점
+          "yes": 교차로
         landuse:
           allotments: 텃밭
           basin: 유역
@@ -649,9 +717,9 @@ ko:
           reservoir: 저수지
           reservoir_watershed: 저수지 유역
           residential: 주거 지역
-          retail: ì\86\8c매ì \90
+          retail: ì\83\81ì\97\85 ì§\80ì\97­
           road: 도로 지역
-          village_green: ë\85¹ì\83\89 ë§\88ì\9d\84
+          village_green: ë\85¹ì§\80 ê´\91ì\9e¥
           vineyard: 포도밭
           "yes": 토지 이용
         leisure:
@@ -796,7 +864,7 @@ ko:
           islet: 작은 섬
           isolated_dwelling: 독립 주택
           locality: 지역
-          municipality: ì\8b\9cì \95ì´\8c
+          municipality: ì§\80ë°©ì\9e\90ì¹\98ì²´
           neighbourhood: 마을
           postcode: 우편 번호
           quarter: 구역
@@ -815,7 +883,7 @@ ko:
           construction: 건설 중인 철도
           disused: 폐선된 철도
           funicular: 케이블 카
-          halt: ê¸°ì°¨ ì \95ì§\80
+          halt: ê°\84ì\9d´ì\97­
           junction: 철도 분기점
           level_crossing: 건널목
           light_rail: 경전철
@@ -860,7 +928,7 @@ ko:
           deli: 델리카트슨
           department_store: 백화점
           discount: 할인점
-          doityourself: 손수짜기
+          doityourself: DIY
           dry_cleaning: 드라이클리닝
           electronics: 전자 제품 가게
           estate_agent: 공인 중개사
@@ -998,8 +1066,8 @@ ko:
       status: 상태
       reports: 보고서
       last_updated: 최근 업데이트
-      last_updated_time_html: <abbr title='%{title}'>%{time} 전</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} 전</abbr> (%{user}님에
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> (%{user}님에
         의해)
       link_to_reports: 보고서 보기
       reports_count:
@@ -1039,11 +1107,10 @@ ko:
     reopen:
       reopened: 이슈 상태가 '열림'으로 설정되었습니다
     comments:
-      created_at: '%{datetime}에'
+      comment_from_html: '%{comment_created_at}에 %{user_link}님의 댓글'
       reassign_param: 이슈를 다시 할당하시겠습니까?
     reports:
-      updated_at: '%{datetime}에'
-      reported_by_html: '%{user}님이 %{category} 분류로 보고함'
+      reported_by_html: '%{updated_at}에 %{user}님이 %{category} 분류로 보고함'
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, 의견 #%{comment_id}'
@@ -1146,7 +1213,7 @@ ko:
       hi: 안녕하세요 %{to_user}님,
       header: '%{from_user}님이 OpenStreetMap을 통해 %{subject} 제목으로 된 메시지를 보냈습니다:'
       footer_html: 또한 %{readurl}에서 메시지를 읽을 수 있고 %{replyurl}에서 회신할 수 있습니다.
-    friend_notification:
+    friendship_notification:
       hi: 안녕하세요 %{to_user}님,
       subject: '[OpenStreetMap] %{user}님이 당신을 친구로 추가했습니다'
       had_added_you: '%{user}님이 당신을 OpenStreetMap 친구로 추가했습니다.'
@@ -1221,9 +1288,9 @@ ko:
       commented:
         subject_own: '[오픈스트리트맵] %{commenter}님이 내 바뀜집합에 덧글을 남겼습니다'
         subject_other: '[오픈스트리트맵] %{commenter}님이 내가 관심을 가진 바뀜집합에 뎟글을 남겼습니다'
-        your_changeset: '%{commenter}님이 내가 %{time}에 만든 바뀜집합에 덧글을 달았습니다'
+        your_changeset: '%{commenter}님이 %{time}에 내가 바뀜집합에 댓글을 달았습니다'
         commented_changeset: '%{commenter}님이 %{time}에 %{changeset_author}님이 만든 내가
-          주시중인 지도 바뀜집합에 덧글을 남겼습니다'
+          주시중인 바뀜집합에 댓글을 남겼습니다'
         partial_changeset_with_comment: ‘%{changeset_comment}’ 덧글로
         partial_changeset_without_comment: 의견 없이
       details: 바뀜집합에 대한 자세한 사항은 %{url}에서 찾을 수 있습니다.
@@ -1243,8 +1310,8 @@ ko:
       from: 보낸이
       subject: 제목
       date: 날짜
-      no_messages_yet: 아직 메시지가 없습니다. %{people_mapping_nearby_link}에서 마음에 드는 친구를 찾아보는
-        것은 어떨까요?
+      no_messages_yet_html: 아직 메시지가 없습니다. %{people_mapping_nearby_link}에서 마음에 드는 친구를
+        찾아보는 것은 어떨까요?
       people_mapping_nearby: 근처에 매핑한 사람
     message_summary:
       unread_button: 읽지 않음으로 표시
@@ -1253,10 +1320,9 @@ ko:
       destroy_button: 삭제
     new:
       title: 메시지 보내기
-      send_message_to: '%{name}에게 새 메시지 보내기'
+      send_message_to_html: '%{name}에게 새 메시지 보내기'
       subject: 제목
       body: 본문
-      send_button: 보내기
       back_to_inbox: 받은 쪽지함으로 돌아가기
     create:
       message_sent: 메시지를 보냈습니다
@@ -1267,7 +1333,7 @@ ko:
       body: 죄송합니다 해당 id로 된 메시지가 없습니다.
     outbox:
       title: 보낸 쪽지함
-      my_inbox: 내 %{inbox_link}
+      my_inbox_html: 내 %{inbox_link}
       inbox: 받은 쪽지함
       outbox: 보낸 쪽지함
       messages:
@@ -1276,8 +1342,8 @@ ko:
       to: 받는이
       subject: 제목
       date: 날짜
-      no_sent_messages: 아직 보낸 메시지가 없습니다. %{people_mapping_nearby_link}에서 마음에 드는 친구를
-        찾아보는 것은 어떨까요?
+      no_sent_messages_html: 아직 보낸 메시지가 없습니다. %{people_mapping_nearby_link}에서 마음에
+        드는 친구를 찾아보는 것은 어떨까요?
       people_mapping_nearby: 근처에 매핑한 사람
     reply:
       wrong_user: '''%{user}''님으로 로그인하고 있지만 답장을 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 답장을
@@ -1305,7 +1371,7 @@ ko:
     about:
       next: 다음
       copyright_html: <span>&copy;</span>OpenStreetMap<br>기여자
-      used_by: '%{name}의 지도 자료는 수많은 웹사이트와 모바일 앱, 하드웨어 장치에서 사용합니다'
+      used_by_html: '%{name}의 지도 자료는 수많은 웹사이트와 모바일 앱, 하드웨어 장치에서 사용합니다'
       lede_text: OpenStreetMap은 도로나 오솔길, 카페, 기차역 등에 대한 전세계에 있는 자료를 유지하고 기여하는 지도 제작자
         공동체로부터 제작됩니다.
       local_knowledge_title: 지역 지식
@@ -1321,20 +1387,25 @@ ko:
         그 결과물을 배포할 수 있습니다. 자세한 내용은 <a href=''%{copyright_path}''>저작권 및 라이선스 문서</a>에서
         확인하세요.'
       legal_title: 법률
-      legal_html: |-
-        이 사이트 및 많은 다른 관련된 부문은 공동체를 대표하여 <a href='https://osmfoundation.org/'>OpenStreetMap 재단</a>에서 정식적으로 운영합니다. OpenStreetMap 재단이 운영하는 부문의 이용은 <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        허용할 수 있는 이용 정책</a> 및 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">개인정보 정책</a> 조건 하에서 이루어집니다.
+      legal_1_html: 이 사이트 및 많은 다른 관련된 부문은 공동체를 대표하여 <a href='https://osmfoundation.org/'>OpenStreetMap
+        재단</a>에서 정식적으로 운영합니다. OpenStreetMap 재단이 운영하는 부문의 이용은 <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">이용
+        약관</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">허용할
+        수 있는 이용 정책</a> 및 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">개인정보처리방침</a>
+        조건 하에서 이루어집니다.
+      legal_2_html: |-
+        라이선스나 저작권, 법률 관련 의문점이 있다면
+        <a href='https://osmfoundation.org/Contact'>오픈스트리트맵 재단으로 문의</a>해주세요.
         <br>
-        만일 이용허락 또는 저작권 및 다른 법률적인 질문이나 사안이 있다면, <a href='https://osmfoundation.org/Contact'>OpenStreetMap 재단에 연락</a>하십시오.
+        오픈스트리트맵, 돋보기와 지도 로고는 <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">오픈스트리트맵 재단의 등록 상표입니다</a>.
       partners_title: 파트너
     copyright:
       foreign:
         title: 이 번역에 대한 정보
-        text: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우 영어 문서가 우선합니다
+        html: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우 영어 문서가 우선합니다
         english_link: 영어 원본
       native:
         title: 이 문서에 대한 정보
-        text: 저작권 문서의 영어 버전을 보고 있습니다. 이 문서의 %{native_link}으로 돌아갈 수 있으며 또는 저작권을 읽는
+        html: 저작권 문서의 영어 버전을 보고 있습니다. 이 문서의 %{native_link}으로 돌아갈 수 있으며 또는 저작권을 읽는
           것을 멈추고 %{mapping_link}할 수 있습니다.
         native_link: 한국어 버전
         mapping_link: 매핑을 시작
@@ -1347,7 +1418,7 @@ ko:
           커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
         intro_2_html: |-
           OpenStreetMap 기여자를 명시하는 한, OpenStreetMap 데이터를 자유롭게 복사, 배포, 전송 및 적용할 수 있습니다.
-          데이터를 바꾸거나 데이터에 기초로 할 때는 오로지
+          데이터를 바꾸거나 데이터를 기초로 작업할 때는 오로지
           같은 라이선스에 따라서만 결과를 배포할 수 있습니다.
           <a href="https://opendatacommons.org/licenses/odbl/1.0/">전문</a>은
           당신의 권리와 책임을 설명합니다.
@@ -1358,8 +1429,8 @@ ko:
         credit_title_html: OpenStreetMap 제작진 넣는 방법
         credit_1_html: '&ldquo;&copy; OpenStreetMap 기여자&rdquo;를 저작자로 사용해야 합니다.'
         credit_2_html: |-
-          ë\98\90í\95\9c ëª\85í\99\95í\95\98ê²\8c ë\8d°ì\9d´í\84°ë\8a\94 ì\98¤í\94\88 ë\8d°ì\9d´í\84°ë² ì\9d´ì\8a¤ ë\9d¼ì\9d´ì\84 ì\8a¤ì\97\90 ë\94°ë\9d¼ ì\82¬ì\9a©í\95  ì\88\98 ì\9e\88ì\9c¼ë©°,
-          지도 제작은 지도 타일을 사용할 때에 CC-BY-SA로 허가합니다.
+          ë\98\90í\95\9c ë\8d°ì\9d´í\84°ë\8a\94 ì\98¤í\94\88 ë\8d°ì\9d´í\84°ë² ì\9d´ì\8a¤ ë\9d¼ì\9d´ì\84 ì\8a¤ì\97\90 ë\94°ë\9d¼ ì\82¬ì\9a©í\95  ì\88\98 ì\9e\88ì\9c¼ë©°, ì§\80ë\8f\84 ì \9cì\9e\91ì\9d\80
+          지도 타일을 사용할 때에 CC-BY-SA로 허가한다는 내용을 명확하게 통지해야 합니다.
           <a href="https://www.openstreetmap.org/copyright">이 저작권 문서</a>로
           링크하여 이렇게 할 수 있습니다.
           또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과
@@ -1419,7 +1490,7 @@ ko:
         contributors_za_html: |-
           <strong>남아프리카 공화국</strong>: <a href="http://www.ngi.gov.za/">Chief Directorate:
           National Geo-Spatial Information</a>에서의 데이터를
-          포함합니다. State가 저작권을 소유합니다.
+          포함합니다. 국가가 저작권을 소유합니다.
         contributors_gb_html: |-
           <strong>영국</strong>: 육지 측량 데이터
           &copy; Crown 저작권 및 데이터베이스 권리
@@ -1441,7 +1512,7 @@ ko:
         infringement_2_html: |-
           저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에
           추가되었다고 생각하면 <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">게시
-          중단 절차</a>를 참고하거나 <a href="http://dmca.openstreetmap.org/">온라인
+          중단 절차</a>를 참고하거나 <a href="https://dmca.openstreetmap.org/">온라인
           신고 페이지</a>에서 직접 제출하세요.
         trademarks_title_html: <span id="trademarks"></span>등록 상표
         trademarks_1_html: OpenStreetMap, 돋보기 로고, 스테이트 오브 맵은 OpenStreetMap 재단의 등록상표입니다.
@@ -1454,16 +1525,16 @@ ko:
       shortlink: 짧은링크
       createnote: 참고 추가
       license:
-        copyright: 저작권 OpenStreetMap 기여자, 오픈 라이선스로 배포
+        copyright: 저작권 OpenStreetMap 및 기여자, 오픈 라이선스로 배포
       remote_failed: 편집을 실패했습니다 - JOSM이나 Merkaartor를 불러왔고 원격 제어 설정이 활성화되어 있는지 확인하세요
     edit:
       not_public: 공개할 편집을 설정하지 않았습니다.
-      not_public_description: 이렇게 하지 않으면 더 이상 지도를 편집할 수 없습니다. %{user_page}에서 공개로 편집을
-        설정할 수 있습니다.
+      not_public_description_html: 이렇게 하지 않으면 더 이상 지도를 편집할 수 없습니다. %{user_page}에서
+        공개로 편집을 설정할 수 있습니다.
       user_page_link: 사용자 문서
       anon_edits_link_text: 왜 이러한지 알아보세요.
-      flash_player_required: OpenStreetMap 플래시 편집기인 Potlatch를 사용하려면 플래시 플레이어가 필요합니다.
-        <a href="https://get.adobe.com/flashplayer">Adobe.com에서 플래시 플레이어를 다운로드</a>할
+      flash_player_required_html: OpenStreetMap 플래시 편집기인 Potlatch를 사용하려면 플래시 플레이어가
+        필요합니다. <a href="https://get.adobe.com/flashplayer">Adobe.com에서 플래시 플레이어를 다운로드</a>할
         수 있습니다. <a href="https://wiki.openstreetmap.org/wiki/Editing">몇 가지 다른 설정</a>
         또한 OpenStreetMap 편집을 위해 사용할 수 있습니다.
       potlatch_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는
@@ -1481,7 +1552,7 @@ ko:
       map_image: 지도 그림 (표준 레이어 보이기)
       embeddable_html: 내장된 HTML
       licence: 라이선스
-      export_details: OpenStreetMap 데이터는 <a href="https://opendatacommons.org/licenses/odbl/1.0/">오픈
+      export_details_html: OpenStreetMap 데이터는 <a href="https://opendatacommons.org/licenses/odbl/1.0/">오픈
         데이터 커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
       too_large:
         advice: '위의 내보내기가 실패하면, 아래에 나열된 원본 중 하나를 사용하는 것을 고려해주세요:'
@@ -1541,7 +1612,7 @@ ko:
         매핑 주제를 협력하여 토론하고 문서하기 위한 여러 자료가 있습니다.
       welcome:
         url: /welcome
-        title: OSM에 오신 것을 환영합니다
+        title: OpenStreetMap에 오신 것을 환영합니다
         description: OpenStreetMap 기초를 다루는 이 퀵 가이드로 시작합니다.
       beginners_guide:
         url: https://wiki.openstreetmap.org/wiki/Ko:%EC%B4%88%EB%B3%B4%EC%9E%90_%EC%95%88%EB%82%B4%EC%84%9C
@@ -1549,8 +1620,8 @@ ko:
         description: 커뮤니티에서 유지하는 초보자 가이드
       help:
         url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
-        description: OSM의 질문 및 답변 사이트에서 질문하거나 답변을 찾아보세요.
+        title: 도움말 포럼
+        description: OpenStreetMap의 질문 및 답변 사이트에서 질문하거나 답변을 찾아보세요.
       mailing_lists:
         title: 메일링 리스트
         description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.
@@ -1569,8 +1640,8 @@ ko:
         description: 단체와의 오픈스트리트맵에 제작 계획이 있습니까? 환영판에서 알아야 할 것을 찾아보세요.
       wiki:
         url: https://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: 깊이 있는 OSM 설명문서에 대해서는 위키를 찾아보세요.
+        title: OpenStreetMap 위키
+        description: 깊이 있는 OpenStreetMap 설명문서에 대해서는 위키를 찾아보세요.
     sidebar:
       search_results: 검색 결과
       close: 닫기
@@ -1706,9 +1777,9 @@ ko:
       questions:
         title: 질문이 있습니까?
         paragraph_1_html: |-
-          OpenStreetMapì\9d\80 프로젝트에 대해 배우고, 질문을 묻고 답하고,
+          OpenStreetMapì\97\90ë\8a\94 프로젝트에 대해 배우고, 질문을 묻고 답하고,
           매핑 주제를 협력하여 토론하고 문서화하기 위한 여러 자료가 있습니다.
-          <a href='%{help_url}'>ì\97¬ê¸°ì\84\9c ë\8f\84ì\9b\80ì\9d\84 ì\96»ì\9c¼ì\84¸ì\9a\94</a>. OpenStreetMapì\97\90 ê¸°ì\97¬í\95\98ê³  ì\8b¶ì\9d\80 ë\8b¨ì²´ì\97\90 ì\86\8dí\95\98ì\85¨나요? <a href='https://welcome.openstreetmap.org/'>Welcome Mat</a>을 방문해보세요.
+          <a href='%{help_url}'>ì\97¬ê¸°ì\84\9c ë\8f\84ì\9b\80ì\9d\84 ì\96»ì\9c¼ì\84¸ì\9a\94</a>. OpenStreetMapì\97\90 ê¸°ì\97¬í\95  ê³\84í\9a\8dì\9d\84 ê°\80ì§\84 ì¡°ì§\81ì\97\90 ì\86\8dí\95´ ì\9e\88나요? <a href='https://welcome.openstreetmap.org/'>Welcome Mat</a>을 방문해보세요.
       start_mapping: 매핑 시작
       add_a_note:
         title: 편집할 시간이 없습니까? 참고를 추가하세요!
@@ -1734,7 +1805,6 @@ ko:
       visibility: '공개 여부:'
       visibility_help: 이게 무슨 뜻입니까?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: 올리기
       help: 도움말
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
@@ -1745,6 +1815,8 @@ ko:
       traces_waiting:
         one: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지 더
           기다려주십시오.
+        other: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지
+          더 기다려주십시오.
     edit:
       title: '%{name} 경로 편집'
       heading: '%{name} 경로 편집'
@@ -1759,7 +1831,6 @@ ko:
       description: '설명:'
       tags: '태그:'
       tags_help: 쉼표로 구분
-      save_button: 바뀜 저장
       visibility: '공개 여부:'
       visibility_help: 이게 무슨 뜻입니까?
     update:
@@ -1792,8 +1863,9 @@ ko:
       newer: 다음 궤적
     trace:
       pending: 보류 중
-      count_points: 점 %{count}개
-      ago: '%{time_in_words_ago} 전'
+      count_points:
+        one: 점 1개
+        other: 점 %{count}개
       more: 더 보기
       trace_details: 궤적 상세보기
       view_map: 지도 보기
@@ -1818,7 +1890,7 @@ ko:
       upload_trace: 궤적 올리기
       see_all_traces: 모든 궤적 보기
       see_my_traces: 내 추적 보기
-    delete:
+    destroy:
       scheduled_for_deletion: 삭제 계획중인 궤적
     make_public:
       made_public: 추적이 공개적으로 만들어짐
@@ -1849,8 +1921,8 @@ ko:
   oauth:
     authorize:
       title: 내 계정에 접근 인증
-      request_access: '%{app_name} 애플리케이션이 %{user} 계정에 접근을 요청합니다. 애플리케이션이 다음 기능을 수행할
-        것인지 확인하세요. 원하는 만큼 많거나 적게 선택할 수 있습니다.'
+      request_access_html: '%{app_name} 애플리케이션이 %{user} 계정에 접근을 요청합니다. 애플리케이션이 다음
+        ê¸°ë\8a¥ì\9d\84 ì\88\98í\96\89í\95  ê²\83ì\9d¸ì§\80 í\99\95ì\9d¸í\95\98ì\84¸ì\9a\94. ì\9b\90í\95\98ë\8a\94 ë§\8cí\81¼ ë§\8eê±°ë\82\98 ì \81ê²\8c ì\84 í\83\9dí\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤.'
       allow_to: '다음 클라이언트 애플리케이션을 허용합니다:'
       allow_read_prefs: 사용자 환경 설정을 읽습니다.
       allow_write_prefs: 사용자 환경 설정을 수정합니다.
@@ -1862,7 +1934,7 @@ ko:
       grant_access: 권한 부여
     authorize_success:
       title: 인증 요청이 허가됨
-      allowed: 내 계정에 %{app_name} 애플리케이션 접근이 부여되었습니다.
+      allowed_html: 내 계정에 %{app_name} 애플리케이션 접근이 부여되었습니다.
       verification: 인증 코드는 %{code}입니다.
     authorize_failure:
       title: 인증 요청이 실패됨
@@ -1875,12 +1947,10 @@ ko:
   oauth_clients:
     new:
       title: 새 애플리케이션 등록
-      submit: 등록
     edit:
       title: 내 애플리케이션 편집
-      submit: 편집
     show:
-      title: '%{app_name}ì\97\90 ë\8d°한 OAuth 자세한 정보'
+      title: '%{app_name}ì\97\90 ë\8c\80한 OAuth 자세한 정보'
       key: '컨슈머 키:'
       secret: '컨슈머 비밀 값:'
       url: '요청 토큰 URL:'
@@ -1906,8 +1976,9 @@ ko:
       issued_at: 발행
       revoke: 해제!
       my_apps: 내 클라이언트 애플리케이션
-      no_apps: '%{oauth} 표준을 사용하여 OpenStreetMap과 함께 사용하기 위해 등록할 애플리케이션이 있습니까? 이 서비스에
-        OAuth를 요청하기 전에 웹 애플리케이션을 등록해야 합니다.'
+      no_apps_html: '%{oauth} 표준을 사용하여 OpenStreetMap과 함께 사용하기 위해 등록할 애플리케이션이 있습니까?
+        이 서비스에 OAuth를 요청하기 전에 웹 애플리케이션을 등록해야 합니다.'
+      oauth: OAuth
       registered_apps: '등록된 다음 클라이언트 애플리케이션이 있습니다:'
       register_new: 내 애플리케이션 등록
     form:
@@ -1938,7 +2009,7 @@ ko:
       heading: 로그인
       email or username: '이메일 주소 또는 사용자 이름:'
       password: '비밀번호:'
-      openid: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID:'
       remember: 로그인 상태를 기억하기
       lost password link: 비밀번호를 잊으셨나요?
       login_button: 로그인
@@ -2006,8 +2077,8 @@ ko:
     new:
       title: 가입하기
       no_auto_account_create: 불행하게도 현재로서는 자동으로 계정을 만들 수 없습니다.
-      contact_webmaster: 계정을 만들 수 있도록 <a href="%{webmaster}">웹마스터</a>에게 문의하세요. 희망에
-        대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다.
+      contact_webmaster_html: 계정을 만들 수 있도록 <a href="%{webmaster}">웹마스터</a>에게 문의하세요.
+        희망에 대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다.
       about:
         header: 자유롭게 편집 가능
         html: |-
@@ -2018,9 +2089,8 @@ ko:
         약관</a>에 동의해야합니다.
       email address: '이메일 주소:'
       confirm email address: '이메일 주소 확인:'
-      not displayed publicly: 당신의 주소는 공개되지 않습니다. 자세한 내용은 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
-        title="OSMF privacy policy including section on email addresses">개인정보 정책</a>을
-        참조하시기 바랍니다.
+      not_displayed_publicly_html: 당신의 주소는 공개되지 않습니다. 자세한 내용은 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
+        title="이메일 주소 절을 포함한 OSMF 개인정보처리방침">개인정보처리방침</a>을 참조하시기 바랍니다.
       display name: '표시 이름:'
       display name description: 공개적으로 표시되는 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
       external auth: '제3자 인증:'
@@ -2037,13 +2107,15 @@ ko:
       title: 약관
       heading: 약관
       heading_ct: 기여자 약관
+      read and accept with tou: 기여자 동의 및 사용 약관을 읽고 두 개의 체크 상자에 체크한 다음 계속 버튼을 눌러 주십시오.
+      contributor_terms_explain: 이 동의는 기존 기여와 앞으로의 기여자의 약관에 적용됩니다.
       read_ct: 상기의 기여자 약관을 읽었고 동의합니다
       read_tou: 이용약관을 읽었으며 동의합니다
       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>'
+      guidance_html: '약관을 이해하는 데 유용한 정보: <a href="%{summary}">사람이 읽을 수 있는 요약</a>과
+        일부 <a href="%{translations}">비공식 번역</a>'
       continue: 계속
       declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: 거부
@@ -2079,19 +2151,17 @@ ko:
       remove as friend: 친구 제거
       add as friend: 친구 추가
       mapper since: '이후 매퍼:'
-      ago: (%{time_in_words_ago} 전)
       ct status: '기여자 약관:'
       ct undecided: 정의되지 않음
       ct declined: 거부됨
-      ct accepted: '%{ago} 전에 승인함'
-      latest edit: '마지막 편집 %{ago}:'
+      latest edit: '마지막 편집 (%{ago}):'
       email address: '이메일 주소:'
       created from: '만든 위치:'
       status: '상태:'
       spam score: '스팸 점수:'
       description: 설명
       user location: 사용자 위치
-      if set location: 근처 사용자를 보려면 %{settings_link} 페이지에 집 위치를 설정하세요.
+      if_set_location_html: 근처 사용자를 보려면 %{settings_link} 페이지에 집 위치를 설정하세요.
       settings_link_text: 설정
       my friends: 내 친구
       no friends: 아직 어떠한 친구도 추가하지 않았습니다.
@@ -2147,7 +2217,7 @@ ko:
         disabled link text: 왜 편집할 수 없나요?
       public editing note:
         heading: 공개 편집
-        text: 현재 편집은 익명으로 나타나며, 다른 사람에게서 메시지를 받을 수 없고 자신의 위치가 공개되지 않습니다. 자신이 편집한 것을
+        html: 현재 편집은 익명으로 나타나며, 다른 사람에게서 메시지를 받을 수 없고 자신의 위치가 공개되지 않습니다. 자신이 편집한 것을
           드러내고 다른 사람이 웹 사이트를 통해 연락할 수 있게 하려면 아래 버튼을 클릭하세요. <b>0.6 API 개편 이후 공개 사용자만
           지도 데이터를 편집할 수 있습니다</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">이유
           알아보기</a>).<ul><li>공개 사용자가 되더라도 이메일 주소는 공개되지 않습니다.</li><li>이 동작은 취소할 수 없으며,
@@ -2211,25 +2281,14 @@ ko:
       flash success: 집 위치를 성공적으로 저장했습니다
     go_public:
       flash success: 지금 모든 편집을 공개하고, 편집을 허용하지 않습니다.
-    make_friend:
-      heading: '%{user}님을 친구로 추가할까요?'
-      button: 친구 추가
-      success: '%{name}님은 이제 친구입니다!'
-      failed: 죄송합니다, %{name}님을 친구로 추가하는 데 실패했습니다.
-      already_a_friend: 이미 %{name}님과 친구입니다.
-    remove_friend:
-      heading: '%{user}님을 친구 제거할까요?'
-      button: 친구 제거
-      success: '%{name}님을 친구에서 제거했습니다.'
-      not_a_friend: '%{name}님은 친구가 아닙니다.'
     index:
       title: 사용자
       heading: 사용자
       showing:
         one: '%{page}쪽(%{items} 중 %{first_item} 부분)'
         other: '%{page}쪽(%{items} 중 %{first_item}-%{last_item} 부분)'
-      summary: '%{name}님이 %{date}에 %{ip_address}에서 만들어짐'
-      summary_no_ip: '%{name}이(가) %{date}에 만들어짐'
+      summary_html: '%{name}님이 %{date}에 %{ip_address}에서 만들어짐'
+      summary_no_ip_html: '%{name}이(가) %{date}에 만들어짐'
       confirm: 선택한 사용자 확인
       hide: 선택한 사용자 숨기기
       empty: 일치하는 사용자를 찾을 수 없습니다
@@ -2237,7 +2296,7 @@ ko:
       title: 계정 정지
       heading: 계정 정지
       webmaster: 웹마스터
-      body: |-
+      body_html: |-
         <p>
           죄송합니다, 의심스러운 활동으로 인해 계정이 자동으로
           일시 중지되었습니다.
@@ -2284,23 +2343,21 @@ ko:
       back: 색인으로 돌아가기
     new:
       title: '%{name} 사용자 차단'
-      heading: '%{name} 사용자 차단'
+      heading_html: '%{name} 사용자 차단'
       reason: '%{name}님을 차단한 이유입니다. 메시지가 대중에 공개적으로 보이기 때문에, 상황에 대해 가능한 한 냉정하고 합리적으로
         최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를
         사용하도록 노력하세요.'
       period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
-      submit: 차단 만들기
       tried_contacting: 사용자에게 연락하여 이를 멈추도록 요청했습니다.
       tried_waiting: 의사 소통에 대답한 사용자에게 충분한 시간을 주었습니다.
       needs_view: 차단 해제하기 전에 로그인해야 합니다
       back: 모든 차단 보기
     edit:
       title: '%{name} 사용자에 대한 차단 편집'
-      heading: '%{name} 사용자에 대한 차단 편집'
+      heading_html: '%{name} 사용자에 대한 차단 편집'
       reason: '%{name}님을 차단한 이유입니다. 상황에 대해 가능한 한 냉정하고 합리적으로 최대한 정중하게 상황을 설명하도록 하세요.
         모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요.'
       period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
-      submit: 차단 업데이트
       show: 이 차단 보기
       back: 모든 차단 보기
       needs_view: 이 차단을 해제하기 전에 사용자가 로그인을 해야 합니까?
@@ -2320,35 +2377,45 @@ ko:
       empty: 아직 차단하지 않았습니다.
     revoke:
       title: '%{block_on}에 차단 해제함'
-      heading: '%{block_by}에 의해 %{block_on}에 차단 해제함'
+      heading_html: '%{block_by}에 의해 %{block_on}에 차단 해제함'
       time_future: 이 차단은 %{time}에 끝납니다.
-      past: 이 차단은 %{time} 전에 끝났고 지금 해제할 수 없습니다.
+      past: 이 차단은 %{time}에 끝났고 지금 해제할 수 없습니다.
       confirm: 이 차단을 해제하겠습니까?
       revoke: 해제!
       flash: 이 차단을 해제했습니다.
-    period:
-      one: 1시간
-      other: '%{count}시간'
     helper:
       time_future: '%{time}에 끝납니다.'
       until_login: 사용자가 로그인할 때까지 활성합니다.
       time_future_and_until_login: '%{time} 이후에 사용자가 로그인하면.'
-      time_past: '%{time} 전에 끝났습니다.'
+      time_past: '%{time}에 끝났습니다.'
+      block_duration:
+        hours:
+          one: 1시간
+          other: '%{count}시간'
+        days:
+          one: 1일
+          other: '%{count}일'
+        weeks:
+          one: 1주
+          other: '%{count}주'
+        months:
+          one: 1개월
+          other: '%{count}개월'
+        years:
+          one: 1년
+          other: '%{count}년'
     blocks_on:
       title: '%{name}님에 대해 차단'
-      heading: '%{name} 사용자에 대한 차단 목록'
+      heading_html: '%{name} 사용자에 대한 차단 목록'
       empty: '%{name}님은 아직 차단되지 않았습니다.'
     blocks_by:
       title: '%{name}님에 의해 차단'
-      heading: '%{name} 사용자에 의한 차단 목록'
+      heading_html: '%{name} 사용자에 의한 차단 목록'
       empty: '%{name}님은 아직 어떠한 차단도 하지 않았습니다.'
     show:
       title: '%{block_on}님이 %{block_by}님에 의해 차단됨'
-      heading: '%{block_on}님이 %{block_by}님에 의해 차단됨'
-      time_future: '%{time}에 끝남'
-      time_past: '%{time} 전에 끝남'
+      heading_html: '%{block_on} 님이 %{block_by} 님에 의해 차단됨'
       created: 만들어짐
-      ago: '%{time} 전'
       status: 상태
       show: 보기
       edit: 편집
@@ -2374,15 +2441,14 @@ ko:
       previous: « 이전
   notes:
     mine:
-      title: '%{user}님이 제출했거나 덧글을 남긴 참고'
+      title: '%{user} 님이 제출했거나 덧글을 남긴 참고'
       heading: '%{user}의 참고'
-      subheading_html: '%{user}님이 제출했거나 덧글을 남긴 참고'
+      subheading_html: '%{user} 님이 제출했거나 덧글을 남긴 참고'
       id: ID
       creator: 만든이
       description: 설명
       created_at: 만든 날짜
       last_changed: 마지막으로 바뀜
-      ago_html: '%{when} 전'
   javascripts:
     close: 닫기
     share:
@@ -2417,7 +2483,6 @@ ko:
         out: 축소
       locate:
         title: 내 위치 보기
-        popup: 이 점의 {distance} {unit} 안에 있습니다
       base:
         standard: 표준
         cycle_map: 사이클 지도
@@ -2430,8 +2495,9 @@ ko:
         gps: 공개 GPS 궤적
         overlays: 지도 문제를 해결하기 위해 오버레이를 활성화
         title: 레이어
-      copyright: © <a href='%{copyright_url}'>오픈스트리트맵 기여자</a>
+      copyright: © <a href='%{copyright_url}'>OpenStreetMap 기여자</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>기부하기</a>
+      terms: <a href='%{terms_url}' target='_blank'>웹 사이트 및 API 약관</a>
     site:
       edit_tooltip: 지도 편집
       edit_disabled_tooltip: 지도를 편집하려면 확대
@@ -2452,7 +2518,7 @@ ko:
       new:
         intro: 실수했거나 없는 무언가를 발견했나요? 다른 매퍼에게 알려주어 고칠 수 있게 해주세요. 마커를 올바른 위치로 이동하고, 참고를
           남겨 문제를 설명해주세요.
-        advice: 노트는 공개되어 지도 업데이트에 쓰일 수 있으므로 개인 정보 또는 저작권이 있는 지도나 디렉터리 리스팅의 정보를 입력하지
+        advice: 노트는 공개되어 지도 업데이트에 쓰일 수 있으므로 개인정보 또는 저작권이 있는 지도나 디렉터리 리스팅의 정보를 입력하지
           마십시오.
         add: 참고 추가
       show:
@@ -2566,7 +2632,6 @@ ko:
     edit:
       description: 설명
       heading: 교정 편집
-      submit: 교정 저장
       title: 교정 편집
     index:
       empty: 보여줄 교정이 없습니다.
@@ -2575,7 +2640,6 @@ ko:
     new:
       description: 설명
       heading: 새 교정에 대한 정보 입력
-      submit: 교정 만들기
       title: 새 교정 만들기
     show:
       description: '설명:'