Changeset 22540 for branches/version-2_12_3en-p1

Timestamp:

2013/02/13 18:53:53 (11 years ago)

Author:

m_uehara

Message:

#2084 メッセージIDに含まれる「\n」を削除しました。

Location:

branches/version-2_12_3en-p1

Files:

• data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (modified) (1 diff)
• data/class/pages/error/LC_Page_Error.php (modified) (3 diffs)
• data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (modified) (1 diff)
• data/class/pages/shopping/LC_Page_Shopping.php (modified) (1 diff)
• data/locales/en-US.po (modified) (7 diffs)
• data/locales/ja.po (modified) (7 diffs)
• html/install/index.php (modified) (2 diffs)

branches/version-2_12_3en-p1/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php

@@ -487 +487 @@
 
         if (!$success) {
-            $msg = t('c_Decompression of backup file failed.\n_01');
-            $msg .= t('c_Decompression source: T_ARG1 \n_01', array('T_ARG1' => $bkup_filepath));
+            $msg = t('c_Decompression of backup file failed._01');
+            $msg .= t('c_Decompression source: T_ARG1 _01', array('T_ARG1' => $bkup_filepath));
             $msg .= t('c_Decompression destination: T_ARG1_01', array('T_ARG1' => $work_dir));
             trigger_error($msg, E_USER_ERROR);

branches/version-2_12_3en-p1/data/class/pages/error/LC_Page_Error.php

@@ -133 +133 @@
                 break;
             case EXTRACT_ERROR:
-                $this->tpl_error=t('c_File decompression failed.\nWrite access may not have been granted to the designated directory._01');
+                $this->tpl_error=t('c_File decompression failed.Write access may not have been granted to the designated directory._01');
                 break;
             case FTP_DOWNLOAD_ERROR:
@@ -145 +145 @@
                 break;
             case CREATE_DB_ERROR:
-                $this->tpl_error=t('c_DB creation failed. \nThe user designated by may not have been granted DB creation access._01');
+                $this->tpl_error=t('c_DB creation failed. The user designated by may not have been granted DB creation access._01');
                 break;
             case DB_IMPORT_ERROR:
-                $this->tpl_error=t('c_Import of the database structure failed. \nThe sql file may be damaged._01');
+                $this->tpl_error=t('c_Import of the database structure failed. The sql file may be damaged._01');
                 break;
             case FILE_NOT_FOUND:
@@ -154 +154 @@
                 break;
             case WRITE_FILE_ERROR:
-                $this->tpl_error=t('c_It is not possible to write to the file settings.\nGrant write access to file settings._01');
+                $this->tpl_error=t('c_It is not possible to write to the file settings.Grant write access to file settings._01');
                 break;
             case DOWNFILE_NOT_FOUND:

branches/version-2_12_3en-p1/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php

@@ -238 +238 @@
         switch ($error) {
             case TEMP_LOGIN_ERROR:
-                $msg = t('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');
+                $msg = t('c_The e-mail address or password is not correct.If you have not completed registration, access the registration page from the URL given to you in an e-mail._01');
                 break;
             case SITE_LOGIN_ERROR:

branches/version-2_12_3en-p1/data/class/pages/shopping/LC_Page_Shopping.php

@@ -501 +501 @@
         switch ($error) {
             case TEMP_LOGIN_ERROR:
-                $msg = t('c_The e-mail address or password is not correct.\nIf you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01');
+                $msg = t('c_The e-mail address or password is not correct.If you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01');
                 break;
             case SITE_LOGIN_ERROR:

branches/version-2_12_3en-p1/data/locales/en-US.po

@@ -1923 +1923 @@
 msgstr "This product is already added to your favorites"
 
-msgid "c_File decompression failed.\nWrite access may not have been granted to the designated directory._01"
+msgid "c_File decompression failed.Write access may not have been granted to the designated directory._01"
 msgstr ""
 "File decompression failed.\n"
@@ -1937 +1937 @@
 msgstr "FTP login failed."
 
-msgid "c_DB creation failed. \nThe user designated by may not have been granted DB creation access._01"
+msgid "c_DB creation failed. The user designated by may not have been granted DB creation access._01"
 msgstr ""
 "DB creation failed. \n"
 "The user designated by may not have been granted DB creation access."
 
-msgid "c_Import of the database structure failed. \nThe sql file may be damaged._01"
+msgid "c_Import of the database structure failed. The sql file may be damaged._01"
 msgstr ""
 "Import of the database structure failed. \n"
@@ -1950 +1950 @@
 msgstr "The settings file does not exist in the designated path."
 
-msgid "c_It is not possible to write to the file settings.\nGrant write access to file settings._01"
+msgid "c_It is not possible to write to the file settings.Grant write access to file settings._01"
 msgstr ""
 "It is not possible to write to the file settings.\n"
@@ -2012 +2012 @@
 msgstr "The password has been changed."
 
-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"
+msgid "c_The e-mail address or password is not correct.If 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"
@@ -2114 +2114 @@
 "necessary.<br />Please carry out member registration."
 
-msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
+msgid "c_The e-mail address or password is not correct.If you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
 msgstr ""
 "The e-mail address or password is not correct.\n"
@@ -2206 +2206 @@
 msgstr "×: The sequence was not deleted.<br />"
 
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (777, 707, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (777, 707, etc.)_01"
 msgstr ""
 ">> ×:T_ARG1(T_ARG2)\n"
 "Please grant user write access (777, 707, etc.)"
 
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (666, 606, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (666, 606, etc.)_01"
 msgstr ""
 ">> ×:T_ARG1(T_ARG2)\n"
@@ -2987 +2987 @@
 msgstr "(No record. Only backup file available.)"
 
-msgid "c_Decompression of backup file failed.\n_01"
+msgid "c_Decompression of backup file failed._01"
 msgstr ""
 "Decompression of backup file failed.\n"
 " "
 
-msgid "c_Decompression source: T_ARG1 \n_01"
+msgid "c_Decompression source: T_ARG1 _01"
 msgstr ""
 "Decompression source: T_ARG1 \n"

branches/version-2_12_3en-p1/data/locales/ja.po

@@ -1903 +1903 @@
 msgstr "既にお気に入りに追加されている商品です"
 
-msgid "c_File decompression failed.\nWrite access may not have been granted to the designated directory._01"
+msgid "c_File decompression failed.Write access may not have been granted to the designated directory._01"
 msgstr ""
 "ファイルの解凍に失敗しました。\n"
@@ -1917 +1917 @@
 msgstr "FTPログインに失敗しました。"
 
-msgid "c_DB creation failed. \nThe user designated by may not have been granted DB creation access._01"
+msgid "c_DB creation failed. The user designated by may not have been granted DB creation access._01"
 msgstr ""
 "DBの作成に失敗しました。\n"
 "指定のユーザーには、DB作成の権限が与えられていない可能性があります。"
 
-msgid "c_Import of the database structure failed. \nThe sql file may be damaged._01"
+msgid "c_Import of the database structure failed. The sql file may be damaged._01"
 msgstr ""
 "データベース構造のインポートに失敗しました。\n"
@@ -1930 +1930 @@
 msgstr "指定のパスに、設定ファイルが存在しません。"
 
-msgid "c_It is not possible to write to the file settings.\nGrant write access to file settings._01"
+msgid "c_It is not possible to write to the file settings.Grant write access to file settings._01"
 msgstr ""
 "設定ファイルに書き込めません。\n"
@@ -1998 +1998 @@
 msgstr "パスワードを変更いたしました。"
 
-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"
+msgid "c_The e-mail address or password is not correct.If you have not completed registration, access the registration page from the URL given to you in an e-mail._01"
 msgstr ""
 "メールアドレスもしくはパスワードが正しくありません。\n"
@@ -2100 +2100 @@
 "員登録をお願いします。"
 
-msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
+msgid "c_The e-mail address or password is not correct.If you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
 msgstr ""
 "メールアドレスもしくはパスワードが正しくありません。\n"
@@ -2187 +2187 @@
 msgstr "×：シーケンスの削除に失敗しました。<br />"
 
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (777, 707, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (777, 707, etc.)_01"
 msgstr ""
 ">> ×：T_ARG1(T_ARG2)\n"
 "ユーザ書込み権限(777, 707等)を付与して下さい。"
 
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (666, 606, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (666, 606, etc.)_01"
 msgstr ""
 ">> ×：T_ARG1(T_ARG2)\n"
@@ -2949 +2949 @@
 msgstr "(記録なし。バックアップファイルのみ。)"
 
-msgid "c_Decompression of backup file failed.\n_01"
+msgid "c_Decompression of backup file failed._01"
 msgstr ""
 "バックアップファイルの展開に失敗しました。\n"
 " "
 
-msgid "c_Decompression source: T_ARG1 \n_01"
+msgid "c_Decompression source: T_ARG1 _01"
 msgstr ""
 "展開元: T_ARG1 \n"

branches/version-2_12_3en-p1/html/install/index.php

@@ -349 +349 @@
                 if (is_dir($path)) {
                     if (!is_writable($path)) {
-                        $mess .= t('c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (777, 707, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
+                        $mess .= t('c_>> ×:T_ARG1(T_ARG2)Please grant user write access (777, 707, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
                         $hasErr = true;
                     } else {
@@ -356 +356 @@
                 } else {
                     if (!is_writable($path)) {
-                        $mess .= t('c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (666, 606, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
+                        $mess .= t('c_>> ×:T_ARG1(T_ARG2)Please grant user write access (666, 606, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
                         $hasErr = true;
                     } else {