Add reference to settings-file in installation.md

[rails.git] / config / locales / ko.yml
diff --git a/config/locales/ko.yml b/config/locales/ko.yml

index cedd4e97c248436640f5cf580eea412df8f3a106..572069748d5397b761b5c46f49107bf31c9ec1e0 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -7,6 +7,7 @@
  # Author: Asdfqwer51
  # Author: B891202
  # Author: CYAN
  # Author: Asdfqwer51
  # Author: B891202
  # Author: CYAN
+# Author: D6283
  # Author: Freebiekr
  # Author: Garam
  # Author: Hym411
  # Author: Freebiekr
  # Author: Garam
  # Author: Hym411
@@ -27,6 +28,8 @@
  # Author: Wrightbus
  # Author: Ykhwong
  # Author: Ysjbserver
  # Author: Wrightbus
  # Author: Ykhwong
  # Author: Ysjbserver
+# Author: 予弦
+# Author: 神樂坂秀吉
  # Author: 고솜
  # Author: 밥풀떼기
  # Author: 아라
  # Author: 고솜
  # Author: 밥풀떼기
  # Author: 아라
@@ -37,6 +40,29 @@ ko:
      formats:
        friendly: '%Y년 %B %e일 %H:%M'
        blog: '%Y년 %B %e일'
      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:
    activerecord:
      errors:
        messages:
@@ -109,6 +135,21 @@ ko:
          description: 설명
          languages: 언어
          pass_crypt: 비밀번호
          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:
    editor:
      default: 기본값 (현재 %{name})
      potlatch:
@@ -122,18 +163,18 @@ ko:
        description: Potlatch 2 (브라우저 내 편집기)
      remote:
        name: 원격 제어
        description: Potlatch 2 (브라우저 내 편집기)
      remote:
        name: 원격 제어
