diff options
| author |  Ed Sandor <1273949+ewsandor@users.noreply.github.com>
| 2020-06-19 14:59:27 -0600 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-06-19 22:59:27 +0200 |
| commit | baaef3d9f4bdc81224620ab2f6b92575dcf81a59 (patch) | |
| tree | 01a5d21ab64d4c058fa3f92a33441c07963ec3f5 /app/i18n/en/feedback.php | |
| parent | 9489cca1e3560e20614f73e5bfc570e8b6513b4a (diff) | |
3041 en us localization (#3060)
* Initial locaization from international english to United States English
examples:
favourite -> favorite
optimise -> optimize
occured -> occurred
labelled -> labelled
ok -> okay
* More spelling corrections
default English occured->occurred
cancelled -> canceled
labelled -> labeled
* Undo key spelling change
* i18n format and admin.php translating
* Translating admin.php
* more admin.php translating
* Translating conf.php
* Translating feedback.php and format command
* Translating gen.php
* Translating index.php
* Translating sub.php
* Translating user.php
* Translating install.php
* Fix 'there is no idle feed'
* FIx 'there is no feed to refresh"
* Add i18n manipulation option to ignore all unmodified translation keys
* Lint fixes
* Update keys newly add since original branch
* Revert unintenntional ru 'translation'
* Code review revisions
* Fix leading whitespace in ignore_unmodified api
* Update app/i18n/en-us/gen.php
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
* Update app/i18n/en-us/admin.php
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
* Update app/i18n/en-us/admin.php
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
* Update error message for Make ignore-unmodified keys to use Make syntax.
(inline with 3062) Also rename ignore-unmodifed-key ->
ignore-unmodified-keys
* Replace makefile leading spaces with tabs
* Code review revisions
* Retab added php functions
* Missed tab replace
* Remove stray '-> todo'
Co-authored-by: root <root@x-freshrss.lan.ewsandor.com>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Diffstat (limited to 'app/i18n/en/feedback.php')
| -rw-r--r-- | app/i18n/en/feedback.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php index 6d6796dda..5bd5469ca 100644 --- a/app/i18n/en/feedback.php +++ b/app/i18n/en/feedback.php @@ -16,7 +16,7 @@ return array( ), 'auth' => array( 'form' => array( - 'not_set' => 'A problem occured during authentication system configuration. Please retry later.', + 'not_set' => 'A problem occurred during authentication system configuration. Please retry later.', 'set' => 'Form is now your default authentication system.', ), 'login' => array( @@ -56,7 +56,7 @@ return array( 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred', 'file_cannot_be_uploaded' => 'File cannot be uploaded!', 'no_zip_extension' => 'ZIP extension is not present on your server.', - 'zip_error' => 'An error occured during ZIP import.', + 'zip_error' => 'An error occurred during ZIP import.', ), 'profile' => array( 'error' => 'Your profile cannot be modified', |