Revert "Use Redcarpet::Render::XHTML instead of our custom renderer"

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

index 14465566a31869cfe6ceb91e8efa78c1874b83c3..05a812e27654ad2f4a63d327de3f42264f9eed85 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -90,9 +90,9 @@ ko:
        box: 사각형
        closed_at: "종료된 때:"
        created_at: "생성된 때:"
        box: 사각형
        closed_at: "종료된 때:"
        created_at: "생성된 때:"
-      has_nodes: "ë\8a\94(ì\9d\80) ë\8b¤ì\9d\8c ë\85¸ë\93\9c %{count}ê°\9cë¥¼ ê°\80ì§\80ê³  ì\9e\88ì\8aµë\8b\88ë\8b¤:"
-      has_relations: "ë\8a\94(ì\9d\80) ë\8b¤ì\9d\8c ê´\80ê³\84 %{count}ê°\9cë¥¼ ê°\80ì§\80ê³  ì\9e\88ì\8aµë\8b\88ë\8b¤:"
-      has_ways: "ë\8a\94(ì\9d\80) ë\8b¤ì\9d\8c ê¸¸ %{count}ê°\9cë¥¼ ê°\80ì§\80ê³  ì\9e\88ì\8aµë\8b\88ë\8b¤:"
+      has_nodes: "ë\8b¤ì\9d\8c ë\85¸ë\93\9c %{count}ê°\9c ì\9e\88ì\9d\8c:"
+      has_relations: "ë\8b¤ì\9d\8c ê´\80ê³\84 %{count}ê°\9c ì\9e\88ì\9d\8c:"
+      has_ways: "ë\8b¤ì\9d\8c ê¸¸ %{count}ê°\9c ì\9e\88ì\9d\8c:"
        no_bounding_box: 이 바뀜집합에서 어떤 테두리 지정 사각형도 저장되지 않았습니다.
        show_area_box: 구역 사각형 표시
      common_details: 
        no_bounding_box: 이 바뀜집합에서 어떤 테두리 지정 사각형도 저장되지 않았습니다.
        show_area_box: 구역 사각형 표시
      common_details: 
@@ -113,7 +113,12 @@ ko:
          node: 노드 편집
          relation: 관계 편집
          way: 길 편집
          node: 노드 편집
          relation: 관계 편집
          way: 길 편집
-      loading: 불러 오는 중...
+      larger: 
+        area: 큰 지도에서 지역 보기
+        node: 큰 지도에서 노드 보기
+        relation: 큰 지도에서 관계 보기
+        way: 큰 지도에서 길 보기
+      loading: 불러오는 중...
      navigation: 
        all: 
          next_changeset_tooltip: 다음 바뀜집합
      navigation: 
        all: 
          next_changeset_tooltip: 다음 바뀜집합
@@ -129,8 +134,8 @@ ko:
          next_changeset_tooltip: "%{user}의 다음 편집"
          prev_changeset_tooltip: "%{user}의 이전 편집"
      node: 
          next_changeset_tooltip: "%{user}의 다음 편집"
          prev_changeset_tooltip: "%{user}의 이전 편집"
      node: 
-      download_xml: XML ë\82´ë ¤ë°\9bê¸°
-      edit: 편집
+      download_xml: XML ë\8b¤ì\9a´ë¡\9cë\93\9c
+      edit: 노드 편집
        node: 노드
        node_title: "노드: %{node_name}"
        view_history: 역사 보기
        node: 노드
        node_title: "노드: %{node_name}"
        view_history: 역사 보기
@@ -138,10 +143,10 @@ ko:
        coordinates: "좌표:"
        part_of: "포함되는 노드:"
      node_history: 
        coordinates: "좌표:"
        part_of: "포함되는 노드:"
      node_history: 
-      download_xml: XML ë\82´ë ¤ë°\9bê¸°
+      download_xml: XML ë\8b¤ì\9a´ë¡\9cë\93\9c
        node_history: 노드 역사
        node_history_title: "노드 역사: %{node_name}"
        node_history: 노드 역사
        node_history_title: "노드 역사: %{node_name}"
-      view_details: ì\84¸ë¶\80 ì\82¬í\95 í\91\9cì\8b\9c
+      view_details: ì\9e\90ì\84¸í\95\9c ë\82´ì\9a© ë³´ê¸°
      not_found: 
        sorry: 죄송합니다. %{id}인 %{type}를 발견하지 못했습니다.
        type: 
      not_found: 
        sorry: 죄송합니다. %{id}인 %{type}를 발견하지 못했습니다.
        type: 
@@ -149,27 +154,44 @@ ko:
          node: 노드
          relation: 관계
          way: 길
          node: 노드
          relation: 관계
          way: 길
+    paging_nav: 
+      of: 중
+      showing_page: 페이지 보기
+    redacted: 
+      message_html: 이 %{type}의 %{version} 버전은 수정한 버전으로 볼 수 없습니다. 자세한 내용은 %{redaction_link}(을)를 참고하세요.
+      redaction: 개정 %{id}
+      type: 
+        node: 노드
+        relation: 관계
+        way: 길
      relation: 
      relation: 
-      download_xml: XML ë\82´ë ¤ë°\9bê¸°
+      download_xml: XML ë\8b¤ì\9a´ë¡\9cë\93\9c
        relation: 관계
        relation_title: "관계: %{relation_name}"
        view_history: 역사 보기
        relation: 관계
        relation_title: "관계: %{relation_name}"
        view_history: 역사 보기
+    relation_details: 
+      members: "멤버:"
+      part_of: "포함되는 관계:"
      relation_history: 
      relation_history: 
+      download_xml: XML 다운로드
        relation_history: 관계 역사
        relation_history_title: "관계 역사: %{relation_name}"
        relation_history: 관계 역사
        relation_history_title: "관계 역사: %{relation_name}"
-    start: 
-      manually_select: 다른 지역 수동 선택
-      view_data: 현재 지도 표기로 정보 보기
+      view_details: 자세한 내용 보기
+    relation_member: 
+      entry_role: "%{type}에서 %{role}의 %{name}"
+      type: 
+        node: 노드
+        relation: 관계
+        way: 길
      start_rjs: 
        data_frame_title: 데이터
        data_layer_name: 지도 데이터 찾아보기
        details: 자세한 사항
      start_rjs: 
        data_frame_title: 데이터
        data_layer_name: 지도 데이터 찾아보기
        details: 자세한 사항
-      drag_a_box: 지역을 보기 위해 지도로 끌어 놓으세요.
-      edited_by_user_at_timestamp: "[[timestamp]]에 [[user]]가 수정"
+      edited_by_user_at_timestamp: "%{timestamp}에 %{user}가 수정"
        hide_areas: 지역 숨기기
        hide_areas: 지역 숨기기
-      history_for_feature: "[[feature]]의 역사"
+      history_for_feature: "%{feature}의 역사"
        load_data: 데이터 불러오기
        load_data: 데이터 불러오기
-      loaded_an_area_with_num_features: 당신은 특성을 가진 지역 [[num_features]]개를 불러왔습니다. 일반적으로, 일부 브라우저에서는 이 데이터 개수를 모두 처리하지 못할 수도 있습니다. 일반적으로, 브라우저들은 대개 특성 [[max_features]]개 이하를 처리하여 보여줄 수 있습니다. 그렇지 않은 경우, 브라우저의 속도가 저하되거나 브라우저의 반응이 느려질 수 있습니다. 여전히 이 데이터를 표시하려면, 아래의 버튼을 클릭하세요.
+      loaded_an_area_with_num_features: 당신은 특성을 가진 지역 %{num_features}개를 불러왔습니다. 일반적으로, 일부 브라우저에서는 이 데이터 개수를 모두 처리하지 못할 수도 있습니다. 일반적으로, 브라우저들은 대개 특성 %{max_features}개 이하를 처리하여 보여줄 수 있습니다. 그렇지 않은 경우, 브라우저의 속도가 저하되거나 브라우저의 반응이 느려질 수 있습니다. 여전히 이 데이터를 표시하려면, 아래의 버튼을 클릭하세요.
        loading: 불러오는 중...
        manually_select: 다른 지역 선택
        object_list: 
        loading: 불러오는 중...
        manually_select: 다른 지역 선택
        object_list: 
@@ -179,30 +201,37 @@ ko:
          heading: 개체 목록
          history: 
            type: 
          heading: 개체 목록
          history: 
            type: 
-            node: 노드 [[id]]
-            way: 길 [[id]]
+            node: 노드 %{id}
+            way: 길 %{id}
          selected: 
            type: 
          selected: 
            type: 
-            node: 노드 [[id]]
-            way: 길 [[id]]
+            node: 노드 %{id}
+            way: 길 %{id}
          type: 
            node: 노드
            way: 길
        private_user: 개인 유저
        show_areas: 지역 보이기
        show_history: 역사 보기
          type: 
            node: 노드
            way: 길
        private_user: 개인 유저
        show_areas: 지역 보이기
        show_history: 역사 보기
-      unable_to_load_size: "불러오기 실패: 표시하려는 지역([[bbox_size]])의 설정 박스가 너무 큽니다. %{max_bbox_size}까지 표시할 수 있습니다."
+      unable_to_load_size: "불러오기 실패: 표시하려는 지역(%{bbox_size})의 설정 박스가 너무 큽니다. %{max_bbox_size}까지 표시할 수 있습니다."
        wait: 잠시만 기다려 주세요...
        zoom_or_select: 확대 또는 보고 싶은 지도의 지역을 선택하세요
      tag_details: 
        wait: 잠시만 기다려 주세요...
        zoom_or_select: 확대 또는 보고 싶은 지도의 지역을 선택하세요
      tag_details: 
-      tags: "태그들:"
+      tags: "태그:"
+      wiki_link: 
+        key: "%{key} 태그에 대한 위키 설명 문서"
+        tag: "%{key}=%{value} 태그에 대한 위키 설명 문서"
        wikipedia_link: 위키백과에 %{page} 문서 있음
      timeout: 
        wikipedia_link: 위키백과에 %{page} 문서 있음
      timeout: 
+      sorry: 죄송합니다, %{id} id와 %{type}에 대한 데이터는 너무 오래 검색하려 했습니다.
        type: 
          changeset: 바뀜집합
        type: 
          changeset: 바뀜집합
