Merge branch 'master' into feature/add-communities-page

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

index 7b6adb97f1af387982004a3c27b3f45b51069d62..b5fb28484fe2f16437d41485904293821ce01662 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -4,6 +4,7 @@
  # Author: A Retired User
  # Author: Alattalatta
  # Author: Alex00728
  # Author: A Retired User
  # Author: Alattalatta
  # Author: Alex00728
+# Author: Apzp79
  # Author: Asdfqwer51
  # Author: B891202
  # Author: CYAN
  # Author: Asdfqwer51
  # Author: B891202
  # Author: CYAN
@@ -61,6 +62,9 @@ ko:
        client_application:
          create: 등록
          update: 업데이트
        client_application:
          create: 등록
          update: 업데이트
+      doorkeeper_application:
+        create: 등록
+        update: 업데이트
        redaction:
          create: 교정 만들기
          update: 교정 저장
        redaction:
          create: 교정 만들기
          update: 교정 저장
@@ -77,8 +81,8 @@ ko:
          email_address_not_routable: 경로를 잡을 수 없음
      models:
        acl: 접근 제어 목록
          email_address_not_routable: 경로를 잡을 수 없음
      models:
        acl: 접근 제어 목록
-      changeset: ë°\94ë\80\9c집합
-      changeset_tag: ë°\94ë\80\9c집합 태그
+      changeset: ë³\80ê²½ 집합
+      changeset_tag: ë³\80ê²½ 집합 태그
        country: 나라
        diary_comment: 일기 의견
        diary_entry: 일기 항목
        country: 나라
        diary_comment: 일기 의견
        diary_entry: 일기 항목
@@ -132,6 +136,10 @@ ko:
          latitude: 위도
          longitude: 경도
          language: 언어
          latitude: 위도
          longitude: 경도
          language: 언어
+      doorkeeper/application:
+        name: 이름
+        redirect_uri: URI 리다이렉트
+        scopes: 허가
        friend:
          user: 사용자
          friend: 친구
        friend:
          user: 사용자
          friend: 친구
@@ -169,11 +177,13 @@ ko:
          description: 프로필 설명
          home_lat: 위도
          home_lon: 경도
          description: 프로필 설명
          home_lat: 위도
          home_lon: 경도
-        languages: ì£¼ë¡\9c ì\82¬ì\9a©하는 언어
-        preferred_editor: ì£¼ë¡\9c ì\82¬ì\9a©하는 편집기
+        languages: ì\84 í\98¸하는 언어
+        preferred_editor: ì\84 í\98¸하는 편집기
          pass_crypt: 비밀번호
          pass_crypt_confirmation: 비밀번호 확인
      help:
          pass_crypt: 비밀번호
          pass_crypt_confirmation: 비밀번호 확인
      help:
+      doorkeeper/application:
+        redirect_uri: URI마다 1줄 사용
        trace:
          tagstring: 쉼표로 구분
        user_block:
        trace:
          tagstring: 쉼표로 구분
        user_block:
@@ -220,11 +230,11 @@ ko:
        comment:
          opened_at_html: '%{when}에 만듦'
          opened_at_by_html: '%{user}님이 %{when}에 만듦'
        comment:
          opened_at_html: '%{when}에 만듦'
          opened_at_by_html: '%{user}님이 %{when}에 만듦'
-        commented_at_html: '%{when}에 바꿈'
+        commented_at_html: '%{when}에 바뀜'
          commented_at_by_html: '%{user}님이 %{when}에 업데이트함'
          closed_at_html: '%{when}에 해결함'
          closed_at_by_html: '%{user}님이 %{when}에 해결함'
          commented_at_by_html: '%{user}님이 %{when}에 업데이트함'
          closed_at_html: '%{when}에 해결함'
          closed_at_by_html: '%{user}님이 %{when}에 해결함'
-        reopened_at_html: '%{when}에 다시 활성화í\95¨'
+        reopened_at_html: '%{when}에 다시 활성화ë\90¨'
          reopened_at_by_html: '%{user}님이 %{when}에 다시 활성화함'
        rss:
          title: OpenStreetMap 참고
          reopened_at_by_html: '%{user}님이 %{when}에 다시 활성화함'
        rss:
          title: OpenStreetMap 참고
@@ -248,7 +258,7 @@ ko:
      edited_by_html: <abbr title='%{title}'>%{time}</abbr>에 %{user}님이 편집함
      closed_by_html: <abbr title='%{title}'>%{time}</abbr>에 %{user}님이 닫음
      version: 버전
      edited_by_html: <abbr title='%{title}'>%{time}</abbr>에 %{user}님이 편집함
      closed_by_html: <abbr title='%{title}'>%{time}</abbr>에 %{user}님이 닫음
      version: 버전
-    in_changeset: ë°\94ë\80\9c집합
+    in_changeset: ë³\80ê²½ 집합
      anonymous: 익명
      no_comment: (댓글 없음)
      part_of: '다음의 일부:'
      anonymous: 익명
      no_comment: (댓글 없음)
      part_of: '다음의 일부:'
@@ -260,7 +270,7 @@ ko:
      view_details: 자세한 내용 보기
      location: '위치:'
      changeset:
      view_details: 자세한 내용 보기
      location: '위치:'
      changeset:
