From 73aec1225a3b090987e76a42e5e7731a5de32af1 Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Mon, 18 Jan 2021 21:16:10 +0100
Subject: [PATCH] Improve merge descripiton #566

---
 src/merge/SortableFiles.jsx | 4 +++-
 src/mifi.js                 | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/merge/SortableFiles.jsx b/src/merge/SortableFiles.jsx
index aff37362..3c696d98 100644
--- a/src/merge/SortableFiles.jsx
+++ b/src/merge/SortableFiles.jsx
@@ -49,7 +49,9 @@ const SortableFiles = memo(({
 
   return (
     <div>
-      <div><b>{t('Sort your files for merge')}</b></div>
+      <div><b>{t('Merge/concatenate files')}</b></div>
+
+      <div style={{ whiteSpace: 'pre-wrap', textAlign: 'left', fontSize: 14 }}>{t('This dialog can be used to concatenate files in series, e.g. one after the other:\n[file1][file2][file3]\nIt can NOT be used for merging tracks in parallell (like adding an audio track to a video).\nMake sure all files are of the exact same codecs & codec parameters (fps, resolution etc).\n\nDrag and drop to change the order of your files here:')}</div>
       <SortableContainer
         items={items}
         onSortEnd={onSortEnd}
diff --git a/src/mifi.js b/src/mifi.js
index 308ab9af..c2b52946 100644
--- a/src/mifi.js
+++ b/src/mifi.js
@@ -3,6 +3,7 @@ import axios from 'axios';
 // eslint-disable-next-line import/prefer-default-export
 export async function loadMifiLink() {
   try {
+    // In old versions: https://mifi.no/losslesscut/config.json
     const resp = await axios.get('https://losslesscut.mifi.no/config.json');
     return resp.data;
   } catch (err) {