+        node: 노드
+        relation: 관계
+        way: 길
      way: 
      way: 
-      download_xml: XML ë\82´ë ¤ë°\9bê¸°
-      edit: 편집
+      download_xml: XML ë\8b¤ì\9a´ë¡\9cë\93\9c
+      edit: 길 편집
        view_history: 역사 보기
        way: 길
        way_title: "길: %{way_name}"
        view_history: 역사 보기
        way: 길
        way_title: "길: %{way_name}"
@@ -213,8 +242,8 @@ ko:
        nodes: "노드:"
        part_of: "포함되는 길:"
      way_history: 
        nodes: "노드:"
        part_of: "포함되는 길:"
      way_history: 
-      download_xml: XML ë\82´ë ¤ë°\9bê¸°
-      view_details: ì\84¸ë¶\80 ì\82¬í\95 í\91\9cì\8b\9c
+      download_xml: XML ë\8b¤ì\9a´ë¡\9cë\93\9c
+      view_details: ì\9e\90ì\84¸í\95\9c ë\82´ì\9a© ë³´ê¸°
        way_history: 길 역사
        way_history_title: "길 역사: %{way_name}"
    changeset: 
        way_history: 길 역사
        way_history_title: "길 역사: %{way_name}"
    changeset: 
@@ -243,6 +272,8 @@ ko:
        description_nearby: 근처 사용자의 바뀜집합
        description_user: "%{user} 사용자의 바뀜집합"
        description_user_bbox: "%{bbox} 안에서 %{user} 사용자의 바뀜집합"
        description_nearby: 근처 사용자의 바뀜집합
        description_user: "%{user} 사용자의 바뀜집합"
        description_user_bbox: "%{bbox} 안에서 %{user} 사용자의 바뀜집합"
+      empty_anon_html: 아직 수정한 사항이 없습니다
+      empty_user_html: 아직 어떠한 편집을 하지 않은 것으로 보입니다. 시작하려면, <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>초보자 가이드</a>를 참고하세요.
        heading: 바뀜집합
        heading_bbox: 바뀜집합
        heading_friend: 바뀜집합
        heading: 바뀜집합
        heading_bbox: 바뀜집합
        heading_friend: 바뀜집합
@@ -261,21 +292,24 @@ ko:
      comments: 
        ago: "%{ago} 전"
        comment: 덧글
      comments: 
        ago: "%{ago} 전"
        comment: 덧글
+      has_commented_on: "%{display_name} 사용자가 다음 일지 항목에 남긴 덧글"
        newer_comments: 새 덧글
        older_comments: 이전 덧글
        post: 게시물
        when: 날짜
      diary_comment: 
        newer_comments: 새 덧글
        older_comments: 이전 덧글
        post: 게시물
        when: 날짜
      diary_comment: 
+      comment_from: "%{comment_created_at}에 %{link_user}에 대한 덧글"
        confirm: 확인
        hide_link: 이 덧글 숨기기
      diary_entry: 
        comment_count: 
        confirm: 확인
        hide_link: 이 덧글 숨기기
      diary_entry: 
        comment_count: 
-        one: 덧글 한 개
+        one: 덧글 1개
          other: 덧글 %{count}개
        comment_link: 이 항목에 덧글 남기기
        confirm: 확인
        edit_link: 이 항목 수정
        hide_link: 이 항목 숨기기
          other: 덧글 %{count}개
        comment_link: 이 항목에 덧글 남기기
        confirm: 확인
        edit_link: 이 항목 수정
        hide_link: 이 항목 숨기기
+      posted_by: "%{link_user} 사용자가 %{language_link}에서 %{created}에 게시함"
        reply_link: 이 항목에 답변하기
      edit: 
        body: "내용:"
        reply_link: 이 항목에 답변하기
      edit: 
        body: "내용:"
@@ -288,9 +322,20 @@ ko:
        subject: "제목:"
        title: 일지 항목 수정
        use_map_link: 지도 사용
        subject: "제목:"
        title: 일지 항목 수정
        use_map_link: 지도 사용
+    feed: 
+      all: 
+        description: OpenStreetMap의 사용자에서 최근 일지 항목
+        title: OpenStreetMap 일지 항목
+      language: 
+        description: "%{language_name}로 된 OpenStreetMap 최근 일지 항목"
+        title: "%{language_name}로 된 OpenStreetMap 일지 항목"
+      user: 
+        description: "%{user} 사용자에서 최근 OpenStreetMap 일지 항목"
+        title: "%{user} 사용자에 대한 OpenStreetMap 일지 항목"
      list: 
        in_language_title: "%{language} 일지 항목"
        new: 새 일지 항목
      list: 
        in_language_title: "%{language} 일지 항목"
        new: 새 일지 항목
+      new_title: 사용자 일지에 새 항목 작성
        newer_entries: 다음 항목
        no_entries: 일지 항목이 없습니다
        older_entries: 이전 항목
        newer_entries: 다음 항목
        no_entries: 일지 항목이 없습니다
        older_entries: 이전 항목
@@ -305,6 +350,10 @@ ko:
        view: 보기
      new: 
        title: 새 일지 항목
        view: 보기
      new: 
        title: 새 일지 항목
+    no_such_entry: 
+      body: 죄송합니다, %{id} id로 된 일지 항목이나 덧글이 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요.
+      heading: "id에 항목 없음: %{id}"
+      title: 일지 항목이 없음
      view: 
        leave_a_comment: 덧글 남기기
        login: 로그인
      view: 
        leave_a_comment: 덧글 남기기
        login: 로그인
@@ -325,10 +374,11 @@ ko:
        name: 원격 제어
    export: 
      start: 
        name: 원격 제어
    export: 
      start: 
+      add_marker: 지도에 표시 추가
        area_to_export: 지역 내보내기
        embeddable_html: 내장된 HTML
        export_button: 내보내기
        area_to_export: 지역 내보내기
        embeddable_html: 내장된 HTML
        export_button: 내보내기
-      export_details: OpenStreetMap 데이터는 <a href="http://creativecommons.org/licenses/by-sa/2.0/">크리에이티브 커먼즈 저작자표시-동일조건변경허락 2.0 라이선스</a>에 따릅니다.
+      export_details: OpenStreetMap 데이터는 <a href="http://opendatacommons.org/licenses/odbl/1.0/">오픈 데이터 커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따릅니다.
        format: 형식
        format_to_export: 내보내기 형식
        image_size: 이미지 크기
        format: 형식
        format_to_export: 내보내기 형식
        image_size: 이미지 크기
@@ -338,19 +388,28 @@ ko:
        manually_select: 다른 지역 선택
        map_image: 지도 그림 (표준 레이어 보이기)
        max: 최대
        manually_select: 다른 지역 선택
        map_image: 지도 그림 (표준 레이어 보이기)
        max: 최대
-      options: ì\84 í\83\9dì\82¬í\95
+      options: ì\84¤ì \95
        osm_xml_data: OpenStreetMap XML 데이터
        output: 출력
        osm_xml_data: OpenStreetMap XML 데이터
        output: 출력
+      paste_html: HTML을 붙여 넣어 웹사이트에 포함시키기
        scale: 축척
        too_large: 
        scale: 축척
        too_large: 
+        body: 이 지역은 OpenStreetMap XML 데이터로 내보내는 데 너무 넓습니다. 확대하거나 작은 지역을 선택하세요.
          heading: 너무 넓은 지역
          heading: 너무 넓은 지역
-      zoom: 줌
+      zoom: 확대
      start_rjs: 
      start_rjs: 
+      add_marker: 지도에 표시 추가
+      change_marker: 표시 위치 바꾸기
+      click_add_marker: 표시를 추가하려면 지도에 클릭하세요
+      drag_a_box: 지역을 보기 위해 지도로 끌어 놓으세요
        export: 내보내기
        manually_select: 다른 지역 선택
        view_larger_map: 큰 지도 보기
    geocoder: 
      description: 
        export: 내보내기
        manually_select: 다른 지역 선택
        view_larger_map: 큰 지도 보기
    geocoder: 
      description: 
+      title: 
+        geonames: <a href="http://www.geonames.org/">GeoNames</a>에서 위치
+        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>에서 위치
        types: 
          cities: 도시
          places: 장소
        types: 
          cities: 도시
          places: 장소
@@ -376,30 +435,47 @@ ko:
          ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> 결과
          geonames: <a href="http://www.geonames.org/">GeoNames</a> 결과
          latlon: <a href="http://openstreetmap.org/">내부</a> 결과
          ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> 결과
          geonames: <a href="http://www.geonames.org/">GeoNames</a> 결과
          latlon: <a href="http://openstreetmap.org/">내부</a> 결과
-        osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap 이름 찾기</a> 결과
          osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> 결과
          uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> 결과
          us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> 결과
      search_osm_nominatim: 
        prefix: 
          aeroway: 
          osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> 결과
          uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a> 결과
          us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> 결과
      search_osm_nominatim: 
        prefix: 
          aeroway: 
+          aerodrome: 비행장
+          apron: 에이프런(공항등)
+          gate: 문
+          helipad: 헬기 착륙장
+          runway: 활주로
+          taxiway: 공항 유도로
            terminal: 터미널
          amenity: 
            terminal: 터미널
          amenity: 
+          WLAN: 와이파이 존
            airport: 공항
            arts_centre: 문예회관
            airport: 공항
            arts_centre: 문예회관
+          artwork: 예술 작품
            atm: ATM
            atm: ATM
+          auditorium: 강당
            bank: 은행
            bank: 은행
+          bar: 주점
            bbq: BBQ
            bench: 벤치
            bicycle_parking: 자전거 주차
            bicycle_rental: 자전거 대여
            bbq: BBQ
            bench: 벤치
            bicycle_parking: 자전거 주차
            bicycle_rental: 자전거 대여
+          biergarten: 비어 가든
+          brothel: 매음굴
+          bureau_de_change: 환전소
            bus_station: 버스 정류장
            cafe: 카페
            bus_station: 버스 정류장
            cafe: 카페
+          car_rental: 자동차 대여
+          car_sharing: 자동차 공유
            car_wash: 세차장
            casino: 카지노
            car_wash: 세차장
            casino: 카지노
