8 files changed, 18 insertions, 12 deletions

diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index f4f9b1352..d5b83f239 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -36,6 +36,7 @@ languages=(
     ["de"]="de-DE"
     ["it"]="it-IT"
     ["sq"]="sq"
+    ["tok"]="tok"
     ["nn"]="nn"
     ["nb"]="nb-NO"
     ["kab"]="kab"
@@ -49,7 +50,7 @@ rm -rf ./dist
 if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); then
     additionalParams=""
     if [ ! -z ${1+x} ] && [ "$1" == "--source-map" ]; then
-        additionalParams="--sourceMap=true"
+        additionalParams="--source-map=true"
     fi
 
     node --max_old_space_size=8192 node_modules/.bin/ng build --configuration production --output-path "dist/build" $additionalParams
@@ -71,14 +72,14 @@ if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); t
 else
     additionalParams=""
     if [ ! -z ${1+x} ] && [ "$1" == "--analyze-bundle" ]; then
-        additionalParams="--namedChunks=true --outputHashing=none"
+        additionalParams="--named-chunks=true --output-hashing=none"
 
         # For webpack
         export ANALYZE_BUNDLE=true
     fi
 
     node --max_old_space_size=8192 node_modules/.bin/ng build --localize=false --output-path "dist/$defaultLanguage/" \
-                        --deploy-url "/client/$defaultLanguage/" --configuration production --stats-json $additionalParams
+                                                              --configuration production --stats-json $additionalParams
 fi
 
 cp "./dist/$defaultLanguage/manifest.webmanifest" "./dist/manifest.webmanifest"
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index 650b0aecd..e52909c43 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -57,6 +57,8 @@ const playerKeys = {
   '  off': '  off',
   'Player mode': 'Player mode',
   'Play in loop': 'Play in loop',
+  'This live has not started yet.': 'This live has not started yet.',
+  'This live has ended.': 'This live has ended.',
   'The video failed to play, will try to fast forward.': 'The video failed to play, will try to fast forward.'
 }
 Object.assign(playerKeys, videojs)
diff --git a/scripts/i18n/update.sh b/scripts/i18n/update.sh
index 4cf0d65b7..2d037e523 100755
--- a/scripts/i18n/update.sh
+++ b/scripts/i18n/update.sh
@@ -8,7 +8,7 @@ cd client
 npm run ng -- extract-i18n --out-file src/locale/angular.xlf
 
 # Merge new translations in other language files
-node ./node_modules/.bin/xliffmerge -p ./.xliffmerge.json "ar" "ca-ES" "gl-ES" "cs-CZ" "da-DK" "de-DE" "el-GR" "en-GB" "en-US" "eo" "es-ES" "eu-ES" "fa-IR" "fi-FI" "fr-FR" "gd" "gl-ES" "hu-HU" "it-IT" "ja-JP" "jbo" "kab" "ko-KR" "lt-LT" "nb-NO" "nl-NL" "oc" "pl-PL" "pt-BR" "pt-PT" "ru-RU" "sk-SK" "sl-SI" "sv-SE" "ta" "th-TH" "tr-TR" "uk-UA" "vi-VN" "zh-Hans-CN" "zh-Hant-TW" "nn" "nb-NO"
+node ./node_modules/.bin/xliffmerge -p ./.xliffmerge.json "ar" "ca-ES" "gl-ES" "cs-CZ" "da-DK" "de-DE" "el-GR" "en-GB" "en-US" "eo" "es-ES" "eu-ES" "fa-IR" "fi-FI" "fr-FR" "gd" "gl-ES" "hu-HU" "it-IT" "ja-JP" "jbo" "kab" "ko-KR" "lt-LT" "nb-NO" "nl-NL" "oc" "pl-PL" "pt-BR" "pt-PT" "ru-RU" "sk-SK" "sl-SI" "sv-SE" "ta" "th-TH" "tr-TR" "uk-UA" "vi-VN" "zh-Hans-CN" "zh-Hant-TW" "nn" "nb-NO" "tok"
 
 # Add our strings too
 cd ../
diff --git a/scripts/migrations/peertube-4.2.ts b/scripts/migrations/peertube-4.2.ts
index b5e5dfebd..6a9007265 100644
--- a/scripts/migrations/peertube-4.2.ts
+++ b/scripts/migrations/peertube-4.2.ts
@@ -110,7 +110,7 @@ async function generateSmallerAvatar (actor: MActorDefault) {
   const source = join(CONFIG.STORAGE.ACTOR_IMAGES, sourceFilename)
   const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, newImageName)
 
-  await processImage(source, destination, imageSize, true)
+  await processImage({ path: source, destination, newSize: imageSize, keepOriginal: true })
 
   const actorImageInfo = {
     name: newImageName,
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index d3c93cee5..7a50d9f2f 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -39,7 +39,7 @@ const loggerFormat = winston.format.printf((info) => {
     if (CONFIG.LOG.PRETTIFY_SQL) {
       additionalInfos += '\n' + sqlFormat(info.sql, {
         language: 'sql',
-        indent: '  '
+        tabWidth: 2
       })
     } else {
       additionalInfos += ' - ' + info.sql
diff --git a/scripts/regenerate-thumbnails.ts b/scripts/regenerate-thumbnails.ts
index a377baa61..061819387 100644
--- a/scripts/regenerate-thumbnails.ts
+++ b/scripts/regenerate-thumbnails.ts
@@ -52,7 +52,7 @@ async function processVideo (id: number) {
   thumbnail.height = size.height
 
   const thumbnailPath = thumbnail.getPath()
-  await processImage(previewPath, thumbnailPath, size, true)
+  await processImage({ path: previewPath, destination: thumbnailPath, newSize: size, keepOriginal: true })
 
   // Save new attributes
   await thumbnail.save()
diff --git a/scripts/simulate-many-viewers.ts b/scripts/simulate-many-viewers.ts
index fb666c318..a993e175a 100644
--- a/scripts/simulate-many-viewers.ts
+++ b/scripts/simulate-many-viewers.ts
@@ -46,10 +46,12 @@ async function prepare () {
     }
   }
 
+  const env = { PRODUCTION_CONSTANTS: 'true' }
+
   servers = await Promise.all([
-    createSingleServer(1, config, { nodeArgs: [ '--inspect' ] }),
-    createSingleServer(2, config),
-    createSingleServer(3, config)
+    createSingleServer(1, config, { env, nodeArgs: [ '--inspect' ] }),
+    createSingleServer(2, config, { env }),
+    createSingleServer(3, config, { env })
   ])
 
   await setAccessTokensToServers(servers)
@@ -81,7 +83,7 @@ async function runViewers () {
 
   await Bluebird.map(viewers, viewer => {
     return servers[0].views.simulateView({ id: videoId, xForwardedFor: viewer.xForwardedFor })
-  }, { concurrency: 100 })
+  }, { concurrency: 500 })
 
   console.log('Finished to run views in %d seconds.', (new Date().getTime() - before) / 1000)
 
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 9c17aecb8..e70576285 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -78,7 +78,8 @@ ln -s "$PEERTUBE_PATH/versions/peertube-${VERSION}" $PEERTUBE_PATH/peertube-late
 cp $PEERTUBE_PATH/peertube-latest/config/default.yaml $PEERTUBE_PATH/config/default.yaml
 
 echo "Differences in configuration files..."
-diff -u $PEERTUBE_PATH/config/production.yaml "$PEERTUBE_PATH/versions/peertube-${VERSION}/config/production.yaml.example"
+cd $PEERTUBE_PATH/versions
+diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example"
 
 echo ""
 echo "==========================================="