Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove "sorry" strings (except in mail templates) #7813

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions Themes/default/languages/Errors.english.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Themes/default/languages/Install.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
$txt['error_session_missing'] = 'The installer was unable to detect sessions support in your server\'s installation of PHP. Please ask your host to ensure that PHP was compiled with session support (which in fact is the PHP default, meaning your host currently has explicitly disabled it).';
$txt['error_user_settings_again_match'] = 'You typed in two completely different passwords!';
$txt['error_user_settings_no_password'] = 'Your password must be at least four characters long.';
$txt['error_user_settings_taken'] = 'Sorry, a member is already registered with that username and/or email address.<br><br>A new account has not been created.';
$txt['error_user_settings_taken'] = 'A member is already registered with that username and/or email address.<br><br>A new account has not been created.';
$txt['error_user_settings_query'] = 'A database error occurred while trying to create an administrator. This error was:';
$txt['error_sourcefile_missing'] = 'Unable to find the Sources/%1$s file. Please make sure it was uploaded properly, and then try again.';
$txt['error_db_alter_priv'] = 'The database account you specified does not have permission to ALTER, CREATE, and/or DROP tables in the database. This is necessary for SMF to function properly.';
Expand Down
2 changes: 1 addition & 1 deletion Themes/default/languages/Login.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

$txt['login_hash_error'] = 'Password security has recently been upgraded. Please enter your password again.';

$txt['ban_register_prohibited'] = 'Sorry, you are not allowed to sign up on this forum.';
$txt['ban_register_prohibited'] = 'You are not allowed to sign up on this forum.';

$txt['activate_account'] = 'Account activation';
$txt['activate_success'] = 'Your account has been successfully activated. You can now proceed to login.';
Expand Down
2 changes: 1 addition & 1 deletion Themes/default/languages/ManagePaid.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
$txt['paid_count_not_find_subscription'] = 'Paid subscription handler could not find subscription for member ID: %1$s, subscription ID: %2$s';
$txt['paid_count_not_find_subscription_log'] = 'Paid subscription handler could not find subscription log entry for member ID: %1$s, subscription ID: %2$s';
$txt['paid_count_not_find_outstanding_payment'] = 'Could not find outstanding payment entry for member ID: %1$s, subscription ID: %2$s so ignoring';
$txt['paid_admin_not_setup_gateway'] = 'Sorry, the admin has not yet finished setting up paid subscriptions. Please check back later.';
$txt['paid_admin_not_setup_gateway'] = 'The admin has not yet finished setting up paid subscriptions. Please check back later.';
$txt['paid_make_recurring'] = 'Make this a recurring payment';

$txt['subscriptions'] = 'Subscriptions';
Expand Down
2 changes: 1 addition & 1 deletion Themes/default/languages/ManageSettings.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@
$txt['languages_txt_for_timezones'] = 'Place names';
$txt['languages_txt_for_email_templates'] = 'Email message templates';
$txt['languages_enter_key'] = 'Enter a variable name for this text string';
$txt['languages_invalid_key'] = 'Sorry, but this variable name is invalid: ';
$txt['languages_invalid_key'] = 'This variable name is invalid: ';

$txt['allow_cors'] = 'Allow CORS (Cross Origin Resource Sharing)';
$txt['allow_cors_credentials'] = 'Allow sending credentials over CORS';
Expand Down
4 changes: 2 additions & 2 deletions Themes/default/languages/ModerationCenter.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
$txt['report_action_message_edited'] = 'You successfully edited the note.';
$txt['report_action_message_deleted'] = 'The note was successfully deleted.';
$txt['report_action_message_edit_issue'] = 'The note you are trying to edit is not available any more. Please check if it wasn\'t deleted already.';
$txt['report_action_message_edit_cannot'] = 'I am sorry, you are not allowed to edit this note.';
$txt['report_action_message_delete_cannot'] = 'I am sorry, you are not allowed to delete this note.';
$txt['report_action_message_edit_cannot'] = 'You are not allowed to edit this note.';
$txt['report_action_message_delete_cannot'] = 'You are not allowed to delete this note.';
$txt['report_action_message_delete_issue'] = 'The note you are trying to delete is not available any more. Please check if it wasn\'t deleted already.';
$txt['report_action_ignore'] = 'The report was successfully ignored.';
$txt['report_action_unignore'] = 'The report was successfully un-ignored.';
Expand Down
4 changes: 2 additions & 2 deletions Themes/default/languages/Packages.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
$txt['browse_installed'] = 'Browse installed mods';
$txt['uninstall'] = 'Uninstall';
$txt['package_delete_list_warning'] = 'Are you sure you wish to clear the installed modification list?';
$txt['php_safe_mode'] = 'Sorry, your server currently has PHP set to run in SAFE MODE. This feature is not compatible with SAFE MODE.';
$txt['php_safe_mode'] = 'Your server currently has PHP set to run in SAFE MODE. This feature is not compatible with SAFE MODE.';
$txt['lets_try_anyway'] = 'Let me try anyway.';

$txt['could_not_package_backup'] = 'A backup could not be made before making changes. No changes have been made at this time as a result (either change the permissions so Packages/backup can be written to, or turn off backups - not recommended)';
Expand Down Expand Up @@ -182,7 +182,7 @@
$txt['package_no_zlib'] = 'zlib';
$txt['package_no_phar'] = 'phar';
$txt['package_no_package_manager'] = 'the package manager';
$txt['package_no_lib'] = 'Sorry, your PHP configuration doesn\'t have support for <strong>"%1$s"</strong>. Without this, %2$s cannot function. Please contact your host about this for more information.';
$txt['package_no_lib'] = 'Your PHP configuration doesn\'t have support for <strong>"%1$s"</strong>. Without this, %2$s cannot function. Please contact your host about this for more information.';