-      title: 'ë°\94ë\80\9c집합: %{id}'
+      title: 'ë³\80ê²½ 집합: %{id}'
        belongs_to: 저자
        node: 교점(%{count})
        node_paginated: 교점(%{count}개 중 %{x}-%{y})
        belongs_to: 저자
        node: 교점(%{count})
        node_paginated: 교점(%{count}개 중 %{x}-%{y})
@@ -272,11 +282,11 @@ ko:
        hidden_commented_by_html: '%{user}님의 <abbr title=''%{exact_time}''>%{when}</abbr>
          숨겨진 의견'
        commented_by_html: '%{user}님의 <abbr title=''%{exact_time}''>%{when}</abbr> 의견'
        hidden_commented_by_html: '%{user}님의 <abbr title=''%{exact_time}''>%{when}</abbr>
          숨겨진 의견'
        commented_by_html: '%{user}님의 <abbr title=''%{exact_time}''>%{when}</abbr> 의견'
-      changesetxml: ë°\94ë\80\9c집합 XML
+      changesetxml: ë³\80ê²½ 집합 XML
        osmchangexml: osmChange XML
        feed:
        osmchangexml: osmChange XML
        feed:
-        title: ë°\94ë\80\9c집합 %{id}
-        title_comment: ë°\94ë\80\9c집합 %{id} - %{comment}
+        title: ë³\80ê²½ 집합 %{id}
+        title_comment: ë³\80ê²½ 집합 %{id} - %{comment}
        join_discussion: 토론에 참여하려면 로그인하세요
        discussion: 토론
        still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다.
        join_discussion: 토론에 참여하려면 로그인하세요
        discussion: 토론
        still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다.
@@ -288,7 +298,7 @@ ko:
        history_title_html: '길 역사: %{name}'
        nodes: 교점
        nodes_count:
        history_title_html: '길 역사: %{name}'
        nodes: 교점
        nodes_count:
-        other: 노드 %{count}개
+        other: 교점 %{count}개
        also_part_of_html:
          one: '%{related_ways} 길의 일부'
          other: '%{related_ways} 길의 일부'
        also_part_of_html:
          one: '%{related_ways} 길의 일부'
          other: '%{related_ways} 길의 일부'
@@ -315,7 +325,7 @@ ko:
          node: 교점
          way: 길
          relation: 관계
          node: 교점
          way: 길
          relation: 관계
-        changeset: ë°\94ë\80\9c집합
+        changeset: ë³\80ê²½ 집합
          note: 참고
      timeout:
        title: 시간 초과 오류
          note: 참고
      timeout:
        title: 시간 초과 오류
@@ -346,7 +356,7 @@ ko:
          tag: '%{key}=%{value} 태그에 대한 위키 설명 문서'
        wikidata_link: 위키데이터 %{page} 항목
        wikipedia_link: 위키백과 %{page} 문서
          tag: '%{key}=%{value} 태그에 대한 위키 설명 문서'
        wikidata_link: 위키데이터 %{page} 항목
        wikipedia_link: 위키백과 %{page} 문서
-      wikimedia_commons_link: ì\9c\84í\82¤ë¯¸ë\94\94ì\96´ ê³µì\9a©ì\97\90ì\84\9cì\9d\98 %{page} í\95ëª©
+      wikimedia_commons_link: 위키미디어 공용의 %{page} 항목
        telephone_link: '%{phone_number}(으)로 전화 걸기'
        colour_preview: '%{colour_value}색 미리 보기'
      note:
        telephone_link: '%{phone_number}(으)로 전화 걸기'
        colour_preview: '%{colour_value}색 미리 보기'
      note:
@@ -382,7 +392,7 @@ ko:
      changeset:
        anonymous: 익명
        no_edits: (편집 없음)
      changeset:
        anonymous: 익명
        no_edits: (편집 없음)
-      view_changeset_details: ë°\94ë\80\9cì§\91í\95© 자세한 사항 보기
+      view_changeset_details: ë³\80ê²½ ì§\91í\95©ì\9d\98 자세한 사항 보기
      changesets:
        id: ID
        saved_at: 저장된 시간
      changesets:
        id: ID
        saved_at: 저장된 시간
@@ -391,29 +401,48 @@ ko:
        area: 구역
      index:
        title: 바뀜집합
        area: 구역
      index:
        title: 바뀜집합
