From 3885812999e729e5a85979e8ab19613b4b558afe Mon Sep 17 00:00:00 2001
From: slothman <slothman>
Date: Wed, 9 Apr 2008 01:57:10 +0000
Subject: [PATCH] Correct thumbnail constraints.  S9Y now supports width,
 height, largest, and smallest constraints.  Backwards compatibility is
 maintained with the imageselectorplus plugin (the only plugin to use the
 thumbnail or aspect calculation code).  Language files are updated and a new
 option screen is displayed after choosing "Rebuild Thumbs".

---
 include/admin/images.inc.php              |  41 ++++-
 include/functions_images.inc.php          | 192 ++++++++++++++++------
 include/tpl/config_local.inc.php          |  10 ++
 lang/UTF-8/serendipity_lang_bg.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_cn.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_cs.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_cz.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_da.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_de.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_en.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_es.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_fa.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_fi.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_fr.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_hu.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_is.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_it.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_ja.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_ko.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_nl.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_no.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_pl.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_pt.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_pt_PT.inc.php |  14 +-
 lang/UTF-8/serendipity_lang_ro.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_ru.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_sa.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_se.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_ta.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_tn.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_tr.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_tw.inc.php    |  14 +-
 lang/UTF-8/serendipity_lang_zh.inc.php    |  14 +-
 lang/serendipity_lang_bg.inc.php          |  15 +-
 lang/serendipity_lang_cn.inc.php          |  14 +-
 lang/serendipity_lang_cs.inc.php          |  14 +-
 lang/serendipity_lang_cz.inc.php          |  14 +-
 lang/serendipity_lang_da.inc.php          |  14 +-
 lang/serendipity_lang_de.inc.php          |  14 +-
 lang/serendipity_lang_en.inc.php          |  18 +-
 lang/serendipity_lang_es.inc.php          |  14 +-
 lang/serendipity_lang_fa.inc.php          |  14 +-
 lang/serendipity_lang_fi.inc.php          |  14 +-
 lang/serendipity_lang_fr.inc.php          |  14 +-
 lang/serendipity_lang_hu.inc.php          |  14 +-
 lang/serendipity_lang_is.inc.php          |  14 +-
 lang/serendipity_lang_it.inc.php          |  14 +-
 lang/serendipity_lang_ja.inc.php          |  14 +-
 lang/serendipity_lang_ko.inc.php          |  14 +-
 lang/serendipity_lang_nl.inc.php          |  14 +-
 lang/serendipity_lang_no.inc.php          |  14 +-
 lang/serendipity_lang_pl.inc.php          |  14 +-
 lang/serendipity_lang_pt.inc.php          |  14 +-
 lang/serendipity_lang_pt_PT.inc.php       |  14 +-
 lang/serendipity_lang_ro.inc.php          |  14 +-
 lang/serendipity_lang_ru.inc.php          |  14 +-
 lang/serendipity_lang_sa.inc.php          |  14 +-
 lang/serendipity_lang_se.inc.php          |  14 +-
 lang/serendipity_lang_ta.inc.php          |  14 +-
 lang/serendipity_lang_tn.inc.php          |  14 +-
 lang/serendipity_lang_tr.inc.php          |  14 +-
 lang/serendipity_lang_tw.inc.php          |  14 +-
 lang/serendipity_lang_zh.inc.php          |  14 +-
 serendipity_admin.php                     |   4 +-
 64 files changed, 975 insertions(+), 117 deletions(-)

diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index fe9e876..791a1f7 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -47,6 +47,33 @@ switch ($serendipity['GET']['adminAction']) {
 
     case 'sync':
         if (!serendipity_checkPermission('adminImagesSync')) {
+            echo '<div class="warning"><em>' . PERM_DENIED . '</em></div>';
+            break;
+        }
+
+        // Make the form to actually do sync with deleting or not
+        $n = "\n";
+        $warning = preg_replace('#\\\n#', '<br />', WARNING_THIS_BLAHBLAH);
+        echo '<div class="serendipityAdminMsgNote">' . $warning . '</div>'; 
+        echo '  <form method="POST" action="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=doSync">' . $n;
+        echo '  <p>' . $n . '  <fieldset>' . $n;
+        echo '  <legend>' . SYNC_OPTION_LEGEND . '</legend>' . $n;
+        echo '    <input type="radio" name="serendipity[deleteThumbs]" value="no" checked="checked" id="keepthumbs" />' .$n;
+        echo '      <label for="keepthumbs">' . SYNC_OPTION_KEEPTHUMBS . '</label><br />' . $n;
+        echo '    <input type="radio" name="serendipity[deleteThumbs]" value="check" id="sizecheckthumbs" />' . $n;
+        echo '      <label for="sizecheckthumbs">' . SYNC_OPTION_SIZECHECKTHUMBS . '</label><br />' . $n;
+        echo '    <input type="radio" name="serendipity[deleteThumbs]" value="yes" />' . $n;
+        echo '      <label for="deletethumbs">' . SYNC_OPTION_DELETETHUMBS . '</label><br />' . $n;
+        echo '  </fieldset>' . $n . '  </p>' . $n;
+        echo '  <input name="doSync" value="' . CREATE_THUMBS . '" class="serendipityPrettyButton input_button" type="submit" />' . $n;
+        echo '  <a href="serendipity_admin.php" class="serendipityPrettyButton">' . ABORT_NOW . '</a>' . $n;
+        echo '</form>';
+        break;
+
+    case 'doSync':
+        // I don't know how it could've changed, but let's be safe.
+        if (!serendipity_checkPermission('adminImagesSync')) {
+            echo '<div class="warning"><em>' . PERM_DENIED . '</em></div>';
             break;
         }
 
@@ -58,7 +85,19 @@ switch ($serendipity['GET']['adminAction']) {
         echo '<p class="image_synch"><b>' . SYNCING . '</b></p><br />';
         flush();
 
-        $i = serendipity_syncThumbs();
+        $deleteThumbs = false;
+        if (isset($serendipity['POST']['deleteThumbs'])) {
+            switch ($serendipity['POST']['deleteThumbs'])
+            {
+            case 'yes':
+                $deleteThumbs = true;
+                break;
+            case 'check':
+                $deleteThumbs = 'checksize';
+                break;
+            }
+        }
+        $i = serendipity_syncThumbs($deleteThumbs);
         printf(SYNC_DONE, $i);
 
         echo '<p class="image_resize"><b>' . RESIZING . '</b></p><br />';
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 2841fb8..a8e3150 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -643,15 +643,19 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
     } else {
         if ($serendipity['magick'] !== true) {
             if (is_array($size)) {
+                // The caller wants a thumbnail with a specific size
                 $r = serendipity_resize_image_gd($infile, $outfile, $size['width'], $size['height']);
             } else {
-                $r = serendipity_resize_image_gd($infile, $outfile, $size);
+                // The caller wants a thumbnail constrained in the dimension set by config
+                $calc = serendipity_calculate_aspect_size($fdim[0], $fdim[1], $size, $serendipity['thumbConstraint']);
+                $r = serendipity_resize_image_gd($infile, $outfile, $calc[0], $calc[1]);
             }
         } else {
             if (is_array($size)) {
                 $r = $size;
             } else {
-                $r = array('width' => $size, 'height' => $size);
+                $calc = serendipity_calculate_aspect_size($fdim[0], $fdim[1], $size, $serendipity['thumbConstraint']);
+                $r = array('width' => $calc[0], 'height' => $calc[1]);
             }
             $newSize = $r['width'] . 'x' . $r['height'];
             if ($fdim['mime'] == 'application/pdf') {
@@ -788,6 +792,7 @@ function serendipity_generateThumbs() {
 
     $i=0;
     $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total);
+    $msg_printed = false;
 
     foreach ($serendipity['imageList'] AS $k => $file) {
         $is_image = serendipity_isImage($file);
@@ -808,25 +813,37 @@ function serendipity_generateThumbs() {
 
             $oldThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
             $newThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension'];
+            $sThumb = $file['path'] . $file['name'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension'];
             $fdim = @getimagesize($ffull);
 
             if (!file_exists($oldThumb) && !file_exists($newThumb) && ($fdim[0] > $serendipity['thumbSize'] || $fdim[1] > $serendipity['thumbSize'])) {
                 $returnsize = serendipity_makeThumbnail($file['name'] . '.' . $file['extension'], $file['path']);
                 if ($returnsize !== false ) {
-                    printf(RESIZE_BLAHBLAH, $filename . ': ' . $returnsize[0] . 'x' . $returnsize[1]);
+                    // Only print the resize message the first time
+                    if (!$msg_printed) {
+                      printf(RESIZE_BLAHBLAH, THUMBNAIL_SHORT);
+                      echo "\n" . '<ul class="serendipityFileList">' . "\n";
+                      $msg_printed = true;
+                    }
+                    echo '<li>' . $sThumb . ': ' . $returnsize[0] . 'x' . $returnsize[1] . "</li>\n";
                     if (!file_exists($newThumb)) {
-                        printf('<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div><br />', $filename);
+                        printf('<li><div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div></li>' . "\n", $sThumb);
                     } else {
                         $update = true;
                     }
                 }
             } elseif (!file_exists($oldThumb) && !file_exists($newThumb) && $fdim[0] <= $serendipity['thumbSize'] && $fdim[1] <= $serendipity['thumbSize']) {
+                if (!$msg_printed) {
+                    printf(RESIZE_BLAHBLAH, THUMB);
+                    echo "\n" . '<ul class="serendipityFileList">' . "\n";
+                    $msg_printed = true;
+                }
                 $res = @copy($ffull, $newThumb);
                 if (@$res === true) {
-                    printf(THUMBNAIL_USING_OWN . '<br />', $filename);
+                    printf('<li>' . THUMBNAIL_USING_OWN . '</li>' . "\n", $sThumb);
                     $update = true;
                 } else {
-                    printf('<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div><br />', $filename);
+                    printf('<li><div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div></li>' . "\n", $sThumb);
                 }
             }
 
@@ -840,6 +857,12 @@ function serendipity_generateThumbs() {
         }
     }
 
+    // Close the list, if it was created
+    if ($msg_printed) {
+        echo "</ul>\n";
+    }
+
+
     return $i;
 }
 
@@ -1059,7 +1082,7 @@ function serendipity_guessMime($extension) {
  * @access public
  * @return  int     Number of updated thumbnails
  */
-function serendipity_syncThumbs() {
+function serendipity_syncThumbs($deleteThumbs = false) {
     global $serendipity;
 
     $i=0;
@@ -1077,6 +1100,7 @@ function serendipity_syncThumbs() {
 
         $ffull   = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x];
         $fthumb  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+        $sThumb = $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
         $fbase   = basename($f[0]);
         $fdir    = dirname($f[0]) . '/';
         if ($fdir == './') {
@@ -1091,6 +1115,40 @@ function serendipity_syncThumbs() {
         $ft_mime = serendipity_guessMime($f[1]);
         $fdim    = serendipity_getimagesize($ffull, $ft_mime);
 
+        // If we're supposed to delete thumbs, this is the easiest place.
+        if (is_readable($fthumb)) {
+            if ($deleteThumbs === true) {
+                if (@unlink($fthumb)) {
+                    printf(DELETE_THUMBNAIL . "<br />\n", $sThumb);
+                    $i++;
+                }
+            } else if ($deleteThumbs == 'checksize') {
+                // Find existing thumbnail dimensions
+                $tdim = serendipity_getimagesize($fthumb);
+                if ($tdim['noimage']) {
+                    // Delete it so it can be regenerated
+                    if (@unlink($fthumb)) {
+                        printf(DELETE_THUMBNAIL . "<br />\n", $sthumb);
+                        $i++;
+                    }
+                } else {
+                    // Calculate correct thumbnail size from original image
+                    $expect = serendipity_calculate_aspect_size(
+                        $fdim[0], $fdim[1], $serendipity['thumbSize'], $serendipity['thumbConstraint']);
+                    // Check actual thumbnail size
+                    if ($tdim[0] != $expect[0] || $tdim[1] != $expect[1]) {
+                        // This thumbnail is incorrect; delete it so
+                        // it can be regenerated
+                        if (@unlink($fthumb)) {
+                            printf(DELETE_THUMBNAIL . "<br />\n", $sthumb);
+                            $i++;
+                        } 
+                    }
+                }
+            }
+            // else the option is to keep all existing thumbs; do nothing.
+        } // end if thumb exists
+
         $cond = array(
             'and' => "WHERE name = '" . serendipity_db_escape_string($fbase) . "'
                             " . ($fdir != '' ? "AND path = '" . serendipity_db_escape_string($fdir) . "'" : '') . "
@@ -1104,20 +1162,25 @@ function serendipity_syncThumbs() {
 
                                            {$cond['and']}", true, 'assoc');
         if (is_array($rs)) {
+            // This image is in the database.  Check our calculated data against the database data.
             $update    = array();
-            $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $rs['path'] . $rs['name'] . '.' . $rs['thumbnail_name'] . '.' . $rs['extension'];
+            // Is the width correct?
             if (isset($fdim[0]) && $rs['dimensions_width'] != $fdim[0]) {
                 $update['dimensions_width'] = $fdim[0];
             }
 
+            // Is the height correct?
             if (isset($fdim[1]) && $rs['dimensions_height'] != $fdim[1]) {
                 $update['dimensions_height'] = $fdim[1];
             }
 
+            // Is the image size correct?
             if ($rs['size'] != filesize($ffull)) {
                 $update['size'] = filesize($ffull);
             }
 
+            // Has the thumbnail suffix changed?
+            $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $rs['path'] . $rs['name'] . '.' . $rs['thumbnail_name'] . '.' . $rs['extension'];
             if (!file_exists($checkfile) && file_exists($fthumb)) {
                 $update['thumbnail_name'] = $serendipity['thumbSuffix'];
             }
@@ -1246,13 +1309,13 @@ function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newh
     $height = imagesy($in);
 
     if (is_null($newheight)) {
-        $newsizes = serendipity_calculate_aspect_size($width, $height, $newwidth);
+        $newsizes = serendipity_calculate_aspect_size($width, $height, $newwidth, 'width');
         $newwidth = $newsizes[0];
         $newheight = $newsizes[1];
     }
 
     if (is_null($newwidth)) {
-        $newsizes  = serendipity_calculate_aspect_size($width, $height, null, $newheight);
+        $newsizes  = serendipity_calculate_aspect_size($width, $height, $newheight, 'height');
         $newwidth  = $newsizes[0];
         $newheight = $newsizes[1];
     }
@@ -1277,56 +1340,81 @@ function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newh
 }
 
 /**
- * Calculate aspect ratio of an image
+ * Calculate new size for an image, considering aspect ratio and constraint
  *
  * @access public
  * @param   int     Image width
  * @param   int     Image height
- * @param   int     Target width
- * @return  int     Target height
+ * @param   int     Target dimension size
+ * @param   string  Dimension to constrain ('width', 'height', 'largest', 
+                    'smallest'; defaults to original behavior, 'largest')
+ * @return  array   An array with the scaled width and height
  */
-function serendipity_calculate_aspect_size($width, $height, $orig_newwidth, $orig_newheight = null) {
+function serendipity_calculate_aspect_size($width, $height, $size, $constraint = null) {
 
-    // calculate aspect ratio
-    if (!is_null($orig_newheight)) {
-        $div_width  = $width  / $orig_newheight;
-        $div_height = $height / $orig_newheight;
-    } else {
-        $div_width  = $width  / $orig_newwidth;
-        $div_height = $height / $orig_newwidth;
-    }
-
-    if ($div_width <= 1 && $div_height <= 1) {
-        // do not scale small images where both sides are smaller than the thumbnail dimensions
-        $newheight = $height;
-        $newwidth  = $width;
-    } elseif (is_null($orig_newheight) &&  $div_width >= $div_height) {
-        // max width - calculate height, keep width as scaling base
-        $newheight = round($height / $div_width);
-        // make sure the height is at least 1 pixel for extreme images
-        $newheight = ($newheight >= 1 ? $newheight : 1);
-        $newwidth = $orig_newwidth;
-    } elseif (is_null($orig_newwidth) && $div_width >= $div_height) {
-        // max width - calculate height, keep width as scaling base
-        $newwidth = round($width / $div_height);
-        // make sure the height is at least 1 pixel for extreme images
-        $newwidth = ($newwidth >= 1 ? $newwidth : 1);
-        $newheight = $orig_newheight;
-    } elseif (is_null($orig_newheight)) {
-        // max height - calculate width, keep height as scaling base
-        $newheight = $orig_newwidth;
-        $newwidth  = round($width / $div_height);
-        // make sure the width is at least 1 pixel for extreme images
-        $newwidth  = ($newwidth >= 1 ? $newwidth : 1);
+    // Allow for future constraints (idea: 'percent')
+    $known_constraints = array('width', 'height', 'largest', 'smallest');
+
+    // Rearrange params for calls from old imageselectorplus plugin
+    if ($size == null) {
+      $size = $constraint;
+      $constraint = 'smallest';
+    }
+
+    // Normalize relative constraint types
+    if ($constraint == 'largest' || !in_array($constraint, $known_constraints)) {
+        // Original default behavior, included for backwards compatibility
+        // Constrains largest dimension
+        if ($width >= $height) {
+            $constraint = 'width';
+        } else {
+            $constraint = 'height';
+        }
+    } else if ($constraint == 'smallest') {
+        // Only ever called from imageselectorplus plugin, included for
+        // backwards compatibility with its older versions
+        if ($width >= $height) {
+            $constraint = 'height';
+        } else {
+            $constraint = 'width';
+        }
+    }
+
+    // Constraint is now definitely one of the known absolute types,
+    // either 'width' or 'height'
+    if ($constraint == 'height') {
+        // Is the image big enough to resize?
+        if ($height > $size) {
+            // Calculate new size
+            $ratio = $width / $height;
+            $newwidth = round($size * $ratio);
+            // Limit calculated dimension to at least 1px
+            if ($newwidth <= 0) {
+                $newwidth = 1;
+            }
+            $newsize = array($newwidth, $size);
+        } else {
+            // Image is too small to be resized; use original dimensions
+            $newsize = array($width, $height);
+        }
     } else {
-        // max height - calculate width, keep height as scaling base
-        $newwidth = $orig_newheight;
-        $newheight  = round($height / $div_width);
-        // make sure the width is at least 1 pixel for extreme images
-        $newheight = ($newheight >= 1 ? $newheight : 1);
+        // Default constraint is width
+        if ($width > $size) {
+            // Image is big enough to resize
+            $ratio = $height / $width;
+            $newheight = round($size * $ratio);
+            // Limit calculated dimension to at least 1px
+            if ($newheight <= 0) { 
+                $newheight = 1; 
+            }
+            $newsize = array($size, $newheight);
+        } else {
+            // Do not scale small images
+            $newsize = array($width, $height);
+        }
     }
 
-    return array($newwidth, $newheight);
+    return $newsize;
 }
 
 /**
@@ -2665,7 +2753,7 @@ function serendipity_prepareMedia(&$file, $url = '') {
             $file['preview'] = '<a href="'. $file['preview_url'] .'">'. $file['preview'] .'</a>';
         }
     } elseif ($file['is_image'] && $file['hotlink']) {
-        $sizes = serendipity_calculate_aspect_size($file['dimensions_width'], $file['dimensions_height'], $serendipity['thumbSize']);
+        $sizes = serendipity_calculate_aspect_size($file['dimensions_width'], $file['dimensions_height'], $serendipity['thumbSize'], $serendipity['thumbConstraint']);
         $file['thumbWidth']  = $sizes[0];
         $file['thumbHeight'] = $sizes[1];
         $file['preview'] .= '<img src="' . $file['path'] . '" width="' . $sizes[0] . '" height="' . $sizes[1] . '" border="0" title="' . $file['path'] . '" alt="'. $file['realname'] . '" />';
diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php
index 402eec9..2de2d3d 100644
--- a/include/tpl/config_local.inc.php
+++ b/include/tpl/config_local.inc.php
@@ -522,6 +522,16 @@
                                           'permission'  => 'siteConfiguration',
                                           'default'     => 110),
 
+                                    array('var'         => 'thumbConstraint',
+                                          'title'       => INSTALL_THUMBDIM,
+                                          'description' => INSTALL_THUMBDIM_DESC,
+                                          'type'        => 'list',
+                                          'permission'  => 'siteConfiguration',
+                                          'default'     => array(
+                                              'largest' => INSTALL_THUMBDIM_LARGEST,
+                                              'width'   => INSTALL_THUMBDIM_WIDTH,
+                                              'height'  => INSTALL_THUMBDIM_HEIGHT)),
+
                                     array('var'         => 'maxFileSize',
                                           'title'       => MEDIA_UPLOAD_SIZE,
                                           'description' => MEDIA_UPLOAD_SIZE_DESC,
diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php
index a25a4d4..ae1a139 100644
--- a/lang/UTF-8/serendipity_lang_bg.inc.php
+++ b/lang/UTF-8/serendipity_lang_bg.inc.php
@@ -89,7 +89,7 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('ERROR_FILE_EXISTS_ALREADY', 'Грешка: Този файл вече съществува!');
 @define('GO', 'Продължаване');
 @define('NEWSIZE', 'Нов размер: ');
-@define('RESIZE_BLAHBLAH', '<b>Промяна на размерите на %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Промяна на размерите на %s</b>');
 @define('ORIGINAL_SIZE', 'Оригинални размери: <i>%s&#215;%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Тук можете да настроите новите размери на изображенията. Ако искате да запазите пропорциите им, въведете стойност в едно от полетата и натиснете бутона TAB. Другото поле ще бъде изчислено автоматично, така че да се запази пропорцията.');
 @define('QUICKSEARCH', 'Бързо търсене');
@@ -188,6 +188,10 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('RESIZING', 'Промяна на размер');
 @define('RESIZE_DONE', 'Готово (променени са размерите на %s изображения).');
 @define('SYNCING', 'Синхронизиране на базата данни с папката с изображения');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Готово (синхронизирани са %s изображения).');
 @define('DELETE_FILE_FAIL' , 'Не може да бъде изтрит файла <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Изтрита е миниатюрата, озаглавена <b>%s</b>');
@@ -436,6 +440,14 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALL_THUMBSUFFIX_DESC', 'Миниатюрите ще бъдат именувани по следния начин: оригинал.[наставка].разширение');
 @define('INSTALL_THUMBWIDTH', 'Размер на миниатюрите');
 @define('INSTALL_THUMBWIDTH_DESC', 'Статична максимална ширина на автоматично генерираните миниатюри');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 @define('USERCONF_CAT_PERSONAL', 'Лични данни');
 @define('USERCONF_CAT_PERSONAL_DESC', 'Въвеждане на вашите лични данни');
 @define('USERCONF_USERNAME', 'Потребителско име');
diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php
index 9a2b322..1769d47 100644
--- a/lang/UTF-8/serendipity_lang_cn.inc.php
+++ b/lang/UTF-8/serendipity_lang_cn.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '发生错误, 文件没有上传，可能因为你的文件超过限制的大小， 请询问你的主机商或修改你的 php.ini 文件属性。');
 @define('GO', '继续');
 @define('NEWSIZE', '大小: ');
-@define('RESIZE_BLAHBLAH', '<b>重设大小 %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>重设大小 %s</b>');
 @define('ORIGINAL_SIZE', '原有的大小: <i>%sx%s</i> 像素');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>在这里你可以修改图片大小！如果你要修改成相同的图片比例, 你只需要输入一个数值然后按 TAB -- 系统会自动帮你计算比例以免出错。</p>');
 @define('QUICKJUMP_CALENDAR', '日历快速跳跃');
@@ -204,6 +204,10 @@
 @define('RESIZING', '重设大小');
 @define('RESIZE_DONE', '完成 (重设 %s 个图片)');
 @define('SYNCING', '进行数据库和图片文件夹数据同步');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '完成 (同步了 %s 个图片)');
 @define('FILE_NOT_FOUND', '找不到文件 <b>%s</b>, 可能已被删除');
 @define('ABORT_NOW', '放弃');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', '缩图会以下面的格式重新命名: original.[后置字符].ext');
 @define('INSTALL_THUMBWIDTH', '缩图大小');
 @define('INSTALL_THUMBWIDTH_DESC', '自动建立缩图的最大宽度');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '个人资料设定');
diff --git a/lang/UTF-8/serendipity_lang_cs.inc.php b/lang/UTF-8/serendipity_lang_cs.inc.php
index c1df5dd..f5bfd50 100644
--- a/lang/UTF-8/serendipity_lang_cs.inc.php
+++ b/lang/UTF-8/serendipity_lang_cs.inc.php
@@ -98,7 +98,7 @@ $i18n_filename_to = array (
 @define('ERROR_FILE_EXISTS_ALREADY', 'Chyba: Soubor už ve vašem počítači existuje!');
 @define('GO', 'Provést!');
 @define('NEWSIZE', 'Nový rozměr: ');
-@define('RESIZE_BLAHBLAH', '<b>Změnit rozměr %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Změnit rozměr %s</b>');
 @define('ORIGINAL_SIZE', 'Původní rozměr: <i>%sx%s</i> pixelů');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Zde můžete zadat nový rozměr obrázku. Pokud chcete zachovat proporce, zadejte jen jednu hodnotu a stiskněte klávesu TAB, nový rozměr bude dopočítán automaticky:');
 @define('QUICKJUMP_CALENDAR', 'Vyhledávací kalendář');
@@ -200,6 +200,10 @@ $i18n_filename_to = array (
 @define('RESIZING', 'Změna rozměrů');
 @define('RESIZE_DONE', 'Hotovo (upraven rozměr %s obrázků).');
 @define('SYNCING', 'Synchronizace databáze s adresářem obrázků');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Hotovo (synchronizováno %s obrázků).');
 @define('DELETE_IMAGE_FAIL' , 'Nelze vymazat obrázek <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Vymazán náhled obrázku s názvem <b>%s</b>');
@@ -403,6 +407,14 @@ $i18n_filename_to = array (
 @define('INSTALL_THUMBSUFFIX_DESC', 'Náhledy budou pojmenovány original.sufix.ext');
 @define('INSTALL_THUMBWIDTH', 'Rozměry náhledů');
 @define('INSTALL_THUMBWIDTH_DESC', 'Pevná šířka automaticky generovaných náhledů');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Osobní nastavení');
diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php
index 33a481a..9c39120 100644
--- a/lang/UTF-8/serendipity_lang_cz.inc.php
+++ b/lang/UTF-8/serendipity_lang_cz.inc.php
@@ -98,7 +98,7 @@ $i18n_filename_to = array (
 @define('ERROR_FILE_EXISTS_ALREADY', 'Chyba: Soubor už ve vašem počítači existuje!');
 @define('GO', 'Provést!');
 @define('NEWSIZE', 'Nový rozměr: ');
-@define('RESIZE_BLAHBLAH', '<b>Změnit rozměr %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Změnit rozměr %s</b>');
 @define('ORIGINAL_SIZE', 'Původní rozměr: <i>%sx%s</i> pixelů');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Zde můžete zadat nový rozměr obrázku. Pokud chcete zachovat proporce, zadejte jen jednu hodnotu a stiskněte klávesu TAB, nový rozměr bude dopočítán automaticky:');
 @define('QUICKJUMP_CALENDAR', 'Vyhledávací kalendář');
@@ -200,6 +200,10 @@ $i18n_filename_to = array (
 @define('RESIZING', 'Změna rozměrů');
 @define('RESIZE_DONE', 'Hotovo (upraven rozměr %s obrázků).');
 @define('SYNCING', 'Synchronizace databáze s adresářem obrázků');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Hotovo (synchronizováno %s obrázků).');
 @define('DELETE_IMAGE_FAIL' , 'Nelze vymazat obrázek <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Vymazán náhled obrázku s názvem <b>%s</b>');
@@ -403,6 +407,14 @@ $i18n_filename_to = array (
 @define('INSTALL_THUMBSUFFIX_DESC', 'Náhledy budou pojmenovány original.sufix.ext');
 @define('INSTALL_THUMBWIDTH', 'Rozměry náhledů');
 @define('INSTALL_THUMBWIDTH_DESC', 'Pevná šířka automaticky generovaných náhledů');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Osobní nastavení');
diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php
index ef6bc37..2102b6e 100644
--- a/lang/UTF-8/serendipity_lang_da.inc.php
+++ b/lang/UTF-8/serendipity_lang_da.inc.php
@@ -85,7 +85,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fejl: Filen findes allerede på din maskine!');
 @define('GO', 'Begynd!');
 @define('NEWSIZE', 'Ny størrelse: ');
-@define('RESIZE_BLAHBLAH', '<b>Ændre størrelse på %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Ændre størrelse på %s</b>');
 @define('ORIGINAL_SIZE', 'Original størrelse: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Her kan du justere billedets størrelse. Hvis du vil bevare proportionerne, skal du bare indtaste én af værdirene og trykke på TAB-tasten, den anden værdi beregnes så automatisk:');
 @define('QUICKJUMP_CALENDAR', 'Hurtigkalender');
@@ -186,6 +186,10 @@
 @define('RESIZING', 'Ændre dimensioner');
 @define('RESIZE_DONE', 'Færdig (Ændrede %s billeder).');
 @define('SYNCING', 'Synkroniserer databasen med billedemappen');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Færdig (Synkroniserede %s billeder).');
 @define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette billedet <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Slettede billedet ved navn <b>%s</b>');
@@ -374,6 +378,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails vil blive navngivet i følgende format: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Thumbnail dimensioner');
 @define('INSTALL_THUMBWIDTH_DESC', 'Statisk maximal brede på et auto-genereret thumbnail');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Dine personlige detaljer');
diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php
index 09eb556..da53264 100644
--- a/lang/UTF-8/serendipity_lang_de.inc.php
+++ b/lang/UTF-8/serendipity_lang_de.inc.php
@@ -85,7 +85,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fehler: Diese Datei existiert schon auf dem Server!');
 @define('GO', 'Los!');
 @define('NEWSIZE', 'Neue Größe ');
-@define('RESIZE_BLAHBLAH', '<b>Größe von %s ändern</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Größe von %s ändern</b>');
 @define('ORIGINAL_SIZE', 'Originalgröße: <i>%sx%s</i> Pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier können Sie die Bildgröße ändern. Um die Proportionen beizubehalten, einfach einen der beiden Werte eingeben, und anschließend die TAB-Taste drücken, und Sie erhalten eine Vorschau mit korrekten Proportionen.');
 @define('DATE_FORMAT_1', 'd.m.Y');
@@ -253,6 +253,10 @@
 @define('SIDEBAR_PLUGINS', 'Seitenleisten-Plugins');
 @define('EVENT_PLUGINS', 'Ereignis-Plugins');
 @define('SYNCING', 'Synchronisiere Datenbank mit Bilder-Ordner');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Fertig (%s Bilder synchronisiert).');
 @define('SORT_ORDER', 'Sortierung');
 @define('SORT_ORDER_NAME', 'Dateiname');
@@ -402,6 +406,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails werden nach dem Schema originalname.Suffix.erweiterung benannt.');
 @define('INSTALL_THUMBWIDTH', 'Thumbnailgröße');
 @define('INSTALL_THUMBWIDTH_DESC', 'Maximale Breite/Höhe der automatisch erzeugten Thumbnails');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Persönliche Einstellungen');
diff --git a/lang/UTF-8/serendipity_lang_en.inc.php b/lang/UTF-8/serendipity_lang_en.inc.php
index 27ca922..890b57f 100644
--- a/lang/UTF-8/serendipity_lang_en.inc.php
+++ b/lang/UTF-8/serendipity_lang_en.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occurred, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 @define('GO', 'Go!');
 @define('NEWSIZE', 'New size: ');
-@define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Resize %s</b>');
 @define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here, you can adjust the image size. If you want to resize the image proportionally, just enter a value in one of the two boxes and press the TAB key --  I will automatically calculate the new size so the image proportions do not get messed up</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Resizing');
 @define('RESIZE_DONE', 'Done (resized %s images).');
 @define('SYNCING', 'Synchronizing the database with the image folder');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Done (Synchronized %s images).');
 @define('FILE_NOT_FOUND', 'Unable to locate the file entitled <b>%s</b>, maybe it has already been deleted?');
 @define('ABORT_NOW', 'Abort now');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
 @define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Your personal details');
diff --git a/lang/UTF-8/serendipity_lang_es.inc.php b/lang/UTF-8/serendipity_lang_es.inc.php
index 2f87997..5483cd3 100644
--- a/lang/UTF-8/serendipity_lang_es.inc.php
+++ b/lang/UTF-8/serendipity_lang_es.inc.php
@@ -93,7 +93,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Error: ¡El fichero ya existe en el sistema!');
 @define('GO', '¡Ir!');
 @define('NEWSIZE', 'Nuevo tamaño: ');
-@define('RESIZE_BLAHBLAH', '<b>Cambiar tamaño %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Cambiar tamaño %s</b>');
 @define('ORIGINAL_SIZE', 'Tamaño original: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aquí puedes ajustar el nuevo tamaño de la imagen. Si quieres mantener las proporciones sólo introduce uno de los valores y presiona la tecla tabulador (TAB), de esta forma se ajustará automáticamente:');
 @define('DATE_FORMAT_1', 'd.m.Y');
@@ -253,6 +253,10 @@
 @define('SIDEBAR_PLUGINS', 'Extensiones de barra lateral');
 @define('EVENT_PLUGINS', 'Extensiones de eventos');
 @define('SYNCING', 'Sincronizando la base de datos con el directorio de imágenes.');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Hecho (Sincronizadas %s imágenes).');
 @define('SORT_ORDER', 'Ordenar por');
 @define('SORT_ORDER_NAME', 'Nombre de fichero');
@@ -399,6 +403,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Las miniaturas se crearán con el siguiente formato: original.[sufijo].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensiones de las miniaturas');
 @define('INSTALL_THUMBWIDTH_DESC', 'Anchura máxima estática de las miniaturas auto-generadas');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Datos personales');
diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php
index 1f65160..f9da62c 100644
--- a/lang/UTF-8/serendipity_lang_fa.inc.php
+++ b/lang/UTF-8/serendipity_lang_fa.inc.php
@@ -89,7 +89,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'خطای ناشناخته، فایلی بالاگذاری نشد. ممکن است که حجم فایل شما بیشتر از ماکزیمم حجم اجازه داده شده باشد. لطفا ISP یا فایل php.ini خود را چک کنید.');
 @define('GO', 'برو!');
 @define('NEWSIZE', 'سایز جدید: ');
-@define('RESIZE_BLAHBLAH', '<b>تغییر اندازه %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>تغییر اندازه %s</b>');
 @define('ORIGINAL_SIZE', 'ابعاد اصلی: <i>%sx%s</i> پیکسل');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>در این مکان، شما می توانید ابعاد عکس را درست نمایید. اگر تصمیم دارید ابعاد عکس را متناسب تغییر دهید، فقط یکی از اعداد را وارد کرده و سپس کلید TAB را فشار دهید -- ما ضلع دیگر را به صورت متناسب تغییر خواهیم داد</p>');
 @define('QUICKJUMP_CALENDAR', 'تقویم برای پرش سریع');
@@ -203,6 +203,10 @@
 @define('RESIZING', 'تغییر اندازه');
 @define('RESIZE_DONE', 'انجام شد (تعداد %s تصویر تغییر کرد).');
 @define('SYNCING', 'هماهنگی پایگاه داده با شاخه تصاویر');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'انجام شد (تعداد %s تصویر هماهنگ شد).');
 @define('FILE_NOT_FOUND', 'توانایی تشخیص محل تصویر <b>%s</b> نیست، احتمالا قبلا حذف شده است؟');
 @define('ABORT_NOW', 'بازگشت');
@@ -414,6 +418,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'عکس های کوچک با روش روبرو نامگذاری خواهند شد: نام اصلی.[پیشوند].توسعه');
 @define('INSTALL_THUMBWIDTH', 'اندازه تصاویر کوچک');
 @define('INSTALL_THUMBWIDTH_DESC', 'بیشترین عرض عکس های کوچک');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* PERSONAL DETAILS */
 @define('USERCONF_CAT_PERSONAL', 'اطلاعات شخصی');
diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php
index 8d900a4..d43a66d 100644
--- a/lang/UTF-8/serendipity_lang_fi.inc.php
+++ b/lang/UTF-8/serendipity_lang_fi.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Pieleen meni, tiedostoa ei tuotu. Kenties tiedoston koko oli liian suuri. Kysy palveluntarjoajaltasi apua tai muokkaa php.ini tiedostoasi salliaksesi isompien tiedostojen tuonnin..');
 @define('GO', 'Tee!');
 @define('NEWSIZE', 'Uusi koko: ');
-@define('RESIZE_BLAHBLAH', '<b>Muokkaa kokoa %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Muokkaa kokoa %s</b>');
 @define('ORIGINAL_SIZE', 'Alkuperäinen koko: <i>%sx%s</i> pikseliä');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Kuvan koon muokkaus. Voit muokata kuvan kokoa säilyttäen suhteet, lisää toiseen laatikkoon arvo ja paina tab-näppäintä, niin lasken sinulle suhteen mukaisen toisen arvon automaattisesti.</p>');
 @define('QUICKJUMP_CALENDAR', 'Pikasiirtymä kalenteriin');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Muokataan');
 @define('RESIZE_DONE', 'Valmis (muokattu %s kuvaa).');
 @define('SYNCING', 'Päivitetään tietokantaa vastaamaan kuvakansiota');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Valmis (Päivitetty %s kuvaa).');
 @define('FILE_NOT_FOUND', 'Tiedostoa <b>%s</b> ei löydy, ehkäpä se on jo poistettu?');
 @define('ABORT_NOW', 'Peruuta');
@@ -412,6 +416,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Pienoiskuvakkeet nimetään seuraavasti: originaali.[suffiksi].pääte');
 @define('INSTALL_THUMBWIDTH', 'Pienoiskuvakkeen mitat');
 @define('INSTALL_THUMBWIDTH_DESC', 'Pienoiskuvakkeen maksimileveys');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Henkilötietosi');
diff --git a/lang/UTF-8/serendipity_lang_fr.inc.php b/lang/UTF-8/serendipity_lang_fr.inc.php
index 6602e92..3a31b7e 100644
--- a/lang/UTF-8/serendipity_lang_fr.inc.php
+++ b/lang/UTF-8/serendipity_lang_fr.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erreur : le fichier existe déjà sur votre machine.');
 @define('GO', 'Go!');
 @define('NEWSIZE', 'Nouvelle taille : ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionner %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionner %s</b>');
 @define('ORIGINAL_SIZE', 'Taille d\'origine : <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Ici vous pouvez ajuster la taille de l\'image sélectionnée. Si vous voulez respecter les proportions de l\'image, entrez juste la hauteur ou la largeur, et pressez la touche TAB - la valeur correspondante sera insérée automatiquement :');
 @define('QUICKJUMP_CALENDAR', 'Saut rapide vers le Calendrier');
@@ -190,6 +190,10 @@
 @define('RESIZING', 'Redimensionnement');
 @define('RESIZE_DONE', 'Terminé (%s images redimensionnées).');
 @define('SYNCING', 'Synchronisation de la base de données avec votre collection d\'images');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Terminé (%s images synchronisées).');
 @define('DELETE_IMAGE_FAIL' , 'Impossible de supprimer l\'image intitulée <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Suppression de la miniature de l\'image intitulée <b>%s</b>');
@@ -398,6 +402,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Les miniatures d\'images seront enregistrées de la manière suivante : original.[suffixe].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensions des miniatures');
 @define('INSTALL_THUMBWIDTH_DESC', 'Largeur maximum (statique) des miniatures crées automatiquement');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Détails personnels');
diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php
index 0288a77..5539dcb 100644
--- a/lang/UTF-8/serendipity_lang_hu.inc.php
+++ b/lang/UTF-8/serendipity_lang_hu.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Ismeretlen hiba történt, a fájl nincs feltöltve. Talán a fájl mérete nagyobb mint a szerveren beállított megengedett maximum érték. Ezt a beállítást a szerver üzemeltetője tudja megváltoztatni.');
 @define('GO', 'OK');
 @define('NEWSIZE', 'Új méret: ');
-@define('RESIZE_BLAHBLAH', '<b>Átméretezés %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Átméretezés %s</b>');
 @define('ORIGINAL_SIZE', 'Eredeti méret: <i>%sx%s</i> képpont');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Itt módosíthatja a kép méretét. Ha arányosan szeretné a képet átméretezni, elég az egyik dobozban módosítani a számot,majd megnyomni a TAB billentyűt -- az új méret automatikusan kerül meghatározásra, így a kép nem lesz aránytalan</p>');
 @define('QUICKJUMP_CALENDAR', 'Gyors naptárra ugrás');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Átméretezés');
 @define('RESIZE_DONE', 'Kész (%s kép átméretezve).');
 @define('SYNCING', 'Szinkronizálom az adatbázist a képek könyvtárával.');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Kész (%s képet szinkronizáltam).');
 @define('FILE_NOT_FOUND', 'Nem találom a <b>%s</b> fájlt, lehet, hogy már törölve lett?');
 @define('ABORT_NOW', 'Azonnali megszakítás');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'A képekből generált előnézeti képek ilyen nevűek lesznek: eredetinév.[előtag].kiterj');
 @define('INSTALL_THUMBWIDTH', 'Előnézeti kép méretek');
 @define('INSTALL_THUMBWIDTH_DESC', 'Az automatikusan generált előnézeti képek szélességének maximuma');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Személyes adatok');
diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php
index eda71cb..2f60a0d 100644
--- a/lang/UTF-8/serendipity_lang_is.inc.php
+++ b/lang/UTF-8/serendipity_lang_is.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Óþekkt villa hefur komið upp, skrá ekki vistuð. Kannski var stærð skráarinnar meiri heldur en hámarksstærðin sem netjónninn skilgreinir. Hafðu samband við þjónustuaðilann þinn eða breytti php.ini skránni til að leyfa stærri skráarflutninga.');
 @define('GO', 'Go!');
 @define('NEWSIZE', 'Ný stærð: ');
-@define('RESIZE_BLAHBLAH', '<b>Breyta stærð %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Breyta stærð %s</b>');
 @define('ORIGINAL_SIZE', 'Upprunaleg stærð: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hér getur þú breytt stærð myndarinnar. Ef þú vilt breyta stærð hennar í réttum hlutföllum, sláðu þá inn eitthvað gildi í annan tveggja reitanna og ýttu á TAB takkann. -- Stærð þeirra verður reiknuð sjálfvirkt svo hlutföllin haldist rétt.</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump dagatal');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Breyti stærð');
 @define('RESIZE_DONE', 'Búin (breytti stærð %s mynda).');
 @define('SYNCING', 'Samhæfi gagnagrunn við myndamöppu');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Búin (Samhæfði %s myndir).');
 @define('FILE_NOT_FOUND', 'Fann ekki skrána <b>%s</b>, kannski er þegar búið að eyða henni?');
 @define('ABORT_NOW', 'Hætta við núna');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Sýnishorn verða nefnd eftir eftirfarandi forsniði: upprunalegt.[viðskeyti].end');
 @define('INSTALL_THUMBWIDTH', 'Stærð sýnishorna');
 @define('INSTALL_THUMBWIDTH_DESC', 'Staðlað hágildi breiddar framkallaðra sýnishorna');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Persónulegu upplýsingar þínar');
diff --git a/lang/UTF-8/serendipity_lang_it.inc.php b/lang/UTF-8/serendipity_lang_it.inc.php
index b6c894b..f719172 100644
--- a/lang/UTF-8/serendipity_lang_it.inc.php
+++ b/lang/UTF-8/serendipity_lang_it.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Errore sconosciuto, file non inviato. Forse le dimensioni sono superiori al massimo consentito dall\'installazione del server. Chiedi al tuo provider o modifica php.ini per consentire upload più corposi.');
 @define('GO', 'Vai!');
 @define('NEWSIZE', 'Nuove dimensioni: ');
-@define('RESIZE_BLAHBLAH', '<b>Ridimensiona %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Ridimensiona %s</b>');
 @define('ORIGINAL_SIZE', 'Dimensione originale: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Qui puoi definire le nuove dimensioni dell\'immagine. Se vuoi mantenere le proporzioni inserisci un solo valore e premi TAB, calcolerò automaticamente le nuove dimensioni in modo da non modificare le proporzioni:');
 @define('QUICKJUMP_CALENDAR', 'Calendario di accesso veloce');
@@ -191,6 +191,10 @@
 @define('RESIZING', 'Ridimensionamento');
 @define('RESIZE_DONE', 'Fatto (ridimensionate %s immagini).');
 @define('SYNCING', 'Sincronizzazione del database con la cartella delle immagini');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Fatto (Sincronizzate %s immagini).');
 @define('FILE_NOT_FOUND', 'Impossibile trovare il file <b>%s</b>, forse è già stato cancellato?');
 @define('ABORT_NOW', 'Interrompi subito');
@@ -402,6 +406,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Le miniature avranno un nome nel formato: originale.[suffisso].est');
 @define('INSTALL_THUMBWIDTH', 'Dimensioni delle miniature');
 @define('INSTALL_THUMBWIDTH_DESC', 'Larghezza massima stabilita per le miniature auto-generate');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'I tuoi dettagli personali');
diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php
index 4c8fe2b..d77038d 100644
--- a/lang/UTF-8/serendipity_lang_ja.inc.php
+++ b/lang/UTF-8/serendipity_lang_ja.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '未知のエラーが生じました。ファイルはアップロードしませんでした。おそらくファイルサイズがサーバーのインストールで許可された最大サイズを超えたと思われます。ISP に確認するか、php.ini ファイルで許可されたアップロード可能な最大ファイルサイズを編集してください。');
 @define('GO', 'Go!');
 @define('NEWSIZE', '新規サイズ: ');
-@define('RESIZE_BLAHBLAH', '<b>リサイズ %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>リサイズ %s</b>');
 @define('ORIGINAL_SIZE', '元サイズ: <i>%sx%s</i> ピクセル');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>ここで、画像サイズを調節することができます。画像の比率を変えずにサイズ変更をしたい場合は、2 つの入力ボックスのうちの 1 つにだけ値入力して、TAB キーを押してください - 自動的に新しいサイズを計算します。したがって、イメージは台無しになりません。</p>');
 @define('QUICKJUMP_CALENDAR', 'カレンダークイックジャンプ');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'サイズ変更中');
 @define('RESIZE_DONE', '終了しました (%s このイメージをサイズ変更しました)');
 @define('SYNCING', 'データベースと画像フォルダーの同期中');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '終了しました (%s 個の画像を同期しました)');
 @define('FILE_NOT_FOUND', '<b>%s</b> と言う名前のファイルは既に削除されたため、恐らく見つけることができません。');
 @define('ABORT_NOW', '今中断する');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'サムネイルは次の書式で指定されるでしょう: オリジナル.[接尾辞].拡張子');
 @define('INSTALL_THUMBWIDTH', 'サムネイルの大きさ');
 @define('INSTALL_THUMBWIDTH_DESC', '自動生成するサムネイルの不変の最大幅');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '個人情報の詳細');
diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php
index d327980..c6297d1 100644
--- a/lang/UTF-8/serendipity_lang_ko.inc.php
+++ b/lang/UTF-8/serendipity_lang_ko.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '알 수 없는 오류가 발생하여 파일이 업로드되지 않았습니다. 서버가 허용하는 파일 크기를 초과했을 수 있습니다. 호스팅 업체에 확인을 하거나 php.ini 파일을 수정하여 더 큰 파일을 업로드할 수 있도록 하십시오.');
 @define('GO', '시작!');
 @define('NEWSIZE', '새로운 크기: ');
-@define('RESIZE_BLAHBLAH', '<b>크기 조절: %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>크기 조절: %s</b>');
 @define('ORIGINAL_SIZE', '원래 크기: <i>%sx%s</i> 픽셀');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>여기서 그림 크기를 조절할 수 있습니다. 비율을 유지하면서 크기를 조절하려면 입력상자 한 쪽에 값을 넣고 Tab 키를 누르면 됩니다. 비율이 유지되는 값이 자동으로 계산됩니다.</p>');
 @define('QUICKJUMP_CALENDAR', '빨리 찾아보는 달력');
@@ -204,6 +204,10 @@
 @define('RESIZING', '크기 조절중');
 @define('RESIZE_DONE', '완료 (%s개의 그림의 크기를 조절함).');
 @define('SYNCING', '데이터베이스를 그림 폴더와 동기화합니다');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '완료 (%s개의 그림을 동기화함).');
 @define('FILE_NOT_FOUND', '<b>%s</b>라는 이름의 파일을 찾지 못했습니다. 이미 삭제되었을 수 있습니다.');
 @define('ABORT_NOW', '지금 중지');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', '작은 그림은 원래이름.[접두사].확장자 식의 이름으로 생성됩니다');
 @define('INSTALL_THUMBWIDTH', '작은 그림 크기');
 @define('INSTALL_THUMBWIDTH_DESC', '자동 생성되는 작은 그림의 최대 크기');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '사용자의 개인 정보');
diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php
index 52b9dbb..dce004e 100644
--- a/lang/UTF-8/serendipity_lang_nl.inc.php
+++ b/lang/UTF-8/serendipity_lang_nl.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Er is een onbekende fout opgetreden, het bestand is niet verzonden. Misschien is het bestand groter dan uw server toestaat. Controleer dit bij uw provider of bewerk uw php.ini zodat deze grotere bestanden toelaat.');
 @define('GO', 'Uitvoeren!');
 @define('NEWSIZE', 'Nieuwe grootte: ');
-@define('RESIZE_BLAHBLAH', '<b>Vergroten/Verkleinen %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Vergroten/Verkleinen %s</b>');
 @define('ORIGINAL_SIZE', 'Originele grootte: <i>%sx%s</i> pixels');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier kunt u de grootte van de afbeelding aanpassen. Als u de afbeeldingsverhoudingen wilt behouden, voer dan in één van de velden een waarde in en druk op de TAB-toets -- Het programma zal dan zelf de andere grootte berekenen zodat de verhoudingen hetzelfde blijven</p>');
 @define('QUICKJUMP_CALENDAR', 'Quickjump Kalender');
@@ -204,6 +204,10 @@
 @define('RESIZING', 'Grootte aanpassen');
 @define('RESIZE_DONE', 'Gereed (%s afbeeldingen aangepast).');
 @define('SYNCING', 'Bezig met het synchroniseren van de databank met de map waar de afbeeldingen in staan');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Gereed (%s afbeeldingen gesynchroniseerd).');
 @define('FILE_NOT_FOUND', 'Kan bestand <b>%s</b> niet vinden, mogelijk is deze reeds verwijderd.');
 @define('ABORT_NOW', 'Annuleren');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniaturen krijgen een naam volgens het formaat: origineel.[achtervoegsel].ext');
 @define('INSTALL_THUMBWIDTH', 'Formaat miniaturen');
 @define('INSTALL_THUMBWIDTH_DESC', 'Maximale breedte van automatisch aangemaakte miniaturen');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Uw persoonlijke gegevens');
diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php
index ec51baa..78d3ba4 100644
--- a/lang/UTF-8/serendipity_lang_no.inc.php
+++ b/lang/UTF-8/serendipity_lang_no.inc.php
@@ -83,7 +83,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Feil: Filen finnes allerede på din maskin!');
 @define('GO', 'Begynn!');
 @define('NEWSIZE', 'Ny størrelse: ');
-@define('RESIZE_BLAHBLAH', '<b>Endre størrelse på %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Endre størrelse på %s</b>');
 @define('ORIGINAL_SIZE', 'Original størrelse: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Her kan du justere bildets størrelse. Hvis du vil bevare proporsjonene, behøver du bare taste en av verdiene og trykke på TAB-tasten.  Jeg vil automatisk beregne den andre verdien:');
 @define('QUICKJUMP_CALENDAR', 'Hurtigkalender');
@@ -184,6 +184,10 @@
 @define('RESIZING', 'Endre dimensjoner');
 @define('RESIZE_DONE', 'Ferdig (Endret %s bilder).');
 @define('SYNCING', 'Synkronisere databasen med bildemappen');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Ferdig (Synkroniserte %s bilder).');
 @define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette bildet <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Slettet bildet med navn <b>%s</b>');
@@ -374,6 +378,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails vil bli gitt navn etter følgende mønster: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Thumbnail-dimensjoner');
 @define('INSTALL_THUMBWIDTH_DESC', 'Statisk maksimalbredde på en auto-genereret thumbnail');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Dine personlige detaljer');
diff --git a/lang/UTF-8/serendipity_lang_pl.inc.php b/lang/UTF-8/serendipity_lang_pl.inc.php
index c8036ef..aa50d7d 100644
--- a/lang/UTF-8/serendipity_lang_pl.inc.php
+++ b/lang/UTF-8/serendipity_lang_pl.inc.php
@@ -90,7 +90,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Wystąpił nieznany błąd, plik nie został załadowany. Być może konfiguracja serwera nie zezwala na przesyłanie tak dużych plików. Sprawdź to u swojego ISP lub wyedytuj odpowiednio plik php.ini (jeśli masz dostęp do konfiguracji serwera) by zezwolić na przesyłanie większych plików.');
 @define('GO', 'Start!');
 @define('NEWSIZE', 'Nowy rozmiar: ');
-@define('RESIZE_BLAHBLAH', '<b>Zmień rozmiar: %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Zmień rozmiar: %s</b>');
 @define('ORIGINAL_SIZE', 'Oryginalny rozmiar: <i>%sx%s</i> pikseli');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Tu możesz zmienić rozmiar obrazka. Jeśli chcesz zmienić rozmiar proporcjonalnie, zaznacz odpowiednią opcję, wpisz wartość w jedno z pól i wciśnij TAB - nowy rozmiar dla drugiej wartości zostanie automatycznie obliczony, tak by proporcje obrazka zostały zachowane.</p>');
 @define('QUICKJUMP_CALENDAR', 'Kalendarz szybkiego dostępu');
@@ -204,6 +204,10 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('RESIZING', 'Zmieniam rozmiar');
 @define('RESIZE_DONE', 'Zrobione (ilość obrazków, którym zmieniono rozmiar: %s).');
 @define('SYNCING', 'Synchronizacja bazy danych z katalogiem obrazków');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Zrobione (%s obrazków zsynchronizowanych).');
 @define('FILE_NOT_FOUND', 'Nie można odnalzeźć pliku <b>%s</b>. Być może został już usunięty?');
 @define('ABORT_NOW', 'Przerwij teraz');
@@ -415,6 +419,14 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniaturki będą nazywane według następującego formatu: nazwaoryginalna.[sufiks].rozszerzenie');
 @define('INSTALL_THUMBWIDTH', 'Szerokość miniaturki');
 @define('INSTALL_THUMBWIDTH_DESC', 'Ustal szerokość tworzonych automatycznie miniatur');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Twoje ustawienia osobiste');
diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php
index 9efad40..75977ef 100644
--- a/lang/UTF-8/serendipity_lang_pt.inc.php
+++ b/lang/UTF-8/serendipity_lang_pt.inc.php
@@ -84,7 +84,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erro: Arquivo já existe em sua máquina!');
 @define('GO', 'Vai!');
 @define('NEWSIZE', 'Novo tamanho: ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b>');
 @define('ORIGINAL_SIZE', 'Tamanho original: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aqui você pode ajustar o novo tamanho das imagens. Se pretende manter as proporções, preencha apenas um valor e pressione a tecla TAB que automaticamente será calculado o novo tamanho de modo que as proporções não fiquem bagunçadas:');
 @define('QUICKJUMP_CALENDAR', 'Calendário de acesso rápido');
@@ -184,6 +184,10 @@
 @define('RESIZING', 'Redimensionando');
 @define('RESIZE_DONE', 'Pronto (%s imagens redimensionadas).');
 @define('SYNCING', 'Sincronizando o banco de dados com o diretório de imagens');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Pronto (%s imagens sincronizadas).');
 @define('DELETE_IMAGE_FAIL' , 'Não foi possível excluir a imagem <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Excluir a miniatura da imagem intitulada <b>%s</b>');
@@ -395,6 +399,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'As miniaturas serão nomeadas com o seguinte formato: original.[sufixo].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensão das miniaturas ');
 @define('INSTALL_THUMBWIDTH_DESC', 'Largura máxima estática das miniaturas geradas automaticamente');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Detalhes pessoais');
diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php
index c9c8ad8..299f12e 100644
--- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php
+++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erro: O ficheiro já existe no seu servidor!');
 @define('GO', 'Vamos!');
 @define('NEWSIZE', 'Novo tamanho: ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b>');
 @define('ORIGINAL_SIZE', 'Tamanho original: <i>%sx%s</i> pixéis');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aqui pode ajustar o novo tamanho das suas imagens. Se pretender manter as proporções, preencha apenas um valor e pressione a tecla TAB de maneira a ser automaticamente calculado o novo tamanho de modo às proporções não ficarem erradas:');
 @define('QUICKJUMP_CALENDAR', 'Calendário de acesso rápido');
@@ -190,6 +190,10 @@
 @define('RESIZING', 'Redimensionando');
 @define('RESIZE_DONE', 'Pronto (%s imagens redimensionadas).');
 @define('SYNCING', 'Sincronizando a base de dados com a directoria de imagens');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Pronto (%s imagens sincronizadas).');
 @define('DELETE_IMAGE_FAIL' , 'Não foi possível excluir a imagem <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Excluir a miniatura da imagem entitulada <b>%s</b>');
@@ -402,6 +406,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'As miniaturas serão nomeadas com o seguinte formato: original.[sufixo].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensão das miniaturas ');
 @define('INSTALL_THUMBWIDTH_DESC', 'Largura máxima estática das miniaturas geradas automaticamente');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Detalhes pessoais');
diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php
index 3f1cae9..eb48493 100644
--- a/lang/UTF-8/serendipity_lang_ro.inc.php
+++ b/lang/UTF-8/serendipity_lang_ro.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Am dat peste o eroare necunoscută, nu am încărcat fişierul. Poate că mărimea fişierului este mai mare decât maximul admis de server. Ia legătură cu ISP-ul tău sau editează fişierul php.ini pentru a permite imagini mai mari.');
 @define('GO', 'Du-te!');
 @define('NEWSIZE', 'Noua mărime: ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionează %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionează %s</b>');
 @define('ORIGINAL_SIZE', 'Mărime originală: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aici poţi ajusta mărimea imaginii. Dacă vrei să redimensionezi imaginea proporţional, introdu o valoare doar în una din cele 2 câmpuri şi apasă tastat TAB --  Voi calcula automat cealaltă mărime astfel încât proporţiile imaginii să nu fie alterate</p>');
 @define('QUICKJUMP_CALENDAR', 'Calendar Rapid');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Redimensionez');
 @define('RESIZE_DONE', 'Gata (am redimensionat %s imagini).');
 @define('SYNCING', 'Sincronizez baza de date cu directorul cu imagini');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Gata (am sincronizat %s imagini).');
 @define('FILE_NOT_FOUND', 'Nu pot localiza fişierul denumit <b>%s</b>, poate că a fost şters deja ?');
 @define('ABORT_NOW', 'Abandonează acum');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniaturile vor fi numite după formatul: numeoriginal.[suffix].extensie');
 @define('INSTALL_THUMBWIDTH', 'Dimensiuni miniaturi');
 @define('INSTALL_THUMBWIDTH_DESC', 'Valori statice maxime pentru miniaturile auto-generate');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Detalii personale');
diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php
index 69e9fe2..77c1dd1 100644
--- a/lang/UTF-8/serendipity_lang_ru.inc.php
+++ b/lang/UTF-8/serendipity_lang_ru.inc.php
@@ -90,7 +90,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Произошла неизвестная ошибка, файл не был загружен. Возможно, размер вашего файл превысил допустивый максимальный размер, разрешённый на вашем сервере. Сверьтесь с вашим провайдером, или отредактируйте ваш файл php.ini чтобы позволить загрузку на сервер файлов большего размера.');
 @define('GO', 'Давай!');
 @define('NEWSIZE', 'Новый размер: ');
-@define('RESIZE_BLAHBLAH', '<b>Изменить размеры %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Изменить размеры %s</b>');
 @define('ORIGINAL_SIZE', 'Оригинальный размер: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Здесь вы можете изменить размер изображения. Если вы хотите изменить размеры пропорционально, просто введите значение в одном из двух полей, и нажмите клавишу TAB - второе поле будет заполнено автоматически с учётом пропорций изображения.</p>');
 @define('QUICKJUMP_CALENDAR', 'Календарь');
@@ -205,6 +205,10 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('RESIZING', 'Изменение размеров');
 @define('RESIZE_DONE', 'Готово! (Изменено изображений: %s).');
 @define('SYNCING', 'Синхронизация базы данных с каталогом изображений');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Готово! (Синхронизировано изображений: %s).');
 @define('FILE_NOT_FOUND', 'Невозможно найти файл <b>%s</b>, может быть он уже был удалён?');
 @define('ABORT_NOW', 'Отмена');
@@ -416,6 +420,14 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALL_THUMBSUFFIX_DESC', 'Тамбнэйлы будут создаваться в соответствии с форматом: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Размеры тамбнэйлов');
 @define('INSTALL_THUMBWIDTH_DESC', 'Максимальная ширина автоматически создаваемых тамбнэйлов');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Личные настройки');
diff --git a/lang/UTF-8/serendipity_lang_sa.inc.php b/lang/UTF-8/serendipity_lang_sa.inc.php
index e33ff5f..d07e76d 100644
--- a/lang/UTF-8/serendipity_lang_sa.inc.php
+++ b/lang/UTF-8/serendipity_lang_sa.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'حصل خطأ غير معروف! ! ! لم يتمل رفع الملف – من الممكن أن يكون الملف أكبر من حجم الملف لمصرح برفعه ! ! ! أفحص ISP أو قم بتحرير ملف php.ini كي تسمح برفع الملفات الكبيرة');
 @define('GO', 'أكمل!');
 @define('NEWSIZE', 'المقاس الجديد: ');
-@define('RESIZE_BLAHBLAH', '<b>تغيير المقاييس %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>تغيير المقاييس %s</b>');
 @define('ORIGINAL_SIZE', 'الحجم الاصلي <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>يمكن لك تغيير قياسات الصورة - ان كنت تريد تغيير قياسات الصورة بأطوال متناسبة - كل ما عليك هو ادخل القياس الجديد في احد الصندوقين ثم أضغط زر Tab -- سوف تعطيك اتماتيكياً الحجم المناسب للقياس الجديد - لذلك الصورة سوف تستمر بشكلها الأصلي و لا تفقد شكل توازنها</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
@@ -203,6 +203,10 @@
 @define('RESIZING', 'تغير الحجم');
 @define('RESIZE_DONE', 'تم (تغيير قياسات %s صورة).');
 @define('SYNCING', 'ضبط قاعدة البيانات مع مجلد الصور');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Done (ضبط %s الصور).');
 @define('FILE_NOT_FOUND', 'لم يتم إيجاد الملف <b>%s</b>, من الممكن أن يكون قد حذف؟');
 @define('ABORT_NOW', 'توقف الآن');
@@ -414,6 +418,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'سوف يعطى للصور المصغرة االأسم والصيغة التالية: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'قياسات الصورة المصغرة');
 @define('INSTALL_THUMBWIDTH_DESC', 'العرض الثابت لصور المصغرة المنشئة أتماتيكياً');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'تفصيل اعدادتك الشخصية');
diff --git a/lang/UTF-8/serendipity_lang_se.inc.php b/lang/UTF-8/serendipity_lang_se.inc.php
index e8d4cf7..a077f8e 100644
--- a/lang/UTF-8/serendipity_lang_se.inc.php
+++ b/lang/UTF-8/serendipity_lang_se.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Ett okänt fel inträffade och filen laddades inte upp. Filstorleken är kanske större än vad som tillåts av din serverinstallation. Kolla med din tjänsteleverantör eller ändra i filen php.ini för att tillåta uppladdning av större filer.');
 @define('GO', 'Kör!');
 @define('NEWSIZE', 'Ny storlek: ');
-@define('RESIZE_BLAHBLAH', '<b>Ändra storlek på %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Ändra storlek på %s</b>');
 @define('ORIGINAL_SIZE', 'Ursprunglig storlek: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Här kan du anpassa bildstorleken. Om du vill ändra storlek proportionellt, ändra bara ett värde i något av de två fälten och tryck på TAB - Då ändras  automatiskt storleken automatiskt så att bildens proportioner bibehålls</p>');
 @define('QUICKJUMP_CALENDAR', 'Snabbkalender');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Ändrar storlek');
 @define('RESIZE_DONE', 'Klar (böt storlek på %s bilder).');
 @define('SYNCING', 'Synkroniserar databasen med bildkatalogen');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Klar (synkroniserade %s bilder).');
 @define('FILE_NOT_FOUND', 'Kunde inte hitta filen <b>%s</b>, kanske är den redan borttagen?');
 @define('ABORT_NOW', 'Avbryt nu');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniatyrer kommer att döpas enligt följande format: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Miniatyrbildsdimensioner');
 @define('INSTALL_THUMBWIDTH_DESC', 'Statisk max-bredd för auto-genererade miniatyrbilder');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Din personliga information');
diff --git a/lang/UTF-8/serendipity_lang_ta.inc.php b/lang/UTF-8/serendipity_lang_ta.inc.php
index baa67ec..76e8cc2 100644
--- a/lang/UTF-8/serendipity_lang_ta.inc.php
+++ b/lang/UTF-8/serendipity_lang_ta.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occurred, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 @define('GO','செயல்படுத்துக!');
 @define('NEWSIZE', 'New size: ');
-@define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Resize %s</b>');
 @define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here, you can adjust the image size. If you want to resize the image proportionally, just enter a value in one of the two boxes and press the TAB key --  I will automatically calculate the new size so the image proportions do not get messed up</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'வலைபொருள்கள் சிறிதாக்கப்படுகின்றன');
 @define('RESIZE_DONE', '%s வலைபொருள்கள் சிறிதாக்கப்பட்டுவிட்டன.');
 @define('SYNCING', 'வலைபொருள் இருப்பிடங்கள் உறுதிப்படுத்தப்படுகின்றன...');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '%s வலைபொருள் இருப்பிடங்கள் உறுதிப்படுத்தப்படுத்தப்பட்டுவிட்டன.');
 @define('FILE_NOT_FOUND', 'நீங்கள் தேடிய கணிபொறிக்ககோப்பு <b>%s</b> காணவில்லை. ஒருவேளை அது முன்பே நீக்கப்பட்டுவிட்டதோ?');
 @define('ABORT_NOW', 'இக்கணமே நிறுத்து!');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
 @define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'உங்கள் நிலைகள்');
