メール関連文言修正

diff --git a/app/locale/default.pot b/app/locale/default.pot
index 4211010..3389d4d 100644 (file)
--- a/app/locale/default.pot
+++ b/app/locale/default.pot
@@ -2185,14 +2185,6 @@ msgstr ""
 msgid "No."
 msgstr ""
 
-#: /views/users/admin_listview.ctp:35
-msgid "PC"
-msgstr ""
-
-#: /views/users/admin_listview.ctp:36
-msgid "Mobile"
-msgstr ""
-
 #: /views/users/admin_listview.ctp:37
 msgid "Registed"
 msgstr ""
@@ -2215,11 +2207,11 @@ msgid "Delete User"
 msgstr ""
 
 #: /views/users/admin_view.ctp:68
-msgid "Pc Mail Address"
+msgid "Pc Mail"
 msgstr ""
 
 #: /views/users/admin_view.ctp:73
-msgid "Mobile Mail Address"
+msgid "Mobile Mail"
 msgstr ""
 
 #: /views/users/admin_view.ctp:78
@@ -4418,14 +4410,6 @@ msgstr ""
 msgid "No."
 msgstr ""
 
-#: /views/users/admin_listview.ctp:35;35
-msgid "PC"
-msgstr ""
-
-#: /views/users/admin_listview.ctp:36;36
-msgid "Mobile"
-msgstr ""
-
 #: /views/users/admin_listview.ctp:37;37
 msgid "Registed"
 msgstr ""
@@ -4448,11 +4432,11 @@ msgid "Delete User"
 msgstr ""
 
 #: /views/users/admin_view.ctp:68;68
-msgid "Pc Mail Address"
+msgid "Pc Mail"
 msgstr ""
 
 #: /views/users/admin_view.ctp:73;73
-msgid "Mobile Mail Address"
+msgid "Mobile Mail"
 msgstr ""
 
 #: /views/users/admin_view.ctp:78;78

diff --git a/app/locale/jpn/LC_MESSAGES/default.po b/app/locale/jpn/LC_MESSAGES/default.po
index e76e178..7259443 100644 (file)
--- a/app/locale/jpn/LC_MESSAGES/default.po
+++ b/app/locale/jpn/LC_MESSAGES/default.po
@@ -2057,14 +2057,6 @@ msgstr "ユーザ一覧"
 msgid "No."
 msgstr ""
 
-#: /views/users/admin_listview.ctp:35
-msgid "PC"
-msgstr ""
-
-#: /views/users/admin_listview.ctp:36
-msgid "Mobile"
-msgstr "携帯"
-
 #: /views/users/admin_listview.ctp:37
 msgid "Registed"
 msgstr "登録日時"
@@ -2092,11 +2084,11 @@ msgid "Delete User"
 msgstr "このユーザを削除"
 
 #: /views/users/admin_view.ctp:68
-msgid "Pc Mail Address"
+msgid "Pc Mail"
 msgstr "PCアドレス"
 
 #: /views/users/admin_view.ctp:73
-msgid "Mobile Mail Address"
+msgid "Mobile Mail"
 msgstr "携帯アドレス"
 
 #: /views/users/admin_view.ctp:78

diff --git a/app/plugins/install/views/install/regist.ctp b/app/plugins/install/views/install/regist.ctp
index e9a3505..92a6631 100644 (file)
--- a/app/plugins/install/views/install/regist.ctp
+++ b/app/plugins/install/views/install/regist.ctp
@@ -73,7 +73,7 @@
 <p>
 <?php
        echo $form->input('User.pcmail', array(
-               'label' => __('Pc Mail Address', true),
+               'label' => __('Pc Mail', true),
                'after' => $html->tag('div',
 'required', 
                        __(' * required', true),

diff --git a/app/views/users/admin_add.ctp b/app/views/users/admin_add.ctp
index 96a3dcc..e264455 100644 (file)
--- a/app/views/users/admin_add.ctp
+++ b/app/views/users/admin_add.ctp
@@ -32,7 +32,7 @@
                'maxlength' => $passwordLength['max'],
        ));
        echo $form->input('pcmail', array(
-               'label' => __('Pc Mail Address', true),
+               'label' => __('Pc Mail', true),
        ));
        echo $token->create();
 ?>

diff --git a/app/views/users/admin_delete.ctp b/app/views/users/admin_delete.ctp
index 17e0ab4..fdabb5e 100644 (file)
--- a/app/views/users/admin_delete.ctp
+++ b/app/views/users/admin_delete.ctp
@@ -59,12 +59,12 @@
 <dd>
        <?php echo $target_user['User']['username']; ?>
 </dd>
-<dt><?php __('Pc Mail Address'); ?></dt>
+<dt><?php __('Pc Mail'); ?></dt>
 <dd>
        <?php echo $target_user['User']['pcmail']; ?>
        &nbsp;
 </dd>
-<dt><?php __('Mobile Mail Address'); ?></dt>
+<dt><?php __('Mobile Mail'); ?></dt>
 <dd>
        <?php echo $target_user['User']['mobile_mail']; ?>
        &nbsp;

diff --git a/app/views/users/admin_listview.ctp b/app/views/users/admin_listview.ctp
index 972521b..f80e9f9 100644 (file)
--- a/app/views/users/admin_listview.ctp
+++ b/app/views/users/admin_listview.ctp
@@ -32,9 +32,9 @@ echo $paginator->counter(array(
        <th><?php echo $paginator->sort(__('Last Access', true), 'modified');?></th>
        <th><?php echo __('Characters'); ?></th>
        <th><?php echo $paginator->sort(__('Id', true), 'username');?></th>
-       <th><?php echo $paginator->sort(__('PC', true), 'pcmail');?></th>
+       <th><?php echo $paginator->sort(__('Pc Mail', true), 'pcmail');?></th>
        <?php if (Configure::read('Mode.Mobile')): ?>
-       <th><?php echo $paginator->sort(__('Mobile', true), 'mobile_mail');?></th>
+       <th><?php echo $paginator->sort(__('Mobile Mail', true), 'mobile_mail');?></th>
        <?php endif; ?>
        <th><?php echo $paginator->sort(__('Registed', true), 'created');?></th>
        <th><?php echo $paginator->sort(__('UserAgent', true), 'useragent');?></th>

diff --git a/app/views/users/admin_view.ctp b/app/views/users/admin_view.ctp
index b0f1db6..a3ff234 100644 (file)
--- a/app/views/users/admin_view.ctp
+++ b/app/views/users/admin_view.ctp
@@ -68,13 +68,13 @@
 <dd>
        <?php echo $target_user['User']['username']; ?>
 </dd>
-<dt><?php __('Pc Mail Address'); ?></dt>
+<dt><?php __('Pc Mail'); ?></dt>
 <dd>
        <?php echo $target_user['User']['pcmail']; ?>
        &nbsp;
 </dd>
 <?php if (Configure::read('Mode.Mobile')): ?>
-<dt><?php __('Mobile Mail Address'); ?></dt>
+<dt><?php __('Mobile Mail'); ?></dt>
 <dd>
        <?php echo $target_user['User']['mobile_mail']; ?>
        &nbsp;