-      title_user: '%{user}ë\8b\98ì\9d\98 ë°\94ë\80\9c집합'
-      title_friend: ë\82´ ì¹\9cêµ¬ì\9d\98 ë°\94ë\80\9c집합
-      title_nearby: ê·¼ì²\98 ì\82¬ì\9a©ì\9e\90ì\9d\98 ë°\94ë\80\9c집합
-      empty: 찾은 바뀜집합이 없습니다.
-      empty_area: ì\9d´ ì§\80ì\97ì\97\90 ë°\94ë\80\9c집합이 없습니다.
-      empty_user: ì\9d´ ì\82¬ì\9a©ì\9e\90ì\9d\98 ë°\94ë\80\9c집합이 없습니다.
-      no_more: ì°¾ì\9d\80 ë°\94ë\80\9c집합이 더 없습니다.
-      no_more_area: ì\9d´ ì§\80ì\97ì\97\90ì\84\9c ë°\94ë\80\9c집합이 더 없습니다.
-      no_more_user: ì\9d´ ì\82¬ì\9a©ì\9e\90ì\9d\98 ë°\94ë\80\9c집합이 더 없습니다.
+      title_user: '%{user}ë\8b\98ì\9d\98 ë³\80ê²½ 집합'
+      title_friend: ë\82´ ì¹\9cêµ¬ì\9d\98 ë³\80ê²½ 집합
+      title_nearby: ê·¼ì²\98 ì\82¬ì\9a©ì\9e\90ì\9d\98 ë³\80ê²½ 집합
+      empty: 찾는 변경 집합이 없습니다.
+      empty_area: ì\9d´ ì§\80ì\97ì\97\90 ë³\80ê²½ 집합이 없습니다.
+      empty_user: ì\9d´ ì\82¬ì\9a©ì\9e\90ì\9d\98 ë³\80ê²½ 집합이 없습니다.
+      no_more: ì°¾ì\9d\80 ë³\80ê²½ 집합이 더 없습니다.
+      no_more_area: ì\9d´ ì§\80ì\97ì\97\90ì\84\9c ë³\80ê²½ 집합이 더 없습니다.
+      no_more_user: ì\9d´ ì\82¬ì\9a©ì\9e\90ì\9d\98 ë³\80ê²½ 집합이 더 없습니다.
        load_more: 더 불러오기
      timeout:
        load_more: 더 불러오기
      timeout:
-      sorry: ì£\84ì\86¡í\95©ë\8b\88ë\8b¤, ì\9a\94ì²í\95\98ë\8a\94 ë°\94ë\80\9c집합 목록을 얻는데 너무 오래 걸렸습니다.
+      sorry: ì£\84ì\86¡í\95©ë\8b\88ë\8b¤, ì\9a\94ì²í\95\98ë\8a\94 ë³\80ê²½ 집합 목록을 얻는데 너무 오래 걸렸습니다.
    changeset_comments:
      comment:
    changeset_comments:
      comment:
-      comment: 'ë°\94ë\80\9cì§\91í\95© #%{changeset_id}ì\97\90 %{author}ë\8b\98ì\9d´ ì\83\88 ë\8d§글을 남김'
+      comment: 'ë³\80ê²½ ì§\91í\95© #%{changeset_id}ì\97\90 %{author}ë\8b\98ì\9d´ ì\83\88 ë\8c\93글을 남김'
        commented_at_by_html: '%{user}님이 %{when}에 업데이트함'
      comments:
        commented_at_by_html: '%{user}님이 %{when}에 업데이트함'
      comments:
-      comment: 'ë°\94ë\80\9c집합 #%{changeset_id}에 %{author}님이 새 댓글을 남김'
+      comment: 'ë³\80ê²½ 집합 #%{changeset_id}에 %{author}님이 새 댓글을 남김'
      index:
      index:
-      title_all: OpenStreetMap ë°\94ë\80\9c집합 토론
-      title_particular: 'OpenStreetMap ë°\94ë\80\9c집합 #%{changeset_id} 토론'
+      title_all: OpenStreetMap ë³\80ê²½ 집합 토론
+      title_particular: 'OpenStreetMap ë³\80ê²½ 집합 #%{changeset_id} 토론'
      timeout:
      timeout:
-      sorry: 죄송합니다, 요청하는 바뀜집합 댓글을 얻는데 너무 오래 걸렸습니다.
+      sorry: 죄송합니다, 요청하는 변경 집합 댓글을 불러오는데 너무 오래 걸렸습니다.
+  dashboards:
+    contact:
+      km away: '%{count}km 거리'
+      m away: '%{count}m 거리'
+    popup:
+      your location: 내 위치
+      nearby mapper: 근처 매퍼
+      friend: 친구
+    show:
+      title: 내 대시보드
+      edit_your_profile: 내 프로파일 편집
+      my friends: 내 친구
+      no friends: 아직 어떠한 친구도 추가하지 않았습니다.
+      nearby users: 기타 근처 사용자
+      no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다.
+      friends_changesets: 친구의 바뀜집합
+      friends_diaries: 친구의 일기 항목
+      nearby_changesets: 근처 사용자의 바뀜집합
+      nearby_diaries: 근처 사용자의 일기 항목
    diary_entries:
      new:
        title: 새 일기 항목
    diary_entries:
      new:
        title: 새 일기 항목
@@ -481,12 +510,16 @@ ko:
          title: 오픈스트리트맵 일기 항목
          description: 오픈스트리트맵 사용자의 최근 일기 항목
      comments:
          title: 오픈스트리트맵 일기 항목
          description: 오픈스트리트맵 사용자의 최근 일기 항목
      comments:
