diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
| commit | 0c06a181819249c6a4a2a6c60e13f739df1f2253 (patch) | |
| tree | 859377c572d0acbfc520b02304ef515bf3aebbe0 /inc/lang/en/lang.php | |
| parent | ef7e36e4fd2a168977754f0aac1d855fb651f104 (diff) | |
| parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
| download | rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.gz rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements
Conflicts:
lib/tpl/dokuwiki/css/basic.css
Diffstat (limited to 'inc/lang/en/lang.php')
| -rw-r--r-- | inc/lang/en/lang.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 2ba220e64..7f0bf05e9 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -99,6 +99,7 @@ $lang['searchmedia_in'] = 'Search in %s'; $lang['txt_upload'] = 'Select file to upload'; $lang['txt_filename'] = 'Upload as (optional)'; $lang['txt_overwrt'] = 'Overwrite existing file'; +$lang['maxuploadsize'] = 'Upload max. %s per file.'; $lang['lockedby'] = 'Currently locked by'; $lang['lockexpire'] = 'Lock expires at'; @@ -190,7 +191,7 @@ $lang['lastmod'] = 'Last modified'; $lang['by'] = 'by'; $lang['deleted'] = 'removed'; $lang['created'] = 'created'; -$lang['restored'] = 'old revision restored'; +$lang['restored'] = 'old revision restored (%s)'; $lang['external_edit'] = 'external edit'; $lang['summary'] = 'Edit summary'; $lang['noflash'] = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.'; |