diff --git a/lang/UTF-8/serendipity_lang_tn.inc.php b/lang/UTF-8/serendipity_lang_tn.inc.php
index 2543932..c7e0239 100644
--- a/lang/UTF-8/serendipity_lang_tn.inc.php
+++ b/lang/UTF-8/serendipity_lang_tn.inc.php
@@ -90,7 +90,7 @@ $i18n_unknown = 'tw';
 @define('ERROR_UNKNOWN_NOUPLOAD', '未知的錯誤發生, 檔案還沒上傳. 也許你的檔案大於限制的大小. 請詢問您的 ISP 或修改您的 php.ini 檔.');
 @define('GO', '繼續!');
 @define('NEWSIZE', '新大小: ');
-@define('RESIZE_BLAHBLAH', '<b>重設大小 %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>重設大小 %s</b>');
 @define('ORIGINAL_SIZE', '原有的大小: <i>%sx%s</i> 像素');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>在這裡您可以修改圖片大小. 如果您要修改成相同的圖片比例, 您只需要輸入一個數值然後按 TAB -- 系統會自動幫您計算比例以免出錯</p>');
 @define('QUICKJUMP_CALENDAR', '日曆快速跳躍');
@@ -204,6 +204,10 @@ $i18n_unknown = 'tw';
 @define('RESIZING', '重設大小');
 @define('RESIZE_DONE', '完成 (重設 %s 個圖片).');
 @define('SYNCING', '進行資料庫和圖片檔案夾同步化');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '完成 (同步了 %s 個圖片).');
 @define('FILE_NOT_FOUND', '找不到檔案名稱 <b>%s</b>, 也許已經被刪除了?');
 @define('ABORT_NOW', '放棄');
@@ -415,6 +419,14 @@ $i18n_unknown = 'tw';
 @define('INSTALL_THUMBSUFFIX_DESC', '縮圖會以下面的格式重新命名: 原檔名.[後置字元].ext');
 @define('INSTALL_THUMBWIDTH', '縮圖尺度');
 @define('INSTALL_THUMBWIDTH_DESC', '自動建立縮圖的最大寬度');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '個人資料設定');
diff --git a/lang/UTF-8/serendipity_lang_tr.inc.php b/lang/UTF-8/serendipity_lang_tr.inc.php
index ed05f76..b624553 100644
--- a/lang/UTF-8/serendipity_lang_tr.inc.php
+++ b/lang/UTF-8/serendipity_lang_tr.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Bilinmeyen hata oluştu, dosya yüklenemedi.Dosyanız sunucunuzda izin verilen boyuttan daha büyük olabilir.Servis sağlayıcınızdan araştırın ya da php.ini dosyanızı daha büyük boyutta dosya yüklenmesine izin verecek şekilde ayarlayın.');
 @define('GO', 'Git!');
 @define('NEWSIZE', 'Yeni boyut: ');
-@define('RESIZE_BLAHBLAH', '<b>Yeniden boyutlandır %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Yeniden boyutlandır %s</b>');
 @define('ORIGINAL_SIZE', 'Özgün boyut: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Burada resmi yeniden boyutlandırabilirsiniz. Eğer resim özelliklerini değiştirmek istiyorsanız,İki kutudan birine bir değer girin ve TAB tuşuna basın --  Otomatik olarak resminiz yeniden boyutlandırılacaktır</p>');
 @define('QUICKJUMP_CALENDAR', 'Ajandaya hızlı bakış');
@@ -204,6 +204,10 @@
 @define('RESIZING', 'Yeniden hizalama');
 @define('RESIZE_DONE', 'Tamamlandı (resim %s hizalandı).');
 @define('SYNCING', 'Veritabanı ile resimler dizini eşleniyor');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Tamamlandı (Eşlendi %s resimler).');
 @define('FILE_NOT_FOUND', 'Başlıklı dosyaya erişilemedi <b>%s</b>, silinmiş olabilir');
 @define('ABORT_NOW', 'Ä°ptal et');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Küçükresimler izleyen şekilde adlandırılacak: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Küçükresim boyutları');
 @define('INSTALL_THUMBWIDTH_DESC', 'Küçükresim oluşturma işlemi için izin verilen enbüyük genişlik boyutu');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Kişisel bilgileriniz');
diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php
index 3f81c7a..c36e012 100644
--- a/lang/UTF-8/serendipity_lang_tw.inc.php
+++ b/lang/UTF-8/serendipity_lang_tw.inc.php
@@ -90,7 +90,7 @@ $i18n_unknown = 'tw';
 @define('ERROR_UNKNOWN_NOUPLOAD', '未知的錯誤發生, 檔案還沒上傳. 也許你的檔案大於限制的大小. 請詢問您的 ISP 或修改您的 php.ini 檔.');
 @define('GO', '繼續!');
 @define('NEWSIZE', '新大小: ');
-@define('RESIZE_BLAHBLAH', '<b>重設大小 %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>重設大小 %s</b>');
 @define('ORIGINAL_SIZE', '原有的大小: <i>%sx%s</i> 像素');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>在這裡您可以修改圖片大小. 如果您要修改成相同的圖片比例, 您只需要輸入一個數值然後按 TAB -- 系統會自動幫您計算比例以免出錯</p>');
 @define('QUICKJUMP_CALENDAR', '日曆快速跳躍');
@@ -204,6 +204,10 @@ $i18n_unknown = 'tw';
 @define('RESIZING', '重設大小');
 @define('RESIZE_DONE', '完成 (重設 %s 個圖片).');
 @define('SYNCING', '進行資料庫和圖片檔案夾同步化');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '完成 (同步了 %s 個圖片).');
 @define('FILE_NOT_FOUND', '找不到檔案名稱 <b>%s</b>, 也許已經被刪除了?');
 @define('ABORT_NOW', '放棄');
@@ -415,6 +419,14 @@ $i18n_unknown = 'tw';
 @define('INSTALL_THUMBSUFFIX_DESC', '縮圖會以下面的格式重新命名: 原檔名.[後置字元].ext');
 @define('INSTALL_THUMBWIDTH', '縮圖尺度');
 @define('INSTALL_THUMBWIDTH_DESC', '自動建立縮圖的最大寬度');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '個人資料設定');
diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php
index 2e34800..76fc7bd 100644
--- a/lang/UTF-8/serendipity_lang_zh.inc.php
+++ b/lang/UTF-8/serendipity_lang_zh.inc.php
@@ -89,7 +89,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '发生错误, 文件没有上传，可能因为你的文件超过限制的大小， 请询问你的主机商或修改你的 php.ini 文件属性。');
 @define('GO', '继续');
 @define('NEWSIZE', '大小: ');
-@define('RESIZE_BLAHBLAH', '<b>重设大小 %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>重设大小 %s</b>');
 @define('ORIGINAL_SIZE', '原有的大小: <i>%sx%s</i> 像素');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>在这里你可以修改图片大小！如果你要修改成相同的图片比例, 你只需要输入一个数值然后按 TAB -- 系统会自动帮你计算比例以免出错。</p>');
 @define('QUICKJUMP_CALENDAR', '日历快速跳跃');
@@ -203,6 +203,10 @@
 @define('RESIZING', '重设大小');
 @define('RESIZE_DONE', '完成 (重设 %s 个图片)');
 @define('SYNCING', '进行数据库和图片文件夹数据同步');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '完成 (同步了 %s 个图片)');
 @define('FILE_NOT_FOUND', '找不到文件 <b>%s</b>, 可能已被删除');
 @define('ABORT_NOW', '放弃');
@@ -414,6 +418,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', '缩图会以下面的格式重新命名: original.[后置字符].ext');
 @define('INSTALL_THUMBWIDTH', '缩图大小');
 @define('INSTALL_THUMBWIDTH_DESC', '自动建立缩图的最大宽度');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '个人资料设定');
diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php
index baa67a2..8fa68ed 100644
--- a/lang/serendipity_lang_bg.inc.php
+++ b/lang/serendipity_lang_bg.inc.php
@@ -89,7 +89,7 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('ERROR_FILE_EXISTS_ALREADY', 'Ãðåøêà: Òîçè ôàéë âå÷å ñúùåñòâóâà!');
 @define('GO', 'Ïðîäúëæàâàíå');
 @define('NEWSIZE', 'Íîâ ðàçìåð: ');
-@define('RESIZE_BLAHBLAH', '<b>Ïðîìÿíà íà ðàçìåðèòå íà %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Ïðîìÿíà íà ðàçìåðèòå íà %s</b>');
 @define('ORIGINAL_SIZE', 'Îðèãèíàëíè ðàçìåðè: <i>%s&#215;%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Òóê ìîæåòå äà íàñòðîèòå íîâèòå ðàçìåðè íà èçîáðàæåíèÿòà. Àêî èñêàòå äà çàïàçèòå ïðîïîðöèèòå èì, âúâåäåòå ñòîéíîñò â åäíî îò ïîëåòàòà è íàòèñíåòå áóòîíà TAB. Äðóãîòî ïîëå ùå áúäå èç÷èñëåíî àâòîìàòè÷íî, òàêà ÷å äà ñå çàïàçè ïðîïîðöèÿòà.');
 @define('QUICKSEARCH', 'Áúðçî òúðñåíå');
@@ -188,6 +188,10 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('RESIZING', 'Ïðîìÿíà íà ðàçìåð');
 @define('RESIZE_DONE', 'Ãîòîâî (ïðîìåíåíè ñà ðàçìåðèòå íà %s èçîáðàæåíèÿ).');
 @define('SYNCING', 'Ñèíõðîíèçèðàíå íà áàçàòà äàííè ñ ïàïêàòà ñ èçîáðàæåíèÿ');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Ãîòîâî (ñèíõðîíèçèðàíè ñà %s èçîáðàæåíèÿ).');
 @define('DELETE_FILE_FAIL' , 'Íå ìîæå äà áúäå èçòðèò ôàéëà <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Èçòðèòà å ìèíèàòþðàòà, îçàãëàâåíà <b>%s</b>');
@@ -436,6 +440,15 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALL_THUMBSUFFIX_DESC', 'Ìèíèàòþðèòå ùå áúäàò èìåíóâàíè ïî ñëåäíèÿ íà÷èí: îðèãèíàë.[íàñòàâêà].ðàçøèðåíèå');
 @define('INSTALL_THUMBWIDTH', 'Ðàçìåð íà ìèíèàòþðèòå');
 @define('INSTALL_THUMBWIDTH_DESC', 'Ñòàòè÷íà ìàêñèìàëíà øèðèíà íà àâòîìàòè÷íî ãåíåðèðàíèòå ìèíèàòþðè');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
+
 @define('USERCONF_CAT_PERSONAL', 'Ëè÷íè äàííè');
 @define('USERCONF_CAT_PERSONAL_DESC', 'Âúâåæäàíå íà âàøèòå ëè÷íè äàííè');
 @define('USERCONF_USERNAME', 'Ïîòðåáèòåëñêî èìå');
diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php
index c16d846..b2f14ff 100644
--- a/lang/serendipity_lang_cn.inc.php
+++ b/lang/serendipity_lang_cn.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '发生错误, 文件没有上传，可能因为你的文件超过限制的大小， 请询问你的主机商或修改你的 php.ini 文件属性。');
 @define('GO', '继续');
 @define('NEWSIZE', '大小: ');
-@define('RESIZE_BLAHBLAH', '<b>重设大小 %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>重设大小 %s</b>');
 @define('ORIGINAL_SIZE', '原有的大小: <i>%sx%s</i> 像素');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>在这里你可以修改图片大小！如果你要修改成相同的图片比例, 你只需要输入一个数值然后按 TAB -- 系统会自动帮你计算比例以免出错。</p>');
 @define('QUICKJUMP_CALENDAR', '日历快速跳跃');
@@ -204,6 +204,10 @@
 @define('RESIZING', '重设大小');
 @define('RESIZE_DONE', '完成 (重设 %s 个图片)');
 @define('SYNCING', '进行数据库和图片文件夹数据同步');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '完成 (同步了 %s 个图片)');
 @define('FILE_NOT_FOUND', '找不到文件 <b>%s</b>, 可能已被删除');
 @define('ABORT_NOW', '放弃');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', '缩图会以下面的格式重新命名: original.[后置字符].ext');
 @define('INSTALL_THUMBWIDTH', '缩图大小');
 @define('INSTALL_THUMBWIDTH_DESC', '自动建立缩图的最大宽度');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '个人资料设定');
diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php
index 8ae1366..acdbfa4 100644
--- a/lang/serendipity_lang_cs.inc.php
+++ b/lang/serendipity_lang_cs.inc.php
@@ -98,7 +98,7 @@ $i18n_filename_to = array (
 @define('ERROR_FILE_EXISTS_ALREADY', 'Chyba: Soubor už ve vašem poèítaèi existuje!');
 @define('GO', 'Provést!');
 @define('NEWSIZE', 'Nový rozmìr: ');
-@define('RESIZE_BLAHBLAH', '<b>Zmìnit rozmìr %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Zmìnit rozmìr %s</b>');
 @define('ORIGINAL_SIZE', 'Pùvodní rozmìr: <i>%sx%s</i> pixelù');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Zde mùžete zadat nový rozmìr obrázku. Pokud chcete zachovat proporce, zadejte jen jednu hodnotu a stisknìte klávesu TAB, nový rozmìr bude dopoèítán automaticky:');
 @define('QUICKJUMP_CALENDAR', 'Vyhledávací kalendáø');
@@ -200,6 +200,10 @@ $i18n_filename_to = array (
 @define('RESIZING', 'Zmìna rozmìrù');
 @define('RESIZE_DONE', 'Hotovo (upraven rozmìr %s obrázkù).');
 @define('SYNCING', 'Synchronizace databáze s adresáøem obrázkù');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Hotovo (synchronizováno %s obrázkù).');
 @define('DELETE_IMAGE_FAIL' , 'Nelze vymazat obrázek <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Vymazán náhled obrázku s názvem <b>%s</b>');
@@ -403,6 +407,14 @@ $i18n_filename_to = array (
 @define('INSTALL_THUMBSUFFIX_DESC', 'Náhledy budou pojmenovány original.sufix.ext');
 @define('INSTALL_THUMBWIDTH', 'Rozmìry náhledù');
 @define('INSTALL_THUMBWIDTH_DESC', 'Pevná šíøka automaticky generovaných náhledù');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Osobní nastavení');
diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php
index 1cb99af..8f3dcb0 100644
--- a/lang/serendipity_lang_cz.inc.php
+++ b/lang/serendipity_lang_cz.inc.php
@@ -98,7 +98,7 @@ $i18n_filename_to = array (
 @define('ERROR_FILE_EXISTS_ALREADY', 'Chyba: Soubor u¾ ve va¹em poèítaèi existuje!');
 @define('GO', 'Provést!');
 @define('NEWSIZE', 'Nový rozmìr: ');
-@define('RESIZE_BLAHBLAH', '<b>Zmìnit rozmìr %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Zmìnit rozmìr %s</b>');
 @define('ORIGINAL_SIZE', 'Pùvodní rozmìr: <i>%sx%s</i> pixelù');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Zde mù¾ete zadat nový rozmìr obrázku. Pokud chcete zachovat proporce, zadejte jen jednu hodnotu a stisknìte klávesu TAB, nový rozmìr bude dopoèítán automaticky:');
 @define('QUICKJUMP_CALENDAR', 'Vyhledávací kalendáø');
@@ -200,6 +200,10 @@ $i18n_filename_to = array (
 @define('RESIZING', 'Zmìna rozmìrù');
 @define('RESIZE_DONE', 'Hotovo (upraven rozmìr %s obrázkù).');
 @define('SYNCING', 'Synchronizace databáze s adresáøem obrázkù');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Hotovo (synchronizováno %s obrázkù).');
 @define('DELETE_IMAGE_FAIL' , 'Nelze vymazat obrázek <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Vymazán náhled obrázku s názvem <b>%s</b>');
@@ -403,6 +407,14 @@ $i18n_filename_to = array (
 @define('INSTALL_THUMBSUFFIX_DESC', 'Náhledy budou pojmenovány original.sufix.ext');
 @define('INSTALL_THUMBWIDTH', 'Rozmìry náhledù');
 @define('INSTALL_THUMBWIDTH_DESC', 'Pevná ¹íøka automaticky generovaných náhledù');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Osobní nastavení');
diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php
index b76cef7..2589cd4 100644
--- a/lang/serendipity_lang_da.inc.php
+++ b/lang/serendipity_lang_da.inc.php
@@ -85,7 +85,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fejl: Filen findes allerede på din maskine!');
 @define('GO', 'Begynd!');
 @define('NEWSIZE', 'Ny størrelse: ');
-@define('RESIZE_BLAHBLAH', '<b>Ændre størrelse på %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Ændre størrelse på %s</b>');
 @define('ORIGINAL_SIZE', 'Original størrelse: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Her kan du justere billedets størrelse. Hvis du vil bevare proportionerne, skal du bare indtaste én af værdirene og trykke på TAB-tasten, den anden værdi beregnes så automatisk:');
 @define('QUICKJUMP_CALENDAR', 'Hurtigkalender');
@@ -186,6 +186,10 @@
 @define('RESIZING', 'Ændre dimensioner');
 @define('RESIZE_DONE', 'Færdig (Ændrede %s billeder).');
 @define('SYNCING', 'Synkroniserer databasen med billedemappen');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Færdig (Synkroniserede %s billeder).');
 @define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette billedet <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Slettede billedet ved navn <b>%s</b>');
@@ -374,6 +378,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails vil blive navngivet i følgende format: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Thumbnail dimensioner');
 @define('INSTALL_THUMBWIDTH_DESC', 'Statisk maximal brede på et auto-genereret thumbnail');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Dine personlige detaljer');
diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php
index 7136b48..591a3a3 100644
--- a/lang/serendipity_lang_de.inc.php
+++ b/lang/serendipity_lang_de.inc.php
@@ -85,7 +85,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fehler: Diese Datei existiert schon auf dem Server!');
 @define('GO', 'Los!');
 @define('NEWSIZE', 'Neue Größe ');
-@define('RESIZE_BLAHBLAH', '<b>Größe von %s ändern</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Größe von %s ändern</b>');
 @define('ORIGINAL_SIZE', 'Originalgröße: <i>%sx%s</i> Pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier können Sie die Bildgröße ändern. Um die Proportionen beizubehalten, einfach einen der beiden Werte eingeben, und anschließend die TAB-Taste drücken, und Sie erhalten eine Vorschau mit korrekten Proportionen.');
 @define('DATE_FORMAT_1', 'd.m.Y');
@@ -253,6 +253,10 @@
 @define('SIDEBAR_PLUGINS', 'Seitenleisten-Plugins');
 @define('EVENT_PLUGINS', 'Ereignis-Plugins');
 @define('SYNCING', 'Synchronisiere Datenbank mit Bilder-Ordner');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Fertig (%s Bilder synchronisiert).');
 @define('SORT_ORDER', 'Sortierung');
 @define('SORT_ORDER_NAME', 'Dateiname');
@@ -402,6 +406,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails werden nach dem Schema originalname.Suffix.erweiterung benannt.');
 @define('INSTALL_THUMBWIDTH', 'Thumbnailgröße');
 @define('INSTALL_THUMBWIDTH_DESC', 'Maximale Breite/Höhe der automatisch erzeugten Thumbnails');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Persönliche Einstellungen');
diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php
index 0d24c69..b7971d5 100644
--- a/lang/serendipity_lang_en.inc.php
+++ b/lang/serendipity_lang_en.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occurred, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 @define('GO', 'Go!');
 @define('NEWSIZE', 'New size: ');
-@define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Resize %s</b>');
 @define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here, you can adjust the image size. If you want to resize the image proportionally, just enter a value in one of the two boxes and press the TAB key --  I will automatically calculate the new size so the image proportions do not get messed up</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Resizing');
 @define('RESIZE_DONE', 'Done (resized %s images).');
 @define('SYNCING', 'Synchronizing the database with the image folder');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Done (Synchronized %s images).');
 @define('FILE_NOT_FOUND', 'Unable to locate the file entitled <b>%s</b>, maybe it has already been deleted?');
 @define('ABORT_NOW', 'Abort now');
@@ -411,8 +415,16 @@
 @define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full path & name of your ImageMagick convert binary');
 @define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
-@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
-@define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail max size');
+@define('INSTALL_THUMBWIDTH_DESC', 'Maximum size of thumbnail in constrained dimension');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Your personal details');
diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php
index 1268284..792eb5f 100644
--- a/lang/serendipity_lang_es.inc.php
+++ b/lang/serendipity_lang_es.inc.php
@@ -93,7 +93,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Error: ¡El fichero ya existe en el sistema!');
 @define('GO', '¡Ir!');
 @define('NEWSIZE', 'Nuevo tamaño: ');
-@define('RESIZE_BLAHBLAH', '<b>Cambiar tamaño %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Cambiar tamaño %s</b>');
 @define('ORIGINAL_SIZE', 'Tamaño original: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aquí puedes ajustar el nuevo tamaño de la imagen. Si quieres mantener las proporciones sólo introduce uno de los valores y presiona la tecla tabulador (TAB), de esta forma se ajustará automáticamente:');
 @define('DATE_FORMAT_1', 'd.m.Y');
@@ -253,6 +253,10 @@
 @define('SIDEBAR_PLUGINS', 'Extensiones de barra lateral');
 @define('EVENT_PLUGINS', 'Extensiones de eventos');
 @define('SYNCING', 'Sincronizando la base de datos con el directorio de imágenes.');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Hecho (Sincronizadas %s imágenes).');
 @define('SORT_ORDER', 'Ordenar por');
 @define('SORT_ORDER_NAME', 'Nombre de fichero');
@@ -399,6 +403,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Las miniaturas se crearán con el siguiente formato: original.[sufijo].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensiones de las miniaturas');
 @define('INSTALL_THUMBWIDTH_DESC', 'Anchura máxima estática de las miniaturas auto-generadas');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Datos personales');
diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php
index e8cba82..35277d0 100644
--- a/lang/serendipity_lang_fa.inc.php
+++ b/lang/serendipity_lang_fa.inc.php
@@ -89,7 +89,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'خطای ناشناخته، فایلی بالاگذاری نشد. ممکن است که حجم فایل شما بیشتر از ماکزیمم حجم اجازه داده شده باشد. لطفا ISP یا فایل php.ini خود را چک کنید.');
 @define('GO', 'برو!');
 @define('NEWSIZE', 'سایز جدید: ');
-@define('RESIZE_BLAHBLAH', '<b>تغییر اندازه %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>تغییر اندازه %s</b>');
 @define('ORIGINAL_SIZE', 'ابعاد اصلی: <i>%sx%s</i> پیکسل');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>در این مکان، شما می توانید ابعاد عکس را درست نمایید. اگر تصمیم دارید ابعاد عکس را متناسب تغییر دهید، فقط یکی از اعداد را وارد کرده و سپس کلید TAB را فشار دهید -- ما ضلع دیگر را به صورت متناسب تغییر خواهیم داد</p>');
 @define('QUICKJUMP_CALENDAR', 'تقویم برای پرش سریع');
@@ -203,6 +203,10 @@
 @define('RESIZING', 'تغییر اندازه');
 @define('RESIZE_DONE', 'انجام شد (تعداد %s تصویر تغییر کرد).');
 @define('SYNCING', 'هماهنگی پایگاه داده با شاخه تصاویر');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'انجام شد (تعداد %s تصویر هماهنگ شد).');
 @define('FILE_NOT_FOUND', 'توانایی تشخیص محل تصویر <b>%s</b> نیست، احتمالا قبلا حذف شده است؟');
 @define('ABORT_NOW', 'بازگشت');
@@ -414,6 +418,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'عکس های کوچک با روش روبرو نامگذاری خواهند شد: نام اصلی.[پیشوند].توسعه');
 @define('INSTALL_THUMBWIDTH', 'اندازه تصاویر کوچک');
 @define('INSTALL_THUMBWIDTH_DESC', 'بیشترین عرض عکس های کوچک');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* PERSONAL DETAILS */
 @define('USERCONF_CAT_PERSONAL', 'اطلاعات شخصی');
diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php
index 044baa0..074d1e4 100644
--- a/lang/serendipity_lang_fi.inc.php
+++ b/lang/serendipity_lang_fi.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Pieleen meni, tiedostoa ei tuotu. Kenties tiedoston koko oli liian suuri. Kysy palveluntarjoajaltasi apua tai muokkaa php.ini tiedostoasi salliaksesi isompien tiedostojen tuonnin..');
 @define('GO', 'Tee!');
 @define('NEWSIZE', 'Uusi koko: ');
-@define('RESIZE_BLAHBLAH', '<b>Muokkaa kokoa %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Muokkaa kokoa %s</b>');
 @define('ORIGINAL_SIZE', 'Alkuperäinen koko: <i>%sx%s</i> pikseliä');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Kuvan koon muokkaus. Voit muokata kuvan kokoa säilyttäen suhteet, lisää toiseen laatikkoon arvo ja paina tab-näppäintä, niin lasken sinulle suhteen mukaisen toisen arvon automaattisesti.</p>');
 @define('QUICKJUMP_CALENDAR', 'Pikasiirtymä kalenteriin');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Muokataan');
 @define('RESIZE_DONE', 'Valmis (muokattu %s kuvaa).');
 @define('SYNCING', 'Päivitetään tietokantaa vastaamaan kuvakansiota');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Valmis (Päivitetty %s kuvaa).');
 @define('FILE_NOT_FOUND', 'Tiedostoa <b>%s</b> ei löydy, ehkäpä se on jo poistettu?');
 @define('ABORT_NOW', 'Peruuta');
@@ -412,6 +416,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Pienoiskuvakkeet nimetään seuraavasti: originaali.[suffiksi].pääte');
 @define('INSTALL_THUMBWIDTH', 'Pienoiskuvakkeen mitat');
 @define('INSTALL_THUMBWIDTH_DESC', 'Pienoiskuvakkeen maksimileveys');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Henkilötietosi');
diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php
index e49f0b2..06327a6 100644
--- a/lang/serendipity_lang_fr.inc.php
+++ b/lang/serendipity_lang_fr.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erreur : le fichier existe déjà sur votre machine.');
 @define('GO', 'Go!');
 @define('NEWSIZE', 'Nouvelle taille : ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionner %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionner %s</b>');
 @define('ORIGINAL_SIZE', 'Taille d\'origine : <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Ici vous pouvez ajuster la taille de l\'image sélectionnée. Si vous voulez respecter les proportions de l\'image, entrez juste la hauteur ou la largeur, et pressez la touche TAB - la valeur correspondante sera insérée automatiquement :');
 @define('QUICKJUMP_CALENDAR', 'Saut rapide vers le Calendrier');
@@ -190,6 +190,10 @@
 @define('RESIZING', 'Redimensionnement');
 @define('RESIZE_DONE', 'Terminé (%s images redimensionnées).');
 @define('SYNCING', 'Synchronisation de la base de données avec votre collection d\'images');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Terminé (%s images synchronisées).');
 @define('DELETE_IMAGE_FAIL' , 'Impossible de supprimer l\'image intitulée <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Suppression de la miniature de l\'image intitulée <b>%s</b>');
@@ -398,6 +402,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Les miniatures d\'images seront enregistrées de la manière suivante : original.[suffixe].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensions des miniatures');
 @define('INSTALL_THUMBWIDTH_DESC', 'Largeur maximum (statique) des miniatures crées automatiquement');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Détails personnels');
diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php
index 40ecd0e..9de94d0 100644
--- a/lang/serendipity_lang_hu.inc.php
+++ b/lang/serendipity_lang_hu.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Ismeretlen hiba történt, a fájl nincs feltöltve. Talán a fájl mérete nagyobb mint a szerveren beállított megengedett maximum érték. Ezt a beállítást a szerver üzemeltetõje tudja megváltoztatni.');
 @define('GO', 'OK');
 @define('NEWSIZE', 'Új méret: ');
-@define('RESIZE_BLAHBLAH', '<b>Átméretezés %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Átméretezés %s</b>');
 @define('ORIGINAL_SIZE', 'Eredeti méret: <i>%sx%s</i> képpont');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Itt módosíthatja a kép méretét. Ha arányosan szeretné a képet átméretezni, elég az egyik dobozban módosítani a számot,majd megnyomni a TAB billentyût -- az új méret automatikusan kerül meghatározásra, így a kép nem lesz aránytalan</p>');
 @define('QUICKJUMP_CALENDAR', 'Gyors naptárra ugrás');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Átméretezés');
 @define('RESIZE_DONE', 'Kész (%s kép átméretezve).');
 @define('SYNCING', 'Szinkronizálom az adatbázist a képek könyvtárával.');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Kész (%s képet szinkronizáltam).');
 @define('FILE_NOT_FOUND', 'Nem találom a <b>%s</b> fájlt, lehet, hogy már törölve lett?');
 @define('ABORT_NOW', 'Azonnali megszakítás');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'A képekbõl generált elõnézeti képek ilyen nevûek lesznek: eredetinév.[elõtag].kiterj');
 @define('INSTALL_THUMBWIDTH', 'Elõnézeti kép méretek');
 @define('INSTALL_THUMBWIDTH_DESC', 'Az automatikusan generált elõnézeti képek szélességének maximuma');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Személyes adatok');
diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php
index fdc4885..7228ae7 100644
--- a/lang/serendipity_lang_is.inc.php
+++ b/lang/serendipity_lang_is.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Óþekkt villa hefur komið upp, skrá ekki vistuð. Kannski var stærð skráarinnar meiri heldur en hámarksstærðin sem netjónninn skilgreinir. Hafðu samband við þjónustuaðilann þinn eða breytti php.ini skránni til að leyfa stærri skráarflutninga.');
 @define('GO', 'Go!');
 @define('NEWSIZE', 'Ný stærð: ');
-@define('RESIZE_BLAHBLAH', '<b>Breyta stærð %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Breyta stærð %s</b>');
 @define('ORIGINAL_SIZE', 'Upprunaleg stærð: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hér getur þú breytt stærð myndarinnar. Ef þú vilt breyta stærð hennar í réttum hlutföllum, sláðu þá inn eitthvað gildi í annan tveggja reitanna og ýttu á TAB takkann. -- Stærð þeirra verður reiknuð sjálfvirkt svo hlutföllin haldist rétt.</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump dagatal');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Breyti stærð');
 @define('RESIZE_DONE', 'Búin (breytti stærð %s mynda).');
 @define('SYNCING', 'Samhæfi gagnagrunn við myndamöppu');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Búin (Samhæfði %s myndir).');
 @define('FILE_NOT_FOUND', 'Fann ekki skrána <b>%s</b>, kannski er þegar búið að eyða henni?');
 @define('ABORT_NOW', 'Hætta við núna');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Sýnishorn verða nefnd eftir eftirfarandi forsniði: upprunalegt.[viðskeyti].end');
 @define('INSTALL_THUMBWIDTH', 'Stærð sýnishorna');
 @define('INSTALL_THUMBWIDTH_DESC', 'Staðlað hágildi breiddar framkallaðra sýnishorna');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Persónulegu upplýsingar þínar');
diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php
index 98e5661..f1a37f5 100644
--- a/lang/serendipity_lang_it.inc.php
+++ b/lang/serendipity_lang_it.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Errore sconosciuto, file non inviato. Forse le dimensioni sono superiori al massimo consentito dall\'installazione del server. Chiedi al tuo provider o modifica php.ini per consentire upload più corposi.');
 @define('GO', 'Vai!');
 @define('NEWSIZE', 'Nuove dimensioni: ');
-@define('RESIZE_BLAHBLAH', '<b>Ridimensiona %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Ridimensiona %s</b>');
 @define('ORIGINAL_SIZE', 'Dimensione originale: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Qui puoi definire le nuove dimensioni dell\'immagine. Se vuoi mantenere le proporzioni inserisci un solo valore e premi TAB, calcolerò automaticamente le nuove dimensioni in modo da non modificare le proporzioni:');
 @define('QUICKJUMP_CALENDAR', 'Calendario di accesso veloce');
@@ -191,6 +191,10 @@
 @define('RESIZING', 'Ridimensionamento');
 @define('RESIZE_DONE', 'Fatto (ridimensionate %s immagini).');
 @define('SYNCING', 'Sincronizzazione del database con la cartella delle immagini');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Fatto (Sincronizzate %s immagini).');
 @define('FILE_NOT_FOUND', 'Impossibile trovare il file <b>%s</b>, forse è già stato cancellato?');
 @define('ABORT_NOW', 'Interrompi subito');
@@ -402,6 +406,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Le miniature avranno un nome nel formato: originale.[suffisso].est');
 @define('INSTALL_THUMBWIDTH', 'Dimensioni delle miniature');
 @define('INSTALL_THUMBWIDTH_DESC', 'Larghezza massima stabilita per le miniature auto-generate');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'I tuoi dettagli personali');
diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php
index 19c2863..fd926ec 100644
--- a/lang/serendipity_lang_ja.inc.php
+++ b/lang/serendipity_lang_ja.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '未知のエラーが生じました。ファイルはアップロードしませんでした。おそらくファイルサイズがサーバーのインストールで許可された最大サイズを超えたと思われます。ISP に確認するか、php.ini ファイルで許可されたアップロード可能な最大ファイルサイズを編集してください。');
 @define('GO', 'Go!');
 @define('NEWSIZE', '新規サイズ: ');
