From afed0f5ef13824a8df7557ae2d96854cbd6b338b Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Mon, 28 Jul 2014 16:41:14 +0900
Subject: [PATCH] Clean up misc pages translation

---
 app/views/users/show.html.haml    | 2 +-
 config/locales/translation_en.yml | 7 +------
 config/locales/translation_ja.yml | 6 +-----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index c91a91c..60e24a3 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -19,4 +19,4 @@
     %div.form-group
       = f.label :password_confirmation
       = f.password_field :password_confirmation, class: "form-control"
-    = f.submit t(".update_password"), class: "btn btn-primary"
+    = f.submit t("terms.update_password"), class: "btn btn-primary"
diff --git a/config/locales/translation_en.yml b/config/locales/translation_en.yml
index 3f52419..413a005 100644
--- a/config/locales/translation_en.yml
+++ b/config/locales/translation_en.yml
@@ -66,9 +66,8 @@ en:
     updated:
       page_title: Updated Plugins
 
-  users: &users
+  users:
     show:
-      <<: *terms
       page_title: Password
 
   fluentd: &fluentd
@@ -207,10 +206,7 @@ en:
           page_title: "Confirmation"
 
   misc:
-    common: &misc_common
-      <<: *terms
     information:
-      <<: *misc_common
       env: Environment Variable
       env_key: Key
       env_value: Value
@@ -219,7 +215,6 @@ en:
       update_fluentd_ui_caution: "Note: %{brand} will not restart"
       download_system_information: Download System Information
     update_fluentd_ui:
-      <<: *misc_common
       update_title: "Updating %{title}"
       updating: Updating..
       update_finish: Update finished!
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 55812f4..7f600ef 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -67,9 +67,8 @@ ja:
     updated:
       page_title: 更新のあったプラグイン
 
-  users: &users
+  users:
     show:
-      <<: *terms
       page_title: パスワード管理
 
   fluentd: &fluentd
@@ -205,10 +204,7 @@ ja:
           page_title: "ファイル読み込み | 確認"
 
   misc:
-    common: &misc_common
-      <<: *terms
     information:
-      <<: *misc_common
       env: 環境変数
       env_key: キー
       env_value: 値