Index: /branches/version-2_12-multilang/data/locales/en-US.po
===================================================================
--- /branches/version-2_12-multilang/data/locales/en-US.po	(revision 22366)
+++ /branches/version-2_12-multilang/data/locales/en-US.po	(revision 22372)
@@ -12,100 +12,85 @@
 "X-Generator: Poedit 1.5.4\n"
 
-msgid "SC_CheckError_001"
+msgid "c_* T_TAG contains the tag T_FIELD which is not allowed. <br />_01"
 msgstr "* T_TAG contains the tag T_FIELD which is not allowed. <br />"
 
-msgid "SC_CheckError_002"
+msgid "c_* T_FIELD is blank. <br />_01"
 msgstr "* T_FIELD is blank. <br />"
 
-msgid "SC_CheckError_003"
+msgid "c_* T_FIELD is not selected. <br />_01"
 msgstr "* T_FIELD is not selected. <br />"
 
-msgid "SC_CheckError_004"
-msgstr "* T_FIELD is blank. <br />"
-
-msgid "SC_CheckError_005"
+msgid "c_* Spaces, tabs and line breaks are not possible in T_FIELD. <br />_01"
 msgstr "* Spaces, tabs and line breaks are not possible in T_FIELD. <br />"
 
-msgid "SC_CheckError_006"
+msgid "c_* Do not include spaces, tabs or line breaks in T_FIELD. <br />_01"
 msgstr "* Do not include spaces, tabs or line breaks in T_FIELD. <br />"
 
-msgid "SC_CheckError_007"
+msgid "c_* A numerical value that starts with 0 has been entered for T_FIELD. <br />_01"
 msgstr ""
 "* A numerical value that starts with 0 has been entered for T_FIELD. <br />"
 
-msgid "SC_CheckError_008"
-msgstr "* T_FIELD is not selected. <br />"
-
-msgid "SC_CheckError_009"
+msgid "c_* T_FIELD_1ST and T_FIELD_2ND do not match. <br />_01"
 msgstr "* T_FIELD_1ST and T_FIELD_2ND do not match. <br />"
 
-msgid "SC_CheckError_010"
+msgid "c_* The same value cannot be used for T_FIELD_1ST and T_FIELD_2ND. <br />_01"
 msgstr ""
 "* The same value cannot be used for T_FIELD_1ST and T_FIELD_2ND. <br />"
 
-msgid "SC_CheckError_011"
+msgid "c_* It is not possible to enter a larger value for T_FIELD_1ST than for T_FIELD_2ND. <br />_01"
 msgstr ""
 "* It is not possible to enter a larger value for T_FIELD_1ST than for "
 "T_FIELD_2ND. <br />"
 
-msgid "SC_CheckError_012"
+msgid "c_* For T_FIELD, enter T_LENGTH  characters or less. <br />_01"
 msgstr "* For T_FIELD, enter T_LENGTH  characters or less. <br />"
 
-msgid "SC_CheckError_013_SINGLE"
-msgid_plural "SC_CheckError_013_PLURAL"
+msgid "c_* For T_FIELD, enter T_COUNT characters or more. <br />_01"
+msgid_plural "c_* For T_FIELD, input T_COUNT characters or more. <br />_01"
 msgstr[0] "* For T_FIELD, enter T_COUNT characters or more. <br />"
 msgstr[1] "* For T_FIELD, input T_COUNT characters or more. <br />"
 
-msgid "SC_CheckError_014"
+msgid "c_* For T_FIELD, enter T_LENGTH or smaller. <br />_01"
 msgstr "* For T_FIELD, enter T_LENGTH or smaller. <br />"
 
-msgid "SC_CheckError_015_SINGLE"
-msgid_plural "SC_CheckError_015_PLURAL"
+msgid "c_* Enter T_COUNT or higher for T_FIELD. <br />_01"
+msgid_plural "c_* Input T_COUNT or higher for T_FIELD. <br />_01"
 msgstr[0] "* Enter T_COUNT or higher for T_FIELD. <br />"
 msgstr[1] "* Input T_COUNT or higher for T_FIELD. <br />"
 
-msgid "SC_CheckError_016"
+msgid "c_* Enter only numbers for T_FIELD. <br />_01"
 msgstr "* Enter only numbers for T_FIELD. <br />"
 