$txt['package_cleanperms_title'] = 'Cleanup Permissions';
$txt['package_cleanperms_desc'] = 'This interface allows you to reset the permissions for files throughout your installation, so as to increase security or solve any permission problems you may encounter while installing packages.';
Expand Down
6 changes: 3 additions & 3 deletions Themes/default/languages/Post.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@

$txt['more_attachments'] = 'more attachments';
// Don't use entities in the below string.
$txt['more_attachments_error'] = 'Sorry, you aren\'t allowed to post any more attachments.';
$txt['more_attachments_error'] = 'You aren\'t allowed to post any more attachments.';

$txt['more_smileys'] = 'more';
$txt['more_smileys_title'] = 'Additional smileys';
Expand Down Expand Up @@ -167,8 +167,8 @@
$txt['attach_error_title'] = 'Error uploading attachments.';
$txt['attach_warning'] = 'There was a problem during the uploading of <strong>%1$s</strong>.';
$txt['attach_check_nag'] = 'Unable to continue due to incomplete data (%1$s).';
$txt['attach_max_total_file_size'] = 'Sorry, you are out of attachment space. The total attachment size allowed per post is %1$s KB. Space remaining is %2$s KB.';
$txt['attach_max_total_file_size_current'] = 'Sorry, you are out of attachment space. The current total attachment size allowed per post is {currentTotal} KB. The total amount of the selected files is {currentRemain} KB. Please delete one or more attachments.';
$txt['attach_max_total_file_size'] = 'You are out of attachment space. The total attachment size allowed per post is %1$s KB. Space remaining is %2$s KB.';
$txt['attach_max_total_file_size_current'] = 'You are out of attachment space. The current total attachment size allowed per post is {currentTotal} KB. The total amount of the selected files is {currentRemain} KB. Please delete one or more attachments.';
$txt['attach_max_size_progress'] = 'The current total attachment size allowed per post is {currentTotal} KB. The total amount of the selected files is {currentRemain} KB.';
$txt['attach_folder_warning'] = 'The attachments directory can not be located. Please notify an administrator of this problem.';
$txt['attach_folder_admin_warning'] = 'The path to the attachments directory (%1$s) is incorrect. Please correct it in the attachment settings area of your admin panel.';
Expand Down
6 changes: 3 additions & 3 deletions Themes/default/languages/Profile.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
$txt['secret_answer'] = 'Answer';
$txt['secret_ask'] = 'Ask me my question';
$txt['cant_retrieve'] = 'You can\'t retrieve your password, but you can set a new one by following a link sent to you by email. You also have the option of setting a new password by answering your secret question.';
$txt['incorrect_answer'] = 'Sorry, but you did not specify a valid combination of Secret Question and Answer in your profile. Please click on the back button, and use the default method of obtaining your password.';
$txt['incorrect_answer'] = 'You did not specify a valid combination of Secret Question and Answer in your profile. Please click on the back button, and use the default method of obtaining your password.';
$txt['enter_new_password'] = 'Please enter the answer to your question, and the password you would like to use. Your password will be changed to the one you select provided you answer the question correctly.';
$txt['secret_why_blank'] = 'why is this blank?';

Expand Down Expand Up @@ -289,8 +289,8 @@
$txt['reminder_password_set'] = 'Password successfully set';
$txt['reminder_error'] = '%1$s failed to answer their secret question correctly when attempting to change a forgotten password.';

$txt['registration_not_approved'] = 'Sorry, this account has not yet been approved. If you need to change your email address please click <a href="%1$s">here</a>.';
$txt['registration_not_activated'] = 'Sorry, this account has not yet been activated. If you need to resend the activation email please click <a href="%1$s">here</a>';
$txt['registration_not_approved'] = 'This account has not yet been approved. If you need to change your email address please click <a href="%1$s">here</a>.';
$txt['registration_not_activated'] = 'This account has not yet been activated. If you need to resend the activation email please click <a href="%1$s">here</a>';

$txt['primary_membergroup'] = 'Primary Membergroup';
$txt['post_based_membergroup'] = 'Post Based Membergroup';
Expand Down
8 changes: 4 additions & 4 deletions Themes/default/languages/index.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,11 @@
$txt['time_offset'] = 'Time Offset';
$txt['or'] = 'or';

$txt['no_matches'] = 'Sorry, no matches were found';
$txt['no_matches'] = 'No matches were found';

$txt['notification'] = 'Notification';

$txt['your_ban'] = 'Sorry %1$s, you are banned from using this forum!';
$txt['your_ban'] = '%1$s, you are banned from using this forum!';
$txt['your_ban_expires'] = 'This ban is set to expire %1$s.';
$txt['your_ban_expires_never'] = 'This ban is not set to expire.';
$txt['ban_continue_browse'] = 'You may continue to browse the forum as a guest.';
Expand Down Expand Up @@ -613,7 +613,7 @@
$txt['etc'] = 'etc.';

$txt['hostname'] = 'Hostname';
$txt['you_are_post_banned'] = 'Sorry %1$s, you are banned from posting and sending personal messages on this forum.';
$txt['you_are_post_banned'] = '%1$s, you are banned from posting and sending personal messages on this forum.';
$txt['ban_reason'] = 'Reason';
$txt['select_item_check'] = 'Please select at least one item in the list';

Expand Down Expand Up @@ -736,7 +736,7 @@
$txt['smileys_forum_board_default'] = 'Forum/Board Default';

$txt['search_results'] = 'Search Results';
$txt['search_no_results'] = 'Sorry, no matches were found';
$txt['search_no_results'] = 'No matches were found';

$txt['total_time_logged_days'] = ' days, ';
$txt['total_time_logged_hours'] = ' hours and ';
Expand Down