summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorMarcin Łabanowski <marcin@6irc.net>2014-10-05 17:56:46 +0200
committerMarcin Łabanowski <marcin@6irc.net>2014-10-05 17:56:46 +0200
commit97a25dad036b9606485570140241335103cde4f3 (patch)
treefaaf7a8dc0dac921efdab65dff13976f4803e241 /inc
parentd01d892896022b1eb81a73fb6c4e6ad180444fdb (diff)
parent3c2529e157c4f51e59e107016c4c06d3026d43d6 (diff)
Merge pull request #102 from cable6-dev/bugfix-genwebmerror
[bugfix]$config['error']['genwebmerror'] wasn't set in config.php
Diffstat (limited to 'inc')
-rw-r--r--inc/config.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/inc/config.php b/inc/config.php
index 93fc7687..1a75cad0 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1049,10 +1049,11 @@
$config['error']['unknownext'] = _('Unknown file extension.');
$config['error']['filesize'] = _('Maximum file size: %maxsz% bytes<br>Your file\'s size: %filesz% bytes');
$config['error']['maxsize'] = _('The file was too big.');
- $config['error']['webmerror'] = _('There was a problem processing your webm.');
- $config['error']['invalidwebm'] = _('Invalid webm uploaded.');
- $config['error']['webmhasaudio'] = _('The uploaded webm contains an audio or another type of additional stream.');
- $config['error']['webmtoolong'] = _('The uploaded webm is longer than ' . $config['webm']['max_length'] . ' seconds.');
+ $config['error']['genwebmerror'] = _('There was a problem processing your webm.');
+ $config['error']['webmerror'] = _('There was a problem processing your webm.');//Is this error used anywhere ?
+ $config['error']['invalidwebm'] = _('Invalid webm uploaded.');
+ $config['error']['webmhasaudio'] = _('The uploaded webm contains an audio or another type of additional stream.');
+ $config['error']['webmtoolong'] = _('The uploaded webm is longer than ' . $config['webm']['max_length'] . ' seconds.');
$config['error']['fileexists'] = _('That file <a href="%s">already exists</a>!');
$config['error']['fileexistsinthread'] = _('That file <a href="%s">already exists</a> in this thread!');
$config['error']['delete_too_soon'] = _('You\'ll have to wait another %s before deleting that.');