+          charging_station: 충전 스테이션
            cinema: 영화관
            cinema: 영화관
+          clinic: 진료소
            club: 클럽
            college: 대학
            club: 클럽
            college: 대학
+          community_centre: 커뮤니티 센터
            courthouse: 법원
            crematorium: 화장장
            dentist: 치과
            courthouse: 법원
            crematorium: 화장장
            dentist: 치과
@@ -422,6 +498,7 @@ ko:
            health_centre: 보건소
            hospital: 병원
            hotel: 호텔
            health_centre: 보건소
            hospital: 병원
            hotel: 호텔
+          hunting_stand: 사냥 스탠드
            ice_cream: 아이스크림
            kindergarten: 유치원
            library: 도서관
            ice_cream: 아이스크림
            kindergarten: 유치원
            library: 도서관
@@ -439,10 +516,12 @@ ko:
            police: 경찰
            post_box: 우체통
            post_office: 우체국
            police: 경찰
            post_box: 우체통
            post_office: 우체국
+          preschool: 유치원
            prison: 교도소
            pub: 술집
            public_building: 공공 건물
            public_market: 공동 시장
            prison: 교도소
            pub: 술집
            public_building: 공공 건물
            public_market: 공동 시장
+          reception_area: 리셉션 지역
            recycling: 재활용 장소
            restaurant: 식당
            retirement_home: 노인정
            recycling: 재활용 장소
            restaurant: 식당
            retirement_home: 노인정
@@ -450,10 +529,13 @@ ko:
            school: 학교
            shelter: 쉼터
            shop: 상점
            school: 학교
            shelter: 쉼터
            shop: 상점
+          shopping: 상점
            shower: 샤워
            shower: 샤워
+          social_centre: 사회 센터
            social_club: 사교 클럽
            studio: 스튜디오
            supermarket: 슈퍼마켓
            social_club: 사교 클럽
            studio: 스튜디오
            supermarket: 슈퍼마켓
+          swimming_pool: 수영장
            taxi: 택시 정류장
            telephone: 공중전화
            theatre: 극장
            taxi: 택시 정류장
            telephone: 공중전화
            theatre: 극장
@@ -462,45 +544,145 @@ ko:
            university: 종합대학
            vending_machine: 자동판매기
            veterinary: 동물병원
            university: 종합대학
            vending_machine: 자동판매기
            veterinary: 동물병원
+          village_hall: 주민센터
            waste_basket: 쓰레기통
            waste_basket: 쓰레기통
-          wifi: 와이파이존
+          wifi: 와이파이 존
            youth_centre: 청소년 센터
          boundary: 
            administrative: 행정 구역 경계
            youth_centre: 청소년 센터
          boundary: 
            administrative: 행정 구역 경계
+          census: 국세 조사 경계
            national_park: 국립 공원
            protected_area: 보호 구역
          bridge: 
            national_park: 국립 공원
            protected_area: 보호 구역
          bridge: 
+          aqueduct: 수로
+          suspension: 현수교
+          swing: 선회교
+          viaduct: 고가 다리
            "yes": 다리
          building: 
            "yes": 건물
          highway: 
            "yes": 다리
          building: 
            "yes": 건물
          highway: 
+          bridleway: 승마로
+          bus_guideway: 버스 전용 도로
            bus_stop: 버스 정류장
            bus_stop: 버스 정류장
+          byway: 옆길
+          construction: 건설 중인 고속도로
+          cycleway: 자전거 경로
+          emergency_access_point: 긴급 접근 지점
+          footway: 보도
+          ford: 여울
+          living_street: 주택가
+          milestone: 이정표
+          minor: 보조 도로
+          motorway: 고속도로
+          motorway_junction: 고속도로 교차점
+          motorway_link: 고속도로 길
+          path: 경로
+          pedestrian: 보행자 길
+          platform: 플랫폼
+          primary: 주요 도로
+          primary_link: 주요 도로
+          raceway: 경마장
+          residential: 주택
+          rest_area: 휴게소
+          road: 도로
+          secondary: 보조 도로
+          secondary_link: 보조 도로
+          service: 취부 도로
+          services: 고속도로 휴게소
+          speed_camera: 속도 카메라
+          steps: 계단
+          stile: 회전식 문
+          tertiary: 3차 도로
+          tertiary_link: 3차 도로
+          track: 추적
+          trail: 샛길
+          trunk: 간선 도로
+          trunk_link: 간선 도로
+          unclassified: 분류하지 않은 도로
+          unsurfaced: 비포장 도로
          historic: 
          historic: 
+          archaeological_site: 고고학 지역
+          battlefield: 전쟁터
+          boundary_stone: 경계석
+          building: 건물
+          castle: 성
            church: 교회
            church: 교회
+          fort: 성채
+          house: 주택
+          icon: 아이콘
+          manor: 장원
            memorial: 기념관
            memorial: 기념관
+          mine: 광산
            monument: 기념물
            museum: 박물관
            monument: 기념물
            museum: 박물관
+          ruins: 유적
            tower: 타워
            tower: 타워
+          wayside_cross: 사거리 길가
+          wayside_shrine: 예배당
+          wreck: 난파선
          landuse: 
          landuse: 
+          allotments: 텃밭
+          basin: 분지
+          brownfield: 갈색땅
+          cemetery: 묘지
+          commercial: 상업 지역
+          conservation: 보존
+          construction: 공사중
            farm: 농장
            farmland: 농지
            farmyard: 농지
            forest: 숲
            farm: 농장
            farmland: 농지
            farmyard: 농지
            forest: 숲
+          garages: 차고
+          grass: 잔디
+          greenfield: 미개발 지역
+          industrial: 산업 지역
+          landfill: 매립지
+          meadow: 목초지
+          military: 군사 지역
+          mine: 광산
+          nature_reserve: 자연 보호구
+          orchard: 과수원
+          park: 공원
+          piste: 스키 활강 코스
+          quarry: 채석장
            railway: 철도
            railway: 철도
+          recreation_ground: 놀이 공원
+          reservoir: 저수지
+          reservoir_watershed: 저수지 유역
+          residential: 주거 지역
+          retail: 소매점
+          road: 도로 지역
+          village_green: 녹색 마을
+          vineyard: 포도밭
+          wetland: 습지
+          wood: 산림
          leisure: 
          leisure: 
+          beach_resort: 해수욕장
+          bird_hide: 조류 관찰지
+          common: 공유지
            fishing: 낚시터
            fishing: 낚시터
+          fitness_station: 피트니스 스테이션
            garden: 정원
            golf_course: 골프 코스
            ice_rink: 아이스링크
            garden: 정원
            golf_course: 골프 코스
            ice_rink: 아이스링크
+          marina: 마리나
+          miniature_golf: 미니어처 골프
+          nature_reserve: 자연 보호구
            park: 공원
            park: 공원
+          pitch: 운동장
            playground: 운동장
            playground: 운동장
+          recreation_ground: 놀이 공원
            sauna: 사우나
            sauna: 사우나
+          slipway: 조선대
            sports_centre: 스포츠 센터
            stadium: 경기장
            swimming_pool: 수영장
            sports_centre: 스포츠 센터
            stadium: 경기장
            swimming_pool: 수영장
+          track: 육상 트랙
            water_park: 워터파크
          military: 
            airfield: 군용 비행장
            water_park: 워터파크
          military: 
            airfield: 군용 비행장
+          barracks: 막사
            bunker: 벙커
          natural: 
            bay: 만
            bunker: 벙커
          natural: 
            bay: 만
@@ -511,26 +693,50 @@ ko:
            cliff: 절벽
            crater: 크레이터
            dune: 모래 언덕
            cliff: 절벽
            crater: 크레이터
            dune: 모래 언덕
+          feature: 지물
+          fell: 황야
            fjord: 피요르드
            forest: 숲
            geyser: 건헐천
            glacier: 빙하
            fjord: 피요르드
            forest: 숲
            geyser: 건헐천
            glacier: 빙하
+          heath: 황무지
            hill: 언덕
            island: 섬
            hill: 언덕
            island: 섬
+          land: 토지
+          marsh: 습지
+          moor: 습지
+          mud: 진흙
+          peak: 정상
+          point: 지점
+          reef: 암초
+          ridge: 산등성이
            river: 강
            river: 강
+          rock: 바위
+          scree: 애추
+          scrub: 잡목이 우거진 숲
+          shoal: 얕은 곳
            spring: 온천
            spring: 온천
+          stone: 암석
            strait: 해협
            tree: 나무
            strait: 해협
            tree: 나무
+          valley: 골짜기
            volcano: 화산
            water: 물
            wetland: 습지
            volcano: 화산
            water: 물
            wetland: 습지
-          wood: 나무
+          wetlands: 습지
+          wood: 산림
          office: 
            accountant: 회계사 사무실
          office: 
            accountant: 회계사 사무실
+          architect: 건축사
            company: 회사
            company: 회사
+          employment_agency: 직업 소개소
+          estate_agent: 공인중개사
+          government: 정부 기관
            insurance: 보험 사무실
            lawyer: 변호사 사무실
            ngo: NGO 사무실
            insurance: 보험 사무실
            lawyer: 변호사 사무실
            ngo: NGO 사무실
+          telecommunication: 통신사
+          travel_agent: 여행사
            "yes": 사무실
          place: 
            airport: 공항
            "yes": 사무실
          place: 
            airport: 공항
@@ -538,59 +744,161 @@ ko:
            country: 국가
            county: 군
            farm: 농장
            country: 국가
            county: 군
            farm: 농장
+          hamlet: 작은 마을
            house: 주택
            house: 주택
+          houses: 주택
            island: 섬
            island: 섬
+          islet: 작은 섬
+          isolated_dwelling: 분리된 주택
+          locality: 지역
+          moor: 습지
+          municipality: 시정촌
            postcode: 우편 번호
            postcode: 우편 번호
+          region: 지역
            sea: 바다
            state: 주
            sea: 바다
            state: 주
+          subdivision: 구분
            suburb: 교외
            town: 탑
            suburb: 교외
            town: 탑
+          unincorporated_area: 비법인 지역
+          village: 마을
          railway: 
          railway: 