-      description: 원격제어(JOSM 혹은 Merkaartor)
+      description: 원격 제어 (JOSM 또는 Merkaartor)
    api:
      notes:
        comment:
    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})]
        rss:
          title: OpenStreetMap 참고
          description_area: 내 지역 [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
@@ -149,12 +190,12 @@ ko:
    browse:
      created: 만들어짐
      closed: 닫힘
    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: 익명
      version: 버전
      in_changeset: 바뀜집합
      anonymous: 익명
@@ -174,9 +215,9 @@ ko:
        relation: 관계(%{count})
        relation_paginated: 관계(%{count}개 중 %{x}-%{y})
        comment: 의견(%{count}개)
        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:
        changesetxml: 바뀜집합 XML
        osmchangexml: osmChange XML
        feed:
@@ -252,17 +293,15 @@ ko:
        open_title: '해결되지 않은 참고 #%{note_name}'
        closed_title: '해결된 참고 #%{note_name}'
        hidden_title: '숨겨진 참고 #%{note_name}'
        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>에 숨김'
+      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>에 숨김'
        report: 이 참고 신고
      query:
        title: 지물 정보
        report: 이 참고 신고
      query:
        title: 지물 정보
@@ -301,7 +340,7 @@ ko:
    changeset_comments:
      comment:
        comment: '바뀜집합 #%{changeset_id}에 %{author}님이 새 덧글을 남김'
    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:
      comments:
        comment: '바뀜집합 #%{changeset_id}에 %{author}님이 새 댓글을 남김'
      index:
@@ -312,7 +351,14 @@ ko:
    diary_entries:
      new:
        title: 새 일기 항목
    diary_entries:
      new:
        title: 새 일기 항목
-      publish_button: 게시
+    form:
+      subject: '제목:'
+      body: '본문:'
+      language: '언어:'
+      location: '위치:'
+      latitude: '위도:'
+      longitude: '경도:'
+      use_map_link: 지도 사용
      index:
        title: 사용자의 일기
        title_friends: 친구의 일기
      index:
        title: 사용자의 일기
        title_friends: 친구의 일기
@@ -327,14 +373,6 @@ ko:
        newer_entries: 다음 항목
      edit:
        title: 일기 항목 수정
        newer_entries: 다음 항목
      edit:
        title: 일기 항목 수정
-      subject: '제목:'
-      body: '본문:'
-      language: '언어:'
-      location: '위치:'
-      latitude: '위도:'
-      longitude: '경도:'
-      use_map_link: 지도 사용
-      save_button: 저장
        marker_text: 일기 항목 위치
      show:
        title: '%{user}의 일기 | %{title}'
        marker_text: 일기 항목 위치
      show:
        title: '%{user}의 일기 | %{title}'
@@ -342,7 +380,6 @@ ko:
        leave_a_comment: 의견 남기기
        login_to_leave_a_comment: 덧글을 남기려면 %{login_link}해야 합니다.
        login: 로그인
        leave_a_comment: 의견 남기기
        login_to_leave_a_comment: 덧글을 남기려면 %{login_link}해야 합니다.
        login: 로그인
-      save_button: 저장
      no_such_entry:
        title: 해당 일기 항목이 없음
        heading: 'id에 항목 없음: %{id}'
      no_such_entry:
        title: 해당 일기 항목이 없음
        heading: 'id에 항목 없음: %{id}'
@@ -357,11 +394,13 @@ ko:
          other: 댓글 %{count}개
        edit_link: 이 항목 편집
        hide_link: 이 항목 숨기기
          other: 댓글 %{count}개
        edit_link: 이 항목 편집
        hide_link: 이 항목 숨기기
+      unhide_link: 이 항목 숨기기 취소
        confirm: 확인
        report: 이 항목 신고
      diary_comment:
        comment_from: '%{comment_created_at}에 %{link_user}님의 의견'
        hide_link: 이 의견 숨기기
        confirm: 확인
        report: 이 항목 신고
      diary_comment:
        comment_from: '%{comment_created_at}에 %{link_user}님의 의견'
        hide_link: 이 의견 숨기기
+      unhide_link: 이 댓글 숨기기 취소
        confirm: 확인
        report: 이 의견 신고
      location:
        confirm: 확인
        report: 이 의견 신고
      location:
@@ -383,7 +422,6 @@ ko:
        post: 게시물
        when: 날짜
        comment: 의견
        post: 게시물
        when: 날짜
        comment: 의견
-      ago: '%{ago} 전'
        newer_comments: 새 의견
        older_comments: 이전 의견
    geocoder:
        newer_comments: 새 의견
        older_comments: 이전 의견
    geocoder:
@@ -446,7 +484,7 @@ ko:
            clinic: 의원
            clock: 시계
            college: 전문대학
            clinic: 의원
            clock: 시계
            college: 전문대학
-          community_centre: ì£¼ë¯¼센터
+          community_centre: ì»¤ë®¤ë\8b\88í\8b° 센터
            courthouse: 법원
            crematorium: 화장장
            dentist: 치과
            courthouse: 법원
            crematorium: 화장장
            dentist: 치과
@@ -507,14 +545,14 @@ ko:
            university: 대학
            vending_machine: 자동 판매기
            veterinary: 동물병원
            university: 대학
            vending_machine: 자동 판매기
            veterinary: 동물병원
-          village_hall: ì£¼ë¯¼센터
+          village_hall: ì»¤ë®¤ë\8b\88í\8b° 센터
            waste_basket: 쓰레기통
            waste_disposal: 폐기물 처리장
            water_point: 워터 포인트
            youth_centre: 청소년 센터
          boundary:
            administrative: 행정 구역 경계
            waste_basket: 쓰레기통
            waste_disposal: 폐기물 처리장
            water_point: 워터 포인트
            youth_centre: 청소년 센터
          boundary:
            administrative: 행정 구역 경계
-          census: 국세조사 구역 경계
+          census: 인구조사 구역 경계
            national_park: 국립 공원
            protected_area: 보호 구역
          bridge:
            national_park: 국립 공원
            protected_area: 보호 구역
          bridge:
@@ -528,7 +566,7 @@ ko:
            "yes": 건물
          craft:
            brewery: 맥주 공장
            "yes": 건물
          craft:
            brewery: 맥주 공장
-          carpenter: 목수
+          carpenter: 목공
            electrician: 전기공
            gardener: 정원사
            painter: 화가
            electrician: 전기공
            gardener: 정원사
            painter: 화가
@@ -568,14 +606,14 @@ ko:
            pedestrian: 보행자 길
            platform: 승강장
            primary: 1차 도로
            pedestrian: 보행자 길
            platform: 승강장
            primary: 1차 도로
-          primary_link: 주요 도로
-          proposed: 제안된 도로
+          primary_link: 1차 도로
+          proposed: 계획 도로
            raceway: 경마장
            residential: 주거 도로
            rest_area: 휴게소
            road: 도로
            secondary: 2차 도로
            raceway: 경마장
            residential: 주거 도로
            rest_area: 휴게소
            road: 도로
            secondary: 2차 도로
-          secondary_link: 보조 도로
+          secondary_link: 2차 도로
            service: 접근 도로
            services: 고속도로 휴게소
            speed_camera: 속도 카메라
            service: 접근 도로
            services: 고속도로 휴게소
            speed_camera: 속도 카메라
@@ -587,7 +625,7 @@ ko:
            track: 농·임도
            traffic_signals: 교통 신호
            trail: 샛길
            track: 농·임도
            traffic_signals: 교통 신호
            trail: 샛길
-          trunk: ê³ ì\86\8dí\99\94도로
+          trunk: ê°\84ì\84  도로
            trunk_link: 간선 도로
            turning_loop: 방향전환 운전용 루프선
            unclassified: 분류되지 않은 도로
            trunk_link: 간선 도로
            turning_loop: 방향전환 운전용 루프선
            unclassified: 분류되지 않은 도로
@@ -621,7 +659,7 @@ ko:
            wreck: 난파선
            "yes": 유적지
          junction:
            wreck: 난파선
            "yes": 유적지
          junction:
-          "yes": 분기점
+          "yes": 교차로
          landuse:
            allotments: 텃밭
            basin: 유역
          landuse:
            allotments: 텃밭
            basin: 유역
@@ -649,9 +687,9 @@ ko:
            reservoir: 저수지
            reservoir_watershed: 저수지 유역
            residential: 주거 지역
            reservoir: 저수지
            reservoir_watershed: 저수지 유역
            residential: 주거 지역
-          retail: ì\86\8cë§¤ì \90
+          retail: ì\83\81ì\97\85 ì§\80ì\97
            road: 도로 지역
            road: 도로 지역
-          village_green: ë\85¹ì\83\89 ë§\88ì\9d\84
+          village_green: ë\85¹ì§\80 ê´\91ì\9e¥
            vineyard: 포도밭
            "yes": 토지 이용
          leisure:
            vineyard: 포도밭
            "yes": 토지 이용
          leisure:
@@ -796,7 +834,7 @@ ko:
            islet: 작은 섬
            isolated_dwelling: 독립 주택
            locality: 지역
            islet: 작은 섬
            isolated_dwelling: 독립 주택
            locality: 지역
-          municipality: ì\8b\9cì \95ì´\8c
+          municipality: ì§\80ë°©ì\9e\90ì¹\98ì²´
            neighbourhood: 마을
            postcode: 우편 번호
            quarter: 구역
            neighbourhood: 마을
            postcode: 우편 번호
            quarter: 구역
@@ -815,7 +853,7 @@ ko:
            construction: 건설 중인 철도
            disused: 폐선된 철도
            funicular: 케이블 카
            construction: 건설 중인 철도
            disused: 폐선된 철도
            funicular: 케이블 카
-          halt: ê¸°ì°¨ ì \95ì§\80
+          halt: ê°\84ì\9d´ì\97
            junction: 철도 분기점
            level_crossing: 건널목
            light_rail: 경전철
            junction: 철도 분기점
            level_crossing: 건널목
            light_rail: 경전철
@@ -860,7 +898,7 @@ ko:
            deli: 델리카트슨
            department_store: 백화점
            discount: 할인점
            deli: 델리카트슨
            department_store: 백화점
            discount: 할인점
-          doityourself: 손수짜기
+          doityourself: DIY
            dry_cleaning: 드라이클리닝
            electronics: 전자 제품 가게
            estate_agent: 공인 중개사
            dry_cleaning: 드라이클리닝
            electronics: 전자 제품 가게
            estate_agent: 공인 중개사
@@ -998,8 +1036,8 @@ ko:
        status: 상태
        reports: 보고서
        last_updated: 최근 업데이트
        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:
          의해)
        link_to_reports: 보고서 보기
        reports_count:
@@ -1256,7 +1294,6 @@ ko:
        send_message_to: '%{name}에게 새 메시지 보내기'
        subject: 제목
        body: 본문
        send_message_to: '%{name}에게 새 메시지 보내기'
        subject: 제목
        body: 본문
-      send_button: 보내기
        back_to_inbox: 받은 쪽지함으로 돌아가기
      create:
        message_sent: 메시지를 보냈습니다
        back_to_inbox: 받은 쪽지함으로 돌아가기
      create:
        message_sent: 메시지를 보냈습니다
@@ -1322,10 +1359,12 @@ ko:
          확인하세요.'
        legal_title: 법률
        legal_html: |-
          확인하세요.'
        legal_title: 법률
        legal_html: |-
-        이 사이트 및 많은 다른 관련된 부문은 공동체를 대표하여 <a href='https://osmfoundation.org/'>OpenStreetMap 재단</a>에서 정식적으로 운영합니다. OpenStreetMap 재단이 운영하는 부문의 이용은 <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+        이 사이트 및 많은 다른 관련된 부문은 공동체를 대표하여 <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> 조건 하에서 이루어집니다.
          <br>
          허용할 수 있는 이용 정책</a> 및 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">개인정보 정책</a> 조건 하에서 이루어집니다.
          <br>