-msgid "SC_CheckError_017"
+msgid "c_* Enter only numbers for T_FIELD. <br />_02"
 msgstr "* Enter only numbers for T_FIELD. <br />"
 
-msgid "SC_CheckError_018"
+msgid "c_* Enter alphabetical characters for T_FIELD. <br />_01"
 msgstr "* Enter alphabetical characters for T_FIELD. <br />"
 
-msgid "SC_CheckError_019"
+msgid "c_* Enter all items for T_FIELD. <br />_01"
 msgstr "* Enter all items for T_FIELD. <br />"
 
-msgid "SC_CheckError_020"
+msgid "c_* T_FIELD must be T_LENGTH characters or less. <br />_01"
 msgstr "* T_FIELD must be T_LENGTH characters or less. <br />"
 
-msgid "SC_CheckError_021"
+msgid "c_* Enter numbers for T_FIELD. <br />_01"
 msgstr "* Enter numbers for T_FIELD. <br />"
 
-msgid "SC_CheckError_022"
+msgid "c_* For T_FIELD, enter within a text length of T_LENGTH. <br />_01"
 msgstr "* For T_FIELD, enter within a text length of T_LENGTH. <br />"
 
-msgid "SC_CheckError_023"
-msgstr "* T_FIELD is blank. <br />"
-
-msgid "SC_CheckError_024"
-msgstr "* Enter all items for T_FIELD. <br />"
-
-msgid "SC_CheckError_025"
-msgstr "* T_FIELD is blank. <br />"
-
-msgid "SC_CheckError_026"
+msgid "c_* Enter items in order, starting at the beginning. <br />_01"
 msgstr "* Enter items in order, starting at the beginning. <br />"
 
-msgid "SC_CheckError_027"
+msgid "c_* For T_FIELD, enter katakana characters. <br />_01"
 msgstr "* For T_FIELD, enter katakana characters. <br />"
 
-msgid "SC_CheckError_028"
+msgid "c_* For T_FIELD, enter katakana characters. <br />_02"
 msgstr "* For T_FIELD, enter katakana characters. <br />"
 
-msgid "SC_CheckError_029"
+msgid "c_* Enter alphanumeric characters for T_FIELD. <br />_01"
 msgstr "* Enter alphanumeric characters for T_FIELD. <br />"
 
-msgid "SC_CheckError_030"
+msgid "c_* Enter alphanumeric symbols for T_FIELD. <br />_01"
 msgstr "* Enter alphanumeric symbols for T_FIELD. <br />"
 
@@ -151,7 +136,4 @@
 msgstr "* Do not use Japanese or spaces in the file name for T_FIELD. <br />"
 
-msgid "SC_CheckError_043"
-msgstr "* Enter all items for T_FIELD. <br />"
-
 msgid "SC_CheckError_044"
 msgstr "* T_FIELD is not correct. <br />"
@@ -3596,5 +3578,5 @@
 msgstr "A method for upward compatibility was used."
 
-msgid "tpl_001"
+msgid "t_Delivery company_01"
 msgstr "Delivery company"
 
@@ -5006,5 +4988,5 @@
 msgstr "Yes"
 
-msgid "tpl_433"
+msgid "t_No_01"
 msgstr "No"
 
@@ -5662,7 +5644,4 @@
 "the management screen.<br/>Do not change these settings if you are not "
 "familiar with them."
-
-msgid "tpl_640"
-msgstr "Management area settings"
 
 msgid "tpl_641"
@@ -5927,16 +5906,16 @@
 msgstr "(None)"
 
-msgid "tpl_730"
+msgid "t_Not selected_01"
 msgstr "Not selected"
 
-msgid "tpl_731"
+msgid "t_■Agreement to the license agreement_01"
 msgstr "*Agreement to the license agreement"
 
-msgid "tpl_732"
+msgid "t_Please read the license agreement below.<br />It is necessary to agree to the agreement in order to continue with installation_01"
 msgstr ""
 "Please read the license agreement below.<br />It is necessary to agree to "
 "the agreement in order to continue with installation."
 