+          abandoned: 폐지한 철도
+          construction: 건설 중인 철도
+          disused: 폐선한 철도
+          disused_station: 폐선한 철도역
+          funicular: 케이블 카
+          halt: 기차 정지
+          historic_station: 역사적인 철도역
+          junction: 철도 분기점
+          level_crossing: 건널목
            light_rail: 경전철
            light_rail: 경전철
+          miniature: 미니어처 철도
            monorail: 모노레일
            narrow_gauge: 협궤 철도
            monorail: 모노레일
            narrow_gauge: 협궤 철도
+          platform: 철도 플랫폼
+          preserved: 보존된 철도
+          spur: 철도 박차
            station: 철도역
            subway: 지하철역
            subway_entrance: 지하철 입구
            station: 철도역
            subway: 지하철역
            subway_entrance: 지하철 입구
+          switch: 철도 분기
+          tram: 전차
+          tram_stop: 전차 정류장
+          yard: 철도 기지
          shop: 
          shop: 
+          alcohol: 주점
            antiques: 골동품 상점
            antiques: 골동품 상점
+          art: 아트 상점
            bakery: 제과점
            bakery: 제과점
+          beauty: 미용실
+          beverages: 음료 가게
            bicycle: 자전거 상점
            books: 서점
            butcher: 정육점
            bicycle: 자전거 상점
            books: 서점
            butcher: 정육점
+          car: 자동차 상점
            car_parts: 자동차 부품 상점
            car_repair: 자동차 정비소
            car_parts: 자동차 부품 상점
            car_repair: 자동차 정비소
+          carpet: 카펫 가게
+          charity: 자선 가게
+          chemist: 화학자
            clothes: 의류 상점
            computer: 컴퓨터 가게
            clothes: 의류 상점
            computer: 컴퓨터 가게
+          confectionery: 과자 가게
            convenience: 편의점
            convenience: 편의점
+          copyshop: 복사점
            cosmetics: 화장품 상점
            department_store: 백화점
            cosmetics: 화장품 상점
            department_store: 백화점
+          discount: 할인점
+          doityourself: 손수 함
            dry_cleaning: 드라이 클리닝
            dry_cleaning: 드라이 클리닝
+          electronics: 전자 제품 상점
+          estate_agent: 공인중개사
+          farm: 농장 가게
+          fashion: 패션 샵
+          fish: 생선 가게
+          florist: 꽃집
+          food: 음식 가게
+          funeral_directors: 장례식장
            furniture: 가구
            gallery: 갤러리
            furniture: 가구
            gallery: 갤러리
+          garden_centre: 정원 센터
            general: 일반 상점
            general: 일반 상점
+          gift: 선물 상점
+          greengrocer: 청과상
            grocery: 식료품 상점
            grocery: 식료품 상점
+          hairdresser: 미용실
+          hardware: 집개선 상점
+          hifi: 하이파이
            insurance: 보험
            insurance: 보험
+          jewelry: 보석 가게
+          kiosk: 키오스크 샵
            laundry: 세탁소
            laundry: 세탁소
+          mall: 몰
            market: 시장
            market: 시장
+          mobile_phone: 휴대 전화 상점
+          motorcycle: 모터사이클 샵
+          music: 음악 상점
+          newsagent: 신문 판매대
            optician: 안경점
            organic: 유기농 식품 상점
            optician: 안경점
            organic: 유기농 식품 상점
+          outdoor: 아웃도어 상점
+          pet: 애완 가게
+          photo: 사진관
+          salon: 가게
            shoes: 신발 가게
            shoes: 신발 가게
+          shopping_centre: 쇼핑 센터
+          sports: 스포츠 상점
+          stationery: 문구점
            supermarket: 수퍼마켓
            toys: 장난감 가게
            supermarket: 수퍼마켓
            toys: 장난감 가게
+          travel_agency: 여행사
+          video: 비디오 가게
+          wine: 주점
          tourism: 
          tourism: 
+          alpine_hut: 알파인 오두막
+          artwork: 예술 작품
+          attraction: 견인
+          bed_and_breakfast: 민박(잠자기와 아침 식사)
+          cabin: 오두막
+          camp_site: 캠프장
+          caravan_site: 캐러밴 사이트
+          chalet: 별장
            guest_house: 게스트 하우스
            hostel: 호스텔
            hotel: 호텔
            guest_house: 게스트 하우스
            hostel: 호스텔
            hotel: 호텔
+          information: 안내소
+          lean_to: 오두막
            motel: 모텔
            museum: 박물관
            motel: 모텔
            museum: 박물관
+          picnic_site: 피크닉 사이트
+          theme_park: 테마 파크
+          valley: 골짜기
+          viewpoint: 관점
            zoo: 동물원
          tunnel: 
            "yes": 터널
          waterway: 
            zoo: 동물원
          tunnel: 
            "yes": 터널
          waterway: 
+          artificial: 인공 수로
+          boatyard: 보트야드
+          canal: 운하
+          connector: 수로 연결로
            dam: 댐
            dam: 댐
+          derelict_canal: 버려진 운하
+          ditch: 구거
+          dock: 부두
+          drain: 배수로
+          lock: 갑문
+          lock_gate: 수문
+          mineral_spring: 온천장
+          mooring: 계선
+          rapids: 급류
            river: 강
            river: 강
+          riverbank: 강가
+          stream: 하류
+          water_point: 급수소
            waterfall: 폭포
            waterfall: 폭포
+          weir: 댐
    javascripts: 
      map: 
        base: 
    javascripts: 
      map: 
        base: 
@@ -598,8 +906,12 @@ ko:
          standard: 표준
          transport_map: 교통 지도
      site: 
          standard: 표준
          transport_map: 교통 지도
      site: 
+      edit_disabled_tooltip: 지도를 편집하려면 확대
        edit_tooltip: 지도 편집
        edit_tooltip: 지도 편집
+      edit_zoom_alert: 지도를 편집하려면 확대해야 합니다.
+      history_disabled_tooltip: 이 지역에 대한 편집을 보려면 확대
        history_tooltip: 이 지역에 대한 편집 보기
        history_tooltip: 이 지역에 대한 편집 보기
+      history_zoom_alert: 이 지역에 대한 편집을 보려면 확대하야 합니다
    layouts: 
      community: 커뮤니티
      community_blogs: 커뮤니티 블로그
    layouts: 
      community: 커뮤니티
      community_blogs: 커뮤니티 블로그
@@ -614,7 +926,7 @@ ko:
      export: 내보내기
      export_tooltip: 지도 데이터 내보내기
      foundation: 재단
      export: 내보내기
      export_tooltip: 지도 데이터 내보내기
      foundation: 재단
-    foundation_title: 오픈스트리트맵 재단
+    foundation_title: OpenStreetMap 재단
      gps_traces: GPS 추적
      gps_traces_tooltip: GPS 추적 설정
      help: 도움말
      gps_traces: GPS 추적
      gps_traces_tooltip: GPS 추적 설정
      help: 도움말
@@ -623,19 +935,17 @@ ko:
      history: 역사
      home: 집
      home_tooltip: 집 위치로 가기
      history: 역사
      home: 집
      home_tooltip: 집 위치로 가기
-    inbox: 받은 쪽지함 (%{count})
+    inbox_html: 받은 쪽지 %{count}개
      inbox_tooltip: 
      inbox_tooltip: 
-      one: 읽지 않은 쪽지 한 개가 있습니다.
-      other: 읽지 않은 쪽지 %{count}개가 있습니다.
+      one: 읽지 않은 쪽지 한 개가 있습니다
+      other: 읽지 않은 쪽지 %{count}개가 있습니다
        zero: 읽지 않은 쪽지가 없습니다
      intro_1: OpenStreetMap은 여러분같은 사람에 의해 만들어진 우리 모두의 전세계 지도입니다.
        zero: 읽지 않은 쪽지가 없습니다
      intro_1: OpenStreetMap은 여러분같은 사람에 의해 만들어진 우리 모두의 전세계 지도입니다.
-    intro_2_create_account: 새 계정을 만들 수 있습니다
+    intro_2_create_account: 계정을 만들 수 있습니다
      intro_2_download: 다운로드
      intro_2_html: 데이터는 %{license} 하에 무료로 %{download}와 %{use}합니다. 지도를 개선하려면 %{create_account}.
      intro_2_license: 오픈 라이선스
      intro_2_use: 이용
      intro_2_download: 다운로드
      intro_2_html: 데이터는 %{license} 하에 무료로 %{download}와 %{use}합니다. 지도를 개선하려면 %{create_account}.
      intro_2_license: 오픈 라이선스
      intro_2_use: 이용
-    license: 
-      alt: CC BY-SA 2.0
      log_in: 로그인
      log_in_tooltip: 기존 계정으로 로그인
      logo: 
      log_in: 로그인
      log_in_tooltip: 기존 계정으로 로그인
      logo: 
@@ -644,6 +954,7 @@ ko:
      logout_tooltip: 로그아웃
      make_a_donation: 
        text: 기부하기
      logout_tooltip: 로그아웃
      make_a_donation: 
        text: 기부하기
+      title: 금전적인 기부와 OpenStreetMap 지원
      osm_offline: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 오프라인입니다.
      osm_read_only: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 읽기 전용입니다.
      partners_bytemark: 바이트마크 호스팅
      osm_offline: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 오프라인입니다.
      osm_read_only: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 읽기 전용입니다.
      partners_bytemark: 바이트마크 호스팅
@@ -666,10 +977,19 @@ ko:
    license_page: 
      foreign: 
        english_link: 영어 원본
    license_page: 
      foreign: 
        english_link: 영어 원본
+      text: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우, 영어 문서가 우선합니다
        title: 이 번역에 대한 정보
        title: 이 번역에 대한 정보
+    legal_babble: 
+      contributors_title_html: 우리의 기여자
+      credit_1_html: "&ldquo;&copy; OpenStreetMap \n기여자&rdquo; 로 제작진을 적어야 합니다."
+      credit_title_html: OpenStreetMap 제작진 적는 방법
+      infringement_title_html: 저작권 침해
+      more_title_html: 자세히 찾기
+      title_html: 저작권 및 라이선스
      native: 
        mapping_link: 매핑 시작
        native_link: THIS_LANGUAGE_NAME_HERE 버전
      native: 
        mapping_link: 매핑 시작
        native_link: THIS_LANGUAGE_NAME_HERE 버전