-        만일 이용허락 또는 저작권 및 다른 법률적인 질문이나 사안이 있다면, <a href='https://osmfoundation.org/Contact'>OpenStreetMap 재단에 연락</a>하십시오.
+        만일 이용허락 또는 저작권 및 다른 법률적인 질문이 있다면, <a href='https://osmfoundation.org/Contact'>OpenStreetMap 재단에 연락</a>하십시오.
+        <br>
+        OpenStreetMap, 돋보기 로고와 State of the Map은 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">OpenStreetMap 재단의 등록상표입니다.</a>
        partners_title: 파트너
      copyright:
        foreign:
        partners_title: 파트너
      copyright:
        foreign:
@@ -1347,7 +1386,7 @@ ko:
            커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
          intro_2_html: |-
            OpenStreetMap 기여자를 명시하는 한, OpenStreetMap 데이터를 자유롭게 복사, 배포, 전송 및 적용할 수 있습니다.
            커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
          intro_2_html: |-
            OpenStreetMap 기여자를 명시하는 한, OpenStreetMap 데이터를 자유롭게 복사, 배포, 전송 및 적용할 수 있습니다.
-          데이터를 바꾸거나 데이터에 기초로 할 때는 오로지
+          데이터를 바꾸거나 데이터를 기초로 작업할 때는 오로지
            같은 라이선스에 따라서만 결과를 배포할 수 있습니다.
            <a href="https://opendatacommons.org/licenses/odbl/1.0/">전문</a>은
            당신의 권리와 책임을 설명합니다.
            같은 라이선스에 따라서만 결과를 배포할 수 있습니다.
            <a href="https://opendatacommons.org/licenses/odbl/1.0/">전문</a>은
            당신의 권리와 책임을 설명합니다.
