Merge 9a81e354ea into 2aedc3e861

* resolve 5c19637715 (locale-uk)

* resolve 73a067a0c5 (locale-uk)

* resolve cf0b4be3fb (locale-uk)

* resolve aff19de2ea (locale-uk)

* fix(locale-uk): fix spelling errors

* fix(locale-uk): fix spelling errors

* fix(locale-uk): fix spelling errors

* fix(locale-uk): fix spelling errors

* fix(locale-uk): fix spelling errors

* resolve 2af8447a0f (locale-uk)

* resolve e4a79a8ffb (locale-uk)

* fix(locale-uk): fix spelling errors

* small typo fix

Web/Models/shell/processVideo.ps1

@@ -13,7 +13,7 @@ Move-Item $file $temp
 
 # video stub logic was implicitly deprecated, so we start processing at once
 ffmpeg -i $temp -ss 00:00:01.000 -vframes 1 "$dir$hashT/$hash.gif"
-ffmpeg -i $temp -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=640:480:force_original_aspect_ratio=decrease,pad=640:480:(ow-iw)/2:(oh-ih)/2,setsar=1" -y $temp2
+ffmpeg -i $temp -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=480:-1,setsar=1" -y $temp2
 
 Move-Item $temp2 "$dir$hashT/$hash.mp4"
 Remove-Item $temp

Web/Models/shell/processVideo.sh

@@ -3,7 +3,7 @@ tmpfile="$RANDOM-$(date +%s%N)"
 cp $2 "/tmp/vid_$tmpfile.bin"
 
 nice ffmpeg -i "/tmp/vid_$tmpfile.bin" -ss 00:00:01.000 -vframes 1 $3${4:0:2}/$4.gif
-nice -n 20 ffmpeg -i "/tmp/vid_$tmpfile.bin" -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=640:480:force_original_aspect_ratio=decrease,pad=640:480:(ow-iw)/2:(oh-ih)/2,setsar=1" -y "/tmp/ffmOi$tmpfile.mp4"
+nice -n 20 ffmpeg -i "/tmp/vid_$tmpfile.bin" -c:v libx264 -q:v 7 -c:a libmp3lame -q:a 4 -tune zerolatency -vf "scale=480:-1,setsar=1" -y "/tmp/ffmOi$tmpfile.mp4"
 
 rm -rf $3${4:0:2}/$4.mp4
 mv "/tmp/ffmOi$tmpfile.mp4" $3${4:0:2}/$4.mp4