Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: EllisLab/EE-Language-English
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.0.7
Choose a base ref
...
head repository: EllisLab/EE-Language-English
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.0.8
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Jan 26, 2018

  1. 4.0.8 release

    Derek Jones committed Jan 26, 2018
    Copy the full SHA
    dbfa1df View commit details
Showing with 8 additions and 3 deletions.
  1. +2 −1 README.md
  2. +2 −0 user/language/english/core_lang.php
  3. +2 −0 user/language/english/members_lang.php
  4. +1 −1 user/language/english/settings_lang.php
  5. +1 −1 user/language/english/spam_lang.php
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ English Language Pack for ExpressionEngine 4
Changes Between Versions
------------------------

- [4.0.7 → 4.0.8](https://github.com/EllisLab/EE-Language-English/compare/4.0.7...4.0.8)
- [4.0.6 → 4.0.7](https://github.com/EllisLab/EE-Language-English/compare/4.0.6...4.0.7)
- [4.0.5 → 4.0.6](https://github.com/EllisLab/EE-Language-English/compare/4.0.5...4.0.6)
- [4.0.4 → 4.0.5](https://github.com/EllisLab/EE-Language-English/compare/4.0.4...4.0.5)
@@ -17,7 +18,7 @@ Changes Between Versions
License
-------

Copyright (C) 2009-2017 EllisLab, Inc.
Copyright (C) 2009-2018 EllisLab, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
2 changes: 2 additions & 0 deletions user/language/english/core_lang.php
View file
Original file line number Diff line number Diff line change
@@ -121,6 +121,8 @@

'missing_mime_config' => 'Cannot import your mime-type whitelist: the file %s does not exist or cannot be read.',

'license_disabled' => 'Your software license has been disabled or upgraded. Please visit your <a href="%s">License & Registration</a> page and install the active license from your <a href="%s" title="download account" rel="external">Download Account</a>. If this error persists, please contact your system administrator.',

'new_version_error' => 'An unexpected error occurred attempting to download the current ExpressionEngine version number. Please visit your <a href="%s" title="download account" rel="external">Download Account</a> to verify you are on the current version. If this error persists, please contact your system administrator',

'nonexistent_page' => 'The page you requested was not found',
2 changes: 2 additions & 0 deletions user/language/english/members_lang.php
View file
Original file line number Diff line number Diff line change
@@ -136,6 +136,8 @@

'heir_to_members_entries' => 'Some of these members have entries assigned to their accounts. What would you like to do with those entries?',

'heir_required' => 'You must select an account to reassign entries to.',

'include_in_authorlist' => 'Author lists',

'include_in_memberlist' => 'Member lists',
2 changes: 1 addition & 1 deletion user/language/english/settings_lang.php
View file
Original file line number Diff line number Diff line change
@@ -723,7 +723,7 @@

'cookie_path' => 'Path',

'cookie_path_desc' => 'Path to apply cookies to the above domain. (<a href="%s">more info</a>)',
'cookie_path_desc' => 'Path to apply cookies to the above domain. (<a href="%s" rel="external">more info</a>)',

'cookie_prefix' => 'Prefix',

2 changes: 1 addition & 1 deletion user/language/english/spam_lang.php
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
* ExpressionEngine (https://expressionengine.com)
*
* @link https://expressionengine.com/
* @copyright Copyright (c) 2003-2017, EllisLab, Inc. (https://ellislab.com)
* @copyright Copyright (c) 2003-2018, EllisLab, Inc. (https://ellislab.com)
* @license https://expressionengine.com/license
*/