+      text: 저작권 문서의 영어 버전을 보고 있습니다. 이 문서의 %{native_link}의 버전으로 돌아갈 수 있으며 또는 저작권을 읽는 것을 멈추고 %{mapping_link}할 수 있습니다.
        title: 이 문서에 대한 정보
    message: 
      delete: 
        title: 이 문서에 대한 정보
    message: 
      delete: 
@@ -677,6 +997,7 @@ ko:
      inbox: 
        date: 날짜
        from: 보낸 사람
      inbox: 
        date: 날짜
        from: 보낸 사람
+      messages: "%{new_messages}와 %{old_messages}가 있습니다"
        my_inbox: 내 쪽지함
        new_messages: 
          one: 새 메시지 %{count}개
        my_inbox: 내 쪽지함
        new_messages: 
          one: 새 메시지 %{count}개
@@ -700,14 +1021,23 @@ ko:
      new: 
        back_to_inbox: 받은 쪽지함으로 돌아가기
        body: 내용
      new: 
        back_to_inbox: 받은 쪽지함으로 돌아가기
        body: 내용
+      limit_exceeded: 최근에 많은 메시지를 보냈습니다. 더 보내려면 잠시 기다려주세요.
        message_sent: 쪽지가 전송되었습니다.
        send_button: 보내기
        send_message_to: "%{name}에게 새 쪽지 보내기"
        subject: 제목
        title: 새 쪽지
        message_sent: 쪽지가 전송되었습니다.
        send_button: 보내기
        send_message_to: "%{name}에게 새 쪽지 보내기"
        subject: 제목
        title: 새 쪽지
+    no_such_message: 
+      body: 죄송합니다 해당 id로 된 메시지가 없습니다.
+      heading: 메시지가 없습니다.
+      title: 메시지가 없습니다.
      outbox: 
        date: 날짜
        inbox: 받은 편지함
      outbox: 
        date: 날짜
        inbox: 받은 편지함
+      messages: 
+        one: 메시지 %{count}개를 보냈습니다
+        other: 메시지 %{count}개를 보냈습니다
+      my_inbox: 내 %{inbox_link}
        no_sent_messages: 받은 쪽지가 없습니다. %{people_mapping_nearby_link}에서 친구를 찾아보세요.
        outbox: 보낸 편지함
        people_mapping_nearby: 근처를 지도 입력한 사람들
        no_sent_messages: 받은 쪽지가 없습니다. %{people_mapping_nearby_link}에서 친구를 찾아보세요.
        outbox: 보낸 편지함
        people_mapping_nearby: 근처를 지도 입력한 사람들
@@ -740,63 +1070,154 @@ ko:
        greeting: 안녕하세요,
      email_confirm_plain: 
        greeting: 안녕하세요,
        greeting: 안녕하세요,
      email_confirm_plain: 
        greeting: 안녕하세요,
+      hopefully_you_1: 누군가(바라는 데 당신)가 여기를 통해 이메일 주소를 바꾸고 싶습니다.
+      hopefully_you_2: "%{server_url}(은)는 %{new_address}에 있습니다."
      friend_notification: 
      friend_notification: 
+      befriend_them: 또한 %{befriendurl}에서 친구로 추가할 수 있습니다.
        had_added_you: "%{user} 님이 당신을 OpenStreetMap 친구로 추가하였습니다."
        see_their_profile: "%{userurl} 에서 프로필을 확인하고 원하면 친구로 등록할 수 있습니다."
        subject: "[OpenStreetMap] %{user} 님이 당신을 친구로 추가하였습니다."
      gpx_notification: 
        had_added_you: "%{user} 님이 당신을 OpenStreetMap 친구로 추가하였습니다."
        see_their_profile: "%{userurl} 에서 프로필을 확인하고 원하면 친구로 등록할 수 있습니다."
        subject: "[OpenStreetMap] %{user} 님이 당신을 친구로 추가하였습니다."
      gpx_notification: 
+      and_no_tags: 태그가 없습니다.
+      and_the_tags: "다음 태그가 있습니다:"
        failure: 
        failure: 
+        failed_to_import: "가져오기에 실패했습니다. 오류는 다음과 같습니다:"
+        more_info_1: 더 많은 GPX 가져오기 실페에 대한 정보와 방지하는 방법에 대해서는
+        more_info_2: "다음에서 찾을 수 있습니다:"
          subject: "[OpenStreetMap] GPX 가져오기 실패"
        greeting: 안녕하세요,
        success: 
          subject: "[OpenStreetMap] GPX 가져오기 실패"
        greeting: 안녕하세요,
        success: 
-        loaded_successfully: "loaded successfully with %{trace_points} out of a possible\n%{possible_points} points."
+        loaded_successfully: 가능한 %{possible_points} 지점 중 %{trace_points} 지점을 성공적으로 불러왔습니다.
          subject: "[OpenStreetMap] GPX 가져오기 성공"
        with_description: 설명과 함께
          subject: "[OpenStreetMap] GPX 가져오기 성공"
        with_description: 설명과 함께
+      your_gpx_file: GPX 파일 같아 보이고
      lost_password: 
      lost_password: 
-      subject: "[OpenStreetMap] 암호 초기화 요청"
+      subject: "[OpenStreetMap] 비밀번호 초기화 요청"
      lost_password_html: 
        greeting: 안녕하세요,
      lost_password_plain: 
        greeting: 안녕하세요,
      lost_password_html: 
        greeting: 안녕하세요,
      lost_password_plain: 
        greeting: 안녕하세요,
+      hopefully_you_1: 누군가(아마도 당신)가 openstreetmap.org 계정의 이 이메일 주소로
+      hopefully_you_2: 재설정할 비밀번호를 요청했습니다.
      message_notification: 
        footer1: "%{readurl} 에서도 쪽지를 확인할 수 있습니다."
        footer2: "%{replyurl} 에서 답장하실 수 있습니다."
        header: "%{from_user} 님이 OpenStreetMap을 통해 %{subject} 쪽지를 보냈습니다."
        hi: "%{to_user}님 안녕하세요."
      signup_confirm: 
      message_notification: 
        footer1: "%{readurl} 에서도 쪽지를 확인할 수 있습니다."
        footer2: "%{replyurl} 에서 답장하실 수 있습니다."
        header: "%{from_user} 님이 OpenStreetMap을 통해 %{subject} 쪽지를 보냈습니다."
        hi: "%{to_user}님 안녕하세요."
      signup_confirm: 
-      subject: "[오픈스트리트 맵] 이메일 주소 확인"
+      subject: "[OpenStreetMap] OpenStreetMap에 오신 것을 환영합니다"
      signup_confirm_html: 
      signup_confirm_html: 
-      greeting: 안녕하세요!
-      more_videos_here: 여기에 더 많은 동영상
+      more_videos: "%{more_videos_link}이 있습니다."
+      more_videos_here: 여기에 더 많은 동영상이 있습니다
        video_to_openstreetmap: OpenStreetMap 소개 동영상
      signup_confirm_plain: 
        blog_and_twitter: "OpenStreetMap 블로그 또는 트위터를 통해 최신 뉴스 보기:"
        video_to_openstreetmap: OpenStreetMap 소개 동영상
      signup_confirm_plain: 
        blog_and_twitter: "OpenStreetMap 블로그 또는 트위터를 통해 최신 뉴스 보기:"
-      greeting: 안녕하세요!
-      the_wiki: "위키에서 OpenStreetMap에 대하여 읽기:"
+      introductory_video: "여기서 OpenStreetMap 소개 동영상을 볼 수 있습니다:"
+      more_videos: "여기에 더 많은 동영상이 있습니다:"
+      the_wiki: "위키에서 OpenStreetMap에 대하여 읽어보기:"
    oauth: 
      oauthorize: 
    oauth: 
      oauthorize: 
-      allow_write_gpx: 사용자가 GPS 추적을 올립니다.
+      allow_read_gpx: 비공개 GPS 추적을 읽습니다.
+      allow_read_prefs: 사용자 환경 설정을 읽습니다.
+      allow_to: "다음 클라이언트 어플리케이션을 허용합니다:"
+      allow_write_api: 지도를 수정합니다.
+      allow_write_diary: 일지 항목을 만들고 덧글을 달고 친구를 만듭니다.
+      allow_write_gpx: GPS 추적을 올립니다.
+      allow_write_prefs: 사용자 환경 설정을 수정합니다.
+    revoke: 
+      flash: "%{application}에 대한 토큰을 철회했습니다"
    oauth_clients: 
    oauth_clients: 
+    create: 
+      flash: 성공적으로 정보를 등록했습니다
+    destroy: 
+      flash: 클라이언트 어플리케이션 등록을 파괴했습니다
      edit: 
        submit: 편집
      edit: 
        submit: 편집
+      title: 어플리케이션 편집
      form: 
      form: 
-      allow_write_gpx: 사용자가 GPS 추적을 올립니다.
+      allow_read_gpx: 비공개 GPS 추적을 읽습니다.
+      allow_read_prefs: 사용자 환경 설정을 읽습니다.
+      allow_write_api: 지도를 수정합니다.
+      allow_write_diary: 일지 항목을 만들고 덧글을 달고 친구를 만듭니다.
+      allow_write_gpx: GPS 추적을 올립니다.
+      allow_write_prefs: 사용자 환경 설정을 수정합니다.
+      callback_url: 연락 URL
        name: 이름
        name: 이름
+      requests: "사용자가 다음 권한을 요청합니다:"
+      required: 필수
+      support_url: 지원 URL
+      url: 주요 어플리케이션 URL
      index: 
        application: 어플리케이션 이름
      index: 
        application: 어플리케이션 이름
+      issued_at: 발행
+      my_apps: 내 클라이언트 어플리케이션
+      my_tokens: 내 인증한 어플리케이션
        register_new: 어플리케이션 등록
        register_new: 어플리케이션 등록
+      revoke: 철회!
+      title: 내 OAuth 자세한 정보
+    new: 
+      submit: 등록
+      title: 새 어플리케이션 등록
+    not_found: 
+      sorry: 죄송합니다, 해당 %{type}(을)를 찾을 수 없습니다.
      show: 
      show: 
