MERGE: リビジョン1672から1680にかけて行われた修正のうち、反映されてないものを追加。

[nucleus-jp/nucleus-next.git] / nucleus / locales / en_Latn_US.UTF-8.php

diff --git a/nucleus/locales/en_Latn_US.UTF-8.php b/nucleus/locales/en_Latn_US.UTF-8.php
index 7a36cd7..c0af087 100644 (file)
--- a/nucleus/locales/en_Latn_US.UTF-8.php
+++ b/nucleus/locales/en_Latn_US.UTF-8.php
@@ -4,12 +4,12 @@
 // Author: Wouter Demuynck
 // Nucleus version: v1.0-v3.4
 //
-// Please note: if you want to translate this file to your own locale, be aware
+// Please note: if you want to translate this file to your own translation, be aware
 // that in a next Nucleus version, new variables might be added and some other ones
 // might be deleted. Therefore, it's important to list the Nucleus version for which
 // the file was written in your document.
 //
-// Fully translated file can be sent to us and will be made
+// Fully translated translation file can be sent to us and will be made
 // available for download (with proper credit to the author, of course)
 
 /**
@@ -17,7 +17,7 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
- * @version $Id: english.php 1594 2011-11-01 20:18:32Z ftruscot $
+ * @version $Id: en_Latn_US.UTF-8.php 1678 2012-02-26 07:31:36Z sakamocchi $
  */
 
  /********************************************
@@ -329,43 +329,6 @@ define('_CREATED_NEW_CATEGORY_DESC',                               'New category');
 // ADMIN.php blog settings
 define('_EBLOG_CURRENT_TEAM_MEMBER',                           'Members currently on your team:');
 
-// Language Files
-define('_LANGUAGEFILES_JAPANESE-UTF8',                         'Japanese - 日本語 (UTF-8)');
-define('_LANGUAGEFILES_JAPANESE-EUC',                          'Japanese - 日本語 (EUC)');
-define('_LANGUAGEFILES_JAPANESE-SJIS',                         'Japanese - 日本語 (Shift-JIS)');
-define('_LANGUAGEFILES_ENGLISH-UTF8',                          'English - English (UTF-8)');
-define('_LANGUAGEFILES_ENGLISH',                                       'English - English (iso-8859-1)');
-/*
-define('_LANGUAGEFILES_BULGARIAN',                                     'Bulgarian - Български (iso-8859-5)');
-define('_LANGUAGEFILES_CATALAN',                                       'Catalan - Català (iso-8859-1)');
-define('_LANGUAGEFILES_CHINESE-GBK',                           'Simplified Chinese - 簡体字中文 (gbk)');
-define('_LANGUAGEFILES_SIMCHINESE',                                    'Simplified Chinese - 簡体字中文 (gb2312)');
-define('_LANGUAGEFILES_CHINESE-UTF8',                          'Simplified Chinese - 簡体字中文 (utf-8)');
-define('_LANGUAGEFILES_CHINESEB5',                                     'Tranditional Chinese - 繁体字中文 (big5)');
-define('_LANGUAGEFILES_CHINESEB5-UTF8',                                'Tranditional Chinese - 繁体字中文 (utf-8)');
-define('_LANGUAGEFILES_TRADITIONAL_CHINESE',           'Tranditional Chinese - 繁体字中文 (big5)');
-define('_LANGUAGEFILES_TRADITIONAL_CHINESE-UTF-8',     'Tranditional Chinese - 繁体字中文 (utf-8)');
-define('_LANGUAGEFILES_CZECH',                                         'Czech - Česky (windows-1250)');
-define('_LANGUAGEFILES_FINNISH',                                       'Finnish - Suomi (iso-8859-1)');
-define('_LANGUAGEFILES_FRENCH',                                                'French - Français (iso-8859-1)');
-define('_LANGUAGEFILES_GALEGO',                                                'Galego - Galego (iso-8859-1)');
-define('_LANGUAGEFILES_GERMAN',                                                'German - Deutsch (iso-8859-1)');
-define('_LANGUAGEFILES_HUNGARIAN',                                     'Hungarian - Magyar (iso-8859-2)');
-define('_LANGUAGEFILES_ITALIANO',                                      'Italiano - Italiano (iso-8859-1)');
-define('_LANGUAGEFILES_KOREAN-EUC-KR',                         'Korean - 한국어 (euc-kr)');
-define('_LANGUAGEFILES_KOREAN-UTF',                                    'Korean - 한국어 (utf-8)');
-define('_LANGUAGEFILES_LATVIAN',                                       'Latvian - Latviešu (windows-1257)');
-define('_LANGUAGEFILES_NEDERLANDS',                                    'Duch - Nederlands (iso-8859-15)');
-define('_LANGUAGEFILES_PERSIAN',                                       'Persian - فارسی (utf-8)');
-define('_LANGUAGEFILES_PORTUGUESE_BRAZIL',                     'Portuguese Brazil - Português (iso-8859-1)');
-define('_LANGUAGEFILES_RUSSIAN',                                       'Russian - Русский (windows-1251)');
-define('_LANGUAGEFILES_SLOVAK',                                                'Slovak - Slovenčina (ISO-8859-2)');
-define('_LANGUAGEFILES_SPANISH-UTF8',                          'Spanish - Español (utf-8)');
-define('_LANGUAGEFILES_SPANISH',                                       'Spanish - Español (iso-8859-1)');
-*/
-
-// </add by shizuki>
-
 /********************************************
  *        End New for 3.40                  *
  ********************************************/
@@ -957,7 +920,7 @@ define('_ERROR_UPLOADDUPLICATE',    'Another file with that name already exists. Tr
 define('_ERROR_LOGINDISALLOWED',       'Sorry, you\'re not allowed to log in to the admin area. You can log in as another user, though');
 define('_ERROR_DBCONNECT',                     'Could not connect to mySQL server');
 define('_ERROR_DBSELECT',                      'Could not select the nucleus database.');
-define('_ERROR_NOSUCHTRANSLATION',             'No such translation file exists');
+define('_ERROR_NOSUCHLANGUAGE',                'No such translation file exists');
 define('_ERROR_NOSUCHCATEGORY',                'No such category exists');
 define('_ERROR_DELETELASTCATEGORY',    'There must at least be one category');
 define('_ERROR_DELETEDEFCATEGORY',     'Cannot delete default category');
@@ -1158,7 +1121,7 @@ define('_SETTINGS_ALLOWCREATE',           'Allow Visitors to Create a Member Account');
 define('_SETTINGS_NEWLOGIN',           'Login Allowed for User-Created accounts');
 define('_SETTINGS_NEWLOGIN2',          '(only goes for newly created accounts)');
 define('_SETTINGS_MEMBERMSGS',         'Allow Member-2-Member Service');
-define('_SETTINGS_LOCALE',             'Default Language');
+define('_SETTINGS_LANGUAGE',           'Default Language');
 define('_SETTINGS_DISABLESITE',                'Disable Site');
 define('_SETTINGS_DBLOGIN',                    'mySQL Login &amp; Database');
 define('_SETTINGS_UPDATE',                     'Update Settings');