-msgid "tpl_733"
+msgid "t_Please agree to the software license agreement<br /><br />Lockon Co., Ltd. (hereinafter referred to as 'our company') requires customers to agree to the contents of the 'Software License Agreement' below to be able to use this software. You will be deemed as having agreed to the 'Software License Agreement' below at the point in time that you install, copy, or use this software.<br /><br />--------------------- Software License Agreement ---------------------<br /><br />1. License<br /><br />EC-CUBE adopts a 'dual license method' in which you can select either a free GPL license or paid commercial license for using the EC-CUBE product. The major characteristics of each license are as follows.<br /><br />1-1. GPL license<br /><br />Although it is possible to use EC-CUBE for free, and carry out duplication, modification, and distribution, if distributing an application that uses EC-CUBE, you must publish the source code for the application and make it utilizable.<br /><br />* When modifying, you may modify everything except for the copyright notice in the header section of the program file (PHP file, etc.) <br /><br />* With regard to the official conditions of the GPL license (GNU General Public License), please refer to http://www.fsf.org/licenses/ (Japanese translation: http://www.opensource.jp/gpl/gpl.ja.html).<br /><br />1-2. Commercial license <br /><br />The EC-CUBE commercial license is a license for parties who do not want to comply with the GPL license. <br />When you purchase an EC-CUBE commercial license, it is not necessary to make your own application an open source, within the scope of the commercial license. <br /><br />* A commercial license is necessary for all uses that do not comply with the GPL license. <br /><br />* For details regarding the commercial license, refer to http://www.ec-cube.net/license/business.php.<br /><br />2. Exclusion of liability<br /><br />2-1. Users shall confirm and agree that all direct and indirect damages (data loss, server trouble, halting of operations, claims from a third party, etc.) and dangers arising from use of this software are entirely the responsibility of the user.<br />2-2. In any case, and even in cases of illegal behavior, agreement, or any other legal basis, the suppliers, resellers, and various information contents providers for this software are not responsible for any direct, indirect, specific, incidental, or consequential loss or damage of the customer or other third party, including the loss of sales value, halting of operations, damage resulting from computer malfunctions, and any other commercial loss or damages, etc. Furthermore, our company is not responsible for any claims by a third party. <br /><br />3. Gathering of site information <br /><br />3-1 When installing EC-CUBE, the customer confirms and agrees that our company gathers information such as the site URL, store name, EC-CUBE version, PHP information, DB information, etc.<br />_01"
 msgstr ""
 "Please agree to the software license agreement<br /><br />Lockon Co., Ltd. "
@@ -5982,116 +5961,116 @@
 "information, DB information, etc.<br />"
 
-msgid "tpl_734"
+msgid "tpl_Agree_01"
 msgstr "Agree"
 
-msgid "tpl_735"
+msgid "tpl_Do not agree_01"
 msgstr "Do not agree"
 
-msgid "tpl_736"
+msgid "tpl_Next_01"
 msgstr "Next"
 
-msgid "tpl_737"
+msgid "t_EC CUBE installation is complete._01"
 msgstr "EC CUBE installation is complete."
 
-msgid "tpl_738"
+msgid "t_Log in using the ID and password that you just registered._01"
 msgstr "Log in using the ID and password that you just registered."
 
-msgid "tpl_739"
+msgid "t_Log in to management screen_01"
 msgstr "Log in to management screen"
 
-msgid "tpl_740"
+msgid "t_EC-CUBE Installation_01"
 msgstr "EC-CUBE Installation"
 
-msgid "tpl_741"
+msgid "t_This is a notice from EC-CUBE. Please use a browser that supports iframe for this section._01"
 msgstr ""
 "This is a notice from EC-CUBE. Please use a browser that supports iframe for "
 "this section."
 
-msgid "tpl_742"
+msgid "t_Check results_01"
 msgstr "Check results"
 
-msgid "tpl_743"
+msgid "t_When [Next] is clicked, a check will be executed once again._01"
 msgstr "When [Next] is clicked, a check will be executed once again."
 
-msgid "tpl_744"
+msgid "t_Ignore problems and proceed (for advanced users)_01"
 msgstr "Ignore problems and proceed (for advanced users)"
 
