Merge 16110:16216 from trunk.

[rails.git] / config / locales / ko.yml

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5130c006ec4a2898b8cdaaba2c570bdefefa3a77..96634658de6c3474195d36f32a17b579fd15ec0a 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -100,8 +100,8 @@ ko:
       version: "버젼:"
       in_changeset: "In changeset:"
     containing_relation:
-      relation: "관계 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "관계 {{relation_name}}"
+      entry_role: "관계 {{relation_name}} (as {{relation_role}})"
     map:
       loading: "불러 오는 중..."
       deleted: "삭제됨"
@@ -134,8 +134,6 @@ ko:
     relation_history:
       relation_history: "관계 이력"
       relation_history_title: "관계 이력: {{relation_name}}"
-    relation_member:
-      as: "as"
     relation:
       relation: "관계"
       relation_title: "관계: {{relation_name}}"