diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
| commit | 8702de7f7e170bddfdb622c393c3cac3446fd1c5 (patch) | |
| tree | c7269ea61f5d4230a6f916dbabee4ce412e0a9fb /inc/lang/en/lang.php | |
| parent | 1cc82e5c76ae7fcd646e448404afdc0fd458bf55 (diff) | |
| parent | 9a0ca2cfd8ac42895af3be2efbd2cab7e6d33578 (diff) | |
| download | rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.gz rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into scrutinizerissues
Conflicts:
inc/media.php
inc/plugin.php
inc/template.php
lib/plugins/authplain/_test/escaping.test.php
lib/plugins/syntax.php
Diffstat (limited to 'inc/lang/en/lang.php')
| -rw-r--r-- | inc/lang/en/lang.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 9c1e5dacd..fb455f85f 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -70,6 +70,7 @@ $lang['badpassconfirm'] = 'Sorry, the password was wrong'; $lang['minoredit'] = 'Minor Changes'; $lang['draftdate'] = 'Draft autosaved on'; // full dformat date will be added $lang['nosecedit'] = 'The page was changed in the meantime, section info was out of date loaded full page instead.'; +$lang['searchcreatepage'] = 'If you didn\'t find what you were looking for, you can create or edit the page named after your query with the appropriate tool.'; $lang['regmissing'] = 'Sorry, you must fill in all fields.'; $lang['reguexists'] = 'Sorry, a user with this login already exists.'; @@ -367,4 +368,6 @@ $lang['currentns'] = 'Current namespace'; $lang['searchresult'] = 'Search Result'; $lang['plainhtml'] = 'Plain HTML'; $lang['wikimarkup'] = 'Wiki Markup'; +$lang['page_nonexist_rev'] = 'Page did not exist at %s. It was subsequently created at <a href="%s">%s</a>.'; +$lang['unable_to_parse_date'] = 'Unable to parse at parameter "%s".'; //Setup VIM: ex: et ts=2 : |