-      allow_write_api: 사용자가 지도를 수정합니다.
+      access_url: "접근 토큰 URL:"
+      allow_read_gpx: 비공개 GPS 추적을 읽습니다.
+      allow_read_prefs: 사용자 환경 설정을 읽습니다.
+      allow_write_api: 지도를 수정합니다.
+      allow_write_diary: 일지 항목을 만들고 덧글을 달고 친구를 만듭니다.
+      allow_write_gpx: GPS 추적을 올립니다.
+      allow_write_prefs: 사용자 환경 설정을 수정합니다.
+      authorize_url: "요청 URL:"
        confirm: 확실합니까?
        confirm: 확실합니까?
+      delete: 클라이언트 삭제
+      edit: 자세한 사항 편집
+      requests: "사용자가 다음 권한을 요청합니다:"
+      title: "%{app_name}에 데한 OAuth 자세한 정보"
+      url: "요청 토큰 URL:"
+    update: 
+      flash: 성공적으로 클라이언트 정보를 업데이트했습니다
+  redaction: 
+    create: 
+      flash: 교정을 만들었습니다.
+    destroy: 
+      error: 이 교정을 파괴하는 중에 오류가 발생했습니다.
+      flash: 교정을 파괴했습니다.
+      not_empty: 교정이 비어 있지 않습니다. 파괴하기 전에 이 교정에 속하는 모든 버전을 교정 취소하세요.
+    edit: 
+      description: 설명
+      heading: 교정 편집
+      submit: 교정 저장
+      title: 교정 편집
+    index: 
+      empty: 보여줄 교정이 없습니다.
+      heading: 교정 목록
+      title: 교정 목록
+    new: 
+      description: 설명
+      heading: 새 교정에 대한 정보 입력
+      submit: 교정 만들기
+      title: 새 교정 만들기
+    show: 
+      confirm: 확실합니까?
+      description: "설명:"
+      destroy: 이 교정 제거
+      edit: 이 교정 편집
+      heading: "\"%{title}\" 교정 보기"
+      title: 교정 보기
+      user: "만든이:"
+    update: 
+      flash: 바뀜을 저장했습니다.
    site: 
      edit: 
    site: 
      edit: 
-      potlatch_unsaved_changes: 바뀜 사항을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우, 현재의 방식이나 포인트를 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
+      anon_edits_link_text: 왜 이러한지 알아보세요.
+      potlatch_unsaved_changes: 바뀜 사항을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우, 현재의 방식이나 지점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
        user_page_link: 사용자 문서
      index: 
        js_1: 자바스크립트를 지원하지 않는 브라우저이거나, 자바스크립트가 활성화 되어 있지 않습니다.
        user_page_link: 사용자 문서
      index: 
        js_1: 자바스크립트를 지원하지 않는 브라우저이거나, 자바스크립트가 활성화 되어 있지 않습니다.
+      js_2: OpenStreetMap은 매끄러운 지도를 위해 자바스크립트를 사용합니다.
        license: 
        license: 
-        license_name: 크리에이티브 커먼즈 저작자표시-동일조건변경허락 2.0
-        project_name: 오픈스트리트맵 프로젝트
+        copyright: 저작권 OpenStreetMap과 기여자, 오픈 라이선스로 배포
        permalink: 고유링크
        shortlink: 짧은링크
      key: 
        permalink: 고유링크
        shortlink: 짧은링크
      key: 
@@ -804,28 +1225,83 @@ ko:
        map_key_tooltip: 지도에 대한 키
        table: 
          entry: 
        map_key_tooltip: 지도에 대한 키
        table: 
          entry: 
-          allotments: 산
+          admin: 행정 구역 경계
+          allotments: 텃밭
            apron: 
            apron: 
-            1: 터미널
+            - 공항 에이프런
+            - 터미널
+          bridge: 검은 테두리 = 다리
+          bridleway: 승마로
+          brownfield: 갈색땅
+          building: 중요한 건물
+          byway: 옆길
            cable: 
              - 케이블 카
            cable: 
              - 케이블 카
+            - 의자 리프트
            cemetery: 묘지
            centre: 스포츠 센터
            cemetery: 묘지
            centre: 스포츠 센터
+          commercial: 상업 지역
+          common: 
+            - 공유지
+            - 목초지
+          construction: 공사 중인 도로
+          cycleway: 자전거 도로
+          destination: 목적 통행
            farm: 농장
            farm: 농장
+          footway: 보도
            forest: 숲
            golf: 골프장
            forest: 숲
            golf: 골프장
+          heathland: 황무지
+          industrial: 산업 지역
            lake: 
              - 호수
            lake: 
              - 호수
+            - 저수지
            military: 군사 지역
            military: 군사 지역
+          motorway: 고속도로
            park: 공원
            park: 공원
+          permissive: 허용 통행
+          pitch: 운동장
+          primary: 주요 도로
+          private: 개인 통행
            rail: 철도
            rail: 철도
+          reserve: 자연 보호구
+          resident: 주거 지역
+          retail: 소매 지역
+          runway: 
+            - 공항 활주로
+            - 공항 유도로
            school: 
              - 학교
              - 대학교
            school: 
              - 학교
              - 대학교
+          secondary: 보조 도로
+          station: 철도역
            subway: 지하철
            summit: 
            subway: 지하철
            summit: 
-            - 제출
+            - 정상
+            - 정상
+          tourist: 관광 명소
+          track: 추적
+          tram: 
+            - 경전철
+            - 노면 전차
+          trunk: 간선 도로
+          tunnel: 점선 테두리 = 터널
+          unclassified: 분류하지 않은 도로
+          unsurfaced: 비포장 도로
+          wood: 산림
      markdown_help: 
      markdown_help: 
+      alt: 대체 텍스트
+      first: 첫째 항목
+      heading: 문단 제목
+      headings: 문단 제목
+      image: 그림
+      link: 링크
+      ordered: 순서 있는 목록
+      second: 둘째 항목
+      subheading: 하위 문단 제목
+      text: 텍스트
+      title_html: <a href="http://daringfireball.net/projects/markdown/">Markdown</a>으로 파서함
+      unordered: 순서 없는 목록
        url: URL
      richtext_area: 
        edit: 편집
        url: URL
      richtext_area: 
        edit: 편집
@@ -835,59 +1311,79 @@ ko:
        search_help: "예제: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 또는 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>더 많은 예제...</a>"
        submit_text: 가기
        where_am_i: 내가 어디있나요?
        search_help: "예제: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 또는 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>더 많은 예제...</a>"
        submit_text: 가기
        where_am_i: 내가 어디있나요?
+      where_am_i_title: 검색 엔진을 사용하여 현재 위치를 설명
      sidebar: 
        close: 닫기
        search_results: 찾기 결과
    time: 
      formats: 
      sidebar: 
        close: 닫기
        search_results: 찾기 결과
    time: 
      formats: 
-      friendly: "%Y년 %B월 %e일 %H:%M"
+      friendly: "%Y년 %B %e일 %H:%M"
    trace: 
      create: 
        upload_trace: GPS 추적 올리기
    trace: 
      create: 
        upload_trace: GPS 추적 올리기
+    delete: 
+      scheduled_for_deletion: 삭제 예정 추적
      edit: 
        description: "설명:"
        download: 다운로드
        edit: 편집
        filename: "파일 이름:"
      edit: 
        description: "설명:"
        download: 다운로드
        edit: 편집
        filename: "파일 이름:"
-      heading: 경로 편집 %{name}
+      heading: "%{name} 경로 편집"
        map: 지도
        owner: "소유자:"
        map: 지도
        owner: "소유자:"
+      points: "지점:"
        save_button: 바뀐 사항 저장
        save_button: 바뀐 사항 저장
+      start_coord: "시작 좌표:"
        tags: "태그:"
        tags: "태그:"
-      title: 경로 편집 %{name}
+      tags_help: 쉼표로 구분
+      title: "%{name} 경로 편집"
        uploaded_at: "올려짐:"
        uploaded_at: "올려짐:"
+      visibility: "공개 여부:"
        visibility_help: 이게 무슨 의미입니까?
      list: 
        public_traces: 공개 GPS 추적
        public_traces_from: "%{user} 사용자의 공중 GPS 추적"
        visibility_help: 이게 무슨 의미입니까?
      list: 
        public_traces: 공개 GPS 추적
        public_traces_from: "%{user} 사용자의 공중 GPS 추적"
+      tagged_with: "%{tags}로 태그함"
        your_traces: 내 GPS 추적
      make_public: 
        made_public: 추적이 공개적으로 만들어짐
      offline: 
        heading: GPX 저장소 오프라인
      trace: 
        your_traces: 내 GPS 추적
      make_public: 
        made_public: 추적이 공개적으로 만들어짐
      offline: 
        heading: GPX 저장소 오프라인
      trace: 
-      ago: "% {time_in_words_ago} 전"
+      ago: "%{time_in_words_ago} 전"
        by: 사용자
        by: 사용자
-      count_points: "% {count} 포인트"
+      count_points: "%{count} 지점"
        edit: 편집
        edit_map: 지도 편집
        edit: 편집
        edit_map: 지도 편집
+      identifiable: 식별 가능
        in: 위치
        map: 지도
        more: 더 보기
        in: 위치
        map: 지도
        more: 더 보기
+      pending: 보류 중
+      private: 비공개
+      public: 공개
        trace_details: 추적 자세한 정보 보기
        trace_details: 추적 자세한 정보 보기
+      trackable: 추적 가능
        view_map: 지도 보기
      trace_form: 
        description: "설명:"
        help: 도움말
        tags: "태그:"
        view_map: 지도 보기
      trace_form: 
        description: "설명:"
        help: 도움말
        tags: "태그:"
+      tags_help: 쉼표로 구분
        upload_button: 올리기
        upload_button: 올리기
-      upload_gpx: "GPX 파일 업로드:"
+      upload_gpx: "GPX 파일 올리기:"
+      visibility: "공개 여부:"
+      visibility_help: 이게 무슨 의미입니까?
      trace_header: 
        see_all_traces: 모든 추적 보기
        see_your_traces: 내 추적 보기
        upload_trace: 추적 올리기
      trace_optionals: 
        tags: 태그
      trace_header: 
        see_all_traces: 모든 추적 보기
        see_your_traces: 내 추적 보기
        upload_trace: 추적 올리기
      trace_optionals: 
        tags: 태그
