[Svn-src-all:3597] [version-2_12-multilang 22509] #2084 ID振り直し 重複テキストの調整

kim admin @ mail.ec-cube.net
2013年 2月 6日 (水) 21:08:56 JST


Subversion committed to /home/svn/open 22509
http://svn.ec-cube.net/open_trac/changeset/22509
┌────────────────────────────┐
│更新者 :  kim                                          │
│更新日時:  2013-02-06 21:08:56 +0900 (水, 06  2月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2084 ID振り直し 重複テキストの調整
#2100 郵便番号登録完了後の画面でメッセージIDの切り出しが間違っていた箇所を修正


Changed:                      [U:修正,A:追加,D:削除]
--------------------------------------------------------
_U  branches/version-2_12-multilang/
U   branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
U   branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
U   branches/version-2_12-multilang/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
U   branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order.php
U   branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
U   branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
U   branches/version-2_12-multilang/data/class/pages/contact/LC_Page_Contact.php
U   branches/version-2_12-multilang/data/class/pages/entry/LC_Page_Entry.php
U   branches/version-2_12-multilang/data/class/pages/forgot/LC_Page_Forgot.php
U   branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
U   branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
U   branches/version-2_12-multilang/data/class/pages/regist/LC_Page_Regist.php
U   branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping.php
U   branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U   branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Payment.php
U   branches/version-2_12-multilang/data/locales/en-US.mo
U   branches/version-2_12-multilang/data/locales/en-US.po
U   branches/version-2_12-multilang/data/locales/ja.mo
U   branches/version-2_12-multilang/data/locales/ja.po
U   branches/version-2_12-multilang/html/install/index.php


Property changes on: branches/version-2_12-multilang
___________________________________________________________________
変更: svk:merge
   - 15179af3-f7c7-564b-996f-01402db0ec98:/cube-ml-001:363
8542061c-9c18-c943-b834-b5b361a76c87:/cube-ml-001:255
ca513dc5-e535-214e-9b15-241195261559:/b-cube-ml:217
ca513dc5-e535-214e-9b15-241195261559:/cube-ml-001:863
   + 15179af3-f7c7-564b-996f-01402db0ec98:/cube-ml-001:366
8542061c-9c18-c943-b834-b5b361a76c87:/cube-ml-001:255
ca513dc5-e535-214e-9b15-241195261559:/b-cube-ml:217
ca513dc5-e535-214e-9b15-241195261559:/cube-ml-001:863

変更: branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -357,8 +357,8 @@
     function sfCustomerCommonParam(&$objFormParam) {
         $objFormParam->addParam(t('c_Name (last name)_01'), 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name (first name)_01'), 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'kana01', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'kana02', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
+        $objFormParam->addParam(t('c_Name (last name) KANA_01'), 'kana01', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
+        $objFormParam->addParam(t('c_Name (first name) KANA_01'), 'kana02', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam(t('c_Postal code_01'), 'zipcode', ZIPCODE_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -520,7 +520,7 @@
     function sfSetSearchParam(&$objFormParam) {
         $objFormParam->addParam(t('c_Member ID_01'), 'search_customer_id', ID_MAX_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name_02'), 'search_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_KANA'), 'search_kana', STEXT_LEN, 'CKV', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'KANABLANK_CHECK'));
+        $objFormParam->addParam(t('c_Name KANA_01'), 'search_kana', STEXT_LEN, 'CKV', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'KANABLANK_CHECK'));
         $objFormParam->addParam(t('c_Prefecture_01'), 'search_pref', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Birthday (start year)_01'), 'search_b_start_year', 4, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Birthday (start month)_01'), 'search_b_start_month', 2, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -214,10 +214,10 @@
 
     function lfInitParam(&$objFormParam, $post) {
         $objFormParam->addParam(t('c_Company name_01'), 'company_name', STEXT_LEN, 'KVa',  array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_COMPANY_KANA'), 'company_kana', STEXT_LEN, 'KVC',  array('KANA_CHECK','MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Company name KANA_01'), 'company_kana', STEXT_LEN, 'KVC',  array('KANA_CHECK','MAX_LENGTH_CHECK'));
 
         $objFormParam->addParam(t('c_Store name_01'), 'shop_name', STEXT_LEN, 'KVa', array('EXIST_CHECK','MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_SHOP_KANA'), 'shop_kana',  STEXT_LEN, 'KVC', array('KANA_CHECK','MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Store name KANA_01'), 'shop_kana',  STEXT_LEN, 'KVC', array('KANA_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Store name (in English)_01'), 'shop_name_eng',MTEXT_LEN, 'a', array('GRAPH_CHECK','MAX_LENGTH_CHECK'));
         // 郵便番号チェック
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -50,7 +50,7 @@
         $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrTAXRULE = $masterData->getMasterData('mtb_taxrule');
         $this->tpl_maintitle = t('c_Basic information_01');
-        $this->tpl_subtitle = t('LC_Page_Admin_Basis_Delivery_002');
+        $this->tpl_subtitle = t('c_Delivery method settings_01');
     }
 
     /**

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -50,7 +50,7 @@
         $this->arrProductType = $masterData->getMasterData('mtb_product_type');
         $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         $this->tpl_maintitle = t('c_Basic information_01');;
-        $this->tpl_subtitle = t('LC_Page_Admin_Basis_DeliveryInput_002');;
+        $this->tpl_subtitle = t('c_Delivery method settings_01');;
         $this->mode = $this->getMode();
     }
 

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -240,7 +240,7 @@
             $arrRet = $objQuery->select('kiyaku_id, kiyaku_title', 'dtb_kiyaku', 'del_flg = 0 AND kiyaku_title = ?', array($post['kiyaku_title']));
             // 編集中のレコード以外に同じ名称が存在する場合
             if ($arrRet[0]['kiyaku_id'] != $post['kiyaku_id'] && $arrRet[0]['kiyaku_title'] == $post['kiyaku_title']) {
-                $arrErr['name'] = t('LC_Page_Admin_Basis_Kiyaku_004');
+                $arrErr['name'] = t('c_* Registration of the same contents already exists.<br>_01');
             }
         }
         return $arrErr;

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -47,7 +47,7 @@
         $this->tpl_mainno = 'basis';
         $this->tpl_subno = 'payment';
         $this->tpl_maintitle = t('c_Basic information_01');
-        $this->tpl_subtitle = t('LC_Page_Admin_Basis_Payment_002');
+        $this->tpl_subtitle = t('c_Payment method settings_01');
     }
 
     /**

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -52,7 +52,7 @@
         $this->tpl_mainno = 'basis';
         $this->tpl_subno = 'payment';
         $this->tpl_maintitle = t('c_Basic information_01');
-        $this->tpl_subtitle = t('LC_Page_Admin_Basis_PaymentInput_002');
+        $this->tpl_subtitle = t('c_Payment method settings_01');
     }
 
     /**
@@ -129,7 +129,7 @@
                 if (count($this->arrErr) == 0) {
                     $arrRet = $objPayment->get($post['payment_id']);
 
-                    $objFormParam->addParam(t('PARAM_LABEL_PAYMENT_METHOD'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+                    $objFormParam->addParam(t('c_Payment method_01'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
                     $objFormParam->addParam(t('c_Processing fee_01'), 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
                     $objFormParam->addParam(t('c_Usage conditions(-$ Above)_01'), 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
                     $objFormParam->addParam(t('c_Usage conditions(-$ Less than)_01'), 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -174,7 +174,7 @@
 
         switch ($mode) {
             case 'edit':
-                $objFormParam->addParam(t('PARAM_LABEL_PAYMENT_METHOD'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+                $objFormParam->addParam(t('c_Payment method_01'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Processing fee_01'), 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Usage conditions(-$ Above)_01'), 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Usage conditions(-$ Less than)_01'), 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -186,7 +186,7 @@
             case 'upload_image':
             case 'delete_image':
                 $objFormParam->addParam(t('c_Payment ID_01'), 'payment_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-                $objFormParam->addParam(t('PARAM_LABEL_PAYMENT_METHOD'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+                $objFormParam->addParam(t('c_Payment method_01'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Processing fee_01'), 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Usage conditions(-$ Above)_01'), 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Usage conditions(-$ Less than)_01'), 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -200,7 +200,7 @@
                 break;
 
             default:
-                $objFormParam->addParam(t('PARAM_LABEL_PAYMENT_METHOD'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+                $objFormParam->addParam(t('c_Payment method_01'), 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Processing fee_01'), 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Usage conditions(-$ Above)_01'), 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 $objFormParam->addParam(t('c_Usage conditions(-$ Less than)_01'), 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -140,7 +140,7 @@
         $objFormParam->addParam(t('c_URL_01'), 'law_url', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'URL_CHECK'));
         $objFormParam->addParam(t('c_Necessary fees_01'), 'law_term01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Order method_01'), 'law_term02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_PAYMENT_METHOD'), 'law_term03', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Payment method_01'), 'law_term03', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Payment deadline_01'), 'law_term04', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Delivery period_01'), 'law_term05', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Returns and exchanges_01'), 'law_term06', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -276,9 +276,8 @@
                 function complete() {
                     document.open('text/html','replace');
                     document.clear();
-                    document.write(t('LC_Page_Admin_Basis_ZipInstall_003'));
-                    document.write("<?php echo $cntInsert ?> " . t('LC_Page_Admin_Basis_ZipInstall_004'));
-                    document.write(t('LC_Page_Admin_Basis_ZipInstall_005'));
+                    document.write('<?php t("c_<p>Completed.<br /> T_ARG1 items were added.</p>_01", array("T_ARG1" => $cntInsert))?>');
+                    document.write('<?php t("c_<p><a href='?' target='_top'>Go back</a></p>_01"); ?>');
                     document.close();
                 }
                 // コンテンツを削除するため、タイムアウトで呼び出し。
@@ -382,7 +381,7 @@
     function lfExtractZipFile() {
         $zip = zip_open($this->zip_csv_temp_realfile);
         if (!is_resource($zip)) {
-            trigger_error(t(t('c_cannot be opened._01', array('T_ARG1' => $this->zip_csv_temp_realfile))), E_USER_ERROR);
+            trigger_error(t(t('c_T_ARG1 cannot be opened._02', array('T_ARG1' => $this->zip_csv_temp_realfile))), E_USER_ERROR);
         }
 
         do {
@@ -418,7 +417,7 @@
         // CSV 削除
         $res = unlink(ZIP_CSV_REALFILE);
         if (!$res) {
-            trigger_error(t('LC_Page_Admin_Basis_ZipInstall_013', array('T_ARG1' => ZIP_CSV_REALFILE)), E_USER_ERROR);
+            trigger_error(t('c_T_ARG1 cannot be deleted._01', array('T_ARG1' => ZIP_CSV_REALFILE)), E_USER_ERROR);
         }
 
         // CSV ファイル名変更

変更: branches/version-2_12-multilang/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -155,7 +155,7 @@
         $objFormParam->addParam(t('c_Terminal type ID_01'), 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_CSS file name_01'), 'css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Old CSS file name_01'), 'old_css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CSS_DATA'), 'css_data');
+        $objFormParam->addParam(t('c_CSS data_01'), 'css_data');
 
     }
 

変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -189,13 +189,13 @@
         $objFormParam->addParam(t('c_Order number 2_01'), 'search_order_id2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Response status_01'), 'search_order_status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Name of orderer_01'), 'search_order_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_ORDER_KANA'), 'search_order_kana', STEXT_LEN, 'KVCa', array('KANA_CHECK','MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name of orderer KANA_01'), 'search_order_kana', STEXT_LEN, 'KVCa', array('KANA_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Gender_01'), 'search_order_sex', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Age 1_01'), 'search_age1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Age 2_01'), 'search_age2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_E-mail address_01'), 'search_order_email', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_TEL_01'), 'search_order_tel', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_PAYMENT_METHOD2'), 'search_payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam(t('c_Payment method_01'), 'search_payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Purchase amount 1_01'), 'search_total1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Purchase amount 2_01'), 'search_total2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Number of items displayed_01'), 'search_page_max', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -154,8 +154,8 @@
         // お客様情報
         $objFormParam->addParam(t('c_Member name 1_01'), 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Member name 2_01'), 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_MEMBER_KANA1'), 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_MEMBER_KANA2'), 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Member name KANA 1_01'), 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Member name KANA 2_01'), 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_E-mail address_01'), 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -178,7 +178,7 @@
         }
 
         $objFormParam->addParam(t('c_Delivery company_01'), 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_PAYMENT_METHOD'), 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam(t('c_Payment method_02'), 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Response status_01'), 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Payment method name_01'), 'payment_method');
 
@@ -220,8 +220,8 @@
         $objFormParam->addParam(t('c_Delivery ID_01'), 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0);
         $objFormParam->addParam(t('c_Name (last name)_01'), 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name (first name)_01'), 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (last name) KANA_01'), 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (first name) KANA_01'), 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam(t('c_Postal code_01'), 'shipping_zipcode', ZIPCODE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -289,8 +289,8 @@
         // お客様情報
         $objFormParam->addParam(t('c_Name of orderer (last name)_01'), 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name of orderer (first name)_01'), 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_ORDER_LASTKANA'), 'order_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_ORDER_FIRSTKANA'), 'order_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name of orderer (last name) KANA_01'), 'order_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name of orderer (first name) KANA_01'), 'order_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_E-mail address_01'), 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -316,7 +316,7 @@
         }
 
         $objFormParam->addParam(t('c_Delivery company_01'), 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_PAYMENT_METHOD'), 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam(t('c_Payment method_02'), 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Response status_01'), 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Payment method name_01'), 'payment_method');
 
@@ -358,8 +358,8 @@
         $objFormParam->addParam(t('c_Delivery ID_01'), 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0);
         $objFormParam->addParam(t('c_Name (last name)_01'), 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name (first name)_01'), 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (last name) KANA_01'), 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (first name) KANA_01'), 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam(t('c_Postal code_01'), 'shipping_zipcode', ZIPCODE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/contact/LC_Page_Contact.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/contact/LC_Page_Contact.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -159,8 +159,8 @@
 
         $objFormParam->addParam(t('c_Name (last name)_01'), 'name01', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name (first name)_01'), 'name02', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK'));
+        $objFormParam->addParam(t('c_Name (last name) KANA_01'), 'kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK'));
+        $objFormParam->addParam(t('c_Name (first name) KANA_01'), 'kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'zip01', ZIP01_LEN, 'n',array('SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'zip02', ZIP02_LEN, 'n',array('SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam(t('c_Postal code_01'), 'zipcode', ZIPCODE_LEN, 'n',array('SPTAB_CHECK' ,'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -203,7 +203,7 @@
         $helperMail->setPage($this);
         $helperMail->sfSendTemplateMail(
             $objPage->arrForm['email']['value'],            // to
-            t('LC_Page_Contact_004', array('T_ARG1' => $objPage->arrForm['name01']['value'])), // to_name
+            t('f_LAST_NAME_SIR_01', array('T_ARG1' => $objPage->arrForm['name01']['value'])), // to_name
             5,                                              // template_id
             $objPage,                                       // objPage
             $CONF['email03'],                               // from_address

変更: branches/version-2_12-multilang/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/entry/LC_Page_Entry.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/entry/LC_Page_Entry.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -267,7 +267,7 @@
         );
         // 宛先の設定
         $objMail->setTo($arrForm['email'],
-                        t('LC_Page_Entry_007', array('T_ARG1' => $arrForm['name01'], 'T_ARG2' => $arrForm['name02'])));
+                        t('f_NAME_FULL_SIR_01', array('T_ARG1' => $arrForm['name01'], 'T_ARG2' => $arrForm['name02'])));
 
         $objMail->sendMail();
     }

変更: branches/version-2_12-multilang/data/class/pages/forgot/LC_Page_Forgot.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/forgot/LC_Page_Forgot.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/forgot/LC_Page_Forgot.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -304,7 +304,7 @@
             , $CONF['email04'] //return_path
             , $CONF['email04'] // errors_to
             );
-        $objMail->setTo($email, t('LC_Page_Forgot_007', array('T_ARG1' => $customer_name)));
+        $objMail->setTo($email, t('f_LAST_NAME_SIR_01', array('T_ARG1' => $customer_name)));
         $objMail->sendMail();
         return;
     }

変更: branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -118,7 +118,7 @@
      * @return void
      */
     function lfInitNewsParam(&$objFormParam) {
-        $objFormParam->addParam(t('PARAM_LABEL_CURRENT PAGE'), 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
+        $objFormParam->addParam(t('c_Current page_01'), 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
         $objFormParam->addParam(t('c_Number of items displayed_01'), 'disp_number', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
         $objFormParam->addParam(t('c_New ID_01'), 'news_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
     }

変更: branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_Delivery.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage_Delivery.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -135,7 +135,7 @@
      */
     function lfInitParam(&$objFormParam) {
         $objFormParam->addParam(t('c_Delivery destination ID_01'), 'other_deliv_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CURRENT PAGE'), 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
+        $objFormParam->addParam(t('c_Current page_01'), 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
     }
 
     /**

変更: branches/version-2_12-multilang/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/regist/LC_Page_Regist.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/regist/LC_Page_Regist.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -177,7 +177,7 @@
                             , $CONF['email04']          // Errors_to
         );
         // 宛先の設定
-        $name = t('LC_Page_Regist_005',
+        $name = t('f_NAME_FULL_SIR_01',
                               array('T_ARG1' => $data['name01'],
                                     'T_ARG2' => $data['name02']));
         $objMail->setTo($data['email'], $name);

変更: branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -284,8 +284,8 @@
 
         $objFormParam->addParam(t('c_Name (last name)_01'), 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name (first name)_01'), 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'order_kana01', STEXT_LEN, 'KVCa', array('KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'order_kana02', STEXT_LEN, 'KVCa', array('KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (last name) KANA_01'), 'order_kana01', STEXT_LEN, 'KVCa', array('KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (first name) KANA_01'), 'order_kana02', STEXT_LEN, 'KVCa', array('KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'order_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'order_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam(t('c_Postal code_01'), 'order_zipcode', ZIPCODE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -308,8 +308,8 @@
         $objFormParam->addParam(t('c_Separate shipping destination_01'), 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('c_Name (last name)_01'), 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam(t('c_Name (first name)_01'), 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (last name) KANA_01'), 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Name (first name) KANA_01'), 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 1_01'), 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
 //        $objFormParam->addParam(t('c_Postal code 2_01'), 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
         $objFormParam->addParam(t('c_Postal code_01'), 'shipping_zipcode', ZIPCODE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -428,8 +428,8 @@
         if (isset($arrParams['deliv_check']) && $arrParams['deliv_check'] == '1') {
             $objErr->doFunc(array(t('c_Name (last name)_01'), 'shipping_name01'), array('EXIST_CHECK'));
             $objErr->doFunc(array(t('c_Name (first name)_01'), 'shipping_name02'), array('EXIST_CHECK'));
-//            $objErr->doFunc(array(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'shipping_kana01'), array('EXIST_CHECK'));
-//            $objErr->doFunc(array(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'shipping_kana02'), array('EXIST_CHECK'));
+//            $objErr->doFunc(array(t('c_Name (last name) KANA_01'), 'shipping_kana01'), array('EXIST_CHECK'));
+//            $objErr->doFunc(array(t('c_Name (first name) KANA_01'), 'shipping_kana02'), array('EXIST_CHECK'));
 //            $objErr->doFunc(array(t('c_Postal code 1_01'), 'shipping_zip01'), array('EXIST_CHECK'));
 //            $objErr->doFunc(array(t('c_Postal code 2_01'), 'shipping_zip02'), array('EXIST_CHECK'));
             $objErr->doFunc(array(t('c_Postal code_01'), 'shipping_zipcode'), array('EXIST_CHECK'));

変更: branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -191,7 +191,7 @@
         $masterData = new SC_DB_MasterData_Ex();
         $arrPref = $masterData->getMasterData('mtb_pref');
 
-        $arrResults = array('' => t('LC_Page_Shopping_Multiple_002'));
+        $arrResults = array('' => t('c_Please make a selection_02'));
         // 会員ログイン時
         if ($objCustomer->isLoginSuccess(true)) {
             $addr = array(

変更: branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Payment.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Payment.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -279,9 +279,9 @@
         $objFormParam->addParam(t('c_Use points_01'), 'point_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '2');
 
         if ($deliv_only) {
-            $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_PAYMENT_METHOD'), 'payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+            $objFormParam->addParam(t('c_Payment method_02'), 'payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         } else {
-            $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_PAYMENT_METHOD'), 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+            $objFormParam->addParam(t('c_Payment method_02'), 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
 
             foreach ($arrShipping as $val) {
                 $objFormParam->addParam(t('c_Delivery time_01'), 'deliv_time_id' . $val['shipping_id'], INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));

変更: branches/version-2_12-multilang/data/locales/en-US.mo
===================================================================
(バイナリファイルが異なっています)

変更: branches/version-2_12-multilang/data/locales/en-US.po
===================================================================
--- branches/version-2_12-multilang/data/locales/en-US.po	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/locales/en-US.po	2013-02-06 12:08:56 UTC (rev 22509)
@@ -202,36 +202,15 @@
 msgid "c_Product name / Product code / [Specification]_01"
 msgstr "Product name / Product code / [Specification]"
 
-msgid "c_Quantity_01"
-msgstr "Quantity"
-
-msgid "c_Unit price_01"
-msgstr "Unit price"
-
 msgid "c_Amount with tax_01"
 msgstr "Amount with tax"
 
 msgid "c_Product total_01"
 msgstr "Product total"
 
-msgid "c_Shipping fee_01"
-msgstr "Shipping fee"
-
-msgid "c_Processing fee_01"
-msgstr "Processing fee"
-
-msgid "c_Discount_01"
-msgstr "Discount"
-
 msgid "c_Billing amount_01"
 msgstr "Billing amount"
 
-msgid "c_Used points_01"
-msgstr "Used points"
-
-msgid "c_Points added_01"
-msgstr "Points added"
-
 msgid "c_<Remarks>_01"
 msgstr "<Remarks>"
 
@@ -457,14 +436,14 @@
 msgid "c_Name (first name)_01"
 msgstr "Name (first name)"
 
-msgid "PARAM_LABEL_CUSTOMER_KANA"
-msgstr "お名前(フリガナ)"
+msgid "c_Name KANA_01"
+msgstr ""
 
-msgid "PARAM_LABEL_CUSTOMER_LASTKANA"
-msgstr "お名前(フリガナ・姓)"
+msgid "c_Name (last name) KANA_01"
+msgstr ""
 
-msgid "PARAM_LABEL_CUSTOMER_FIRSTKANA"
-msgstr "お名前(フリガナ・名)"
+msgid "c_Name (first name) KANA_01"
+msgstr ""
 
 msgid "c_Name of orderer (last name)_01"
 msgstr "Name of orderer (last name)"
@@ -472,17 +451,17 @@
 msgid "c_Name of orderer (first name)_01"
 msgstr "Name of orderer (first name)"
 
-msgid "PARAM_LABEL_ORDER_LASTKANA"
-msgstr "注文者 お名前(フリガナ・姓)"
+msgid "c_Name of orderer (last name) KANA_01"
+msgstr ""
 
-msgid "PARAM_LABEL_ORDER_FIRSTKANA"
-msgstr "注文者 お名前(フリガナ・名)"
+msgid "c_Name of orderer (first name) KANA_01"
+msgstr ""
 
 msgid "c_Name of orderer_01"
 msgstr "Name of orderer"
 
-msgid "PARAM_LABEL_ORDER_KANA"
-msgstr "注文者 お名前(フリガナ)"
+msgid "c_Name of orderer KANA_01"
+msgstr ""
 
 msgid "c_Prefecture_01"
 msgstr "Prefecture"
@@ -628,6 +607,9 @@
 msgid "c_Points in possession_01"
 msgstr "Points in possession"
 
+msgid "c_Points added_01"
+msgstr "Points added"
+
 msgid "c_Birthday points_01"
 msgstr "Birthday points"
 
@@ -727,14 +709,14 @@
 msgid "c_Company name_01"
 msgstr "Company name"
 
-msgid "PARAM_LABEL_COMPANY_KANA"
-msgstr "会社名(フリガナ)"
+msgid "c_Company name KANA_01"
+msgstr ""
 
 msgid "c_Store name_01"
 msgstr "Store name"
 
-msgid "PARAM_LABEL_SHOP_KANA"
-msgstr "店名(フリガナ)"
+msgid "c_Store name KANA_01"
+msgstr ""
 
 msgid "c_Store name (in English)_01"
 msgstr "Store name (in English)"
@@ -826,21 +808,30 @@
 msgid "c_Payment method ID_01"
 msgstr "Payment method ID"
 
-msgid "PARAM_LABEL_PAYMENT_METHOD"
+msgid "c_Payment method_01"
 msgstr "Payment method"
 
-msgid "PARAM_LABEL_PAYMENT_METHOD2"
+msgid "c_Payment method_02"
 msgstr "Payment method"
 
-msgid "PARAM_LABEL_CUSTOMER_PAYMENT_METHOD"
-msgstr "Payment method"
-
 msgid "c_Payment method name_01"
 msgstr "Payment method name"
 
+msgid "c_Processing fee_01"
+msgstr "Processing fee"
+
+msgid "c_Shipping fee_01"
+msgstr "Shipping fee"
+
 msgid "c_Product shipping fee_01"
 msgstr "Product shipping fee"
 
+msgid "c_Discount_01"
+msgstr "Discount"
+
+msgid "c_Used points_01"
+msgstr "Used points"
+
 msgid "c_Points_01"
 msgstr "Points"
 
@@ -919,6 +910,12 @@
 msgid "c_Product type ID_01"
 msgstr "Product type ID"
 
+msgid "c_Unit price_01"
+msgstr "Unit price"
+
+msgid "c_Quantity_01"
+msgstr "Quantity"
+
 msgid "c_Sales price_01"
 msgstr "Sales price"
 
@@ -1093,7 +1090,7 @@
 msgid "c_Category name_01"
 msgstr "Category name"
 
-msgid "PARAM_LABEL_CURRENT"
+msgid "c_Current page_01"
 msgstr "Current page"
 
 msgid "c_New ID_01"
@@ -1141,7 +1138,7 @@
 msgid "c_Old CSS file name_01"
 msgstr "Old CSS file name"
 
-msgid "PARAM_LABEL_"
+msgid "c_CSS data_01"
 msgstr "CSS data"
 
 msgid "c_Block ID_01"
@@ -1426,11 +1423,11 @@
 msgid "c_Member name 2_01"
 msgstr "Member name 2"
 
-msgid "PARAM_LABEL_MEMBER_KANA1"
-msgstr "会員名カナ1"
+msgid "c_Member name KANA 1_01"
+msgstr ""
 
-msgid "PARAM_LABEL_MEMBER_KANA2"
-msgstr "会員名カナ2"
+msgid "c_Member name KANA 2_01"
+msgstr ""
 
 msgid "c_Memo_01"
 msgstr "Memo"
@@ -1818,6 +1815,9 @@
 msgid "f_NAME_FULL_SIR_01"
 msgstr "T_ARG1 T_ARG2"
 
+msgid "f_LAST_NAME_SIR_01"
+msgstr "T_ARG1"
+
 msgid "c_About this site_01"
 msgstr "About this site"
 
@@ -1838,9 +1838,6 @@
 msgid "c_Inquiry_02"
 msgstr "Inquiry"
 
-msgid "LC_Page_Contact_004"
-msgstr "T_ARG1"
-
 msgid "c_Inquiry_03"
 msgstr "Inquiry"
 
@@ -1859,9 +1856,6 @@
 msgid "c_* Format is inadequate.<br />_01"
 msgstr "* Format is inadequate.<br />"
 
-msgid "LC_Page_Entry_007"
-msgstr "T_ARG1 T_ARG2"
-
 msgid "c_The address is being searched._01"
 msgstr "The address is being searched."
 
@@ -2019,9 +2013,6 @@
 msgid "c_The password has been changed._01"
 msgstr "The password has been changed."
 
-msgid "LC_Page_Forgot_007"
-msgstr "T_ARG1"
-
 msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, access the registration page from the URL given to you in an e-mail._01"
 msgstr ""
 "The e-mail address or password is not correct.\n"
@@ -2104,9 +2095,6 @@
 msgid "c_Member registration is complete._01"
 msgstr "Member registration is complete."
 
-msgid "LC_Page_Regist_005"
-msgstr "T_ARG1 T_ARG2"
-
 msgid "LC_Page_Regist_Complete_001"
 msgstr "Member registration"
 
@@ -2151,7 +2139,7 @@
 msgid "c_Designation of multiple delivery destinations_01"
 msgstr "Designation of multiple delivery destinations"
 
-msgid "LC_Page_Shopping_Multiple_002"
+msgid "c_Please make a selection_02"
 msgstr "Please make a selection"
 
 msgid "c_* When the quantity is 0, it is not possible to enter a shipping destination.<br />_01"
@@ -2250,7 +2238,7 @@
 msgid "c_Administrator: Login ID_01"
 msgstr "Administrator: Login ID"
 
-msgid "LC_Page_Install_021"
+msgid "c_Administrator: Password_01"
 msgstr "Administrator: Password"
 
 msgid "c_Management area: Directory_01"
@@ -2301,27 +2289,18 @@
 msgid "c_DB password_01"
 msgstr "DB password"
 
-msgid "LC_Page_Install_039"
+msgid "c_* It is not possible to designate a different hierarchy for the URL._01"
 msgstr "* It is not possible to designate a different hierarchy for the URL."
 
-msgid "LC_Page_Install_040"
-msgstr "* It is not possible to designate a different hierarchy for the URL."
-
-msgid "LC_Page_Install_042"
-msgstr "Administrator: Password"
-
-msgid "LC_Page_Install_043"
-msgstr "Management area: Directory"
-
 msgid "c_* The designated management directory already exists. Please use a different name._01"
 msgstr ""
 "* The designated management directory already exists. Please use a different "
 "name."
 
-msgid "LC_Page_Install_045"
+msgid "c_>> The script file cannot be found_01"
 msgstr ">> The script file cannot be found"
 
-msgid "LC_Page_Install_046"
+msgid "c_>> Table structure was not changed.<br />_01"
 msgstr ">> Table structure was not changed.<br />"
 
 msgid "c_* The designated management directory already exists. Please use  a different name._01"
@@ -2335,9 +2314,6 @@
 msgid "c_Administrator_01"
 msgstr "Administrator"
 
-msgid "LC_Page_Admin_Basis_001"
-msgstr "Basic information"
-
 msgid "c_SHOP master_01"
 msgstr "SHOP master"
 
@@ -2371,12 +2347,9 @@
 msgid "c_INSERT was executed for dtb_baseinfo._01"
 msgstr "INSERT was executed for dtb_baseinfo."
 
-msgid "LC_Page_Admin_Basis_Delivery_002"
+msgid "c_Delivery method settings_01"
 msgstr "Delivery method settings"
 
-msgid "LC_Page_Admin_Basis_DeliveryInput_002"
-msgstr "Delivery method settings"
-
 msgid "c_Delivery time T_ARG1_01"
 msgstr "Delivery time T_ARG1"
 
@@ -2395,7 +2368,7 @@
 msgid "c_Membership terms and conditions_01"
 msgstr "Membership terms and conditions"
 
-msgid "LC_Page_Admin_Basis_Kiyaku_004"
+msgid "c_* Registration of the same contents already exists.<br>_01"
 msgstr "* Registration of the same contents already exists.<br>"
 
 msgid "c_E-mail settings_01"
@@ -2404,12 +2377,9 @@
 msgid "c_An error has occurred_01"
 msgstr "An error has occurred"
 
-msgid "LC_Page_Admin_Basis_Payment_002"
+msgid "c_Payment method settings_01"
 msgstr "Payment method settings"
 
-msgid "LC_Page_Admin_Basis_PaymentInput_002"
-msgstr "Payment method settings"
-
 msgid "c_Make the usage conditions (lower limit) &#036; T_ARG1 or more.<br>_01"
 msgstr "Make the usage conditions (lower limit) &#036; T_ARG1 or more.<br>"
 
@@ -2437,13 +2407,10 @@
 msgid "c_Postal code registration_01"
 msgstr "Postal code registration"
 
-msgid "LC_Page_Admin_Basis_ZipInstall_003"
-msgstr "'<p>Completed.<br />'"
+msgid "c_<p>Completed.<br /> T_ARG1 items were added.</p>_01"
+msgstr "<p>Completed.<br /> T_ARG1 items were added.</p>"
 
-msgid "LC_Page_Admin_Basis_ZipInstall_004"
-msgstr " items were added.</p>"
-
-msgid "LC_Page_Admin_Basis_ZipInstall_005"
+msgid "c_<p><a href='?' target='_top'>Go back</a></p>_01"
 msgstr "<p><a href='?' target='_top'>Go back</a></p>"
 
 msgid "c_T_ARG1 reading failed._01"
@@ -2458,8 +2425,8 @@
 msgid "c_T_ARG1 writing failed._01"
 msgstr "T_ARG1 writing failed."
 
-msgid "c_cannot be opened._01"
-msgstr " cannot be opened."
+msgid "c_T_ARG1 cannot be opened._02"
+msgstr "T_ARG1 cannot be opened."
 
 msgid "c_The target file was not found in T_ARG1._01"
 msgstr "The target file was not found in T_ARG1."
@@ -2467,8 +2434,8 @@
 msgid "c_T_ARG1 decompression failed._01"
 msgstr "T_ARG1 decompression failed."
 
-msgid "LC_Page_Admin_Basis_ZipInstall_013"
-msgstr " cannot be deleted."
+msgid "c_T_ARG1 cannot be deleted._01"
+msgstr "T_ARG1 cannot be deleted."
 
 msgid "c_The file name cannot be changed.: T_ARG1 -> TFIELF2_01"
 msgstr "The file name cannot be changed.: T_ARG1 -> TFIELF2"

変更: branches/version-2_12-multilang/data/locales/ja.mo
===================================================================
(バイナリファイルが異なっています)

変更: branches/version-2_12-multilang/data/locales/ja.po
===================================================================
--- branches/version-2_12-multilang/data/locales/ja.po	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/data/locales/ja.po	2013-02-06 12:08:56 UTC (rev 22509)
@@ -195,36 +195,15 @@
 msgid "c_Product name / Product code / [Specification]_01"
 msgstr "商品名 / 商品コード / [ 規格 ]"
 
-msgid "c_Quantity_01"
-msgstr "数量"
-
-msgid "c_Unit price_01"
-msgstr "単価"
-
 msgid "c_Amount with tax_01"
 msgstr "金額(税込)"
 
 msgid "c_Product total_01"
 msgstr "商品合計"
 
-msgid "c_Shipping fee_01"
-msgstr "送料"
-
-msgid "c_Processing fee_01"
-msgstr "手数料"
-
-msgid "c_Discount_01"
-msgstr "値引き"
-
 msgid "c_Billing amount_01"
 msgstr "請求金額"
 
-msgid "c_Used points_01"
-msgstr "利用ポイント"
-
-msgid "c_Points added_01"
-msgstr "加算ポイント"
-
 msgid "c_<Remarks>_01"
 msgstr "< 備 考 >"
 
@@ -446,13 +425,13 @@
 msgid "c_Name (first name)_01"
 msgstr "お名前(名)"
 
-msgid "PARAM_LABEL_CUSTOMER_KANA"
+msgid "c_Name KANA_01"
 msgstr "お名前(フリガナ)"
 
-msgid "PARAM_LABEL_CUSTOMER_LASTKANA"
+msgid "c_Name (last name) KANA_01"
 msgstr "お名前(フリガナ・姓)"
 
-msgid "PARAM_LABEL_CUSTOMER_FIRSTKANA"
+msgid "c_Name (first name) KANA_01"
 msgstr "お名前(フリガナ・名)"
 
 msgid "c_Name of orderer (last name)_01"
@@ -461,16 +440,16 @@
 msgid "c_Name of orderer (first name)_01"
 msgstr "注文者 お名前(名)"
 
-msgid "PARAM_LABEL_ORDER_LASTKANA"
+msgid "c_Name of orderer (last name) KANA_01"
 msgstr "注文者 お名前(フリガナ・姓)"
 
-msgid "PARAM_LABEL_ORDER_FIRSTKANA"
+msgid "c_Name of orderer (first name) KANA_01"
 msgstr "注文者 お名前(フリガナ・名)"
 
 msgid "c_Name of orderer_01"
 msgstr "注文者 お名前"
 
-msgid "PARAM_LABEL_ORDER_KANA"
+msgid "c_Name of orderer KANA_01"
 msgstr "注文者 お名前(フリガナ)"
 
 msgid "c_Prefecture_01"
@@ -617,6 +596,9 @@
 msgid "c_Points in possession_01"
 msgstr "所持ポイント"
 
+msgid "c_Points added_01"
+msgstr "加算ポイント"
+
 msgid "c_Birthday points_01"
 msgstr "お誕生日ポイント"
 
@@ -716,13 +698,13 @@
 msgid "c_Company name_01"
 msgstr "会社名"
 
-msgid "PARAM_LABEL_COMPANY_KANA"
+msgid "c_Company name KANA_01"
 msgstr "会社名(フリガナ)"
 
 msgid "c_Store name_01"
 msgstr "店名"
 
-msgid "PARAM_LABEL_SHOP_KANA"
+msgid "c_Store name KANA_01"
 msgstr "店名(フリガナ)"
 
 msgid "c_Store name (in English)_01"
@@ -815,21 +797,30 @@
 msgid "c_Payment method ID_01"
 msgstr "支払方法ID"
 
-msgid "PARAM_LABEL_PAYMENT_METHOD"
+msgid "c_Payment method_01"
 msgstr "支払方法"
 
-msgid "PARAM_LABEL_PAYMENT_METHOD2"
-msgstr "支払い方法"
-
-msgid "PARAM_LABEL_CUSTOMER_PAYMENT_METHOD"
+msgid "c_Payment method_02"
 msgstr "お支払い方法"
 
 msgid "c_Payment method name_01"
 msgstr "お支払方法名称"
 
+msgid "c_Processing fee_01"
+msgstr "手数料"
+
+msgid "c_Shipping fee_01"
+msgstr "送料"
+
 msgid "c_Product shipping fee_01"
 msgstr "商品送料"
 
+msgid "c_Discount_01"
+msgstr "値引き"
+
+msgid "c_Used points_01"
+msgstr "利用ポイント"
+
 msgid "c_Points_01"
 msgstr "ポイント"
 
@@ -908,6 +899,12 @@
 msgid "c_Product type ID_01"
 msgstr "商品種別ID"
 
+msgid "c_Unit price_01"
+msgstr "単価"
+
+msgid "c_Quantity_01"
+msgstr "数量"
+
 msgid "c_Sales price_01"
 msgstr "販売価格"
 
@@ -1082,7 +1079,7 @@
 msgid "c_Category name_01"
 msgstr "カテゴリ名"
 
-msgid "PARAM_LABEL_CURRENT"
+msgid "c_Current page_01"
 msgstr "現在ページ"
 
 msgid "c_New ID_01"
@@ -1130,7 +1127,7 @@
 msgid "c_Old CSS file name_01"
 msgstr "旧CSSファイル名"
 
-msgid "PARAM_LABEL_"
+msgid "c_CSS data_01"
 msgstr "CSSデータ"
 
 msgid "c_Block ID_01"
@@ -1415,10 +1412,10 @@
 msgid "c_Member name 2_01"
 msgstr "会員名2"
 
-msgid "PARAM_LABEL_MEMBER_KANA1"
+msgid "c_Member name KANA 1_01"
 msgstr "会員名カナ1"
 
-msgid "PARAM_LABEL_MEMBER_KANA2"
+msgid "c_Member name KANA 2_01"
 msgstr "会員名カナ2"
 
 msgid "c_Memo_01"
@@ -1824,9 +1821,6 @@
 msgid "c_Inquiry_02"
 msgstr "お問い合わせ(確認ページ)"
 
-msgid "LC_Page_Contact_004"
-msgstr "T_ARG1 様"
-
 msgid "c_Inquiry_03"
 msgstr "お問い合わせ(完了ページ)"
 
@@ -1845,9 +1839,6 @@
 msgid "c_* Format is inadequate.<br />_01"
 msgstr "※ 入力形式が不正です。<br />"
 
-msgid "LC_Page_Entry_007"
-msgstr "T_ARG1 T_ARG2 様"
-
 msgid "c_The address is being searched._01"
 msgstr "住所を検索しています。"
 
@@ -2008,9 +1999,6 @@
 msgid "c_The password has been changed._01"
 msgstr "パスワードを変更いたしました。"
 
-msgid "LC_Page_Forgot_007"
-msgstr "T_ARG1 様"
-
 msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, access the registration page from the URL given to you in an e-mail._01"
 msgstr ""
 "メールアドレスもしくはパスワードが正しくありません。\n"
@@ -2093,9 +2081,6 @@
 msgid "c_Member registration is complete._01"
 msgstr "会員登録が完了しました。"
 
-msgid "LC_Page_Regist_005"
-msgstr "T_ARG1 T_ARG2 様"
-
 msgid "LC_Page_Regist_Complete_001"
 msgstr "会員登録(完了ページ)"
 
@@ -2141,7 +2126,7 @@
 msgid "c_Designation of multiple delivery destinations_01"
 msgstr "お届け先の複数指定"
 
-msgid "LC_Page_Shopping_Multiple_002"
+msgid "c_Please make a selection_02"
 msgstr "選択してください"
 
 msgid "c_* When the quantity is 0, it is not possible to enter a shipping destination.<br />_01"
@@ -2235,7 +2220,7 @@
 msgid "c_Administrator: Login ID_01"
 msgstr "管理者:ログインID"
 
-msgid "LC_Page_Install_021"
+msgid "c_Administrator: Password_01"
 msgstr "管理者:パスワード"
 
 msgid "c_Management area: Directory_01"
@@ -2286,27 +2271,18 @@
 msgid "c_DB password_01"
 msgstr "DBパスワード"
 
-msgid "LC_Page_Install_039"
+msgid "c_* It is not possible to designate a different hierarchy for the URL._01"
 msgstr "※ URLに異なる階層を指定することはできません。"
 
-msgid "LC_Page_Install_040"
-msgstr "※ URLに異なる階層を指定することはできません。"
-
-msgid "LC_Page_Install_042"
-msgstr "管理者:パスワード"
-
-msgid "LC_Page_Install_043"
-msgstr "管理機能:ディレクトリ"
-
 msgid "c_* The designated management directory already exists. Please use a different name._01"
 msgstr ""
 "※ 指定した管理機能ディレクトリは既に存在しています。別の名前を指定してくださ"
 "い。"
 
-msgid "LC_Page_Install_045"
+msgid "c_>> The script file cannot be found_01"
 msgstr ">> スクリプトファイルが見つかりません"
 
-msgid "LC_Page_Install_046"
+msgid "c_>> Table structure was not changed.<br />_01"
 msgstr ">> テーブル構成の変更に失敗しました。<br />"
 
 msgid "c_* The designated management directory already exists. Please use  a different name._01"
@@ -2321,9 +2297,6 @@
 msgid "c_Administrator_01"
 msgstr "管理者"
 
-msgid "LC_Page_Admin_Basis_001"
-msgstr "基本情報管理"
-
 msgid "c_SHOP master_01"
 msgstr "SHOPマスター"
 
@@ -2357,12 +2330,9 @@
 msgid "c_INSERT was executed for dtb_baseinfo._01"
 msgstr "dtb_baseinfo に INSERT を実行しました。"
 
-msgid "LC_Page_Admin_Basis_Delivery_002"
+msgid "c_Delivery method settings_01"
 msgstr "配送方法設定"
 
-msgid "LC_Page_Admin_Basis_DeliveryInput_002"
-msgstr "配送方法設定"
-
 msgid "c_Delivery time T_ARG1_01"
 msgstr "お届け時間T_ARG1"
 
@@ -2381,7 +2351,7 @@
 msgid "c_Membership terms and conditions_01"
 msgstr "会員規約設定"
 
-msgid "LC_Page_Admin_Basis_Kiyaku_004"
+msgid "c_* Registration of the same contents already exists.<br>_01"
 msgstr "※ 既に同じ内容の登録が存在します。<br>"
 
 msgid "c_E-mail settings_01"
@@ -2390,12 +2360,9 @@
 msgid "c_An error has occurred_01"
 msgstr "エラーが発生しました"
 
-msgid "LC_Page_Admin_Basis_Payment_002"
+msgid "c_Payment method settings_01"
 msgstr "支払方法設定"
 
-msgid "LC_Page_Admin_Basis_PaymentInput_002"
-msgstr "支払方法設定"
-
 msgid "c_Make the usage conditions (lower limit) &#036; T_ARG1 or more.<br>_01"
 msgstr "利用条件(下限)はT_ARG1円以上にしてください。<br>"
 
@@ -2423,13 +2390,10 @@
 msgid "c_Postal code registration_01"
 msgstr "郵便番号DB登録"
 
-msgid "LC_Page_Admin_Basis_ZipInstall_003"
-msgstr "'<p>完了しました。<br />'"
+msgid "c_<p>Completed.<br /> T_ARG1 items were added.</p>_01"
+msgstr "<p>完了しました。<br />T_ARG1 件を追加しました。</p>"
 
-msgid "LC_Page_Admin_Basis_ZipInstall_004"
-msgstr "件を追加しました。</p>"
-
-msgid "LC_Page_Admin_Basis_ZipInstall_005"
+msgid "c_<p><a href='?' target='_top'>Go back</a></p>_01"
 msgstr "<p><a href='?' target='_top'>戻る</a></p>"
 
 msgid "c_T_ARG1 reading failed._01"
@@ -2444,7 +2408,7 @@
 msgid "c_T_ARG1 writing failed._01"
 msgstr "T_ARG1 への書き込みに失敗しました。"
 
-msgid "c_cannot be opened._01"
+msgid "c_T_ARG1 cannot be opened._02"
 msgstr "T_ARG1 をオープンできません。"
 
 msgid "c_The target file was not found in T_ARG1._01"
@@ -2453,7 +2417,7 @@
 msgid "c_T_ARG1 decompression failed._01"
 msgstr "T_ARG1 の展開に失敗しました。"
 
-msgid "LC_Page_Admin_Basis_ZipInstall_013"
+msgid "c_T_ARG1 cannot be deleted._01"
 msgstr "T_ARG1 を削除できません。"
 
 msgid "c_The file name cannot be changed.: T_ARG1 -> TFIELF2_01"

変更: branches/version-2_12-multilang/html/install/index.php
===================================================================
--- branches/version-2_12-multilang/html/install/index.php	2013-02-06 11:42:11 UTC (rev 22508)
+++ branches/version-2_12-multilang/html/install/index.php	2013-02-06 12:08:56 UTC (rev 22509)
@@ -686,7 +686,7 @@
     $objWebParam->addParam(t('c_Store name_01'), 'shop_name', MTEXT_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'), $shop_name);
     $objWebParam->addParam(t('c_Administrator: E-mail address_01'), 'admin_mail', null, '', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'), $admin_mail);
     $objWebParam->addParam(t('c_Administrator: Login ID_01'), 'login_id', ID_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
-    $objWebParam->addParam(t('LC_Page_Install_021'), 'login_pass', ID_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
+    $objWebParam->addParam(t('c_Administrator: Password_01'), 'login_pass', ID_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
     $objWebParam->addParam(t('c_Management area: Directory_01'), 'admin_dir', ID_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'), $oldAdminDir);
     $objWebParam->addParam(t('c_Management area: SSL restriction_01'), 'admin_force_ssl', 1, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'), $admin_force_ssl);
     $objWebParam->addParam(t('c_Management area: IP restriction_01'), 'admin_allow_hosts', LTEXT_LEN, 'an', array('IP_CHECK', 'MAX_LENGTH_CHECK'), $admin_allow_hosts);
@@ -757,7 +757,7 @@
     $secure_dir = preg_replace('|^https?://[a-zA-Z0-9_~=&\?\.\-]+|', '', $arrRet['secure_url']);
 
     if ($normal_dir != $secure_dir) {
-        $objErr->arrErr['normal_url'] = t('LC_Page_Install_039');
+        $objErr->arrErr['normal_url'] = t('c_* It is not possible to designate a different hierarchy for the URL._01');
         $objErr->arrErr['secure_url'] = t('LC_Page_Install_040');
     }
 
@@ -765,10 +765,10 @@
     $objErr->doFunc(array(t('c_Administrator: Login ID_01'), 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 
     // パスワードのチェック
-    $objErr->doFunc(array(t('LC_Page_Install_042'), 'login_pass', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
+    $objErr->doFunc(array(t('c_Administrator: Password_01'), 'login_pass', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 
     // 管理機能ディレクトリのチェック
-    $objErr->doFunc(array(t('LC_Page_Install_043'), 'admin_dir', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
+    $objErr->doFunc(array(t('c_Management area: Directory_01'), 'admin_dir', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 
     $oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR);
     $newAdminDir = $objWebParam->getValue('admin_dir');
@@ -815,7 +815,7 @@
     $arrErr = array();
 
     if (!file_exists($filepath)) {
-        $arrErr['all'] = t('LC_Page_Install_045');
+        $arrErr['all'] = t('c_>> The script file cannot be found_01');
     } else {
         if ($fp = fopen($filepath, 'r')) {
             $sql = fread($fp, filesize($filepath));
@@ -845,7 +845,7 @@
                         // エラー文を取得する
                         preg_match('/\[(.*)\]/', $ret->userinfo, $arrKey);
                         $arrErr['all'] .= $arrKey[0] . '<br />';
-                        $objPage->update_mess .= t('LC_Page_Install_046');
+                        $objPage->update_mess .= t('c_>> Table structure was not changed.<br />_01');
                         GC_Utils_Ex::gfPrintLog($ret->userinfo, INSTALL_LOG);
                         break;
                     } else {




Svn-src-all メーリングリストの案内