diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-30 20:12:15 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-30 20:12:15 +0200 |
| commit | bbb83c09c0f53fda26ff0d06083bf900f4babdae (patch) | |
| tree | 2b67788b30422a33675e43cc5e23f397508ae948 /phpBB/language/en/acp/common.php | |
| parent | 807e000b912a30f3c8010dd7c2acdfa04f6c5392 (diff) | |
| parent | fa3a634ae11af0a89000d5770b1c3fae10486195 (diff) | |
| download | forums-bbb83c09c0f53fda26ff0d06083bf900f4babdae.tar forums-bbb83c09c0f53fda26ff0d06083bf900f4babdae.tar.gz forums-bbb83c09c0f53fda26ff0d06083bf900f4babdae.tar.bz2 forums-bbb83c09c0f53fda26ff0d06083bf900f4babdae.tar.xz forums-bbb83c09c0f53fda26ff0d06083bf900f4babdae.zip | |
Merge pull request #2508 from ptitlazy/ticket/12597
[ticket/12597] Command for executing all available cron tasks
* ptitlazy/ticket/12597: (27 commits)
[ticket/12597] Reformating an acp message
[ticket/12597] Modifiying acp message
[ticket/12597] Fix wrong global variable name
[ticket/12597] Typo correction
[ticket/12597] Typo corrections
[ticket/12597] Changing place of lock release in execute() method
[ticket/12597] Fix test file
[ticket/12597] Typing corrections and improvement of code consistency
[ticket/12597] Fix various mistakes
[ticket/12597] Fix various mistakes
[ticket/12597] Fix visibilty of two functions in run.php
[ticket/12597] Refactoring and test improving
[ticket/12597] Fix language key name
[ticket/12597] Fix coding style and typing mistakes
[ticket/12597] Changes name of command cron:run-all to cron:run.
[ticket/12597] Fix various problems
[ticket/12597] Fix constructor bug and servral doc blocs
[ticket/12597] Modification of return statuses and of test files
[ticket/12597] Fix misplaced release of db lock
[ticket/12597] Change EXECUTE to RUN in language
...
Diffstat (limited to 'phpBB/language/en/acp/common.php')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index d340e467be..a9c5eaf184 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -223,8 +223,14 @@ $lang = array_merge($lang, array( 'BACK' => 'Back', + 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all available cron tasks.', + 'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run', + 'COLOUR_SWATCH' => 'Web-safe colour swatch', 'CONFIG_UPDATED' => 'Configuration updated successfully.', + 'CRON_LOCK_ERROR' => 'Could not obtain cron lock.', + 'CRON_NO_SUCH_TASK' => 'No such cron task', + 'CRON_NO_TASK' => 'No task to be run', 'DEACTIVATE' => 'Deactivate', 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path “%s” does not exist.', @@ -285,6 +291,7 @@ $lang = array_merge($lang, array( 'REMIND' => 'Remind', 'RESYNC' => 'Resynchronise', + 'RUNNING_TASK' => 'Running task: %s.', 'SELECT_ANONYMOUS' => 'Select anonymous user', 'SELECT_OPTION' => 'Select option', |