+    trace_paging_nav: 
+      newer: 다음 추적
+      older: 이전 추적
+      showing_page: 페이지 %{page}개 보임
      view: 
        delete_track: 이 추적 삭제
        description: "설명:"
      view: 
        delete_track: 이 추적 삭제
        description: "설명:"
@@ -895,32 +1391,57 @@ ko:
        edit: 편집
        edit_track: 이 추적 편집
        filename: "파일 이름:"
        edit: 편집
        edit_track: 이 추적 편집
        filename: "파일 이름:"
+      heading: "%{name} 경로 보기"
        map: 지도
        map: 지도
+      none: 없음
        owner: "소유자:"
        pending: 보류 중
        owner: "소유자:"
        pending: 보류 중
-      points: "포인트:"
+      points: "지점:"
+      start_coordinates: "시작 좌표:"
        tags: "태그:"
        tags: "태그:"
+      title: "%{name} 경로 보기"
        trace_not_found: 추적을 찾을 수 없습니다!
        uploaded: "올려짐:"
        trace_not_found: 추적을 찾을 수 없습니다!
        uploaded: "올려짐:"
+      visibility: "공개 여부:"
+    visibility: 
+      identifiable: 식별 가능 (식별 가능한 추적 목록 보임, 시간 기록으로 정렬한 지점)
+      private: 비공개 (익명으로만 공유, 정렬하지 않은 지점)
+      public: 공개 (익명으로 추적 목록 보임, 정렬하지 않은 지점)
+      trackable: 추적 가능 (익명으로만 공유, 시간 기록으로 정렬한 지점)
    user: 
      account: 
        contributor terms: 
    user: 
      account: 
        contributor terms: 
+        agreed: 새 기여자 약관에 동의했습니다.
+        heading: "기여자 약관:"
          link text: 이게 뭐죠?
          link text: 이게 뭐죠?
+        not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
        current email address: "현재 이메일 주소:"
        delete image: 현재 이미지 제거
        current email address: "현재 이메일 주소:"
        delete image: 현재 이미지 제거
+      email never displayed publicly: (절대 공개하지 않습니다)
+      flash update success: 사용자 정보를 성공적으로 업데이트했습니다.
+      flash update success confirm needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기 위해 이메일을 확인하세요.
+      home location: "대문 위치:"
+      image: "그림:"
+      image size hint: (100x100 이하의 정사각형 그림이 최적)
        keep image: 현재 이미지를 유지
        latitude: "위도:"
        longitude: "경도:"
        keep image: 현재 이미지를 유지
        latitude: "위도:"
        longitude: "경도:"
-      my settings: 사용자 설정
+      make edits public button: 내 편집을 공개하기
+      my settings: 내 설정
        new email address: "새 이메일 주소:"
        new image: 그림 추가
        new email address: "새 이메일 주소:"
        new image: 그림 추가
+      no home location: 대문 위치를 입력하지 않았습니다.
        openid: 
        openid: 
+        link: http://wiki.openstreetmap.org/wiki/OpenID
          link text: 이게 뭐죠?
          openid: "OpenID:"
          link text: 이게 뭐죠?
          openid: "OpenID:"
+      preferred editor: "주로 사용하는 편집기:"
+      preferred languages: 주로 사용하는 언어
        profile description: "프로필 설명:"
        public editing: 
          disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명으로 됩니다.
          disabled link text: 왜 편집할 수 없나요?
        profile description: "프로필 설명:"
        public editing: 
          disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명으로 됩니다.
          disabled link text: 왜 편집할 수 없나요?
+        enabled: 활성화했습니다. 익명이 아닌 사용자는 데이터를 편집할 수 있습니다.
          enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
          enabled link text: 이게 뭐죠?
          heading: "공개 편집:"
          enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
          enabled link text: 이게 뭐죠?
          heading: "공개 편집:"
@@ -930,26 +1451,45 @@ ko:
        return to profile: 프로필로 돌아가기
        save changes button: 바뀐 사항 저장
        title: 계정 편집
        return to profile: 프로필로 돌아가기
        save changes button: 바뀐 사항 저장
        title: 계정 편집
+      update home location on click: 지도에서 클릭하면 대문 위지로 업데이트할까요?
      confirm: 
      confirm: 
+      already active: 이 계정은 이미 확인했습니다.
        button: 확인
        heading: 사용자 계정 확인
        button: 확인
        heading: 사용자 계정 확인
+      press confirm button: 계정을 활성화하려면 아래 확인 버튼을 누르세요.
+      success: 계정을 확인했습니다, 가입해주셔서 감사합니다!
+      unknown token: 이 토큰이 존재하지 않습니다.
      confirm_email: 
        button: 확인
      confirm_email: 
        button: 확인
+      failure: 이메일 주소는 이미 이 토큰으로 확인했습니다.
        heading: 이메일 주소 변경 확인
        heading: 이메일 주소 변경 확인
+      press confirm button: 새 이메일 주소를 확인하여면 아래에 확인 버튼을 누르세요.
+      success: 이메일 계정을 확인했습니다, 가입해주셔서 감사합니다!
      confirm_resend: 
        failure: "%{name} 사용자를 찾을 수 없습니다."
      confirm_resend: 
        failure: "%{name} 사용자를 찾을 수 없습니다."
+    filter: 
+      not_an_administrator: 해당 동작을 수행하려면 관리자 권한이 필요합니다.
+    go_public: 
+      flash success: 지금 모든 편집을 공개하고, 편집을 허용하지 않습니다.
      list: 
      list: 
+      confirm: 선택한 사용자 확인
+      empty: 일치하는 사용자를 찾을 수 없습니다
+      heading: 사용자
+      hide: 선택한 사용자 숨기기
        showing: 
          one: 페이지 %{page}개 보임 (%{items} 중 %{first_item})
          other: 페이지 %{page}개 보임 (%{items} 중 %{first_item}-%{last_item})
        showing: 
          one: 페이지 %{page}개 보임 (%{items} 중 %{first_item})
          other: 페이지 %{page}개 보임 (%{items} 중 %{first_item}-%{last_item})
+      summary: "%{name}(이)가 %{date}에 %{ip_address}에서 만들어짐"
        summary_no_ip: "%{name}(이)가 %{date}에 만들어짐"
        summary_no_ip: "%{name}(이)가 %{date}에 만들어짐"
+      title: 사용자
      login: 
      login: 
+      auth failure: 죄송합니다, 자세한 내용으로 로그인할 수 없습니다.
        create account minute: 계정을 만듭니다. 1분도 걸리지 않습니다.
        email or username: "이메일 주소 또는 사용자 이름:"
        heading: 로그인
        login_button: 로그인
        lost password link: 비밀번호를 잊으셨나요?
        create account minute: 계정을 만듭니다. 1분도 걸리지 않습니다.
        email or username: "이메일 주소 또는 사용자 이름:"
        heading: 로그인
        login_button: 로그인
        lost password link: 비밀번호를 잊으셨나요?
-      new to osm: 오픈스트리트맵이 처음이세요?
+      new to osm: OpenStreetMap이 처음이세요?
        no account: 계정이 없나요?
        openid: "%{logo} OpenID:"
        openid invalid: 죄송합니다, OpenID가 잘못된 것 같습니다
        no account: 계정이 없나요?
        openid: "%{logo} OpenID:"
        openid invalid: 죄송합니다, OpenID가 잘못된 것 같습니다
@@ -975,38 +1515,60 @@ ko:
            alt: 야후 OpenID로 로그인
            title: 야후로 로그인
        password: "비밀번호:"
            alt: 야후 OpenID로 로그인
            title: 야후로 로그인
        password: "비밀번호:"
-      register now: ì§\80ê¸\88 ë\93±ë¡\9dí\95\98ì\84¸ì\9a\94
+      register now: ì§\80ê¸\88 ë\93±ë¡\9dí\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤
        remember: 로그인 상태를 기억하기
        title: 로그인
        remember: 로그인 상태를 기억하기
        title: 로그인
-      to make changes: 오픈스트리트맵 데이터를 바꾸려면 계정이 있어야 합니다.
+      to make changes: OpenStreetMap 데이터를 바꾸려면 계정이 있어야 합니다.
        with openid: "또는 OpenID로 로그인하세요:"
        with openid: "또는 OpenID로 로그인하세요:"
-      with username: "이미 오픈스트리트맵 계정을 가지고 있나요? 계정 이름과 비밀번호로 로그인하세요:"
+      with username: "이미 OpenStreetMap 계정을 가지고 있나요? 계정 이름과 비밀번호로 로그인하세요:"
      logout: 
      logout: 
-      heading: 오픈스트리트맵에서 로그아웃
+      heading: OpenStreetMap에서 로그아웃
        logout_button: 로그아웃
        title: 로그아웃
      lost_password: 
        email address: "이메일 주소:"
        heading: 비밀번호를 잊으셨나요?
        logout_button: 로그아웃
        title: 로그아웃
      lost_password: 
        email address: "이메일 주소:"
        heading: 비밀번호를 잊으셨나요?
+      help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 우리는 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.
        new password button: 비밀번호 초기화
        notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다.
        new password button: 비밀번호 초기화
        notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다.