-      has_commented_on: '%{display_name}님이 다음의 일기 항목에 덧글을 남겼습니다'
        post: 게시물
        when: 날짜
        comment: 의견
        newer_comments: 새 의견
        older_comments: 이전 의견
        post: 게시물
        when: 날짜
        comment: 의견
        newer_comments: 새 의견
        older_comments: 이전 의견
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: 애플리케이션을 등록했습니다.
    friendships:
      make_friend:
        heading: '%{user} 님을 친구로 추가할까요?'
    friendships:
      make_friend:
        heading: '%{user} 님을 친구로 추가할까요?'
@@ -544,7 +577,7 @@ ko:
            bbq: 바베큐
            bench: 벤치
            bicycle_parking: 자전거 주차장
            bbq: 바베큐
            bench: 벤치
            bicycle_parking: 자전거 주차장
-          bicycle_rental: 자전거 대여
+          bicycle_rental: 자전거 대여점
            bicycle_repair_station: 자전거 수리소
            biergarten: 옥외 탁자
            blood_bank: 혈액 보관소
            bicycle_repair_station: 자전거 수리소
            biergarten: 옥외 탁자
            blood_bank: 혈액 보관소
@@ -558,11 +591,11 @@ ko:
            car_wash: 세차장
            casino: 카지노
            charging_station: 전기 자동차 충전소
            car_wash: 세차장
            casino: 카지노
            charging_station: 전기 자동차 충전소
-          childcare: 육아
+          childcare: 탁아소
            cinema: 영화관
            clinic: 의원
            clock: 시계
            cinema: 영화관
            clinic: 의원
            clock: 시계
-          college: 전문대학
+          college: 대학
            community_centre: 커뮤니티 센터
            conference_centre: 컨퍼런스 센터
            courthouse: 법원
            community_centre: 커뮤니티 센터
            conference_centre: 컨퍼런스 센터
            courthouse: 법원
@@ -583,7 +616,7 @@ ko:
            grit_bin: 모래상자
            hospital: 병원
            hunting_stand: 사냥장
            grit_bin: 모래상자
            hospital: 병원
            hunting_stand: 사냥장
-          ice_cream: 아이스크림
+          ice_cream: 아이스크림 가게
            internet_cafe: 인터넷 카페
            kindergarten: 유치원
            language_school: 언어 학교
            internet_cafe: 인터넷 카페
            kindergarten: 유치원
            language_school: 언어 학교
@@ -595,11 +628,11 @@ ko:
            motorcycle_parking: 오토바이 주차장
            music_school: 음악 학교
            nightclub: 나이트 클럽
            motorcycle_parking: 오토바이 주차장
            music_school: 음악 학교
            nightclub: 나이트 클럽
-          nursing_home: 복지관
+          nursing_home: 양로원
            parking: 주차장
            parking_entrance: 주차장 입구
            parking_space: 주차 공간
            parking: 주차장
            parking_entrance: 주차장 입구
            parking_space: 주차 공간
-          payment_terminal: 결제 터미널
+          payment_terminal: 결제 단말기
            pharmacy: 약국
            place_of_worship: 예배당
            police: 경찰서
            pharmacy: 약국
            place_of_worship: 예배당
            police: 경찰서
@@ -607,15 +640,15 @@ ko:
            post_office: 우체국
            prison: 교도소
            pub: 술집
            post_office: 우체국
            prison: 교도소
            pub: 술집
-          public_bath: 공공 욕실
+          public_bath: 공중 목욕탕
            public_bookcase: 공공 책장
            public_building: 공공 건물
            public_bookcase: 공공 책장
            public_building: 공공 건물
-          ranger_station: 레인저 스테이션
+          ranger_station: 관리소
            recycling: 재활용장
            restaurant: 음식점
            school: 학교
            shelter: 대피소
            recycling: 재활용장
            restaurant: 음식점
            school: 학교
            shelter: 대피소
-          shower: 샤워
+          shower: 샤워장
            social_centre: 사회 센터
            social_facility: 공공 시설
            studio: 스튜디오
            social_centre: 사회 센터
            social_facility: 공공 시설
            studio: 스튜디오
@@ -632,7 +665,7 @@ ko:
            waste_basket: 쓰레기통
            waste_disposal: 폐기물 처리장
            watering_place: 급수지
            waste_basket: 쓰레기통
            waste_disposal: 폐기물 처리장
            watering_place: 급수지
-          water_point: 워터 포인트
+          water_point: 급수장
          boundary:
            administrative: 행정 구역 경계
            census: 인구조사 구역 경계
          boundary:
            administrative: 행정 구역 경계
            census: 인구조사 구역 경계
@@ -642,10 +675,10 @@ ko:
            "yes": 경계
          bridge:
            aqueduct: 수도교
            "yes": 경계
          bridge:
            aqueduct: 수도교
-          boardwalk: 보드워크
+          boardwalk: 판자길
            suspension: 현수교
            suspension: 현수교
-          swing: 선회교
-          viaduct: 고가 다리
+          swing: 선개교
+          viaduct: 고가교
            "yes": 다리
          building:
            apartment: 아파트
            "yes": 다리
          building:
            apartment: 아파트
@@ -669,7 +702,7 @@ ko:
            hospital: 병원
            hotel: 호텔 건물
            house: 주택
            hospital: 병원
            hotel: 호텔 건물
            house: 주택