-@define('RESIZE_BLAHBLAH', '<b>リサイズ %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>リサイズ %s</b>');
 @define('ORIGINAL_SIZE', '元サイズ: <i>%sx%s</i> ピクセル');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>ここで、画像サイズを調節することができます。画像の比率を変えずにサイズ変更をしたい場合は、2 つの入力ボックスのうちの 1 つにだけ値入力して、TAB キーを押してください - 自動的に新しいサイズを計算します。したがって、イメージは台無しになりません。</p>');
 @define('QUICKJUMP_CALENDAR', 'カレンダークイックジャンプ');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'サイズ変更中');
 @define('RESIZE_DONE', '終了しました (%s このイメージをサイズ変更しました)');
 @define('SYNCING', 'データベースと画像フォルダーの同期中');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '終了しました (%s 個の画像を同期しました)');
 @define('FILE_NOT_FOUND', '<b>%s</b> と言う名前のファイルは既に削除されたため、恐らく見つけることができません。');
 @define('ABORT_NOW', '今中断する');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'サムネイルは次の書式で指定されるでしょう: オリジナル.[接尾辞].拡張子');
 @define('INSTALL_THUMBWIDTH', 'サムネイルの大きさ');
 @define('INSTALL_THUMBWIDTH_DESC', '自動生成するサムネイルの不変の最大幅');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '個人情報の詳細');
diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php
index 2b81f81..eb59916 100644
--- a/lang/serendipity_lang_ko.inc.php
+++ b/lang/serendipity_lang_ko.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '알 수 없는 오류가 발생하여 파일이 업로드되지 않았습니다. 서버가 허용하는 파일 크기를 초과했을 수 있습니다. 호스팅 업체에 확인을 하거나 php.ini 파일을 수정하여 더 큰 파일을 업로드할 수 있도록 하십시오.');
 @define('GO', '시작!');
 @define('NEWSIZE', '새로운 크기: ');
-@define('RESIZE_BLAHBLAH', '<b>크기 조절: %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>크기 조절: %s</b>');
 @define('ORIGINAL_SIZE', '원래 크기: <i>%sx%s</i> 픽셀');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>여기서 그림 크기를 조절할 수 있습니다. 비율을 유지하면서 크기를 조절하려면 입력상자 한 쪽에 값을 넣고 Tab 키를 누르면 됩니다. 비율이 유지되는 값이 자동으로 계산됩니다.</p>');
 @define('QUICKJUMP_CALENDAR', '빨리 찾아보는 달력');
@@ -204,6 +204,10 @@
 @define('RESIZING', '크기 조절중');
 @define('RESIZE_DONE', '완료 (%s개의 그림의 크기를 조절함).');
 @define('SYNCING', '데이터베이스를 그림 폴더와 동기화합니다');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '완료 (%s개의 그림을 동기화함).');
 @define('FILE_NOT_FOUND', '<b>%s</b>라는 이름의 파일을 찾지 못했습니다. 이미 삭제되었을 수 있습니다.');
 @define('ABORT_NOW', '지금 중지');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', '작은 그림은 원래이름.[접두사].확장자 식의 이름으로 생성됩니다');
 @define('INSTALL_THUMBWIDTH', '작은 그림 크기');
 @define('INSTALL_THUMBWIDTH_DESC', '자동 생성되는 작은 그림의 최대 크기');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '사용자의 개인 정보');
diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php
index 8af6ffa..427d1dd 100644
--- a/lang/serendipity_lang_nl.inc.php
+++ b/lang/serendipity_lang_nl.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Er is een onbekende fout opgetreden, het bestand is niet verzonden. Misschien is het bestand groter dan uw server toestaat. Controleer dit bij uw provider of bewerk uw php.ini zodat deze grotere bestanden toelaat.');
 @define('GO', 'Uitvoeren!');
 @define('NEWSIZE', 'Nieuwe grootte: ');
-@define('RESIZE_BLAHBLAH', '<b>Vergroten/Verkleinen %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Vergroten/Verkleinen %s</b>');
 @define('ORIGINAL_SIZE', 'Originele grootte: <i>%sx%s</i> pixels');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier kunt u de grootte van de afbeelding aanpassen. Als u de afbeeldingsverhoudingen wilt behouden, voer dan in één van de velden een waarde in en druk op de TAB-toets -- Het programma zal dan zelf de andere grootte berekenen zodat de verhoudingen hetzelfde blijven</p>');
 @define('QUICKJUMP_CALENDAR', 'Quickjump Kalender');
@@ -204,6 +204,10 @@
 @define('RESIZING', 'Grootte aanpassen');
 @define('RESIZE_DONE', 'Gereed (%s afbeeldingen aangepast).');
 @define('SYNCING', 'Bezig met het synchroniseren van de databank met de map waar de afbeeldingen in staan');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Gereed (%s afbeeldingen gesynchroniseerd).');
 @define('FILE_NOT_FOUND', 'Kan bestand <b>%s</b> niet vinden, mogelijk is deze reeds verwijderd.');
 @define('ABORT_NOW', 'Annuleren');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniaturen krijgen een naam volgens het formaat: origineel.[achtervoegsel].ext');
 @define('INSTALL_THUMBWIDTH', 'Formaat miniaturen');
 @define('INSTALL_THUMBWIDTH_DESC', 'Maximale breedte van automatisch aangemaakte miniaturen');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Uw persoonlijke gegevens');
diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php
index 3f36505..2d6567e 100644
--- a/lang/serendipity_lang_no.inc.php
+++ b/lang/serendipity_lang_no.inc.php
@@ -83,7 +83,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Feil: Filen finnes allerede på din maskin!');
 @define('GO', 'Begynn!');
 @define('NEWSIZE', 'Ny størrelse: ');
-@define('RESIZE_BLAHBLAH', '<b>Endre størrelse på %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Endre størrelse på %s</b>');
 @define('ORIGINAL_SIZE', 'Original størrelse: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Her kan du justere bildets størrelse. Hvis du vil bevare proporsjonene, behøver du bare taste en av verdiene og trykke på TAB-tasten.  Jeg vil automatisk beregne den andre verdien:');
 @define('QUICKJUMP_CALENDAR', 'Hurtigkalender');
@@ -184,6 +184,10 @@
 @define('RESIZING', 'Endre dimensjoner');
 @define('RESIZE_DONE', 'Ferdig (Endret %s bilder).');
 @define('SYNCING', 'Synkronisere databasen med bildemappen');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Ferdig (Synkroniserte %s bilder).');
 @define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette bildet <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Slettet bildet med navn <b>%s</b>');
@@ -374,6 +378,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails vil bli gitt navn etter følgende mønster: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Thumbnail-dimensjoner');
 @define('INSTALL_THUMBWIDTH_DESC', 'Statisk maksimalbredde på en auto-genereret thumbnail');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Dine personlige detaljer');
diff --git a/lang/serendipity_lang_pl.inc.php b/lang/serendipity_lang_pl.inc.php
index 344a63f..ca10ffe 100644
--- a/lang/serendipity_lang_pl.inc.php
+++ b/lang/serendipity_lang_pl.inc.php
@@ -90,7 +90,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Wyst±pi³ nieznany b³±d, plik nie zosta³ za³adowany. Byæ mo¿e konfiguracja serwera nie zezwala na przesy³anie tak du¿ych plików. Sprawd¼ to u swojego ISP lub wyedytuj odpowiednio plik php.ini (je¶li masz dostêp do konfiguracji serwera) by zezwoliæ na przesy³anie wiêkszych plików.');
 @define('GO', 'Start!');
 @define('NEWSIZE', 'Nowy rozmiar: ');
-@define('RESIZE_BLAHBLAH', '<b>Zmieñ rozmiar: %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Zmieñ rozmiar: %s</b>');
 @define('ORIGINAL_SIZE', 'Oryginalny rozmiar: <i>%sx%s</i> pikseli');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Tu mo¿esz zmieniæ rozmiar obrazka. Je¶li chcesz zmieniæ rozmiar proporcjonalnie, zaznacz odpowiedni± opcjê, wpisz warto¶æ w jedno z pól i wci¶nij TAB - nowy rozmiar dla drugiej warto¶ci zostanie automatycznie obliczony, tak by proporcje obrazka zosta³y zachowane.</p>');
 @define('QUICKJUMP_CALENDAR', 'Kalendarz szybkiego dostêpu');
@@ -204,6 +204,10 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('RESIZING', 'Zmieniam rozmiar');
 @define('RESIZE_DONE', 'Zrobione (ilo¶æ obrazków, którym zmieniono rozmiar: %s).');
 @define('SYNCING', 'Synchronizacja bazy danych z katalogiem obrazków');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Zrobione (%s obrazków zsynchronizowanych).');
 @define('FILE_NOT_FOUND', 'Nie mo¿na odnalze¼æ pliku <b>%s</b>. Byæ mo¿e zosta³ ju¿ usuniêty?');
 @define('ABORT_NOW', 'Przerwij teraz');
@@ -415,6 +419,14 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniaturki bêd± nazywane wed³ug nastêpuj±cego formatu: nazwaoryginalna.[sufiks].rozszerzenie');
 @define('INSTALL_THUMBWIDTH', 'Szeroko¶æ miniaturki');
 @define('INSTALL_THUMBWIDTH_DESC', 'Ustal szeroko¶æ tworzonych automatycznie miniatur');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Twoje ustawienia osobiste');
diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php
index 277d12b..cc6d6a4 100644
--- a/lang/serendipity_lang_pt.inc.php
+++ b/lang/serendipity_lang_pt.inc.php
@@ -84,7 +84,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erro: Arquivo já existe em sua máquina!');
 @define('GO', 'Vai!');
 @define('NEWSIZE', 'Novo tamanho: ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b>');
 @define('ORIGINAL_SIZE', 'Tamanho original: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aqui você pode ajustar o novo tamanho das imagens. Se pretende manter as proporções, preencha apenas um valor e pressione a tecla TAB que automaticamente será calculado o novo tamanho de modo que as proporções não fiquem bagunçadas:');
 @define('QUICKJUMP_CALENDAR', 'Calendário de acesso rápido');
@@ -184,6 +184,10 @@
 @define('RESIZING', 'Redimensionando');
 @define('RESIZE_DONE', 'Pronto (%s imagens redimensionadas).');
 @define('SYNCING', 'Sincronizando o banco de dados com o diretório de imagens');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Pronto (%s imagens sincronizadas).');
 @define('DELETE_IMAGE_FAIL' , 'Não foi possível excluir a imagem <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Excluir a miniatura da imagem intitulada <b>%s</b>');
@@ -395,6 +399,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'As miniaturas serão nomeadas com o seguinte formato: original.[sufixo].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensão das miniaturas ');
 @define('INSTALL_THUMBWIDTH_DESC', 'Largura máxima estática das miniaturas geradas automaticamente');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Detalhes pessoais');
diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php
index bd7249b..611c316 100644
--- a/lang/serendipity_lang_pt_PT.inc.php
+++ b/lang/serendipity_lang_pt_PT.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erro: O ficheiro já existe no seu servidor!');
 @define('GO', 'Vamos!');
 @define('NEWSIZE', 'Novo tamanho: ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b>');
 @define('ORIGINAL_SIZE', 'Tamanho original: <i>%sx%s</i> pixéis');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aqui pode ajustar o novo tamanho das suas imagens. Se pretender manter as proporções, preencha apenas um valor e pressione a tecla TAB de maneira a ser automaticamente calculado o novo tamanho de modo às proporções não ficarem erradas:');
 @define('QUICKJUMP_CALENDAR', 'Calendário de acesso rápido');
@@ -190,6 +190,10 @@
 @define('RESIZING', 'Redimensionando');
 @define('RESIZE_DONE', 'Pronto (%s imagens redimensionadas).');
 @define('SYNCING', 'Sincronizando a base de dados com a directoria de imagens');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Pronto (%s imagens sincronizadas).');
 @define('DELETE_IMAGE_FAIL' , 'Não foi possível excluir a imagem <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Excluir a miniatura da imagem entitulada <b>%s</b>');
@@ -402,6 +406,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'As miniaturas serão nomeadas com o seguinte formato: original.[sufixo].ext');
 @define('INSTALL_THUMBWIDTH', 'Dimensão das miniaturas ');
 @define('INSTALL_THUMBWIDTH_DESC', 'Largura máxima estática das miniaturas geradas automaticamente');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Detalhes pessoais');
diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php
index 3f1cae9..eb48493 100644
--- a/lang/serendipity_lang_ro.inc.php
+++ b/lang/serendipity_lang_ro.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Am dat peste o eroare necunoscută, nu am încărcat fişierul. Poate că mărimea fişierului este mai mare decât maximul admis de server. Ia legătură cu ISP-ul tău sau editează fişierul php.ini pentru a permite imagini mai mari.');
 @define('GO', 'Du-te!');
 @define('NEWSIZE', 'Noua mărime: ');
-@define('RESIZE_BLAHBLAH', '<b>Redimensionează %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Redimensionează %s</b>');
 @define('ORIGINAL_SIZE', 'Mărime originală: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aici poţi ajusta mărimea imaginii. Dacă vrei să redimensionezi imaginea proporţional, introdu o valoare doar în una din cele 2 câmpuri şi apasă tastat TAB --  Voi calcula automat cealaltă mărime astfel încât proporţiile imaginii să nu fie alterate</p>');
 @define('QUICKJUMP_CALENDAR', 'Calendar Rapid');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Redimensionez');
 @define('RESIZE_DONE', 'Gata (am redimensionat %s imagini).');
 @define('SYNCING', 'Sincronizez baza de date cu directorul cu imagini');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Gata (am sincronizat %s imagini).');
 @define('FILE_NOT_FOUND', 'Nu pot localiza fişierul denumit <b>%s</b>, poate că a fost şters deja ?');
 @define('ABORT_NOW', 'Abandonează acum');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniaturile vor fi numite după formatul: numeoriginal.[suffix].extensie');
 @define('INSTALL_THUMBWIDTH', 'Dimensiuni miniaturi');
 @define('INSTALL_THUMBWIDTH_DESC', 'Valori statice maxime pentru miniaturile auto-generate');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Detalii personale');
diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php
index 40f94d1..e97ab07 100644
--- a/lang/serendipity_lang_ru.inc.php
+++ b/lang/serendipity_lang_ru.inc.php
@@ -90,7 +90,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Произошла неизвестная ошибка, файл не был загружен. Возможно, размер вашего файл превысил допустивый максимальный размер, разрешённый на вашем сервере. Сверьтесь с вашим провайдером, или отредактируйте ваш файл php.ini чтобы позволить загрузку на сервер файлов большего размера.');
 @define('GO', 'Давай!');
 @define('NEWSIZE', 'Новый размер: ');
-@define('RESIZE_BLAHBLAH', '<b>Изменить размеры %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Изменить размеры %s</b>');
 @define('ORIGINAL_SIZE', 'Оригинальный размер: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Здесь вы можете изменить размер изображения. Если вы хотите изменить размеры пропорционально, просто введите значение в одном из двух полей, и нажмите клавишу TAB - второе поле будет заполнено автоматически с учётом пропорций изображения.</p>');
 @define('QUICKJUMP_CALENDAR', 'Календарь');
@@ -205,6 +205,10 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('RESIZING', 'Изменение размеров');
 @define('RESIZE_DONE', 'Готово! (Изменено изображений: %s).');
 @define('SYNCING', 'Синхронизация базы данных с каталогом изображений');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Готово! (Синхронизировано изображений: %s).');
 @define('FILE_NOT_FOUND', 'Невозможно найти файл <b>%s</b>, может быть он уже был удалён?');
 @define('ABORT_NOW', 'Отмена');
@@ -416,6 +420,14 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALL_THUMBSUFFIX_DESC', 'Тамбнэйлы будут создаваться в соответствии с форматом: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Размеры тамбнэйлов');
 @define('INSTALL_THUMBWIDTH_DESC', 'Максимальная ширина автоматически создаваемых тамбнэйлов');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Личные настройки');
diff --git a/lang/serendipity_lang_sa.inc.php b/lang/serendipity_lang_sa.inc.php
index 9fd1528..e785018 100644
--- a/lang/serendipity_lang_sa.inc.php
+++ b/lang/serendipity_lang_sa.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'ÍÕá ÎØà ÛíÑ ãÚÑæÝ! ! ! áã íÊãá ÑÝÚ ÇáãáÝ – ãä Çáããßä Ãä íßæä ÇáãáÝ ÃßÈÑ ãä ÍÌã ÇáãáÝ áãÕÑÍ ÈÑÝÚå ! ! ! ÃÝÍÕ ISP Ãæ Þã ÈÊÍÑíÑ ãáÝ php.ini ßí ÊÓãÍ ÈÑÝÚ ÇáãáÝÇÊ ÇáßÈíÑÉ');
 @define('GO', 'Ãßãá!');
 @define('NEWSIZE', 'ÇáãÞÇÓ ÇáÌÏíÏ: ');