+      notice email on way: 죄송합니다, 잃어버렸습니다 :-( 곧 재설정을 할 수 있도록 하지만, 이메일을 사용할 수 있습니다.
        title: 잊어버진 비밀번호
      make_friend: 
        title: 잊어버진 비밀번호
      make_friend: 
+      already_a_friend: 이미 %{name} 사용자와 친구입니다.
+      button: 친구 추가
+      failed: 죄송합니다, %{name} 사용자를 친구로 추가하는 데 실패했습니다.
+      heading: "%{user} 사용자를 친구로 추가할까요?"
        success: "%{name} 사용자는 친구입니다."
      new: 
        success: "%{name} 사용자는 친구입니다."
      new: 
+      confirm email address: "이메일 주소 확인:"
        confirm password: "비밀번호 확인:"
        continue: 계속
        display name: "보여줄 이름:"
        display name description: 공개적으로 보여질 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
        email address: "이메일 주소:"
        confirm password: "비밀번호 확인:"
        continue: 계속
        display name: "보여줄 이름:"
        display name description: 공개적으로 보여질 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
        email address: "이메일 주소:"
-      heading: 새 계정을 만듭니다
+      fill_form: 양식을 채우고 우리에게 계정을 활성화하기 위해 신속하게 이메일을 보내드립니다.
+      heading: 사용자 계정 만들기
+      license_agreement: 계정을 확인하면 당신은 <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">기여자 약관</a>에 동의해야합니다.
+      not displayed publicly: 공개적으로 보여지지 않습니다 (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="이메일 주소에 대한 부분을 포함한 위키 개인정보 정책">개인정보 정책</a>을 참고하세요)
        openid: "%{logo} OpenID:"
        openid: "%{logo} OpenID:"
+      openid no password: OpenID로 비밀번호가 필요하지 않지만 몇가지 추가 도구나 서버는 여전히 비밀번호가 필요할 수 있습니다.
        password: "비밀번호:"
        password: "비밀번호:"
+      terms accepted: 새 기여자 약관에 동의하셔서 감사합니다!
+      terms declined: 우리는 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이 위키 문서</a>를 참고하세요.
        title: 계정 만들기
        title: 계정 만들기
+      use openid: 또는 %{logo} OpenID를 사용하여 로그인하세요
+    no_such_user: 
+      heading: "%{user} 사용자는 존재하지 않습니다"
+      title: 이러한 사용자는 없습니다
      popup: 
        friend: 친구
        nearby mapper: 인근 매퍼
        your location: 내 위치
      popup: 
        friend: 친구
        nearby mapper: 인근 매퍼
        your location: 내 위치
+    remove_friend: 
+      button: 친구 제거
+      heading: "%{user} 사용자를 친구로 제거할까요?"
+      not_a_friend: "%{name} 사용자는 친구가 아닙니다."
+      success: "%{name} 사용자를 친구에서 제거했습니다."
      reset_password: 
        confirm password: 비밀번호 확인
        flash changed: 비밀번호가 바뀌었습니다.
      reset_password: 
        confirm password: 비밀번호 확인
        flash changed: 비밀번호가 바뀌었습니다.
@@ -1015,44 +1577,169 @@ ko:
        password: "비밀번호:"
        reset: 비밀번호 초기화
        title: 비밀번호 초기화
        password: "비밀번호:"
        reset: 비밀번호 초기화
        title: 비밀번호 초기화
+    set_home: 
+      flash success: 대문 주소를 성공적으로 저장했습니다
+    suspended: 
+      heading: 계정 정지
+      title: 계정 정지
+      webmaster: 웹마스터
      terms: 
        agree: 동의
        consider_pd_why: 이게 뭐죠?
      terms: 
        agree: 동의
        consider_pd_why: 이게 뭐죠?
+      decline: 거부
+      heading: 기여자 약관
        legale_names: 
          france: 프랑스
          italy: 이탈리아
        legale_names: 
          france: 프랑스
          italy: 이탈리아
+        rest_of_world: 세계의 나머지
+      title: 기여자 약관
      view: 
      view: 
-      comments: 의견
+      activate_user: 이 사용자 활성화
+      add as friend: 친구 추가
+      ago: (%{time_in_words_ago} 전)
+      block_history: 사용자가 차단을 받았습니다
+      blocks by me: 나에 의한 차단
+      blocks on me: 나를 차단
+      comments: 덧글
        confirm: 확인
        confirm: 확인
+      confirm_user: 이 사용자 확인
        create_block: 이 사용자를 차단
        create_block: 이 사용자를 차단
+      created from: "만든 날:"
+      ct accepted: "%{ago} 전에 승인함"
+      ct declined: 거부
+      ct status: "기여자 약관:"
+      ct undecided: 정의되지 않음
+      deactivate_user: 이 사용자 비활성화
        delete_user: 이 사용자를 삭제
        description: 설명
        delete_user: 이 사용자를 삭제
        description: 설명
+      diary: 일지
+      edits: 편집
+      email address: "이메일 주소:"
        friends_changesets: 친구의 모든 바뀜집합 찾아보기
        friends_diaries: 친구의 모든 일지 항목 찾아보기
        hide_user: 이 사용자를 숨기기
        friends_changesets: 친구의 모든 바뀜집합 찾아보기
        friends_diaries: 친구의 모든 일지 항목 찾아보기
        hide_user: 이 사용자를 숨기기
+      km away: "%{count}km 거리"
+      latest edit: "최근 편집 %{ago}:"
+      m away: "%{count}m 거리"
+      mapper since: "이후 매퍼:"
+      moderator_history: 사용자가 차단을 주었습니다
+      my comments: 내 덧글
+      my diary: 내 일지
+      my edits: 내 편집
+      my settings: 내 설정
+      my traces: 내 발자취
+      nearby users: 기타 근처 사용자
        nearby_changesets: 인근 사용자의 모든 바뀜집합 찾아보기
        nearby_diaries: 인근 사용자의 모든 일지 항목 찾아보기
        nearby_changesets: 인근 사용자의 모든 바뀜집합 찾아보기
        nearby_diaries: 인근 사용자의 모든 일지 항목 찾아보기
+      new diary entry: 새 일지 항목
+      no friends: 아직 어떠한 친구도 추가하지 않았습니다.
+      no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다.
+      oauth settings: oauth 설정
+      remove as friend: 친구 제거
+      role: 
+        administrator: 이 사용자는 관리자입니다
+        grant: 
+          administrator: 관리자 접근 허가
+          moderator: 운영자 접근 허가
+        moderator: 이 사용자는 운영자입니다
+        revoke: 
+          administrator: 관리자 접근 철회
+          moderator: 운영자 접근 철회
+      send message: 메시지 보내기
        settings_link_text: 설정
        spam score: "스팸 점수:"
        settings_link_text: 설정
        spam score: "스팸 점수:"
+      status: "상태:"
+      traces: 발자취
+      unhide_user: 이 사용자를 숨기기 취소
+      user location: 사용자 위치
        your friends: 내 친구
    user_block: 
      blocks_by: 
        your friends: 내 친구
    user_block: 
      blocks_by: 
-      heading: "%{name} 사용자에 의해 차단한 목록"
+      empty: "%{name} 사용자는 아직 어떠한 차단도 하지 않았습니다."
+      heading: "%{name} 사용자에 의한 차단 목록"
        title: "%{name} 사용자에 의해 차단"
        title: "%{name} 사용자에 의해 차단"
+    blocks_on: 
+      empty: "%{name} 사용자는 아직 차단되지 않았습니다."
+      heading: "%{name} 사용자에 대한 차단 목록"
+      title: "%{name} 사용자에 대해 차단"
+    create: 
+      flash: "%{name} 사용자를 차단했습니다."
      edit: 
        back: 모든 차단 보기
      edit: 
        back: 모든 차단 보기
+      heading: "%{name} 사용자에 대한 차단 편집"
        show: 이 차단 보기
        submit: 차단 업데이트
        show: 이 차단 보기
        submit: 차단 업데이트
+      title: "%{name} 사용자에 대한 차단 편집"
+    helper: 
+      time_future: "%{time}에 끝납니다."
+      time_past: "%{time} 전에 끝났습니다."
+      until_login: 사용자가 로그인할 때까지 활성합니다.
      index: 
      index: 
+      empty: 아직 차단하지 않았습니다.
        heading: 사용자 차단 목록
        title: 사용자 차단
        heading: 사용자 차단 목록
        title: 사용자 차단
+    model: 
+      non_moderator_revoke: 사회자가 차단을 철회해야 합니다.
+      non_moderator_update: 사회자가 차단을 만들거나 업데이트해야 합니다.
+    new: 
+      back: 모든 차단 보기
+      heading: "%{name} 사용자 차단"
+      submit: 차단 만들기
+      title: "%{name} 사용자 차단"
+    not_found: 
+      back: 색인으로 돌아가기
+      sorry: 죄송합니다, %{id} ID로 된 사용자 차단을 찾을 수 없습니다.
      partial: 
        confirm: 확실합니까?
      partial: 
        confirm: 확실합니까?
+      creator_name: 만든이
        display_name: 차단된 사용자
        edit: 편집
        display_name: 차단된 사용자
        edit: 편집
+      next: 다음 »
+      not_revoked: (철회하지 않음)
+      previous: « 이전
+      reason: 차단 이유
+      revoke: 철회!
+      revoker_name: 철회자
        show: 보기
        show: 보기
+      showing_page: 페이지 %{page}개 보임
+      status: 상태
+    period: 
+      one: 1시간
+      other: "%{count}시간"
+    revoke: 
+      confirm: 이 차단을 철회하겠습니까?
+      flash: 이 차단을 철회했습니다.
+      heading: "%{block_by}에 의해 %{block_on}에 차단 철회함"
+      past: 이 차단은 %{time} 전에 끝났고 지금 철회할 수 없습니다.
+      revoke: 철회!
+      time_future: 이 차단은 %{time}에 끝납니다.
+      title: "%{block_on}에 차단 철회함"
      show: 
      show: 
+      back: 모든 차단 보기
        confirm: 확실합니까?
        edit: 편집
        confirm: 확실합니까?
        edit: 편집
+      heading: "%{block_on} 사용자가 %{block_by} 사용자에 의해 차단됨"
+      needs_view: 차단 해제하기 전에 다시 로그인해야합니다.
+      reason: "차단 이유:"
+      revoke: 철회!
+      revoker: "철회:"
+      show: 보기
+      status: 상태
+      time_future: "%{time}에 끝남"
+      time_past: "%{time} 전에 끝남"
+      title: "%{block_on} 사용자가 %{block_by} 사용자에 의해 차단됨"
      update: 
      update: 
+      only_creator_can_edit: 이 차단을 한 운영자만 편집할 수 있습니다.
        success: 차단이 업데이트되었습니다.
        success: 차단이 업데이트되었습니다.
+  user_role: 
+    filter: 
+      already_has_role: 사용자는 이미 %{role} 역할이 있습니다.
+      doesnt_have_role: 사용자는 %{role} 역할이 없습니다.
+    grant: 
+      confirm: 확인
+      heading: 역할 부여 확인
+      title: 역할 부여 확인
+    revoke: 
+      confirm: 확인
+      heading: 역할 철회 확인
+      title: 역할 철회 확인