@@ -51,5 +51,5 @@
- |
+ |
@@ -69,5 +69,5 @@
|
- |
+ |
@@ -77,5 +77,5 @@
|
- |
+ |
@@ -85,5 +85,5 @@
|
- |
+ |
@@ -93,5 +93,5 @@
|
- |
+ |
Index: /branches/version-2_12-multilang/html/install/templates/step3.tpl
===================================================================
--- /branches/version-2_12-multilang/html/install/templates/step3.tpl (revision 22444)
+++ /branches/version-2_12-multilang/html/install/templates/step3.tpl (revision 22451)
@@ -26,5 +26,5 @@
switch(mode) {
case 'drop':
- if(!window.confirm('')){
+ if(!window.confirm('')){
return;
}
@@ -49,14 +49,14 @@
-
+
@@ -67,5 +67,5 @@
Index: /branches/version-2_12-multilang/html/install/templates/step4.tpl
===================================================================
--- /branches/version-2_12-multilang/html/install/templates/step4.tpl (revision 22444)
+++ /branches/version-2_12-multilang/html/install/templates/step4.tpl (revision 22451)
@@ -37,20 +37,20 @@
-
-
+
+
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/settings.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/settings.tpl (revision 22439)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/settings.tpl (revision 22451)
@@ -30,5 +30,5 @@
-
+
@@ -61,5 +61,5 @@
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/basis/zip_install.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/basis/zip_install.tpl (revision 22437)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/basis/zip_install.tpl (revision 22451)
@@ -69,5 +69,5 @@
-
+
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl (revision 22444)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl (revision 22451)
@@ -70,5 +70,5 @@
|
- |
+ |
@@ -90,5 +90,5 @@
- |
+ |
- - |
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl (revision 22443)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl (revision 22451)
@@ -184,5 +184,5 @@
/> - />
-
+
*}-->
/>
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl (revision 22437)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl (revision 22451)
@@ -58,5 +58,5 @@
-
+
|
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/home.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/home.tpl (revision 22444)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/home.tpl (revision 22451)
@@ -60,5 +60,5 @@
- |
+ |
|
Index: /branches/version-2_12-multilang/data/locales/en-US.po
===================================================================
--- /branches/version-2_12-multilang/data/locales/en-US.po (revision 22445)
+++ /branches/version-2_12-multilang/data/locales/en-US.po (revision 22451)
@@ -3695,12 +3695,6 @@
msgstr "Company name"
-msgid "tpl_029"
-msgstr "会社名(フリガナ)"
-
msgid "tpl_Store name
*_01"
msgstr "Store name
*"
-
-msgid "tpl_031"
-msgstr "店名(フリガナ)"
msgid "tpl_Store name (in English)_01"
@@ -4270,11 +4264,5 @@
msgstr "Member status
*"
-msgid "tpl_210"
-msgstr "お名前(フリガナ)"
-
-msgid "tpl_210_1"
-msgstr "お名前(フリガナ)
*"
-
-msgid "tpl_211"
+msgid "tpl_Address input_01"
msgstr "Address input"
@@ -4381,9 +4369,6 @@
msgstr "full member"
-msgid "tpl_240"
+msgid "tpl_%s1 %s2_01"
msgstr "%s1 %s2"
-
-msgid "tpl_241"
-msgstr "Telephone number"
msgid "tpl_Not registered_01"
@@ -4432,7 +4417,4 @@
msgstr "Type"
-msgid "tpl_257"
-msgstr "お名前/(フリガナ)"
-
msgid "tpl_Prefecture_01"
msgstr "Prefecture"
@@ -4750,7 +4732,4 @@
msgstr "(Non-member)"
-msgid "tpl_364"
-msgstr "お名前(カナ)"
-
msgid "tpl_Remarks_01"
msgstr "Remarks"
@@ -4969,5 +4948,5 @@
msgstr "Response status change"
-msgid "tpl_441"
+msgid "tpl_* When %s1 or when changing to delete, restore the inventory count manually._01"
msgstr "* When %s1 or when changing to delete, restore the inventory count manually."
@@ -5587,7 +5566,4 @@
msgstr "When incorrect settings are applied, it may no longer be possible to access the management screen.
Do not change these settings if you are not familiar with them."
-msgid "tpl_640"
-msgstr "Management area settings"
-
msgid "tpl_Directory name_01"
msgstr "Directory name"
@@ -5814,7 +5790,4 @@
msgid "tpl_Add product_01"
msgstr "Add product"
-
-msgid "tpl_723"
-msgstr "Change"
msgid "tpl_Find users_01"
@@ -5957,50 +5930,50 @@
msgstr "Management area settings"
-msgid "tpl_755"
+msgid "tpl_Directory_01"
msgstr "Directory"
-msgid "tpl_756"
+msgid "tpl_(Example) eccube@example.com_01"
msgstr "(Example) eccube@example.com"
-msgid "tpl_757"
+msgid "tpl_Directory name for management area._01"
msgstr "Directory name for management area."
-msgid "tpl_758"
+msgid "tpl_Access the management area with link below._01"
msgstr "Access the management area with link below."
-msgid "tpl_759"
+msgid "tpl_https://[Host name].[Domain name]/[Shop directory]/
[Directory]/_01"
msgstr ""
"https://[Host name].[Domain name]/[Shop directory]/
"
"[Directory]/"
-msgid "tpl_760"
+msgid "tpl_Access to the management area is limited to SSL (https) connections._01"
msgstr "Access to the management area is limited to SSL (https) connections."
-msgid "tpl_761"
+msgid "tpl_WEB server settings_01"
msgstr "WEB server settings"
-msgid "tpl_762"
+msgid "tpl_URL (normal)
*_01"
msgstr "URL (normal)
*"
-msgid "tpl_763"
+msgid "tpl_URL (secure)
*_01"
msgstr "URL (secure)
*"
-msgid "tpl_764"
+msgid "tpl_Common domain_01"
msgstr "Common domain"
-msgid "tpl_765"
+msgid "tpl_Designated when the subdomain differs based on normal URL and secure URL._01"
msgstr ""
"Designated when the subdomain differs based on normal URL and secure URL."
-msgid "tpl_766"
+msgid "tpl_>> Option settings_01"
msgstr ">> Option settings"
-msgid "tpl_767"
+msgid "tpl_E-mail server settings (option)_01"
msgstr "E-mail server settings (option)"
-msgid "tpl_768"
+msgid "tpl_Mailer backend
*_01"
msgstr "Mailer backend
*"
-msgid "tpl_769"
+msgid "tpl_mail - PHP built-in function mail() is used to send.
SMTP - E-mails are sent by directly connecting to the SMTP server.
sendmail - Sent through the sendmail program._01"
msgstr ""
"mail - PHP built-in function mail() is used to send.
SMTP - E-mails "
@@ -6008,101 +5981,101 @@
"through the sendmail program."
-msgid "tpl_770"
+msgid "tpl_SMTP host_01"
msgstr "SMTP host"
-msgid "tpl_771"
+msgid "tpl_Use only when the mailer backend is SMTP._01"
msgstr "Use only when the mailer backend is SMTP."
-msgid "tpl_772"
+msgid "tpl_SMTP port_01"
msgstr "SMTP port"
-msgid "tpl_773"
+msgid "tpl_SMTP user_01"
msgstr "SMTP user"
-msgid "tpl_774"
+msgid "tpl_Use only when the mailer backend is SMTP and SMTP-AUTH is also used._01"
msgstr "Use only when the mailer backend is SMTP and SMTP-AUTH is also used."
-msgid "tpl_775"
+msgid "tpl_SMTP password_01"
msgstr "SMTP password"
-msgid "tpl_776"
+msgid "tpl_Database settings_01"
msgstr "Database settings"
-msgid "tpl_777"
+msgid "tpl_* You must create a new database before installation._01"
msgstr "* You must create a new database before installation."
-msgid "tpl_778"
+msgid "tpl_DB type
*_01"
msgstr "DB type
*"
-msgid "tpl_779"
+msgid "tpl_Port_01"
msgstr "Port"
-msgid "tpl_780"
+msgid "tpl_DB name
*_01"
msgstr "DB name
*"
-msgid "tpl_781"
+msgid "tpl_DB user
*_01"
msgstr "DB user
*"
-msgid "tpl_782"
+msgid "tpl_DB password
*_01"
msgstr "DB password
*"
-msgid "tpl_783"
+msgid "tpl_Are you sure you want to remove this item?It can not be restored._01"
msgstr ""
"Are you sure you want to remove this item? \n"
"It can not be restored."
-msgid "tpl_784"
+msgid "tpl_Database initialization_01"
msgstr "Database initialization"
-msgid "tpl_785"
+msgid "tpl_Connection information_01"
msgstr "Connection information"
-msgid "tpl_786"
+msgid "tpl_Database initialization will begin.
* Will be suspended if a table, etc. is already created._01"
msgstr ""
"Database initialization will begin.
* Will be suspended if a table, "
"etc. is already created."
-msgid "tpl_787"
+msgid "tpl_Do not carry out the database initialization process_01"
msgstr "Do not carry out the database initialization process"
-msgid "tpl_788"
+msgid "tpl_Delete all existing data_01"
msgstr "Delete all existing data"
-msgid "tpl_789"
+msgid "tpl_Site information_01"
msgstr "Site information"
-msgid "tpl_790"
+msgid "tpl_Please provide the information below for the purpose of debugging and improving the EC-CUBE system._01"
msgstr ""
"Please provide the information below for the purpose of debugging and "
"improving the EC-CUBE system."
-msgid "tpl_791"
+msgid "tpl_Site URL: _01"
msgstr "Site URL: "
-msgid "tpl_792"
+msgid "tpl_Store name: _01"
msgstr "Store name: "
-msgid "tpl_793"
+msgid "tpl_EC-CUBE version: _01"
msgstr "EC-CUBE version: "
-msgid "tpl_794"
+msgid "tpl_PHP information: _01"
msgstr "PHP information: "
-msgid "tpl_795"
+msgid "tpl_DB information: _01"
msgstr "DB information: "
-msgid "tpl_796"
+msgid "tpl_OS information: _01"
msgstr "OS information: "
-msgid "tpl_797"
+msgid "tpl_Yes (recommended)_01"
msgstr "Yes (recommended)"
-msgid "tpl_798"
+msgid "tpl_No_02"
msgstr "No"
-msgid "tpl_799"
+msgid "tpl_EC-CUBE installation will begin._01"
msgstr "EC-CUBE installation will begin."
-msgid "tpl_800"
+msgid "tpl_
* The authentication key can be obtained from the EC-CUBE Owners Store._01"
msgstr ""
"
* The authentication key can be obtained from *_01"
msgstr "店名
*"
-
-msgid "tpl_031"
-msgstr "店名(フリガナ)"
msgid "tpl_Store name (in English)_01"
@@ -4227,11 +4221,5 @@
msgstr "会員状態
*"
-msgid "tpl_210"
-msgstr "お名前(フリガナ)"
-
-msgid "tpl_210_1"
-msgstr "お名前(フリガナ)
*"
-
-msgid "tpl_211"
+msgid "tpl_Address input_01"
msgstr "住所入力"
@@ -4326,5 +4314,5 @@
msgstr "購入履歴はありません。"
-msgid "tpl_236"
+msgid "tpl_Registration is complete._01"
msgstr "登録が完了致しました。"
@@ -4338,9 +4326,6 @@
msgstr "本会員"
-msgid "tpl_240"
+msgid "tpl_%s1 %s2_01"
msgstr "%s1%s2 様"
-
-msgid "tpl_241"
-msgstr "お電話番号"
msgid "tpl_Not registered_01"
@@ -4389,7 +4374,4 @@
msgstr "種別"
-msgid "tpl_257"
-msgstr "お名前/(フリガナ)"
-
msgid "tpl_Prefecture_01"
msgstr "都道府県"
@@ -4707,7 +4689,4 @@
msgstr "(非会員)"
-msgid "tpl_364"
-msgstr "お名前(カナ)"
-
msgid "tpl_Remarks_01"
msgstr "備考"
@@ -4926,5 +4905,5 @@
msgstr "対応状況変更"
-msgid "* When %s1 or when changing to delete, restore the inventory count manually."
+msgid "tpl_* When %s1 or when changing to delete, restore the inventory count manually._01"
msgstr "※ %s1もしくは、削除に変更時には、在庫数を手動で戻してください。"
@@ -5768,7 +5747,4 @@
msgid "tpl_Add product_01"
msgstr "商品の追加"
-
-msgid "tpl_723"
-msgstr "変更"
msgid "tpl_Find users_01"
@@ -5904,49 +5880,49 @@
msgstr "管理機能の設定"
-msgid "tpl_755"
+msgid "tpl_Directory_01"
msgstr "ディレクトリ"
-msgid "tpl_756"
+msgid "tpl_(Example) eccube@example.com_01"
msgstr "(例) eccube@example.com"
-msgid "tpl_757"
+msgid "tpl_Directory name for management area._01"
msgstr "管理機能のディレクトリ名です。"
-msgid "tpl_758"
+msgid "tpl_Access the management area with link below._01"
msgstr "下記で管理機能にアクセスする場合の[管理機能]の部分です。"
-msgid "tpl_759"
+msgid "tpl_https://[Host name].[Domain name]/[Shop directory]/
[Directory]/_01"
msgstr ""
"https://[ホスト名].[ドメイン名]/[ショップディレクトリ]/
"
"[ディレクトリ]/"
-msgid "tpl_760"
+msgid "tpl_Access to the management area is limited to SSL (https) connections._01"
msgstr "管理機能へのアクセスをSSL経由(https)の接続に制限します。"
-msgid "tpl_761"
+msgid "tpl_WEB server settings_01"
msgstr "WEBサーバーの設定"
-msgid "tpl_762"
+msgid "tpl_URL (normal)
*_01"
msgstr "URL(通常)
*"
-msgid "tpl_763"
+msgid "tpl_URL (secure)
*_01"
msgstr "URL(セキュア)
*"
-msgid "tpl_764"
+msgid "tpl_Common domain_01"
msgstr "共通ドメイン"
-msgid "tpl_765"
+msgid "tpl_Designated when the subdomain differs based on normal URL and secure URL._01"
msgstr "通常URLとセキュアURLでサブドメインが異なる場合に指定します。"
-msgid "tpl_766"
+msgid "tpl_>> Option settings_01"
msgstr ">> オプション設定"
-msgid "tpl_767"
+msgid "tpl_E-mail server settings (option)_01"
msgstr "メールサーバーの設定(オプション)"
-msgid "tpl_768"
+msgid "tpl_Mailer backend
*_01"
msgstr "メーラーバックエンド
*"
-msgid "tpl_769"
+msgid "tpl_mail - PHP built-in function mail() is used to send.
SMTP - E-mails are sent by directly connecting to the SMTP server.
sendmail - Sent through the sendmail program._01"
msgstr ""
"mail - PHP の組込関数 mail() を使用して送信します。
SMTP - SMTP サーバに"
@@ -5954,101 +5930,101 @@
"信します。"
-msgid "tpl_770"
+msgid "tpl_SMTP host_01"
msgstr "SMTP ホスト"
-msgid "tpl_771"
+msgid "tpl_Use only when the mailer backend is SMTP._01"
msgstr "メーラーバックエンドが SMTP の場合のみ指定します。"
-msgid "tpl_772"
+msgid "tpl_SMTP port_01"
msgstr "SMTP ポート"
-msgid "tpl_773"
+msgid "tpl_SMTP user_01"
msgstr "SMTP ユーザー"
-msgid "tpl_774"
+msgid "tpl_Use only when the mailer backend is SMTP and SMTP-AUTH is also used._01"
msgstr "メーラーバックエンドが SMTP の場合で、SMTP-AUTH 使用時のみ指定します。"
-msgid "tpl_775"
+msgid "tpl_SMTP password_01"
msgstr "SMTP パスワード"
-msgid "tpl_776"
+msgid "tpl_Database settings_01"
msgstr "データベースの設定"
-msgid "tpl_777"
+msgid "tpl_* You must create a new database before installation._01"
msgstr "※インストールの前に新しくDBを作成しておく必要があります。"
-msgid "tpl_778"
+msgid "tpl_DB type
*_01"
msgstr "DBの種類
*"
-msgid "tpl_779"
+msgid "tpl_Port_01"
msgstr "ポート"
-msgid "tpl_780"
+msgid "tpl_DB name
*_01"
msgstr "DB名
*"
-msgid "tpl_781"
+msgid "tpl_DB user
*_01"
msgstr "DBユーザ
*"
-msgid "tpl_782"
+msgid "tpl_DB password
*_01"
msgstr "DBパスワード
*"
-msgid "tpl_783"
+msgid "tpl_Are you sure you want to remove this item?It can not be restored._01"
msgstr ""
"一度削除したデータは、元に戻せません。\n"
"削除しても宜しいですか?"
-msgid "tpl_784"
+msgid "tpl_Database initialization_01"
msgstr "データベースの初期化"
-msgid "tpl_785"
+msgid "tpl_Connection information_01"
msgstr "接続情報:"
-msgid "tpl_786"
+msgid "tpl_Database initialization will begin.
* Will be suspended if a table, etc. is already created._01"
msgstr ""
"データベースの初期化を開始します。
※すでにテーブル等が作成されている場合"
"は中断されます。"
-msgid "tpl_787"
+msgid "tpl_Do not carry out the database initialization process_01"
msgstr "データベースの初期化処理を行わない"
-msgid "tpl_788"
+msgid "tpl_Delete all existing data_01"
msgstr "既存データをすべて削除する"
-msgid "tpl_789"
+msgid "tpl_Site information_01"
msgstr "サイト情報について"
-msgid "tpl_790"
+msgid "tpl_Please provide the information below for the purpose of debugging and improving the EC-CUBE system._01"
msgstr ""
"EC-CUBEのシステム向上及び、デバッグのため以下の情報のご提供をお願いいたしま"
"す。"
-msgid "tpl_791"
+msgid "tpl_Site URL: _01"
msgstr "サイトURL:"
-msgid "tpl_792"
+msgid "tpl_Store name: _01"
msgstr "店名:"
-msgid "tpl_793"
+msgid "tpl_EC-CUBE version: _01"
msgstr "EC-CUBEバージョン:"
-msgid "tpl_794"
+msgid "tpl_PHP information: _01"
msgstr "PHP情報:"
-msgid "tpl_795"
+msgid "tpl_DB information: _01"
msgstr "DB情報:"
-msgid "tpl_796"
+msgid "tpl_OS information: _01"
msgstr "OS情報:"
-msgid "tpl_797"
+msgid "tpl_Yes (recommended)_01"
msgstr "はい(推奨)"
-msgid "tpl_798"
+msgid "tpl_No_02"
msgstr "いいえ"
-msgid "tpl_799"
+msgid "tpl_EC-CUBE installation will begin._01"
msgstr "EC-CUBEのインストールを開始します。"
-msgid "tpl_800"
+msgid "tpl_
* The authentication key can be obtained from the EC-CUBE Owners Store._01"
msgstr ""
"
※認証キーはEC-CUBE"