From: <gi...@ma...> - 2009-05-22 09:24:56
|
The branch, master has been updated via dee0880390666aa44ce3021ce4c06ce5c90178ea (commit) via 75bb4863f7e1d2123665113feac5c1fd5396d6c8 (commit) via 2d8be0aa8ce584c6b9cf0e6c0f535051a09efafc (commit) from be8ef7233d5538bef920bb2d9164a8a62b78c6cd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dee0880390666aa44ce3021ce4c06ce5c90178ea Author: Siebrand Mazeland <s.m...@xs...> Date: Fri May 22 11:24:21 2009 +0200 Tweaked some more capitalisation out commit 75bb4863f7e1d2123665113feac5c1fd5396d6c8 Author: Siebrand Mazeland <s.m...@xs...> Date: Fri May 22 11:14:06 2009 +0200 Remove unused messages $s_logged_out_title, $s_redirecting, $s_here commit 2d8be0aa8ce584c6b9cf0e6c0f535051a09efafc Author: Siebrand Mazeland <s.m...@xs...> Date: Fri May 22 11:02:10 2009 +0200 Reduce shouting in messages. Only left in e-mail messages where we cannot use class styling if we really would want to shout at users. ----------------------------------------------------------------------- Summary of changes: lang/strings_english.txt | 57 +++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 31 deletions(-) ----------------------------------------------------------------------- commit dee0880390666aa44ce3021ce4c06ce5c90178ea Author: Siebrand Mazeland <s.m...@xs...> Date: Fri May 22 11:24:21 2009 +0200 Tweaked some more capitalisation out diff --git a/lang/strings_english.txt b/lang/strings_english.txt index 442f3be..5fae07e 100644 --- a/lang/strings_english.txt +++ b/lang/strings_english.txt @@ -1123,7 +1123,7 @@ $s_required = 'required'; $s_select_category = 'Select Category'; $s_select_reproducibility = 'Select Reproducibility'; $s_select_severity = 'Select Severity'; -$s_or_fill_in = 'OR Fill In'; +$s_or_fill_in = 'Or Fill In'; $s_assign_to = 'Assign To'; $s_additional_information = 'Additional Information'; $s_submit_report_button = 'Submit Report'; commit 75bb4863f7e1d2123665113feac5c1fd5396d6c8 Author: Siebrand Mazeland <s.m...@xs...> Date: Fri May 22 11:14:06 2009 +0200 Remove unused messages $s_logged_out_title, $s_redirecting, $s_here diff --git a/lang/strings_english.txt b/lang/strings_english.txt index e9e889e..442f3be 100644 --- a/lang/strings_english.txt +++ b/lang/strings_english.txt @@ -717,11 +717,6 @@ $s_lost_password_link = 'Lost your password?'; # login_select_proj_page.php $s_select_project_button = 'Select Project'; -# logout_page.php -$s_logged_out_title = 'Logged Out...'; -$s_redirecting = '...Redirecting'; -$s_here = 'Here'; - # lost_pwd_page.php $s_lost_password_title = 'Password Reset'; $s_lost_password_done_title = 'Password Message Sent'; commit 2d8be0aa8ce584c6b9cf0e6c0f535051a09efafc Author: Siebrand Mazeland <s.m...@xs...> Date: Fri May 22 11:02:10 2009 +0200 Reduce shouting in messages. Only left in e-mail messages where we cannot use class styling if we really would want to shout at users. diff --git a/lang/strings_english.txt b/lang/strings_english.txt index bc5fccd..e9e889e 100644 --- a/lang/strings_english.txt +++ b/lang/strings_english.txt @@ -62,8 +62,8 @@ $s_excel_export = 'Excel Export'; $s_login_anonymously = 'Login Anonymously'; $s_anonymous = 'Anonymous'; $s_jump_to_bugnotes = 'Jump to Notes'; -$s_public_project_msg = 'This project is PUBLIC. All users have access.'; -$s_private_project_msg = 'This project is PRIVATE. Only administrators and manually added users have access.'; +$s_public_project_msg = 'This project is public. All users have access.'; +$s_private_project_msg = 'This project is private. Only administrators and manually added users have access.'; $s_access_level_project = 'Project Access Level'; $s_view_submitted_bug_link = 'View Submitted Issue %1$s'; $s_assigned_projects = 'Assigned Projects'; @@ -293,11 +293,11 @@ $MANTIS_ERROR[ERROR_LOST_PASSWORD_NOT_ENABLED] = 'The "lost your password" featu $MANTIS_ERROR[ERROR_LOST_PASSWORD_NO_EMAIL_SPECIFIED] = 'You must provide an e-mail address in order to reset the password.'; $MANTIS_ERROR[ERROR_LOST_PASSWORD_NOT_MATCHING_DATA] = 'The provided information does not match any registered account!'; $MANTIS_ERROR[ERROR_LOST_PASSWORD_CONFIRM_HASH_INVALID] = 'The confirmation URL is invalid or has already been used. Please signup again.'; -$MANTIS_ERROR[ERROR_LOST_PASSWORD_MAX_IN_PROGRESS_ATTEMPTS_REACHED] = 'Max. number of in-progress requests reached. Please contact the system administrator.'; +$MANTIS_ERROR[ERROR_LOST_PASSWORD_MAX_IN_PROGRESS_ATTEMPTS_REACHED] = 'Maximum number of in-progress requests reached. Please contact the system administrator.'; $MANTIS_ERROR[ERROR_PROJECT_RECURSIVE_HIERARCHY] = 'That operation would create a loop in the subproject hierarchy.'; -$MANTIS_ERROR[ERROR_USER_CHANGE_LAST_ADMIN] = 'You cannot change the access level of the only ADMINISTRATOR in the system.'; +$MANTIS_ERROR[ERROR_USER_CHANGE_LAST_ADMIN] = 'You cannot change the access level of the only administrator in the system.'; $MANTIS_ERROR[ERROR_PAGE_REDIRECTION] = 'Page redirection error, ensure that there are no spaces outside the PHP block (<?php ?>) in config_inc.php or custom_*.php files.'; -$MANTIS_ERROR[ERROR_TWITTER_NO_CURL_EXT] = 'Twitter integration requires PHP CURL extension which is not installed.'; +$MANTIS_ERROR[ERROR_TWITTER_NO_CURL_EXT] = 'Twitter integration requires PHP cURL extension which is not installed.'; $MANTIS_ERROR[ERROR_TAG_NOT_FOUND] = 'Could not find a tag with that name.'; $MANTIS_ERROR[ERROR_TAG_DUPLICATE] = 'A tag already exists with that name.'; $MANTIS_ERROR[ERROR_TAG_NAME_INVALID] = 'That tag name is invalid.'; @@ -357,7 +357,7 @@ $s_new_account_subject = 'Account registration'; $s_new_account_greeting = 'Thank you for registering. You have an account with username "%1$s". In order to complete your registration, visit the following URL (make sure it is entered as the single line) and set your own access password:'; $s_new_account_username = 'Username:'; $s_new_account_message = 'If you did not request any registration, ignore this message and nothing will happen.'; -$s_new_account_do_not_reply = 'DO NOT REPLY TO THIS MESSAGE'; +$s_new_account_do_not_reply = 'Do not reply to this message'; $s_new_account_email = 'E-mail:'; $s_new_account_IP = 'Remote IP address:'; $s_new_account_signup_msg = 'The following account has been created:'; @@ -696,13 +696,13 @@ $s_please_report = 'Please report this to the %1$s.'; $s_click_to_login = 'Click here to login'; # login.php -$s_warning_plain_password_authentication = '<strong>WARNING:</strong> Plain password authentication is used, this will expose your passwords to administrators.'; -$s_warning_default_administrator_account_present = '<strong>WARNING:</strong> You should disable the default \'administrator\' account or change its password.'; -$s_warning_admin_directory_present = '<strong>WARNING:</strong> Admin directory should be removed.'; -$s_error_database_version_out_of_date_1 = '<strong>ERROR:</strong> The database structure appears to be out of date (config(databaseversion) is 0 and old upgrade tables exist). Version 1.x of MantisBT introduced a new upgrade process. You appear to be upgrading from a 0.XX Release. Please upgrade to 1.0.8 or 1.1.X, then upgrade to 1.2.'; -$s_error_database_no_schema_version = '<strong>ERROR:</strong> The database structure appears to be out of date (config(databaseversion) is 0 and old upgrade tables do not exist). Please check that your database is running - we can not retrieve the database schema version. Config Table did not return a valid database schema version - please ask for support on the mantis-help mailing list if required.'; -$s_error_database_version_out_of_date_2 = '<strong>WARNING:</strong> The database structure may be out of date. Please upgrade <a href="admin/install.php">here</a> before logging in.'; -$s_error_code_version_out_of_date = '<strong>WARNING:</strong> The database structure is more up-to-date than the code installed. Please upgrade the code.'; +$s_warning_plain_password_authentication = '<strong>Warning:</strong> Plain password authentication is used, this will expose your passwords to administrators.'; +$s_warning_default_administrator_account_present = '<strong>Warning:</strong> You should disable the default \'administrator\' account or change its password.'; +$s_warning_admin_directory_present = '<strong>Warning:</strong> Admin directory should be removed.'; +$s_error_database_version_out_of_date_1 = '<strong>Error:</strong> The database structure appears to be out of date (config(databaseversion) is 0 and old upgrade tables exist). Version 1.x of MantisBT introduced a new upgrade process. You appear to be upgrading from a 0.XX Release. Please upgrade to 1.0.8 or 1.1.X, then upgrade to 1.2.'; +$s_error_database_no_schema_version = '<strong>Error:</strong> The database structure appears to be out of date (config(databaseversion) is 0 and old upgrade tables do not exist). Please check that your database is running - we can not retrieve the database schema version. Config Table did not return a valid database schema version - please ask for support on the mantis-help mailing list if required.'; +$s_error_database_version_out_of_date_2 = '<strong>Warning:</strong> The database structure may be out of date. Please upgrade <a href="admin/install.php">here</a> before logging in.'; +$s_error_code_version_out_of_date = '<strong>Warning:</strong> The database structure is more up-to-date than the code installed. Please upgrade the code.'; # login_page.php #@@@ should the following string be related to $g_window_title? @@ -788,7 +788,7 @@ $s_last_visit = 'Last Visit'; $s_edit_user_link = 'Edit User'; # manage_config_email_page -$s_config_all_projects = 'Note: These configurations affect ALL PROJECTS, unless overridden at the project level.'; +$s_config_all_projects = 'Note: These configurations affect all projects, unless overridden at the project level.'; $s_config_project = 'Note: These configurations affect only the %1$s project.'; $s_colour_coding = 'In the table below, the following color code applies:'; $s_colour_project = 'Project setting overrides others.'; @@ -991,9 +991,9 @@ $s_reset_password_button = 'Reset Password'; $s_delete_user_button = 'Delete User'; $s_reset_password_msg = 'Reset Password sends the confirmation URL via e-mail.'; $s_reset_password_msg2 = 'Reset Password resets the password to be blank.'; -$s_show_all_users = 'ALL'; -$s_users_unused = 'UNUSED'; -$s_users_new = 'NEW'; +$s_show_all_users = 'All'; +$s_users_unused = 'Unused'; +$s_users_new = 'New'; # manage_user_reset.php $s_account_reset_protected_msg = 'Account protected. Cannot reset the password.'; @@ -1378,7 +1378,7 @@ $s_relationship_with_parent = 'Relationship with the parent issue'; $s_delete_relationship_button = 'Delete'; $s_delete_relationship_sure_msg = 'Are you sure you wish to delete this relationship?'; $s_relationship_warning_blocking_bugs_not_resolved = 'Not all the children of this issue are yet resolved or closed.'; -$s_relationship_warning_blocking_bugs_not_resolved_2 = '<b>ATTENTION</b>. Not all the children of this issue are yet resolved or closed.<br />Before <b>resolving/closing</b> a parent issue, all the issues related as child with this one should be resolved or closed.'; +$s_relationship_warning_blocking_bugs_not_resolved_2 = '<b>Attention:</b> Not all the children of this issue are yet resolved or closed.<br />Before <b>resolving/closing</b> a parent issue, all the issues related as child with this one should be resolved or closed.'; $s_create_child_bug_button = 'Create Clone'; $s_bug_cloned_to = 'Issue cloned'; $s_bug_created_from = 'Issue generated from'; @@ -1398,7 +1398,7 @@ $s_checkin = 'Checkin'; # Pemissions report $s_perm_rpt_capability = 'Capability'; $s_view = 'View'; -$s_issues = 'ISSUES'; +$s_issues = 'Issues'; $s_report_issue = 'Report an issue'; $s_update_issue = 'Update an issue'; $s_monitor_issue = 'Monitor an issue'; @@ -1412,12 +1412,12 @@ $s_update_issue_status = 'Update issue status'; $s_set_view_status = 'Set view status (public vs private)'; $s_update_view_status = 'Update view status (public vs private)'; $s_show_list_of_users_monitoring_issue = 'Show list of users monitoring issue'; -$s_notes = 'NOTES'; +$s_notes = 'Notes'; $s_add_notes = 'Add notes'; $s_update_notes = 'Update notes'; $s_delete_note = 'Delete note'; $s_view_private_notes = 'View private notes'; -$s_news = 'NEWS'; +$s_news = 'News'; $s_view_private_news = 'View private news'; $s_manage_news = 'Manage news'; $s_view_list_of_attachments = 'View list of attachments'; @@ -1435,17 +1435,17 @@ $s_delete_project = 'Delete project'; $s_manage_project = 'Manage project'; $s_manage_user_access_to_project = 'Manage user access to a project'; $s_automatically_included_in_private_projects = 'Automatically included in private projects'; -$s_project_documents = 'PROJECT DOCUMENTS'; +$s_project_documents = 'Project Documents'; $s_view_project_documents = 'View project documents'; $s_upload_project_documents = 'Upload project documents'; $s_link_custom_fields_to_projects = 'Link custom fields to projects'; -$s_sponsorships = 'SPONSORSHIPS'; +$s_sponsorships = 'Sponsorships'; $s_view_sponsorship_details = 'View sponsorship details'; $s_view_sponsorship_total = 'View sponsorship total'; $s_sponsor_issue = 'Sponsor issue'; $s_assign_sponsored_issue = 'Assign sponsored issue'; $s_handle_sponsored_issue = 'Handle sponsored issue'; -$s_others = 'OTHERS'; +$s_others = 'Others'; $s_see_email_addresses_of_other_users = 'See e-mail addresses of other users'; $s_send_reminders = 'Send reminders'; $s_add_profiles = 'Add profiles'; @@ -1510,7 +1510,7 @@ $s_tag_related = 'Related Tags'; $s_tag_related_issues = 'Shared Issues (%1$s)'; $s_tag_stats_attached = 'Issues attached: %1$s'; $s_tag_create = 'Create Tag'; -$s_show_all_tags = 'ALL'; +$s_show_all_tags = 'All'; # Time Tracking $s_time_tracking_billing_link = 'Billing'; ----------------------------------------------------------------------- -- Mantis Bug Tracker |