add BMP to JPG string and move JPG to PNG setting

common.php

@@ -14500,12 +14500,14 @@ class_exists( 'EWWW\ExactDN' ) &&
 		<?php
 		return;
 	endif;
-	/* translators: 1: JPG, GIF or PNG 2: JPG or PNG */
+	/* translators: 1: JPG, GIF, BMP or PNG 2: JPG or PNG */
 	$jpg2png = sprintf( __( '%1$s to %2$s Conversion', 'ewww-image-optimizer' ), 'JPG', 'PNG' );
-	/* translators: 1: JPG, GIF or PNG 2: JPG or PNG */
+	/* translators: 1: JPG, GIF, BMP or PNG 2: JPG or PNG */
 	$png2jpg = sprintf( __( '%1$s to %2$s Conversion', 'ewww-image-optimizer' ), 'PNG', 'JPG' );
-	/* translators: 1: JPG, GIF or PNG 2: JPG or PNG */
+	/* translators: 1: JPG, GIF, BMP or PNG 2: JPG or PNG */
 	$gif2png = sprintf( __( '%1$s to %2$s Conversion', 'ewww-image-optimizer' ), 'GIF', 'PNG' );
+	/* translators: 1: JPG, GIF, BMP or PNG 2: JPG or PNG */
+	$bmp2jpg = sprintf( __( '%1$s to %2$s Conversion', 'ewww-image-optimizer' ), 'BMP', 'JPG' );
 	?>
 
 		<div id='ewww-conversion-settings'>
@@ -14536,17 +14538,6 @@ class_exists( 'EWWW\ExactDN' ) &&
 						<span><?php esc_html_e( 'This will remove the original image from the server after a successful conversion.', 'ewww-image-optimizer' ); ?></span>
 					</td>
 				</tr>
-				<tr>
-					<th scope='row'>
-						<label for='ewww_image_optimizer_jpg_to_png'><?php echo esc_html( $jpg2png ); ?></label>
-						<span><?php ewwwio_help_link( 'https://docs.ewww.io/article/14-converting-images', '58545a86c697912ffd6c1b53' ); ?></span>
-					</th>
-					<td>
-						<input type='checkbox' id='ewww_image_optimizer_jpg_to_png' name='ewww_image_optimizer_jpg_to_png' value='true' <?php checked( ewww_image_optimizer_get_option( 'ewww_image_optimizer_jpg_to_png' ) ); ?> />
-						<span><b><?php esc_html_e( 'WARNING:', 'ewww-image-optimizer' ); ?></b> <?php	esc_html_e( 'Removes metadata and increases cpu usage dramatically.', 'ewww-image-optimizer' ); ?></span>
-						<p class='description'><?php esc_html_e( 'PNG is generally much better than JPG for logos and other images with a limited range of colors. Checking this option will slow down JPG processing significantly, and you may want to enable it only temporarily.', 'ewww-image-optimizer' ); ?></p>
-					</td>
-				</tr>
 				<tr>
 					<th scope='row'>
 						<label for='ewww_image_optimizer_png_to_jpg'><?php echo esc_html( $png2jpg ); ?></label>
@@ -14573,6 +14564,17 @@ class_exists( 'EWWW\ExactDN' ) &&
 						<p class='description'><?php esc_html_e( 'PNG is generally better than GIF, but animated images cannot be converted.', 'ewww-image-optimizer' ); ?></p>
 					</td>
 				</tr>
+				<tr>
+					<th scope='row'>
+						<label for='ewww_image_optimizer_jpg_to_png'><?php echo esc_html( $jpg2png ); ?></label>
+						<span><?php ewwwio_help_link( 'https://docs.ewww.io/article/14-converting-images', '58545a86c697912ffd6c1b53' ); ?></span>
+					</th>
+					<td>
+						<input type='checkbox' id='ewww_image_optimizer_jpg_to_png' name='ewww_image_optimizer_jpg_to_png' value='true' <?php checked( ewww_image_optimizer_get_option( 'ewww_image_optimizer_jpg_to_png' ) ); ?> />
+						<span><b><?php esc_html_e( 'WARNING:', 'ewww-image-optimizer' ); ?></b> <?php	esc_html_e( 'Removes metadata and increases cpu usage dramatically.', 'ewww-image-optimizer' ); ?></span>
+						<p class='description'><?php esc_html_e( 'PNG is generally much better than JPG for logos and other images with a limited range of colors. Checking this option will slow down JPG processing significantly, and you may want to enable it only temporarily.', 'ewww-image-optimizer' ); ?></p>
+					</td>
+				</tr>
 	<?php else : ?>
 				<tr>
 					<th>&nbsp;</th>