-msgid "tpl_745"
+msgid "t_* If you proceed without resolving the problem, this may lead to problems._01"
 msgstr ""
 "* If you proceed without resolving the problem, this may lead to problems."
 
-msgid "tpl_746"
+msgid "t_Copying of necessary files will begin._01"
 msgstr "Copying of necessary files will begin."
 
-msgid "tpl_747"
+msgid "t_Copying of necessary files_01"
 msgstr "Copying of necessary files"
 
-msgid "tpl_748"
+msgid "t_EC site settings_01"
 msgstr "EC site settings"
 
-msgid "tpl_749"
+msgid "t_Fill in the name of your store._01"
 msgstr "Fill in the name of your store."
 
-msgid "tpl_750"
+msgid "t_The address will be the one in the order receipt mail, etc._01"
 msgstr "The address will be the one in the order receipt mail, etc."
 
-msgid "tpl_751"
+msgid "t_Login ID <span class='attention'>*</span>_01"
 msgstr "Login ID <span class='attention'>*</span>"
 
-msgid "tpl_752"
+msgid "t_ID for logging in to the management area._01"
 msgstr "ID for logging in to the management area."
 
-msgid "tpl_753"
+msgid "t_Password for logging in to the management area._01"
 msgstr "Password for logging in to the management area."
 
-msgid "tpl_754"
+msgid "t_Management area settings_01"
 msgstr "Management area settings"
 
-msgid "tpl_755"
+msgid "t_Directory_01"
 msgstr "Directory"
 
-msgid "tpl_756"
+msgid "t_(Example) eccube@example.com_01"
 msgstr "(Example) eccube@example.com"
 
-msgid "tpl_757"
+msgid "t_Directory name for management area._01"
 msgstr "Directory name for management area."
 
-msgid "tpl_758"
+msgid "t_Access the management area with link below._01"
 msgstr "Access the management area with link below."
 
-msgid "tpl_759"
+msgid "t_https://[Host name].[Domain name]/[Shop directory]/<span class='bold'>[Directory]</span>/_01"
 msgstr ""
 "https://[Host name].[Domain name]/[Shop directory]/<span class='bold'>"
 "[Directory]</span>/"
 
-msgid "tpl_760"
+msgid "t_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 "t_WEB server settings_01"
 msgstr "WEB server settings"
 
-msgid "tpl_762"
+msgid "t_URL (normal) <span class='attention'>*</span>_01"
 msgstr "URL (normal) <span class='attention'>*</span>"
 
-msgid "tpl_763"
+msgid "t_URL (secure) <span class='attention'>*</span>_01"
 msgstr "URL (secure) <span class='attention'>*</span>"
 
-msgid "tpl_764"
+msgid "t_Common domain_01"
 msgstr "Common domain"
 
-msgid "tpl_765"
+msgid "t_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 "t_&gt;&gt; Option settings_01"
 msgstr "&gt;&gt; Option settings"
 
-msgid "tpl_767"
+msgid "t_E-mail server settings (option)_01"
 msgstr "E-mail server settings (option)"
 
-msgid "tpl_768"
+msgid "t_Mailer backend <span class='attention'>*</span>_01"
 msgstr "Mailer backend <span class='attention'>*</span>"
 
-msgid "tpl_769"
+msgid "t_mail - PHP built-in function  mail() is used to send.<br />SMTP - E-mails are sent by directly connecting to the SMTP server.<br />sendmail - Sent through the sendmail program._01"
 msgstr ""
 "mail - PHP built-in function  mail() is used to send.<br />SMTP - E-mails "
@@ -6099,120 +6078,120 @@
 "through the sendmail program."
 
-msgid "tpl_770"
+msgid "t_SMTP host_01"
 msgstr "SMTP host"
 
-msgid "tpl_771"
+msgid "t_Use only when the mailer backend is SMTP._01"
 msgstr "Use only when the mailer backend is SMTP."
 
-msgid "tpl_772"
+msgid "t_SMTP port_01"
 msgstr "SMTP port"
 
-msgid "tpl_773"
+msgid "t_SMTP user_01"
 msgstr "SMTP user"
 
-msgid "tpl_774"
+msgid "t_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 "t_SMTP password_01"
 msgstr "SMTP password"
 