@@ -1358,8 +1397,8 @@ ko:
          credit_title_html: OpenStreetMap 제작진 넣는 방법
          credit_1_html: '&ldquo;&copy; OpenStreetMap 기여자&rdquo;를 저작자로 사용해야 합니다.'
          credit_2_html: |-
          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을 배포할 때는 라이선스 이름과
            <a href="https://www.openstreetmap.org/copyright">이 저작권 문서</a>로
            링크하여 이렇게 할 수 있습니다.
            또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과
@@ -1419,7 +1458,7 @@ ko:
          contributors_za_html: |-
            <strong>남아프리카 공화국</strong>: <a href="http://www.ngi.gov.za/">Chief Directorate:
            National Geo-Spatial Information</a>에서의 데이터를
          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 저작권 및 데이터베이스 권리
          contributors_gb_html: |-
            <strong>영국</strong>: 육지 측량 데이터
            &copy; Crown 저작권 및 데이터베이스 권리
@@ -1541,7 +1580,7 @@ ko:
          매핑 주제를 협력하여 토론하고 문서하기 위한 여러 자료가 있습니다.
        welcome:
          url: /welcome
          매핑 주제를 협력하여 토론하고 문서하기 위한 여러 자료가 있습니다.
        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
          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 +1588,8 @@ ko:
          description: 커뮤니티에서 유지하는 초보자 가이드
        help:
          url: https://help.openstreetmap.org/
          description: 커뮤니티에서 유지하는 초보자 가이드
        help:
          url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
-        description: OSM의 질문 및 답변 사이트에서 질문하거나 답변을 찾아보세요.
+        title: 도움말 포럼
+        description: OpenStreetMap의 질문 및 답변 사이트에서 질문하거나 답변을 찾아보세요.
        mailing_lists:
          title: 메일링 리스트
          description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.
        mailing_lists:
          title: 메일링 리스트
          description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.
@@ -1569,8 +1608,8 @@ ko:
          description: 단체와의 오픈스트리트맵에 제작 계획이 있습니까? 환영판에서 알아야 할 것을 찾아보세요.
        wiki:
          url: https://wiki.openstreetmap.org/
          description: 단체와의 오픈스트리트맵에 제작 계획이 있습니까? 환영판에서 알아야 할 것을 찾아보세요.
        wiki:
          url: https://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: 깊이 있는 OSM 설명문서에 대해서는 위키를 찾아보세요.
+        title: OpenStreetMap 위키
+        description: 깊이 있는 OpenStreetMap 설명문서에 대해서는 위키를 찾아보세요.
      sidebar:
        search_results: 검색 결과
        close: 닫기
      sidebar:
        search_results: 검색 결과
        close: 닫기
@@ -1706,9 +1745,9 @@ ko:
        questions:
          title: 질문이 있습니까?
          paragraph_1_html: |-
        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: 편집할 시간이 없습니까? 참고를 추가하세요!
        start_mapping: 매핑 시작
        add_a_note:
          title: 편집할 시간이 없습니까? 참고를 추가하세요!
@@ -1734,7 +1773,6 @@ ko:
        visibility: '공개 여부:'
        visibility_help: 이게 무슨 뜻입니까?
        visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
        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:
        help: 도움말
        help_url: https://wiki.openstreetmap.org/wiki/Upload
      create:
@@ -1759,7 +1797,6 @@ ko:
        description: '설명:'
        tags: '태그:'
        tags_help: 쉼표로 구분
        description: '설명:'
        tags: '태그:'
        tags_help: 쉼표로 구분
-      save_button: 바뀜 저장
        visibility: '공개 여부:'
        visibility_help: 이게 무슨 뜻입니까?
      update:
        visibility: '공개 여부:'
        visibility_help: 이게 무슨 뜻입니까?
      update:
@@ -1793,7 +1830,6 @@ ko:
      trace:
        pending: 보류 중
        count_points: 점 %{count}개
      trace:
        pending: 보류 중
        count_points: 점 %{count}개
