Please note that now each language file header is changed in the following way:
Cod: Selectaţi tot
diff -x images -x imageset -crNEB phpbb30RC5/language/en/acp/board.php phpbb30RC6/language/en/acp/board.php
*** phpbb30RC5/language/en/acp/board.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/acp/board.php Mon Oct 8 18:41:34 2007
***************
*** 333,339 ****
'SCRIPT_PATH' => 'Script path',
'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
'SERVER_NAME' => 'Domain name',
! 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: <samp>www.foo.bar</samp>).',
'SERVER_PORT' => 'Server port',
'SERVER_PORT_EXPLAIN' => 'The port your server is running on, usually 80, only change if different.',
'SERVER_PROTOCOL' => 'Server protocol',
--- 338,344 ----
'SCRIPT_PATH' => 'Script path',
'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
'SERVER_NAME' => 'Domain name',
! 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: <samp>www.example.com</samp>).',
'SERVER_PORT' => 'Server port',
'SERVER_PORT_EXPLAIN' => 'The port your server is running on, usually 80, only change if different.',
'SERVER_PROTOCOL' => 'Server protocol',
***************
*** 364,369 ****
--- 369,378 ----
'EMAIL_CHECK_MX_EXPLAIN' => 'If enabled, the e-mail domain provided on registration and profile changes is checked for a valid MX record.',
'FORCE_PASS_CHANGE' => 'Force password change',
'FORCE_PASS_CHANGE_EXPLAIN' => 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.',
+ 'FORM_TIME_MAX' => 'Maximum time to submit forms',
+ 'FORM_TIME_MAX_EXPLAIN' => 'The time a user has to submit a form. Use -1 to disable. Note that a form might become invalid if the session expires, regardless of this setting.',
+ 'FORM_TIME_MIN' => 'Minimum time to submit forms',
+ 'FORM_TIME_MIN_EXPLAIN' => 'Submissions faster than this time are ignored by the board. Use 0 to disable.',
'FORWARDED_FOR_VALID' => 'Validated <var>X_FORWARDED_FOR</var> header',
'FORWARDED_FOR_VALID_EXPLAIN' => 'Sessions will only be continued if the sent <var>X_FORWARDED_FOR</var> header equals the one sent with the previous request. Bans will be checked against IPs in <var>X_FORWARDED_FOR</var> too.',
'IP_VALID' => 'Session IP validation',
***************
*** 424,433 ****
$lang = array_merge($lang, array(
'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
- 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
- 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
'JAB_ENABLE' => 'Enable Jabber',
'JAB_ENABLE_EXPLAIN' => 'Enables use of Jabber messaging and notifications.',
'JAB_PACKAGE_SIZE' => 'Jabber package size',
'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
'JAB_PASSWORD' => 'Jabber password',
--- 433,441 ----
$lang = array_merge($lang, array(
'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
'JAB_ENABLE' => 'Enable Jabber',
'JAB_ENABLE_EXPLAIN' => 'Enables use of Jabber messaging and notifications.',
+ 'JAB_GTALK_NOTE' => 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
'JAB_PACKAGE_SIZE' => 'Jabber package size',
'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
'JAB_PASSWORD' => 'Jabber password',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/acp/forums.php phpbb30RC6/language/en/acp/forums.php
*** phpbb30RC5/language/en/acp/forums.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/acp/forums.php Mon Oct 8 18:41:34 2007
***************
*** 86,94 ****
'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password',
'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.',
'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.',
'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
'FORUM_PRUNE_SETTINGS' => 'Forum prune settings',
! 'FORUM_RESYNCED' => 'Forum "%s" successfully resynced',
'FORUM_RULES_EXPLAIN' => 'Forum rules are displayed at any page within the given forum.',
'FORUM_RULES_LINK' => 'Link to forum rules',
'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.',
--- 91,102 ----
'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password',
'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.',
'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.',
+ 'FORUM_PASSWORD_UNSET' => 'Remove forum password',
+ 'FORUM_PASSWORD_UNSET_EXPLAIN' => 'Check here if you want to remove the forum password.',
+ 'FORUM_PASSWORD_OLD' => 'The forum password is using an old encryption and should be changed.',
'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
'FORUM_PRUNE_SETTINGS' => 'Forum prune settings',
! 'FORUM_RESYNCED' => 'Forum “%s” successfully resynced',
'FORUM_RULES_EXPLAIN' => 'Forum rules are displayed at any page within the given forum.',
'FORUM_RULES_LINK' => 'Link to forum rules',
'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/acp/permissions.php phpbb30RC6/language/en/acp/permissions.php
*** phpbb30RC5/language/en/acp/permissions.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/acp/permissions.php Mon Oct 8 18:41:34 2007
***************
*** 257,271 ****
'TRACE_TOTAL' => 'Total',
'USERS_NOT_ASSIGNED' => 'No user assigned to this role',
! 'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following default groups',
! 'USER_IS_MEMBER_OF_CUSTOM' => 'is a member of the following custom groups',
'VIEW_ASSIGNED_ITEMS' => 'View assigned items',
'VIEW_LOCAL_PERMS' => 'Local permissions',
'VIEW_GLOBAL_PERMS' => 'Global permissions',
'VIEW_PERMISSIONS' => 'View permissions',
! 'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected.',
));
?>
\ No newline at end of file
--- 262,277 ----
'TRACE_TOTAL' => 'Total',
'USERS_NOT_ASSIGNED' => 'No user assigned to this role',
! 'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following pre-defined groups',
! 'USER_IS_MEMBER_OF_CUSTOM' => 'is a member of the following user defined groups',
'VIEW_ASSIGNED_ITEMS' => 'View assigned items',
'VIEW_LOCAL_PERMS' => 'Local permissions',
'VIEW_GLOBAL_PERMS' => 'Global permissions',
'VIEW_PERMISSIONS' => 'View permissions',
! 'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected.',
! 'WRONG_PERMISSION_SETTING_FORMAT' => 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',
));
?>
\ No newline at end of file
diff -x images -x imageset -crNEB phpbb30RC5/language/en/acp/posting.php phpbb30RC6/language/en/acp/posting.php
*** phpbb30RC5/language/en/acp/posting.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/acp/posting.php Mon Oct 8 18:41:34 2007
***************
*** 244,250 ****
'NO_REASON' => 'Reason could not be found.',
'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.',
! 'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason "Other".',
'REASON_ADD' => 'Add report/denial reason',
'REASON_ADDED' => 'Report/denial reason successfully added.',
--- 249,255 ----
'NO_REASON' => 'Reason could not be found.',
'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.',
! 'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason “Other”.',
'REASON_ADD' => 'Add report/denial reason',
'REASON_ADDED' => 'Report/denial reason successfully added.',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/acp/users.php phpbb30RC6/language/en/acp/users.php
*** phpbb30RC5/language/en/acp/users.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/acp/users.php Mon Oct 8 18:41:34 2007
***************
*** 108,116 ****
'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
'USER_DELETED' => 'User deleted successfully.',
'USER_GROUP_ADD' => 'Add user to group',
! 'USER_GROUP_NORMAL' => 'Normal groups user is a member of',
'USER_GROUP_PENDING' => 'Groups user is in pending mode',
! 'USER_GROUP_SPECIAL' => 'Special groups user is a member of',
'USER_NO_ATTACHMENTS' => 'There are no attached files to display.',
'USER_OVERVIEW_UPDATED' => 'User details updated.',
'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user.',
--- 113,121 ----
'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
'USER_DELETED' => 'User deleted successfully.',
'USER_GROUP_ADD' => 'Add user to group',
! 'USER_GROUP_NORMAL' => 'User defined groups user is a member of',
'USER_GROUP_PENDING' => 'Groups user is in pending mode',
! 'USER_GROUP_SPECIAL' => 'Pre-defined groups user is a member of',
'USER_NO_ATTACHMENTS' => 'There are no attached files to display.',
'USER_OVERVIEW_UPDATED' => 'User details updated.',
'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user.',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/common.php phpbb30RC6/language/en/common.php
*** phpbb30RC5/language/en/common.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/common.php Mon Oct 8 18:41:34 2007
***************
*** 160,165 ****
--- 165,172 ----
'ENCLOSURE' => 'Enclosure',
'ERR_CHANGING_DIRECTORY' => 'Unable to change directory.',
'ERR_CONNECTING_SERVER' => 'Error connecting to the server.',
+ 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
+ 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.',
'ERR_WRONG_PATH_TO_PHPBB' => 'The phpBB path specified appears to be invalid.',
'EXPAND_VIEW' => 'Expand view',
***************
*** 176,181 ****
--- 183,189 ----
'FIND_USERNAME' => 'Find a member',
'FOLDER' => 'Folder',
'FORGOT_PASS' => 'I forgot my password',
+ 'FORM_INVALID' => 'The submitted form was invalid. Try submitting again.',
'FORUM' => 'Forum',
'FORUMS' => 'Forums',
'FORUMS_MARKED' => 'All forums have been marked read.',
***************
*** 368,373 ****
--- 376,382 ----
'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist.',
'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods.',
'NO_TOPIC' => 'The requested topic does not exist.',
+ 'NO_TOPIC_FORUM' => 'The topic or forum no longer exists.',
'NO_TOPICS' => 'There are no topics or posts in this forum.',
'NO_TOPICS_TIME_FRAME' => 'No topics exist inside this forum for the selected time frame.',
'NO_UNREAD_PM' => '<strong>0</strong> unread messages',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/admin_welcome_inactive.txt phpbb30RC6/language/en/email/admin_welcome_inactive.txt
*** phpbb30RC5/language/en/email/admin_welcome_inactive.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/admin_welcome_inactive.txt Mon Oct 8 18:41:34 2007
***************
*** 1,4 ****
! Subject: Welcome to "{SITENAME}" - {U_BOARD}
{WELCOME_MSG}
--- 1,4 ----
! Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
***************
*** 7,12 ****
--- 7,14 ----
----------------------------
Username: {USERNAME}
Password: {PASSWORD}
+
+ Board URL: {U_BOARD}
----------------------------
Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/coppa_resend_inactive.txt phpbb30RC6/language/en/email/coppa_resend_inactive.txt
*** phpbb30RC5/language/en/email/coppa_resend_inactive.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/coppa_resend_inactive.txt Mon Oct 8 18:41:34 2007
***************
*** 1,4 ****
! Subject: Welcome to "{SITENAME}" - {U_BOARD}
{WELCOME_MSG}
--- 1,4 ----
! Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
***************
*** 13,19 ****
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
! Permission to participate at "{SITENAME}"
Username: {USERNAME}
E-mail: {EMAIL_ADDRESS}
--- 13,19 ----
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
! Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME}
E-mail: {EMAIL_ADDRESS}
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/coppa_welcome_inactive.txt phpbb30RC6/language/en/email/coppa_welcome_inactive.txt
*** phpbb30RC5/language/en/email/coppa_welcome_inactive.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/coppa_welcome_inactive.txt Mon Oct 8 18:41:34 2007
***************
*** 1,4 ****
! Subject: Welcome to "{SITENAME}" - {U_BOARD}
{WELCOME_MSG}
--- 1,4 ----
! Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
***************
*** 13,19 ****
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
! Permission to participate at "{SITENAME}"
Username: {USERNAME}
Password: {PASSWORD}
--- 13,19 ----
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
! Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME}
Password: {PASSWORD}
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/forum_notify.txt phpbb30RC6/language/en/email/forum_notify.txt
*** phpbb30RC5/language/en/email/forum_notify.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/forum_notify.txt Mon Oct 8 18:41:34 2007
***************
*** 2,8 ****
Hello {USERNAME},
! You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic.
{U_NEWEST_POST}
--- 2,8 ----
Hello {USERNAME},
! You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
{U_NEWEST_POST}
***************
*** 10,16 ****
{U_TOPIC}
If you want to view the forum, click the following link:
! {U_TOPIC}
If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
--- 10,16 ----
{U_TOPIC}
If you want to view the forum, click the following link:
! {U_FORUM}
If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/user_reactivate_account.txt phpbb30RC6/language/en/email/user_reactivate_account.txt
*** phpbb30RC5/language/en/email/user_reactivate_account.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/user_reactivate_account.txt Mon Oct 8 18:41:34 2007
***************
*** 1,6 ****
! Subject: Reactivate your account on "{SITENAME}" - {U_BOARD}
! A board administrator forced your account to be reactivated. Your account is currently inactive.
Please follow the steps listed here to reactivate your account.
Please keep this e-mail for your records. Your account information is as follows:
--- 1,6 ----
! Subject: Reactivate your account on "{SITENAME}"
! A board administrator requested that your account be reactivated. Your account is currently inactive.
Please follow the steps listed here to reactivate your account.
Please keep this e-mail for your records. Your account information is as follows:
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/user_resend_inactive.txt phpbb30RC6/language/en/email/user_resend_inactive.txt
*** phpbb30RC5/language/en/email/user_resend_inactive.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/user_resend_inactive.txt Mon Oct 8 18:41:34 2007
***************
*** 1,4 ****
! Subject: Welcome to "{SITENAME}" - {U_BOARD}
{WELCOME_MSG}
--- 1,4 ----
! Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/user_welcome.txt phpbb30RC6/language/en/email/user_welcome.txt
*** phpbb30RC5/language/en/email/user_welcome.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/user_welcome.txt Mon Oct 8 18:41:34 2007
***************
*** 1,4 ****
! Subject: Welcome to "{SITENAME}" - {U_BOARD}
{WELCOME_MSG}
--- 1,4 ----
! Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
***************
*** 7,12 ****
--- 7,14 ----
----------------------------
Username: {USERNAME}
Password: {PASSWORD}
+
+ Board URL: {U_BOARD}
----------------------------
Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
diff -x images -x imageset -crNEB phpbb30RC5/language/en/email/user_welcome_inactive.txt phpbb30RC6/language/en/email/user_welcome_inactive.txt
*** phpbb30RC5/language/en/email/user_welcome_inactive.txt Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/email/user_welcome_inactive.txt Mon Oct 8 18:41:34 2007
***************
*** 1,4 ****
! Subject: Welcome to "{SITENAME}" - {U_BOARD}
{WELCOME_MSG}
--- 1,4 ----
! Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
***************
*** 7,12 ****
--- 7,14 ----
----------------------------
Username: {USERNAME}
Password: {PASSWORD}
+
+ Board URL: {U_BOARD}
----------------------------
Your account is currently inactive. You cannot use it until you visit the following link:
diff -x images -x imageset -crNEB phpbb30RC5/language/en/install.php phpbb30RC6/language/en/install.php
*** phpbb30RC5/language/en/install.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/install.php Mon Oct 8 18:41:34 2007
***************
*** 65,71 ****
'CONFIG_CONVERT' => 'Converting the configuration',
'CONFIG_FILE_UNABLE_WRITE' => 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below.',
'CONFIG_FILE_WRITTEN' => 'The configuration file has been written. You may now proceed to the next step of the installation.',
! 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for "%s" is empty.',
'CONFIG_RETRY' => 'Retry',
'CONTACT_EMAIL_CONFIRM' => 'Confirm contact e-mail',
'CONTINUE_CONVERT' => 'Continue conversion',
--- 70,76 ----
'CONFIG_CONVERT' => 'Converting the configuration',
'CONFIG_FILE_UNABLE_WRITE' => 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below.',
'CONFIG_FILE_WRITTEN' => 'The configuration file has been written. You may now proceed to the next step of the installation.',
! 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for “%s” is empty.',
'CONFIG_RETRY' => 'Retry',
'CONTACT_EMAIL_CONFIRM' => 'Confirm contact e-mail',
'CONTINUE_CONVERT' => 'Continue conversion',
***************
*** 79,93 ****
'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
'CONVERT_NEW_CONVERSION' => 'New conversion',
'CONVERT_NOT_EXIST' => 'The specified convertor does not exist.',
'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
! 'CONV_ERR_FATAL' => 'Fatal conversion error',
'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.',
'CONV_ERROR_FORUM_ACCESS' => 'Unable to get forum access information.',
'CONV_ERROR_GET_CATEGORIES' => 'Unable to get categories.',
'CONV_ERROR_GET_CONFIG' => 'Could not retrieve your board configuration.',
! 'CONV_ERROR_COULD_NOT_READ' => 'Unable to access/read "%s".',
'CONV_ERROR_GROUP_ACCESS' => 'Unable to get group authentication information.',
'CONV_ERROR_INCONSISTENT_GROUPS' => 'Inconsistency in groups table detected in add_bots() - you need to add all special groups if you do it manually.',
'CONV_ERROR_INSERT_BOT' => 'Unable to insert bot into users table.',
--- 84,99 ----
'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
'CONVERT_NEW_CONVERSION' => 'New conversion',
'CONVERT_NOT_EXIST' => 'The specified convertor does not exist.',
+ 'CONVERT_OPTIONS' => 'Options',
'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
! 'CONV_ERR_FATAL' => 'Fatal conversion error',
'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.',
'CONV_ERROR_FORUM_ACCESS' => 'Unable to get forum access information.',
'CONV_ERROR_GET_CATEGORIES' => 'Unable to get categories.',
'CONV_ERROR_GET_CONFIG' => 'Could not retrieve your board configuration.',
! 'CONV_ERROR_COULD_NOT_READ' => 'Unable to access/read “%s”.',
'CONV_ERROR_GROUP_ACCESS' => 'Unable to get group authentication information.',
'CONV_ERROR_INCONSISTENT_GROUPS' => 'Inconsistency in groups table detected in add_bots() - you need to add all special groups if you do it manually.',
'CONV_ERROR_INSERT_BOT' => 'Unable to insert bot into users table.',
***************
*** 97,103 ****
'CONV_ERROR_NO_AVATAR_PATH' => 'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
'CONV_ERROR_NO_FORUM_PATH' => 'The relative path to the source board has not been specified.',
'CONV_ERROR_NO_GALLERY_PATH' => 'Note to developer: you must specify $convertor[\'avatar_gallery_path\'] to use %s.',
! 'CONV_ERROR_NO_GROUP' => 'Group "%1$s" could not be found in %2$s.',
'CONV_ERROR_NO_RANKS_PATH' => 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.',
'CONV_ERROR_NO_SMILIES_PATH' => 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.',
'CONV_ERROR_NO_UPLOAD_DIR' => 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.',
--- 103,109 ----
'CONV_ERROR_NO_AVATAR_PATH' => 'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
'CONV_ERROR_NO_FORUM_PATH' => 'The relative path to the source board has not been specified.',
'CONV_ERROR_NO_GALLERY_PATH' => 'Note to developer: you must specify $convertor[\'avatar_gallery_path\'] to use %s.',
! 'CONV_ERROR_NO_GROUP' => 'Group “%1$s” could not be found in %2$s.',
'CONV_ERROR_NO_RANKS_PATH' => 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.',
'CONV_ERROR_NO_SMILIES_PATH' => 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.',
'CONV_ERROR_NO_UPLOAD_DIR' => 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.',
***************
*** 106,112 ****
'CONV_ERROR_REPLACE_CATEGORY' => 'Unable to insert new forum replacing old category.',
'CONV_ERROR_REPLACE_FORUM' => 'Unable to insert new forum replacing old forum.',
'CONV_ERROR_USER_ACCESS' => 'Unable to get user authentication information.',
! 'CONV_ERROR_WRONG_GROUP' => 'Wrong group "%1$s" defined in %2$s.',
'CONV_OPTIONS_BODY' => 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.',
'CONV_SAVED_MESSAGES' => 'Saved messages',
--- 112,118 ----
'CONV_ERROR_REPLACE_CATEGORY' => 'Unable to insert new forum replacing old category.',
'CONV_ERROR_REPLACE_FORUM' => 'Unable to insert new forum replacing old forum.',
'CONV_ERROR_USER_ACCESS' => 'Unable to get user authentication information.',
! 'CONV_ERROR_WRONG_GROUP' => 'Wrong group “%1$s” defined in %2$s.',
'CONV_OPTIONS_BODY' => 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.',
'CONV_SAVED_MESSAGES' => 'Saved messages',
***************
*** 119,125 ****
'DB_ERR_INSERT' => 'Error while processing <code>INSERT</code> query.',
'DB_ERR_LAST' => 'Error while processing <var>query_last</var>.',
'DB_ERR_QUERY_FIRST' => 'Error while executing <var>query_first</var>.',
! 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s ("%s").',
'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.',
'DB_HOST' => 'Database server hostname or DSN',
'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
--- 125,131 ----
'DB_ERR_INSERT' => 'Error while processing <code>INSERT</code> query.',
'DB_ERR_LAST' => 'Error while processing <var>query_last</var>.',
'DB_ERR_QUERY_FIRST' => 'Error while executing <var>query_first</var>.',
! 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s (“%s”).',
'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.',
'DB_HOST' => 'Database server hostname or DSN',
'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
***************
*** 160,166 ****
'FILES_REQUIRED_EXPLAIN' => '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.',
'FILLING_TABLE' => 'Filling table <strong>%s</strong>',
'FILLING_TABLES' => 'Filling tables',
! 'FINAL_STEP' => 'Processing final step',
'FORUM_ADDRESS' => 'Board address',
'FORUM_ADDRESS_EXPLAIN' => 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
'FORUM_PATH' => 'Board path',
--- 166,172 ----
'FILES_REQUIRED_EXPLAIN' => '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.',
'FILLING_TABLE' => 'Filling table <strong>%s</strong>',
'FILLING_TABLES' => 'Filling tables',
! 'FINAL_STEP' => 'Process final step',
'FORUM_ADDRESS' => 'Board address',
'FORUM_ADDRESS_EXPLAIN' => 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
'FORUM_PATH' => 'Board path',
***************
*** 266,272 ****
'NAMING_CONFLICT' => 'Naming conflict: %s and %s are both aliases<br><br>%s',
'NEXT_STEP' => 'Proceed to next step',
'NOT_FOUND' => 'Cannot find',
! 'NOT_UNDERSTAND' => 'Could not understand %s #%d, table %s ("%s")',
'NO_CONVERTORS' => 'No convertors are available for use.',
'NO_CONVERT_SPECIFIED' => 'No convertor specified.',
'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
--- 272,278 ----
'NAMING_CONFLICT' => 'Naming conflict: %s and %s are both aliases<br><br>%s',
'NEXT_STEP' => 'Proceed to next step',
'NOT_FOUND' => 'Cannot find',
! 'NOT_UNDERSTAND' => 'Could not understand %s #%d, table %s (“%s”)',
'NO_CONVERTORS' => 'No convertors are available for use.',
'NO_CONVERT_SPECIFIED' => 'No convertor specified.',
'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
***************
*** 294,300 ****
'POST_ID' => 'Post ID',
'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
'PREPROCESS_STEP' => 'Executing pre-processing functions/queries',
! 'PRE_CONVERT_COMPLETE' => 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually adjust several things. After conversion, especially check the permissions assigned, rebuild your search index if necessary and also make sure files got copied correctly, for example avatars and smilies.',
'PROCESS_LAST' => 'Processing last statements',
'REFRESH_PAGE' => 'Refresh page to continue conversion',
--- 300,306 ----
'POST_ID' => 'Post ID',
'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
'PREPROCESS_STEP' => 'Executing pre-processing functions/queries',
! 'PRE_CONVERT_COMPLETE' => 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually do and adjust several things. After conversion, especially check the permissions assigned, rebuild your search index which is not converted and also make sure files got copied correctly, for example avatars and smilies.',
'PROCESS_LAST' => 'Processing last statements',
'REFRESH_PAGE' => 'Refresh page to continue conversion',
***************
*** 350,355 ****
--- 356,362 ----
'UNWRITABLE' => 'Unwritable',
'UPDATE_TOPICS_POSTED' => 'Generating topics posted information',
'UPDATE_TOPICS_POSTED_ERR' => 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
+ 'VERIFY_OPTIONS' => 'Verifying conversion options',
'VERSION' => 'Version',
'WELCOME_INSTALL' => 'Welcome to phpBB3 Installation',
***************
*** 371,378 ****
'CHECK_FILES_EXPLAIN' => 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
'CHECK_FILES_UP_TO_DATE' => 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
'CHECK_UPDATE_DATABASE' => 'Continue update process',
! 'COLLECTED_INFORMATION' => 'Information on collected files',
'COLLECTED_INFORMATION_EXPLAIN' => 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
'COMPLETE_LOGIN_TO_BOARD' => 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
'CONTINUE_UPDATE_NOW' => 'Continue the update process now',
'CURRENT_FILE' => 'Current original file',
--- 378,386 ----
'CHECK_FILES_EXPLAIN' => 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
'CHECK_FILES_UP_TO_DATE' => 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
'CHECK_UPDATE_DATABASE' => 'Continue update process',
! 'COLLECTED_INFORMATION' => 'File information',
'COLLECTED_INFORMATION_EXPLAIN' => 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
+ 'COLLECTING_FILE_DIFFS' => 'Collecting file differences',
'COMPLETE_LOGIN_TO_BOARD' => 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
'CONTINUE_UPDATE_NOW' => 'Continue the update process now',
'CURRENT_FILE' => 'Current original file',
***************
*** 406,416 ****
'FILES_MODIFIED' => 'Modified files',
'FILES_MODIFIED_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
'FILES_NEW' => 'New files',
! 'FILES_NEW_EXPLAIN' => 'The following files currently do not exist within your installation.',
'FILES_NEW_CONFLICT' => 'New conflicting files',
'FILES_NEW_CONFLICT_EXPLAIN' => 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.',
'FILES_NOT_MODIFIED' => 'Not modified files',
! 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files were not modified and represent the original phpBB files from the version you want to update from.',
'FILES_UP_TO_DATE' => 'Already updated files',
'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.',
'FTP_SETTINGS' => 'FTP settings',
--- 414,424 ----
'FILES_MODIFIED' => 'Modified files',
'FILES_MODIFIED_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
'FILES_NEW' => 'New files',
! 'FILES_NEW_EXPLAIN' => 'The following files currently do not exist within your installation. These files will be added to your installation.',
'FILES_NEW_CONFLICT' => 'New conflicting files',
'FILES_NEW_CONFLICT_EXPLAIN' => 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.',
'FILES_NOT_MODIFIED' => 'Not modified files',
! 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files are not modified and represent the original phpBB files from the version you want to update from.',
'FILES_UP_TO_DATE' => 'Already updated files',
'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.',
'FTP_SETTINGS' => 'FTP settings',
***************
*** 439,444 ****
--- 447,454 ----
'MERGE_MOD_FILE_OPTION' => 'Merge differences and use modified code within conflicting block',
'MERGE_NEW_FILE_OPTION' => 'Merge differences and use new file code within conflicting block',
'MERGE_SELECT_ERROR' => 'Conflicting file merge modes are not correctly selected.',
+ 'MERGING_FILES' => 'Merging differences',
+ 'MERGING_FILES_EXPLAIN' => 'Currently collecting final file changes.<br><br>Please wait until phpBB has completed all operations on changed files.',
'NEW_FILE' => 'New updated file',
'NEW_USERNAME' => 'New username',
***************
*** 453,458 ****
--- 463,469 ----
'NO_VISIBLE_CHANGES' => 'No visible changes',
'NOTICE' => 'Notice',
'NUM_CONFLICTS' => 'Number of conflicts',
+ 'NUMBER_OF_FILES_COLLECTED' => 'Currently having differences about %1$d from %2$d files collected.<br>Please wait until file collection finished.',
'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
***************
*** 488,493 ****
--- 499,506 ----
'STATUS_NOT_MODIFIED' => 'Not modified file',
'STATUS_UP_TO_DATE' => 'Already updated file',
+ 'TOGGLE_DISPLAY' => 'View/Hide file list',
+
'UPDATE_COMPLETED' => 'Update completed',
'UPDATE_DATABASE' => 'Update database',
'UPDATE_DATABASE_EXPLAIN' => 'Within the next step the database will be updated.',
***************
*** 556,565 ****
// Default database schema entries...
$lang = array_merge($lang, array(
'CONFIG_BOARD_EMAIL_SIG' => 'Thanks, The Management',
! 'CONFIG_SITE_DESC' => 'A _little_ text to describe your forum',
'CONFIG_SITENAME' => 'yourdomain.com',
! 'DEFAULT_INSTALL_POST' => 'This is an example post in your phpBB3 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!',
'EXT_GROUP_ARCHIVES' => 'Archives',
'EXT_GROUP_DOCUMENTS' => 'Documents',
--- 569,578 ----
// Default database schema entries...
$lang = array_merge($lang, array(
'CONFIG_BOARD_EMAIL_SIG' => 'Thanks, The Management',
! 'CONFIG_SITE_DESC' => 'A short text to describe your forum',
'CONFIG_SITENAME' => 'yourdomain.com',
! 'DEFAULT_INSTALL_POST' => 'This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!',
'EXT_GROUP_ARCHIVES' => 'Archives',
'EXT_GROUP_DOCUMENTS' => 'Documents',
***************
*** 571,579 ****
'EXT_GROUP_REAL_MEDIA' => 'Real Media',
'EXT_GROUP_WINDOWS_MEDIA' => 'Windows Media',
! 'FORUMS_FIRST_CATEGORY' => 'My first Category',
! 'FORUMS_TEST_FORUM_DESC' => 'This is just a test forum.',
! 'FORUMS_TEST_FORUM_TITLE' => 'Test Forum 1',
'RANKS_SITE_ADMIN_TITLE' => 'Site Admin',
'REPORT_WAREZ' => 'The post contains links to illegal or pirated software.',
--- 584,592 ----
'EXT_GROUP_REAL_MEDIA' => 'Real Media',
'EXT_GROUP_WINDOWS_MEDIA' => 'Windows Media',
! 'FORUMS_FIRST_CATEGORY' => 'Your first category',
! 'FORUMS_TEST_FORUM_DESC' => 'Description of your first forum.',
! 'FORUMS_TEST_FORUM_TITLE' => 'Your first forum',
'RANKS_SITE_ADMIN_TITLE' => 'Site Admin',
'REPORT_WAREZ' => 'The post contains links to illegal or pirated software.',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/mcp.php phpbb30RC6/language/en/mcp.php
*** phpbb30RC5/language/en/mcp.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/mcp.php Mon Oct 8 18:41:34 2007
***************
*** 224,230 ****
'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action.',
'NO_TOPICS_QUEUE' => 'There are no topics waiting for approval.',
! 'ONLY_TOPIC' => 'Only topic "%s"',
'OTHER_USERS' => 'Other users posting from this IP',
'POSTER' => 'Poster',
--- 229,235 ----
'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action.',
'NO_TOPICS_QUEUE' => 'There are no topics waiting for approval.',
! 'ONLY_TOPIC' => 'Only topic “%s”',
'OTHER_USERS' => 'Other users posting from this IP',
'POSTER' => 'Poster',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/posting.php phpbb30RC6/language/en/posting.php
*** phpbb30RC5/language/en/posting.php Fri Aug 24 20:33:14 2007
--- phpbb30RC6/language/en/posting.php Mon Oct 8 18:41:34 2007
***************
*** 44,50 ****
'BBCODE_B_HELP' => 'Bold text: [b]text[/b]',
'BBCODE_C_HELP' => 'Code display: [code]code
'USER_CANNOT_FORUM_POST' => 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1d %2s.',
'WRONG_SIZE' => 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.',
diff -x images -x imageset -crNEB phpbb30RC5/language/en/ucp.php phpbb30RC6/language/en/ucp.php
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.',
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.',
'ACTIVATION_EMAIL_SENT' => 'The activation e-mail has been sent to your e-mail address.',
+ 'ACTIVATION_EMAIL_SENT_ADMIN' => 'The activation e-mail has been sent to the administrators e-mail addresses.',