-msgid "tpl_776"
+msgid "t_Database settings_01"
 msgstr "Database settings"
 
-msgid "tpl_777"
+msgid "t_* You must create a new database before installation._01"
 msgstr "* You must create a new database before installation."
 
-msgid "tpl_778"
+msgid "t_DB type <span class='attention'>*</span>_01"
 msgstr "DB type <span class='attention'>*</span>"
 
-msgid "tpl_779"
+msgid "t_Port_01"
 msgstr "Port"
 
-msgid "tpl_780"
+msgid "t_DB name <span class='attention'>*</span>_01"
 msgstr "DB name <span class='attention'>*</span>"
 
-msgid "tpl_781"
+msgid "t_DB user <span class='attention'>*</span>_01"
 msgstr "DB user <span class='attention'>*</span>"
 
-msgid "tpl_782"
+msgid "t_DB password <span class='attention'>*</span>_01"
 msgstr "DB password <span class='attention'>*</span>"
 
-msgid "tpl_783"
+msgid "t_Data that has been erased cannot be restored. \n Do you want to delete?_01"
 msgstr ""
 "Data that has been erased cannot be restored. \n"
 "Do you want to delete?"
 
-msgid "tpl_784"
+msgid "t_Database initialization_01"
 msgstr "Database initialization"
 
-msgid "tpl_785"
+msgid "t_Connection information_01"
 msgstr "Connection information"
 
-msgid "tpl_786"
+msgid "t_Database initialization will begin.<br />* Will be suspended if a table, etc. is already created._01"
 msgstr ""
 "Database initialization will begin.<br />* Will be suspended if a table, "
 "etc. is already created."
 
-msgid "tpl_787"
+msgid "t_Do not carry out the database initialization process_01"
 msgstr "Do not carry out the database initialization process"
 
-msgid "tpl_788"
+msgid "t_Delete all existing data_01"
 msgstr "Delete all existing data"
 
-msgid "tpl_789"
+msgid "t_Site information_01"
 msgstr "Site information"
 
-msgid "tpl_790"
+msgid "t_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 "t_Site URL: _01"
 msgstr "Site URL: "
 
-msgid "tpl_792"
+msgid "t_Store name: _01"
 msgstr "Store name: "
 
-msgid "tpl_793"
+msgid "t_EC-CUBE version: _01"
 msgstr "EC-CUBE version: "
 
-msgid "tpl_794"
+msgid "t_PHP information: _01"
 msgstr "PHP information: "
 
-msgid "tpl_795"
+msgid "t_DB information: _01"
 msgstr "DB information: "
 
-msgid "tpl_796"
+msgid "t_OS information: _01"
 msgstr "OS information: "
 
-msgid "tpl_797"
+msgid "t_Yes (recommended)_01"
 msgstr "Yes (recommended)"
 
-msgid "tpl_798"
+msgid "t_No_02"
 msgstr "No"
 
-msgid "tpl_799"
+msgid "t_EC-CUBE installation will begin_01"
 msgstr "EC-CUBE installation will begin."
 
-msgid "tpl_800"
+msgid "t_<span class='attention'>* The authentication key can be obtained from <a href='T_FIELD' target='_blank'>the EC-CUBE Owners Store</a>.</span>_01"
 msgstr ""
 "<span class='attention'>* The authentication key can be obtained from <a "
 "href='T_FIELD' target='_blank'>the EC-CUBE Owners Store</a>.</span>"
 
-msgid "tpl_801"
+msgid "t_You can log in to <a href='T_FIELD_01T_FIELD_02T_FIELD_03'>the management screen</a>._01"
 msgstr ""
 "You can log in to <a href='T_FIELD_01T_FIELD_02T_FIELD_03'>the management "
 "screen</a>."
 
-msgid "tpl_802"
+msgid "t_Monthly (end of month)_01"
 msgstr "Monthly (end of month)"
 
-msgid "tpl_803"
+msgid "t_Monthly (by T_FIELD)_01"
 msgstr "Monthly (by T_FIELD)"
 
-msgid "tpl_804"
+msgid "t_ID:_01"
 msgstr "ID:"
 
-msgid "tpl_805"
+msgid "t_T_FIELD:_01"
 msgstr "T_FIELD:"
 