-      ago: '%{time_in_words_ago} 전'
        more: 더 보기
        trace_details: 궤적 상세보기
        view_map: 지도 보기
        more: 더 보기
        trace_details: 궤적 상세보기
        view_map: 지도 보기
@@ -1875,10 +1911,8 @@ ko:
    oauth_clients:
      new:
        title: 새 애플리케이션 등록
    oauth_clients:
      new:
        title: 새 애플리케이션 등록
-      submit: 등록
      edit:
        title: 내 애플리케이션 편집
      edit:
        title: 내 애플리케이션 편집
-      submit: 편집
      show:
        title: '%{app_name}에 데한 OAuth 자세한 정보'
        key: '컨슈머 키:'
      show:
        title: '%{app_name}에 데한 OAuth 자세한 정보'
        key: '컨슈머 키:'
@@ -2037,6 +2071,8 @@ ko:
        title: 약관
        heading: 약관
        heading_ct: 기여자 약관
        title: 약관
        heading: 약관
        heading_ct: 기여자 약관
+      read and accept with tou: 기여자 동의 및 사용 약관을 읽고 두 개의 체크 상자에 체크한 다음 계속 버튼을 눌러 주십시오.
+      contributor_terms_explain: 이 동의는 기존 기여와 앞으로의 기여자의 약관에 적용됩니다.
        read_ct: 상기의 기여자 약관을 읽었고 동의합니다
        read_tou: 이용약관을 읽었으며 동의합니다
        consider_pd: 위의 내용 외에도 내 기여가 퍼블릭 도메인에 있다고 간주합니다
        read_ct: 상기의 기여자 약관을 읽었고 동의합니다
        read_tou: 이용약관을 읽었으며 동의합니다
        consider_pd: 위의 내용 외에도 내 기여가 퍼블릭 도메인에 있다고 간주합니다
@@ -2079,12 +2115,10 @@ ko:
        remove as friend: 친구 제거
        add as friend: 친구 추가
        mapper since: '이후 매퍼:'
        remove as friend: 친구 제거
        add as friend: 친구 추가
        mapper since: '이후 매퍼:'
-      ago: (%{time_in_words_ago} 전)
        ct status: '기여자 약관:'
        ct undecided: 정의되지 않음
        ct declined: 거부됨
        ct status: '기여자 약관:'
        ct undecided: 정의되지 않음
        ct declined: 거부됨
-      ct accepted: '%{ago} 전에 승인함'
-      latest edit: '마지막 편집 %{ago}:'
+      latest edit: '마지막 편집 (%{ago}):'
        email address: '이메일 주소:'
        created from: '만든 위치:'
        status: '상태:'
        email address: '이메일 주소:'
        created from: '만든 위치:'
        status: '상태:'
@@ -2289,7 +2323,6 @@ ko:
          최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를
          사용하도록 노력하세요.'
        period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
          최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를
          사용하도록 노력하세요.'
        period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
-      submit: 차단 만들기
        tried_contacting: 사용자에게 연락하여 이를 멈추도록 요청했습니다.
        tried_waiting: 의사 소통에 대답한 사용자에게 충분한 시간을 주었습니다.
        needs_view: 차단 해제하기 전에 로그인해야 합니다
        tried_contacting: 사용자에게 연락하여 이를 멈추도록 요청했습니다.
        tried_waiting: 의사 소통에 대답한 사용자에게 충분한 시간을 주었습니다.
        needs_view: 차단 해제하기 전에 로그인해야 합니다
@@ -2300,7 +2333,6 @@ ko:
        reason: '%{name}님을 차단한 이유입니다. 상황에 대해 가능한 한 냉정하고 합리적으로 최대한 정중하게 상황을 설명하도록 하세요.
          모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요.'
        period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
        reason: '%{name}님을 차단한 이유입니다. 상황에 대해 가능한 한 냉정하고 합리적으로 최대한 정중하게 상황을 설명하도록 하세요.
          모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요.'
        period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요.
