Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10051] XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba
|
From: <be...@us...> - 2012-08-11 09:33:34
|
Revision: 10051
http://xoops.svn.sourceforge.net/xoops/?rev=10051&view=rev
Author: beckmi
Date: 2012-08-11 09:33:27 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Removing spaces from "define", which is required for Transifex per DCrusader
Modified Paths:
--------------
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/extras/altsys_functions.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/xoopseditor/dhtmltextarea/language/english.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/include/defines.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/createconfigform.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/language/english/install.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/admin.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/global.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/class/protector.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_httpbl.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_redirection.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/postcheck.inc.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck.inc.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck_functions.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/language/english/admin.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/cnt-2.2.x-to-2.3.0/language/english.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/language/english/upgrade.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/index.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/language/english.php
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/extras/altsys_functions.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/extras/altsys_functions.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/extras/altsys_functions.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -58,11 +58,11 @@
}
-define( 'ALTSYS_CORE_TYPE_X20' , 1 ) ; // 2.0.0-2.0.13 and 2.0.x-JP
-define( 'ALTSYS_CORE_TYPE_X20S' , 2 ) ; // 2.0.14- from xoops.org Skalpa's "S"
-define( 'ALTSYS_CORE_TYPE_ORE' , 4 ) ; // ORETEKI by marijuana
-define( 'ALTSYS_CORE_TYPE_X22' , 8 ) ; // 2.2 from xoops.org
-define( 'ALTSYS_CORE_TYPE_XC21L' , 16 ) ; // XOOPS Cube 2.1 Legacy
+define('ALTSYS_CORE_TYPE_X20' , 1 ) ; // 2.0.0-2.0.13 and 2.0.x-JP
+define('ALTSYS_CORE_TYPE_X20S' , 2 ) ; // 2.0.14- from xoops.org Skalpa's "S"
+define('ALTSYS_CORE_TYPE_ORE' , 4 ) ; // ORETEKI by marijuana
+define('ALTSYS_CORE_TYPE_X22' , 8 ) ; // 2.2 from xoops.org
+define('ALTSYS_CORE_TYPE_XC21L' , 16 ) ; // XOOPS Cube 2.1 Legacy
function altsys_get_core_type()
{
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/xoopseditor/dhtmltextarea/language/english.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/xoopseditor/dhtmltextarea/language/english.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/xoopseditor/dhtmltextarea/language/english.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -12,6 +12,6 @@
/**
* Assocated with editor_registry.php
*/
-define( '_XOOPS_EDITOR_DHTMLTEXTAREA', 'DHTML Form with xCode' );
+define('_XOOPS_EDITOR_DHTMLTEXTAREA', 'DHTML Form with xCode' );
?>
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/include/defines.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/include/defines.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/include/defines.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -63,7 +63,7 @@
* User Mulitbytes
*/
// if ( !defined( 'XOOPS_USE_MULTIBYTES' ) ) {
-// define( 'XOOPS_USE_MULTIBYTES', 0 );
+// define('XOOPS_USE_MULTIBYTES', 0 );
// }
// IT IS A WRONG PLACE FOR THE FOLLOWING CONSTANTS
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/createconfigform.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/createconfigform.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/createconfigform.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -20,14 +20,14 @@
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-define( "PREF_1", _MD_AM_GENERAL);
-define( "PREF_2", _MD_AM_USERSETTINGS);
-define( "PREF_3", _MD_AM_METAFOOTER);
-define( "PREF_4", _MD_AM_CENSOR);
-define( "PREF_5", _MD_AM_SEARCH);
-define( "PREF_6", _MD_AM_MAILER);
+define("PREF_1", _MD_AM_GENERAL);
+define("PREF_2", _MD_AM_USERSETTINGS);
+define("PREF_3", _MD_AM_METAFOOTER);
+define("PREF_4", _MD_AM_CENSOR);
+define("PREF_5", _MD_AM_SEARCH);
+define("PREF_6", _MD_AM_MAILER);
if (defined("_MD_AM_AUTHENTICATION")) {
- define( "PREF_7", _MD_AM_AUTHENTICATION);
+ define("PREF_7", _MD_AM_AUTHENTICATION);
}
function createConfigform( $config )
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/language/english/install.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/language/english/install.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/language/english/install.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -18,199 +18,199 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-define( "SHOW_HIDE_HELP", "Show/hide help text" );
+define("SHOW_HIDE_HELP", "Show/hide help text" );
// License
define('LICENSE_NOT_WRITEABLE', 'License is %s . <br/><font style="colour:#ff0000">Make ../include/license.php Writable</font>');
define('LICENSE_IS_WRITEABLE', 'License is %s');
// Configuration check page
-define( "SERVER_API", "Server API" );
-define( "PHP_EXTENSION", "%s extension" );
-define( "CHAR_ENCODING", "Character encoding" );
-define( "XML_PARSING", "XML parsing" );
-define( "REQUIREMENTS", "Requirements" );
-define( "_PHP_VERSION", "PHP version" );
-define( "RECOMMENDED_SETTINGS", "Recommended settings" );
-define( "RECOMMENDED_EXTENSIONS", "Recommended extensions" );
-define( "SETTING_NAME", "Setting name" );
-define( "RECOMMENDED", "Recommended" );
-define( "CURRENT", "Current" );
-define( "RECOMMENDED_EXTENSIONS_MSG", "These extensions are not required for normal use, but may be necessary to explore
+define("SERVER_API", "Server API" );
+define("PHP_EXTENSION", "%s extension" );
+define("CHAR_ENCODING", "Character encoding" );
+define("XML_PARSING", "XML parsing" );
+define("REQUIREMENTS", "Requirements" );
+define("_PHP_VERSION", "PHP version" );
+define("RECOMMENDED_SETTINGS", "Recommended settings" );
+define("RECOMMENDED_EXTENSIONS", "Recommended extensions" );
+define("SETTING_NAME", "Setting name" );
+define("RECOMMENDED", "Recommended" );
+define("CURRENT", "Current" );
+define("RECOMMENDED_EXTENSIONS_MSG", "These extensions are not required for normal use, but may be necessary to explore
some specific features (like the multi-language or RSS support). Thus, it is recommended to have them installed." );
-define( "NONE", "None" );
-define( "SUCCESS", "Success" );
-define( "WARNING", "Warning" );
-define( "FAILED", "Failed" );
+define("NONE", "None" );
+define("SUCCESS", "Success" );
+define("WARNING", "Warning" );
+define("FAILED", "Failed" );
// Titles (main and pages)
-define( "XOOPS_INSTALL_WIZARD", "XOOPS Installation Wizard" );
+define("XOOPS_INSTALL_WIZARD", "XOOPS Installation Wizard" );
-define( "LANGUAGE_SELECTION", "Language selection" );
-define( "LANGUAGE_SELECTION_TITLE", "Select your language"); // L128
-define( "INTRODUCTION", "Introduction" );
-define( "INTRODUCTION_TITLE", "Welcome to the XOOPS Installation Wizard" ); // L0
-define( "CONFIGURATION_CHECK", "Configuration check" );
-define( "CONFIGURATION_CHECK_TITLE", "Checking your server configuration" );
-define( "PATHS_SETTINGS", "Paths settings" );
-define( "PATHS_SETTINGS_TITLE", "Paths settings" );
-define( "DATABASE_CONNECTION", "Database connection" );
-define( "DATABASE_CONNECTION_TITLE", "Database connection" );
-define( "DATABASE_CONFIG", "Database configuration" );
-define( "DATABASE_CONFIG_TITLE", "Database configuration" );
-define( "CONFIG_SAVE", "Save Configuration" );
-define( "CONFIG_SAVE_TITLE", "Saving your system configuration" );
-define( "TABLES_CREATION", "Tables creation" );
-define( "TABLES_CREATION_TITLE", "Database tables creation" );
-define( "INITIAL_SETTINGS", "Initial settings" );
-define( "INITIAL_SETTINGS_TITLE", "Please enter your initial settings" );
-define( "DATA_INSERTION", "Data insertion" );
-define( "DATA_INSERTION_TITLE", "Saving your settings to the database" );
-define( "WELCOME", "Welcome" );
-define( "WELCOME_TITLE", "Welcome to your XOOPS site" ); // L0
+define("LANGUAGE_SELECTION", "Language selection" );
+define("LANGUAGE_SELECTION_TITLE", "Select your language"); // L128
+define("INTRODUCTION", "Introduction" );
+define("INTRODUCTION_TITLE", "Welcome to the XOOPS Installation Wizard" ); // L0
+define("CONFIGURATION_CHECK", "Configuration check" );
+define("CONFIGURATION_CHECK_TITLE", "Checking your server configuration" );
+define("PATHS_SETTINGS", "Paths settings" );
+define("PATHS_SETTINGS_TITLE", "Paths settings" );
+define("DATABASE_CONNECTION", "Database connection" );
+define("DATABASE_CONNECTION_TITLE", "Database connection" );
+define("DATABASE_CONFIG", "Database configuration" );
+define("DATABASE_CONFIG_TITLE", "Database configuration" );
+define("CONFIG_SAVE", "Save Configuration" );
+define("CONFIG_SAVE_TITLE", "Saving your system configuration" );
+define("TABLES_CREATION", "Tables creation" );
+define("TABLES_CREATION_TITLE", "Database tables creation" );
+define("INITIAL_SETTINGS", "Initial settings" );
+define("INITIAL_SETTINGS_TITLE", "Please enter your initial settings" );
+define("DATA_INSERTION", "Data insertion" );
+define("DATA_INSERTION_TITLE", "Saving your settings to the database" );
+define("WELCOME", "Welcome" );
+define("WELCOME_TITLE", "Welcome to your XOOPS site" ); // L0
// Settings (labels and help text)
-define( "XOOPS_PATHS", "XOOPS Physical paths" );
-define( "XOOPS_URLS", "Web locations" );
+define("XOOPS_PATHS", "XOOPS Physical paths" );
+define("XOOPS_URLS", "Web locations" );
-define( "XOOPS_ROOT_PATH_LABEL", "XOOPS documents root physical path" );
-define( "XOOPS_ROOT_PATH_HELP", "Physical path to the XOOPS documents (served) directory WITHOUT trailing slash" );
+define("XOOPS_ROOT_PATH_LABEL", "XOOPS documents root physical path" );
+define("XOOPS_ROOT_PATH_HELP", "Physical path to the XOOPS documents (served) directory WITHOUT trailing slash" );
-define( "XOOPS_LIB_PATH_LABEL", "XOOPS library directory" );
-define( "XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
-define( "XOOPS_DATA_PATH_LABEL", "XOOPS data files directory" );
-define( "XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS data files (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure." );
+define("XOOPS_LIB_PATH_LABEL", "XOOPS library directory" );
+define("XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
+define("XOOPS_DATA_PATH_LABEL", "XOOPS data files directory" );
+define("XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS data files (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure." );
-define( "XOOPS_URL_LABEL", "Website location (URL)" ); // L56
-define( "XOOPS_URL_HELP", "Main URL that will be used to access your XOOPS installation" ); // L58
+define("XOOPS_URL_LABEL", "Website location (URL)" ); // L56
+define("XOOPS_URL_HELP", "Main URL that will be used to access your XOOPS installation" ); // L58
-define( "LEGEND_CONNECTION", "Server connection" );
-define( "LEGEND_DATABASE", "Database" ); // L51
+define("LEGEND_CONNECTION", "Server connection" );
+define("LEGEND_DATABASE", "Database" ); // L51
-define( "DB_HOST_LABEL", "Server hostname" ); // L27
-define( "DB_HOST_HELP", "Hostname of the database server. If you are unsure, <em>localhost</em> works in most cases"); // L67
-define( "DB_USER_LABEL", "User name" ); // L28
-define( "DB_USER_HELP", "Name of the user account that will be used to connect to the database server"); // L65
-define( "DB_PASS_LABEL", "Password" ); // L52
-define( "DB_PASS_HELP", "Password of your database user account"); // L68
-define( "DB_NAME_LABEL", "Database name" ); // L29
-define( "DB_NAME_HELP", "The name of database on the host. The installer will attempt to create the database if not exist"); // L64
-define( "DB_CHARSET_LABEL", "Database character set" );
-define( "DB_CHARSET_HELP", "MySQL includes character set support that enables you to store data using a variety of character sets and perform comparisons according to a variety of collations.");
-define( "DB_COLLATION_LABEL", "Database collation" );
-define( "DB_COLLATION_HELP", "A collation is a set of rules for comparing characters in a character set.");
-define( "DB_PREFIX_LABEL", "Table prefix" ); // L30
-define( "DB_PREFIX_HELP", "This prefix will be added to all new tables created to avoid name conflicts in the database. If you are unsure, just keep the default"); // L63
-define( "DB_PCONNECT_LABEL", "Use persistent connection" ); // L54
-define( "DB_PCONNECT_HELP", "Default is 'No'. Leave it blank if you are unsure"); // L69
-define( "DB_DATABASE_LABEL", "Database" );
+define("DB_HOST_LABEL", "Server hostname" ); // L27
+define("DB_HOST_HELP", "Hostname of the database server. If you are unsure, <em>localhost</em> works in most cases"); // L67
+define("DB_USER_LABEL", "User name" ); // L28
+define("DB_USER_HELP", "Name of the user account that will be used to connect to the database server"); // L65
+define("DB_PASS_LABEL", "Password" ); // L52
+define("DB_PASS_HELP", "Password of your database user account"); // L68
+define("DB_NAME_LABEL", "Database name" ); // L29
+define("DB_NAME_HELP", "The name of database on the host. The installer will attempt to create the database if not exist"); // L64
+define("DB_CHARSET_LABEL", "Database character set" );
+define("DB_CHARSET_HELP", "MySQL includes character set support that enables you to store data using a variety of character sets and perform comparisons according to a variety of collations.");
+define("DB_COLLATION_LABEL", "Database collation" );
+define("DB_COLLATION_HELP", "A collation is a set of rules for comparing characters in a character set.");
+define("DB_PREFIX_LABEL", "Table prefix" ); // L30
+define("DB_PREFIX_HELP", "This prefix will be added to all new tables created to avoid name conflicts in the database. If you are unsure, just keep the default"); // L63
+define("DB_PCONNECT_LABEL", "Use persistent connection" ); // L54
+define("DB_PCONNECT_HELP", "Default is 'No'. Leave it blank if you are unsure"); // L69
+define("DB_DATABASE_LABEL", "Database" );
-define( "LEGEND_ADMIN_ACCOUNT", "Administrator account" );
-define( "ADMIN_LOGIN_LABEL", "Admin login" ); // L37
-define( "ADMIN_EMAIL_LABEL", "Admin e-mail" ); // L38
-define( "ADMIN_PASS_LABEL", "Admin password" ); // L39
-define( "ADMIN_CONFIRMPASS_LABEL", "Confirm password" ); // L74
+define("LEGEND_ADMIN_ACCOUNT", "Administrator account" );
+define("ADMIN_LOGIN_LABEL", "Admin login" ); // L37
+define("ADMIN_EMAIL_LABEL", "Admin e-mail" ); // L38
+define("ADMIN_PASS_LABEL", "Admin password" ); // L39
+define("ADMIN_CONFIRMPASS_LABEL", "Confirm password" ); // L74
// Buttons
-define( "BUTTON_PREVIOUS", "Previous" ); // L42
-define( "BUTTON_NEXT", "Next" ); // L47
+define("BUTTON_PREVIOUS", "Previous" ); // L42
+define("BUTTON_NEXT", "Next" ); // L47
// Messages
-define( "XOOPS_FOUND", "%s found" );
-define( "CHECKING_PERMISSIONS", "Checking file and directory permissions..." ); // L82
-define( "IS_NOT_WRITABLE", "%s is NOT writable." ); // L83
-define( "IS_WRITABLE", "%s is writable." ); // L84
+define("XOOPS_FOUND", "%s found" );
+define("CHECKING_PERMISSIONS", "Checking file and directory permissions..." ); // L82
+define("IS_NOT_WRITABLE", "%s is NOT writable." ); // L83
+define("IS_WRITABLE", "%s is writable." ); // L84
-define( "XOOPS_PATH_FOUND", "Path found." );
+define("XOOPS_PATH_FOUND", "Path found." );
-define( "READY_CREATE_TABLES", "No XOOPS tables were detected.<br />The installer is now ready to create the XOOPS system tables.<br />Press <em>next</em> to proceed." );
-define( "XOOPS_TABLES_FOUND", "The XOOPS system tables already exists in your database.<br />Press <em>next</em> to go to the next step." ); // L131
-define( "XOOPS_TABLES_CREATED", "XOOPS system tables have been created.<br />Press <em>next</em> to go to the next step." );
-define( "READY_INSERT_DATA", "The installer is now ready to insert initial data into your database." );
-define( "READY_SAVE_MAINFILE", "The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed." );
-define( "SAVED_MAINFILE", "Settings saved in mainfile.php" );
-define( "SAVED_MAINFILE_MSG", "The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step." );
-define( "DATA_ALREADY_INSERTED", "XOOPS data found in database.<br />Press <em>next</em> to go to the next step." );
-define( "DATA_INSERTED", "Initial data has been inserted into database.<br />Press <em>next</em> to go to the next step." );
+define("READY_CREATE_TABLES", "No XOOPS tables were detected.<br />The installer is now ready to create the XOOPS system tables.<br />Press <em>next</em> to proceed." );
+define("XOOPS_TABLES_FOUND", "The XOOPS system tables already exists in your database.<br />Press <em>next</em> to go to the next step." ); // L131
+define("XOOPS_TABLES_CREATED", "XOOPS system tables have been created.<br />Press <em>next</em> to go to the next step." );
+define("READY_INSERT_DATA", "The installer is now ready to insert initial data into your database." );
+define("READY_SAVE_MAINFILE", "The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed." );
+define("SAVED_MAINFILE", "Settings saved in mainfile.php" );
+define("SAVED_MAINFILE_MSG", "The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step." );
+define("DATA_ALREADY_INSERTED", "XOOPS data found in database.<br />Press <em>next</em> to go to the next step." );
+define("DATA_INSERTED", "Initial data has been inserted into database.<br />Press <em>next</em> to go to the next step." );
// %s is database name
-define( "DATABASE_CREATED", "Database %s created!" ); // L43
+define("DATABASE_CREATED", "Database %s created!" ); // L43
// %s is table name
-define( "TABLE_NOT_CREATED", "Unable to create table %s" ); // L118
-define( "TABLE_CREATED", "Table %s created." ); // L45
-define( "ROWS_INSERTED", "%d entries inserted to table %s." ); // L119
-define( "ROWS_FAILED", "Failed inserting %d entries to table %s." ); // L120
-define( "TABLE_ALTERED", "Table %s updated."); // L133
-define( "TABLE_NOT_ALTERED", "Failed updating table %s."); // L134
-define( "TABLE_DROPPED", "Table %s dropped."); // L163
-define( "TABLE_NOT_DROPPED", "Failed deleting table %s."); // L164
+define("TABLE_NOT_CREATED", "Unable to create table %s" ); // L118
+define("TABLE_CREATED", "Table %s created." ); // L45
+define("ROWS_INSERTED", "%d entries inserted to table %s." ); // L119
+define("ROWS_FAILED", "Failed inserting %d entries to table %s." ); // L120
+define("TABLE_ALTERED", "Table %s updated."); // L133
+define("TABLE_NOT_ALTERED", "Failed updating table %s."); // L134
+define("TABLE_DROPPED", "Table %s dropped."); // L163
+define("TABLE_NOT_DROPPED", "Failed deleting table %s."); // L164
// Error messages
-define( "ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server." );
-define( "ERR_NO_XOOPS_FOUND", "No XOOPS installation could be found in the specified folder." );
-define( "ERR_INVALID_EMAIL", "Invalid Email" ); // L73
-define( "ERR_REQUIRED", "Information is required." ); // L41
-define( "ERR_PASSWORD_MATCH", "The two passwords do not match" );
-define( "ERR_NEED_WRITE_ACCESS", "The server must be given write access to the following files and folders<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)<br />If they are not available or not created correctly, please create manually and set proper permissions." );
-define( "ERR_NO_DATABASE", "Could not create database. Contact the server administrator for details." ); // L31
-define( "ERR_NO_DBCONNECTION", "Could not connect to the database server." ); // L106
-define( "ERR_WRITING_CONSTANT", "Failed writing constant %s." ); // L122
+define("ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server." );
+define("ERR_NO_XOOPS_FOUND", "No XOOPS installation could be found in the specified folder." );
+define("ERR_INVALID_EMAIL", "Invalid Email" ); // L73
+define("ERR_REQUIRED", "Information is required." ); // L41
+define("ERR_PASSWORD_MATCH", "The two passwords do not match" );
+define("ERR_NEED_WRITE_ACCESS", "The server must be given write access to the following files and folders<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)<br />If they are not available or not created correctly, please create manually and set proper permissions." );
+define("ERR_NO_DATABASE", "Could not create database. Contact the server administrator for details." ); // L31
+define("ERR_NO_DBCONNECTION", "Could not connect to the database server." ); // L106
+define("ERR_WRITING_CONSTANT", "Failed writing constant %s." ); // L122
-define( "ERR_COPY_MAINFILE", "Could not copy the distribution file to mainfile.php" );
-define( "ERR_WRITE_MAINFILE", "Could not write into mainfile.php. Please check the file permission and try again.");
-define( "ERR_READ_MAINFILE", "Could not open mainfile.php for reading" );
+define("ERR_COPY_MAINFILE", "Could not copy the distribution file to mainfile.php" );
+define("ERR_WRITE_MAINFILE", "Could not write into mainfile.php. Please check the file permission and try again.");
+define("ERR_READ_MAINFILE", "Could not open mainfile.php for reading" );
-define( "ERR_INVALID_DBCHARSET", "The charset '%s' is not supported." );
-define( "ERR_INVALID_DBCOLLATION", "The collation '%s' is not supported." );
-define( "ERR_CHARSET_NOT_SET", "Default character set is not set for XOOPS database." );
+define("ERR_INVALID_DBCHARSET", "The charset '%s' is not supported." );
+define("ERR_INVALID_DBCOLLATION", "The collation '%s' is not supported." );
+define("ERR_CHARSET_NOT_SET", "Default character set is not set for XOOPS database." );
define("_INSTALL_CHARSET", "UTF-8");
-define( "SUPPORT", "Supports");
+define("SUPPORT", "Supports");
-define( "LOGIN", "Authentication");
-define( "LOGIN_TITLE", "Authentication");
-define( "USER_LOGIN", "Administrator Login" );
-define( "USERNAME", "Username :");
-define( "PASSWORD", "Password :");
+define("LOGIN", "Authentication");
+define("LOGIN_TITLE", "Authentication");
+define("USER_LOGIN", "Administrator Login" );
+define("USERNAME", "Username :");
+define("PASSWORD", "Password :");
-define( "ICONV_CONVERSION", "Character set conversion");
-define( "ZLIB_COMPRESSION", "Zlib Compression");
-define( "IMAGE_FUNCTIONS", "Image functions");
-define( "IMAGE_METAS", "Image meta data (exif)");
-define( "FILTER_FUNCTIONS", "Filter functions");
+define("ICONV_CONVERSION", "Character set conversion");
+define("ZLIB_COMPRESSION", "Zlib Compression");
+define("IMAGE_FUNCTIONS", "Image functions");
+define("IMAGE_METAS", "Image meta data (exif)");
+define("FILTER_FUNCTIONS", "Filter functions");
-define( "ADMIN_EXIST", "The administrator account already exists.<br />Press <strong>next</strong> to go to the next step.");
+define("ADMIN_EXIST", "The administrator account already exists.<br />Press <strong>next</strong> to go to the next step.");
-define( "CONFIG_SITE", "Site configuration" );
-define( "CONFIG_SITE_TITLE", "Site configuration" );
-define( "MODULES", "Modules installation" );
-define( "MODULES_TITLE", "Modules installation" );
-define( "THEME", "Select theme" );
-define( "THEME_TITLE", "Select the default theme" );
+define("CONFIG_SITE", "Site configuration" );
+define("CONFIG_SITE_TITLE", "Site configuration" );
+define("MODULES", "Modules installation" );
+define("MODULES_TITLE", "Modules installation" );
+define("THEME", "Select theme" );
+define("THEME_TITLE", "Select the default theme" );
-define( "INSTALLED_MODULES", "The following modules have been installed.<br />Press <strong>next</strong> to go to the next step.");
-define( "NO_MODULES_FOUND", "No modules found.<br />Press <strong>next</strong> to go to the next step.");
-define( "NO_INSTALLED_MODULES", "No module installed.<br />Press <strong>next</strong> to go to the next step.");
+define("INSTALLED_MODULES", "The following modules have been installed.<br />Press <strong>next</strong> to go to the next step.");
+define("NO_MODULES_FOUND", "No modules found.<br />Press <strong>next</strong> to go to the next step.");
+define("NO_INSTALLED_MODULES", "No module installed.<br />Press <strong>next</strong> to go to the next step.");
-define( "THEME_NO_SCREENSHOT", "No screenshot found");
+define("THEME_NO_SCREENSHOT", "No screenshot found");
-define( "IS_VALOR", " => ");
+define("IS_VALOR", " => ");
// password message
-define( "PASSWORD_LABEL", "Password strength : ");
-define( "PASSWORD_DESC", "Password not entered");
-define( "PASSWORD_GENERATOR", "Password generator");
-define( "PASSWORD_GENERATE", "Generate");
-define( "PASSWORD_COPY", "Copy");
+define("PASSWORD_LABEL", "Password strength : ");
+define("PASSWORD_DESC", "Password not entered");
+define("PASSWORD_GENERATOR", "Password generator");
+define("PASSWORD_GENERATE", "Generate");
+define("PASSWORD_COPY", "Copy");
-define( "PASSWORD_VERY_WEAK", "Very Weak");
-define( "PASSWORD_WEAK", "Weak");
-define( "PASSWORD_BETTER", "Better");
-define( "PASSWORD_MEDIUM", "Medium");
-define( "PASSWORD_STRONG", "Strong");
-define( "PASSWORD_STRONGEST", "Strongest");
+define("PASSWORD_VERY_WEAK", "Very Weak");
+define("PASSWORD_WEAK", "Weak");
+define("PASSWORD_BETTER", "Better");
+define("PASSWORD_MEDIUM", "Medium");
+define("PASSWORD_STRONG", "Strong");
+define("PASSWORD_STRONGEST", "Strongest");
?>
\ No newline at end of file
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/admin.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/admin.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/admin.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -13,7 +13,7 @@
define('_AD_EMAIL', 'Email');
define('_AD_AVATAR', 'Avatar');
define('_AD_REGISTERED', 'Registered'); //Registered Date
-// define( '_AD_PRESSGEN', 'This is your first time to enter the administration section. Press the button below to proceed.' );
+// define('_AD_PRESSGEN', 'This is your first time to enter the administration section. Press the button below to proceed.' );
define('_AD_LOGINADMIN', 'Loging you in..');
define('_AD_WARNINGINSTALL', 'WARNING: Directory %s exists on your server. <br />Please remove this directory for security reasons.');
define('_AD_WARNINGWRITEABLE', 'WARNING: File %s is writeable by the server. <br />Please change the permission of this file for security reasons.<br /> in Unix (444), in Win32 (read-only)');
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/global.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/global.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/language/english/global.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -108,8 +108,8 @@
define("_MD_STRTYOPENG","This can not be changed afterwards!");
define("_MD_ASFILE","Store as files (in uploads directory)");
define("_MD_INDB","Store in the database (as binary \"blob\" data)");
-define ("_MD_IMGMAIN","Category");
-define ("_MD_EDITIMGCAT", "Images Settings");
+define("_MD_IMGMAIN","Category");
+define("_MD_EDITIMGCAT", "Images Settings");
define('_IMGMANAGER', 'Image Manager');
define('_NUMIMAGES', '%s images');
define('_ADDIMAGE', 'Add Image File');
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/class/protector.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/class/protector.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/class/protector.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -468,7 +468,7 @@
}
if( ! empty( $this->_dblayertrap_doubtfuls ) || $force_override ) {
- @define( 'XOOPS_DB_ALTERNATIVE' , 'ProtectorMysqlDatabase' ) ;
+ @define('XOOPS_DB_ALTERNATIVE' , 'ProtectorMysqlDatabase' ) ;
require_once dirname(dirname(__FILE__)).'/class/ProtectorMysqlDatabase.class.php' ;
}
}
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_httpbl.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_httpbl.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_httpbl.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -1,7 +1,7 @@
<?php
// get your 12-character access key from http://www.projecthoneypot.org/
-define( 'PROTECTOR_HTTPBL_KEY' , '............' ) ;
+define('PROTECTOR_HTTPBL_KEY' , '............' ) ;
class protector_postcommon_post_deny_by_httpbl extends ProtectorFilterAbstract {
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -1,6 +1,6 @@
<?php
-define( 'PROTECTOR_POSTCOMMON_POST_REGISTER_MORATORIUM' , 60 ) ; // minutes
+define('PROTECTOR_POSTCOMMON_POST_REGISTER_MORATORIUM' , 60 ) ; // minutes
class protector_postcommon_post_register_moratorium extends ProtectorFilterAbstract {
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_redirection.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_redirection.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_redirection.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -2,7 +2,7 @@
// define it as you like :-)
-define( 'PROTECTOR_BADIP_REDIRECTION_URI' , 'http://yahoo.com/' ) ;
+define('PROTECTOR_BADIP_REDIRECTION_URI' , 'http://yahoo.com/' ) ;
class protector_precommon_badip_redirection extends ProtectorFilterAbstract {
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/postcheck.inc.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/postcheck.inc.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/postcheck.inc.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -7,7 +7,7 @@
return ;
}
-define( 'PROTECTOR_POSTCHECK_INCLUDED' , 1 ) ;
+define('PROTECTOR_POSTCHECK_INCLUDED' , 1 ) ;
if( ! class_exists( 'Database' ) ) return ;
protector_postcommon() ;
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck.inc.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck.inc.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck.inc.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -7,8 +7,8 @@
return ;
}
-define( 'PROTECTOR_PRECHECK_INCLUDED' , 1 ) ;
-define( 'PROTECTOR_VERSION' , file_get_contents( dirname(__FILE__).'/version.txt' ) ) ;
+define('PROTECTOR_PRECHECK_INCLUDED' , 1 ) ;
+define('PROTECTOR_VERSION' , file_get_contents( dirname(__FILE__).'/version.txt' ) ) ;
// set $_SERVER['REQUEST_URI'] for IIS
if ( empty( $_SERVER[ 'REQUEST_URI' ] ) ) { // Not defined by IIS
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck_functions.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck_functions.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/include/precheck_functions.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -49,13 +49,13 @@
$force_override = strstr( @$_SERVER['REQUEST_URI'] , 'protector/admin/index.php?page=advisory' ) ? true : false ;
// $force_override = true ;
if( $force_override || ! empty( $conf['enable_dblayertrap'] ) ) {
- @define( 'PROTECTOR_ENABLED_ANTI_SQL_INJECTION' , 1 ) ;
+ @define('PROTECTOR_ENABLED_ANTI_SQL_INJECTION' , 1 ) ;
$protector->dblayertrap_init( $force_override ) ;
}
// "Big Umbrella" subset version
if( ! empty( $conf['enable_bigumbrella'] ) ) {
- @define( 'PROTECTOR_ENABLED_ANTI_XSS' , 1 ) ;
+ @define('PROTECTOR_ENABLED_ANTI_XSS' , 1 ) ;
$protector->bigumbrella_init() ;
}
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/language/english/admin.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/language/english/admin.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/xoops_lib/modules/protector/language/english/admin.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -13,31 +13,31 @@
define("_AM_TH_TYPE","Type");
define("_AM_TH_DESCRIPTION","Description");
-define( "_AM_TH_BADIPS" , 'Bad IPs<br /><br /><span style="font-weight:normal;">Write each IP a line<br />blank means all IPs are allowed</span>');
+define("_AM_TH_BADIPS" , 'Bad IPs<br /><br /><span style="font-weight:normal;">Write each IP a line<br />blank means all IPs are allowed</span>');
-define( "_AM_TH_GROUP1IPS" , 'Allowed IPs for Group=1<br /><br /><span style="font-weight:normal;">Write each IP a line.<br />192.168. means 192.168.*<br />blank means all IPs are allowed</span>');
+define("_AM_TH_GROUP1IPS" , 'Allowed IPs for Group=1<br /><br /><span style="font-weight:normal;">Write each IP a line.<br />192.168. means 192.168.*<br />blank means all IPs are allowed</span>');
-define( "_AM_LABEL_COMPACTLOG" , "Compact log");
-define( "_AM_BUTTON_COMPACTLOG" , "Compact it!");
-define( "_AM_JS_COMPACTLOGCONFIRM" , "Duplicated (IP,Type) records will be removed");
-define( "_AM_LABEL_REMOVEALL" , "Remove all records");
-define( "_AM_BUTTON_REMOVEALL" , "Remove all!");
-define( "_AM_JS_REMOVEALLCONFIRM" , "All logs are removed absolutely. Are you really OK?");
-define( "_AM_LABEL_REMOVE" , "Remove the records checked:");
-define( "_AM_BUTTON_REMOVE" , "Remove!");
-define( "_AM_JS_REMOVECONFIRM" , "Remove OK?");
-define( "_AM_MSG_IPFILESUPDATED" , "Files for IPs have been updated");
-define( "_AM_MSG_BADIPSCANTOPEN" , "The file for badip cannot be opened");
-define( "_AM_MSG_GROUP1IPSCANTOPEN" , "The file for allowing group=1 cannot be opened");
-define( "_AM_MSG_REMOVED" , "Records are removed");
-define( "_AM_FMT_CONFIGSNOTWRITABLE" , "Turn the configs directory writable: %s");
+define("_AM_LABEL_COMPACTLOG" , "Compact log");
+define("_AM_BUTTON_COMPACTLOG" , "Compact it!");
+define("_AM_JS_COMPACTLOGCONFIRM" , "Duplicated (IP,Type) records will be removed");
+define("_AM_LABEL_REMOVEALL" , "Remove all records");
+define("_AM_BUTTON_REMOVEALL" , "Remove all!");
+define("_AM_JS_REMOVEALLCONFIRM" , "All logs are removed absolutely. Are you really OK?");
+define("_AM_LABEL_REMOVE" , "Remove the records checked:");
+define("_AM_BUTTON_REMOVE" , "Remove!");
+define("_AM_JS_REMOVECONFIRM" , "Remove OK?");
+define("_AM_MSG_IPFILESUPDATED" , "Files for IPs have been updated");
+define("_AM_MSG_BADIPSCANTOPEN" , "The file for badip cannot be opened");
+define("_AM_MSG_GROUP1IPSCANTOPEN" , "The file for allowing group=1 cannot be opened");
+define("_AM_MSG_REMOVED" , "Records are removed");
+define("_AM_FMT_CONFIGSNOTWRITABLE" , "Turn the configs directory writable: %s");
// prefix_manager.php
-define( "_AM_H3_PREFIXMAN" , "Prefix Manager");
-define( "_AM_MSG_DBUPDATED" , "Database Updated Successfully!");
-define( "_AM_CONFIRM_DELETE" , "All data will be dropped. OK?");
-define( "_AM_TXT_HOWTOCHANGEDB" , "If you want to change prefix,<br /> edit %s/mainfile.php manually.<br /><br />define('XOOPS_DB_PREFIX', '<b>%s</b>');");
+define("_AM_H3_PREFIXMAN" , "Prefix Manager");
+define("_AM_MSG_DBUPDATED" , "Database Updated Successfully!");
+define("_AM_CONFIRM_DELETE" , "All data will be dropped. OK?");
+define("_AM_TXT_HOWTOCHANGEDB" , "If you want to change prefix,<br /> edit %s/mainfile.php manually.<br /><br />define('XOOPS_DB_PREFIX', '<b>%s</b>');");
// advisory.php
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/cnt-2.2.x-to-2.3.0/language/english.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/cnt-2.2.x-to-2.3.0/language/english.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/cnt-2.2.x-to-2.3.0/language/english.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -4,7 +4,7 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-define( "_CONFIRM_UPGRADE_220", "
+define("_CONFIRM_UPGRADE_220", "
The upgrade scripts will migrate data from existent 'profile' module.<br />
Please don't uninstall the existent 'profile' module manually, otherwise corresponding data won't be migrated.<br /><br />
Once the upgrade process is fully completed please <strong>go to module administration area to update 'profile' module</strong>. Once this is done, profile data will be migrated completely.<br /><br />
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/language/english/upgrade.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/language/english/upgrade.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/language/english/upgrade.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -4,27 +4,27 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-define( "_XOOPS_UPGRADE", "XOOPS system upgrade" );
-define( "_CHECKING_APPLIED", "Checking applied upgrades:" );
-define( "_SET_FILES_WRITABLE", "Make the following files writable before proceeding:" );
-define( "_NO_NEED_UPGRADE", "No upgrade necessary. Please %s and remove this folder from your server" );
-define( "_NEED_UPGRADE", "Upgrade needed" );
-define( "_PROCEED_UPGRADE", "Proceed to upgrade" );
-define( "_PERFORMING_UPGRADE", "Performing %s upgrade" );
+define("_XOOPS_UPGRADE", "XOOPS system upgrade" );
+define("_CHECKING_APPLIED", "Checking applied upgrades:" );
+define("_SET_FILES_WRITABLE", "Make the following files writable before proceeding:" );
+define("_NO_NEED_UPGRADE", "No upgrade necessary. Please %s and remove this folder from your server" );
+define("_NEED_UPGRADE", "Upgrade needed" );
+define("_PROCEED_UPGRADE", "Proceed to upgrade" );
+define("_PERFORMING_UPGRADE", "Performing %s upgrade" );
-define( "_USER_LOGIN", "User login" );
+define("_USER_LOGIN", "User login" );
-define( "_MANUAL_INSTRUCTIONS", "Manual installation instructions" );
+define("_MANUAL_INSTRUCTIONS", "Manual installation instructions" );
// %s is filename
-define( "_FAILED_PATCH", "Failed to patch %s" );
-define( "_APPLY_NEXT", "Apply next upgrade (%s)" );
-define( "_COPY_RED_LINES", "Copy the following red lines to %s" );
+define("_FAILED_PATCH", "Failed to patch %s" );
+define("_APPLY_NEXT", "Apply next upgrade (%s)" );
+define("_COPY_RED_LINES", "Copy the following red lines to %s" );
-define( "_FINISH", "Finish" );
-define( "_RELOAD", "Reload" );
+define("_FINISH", "Finish" );
+define("_RELOAD", "Reload" );
-define( '_UPGRADE_CHARSET', "UTF-8" );
-define( '_UPDATE_SYSTEM_MODULE', "update system module" );
+define('_UPGRADE_CHARSET', "UTF-8" );
+define('_UPDATE_SYSTEM_MODULE', "update system module" );
?>
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/index.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/index.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/index.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -333,7 +333,7 @@
: "0"
);
$lines[$ln] = preg_replace( "/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([0-9]+)\s*\)/",
- "define( '" . $matches[3] . "', " . $val . " )",
+ "define('" . $matches[3] . "', " . $val . " )",
$lines[$ln] );
} elseif( preg_match( "/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([\"'])([^\"']*?)\\4\s*\)/", $lines[$ln], $matches ) ) {
$val = isset( $vars[$matches[3]] )
@@ -343,7 +343,7 @@
: ""
);
$lines[$ln] = preg_replace( "/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([\"'])(.*?)\\4\s*\)/",
- "define( '" . $matches[3] . "', '" . $val . "' )",
+ "define('" . $matches[3] . "', '" . $val . "' )",
$lines[$ln] );
}
}
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/language/english.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/language/english.php 2012-08-11 07:19:07 UTC (rev 10050)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/upgrade/upd-2.0.18-to-2.3.0/language/english.php 2012-08-11 09:33:27 UTC (rev 10051)
@@ -4,24 +4,24 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-define( "LEGEND_XOOPS_PATHS", "XOOPS Physical paths" );
-define( "LEGEND_DATABASE", "Database Character Set" );
+define("LEGEND_XOOPS_PATHS", "XOOPS Physical paths" );
+define("LEGEND_DATABASE", "Database Character Set" );
-define( "XOOPS_LIB_PATH_LABEL", "XOOPS library directory" );
-define( "XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH . " to make it secure." );
-define( "XOOPS_DATA_PATH_LABEL", "XOOPS datafiles directory" );
-define( "XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH . " to make it secure." );
+define("XOOPS_LIB_PATH_LABEL", "XOOPS library directory" );
+define("XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH . " to make it secure." );
+define("XOOPS_DATA_PATH_LABEL", "XOOPS datafiles directory" );
+define("XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH . " to make it secure." );
-define( "DB_COLLATION_LABEL", "Database character set and collation" );
-define( "DB_COLLATION_HELP", "As of 4.12 MySQL supports custom character set and collation. However it is more complex than expected, so DON'T make any change unless you are confident with your choice.");
-define( "DB_COLLATION_NOCHANGE", "Do not change");
+define("DB_COLLATION_LABEL", "Database character set and collation" );
+define("DB_COLLATION_HELP", "As of 4.12 MySQL supports custom character set and collation. However it is more complex than expected, so DON'T make any change unless you are confident with your choice.");
+define("DB_COLLATION_NOCHANGE", "Do not change");
-define( "XOOPS_PATH_FOUND", "Path found." );
-define( "ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server." );
-define( "CHECKING_PERMISSIONS", "Checking file and directory permissions..." );
-define( "ERR_NEED_WRITE_ACCESS", "The server must be given write access to the following files and folder<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)" );
-define( "IS_NOT_WRITABLE", "%s is NOT writable." );
-define( "IS_WRITABLE", "%s is writable." );
-define( "ERR_COULD_NOT_WRITE_MAINFILE", "Error writing content to mainfile.php, write the content into mainfile.php manually." );
+define("XOOPS_PATH_FOUND", "Path found." );
+define("ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server." );
+define("CHECKING_PERMISSIONS", "Checking file and directory permissions..." );
+define("ERR_NEED_WRITE_ACCESS", "The server must be given write access to the following files and folder<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)" );
+define("IS_NOT_WRITABLE", "%s is NOT writable." );
+define("IS_WRITABLE", "%s is writable." );
+define("ERR_COULD_NOT_WRITE_MAINFILE", "Error writing content to mainfile.php, write the content into mainfile.php manually." );
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