-          houseboat: 거주형 선박
+          houseboat: 선상 가옥
            hut: 소형 오두막
            industrial: 산업용 건물
            kindergarten: 유치원 건물
            hut: 소형 오두막
            industrial: 산업용 건물
            kindergarten: 유치원 건물
@@ -684,16 +717,16 @@ ko:
            service: 서비스 건물
            terrace: 테라스 건물
            train_station: 철도역 건물
            service: 서비스 건물
            terrace: 테라스 건물
            train_station: 철도역 건물
-          university: 대학 건물
+          university: 대학교 건물
            warehouse: 저장고
            "yes": 건물
          club:
            sport: 스포츠 클럽
            "yes": 클럽
          craft:
            warehouse: 저장고
            "yes": 건물
          club:
            sport: 스포츠 클럽
            "yes": 클럽
          craft:
-          beekeper: 양봉장
+          beekeeper: 양봉장
            blacksmith: 대장간
            blacksmith: 대장간
-          brewery: 맥주 공장
+          brewery: 양조장
            carpenter: 목공
            caterer: 조리소
            dressmaker: 양장점
            carpenter: 목공
            caterer: 조리소
            dressmaker: 양장점
@@ -717,7 +750,6 @@ ko:
            landing_site: 비상 착륙지
            phone: 긴급 전화
            water_tank: 긴급 물탱크
            landing_site: 비상 착륙지
            phone: 긴급 전화
            water_tank: 긴급 물탱크
-          "yes": 긴급
          highway:
            abandoned: 버려진 고속도로
            bridleway: 승마로
          highway:
            abandoned: 버려진 고속도로
            bridleway: 승마로
@@ -738,7 +770,7 @@ ko:
            motorway_link: 고속도로
            passing_place: 대피소
            path: 보행로
            motorway_link: 고속도로
            passing_place: 대피소
            path: 보행로
-          pedestrian: 보행자 길
+          pedestrian: 보행자용 통로
            platform: 승강장
            primary: 1차 도로
            primary_link: 1차 도로
            platform: 승강장
            primary: 1차 도로
            primary_link: 1차 도로
@@ -747,17 +779,17 @@ ko:
            residential: 주거 도로
            rest_area: 휴게소
            road: 도로
            residential: 주거 도로
            rest_area: 휴게소
            road: 도로
-          secondary: 2차 도로
-          secondary_link: 2차 도로
-          service: ì \91ê·¼ 도로
+          secondary: 2급 도로
+          secondary_link: 2급 도로
+          service: ì§\80ì\84  도로
            services: 고속도로 휴게소
            speed_camera: 속도 카메라
            steps: 계단
            stop: 정지 표지
            street_lamp: 가로등
            services: 고속도로 휴게소
            speed_camera: 속도 카메라
            steps: 계단
            stop: 정지 표지
            street_lamp: 가로등
-          tertiary: 3차 도로
-          tertiary_link: 3차 도로
-          track: 농·임도
+          tertiary: 3급 도로
+          tertiary_link: 3급 도로
+          track: 오솔길
            traffic_signals: 교통 신호
            trunk: 간선 도로
            trunk_link: 간선 도로
            traffic_signals: 교통 신호
            trunk: 간선 도로
            trunk_link: 간선 도로
@@ -827,7 +859,7 @@ ko:
            residential: 주거 지역
            retail: 상업 지역
            village_green: 녹지 광장
            residential: 주거 지역
            retail: 상업 지역
            village_green: 녹지 광장
-          vineyard: 포도밭
+          vineyard: 포도원
            "yes": 토지 이용
          leisure:
            adult_gaming_centre: 성인 오락실
            "yes": 토지 이용
          leisure:
            adult_gaming_centre: 성인 오락실
@@ -843,7 +875,7 @@ ko:
            fitness_station: 피트니스 스테이션
            garden: 정원
            golf_course: 골프장
            fitness_station: 피트니스 스테이션
            garden: 정원
            golf_course: 골프장
-          horse_riding: 승마
+          horse_riding: 승마장
            ice_rink: 아이스 링크
            marina: 정박지
            miniature_golf: 미니어처 골프
            ice_rink: 아이스 링크
            marina: 정박지
            miniature_golf: 미니어처 골프
@@ -853,7 +885,7 @@ ko:
            picnic_table: 피크닉 테이블
            pitch: 운동장
            playground: 놀이터
            picnic_table: 피크닉 테이블
            pitch: 운동장
            playground: 놀이터
-          recreation_ground: 놀이 공원
+          recreation_ground: 공설 운동장
            resort: 리조트
            sauna: 사우나
            slipway: 슬립 웨이
            resort: 리조트
            sauna: 사우나
            slipway: 슬립 웨이
@@ -885,7 +917,7 @@ ko:
            manhole: 맨홀
            mast: 돛대
            mine: 광산
            manhole: 맨홀
            mast: 돛대
            mine: 광산
-          mineshaft: 갱도
+          mineshaft: 수직 갱도
            monitoring_station: 감시소
            petroleum_well: 유정
            pier: 부두
            monitoring_station: 감시소
            petroleum_well: 유정
            pier: 부두
@@ -955,6 +987,7 @@ ko:
            stone: 돌
            strait: 해협
            tree: 나무
            stone: 돌
            strait: 해협
            tree: 나무
