Merge ../pl

Conflicts:
	post.php

inc/config.php

@@ -1105,9 +1105,9 @@
 
 	// Static images. These can be URLs OR base64 (data URI scheme). These are only used if
 	// $config['font_awesome'] is false (default).
-	// $config['image_sticky']	= 'static/sticky.gif';
+	// $config['image_sticky']	= 'static/sticky.png';
 	// $config['image_locked']	= 'static/locked.gif';
-	// $config['image_bumplocked']	= 'static/sage.gif'.
+	// $config['image_bumplocked']	= 'static/sage.png'.
 
 	// If you want to put images and other dynamic-static stuff on another (preferably cookieless) domain.
 	// This will override $config['root'] and $config['dir']['...'] directives. "%s" will get replaced with

post.php

@@ -692,7 +692,7 @@ if (isset($_POST['delete'])) {
 				if (!$config['redraw_image'] && $config['use_exiftool']) {
 					if($error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
 						escapeshellarg($file['tmp_name'])))
-						error(_('Could not strip EXIF metadata!', null, $error));
+						error(_('Could not strip EXIF metadata!'), null, $error);
 				} else {
 					$image->to($file['file']);
 					$dont_copy_file = true;