-      submit: 차단 업데이트
        show: 이 차단 보기
        back: 모든 차단 보기
        needs_view: 이 차단을 해제하기 전에 사용자가 로그인을 해야 합니까?
        show: 이 차단 보기
        back: 모든 차단 보기
        needs_view: 이 차단을 해제하기 전에 사용자가 로그인을 해야 합니까?
@@ -2322,18 +2354,31 @@ ko:
        title: '%{block_on}에 차단 해제함'
        heading: '%{block_by}에 의해 %{block_on}에 차단 해제함'
        time_future: 이 차단은 %{time}에 끝납니다.
        title: '%{block_on}에 차단 해제함'
        heading: '%{block_by}에 의해 %{block_on}에 차단 해제함'
        time_future: 이 차단은 %{time}에 끝납니다.
-      past: 이 차단은 %{time} 전에 끝났고 지금 해제할 수 없습니다.
+      past: 이 차단은 %{time}에 끝났고 지금 해제할 수 없습니다.
        confirm: 이 차단을 해제하겠습니까?
        revoke: 해제!
        flash: 이 차단을 해제했습니다.
        confirm: 이 차단을 해제하겠습니까?
        revoke: 해제!
        flash: 이 차단을 해제했습니다.
-    period:
-      one: 1시간
-      other: '%{count}시간'
      helper:
        time_future: '%{time}에 끝납니다.'
        until_login: 사용자가 로그인할 때까지 활성합니다.
        time_future_and_until_login: '%{time} 이후에 사용자가 로그인하면.'
      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} 사용자에 대한 차단 목록'
      blocks_on:
        title: '%{name}님에 대해 차단'
        heading: '%{name} 사용자에 대한 차단 목록'
@@ -2345,10 +2390,7 @@ ko:
      show:
        title: '%{block_on}님이 %{block_by}님에 의해 차단됨'
        heading: '%{block_on}님이 %{block_by}님에 의해 차단됨'
      show:
        title: '%{block_on}님이 %{block_by}님에 의해 차단됨'
        heading: '%{block_on}님이 %{block_by}님에 의해 차단됨'
-      time_future: '%{time}에 끝남'
-      time_past: '%{time} 전에 끝남'
        created: 만들어짐
        created: 만들어짐
-      ago: '%{time} 전'
        status: 상태
        show: 보기
        edit: 편집
        status: 상태
        show: 보기
        edit: 편집
@@ -2382,7 +2424,6 @@ ko:
        description: 설명
        created_at: 만든 날짜
        last_changed: 마지막으로 바뀜
        description: 설명
        created_at: 만든 날짜
        last_changed: 마지막으로 바뀜
-      ago_html: '%{when} 전'
    javascripts:
      close: 닫기
      share:
    javascripts:
      close: 닫기
      share:
@@ -2432,6 +2473,7 @@ ko:
          title: 레이어
        copyright: © <a href='%{copyright_url}'>오픈스트리트맵 기여자</a>
        donate_link_text: <a class='donate-attr' href='%{donate_url}'>기부하기</a>
          title: 레이어
        copyright: © <a href='%{copyright_url}'>오픈스트리트맵 기여자</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: 지도를 편집하려면 확대
      site:
        edit_tooltip: 지도 편집
        edit_disabled_tooltip: 지도를 편집하려면 확대
@@ -2566,7 +2608,6 @@ ko:
      edit:
        description: 설명
        heading: 교정 편집
      edit:
        description: 설명
        heading: 교정 편집
-      submit: 교정 저장
        title: 교정 편집
      index:
        empty: 보여줄 교정이 없습니다.
        title: 교정 편집
      index:
        empty: 보여줄 교정이 없습니다.
@@ -2575,7 +2616,6 @@ ko:
      new:
        description: 설명
        heading: 새 교정에 대한 정보 입력
      new:
        description: 설명
        heading: 새 교정에 대한 정보 입력
-      submit: 교정 만들기
        title: 새 교정 만들기
      show:
        description: '설명:'
        title: 새 교정 만들기
      show:
        description: '설명:'