+          tundra: 툰드라
            valley: 골짜기
            volcano: 화산
            water: 물
            valley: 골짜기
            volcano: 화산
            water: 물
@@ -962,7 +995,7 @@ ko:
            wood: 산림
            "yes": 자연
          office:
            wood: 산림
            "yes": 자연
          office:
-          accountant: 공인회계사 사무소
+          accountant: 회계사무소
            administrative: 관리
            architect: 건축가
            association: 협회
            administrative: 관리
            architect: 건축가
            association: 협회
@@ -1451,9 +1484,6 @@ ko:
        unknown token: 확인 코드가 만료되었거나 존재하지 않습니다.
        reconfirm_html: 확인 이메일을 다시 보낼 필요가 있다면, <a href="%{reconfirm}">여기를 클릭하세요</a>.
      confirm_resend:
        unknown token: 확인 코드가 만료되었거나 존재하지 않습니다.
        reconfirm_html: 확인 이메일을 다시 보낼 필요가 있다면, <a href="%{reconfirm}">여기를 클릭하세요</a>.
      confirm_resend:
-      success_html: '%{email}(으)로 새 확인 쪽지를 보냈는데 즉시 계정을 확인하는 대로 매핑을 할 수 있습니다.<br /><br
-        />확인 요청을 보낼 때 스팸 방지 시스템을 사용한다면 어떤 확인 요청에 답변할 수 없으므로 화이트리스트에 %{sender}이(가)
-        있는지 확인하세요.'
        failure: '%{name} 사용자를 찾을 수 없습니다.'
      confirm_email:
        heading: 이메일 주소 바꾸기 확인
        failure: '%{name} 사용자를 찾을 수 없습니다.'
      confirm_email:
        heading: 이메일 주소 바꾸기 확인
@@ -1548,6 +1578,43 @@ ko:
        reset: 비밀번호 재설정
        flash changed: 비밀번호가 바뀌었습니다.
        flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?
        reset: 비밀번호 재설정
        flash changed: 비밀번호가 바뀌었습니다.
        flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?
+  preferences:
+    show:
+      title: 내 환경 설정
+      preferred_editor: 선호하는 편집기
+      preferred_languages: 선호하는 언어
+      edit_preferences: 환경 설정 편집
+    edit:
+      title: 환경 설정 편집
+      save: 환경 설정 갱신
+      cancel: 취소
+    update:
+      failure: 환경 설정을 갱신할 수 없음.
+    update_success_flash:
+      message: 환경 설정이 갱신 됨.
+  profiles:
+    edit:
+      title: 프로필 수정
+      save: 프로필 갱신
+      cancel: 취소
+      image: 이미지
+      gravatar:
+        gravatar: Gravatar 사용
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Gravatar는 무엇입니까?
+        disabled: 그라바타가 비활성화되었습니다.
+        enabled: 그라바타의 표시가 활성화되었습니다
+      new image: 그림 추가
+      keep image: 현재 그림 유지
+      delete image: 현재 그림 제거
+      replace image: 현재 그림 바꾸기
+      image size hint: (100x100 이하의 정사각형 그림이 최적)
+      home location: 집 위치
+      no home location: 집 위치를 입력하지 않았습니다.
+      update home location on click: 지도에서 클릭하면 집 위치로 업데이트할까요?
+    update:
+      success: 프로필이 갱신 됨.
+      failure: 프로필을 갱신할 수 없음.
    sessions:
      new:
        title: 로그인
    sessions:
      new:
        title: 로그인
@@ -2056,6 +2123,7 @@ ko:
        uploaded: '올린 날짜:'
        points: '점:'
        start_coordinates: '시작 좌표:'
        uploaded: '올린 날짜:'
        points: '점:'
        start_coordinates: '시작 좌표:'
+      coordinates_html: '%{latitude}; %{longitude}'
        map: 지도
        edit: 편집
        owner: '소유자:'
        map: 지도
        edit: 편집
        owner: '소유자:'
@@ -2088,7 +2156,7 @@ ko:
        in: 위치
      index:
        public_traces: 공개 GPS 궤적
        in: 위치
      index:
        public_traces: 공개 GPS 궤적
-      my_traces: 내 GPS 궤적
+      my_traces: 내 발자취
        public_traces_from: '%{user}님의 공개 GPS 궤적'
        description: 최근의 GPS 궤적 업로드 항목 둘러보기
        tagged_with: '%{tags}(으)로 태그함'
        public_traces_from: '%{user}님의 공개 GPS 궤적'
        description: 최근의 GPS 궤적 업로드 항목 둘러보기
        tagged_with: '%{tags}(으)로 태그함'
@@ -2096,6 +2164,7 @@ ko:
          <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>위키 문서</a>에서
          GPS 궤적에 대해 더 알아보세요.
        upload_trace: 궤적 올리기
          <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>위키 문서</a>에서
          GPS 궤적에 대해 더 알아보세요.
        upload_trace: 궤적 올리기
+      remove_tag_filter: 태그 필터 제거
      destroy:
        scheduled_for_deletion: 삭제 계획중인 궤적
      make_public:
      destroy:
        scheduled_for_deletion: 삭제 계획중인 궤적
      make_public:
@@ -2124,6 +2193,11 @@ ko:
        blocked: API에 대한 접근을 차단했습니다. 자세한 내용을 알아보려면 웹 인터페이스에 로그인하세요.
        need_to_see_terms: API에 대한 접근을 일시적으로 중지했습니다. 기여자 약관을 보려면 웹 인터페이스에 로그인하세요. 기여자
          약관에 동의할 필요는 없습니다만 기여자 약관을 보아야 합니다.
        blocked: API에 대한 접근을 차단했습니다. 자세한 내용을 알아보려면 웹 인터페이스에 로그인하세요.
        need_to_see_terms: API에 대한 접근을 일시적으로 중지했습니다. 기여자 약관을 보려면 웹 인터페이스에 로그인하세요. 기여자
          약관에 동의할 필요는 없습니다만 기여자 약관을 보아야 합니다.
+    settings_menu:
+      account_settings: 계정 설정
+      oauth1_settings: OAuth 1 설정
+      oauth2_applications: OAuth 2 애플리케이션
+      oauth2_authorizations: OAuth 2 인가
    oauth:
      authorize:
        title: 내 계정에 접근 인증
    oauth:
      authorize:
        title: 내 계정에 접근 인증
@@ -2150,6 +2224,12 @@ ko:
        flash: '%{application}에 대한 토큰을 해제했습니다'
      permissions:
        missing: 이 애플리케이션이 이 기능을 사용할 수 있도록 승인하지 않았습니다
        flash: '%{application}에 대한 토큰을 해제했습니다'
      permissions:
        missing: 이 애플리케이션이 이 기능을 사용할 수 있도록 승인하지 않았습니다
+    scopes:
+      write_prefs: 사용자 환경 설정 수정
+      write_api: 지도 수정
+      read_gpx: 비공개 GPS 궤적 읽기
+      write_gpx: GPS 궤적 업로드
+      skip_authorization: 애플리케이션 자동 승인
    oauth_clients:
      new:
        title: 새 애플리케이션 등록
    oauth_clients:
      new:
        title: 새 애플리케이션 등록
@@ -2190,12 +2270,45 @@ ko:
        flash: 성공적으로 클라이언트 정보를 업데이트했습니다
      destroy:
        flash: 클라이언트 애플리케이션 등록을 파기했습니다
        flash: 성공적으로 클라이언트 정보를 업데이트했습니다
      destroy:
        flash: 클라이언트 애플리케이션 등록을 파기했습니다
+  oauth2_applications:
+    index:
+      title: 내 클라이언트 애플리케이션
+      new: 새 애플리케이션 등록
+      name: 이름
+      permissions: 권한
+    application:
+      edit: 편집
+      delete: 삭제
+      confirm_delete: 이 애플리케이션을 삭제하시겠습니까?
+    new:
+      title: 새 애플리케이션 등록
+    edit:
+      title: 내 애플리케이션 편집
+    show:
+      edit: 편집
+      delete: 삭제
+      confirm_delete: 이 애플리케이션을 삭제하시겠습니까?
+      client_id: 클라이언트 ID
+      permissions: 권한
+  oauth2_authorizations:
+    new:
+      authorize: 인가
+      deny: 거부
+    error:
+      title: 오류가 발생했습니다
+    show:
+      title: 인증 코드
+  oauth2_authorized_applications:
+    index:
+      title: 내 인증한 애플리케이션
+      application: 애플리케이션
+      permissions: 권한
    users:
      new:
        title: 가입하기
        no_auto_account_create: 불행하게도 현재로서는 자동으로 계정을 만들 수 없습니다.
    users:
      new:
        title: 가입하기
        no_auto_account_create: 불행하게도 현재로서는 자동으로 계정을 만들 수 없습니다.
-      contact_webmaster_html: 계정을 만들 수 있도록 <a href="%{webmaster}">웹마스터</a>에게 문의하세요.
-        희망에 대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다.
+      contact_support_html: 계정을 만들 수 있도록 <a href="%{support}">웹마스터</a>에게 문의하세요. 희망에
+        대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다.
        about:
          header: 자유롭게 편집 가능
          html: |-
        about:
          header: 자유롭게 편집 가능
          html: |-
@@ -2211,9 +2324,6 @@ ko:
        auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
        continue: 가입하기
        terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!
        auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
        continue: 가입하기
        terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!
-      terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
-        위키 문서</a>를 참조하세요.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      terms:
        title: 약관
        heading: 약관
      terms:
        title: 약관
        heading: 약관
@@ -2236,6 +2346,9 @@ ko:
          france: 프랑스
          italy: 이탈리아
          rest_of_world: 나머지 국가
          france: 프랑스
          italy: 이탈리아
          rest_of_world: 나머지 국가
+    terms_declined_flash:
+      terms_declined_link: 이 위키 문서
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      no_such_user:
        title: 이러한 사용자는 없습니다
        heading: '%{user} 사용자는 존재하지 않습니다'
      no_such_user:
        title: 이러한 사용자는 없습니다
        heading: '%{user} 사용자는 존재하지 않습니다'