-@define('RESIZE_BLAHBLAH', '<b>ÊÛííÑ ÇáãÞÇííÓ %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>ÊÛííÑ ÇáãÞÇííÓ %s</b>');
 @define('ORIGINAL_SIZE', 'ÇáÍÌã ÇáÇÕáí <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>íãßä áß ÊÛííÑ ÞíÇÓÇÊ ÇáÕæÑÉ - Çä ßäÊ ÊÑíÏ ÊÛííÑ ÞíÇÓÇÊ ÇáÕæÑÉ ÈÃØæÇá ãÊäÇÓÈÉ - ßá ãÇ Úáíß åæ ÇÏÎá ÇáÞíÇÓ ÇáÌÏíÏ Ýí ÇÍÏ ÇáÕäÏæÞíä Ëã ÃÖÛØ ÒÑ Tab -- ÓæÝ ÊÚØíß ÇÊãÇÊíßíÇð ÇáÍÌã ÇáãäÇÓÈ ááÞíÇÓ ÇáÌÏíÏ - áÐáß ÇáÕæÑÉ ÓæÝ ÊÓÊãÑ ÈÔßáåÇ ÇáÃÕáí æ áÇ ÊÝÞÏ Ôßá ÊæÇÒäåÇ</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
@@ -203,6 +203,10 @@
 @define('RESIZING', 'ÊÛíÑ ÇáÍÌã');
 @define('RESIZE_DONE', 'Êã (ÊÛííÑ ÞíÇÓÇÊ %s ÕæÑÉ).');
 @define('SYNCING', 'ÖÈØ ÞÇÚÏÉ ÇáÈíÇäÇÊ ãÚ ãÌáÏ ÇáÕæÑ');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Done (ÖÈØ %s ÇáÕæÑ).');
 @define('FILE_NOT_FOUND', 'áã íÊã ÅíÌÇÏ ÇáãáÝ <b>%s</b>, ãä Çáããßä Ãä íßæä ÞÏ ÍÐÝ¿');
 @define('ABORT_NOW', 'ÊæÞÝ ÇáÂä');
@@ -414,6 +418,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'ÓæÝ íÚØì ááÕæÑ ÇáãÕÛÑÉ ÇÇáÃÓã æÇáÕíÛÉ ÇáÊÇáíÉ: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'ÞíÇÓÇÊ ÇáÕæÑÉ ÇáãÕÛÑÉ');
 @define('INSTALL_THUMBWIDTH_DESC', 'ÇáÚÑÖ ÇáËÇÈÊ áÕæÑ ÇáãÕÛÑÉ ÇáãäÔÆÉ ÃÊãÇÊíßíÇð');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'ÊÝÕíá ÇÚÏÇÏÊß ÇáÔÎÕíÉ');
diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php
index 6700e24..a01ad00 100644
--- a/lang/serendipity_lang_se.inc.php
+++ b/lang/serendipity_lang_se.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Ett okänt fel inträffade och filen laddades inte upp. Filstorleken är kanske större än vad som tillåts av din serverinstallation. Kolla med din tjänsteleverantör eller ändra i filen php.ini för att tillåta uppladdning av större filer.');
 @define('GO', 'Kör!');
 @define('NEWSIZE', 'Ny storlek: ');
-@define('RESIZE_BLAHBLAH', '<b>Ändra storlek på %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Ändra storlek på %s</b>');
 @define('ORIGINAL_SIZE', 'Ursprunglig storlek: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Här kan du anpassa bildstorleken. Om du vill ändra storlek proportionellt, ändra bara ett värde i något av de två fälten och tryck på TAB - Då ändras  automatiskt storleken automatiskt så att bildens proportioner bibehålls</p>');
 @define('QUICKJUMP_CALENDAR', 'Snabbkalender');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'Ändrar storlek');
 @define('RESIZE_DONE', 'Klar (böt storlek på %s bilder).');
 @define('SYNCING', 'Synkroniserar databasen med bildkatalogen');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Klar (synkroniserade %s bilder).');
 @define('FILE_NOT_FOUND', 'Kunde inte hitta filen <b>%s</b>, kanske är den redan borttagen?');
 @define('ABORT_NOW', 'Avbryt nu');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Miniatyrer kommer att döpas enligt följande format: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Miniatyrbildsdimensioner');
 @define('INSTALL_THUMBWIDTH_DESC', 'Statisk max-bredd för auto-genererade miniatyrbilder');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Din personliga information');
diff --git a/lang/serendipity_lang_ta.inc.php b/lang/serendipity_lang_ta.inc.php
index baa67ec..76e8cc2 100644
--- a/lang/serendipity_lang_ta.inc.php
+++ b/lang/serendipity_lang_ta.inc.php
@@ -88,7 +88,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occurred, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 @define('GO','செயல்படுத்துக!');
 @define('NEWSIZE', 'New size: ');
-@define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Resize %s</b>');
 @define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here, you can adjust the image size. If you want to resize the image proportionally, just enter a value in one of the two boxes and press the TAB key --  I will automatically calculate the new size so the image proportions do not get messed up</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
@@ -202,6 +202,10 @@
 @define('RESIZING', 'வலைபொருள்கள் சிறிதாக்கப்படுகின்றன');
 @define('RESIZE_DONE', '%s வலைபொருள்கள் சிறிதாக்கப்பட்டுவிட்டன.');
 @define('SYNCING', 'வலைபொருள் இருப்பிடங்கள் உறுதிப்படுத்தப்படுகின்றன...');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '%s வலைபொருள் இருப்பிடங்கள் உறுதிப்படுத்தப்படுத்தப்பட்டுவிட்டன.');
 @define('FILE_NOT_FOUND', 'நீங்கள் தேடிய கணிபொறிக்ககோப்பு <b>%s</b> காணவில்லை. ஒருவேளை அது முன்பே நீக்கப்பட்டுவிட்டதோ?');
 @define('ABORT_NOW', 'இக்கணமே நிறுத்து!');
@@ -413,6 +417,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
 @define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'உங்கள் நிலைகள்');
diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php
index 966bc21..1bff276 100644
--- a/lang/serendipity_lang_tn.inc.php
+++ b/lang/serendipity_lang_tn.inc.php
@@ -90,7 +90,7 @@ $i18n_unknown = 'tw';
 @define('ERROR_UNKNOWN_NOUPLOAD', '未知的錯誤發生, 檔案還沒上傳. 也許你的檔案大於限制的大小. 請詢問您的 ISP 或修改您的 php.ini 檔.');
 @define('GO', '繼續!');
 @define('NEWSIZE', '新大小: ');
-@define('RESIZE_BLAHBLAH', '<b>重設大小 %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>重設大小 %s</b>');
 @define('ORIGINAL_SIZE', '原有的大小: <i>%sx%s</i> 像素');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>在這裡您可以修改圖片大小. 如果您要修改成相同的圖片比例, 您只需要輸入一個數值然後按 TAB -- 系統會自動幫您計算比例以免出錯</p>');
 @define('QUICKJUMP_CALENDAR', '日曆快速跳躍');
@@ -204,6 +204,10 @@ $i18n_unknown = 'tw';
 @define('RESIZING', '重設大小');
 @define('RESIZE_DONE', '完成 (重設 %s 個圖片).');
 @define('SYNCING', '進行資料庫和圖片檔案夾同步化');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '完成 (同步了 %s 個圖片).');
 @define('FILE_NOT_FOUND', '找不到檔案名稱 <b>%s</b>, 也許已經被刪除了?');
 @define('ABORT_NOW', '放棄');
@@ -415,6 +419,14 @@ $i18n_unknown = 'tw';
 @define('INSTALL_THUMBSUFFIX_DESC', '縮圖會以下面的格式重新命名: 原檔名.[後置字元].ext');
 @define('INSTALL_THUMBWIDTH', '縮圖尺度');
 @define('INSTALL_THUMBWIDTH_DESC', '自動建立縮圖的最大寬度');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '個人資料設定');
diff --git a/lang/serendipity_lang_tr.inc.php b/lang/serendipity_lang_tr.inc.php
index ed05f76..b624553 100644
--- a/lang/serendipity_lang_tr.inc.php
+++ b/lang/serendipity_lang_tr.inc.php
@@ -90,7 +90,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Bilinmeyen hata oluştu, dosya yüklenemedi.Dosyanız sunucunuzda izin verilen boyuttan daha büyük olabilir.Servis sağlayıcınızdan araştırın ya da php.ini dosyanızı daha büyük boyutta dosya yüklenmesine izin verecek şekilde ayarlayın.');
 @define('GO', 'Git!');
 @define('NEWSIZE', 'Yeni boyut: ');
-@define('RESIZE_BLAHBLAH', '<b>Yeniden boyutlandır %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>Yeniden boyutlandır %s</b>');
 @define('ORIGINAL_SIZE', 'Özgün boyut: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Burada resmi yeniden boyutlandırabilirsiniz. Eğer resim özelliklerini değiştirmek istiyorsanız,İki kutudan birine bir değer girin ve TAB tuşuna basın --  Otomatik olarak resminiz yeniden boyutlandırılacaktır</p>');
 @define('QUICKJUMP_CALENDAR', 'Ajandaya hızlı bakış');
@@ -204,6 +204,10 @@
 @define('RESIZING', 'Yeniden hizalama');
 @define('RESIZE_DONE', 'Tamamlandı (resim %s hizalandı).');
 @define('SYNCING', 'Veritabanı ile resimler dizini eşleniyor');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Tamamlandı (Eşlendi %s resimler).');
 @define('FILE_NOT_FOUND', 'Başlıklı dosyaya erişilemedi <b>%s</b>, silinmiş olabilir');
 @define('ABORT_NOW', 'Ä°ptal et');
@@ -415,6 +419,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Küçükresimler izleyen şekilde adlandırılacak: original.[suffix].ext');
 @define('INSTALL_THUMBWIDTH', 'Küçükresim boyutları');
 @define('INSTALL_THUMBWIDTH_DESC', 'Küçükresim oluşturma işlemi için izin verilen enbüyük genişlik boyutu');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Kişisel bilgileriniz');
diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php
index 01bb9d5..28dc36a 100644
--- a/lang/serendipity_lang_tw.inc.php
+++ b/lang/serendipity_lang_tw.inc.php
@@ -90,7 +90,7 @@ $i18n_unknown = 'tw';
 @define('ERROR_UNKNOWN_NOUPLOAD', '¥¼ª¾ªº¿ù»~µo¥Í, ÀÉ®×ÁÙ¨S¤W¶Ç. ¤]³\§AªºÀɮפj©ó­­¨îªº¤j¤p. ½Ð¸ß°Ý±zªº ISP ©Î­×§ï±zªº php.ini ÀÉ.');
 @define('GO', 'Ä~Äò!');
 @define('NEWSIZE', '·s¤j¤p: ');
-@define('RESIZE_BLAHBLAH', '<b>­«³]¤j¤p %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>­«³]¤j¤p %s</b>');
 @define('ORIGINAL_SIZE', '­ì¦³ªº¤j¤p: <i>%sx%s</i> ¹³¯À');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>¦b³o¸Ì±z¥i¥H­×§ï¹Ï¤ù¤j¤p. ¦pªG±z­n­×§ï¦¨¬Û¦Pªº¹Ï¤ù¤ñ¨Ò, ±z¥u»Ý­n¿é¤J¤@­Ó¼Æ­ÈµM«á«ö TAB -- ¨t²Î·|¦Û°ÊÀ°±z­pºâ¤ñ¨Ò¥H§K¥X¿ù</p>');
 @define('QUICKJUMP_CALENDAR', '¤é¾ä§Ö³t¸õÅD');
@@ -204,6 +204,10 @@ $i18n_unknown = 'tw';
 @define('RESIZING', '­«³]¤j¤p');
 @define('RESIZE_DONE', '§¹¦¨ (­«³] %s ­Ó¹Ï¤ù).');
 @define('SYNCING', '¶i¦æ¸ê®Æ®w©M¹Ï¤ùÀɮק¨¦P¨B¤Æ');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', '§¹¦¨ (¦P¨B¤F %s ­Ó¹Ï¤ù).');
 @define('FILE_NOT_FOUND', '§ä¤£¨ìÀɮצWºÙ <b>%s</b>, ¤]³\¤w¸g³Q§R°£¤F?');
 @define('ABORT_NOW', '©ñ±ó');
@@ -415,6 +419,14 @@ $i18n_unknown = 'tw';
 @define('INSTALL_THUMBSUFFIX_DESC', 'ÁY¹Ï·|¥H¤U­±ªº®æ¦¡­«·s©R¦W: ­ìÀɦW.[«á¸m¦r¤¸].ext');
 @define('INSTALL_THUMBWIDTH', 'ÁY¹Ï¤Ø«×');
 @define('INSTALL_THUMBWIDTH_DESC', '¦Û°Ê«Ø¥ßÁY¹Ïªº³Ì¤j¼e«×');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '­Ó¤H¸ê®Æ³]©w');
diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php
index 3ba305d..c23aaf3 100644
--- a/lang/serendipity_lang_zh.inc.php
+++ b/lang/serendipity_lang_zh.inc.php
@@ -89,7 +89,7 @@
 @define('ERROR_UNKNOWN_NOUPLOAD', '·¢Éú´íÎó, ÎļþûÓÐÉÏ´«£¬¿ÉÄÜÒòΪÄãµÄÎļþ³¬¹ýÏÞÖƵĴóС£¬ ÇëѯÎÊÄãµÄÖ÷»úÉÌ»òÐÞ¸ÄÄãµÄ php.ini ÎļþÊôÐÔ¡£');
 @define('GO', '¼ÌÐø');
 @define('NEWSIZE', '´óС: ');
-@define('RESIZE_BLAHBLAH', '<b>ÖØÉè´óС %s</b><p>');
+@define('RESIZE_BLAHBLAH', '<b>ÖØÉè´óС %s</b>');
 @define('ORIGINAL_SIZE', 'Ô­ÓеĴóС: <i>%sx%s</i> ÏñËØ');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>ÔÚÕâÀïÄã¿ÉÒÔÐÞ¸ÄͼƬ´óС£¡Èç¹ûÄãÒªÐ޸ijÉÏàͬµÄͼƬ±ÈÀý, ÄãÖ»ÐèÒªÊäÈëÒ»¸öÊýֵȻºó°´ TAB -- ϵͳ»á×Ô¶¯°ïÄã¼ÆËã±ÈÀýÒÔÃâ³ö´í¡£</p>');
 @define('QUICKJUMP_CALENDAR', 'ÈÕÀú¿ìËÙÌøÔ¾');
@@ -203,6 +203,10 @@
 @define('RESIZING', 'ÖØÉè´óС');
 @define('RESIZE_DONE', 'Íê³É (ÖØÉè %s ¸öͼƬ)');
 @define('SYNCING', '½øÐÐÊý¾Ý¿âºÍͼƬÎļþ¼ÐÊý¾Ýͬ²½');
+@define('SYNC_OPTION_LEGEND', 'Thumbnail Synchronization Options');
+@define('SYNC_OPTION_KEEPTHUMBS', 'Keep all existing thumbnails');
+@define('SYNC_OPTION_SIZECHECKTHUMBS', 'Keep existing thumbnails only if they are the correct size');
+@define('SYNC_OPTION_DELETETHUMBS', 'Regenerate all thumbnails');
 @define('SYNC_DONE', 'Íê³É (ͬ²½ÁË %s ¸öͼƬ)');
 @define('FILE_NOT_FOUND', 'ÕÒ²»µ½Îļþ <b>%s</b>, ¿ÉÄÜÒѱ»É¾³ý');
 @define('ABORT_NOW', '·ÅÆú');
@@ -414,6 +418,14 @@
 @define('INSTALL_THUMBSUFFIX_DESC', 'Ëõͼ»áÒÔÏÂÃæµÄ¸ñʽÖØÐÂÃüÃû: original.[ºóÖÃ×Ö·û].ext');
 @define('INSTALL_THUMBWIDTH', 'Ëõͼ´óС');
 @define('INSTALL_THUMBWIDTH_DESC', '×Ô¶¯½¨Á¢ËõͼµÄ×î´ó¿í¶È');
+@define('INSTALL_THUMBDIM', 'Thumbnail constrained dimension');
+@define('INSTALL_THUMBDIM_LARGEST', 'Largest');
+@define('INSTALL_THUMBDIM_WIDTH', 'Width');
+@define('INSTALL_THUMBDIM_HEIGHT', 'Height');
+@define('INSTALL_THUMBDIM_DESC', 'Dimension to be constrained to the thumbnail max size. The default "' . 
+    INSTALL_THUMBDIM_LARGEST .  '" limits both dimensions, so neither can be greater than the max size; "' . 
+    INSTALL_THUMBDIM_WIDTH . '" and "' .  INSTALL_THUMBDIM_HEIGHT . 
+    '" only limit the chosen dimension, so the other could be larger than the max size.');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', '¸öÈË×ÊÁÏÉ趨');
diff --git a/serendipity_admin.php b/serendipity_admin.php
index 7b97cb8..0408ddd 100644
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -401,7 +401,7 @@ if ($use_installer) {
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li>
 <?php } ?>
 <?php if (serendipity_checkPermission('adminImagesSync')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li>
+                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync"><?php echo CREATE_THUMBS; ?></a></li>
 <?php } ?>
                         <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
                         <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMediaLinks" style="display:none"></li>
@@ -476,4 +476,4 @@ if ($use_installer) {
     </body>
 </html>
 <?php
-}
\ No newline at end of file
+}
-- 
2.39.5