@@ -2251,9 +2364,11 @@ ko:
        my profile: 내 프로필
        my settings: 프로필 설정
        my comments: 내 의견
        my profile: 내 프로필
        my settings: 프로필 설정
        my comments: 내 의견
-      oauth settings: oauth 설정
+      my_preferences: 내 환경 설정
+      my_dashboard: 내 대시보드
        blocks on me: 나를 차단
        blocks by me: 나한테 차단
        blocks on me: 나를 차단
        blocks by me: 나한테 차단
+      edit_profile: 프로필 수정
        send message: 메시지 보내기
        diary: 일기
        edits: 편집
        send message: 메시지 보내기
        diary: 일기
        edits: 편집
@@ -2272,14 +2387,6 @@ ko:
        spam score: '스팸 점수:'
        description: 설명
        user location: 사용자 위치
        spam score: '스팸 점수:'
        description: 설명
        user location: 사용자 위치
-      if_set_location_html: 근처 사용자를 보려면 %{settings_link} 페이지에 집 위치를 설정하세요.
-      settings_link_text: 설정
-      my friends: 내 친구
-      no friends: 아직 어떠한 친구도 추가하지 않았습니다.
-      km away: '%{count}km 거리'
-      m away: '%{count}m 거리'
-      nearby users: 기타 근처 사용자
-      no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다.
        role:
          administrator: 이 사용자는 관리자입니다
          moderator: 이 사용자는 운영자입니다
        role:
          administrator: 이 사용자는 관리자입니다
          moderator: 이 사용자는 운영자입니다
@@ -2300,15 +2407,7 @@ ko:
        unhide_user: 이 사용자를 숨기기 취소
        delete_user: 이 사용자를 삭제
        confirm: 확인
        unhide_user: 이 사용자를 숨기기 취소
        delete_user: 이 사용자를 삭제
        confirm: 확인
-      friends_changesets: 친구의 바뀜집합
-      friends_diaries: 친구의 일기 항목
-      nearby_changesets: 근처 사용자의 바뀜집합
-      nearby_diaries: 근처 사용자의 일기 항목
        report: 이 사용자 보고
        report: 이 사용자 보고
-    popup:
-      your location: 내 위치
-      nearby mapper: 근처 매퍼
-      friend: 친구
      account:
        title: 계정 편집
        my settings: 프로필 설정
      account:
        title: 계정 편집
        my settings: 프로필 설정
@@ -2339,24 +2438,8 @@ ko:
          agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
          link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
          link text: 무엇인가요?
          agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
          link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
          link text: 무엇인가요?
-      image: 이미지
-      gravatar:
-        gravatar: Gravatar 사용
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Gravatar는 무엇입니까?
-        disabled: 그라바타가 비활성화되었습니다.
-        enabled: 그라바타의 표시가 활성화되었습니다
-      new image: 그림 추가
-      keep image: 현재 그림 유지
-      delete image: 현재 그림 제거
-      replace image: 현재 그림 바꾸기
-      image size hint: (100x100 이하의 정사각형 그림이 최적)
-      home location: 집 위치
-      no home location: 집 위치를 입력하지 않았습니다.
-      update home location on click: 지도에서 클릭하면 집 위치로 업데이트할까요?
        save changes button: 변경사항 저장
        make edits public button: 내 편집을 공개하기
        save changes button: 변경사항 저장
        make edits public button: 내 편집을 공개하기
-      return to profile: 프로필로 돌아가기
        flash update success confirm needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기
          위해 이메일을 확인하세요.
        flash update success: 사용자 정보를 성공적으로 업데이트했습니다.
        flash update success confirm needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기
          위해 이메일을 확인하세요.
        flash update success: 사용자 정보를 성공적으로 업데이트했습니다.
@@ -2378,7 +2461,7 @@ ko:
      suspended:
        title: 계정 정지
        heading: 계정 정지
      suspended:
        title: 계정 정지
        heading: 계정 정지
-      webmaster: 웹마스터
+      support: 지원
        body_html: |-
          <p>
            죄송합니다, 의심스러운 활동으로 인해 계정이 자동으로
        body_html: |-
          <p>
            죄송합니다, 의심스러운 활동으로 인해 계정이 자동으로
@@ -2394,6 +2477,7 @@ ko:
        no_authorization_code: 인증 코드가 없습니다.
        unknown_signature_algorithm: 알려지지 않은 인증 알고리즘
        invalid_scope: 잘못된 범위
        no_authorization_code: 인증 코드가 없습니다.
        unknown_signature_algorithm: 알려지지 않은 인증 알고리즘
        invalid_scope: 잘못된 범위
+      unknown_error: 인증 실패
      auth_association:
        heading: 당신의 ID는 아직 OpenStreetMap 계정에 등록되지 않았습니다.
        option_1: 만약 당신이 OpenStreetMap에 처음이시면, 아래 양식을 사용해 새 계정을 만들어 주세요.
      auth_association:
        heading: 당신의 ID는 아직 OpenStreetMap 계정에 등록되지 않았습니다.
        option_1: 만약 당신이 OpenStreetMap에 처음이시면, 아래 양식을 사용해 새 계정을 만들어 주세요.