renamed some option keys

_locales/en/messages.json

@@ -123,19 +123,19 @@
         "message": "open the \"Save as\" dialog to confirm the file name",
         "description": "Options page label: 'open the \"Save as\" dialog to confirm the file name'"
     },
-    "optionConflictAction": {
+    "optionFilenameConflictAction": {
         "message": "file name conflict resolution",
         "description": "Options page label: 'filename conflict resolution'"
     },
-    "optionConflictActionUniquify": {
+    "optionFilenameConflictActionUniquify": {
         "message": "create a unique name",
         "description": "Value for 'filename conflict resolution' option: 'create a unique name'"
     },
-    "optionConflictActionOverwrite": {
+    "optionFilenameConflictActionOverwrite": {
         "message": "overwrite the existing file",
         "description": "Value for 'filename conflict resolution' option: 'overwrite the existing file'"
     },
-    "optionConflictActionPrompt": {
+    "optionFilenameConflictActionPrompt": {
         "message": "prompt for a name",
         "description": "Value for 'name conflict resolution' option: 'prompt for a name'"
     },
@@ -167,11 +167,11 @@
         "message": "group duplicate images together",
         "description": "Options page label: 'group duplicate images together'"
     },
-    "optionLazyLoadImages": {
+    "optionLoadDeferredImages": {
         "message": "save deferred images",
         "description": "Options page label: 'save deferred images'"
     },
-    "optionMaxLazyLoadImagesIdleTime": {
+    "optionLoadDeferredImagesMaxIdle": {
         "message": "maximum idle time (ms)",
         "description": "Options page label: 'maximum idle time (ms)'"
     },

_locales/fr/messages.json

@@ -123,19 +123,19 @@
         "message": "ouvrir la boite de dialogue \"Sauver sous\" pour confimer le nom de fichier",
         "description": "Options page label: 'open the \"Save as\" dialog to confirm the file name'"
     },
-    "optionConflictAction": {
+    "optionFilenameConflictAction": {
         "message": "résolution de conflit de noms",
         "description": "Options page label: 'filename conflict resolution'"
     },
-    "optionConflictActionUniquify": {
+    "optionFilenameConflictActionUniquify": {
         "message": "créer un nom unique",
         "description": "Value for 'filename conflict resolution' option: 'create a unique filename'"
     },
-    "optionConflictActionOverwrite": {
+    "optionFilenameConflictActionOverwrite": {
         "message": "écraser le fichier existant",
         "description": "Value for 'filename conflict resolution' option: 'overwrite the existing file'"
     },
-    "optionConflictActionPrompt": {
+    "optionFilenameConflictActionPrompt": {
         "message": "demander un nom de fichier",
         "description": "Value for 'filename conflict resolution' option: 'prompt for a filename'"
     },
@@ -167,11 +167,11 @@
         "message": "regrouper les images dupliquées",
         "description": "Options page label: 'group duplicate images together'"
     },
-    "optionLazyLoadImages": {
+    "optionLoadDeferredImages": {
         "message": "sauver les images chargées de manière différées",
         "description": "Options page label: 'save deferred images'"
     },
-    "optionMaxLazyLoadImagesIdleTime": {
+    "optionLoadDeferredImagesMaxIdle": {
         "message": "temps d'inactivité maximal (ms)",
         "description": "Options page label: 'maximum idle time (ms)'"
     },

_locales/ja/messages.json

@@ -123,19 +123,19 @@
         "message": "を開く（として保存する：ファイル名を確認するためのダイアログ）",
         "description": "オプションのページラベル: 'を開く（として保存する：ファイル名を確認するためのダイアログ）'"
     },
-    "optionConflictAction": {
+    "optionFilenameConflictAction": {
         "message": "ファイル名の競合を解決する",
         "description": "Options page label: 'filename conflict resolution'"
     },
-    "optionConflictActionUniquify": {
+    "optionFilenameConflictActionUniquify": {
         "message": "独自の名前を作成する",
         "description": "Value for 'filename conflict resolution' option: 'create a unique name'"
     },
-    "optionConflictActionOverwrite": {
+    "optionFilenameConflictActionOverwrite": {
         "message": "既存のファイルを上書きする",
         "description": "Value for 'filename conflict resolution' option: 'overwrite the existing file'"
     },
-    "optionConflictActionPrompt": {
+    "optionFilenameConflictActionPrompt": {
         "message": "名前を求めるプロンプト",
         "description": "Value for 'name conflict resolution' option: 'prompt for a name'"
     },
@@ -167,11 +167,11 @@
         "message": "オプション重複画像のグループ化",
         "description": "Options page label: 'group duplicate images together'"
     },
-    "optionLazyLoadImages": {
+    "optionLoadDeferredImages": {
         "message": "遅延画像を保存する",
         "description": "オプションのページラベル: '遅延画像を保存する'"
     },
-    "optionMaxLazyLoadImagesIdleTime": {
+    "optionLoadDeferredImagesMaxIdle": {
         "message": "最大アイドル時間（秒）",
         "description": "Options page label: 'maximum idle time (ms)'"
     },

_locales/pl/messages.json

@@ -123,19 +123,19 @@
         "message": "otwieraj okno \"Zapisz jako\", aby potwierdzić nazwę pliku",
         "description": "Options page label: 'open the \"Save as\" dialog to confirm the file name'"
     },
-    "optionConflictAction": {
+    "optionFilenameConflictAction": {
         "message": "rozwiązywanie konfliktu nazwy pliku",
         "description": "Options page label: 'filename conflict resolution'"
     },
-    "optionConflictActionUniquify": {
+    "optionFilenameConflictActionUniquify": {
         "message": "stwórz unikalną nazwę pliku",
         "description": "Value for 'filename conflict resolution' option: 'create a unique name'"
     },
-    "optionConflictActionOverwrite": {
+    "optionFilenameConflictActionOverwrite": {
         "message": "nadpisz istniejący plik",
         "description": "Value for 'filename conflict resolution' option: 'overwrite the existing file'"
     },
-    "optionConflictActionPrompt": {
+    "optionFilenameConflictActionPrompt": {
         "message": "zapytaj o nazwę",
         "description": "Value for 'name conflict resolution' option: 'prompt for a name'"
     },
@@ -167,11 +167,11 @@
         "message": "grupuj zduplikowane obrazy razem",
         "description": "Options page label: 'group duplicate images together'"
     },
-    "optionLazyLoadImages": {
+    "optionLoadDeferredImages": {
         "message": "zapisuj odroczone obrazy",
         "description": "Options page label: 'save deferred images'"
     },
-    "optionMaxLazyLoadImagesIdleTime": {
+    "optionLoadDeferredImagesMaxIdle": {
         "message": "maksymalny czas bezczynności (ms)",
         "description": "Options page label: 'maximum idle time (ms)'"
     },

_locales/ru/messages.json

@@ -123,19 +123,19 @@
         "message": "открывать диалоговое окно \"Сохранить как\" для подтверждения имени файла",
         "description": "Options page label: 'open the \"Save as\" dialog to confirm the file name'"
     },
-    "optionConflictAction": {
+    "optionFilenameConflictAction": {
         "message": "разрешение конфликтов имен файлов",
         "description": "Options page label: 'filename conflict resolution'"
     },
-    "optionConflictActionUniquify": {
+    "optionFilenameConflictActionUniquify": {
         "message": "создать уникальное имя",
         "description": "Value for 'filename conflict resolution' option: 'create a unique name'"
     },
-    "optionConflictActionOverwrite": {
+    "optionFilenameConflictActionOverwrite": {
         "message": "перезаписать существующий файл",
         "description": "Value for 'filename conflict resolution' option: 'overwrite the existing file'"
     },
-    "optionConflictActionPrompt": {
+    "optionFilenameConflictActionPrompt": {
         "message": "запросить имя",
         "description": "Value for 'name conflict resolution' option: 'prompt for a name'"
     },
@@ -167,11 +167,11 @@
         "message": "группировать дубликаты изображений",
         "description": "Options page label: 'group duplicate images together'"
     },
-    "optionLazyLoadImages": {
+    "optionLoadDeferredImages": {
         "message": "сохранить отложенные изображения",
         "description": "Options page label: 'save deferred images'"
     },
-    "optionMaxLazyLoadImagesIdleTime": {
+    "optionLoadDeferredImagesMaxIdle": {
         "message": "максимальное время простоя (мс)",
         "description": "Options page label: 'maximum idle time (ms)'"
     },

_locales/zh_CN/messages.json

@@ -123,19 +123,19 @@
         "message": "打开“另存为”对话框以确认文件名",
         "description": "选项页标签: '打开“另存为”对话框以确认文件名'"
     },
-    "optionConflictAction": {
+    "optionFilenameConflictAction": {
         "message": "文件名冲突解决",
         "description": "Options page label: 'filename conflict resolution'"
     },
-    "optionConflictActionUniquify": {
+    "optionFilenameConflictActionUniquify": {
         "message": "创建为不冲突的名称",
         "description": "Value for 'filename conflict resolution' option: 'create a unique name'"
     },
-    "optionConflictActionOverwrite": {
+    "optionFilenameConflictActionOverwrite": {
         "message": "覆盖现有的文件",
         "description": "Value for 'filename conflict resolution' option: 'overwrite the existing file'"
     },
-    "optionConflictActionPrompt": {
+    "optionFilenameConflictActionPrompt": {
         "message": "询问新名称",
         "description": "Value for 'name conflict resolution' option: 'prompt for a name'"
     },
@@ -167,11 +167,11 @@
         "message": "重复图像合并",
         "description": "选项页标签: '重复图像合并'"
     },
-    "optionLazyLoadImages": {
+    "optionLoadDeferredImages": {
         "message": "保存延迟加载的图像",
         "description": "选项页标签: '保存延迟加载的图像'"
     },
-    "optionMaxLazyLoadImagesIdleTime": {
+    "optionLoadDeferredImagesMaxIdle": {
         "message": "最长空闲时间（毫秒）",
         "description": "Options page label: 'maximum idle time (ms)'"
     },

extension/core/bg/config.js

@@ -34,13 +34,13 @@ singlefile.config = (() => {
 		rawDocument: false,
 		compressHTML: true,
 		compressCSS: true,
-		lazyLoadImages: true,
-		maxLazyLoadImagesIdleTime: 1500,
+		loadDeferredImages: true,
+		loadDeferredImagesMaxIdleTime: 1500,
 		filenameTemplate: "{page-title} ({date-iso} {time-locale}).html",
 		infobarTemplate: "",
-		confirmInfobar: false,
+		confirmInfobarContent: false,
 		confirmFilename: false,
-		conflictAction: "uniquify",
+		filenameConflictAction: "uniquify",
 		contextMenuEnabled: true,
 		shadowEnabled: true,
 		maxResourceSizeEnabled: false,
@@ -99,9 +99,6 @@ singlefile.config = (() => {
 		if (config.compressHTML === undefined) {
 			config.compressHTML = true;
 		}
-		if (config.lazyLoadImages === undefined) {
-			config.lazyLoadImages = true;
-		}
 		if (config.contextMenuEnabled === undefined) {
 			config.contextMenuEnabled = true;
 		}
@@ -171,14 +168,24 @@ singlefile.config = (() => {
 			config.autoSaveLoad = false;
 			config.autoSaveUnload = false;
 		}
-		if (config.maxLazyLoadImagesIdleTime === undefined) {
-			config.maxLazyLoadImagesIdleTime = DEFAULT_CONFIG.maxLazyLoadImagesIdleTime;
-		}
 		if (config.confirmFilename === undefined) {
 			config.confirmFilename = false;
 		}
-		if (config.conflictAction === undefined) {
-			config.conflictAction = DEFAULT_CONFIG.conflictAction;
+		if (config.confirmInfobarContent === undefined) {
+			config.confirmInfobarContent = config.confirmInfobar;
+			delete config.confirmInfobar;
+		}
+		if (config.filenameConflictAction === undefined) {
+			config.filenameConflictAction = config.conflictAction || DEFAULT_CONFIG.filenameConflictAction;
+			delete config.conflictAction;
+	}
+		if (config.loadDeferredImages === undefined) {
+			config.loadDeferredImages = config.lazyLoadImages || true;
+			delete config.lazyLoadImages;
+		}
+		if (config.loadDeferredImagesMaxIdleTime === undefined) {
+			config.loadDeferredImagesMaxIdleTime = config.maxLazyLoadImagesIdleTime || DEFAULT_CONFIG.loadDeferredImagesMaxIdleTime;
+			delete config.maxLazyLoadImagesIdleTime;
 		}
 	}
 

extension/core/bg/download.js

@@ -28,10 +28,10 @@ singlefile.download = (() => {
 				if (request.content) {
 					request.url = URL.createObjectURL(new Blob([request.content], { type: "text/html" }));
 				}
-				return downloadPage(request, { confirmFilename: request.confirmFilename, incognito: sender.tab.incognito, conflictAction: request.conflictAction })
+				return downloadPage(request, { confirmFilename: request.confirmFilename, incognito: sender.tab.incognito, conflictAction: request.filenameConflictAction })
 					.catch(error => {
 						if (error.message && error.message.includes("'incognito'")) {
-							return downloadPage(request, { confirmFilename: request.confirmFilename, conflictAction: request.conflictAction });
+							return downloadPage(request, { confirmFilename: request.confirmFilename, conflictAction: request.filenameConflictAction });
 						} else {
 							return { notSupported: true };
 						}
@@ -49,7 +49,7 @@ singlefile.download = (() => {
 			url: page.url,
 			saveAs: options.confirmFilename,
 			filename: page.filename,
-			conflictAction: options.conflictAction
+			conflictAction: options.filenameConflictAction
 		};
 		if (options.incognito) {
 			downloadInfo.incognito = true;

extension/core/content/content.js

@@ -75,8 +75,8 @@ this.singlefile.top = this.singlefile.top || (() => {
 		if (!options.saveRawPage) {
 			if (!options.removeFrames && this.frameTree) {
 				let frameTreePromise;
-				if (options.lazyLoadImages) {
-					frameTreePromise = new Promise(resolve => timeout.set(() => resolve(frameTree.getAsync(options)), options.maxLazyLoadImagesIdleTime - frameTree.TIMEOUT_INIT_REQUEST_MESSAGE));
+				if (options.loadDeferredImages) {
+					frameTreePromise = new Promise(resolve => timeout.set(() => resolve(frameTree.getAsync(options)), options.loadDeferredImagesMaxIdleTime - frameTree.TIMEOUT_INIT_REQUEST_MESSAGE));
 				} else {
 					frameTreePromise = frameTree.getAsync(options);
 				}
@@ -84,7 +84,7 @@ this.singlefile.top = this.singlefile.top || (() => {
 				frameTreePromise.then(() => singlefile.ui.onLoadFrames());
 				preInitializationPromises.push(frameTreePromise);
 			}
-			if (options.lazyLoadImages && options.shadowEnabled) {
+			if (options.loadDeferredImages && options.shadowEnabled) {
 				const lazyLoadPromise = lazyLoader.process(options);
 				singlefile.ui.onLoadingDeferResources();
 				lazyLoadPromise.then(() => singlefile.ui.onLoadDeferResources());
@@ -131,7 +131,7 @@ this.singlefile.top = this.singlefile.top || (() => {
 		options.win = window;
 		await processor.initialize();
 		await processor.run();
-		if (options.confirmInfobar) {
+		if (options.confirmInfobarContent) {
 			options.infobarContent = singlefile.ui.prompt("Infobar content", options.infobarContent) || "";
 		}
 		const page = await processor.getPageData();
@@ -151,9 +151,9 @@ this.singlefile.top = this.singlefile.top || (() => {
 
 	async function downloadPage(page, options) {
 		if (options.backgroundSave) {
-			const response = await browser.runtime.sendMessage({ download: true, url: page.url, confirmFilename: options.confirmFilename, conflictAction: options.conflictAction, filename: page.filename });
+			const response = await browser.runtime.sendMessage({ download: true, url: page.url, confirmFilename: options.confirmFilename, filenameConflictAction: options.filenameConflictAction, filename: page.filename });
 			if (response.notSupported) {
-				const response = await browser.runtime.sendMessage({ download: true, content: page.content, confirmFilename: options.confirmFilename, conflictAction: options.conflictAction, filename: page.filename });
+				const response = await browser.runtime.sendMessage({ download: true, content: page.content, confirmFilename: options.confirmFilename, filenameConflictAction: options.filenameConflictAction, filename: page.filename });
 				if (response.notSupported) {
 					downloadPageFallback(page, options);
 				}

extension/ui/bg/ui-options.js

@@ -36,18 +36,18 @@
 	const saveRawPageLabel = document.getElementById("saveRawPageLabel");
 	const compressHTMLLabel = document.getElementById("compressHTMLLabel");
 	const compressCSSLabel = document.getElementById("compressCSSLabel");
-	const lazyLoadImagesLabel = document.getElementById("lazyLoadImagesLabel");
-	const maxLazyLoadImagesIdleTimeLabel = document.getElementById("maxLazyLoadImagesIdleTimeLabel");
+	const loadDeferredImagesLabel = document.getElementById("loadDeferredImagesLabel");
+	const loadDeferredImagesMaxIdleTimeLabel = document.getElementById("loadDeferredImagesMaxIdleTimeLabel");
 	const addMenuEntryLabel = document.getElementById("addMenuEntryLabel");
 	const filenameTemplateLabel = document.getElementById("filenameTemplateLabel");
 	const shadowEnabledLabel = document.getElementById("shadowEnabledLabel");
 	const setMaxResourceSizeLabel = document.getElementById("setMaxResourceSizeLabel");
 	const maxResourceSizeLabel = document.getElementById("maxResourceSizeLabel");
 	const confirmFilenameLabel = document.getElementById("confirmFilenameLabel");
-	const conflictActionLabel = document.getElementById("conflictActionLabel");
-	const conflictActionUniquifyLabel = document.getElementById("conflictActionUniquifyLabel");
-	const conflictActionOverwriteLabel = document.getElementById("conflictActionOverwriteLabel");
-	const conflictActionPromptLabel = document.getElementById("conflictActionPromptLabel");
+	const filenameConflictActionLabel = document.getElementById("filenameConflictActionLabel");
+	const filenameConflictActionUniquifyLabel = document.getElementById("filenameConflictActionUniquifyLabel");
+	const filenameConflictActionOverwriteLabel = document.getElementById("filenameConflictActionOverwriteLabel");
+	const filenameConflictActionPromptLabel = document.getElementById("filenameConflictActionPromptLabel");
 	const removeAudioLabel = document.getElementById("removeAudioLabel");
 	const removeVideoLabel = document.getElementById("removeVideoLabel");
 	const displayInfobarLabel = document.getElementById("displayInfobarLabel");
@@ -92,15 +92,15 @@
 	const saveRawPageInput = document.getElementById("saveRawPageInput");
 	const compressHTMLInput = document.getElementById("compressHTMLInput");
 	const compressCSSInput = document.getElementById("compressCSSInput");
-	const lazyLoadImagesInput = document.getElementById("lazyLoadImagesInput");
-	const maxLazyLoadImagesIdleTimeInput = document.getElementById("maxLazyLoadImagesIdleTimeInput");
+	const loadDeferredImagesInput = document.getElementById("loadDeferredImagesInput");
+	const loadDeferredImagesMaxIdleTimeInput = document.getElementById("loadDeferredImagesMaxIdleTimeInput");
 	const contextMenuEnabledInput = document.getElementById("contextMenuEnabledInput");
 	const filenameTemplateInput = document.getElementById("filenameTemplateInput");
 	const shadowEnabledInput = document.getElementById("shadowEnabledInput");
 	const maxResourceSizeInput = document.getElementById("maxResourceSizeInput");
 	const maxResourceSizeEnabledInput = document.getElementById("maxResourceSizeEnabledInput");
 	const confirmFilenameInput = document.getElementById("confirmFilenameInput");
-	const conflictActionInput = document.getElementById("conflictActionInput");
+	const filenameConflictActionInput = document.getElementById("filenameConflictActionInput");
 	const removeAudioSrcInput = document.getElementById("removeAudioSrcInput");
 	const removeVideoSrcInput = document.getElementById("removeVideoSrcInput");
 	const displayInfobarInput = document.getElementById("displayInfobarInput");
@@ -252,18 +252,18 @@
 	saveRawPageLabel.textContent = browser.i18n.getMessage("optionSaveRawPage");
 	compressHTMLLabel.textContent = browser.i18n.getMessage("optionCompressHTML");
 	compressCSSLabel.textContent = browser.i18n.getMessage("optionCompressCSS");
-	lazyLoadImagesLabel.textContent = browser.i18n.getMessage("optionLazyLoadImages");
-	maxLazyLoadImagesIdleTimeLabel.textContent = browser.i18n.getMessage("optionMaxLazyLoadImagesIdleTime");
+	loadDeferredImagesLabel.textContent = browser.i18n.getMessage("optionLoadDeferredImages");
+	loadDeferredImagesMaxIdleTimeLabel.textContent = browser.i18n.getMessage("optionLoadDeferredImagesMaxIdleTime");
 	addMenuEntryLabel.textContent = browser.i18n.getMessage("optionAddMenuEntry");
 	filenameTemplateLabel.textContent = browser.i18n.getMessage("optionFilenameTemplate");
 	shadowEnabledLabel.textContent = browser.i18n.getMessage("optionDisplayShadow");
 	setMaxResourceSizeLabel.textContent = browser.i18n.getMessage("optionSetMaxResourceSize");
 	maxResourceSizeLabel.textContent = browser.i18n.getMessage("optionMaxResourceSize");
 	confirmFilenameLabel.textContent = browser.i18n.getMessage("optionConfirmFilename");
-	conflictActionLabel.textContent = browser.i18n.getMessage("optionConflictAction");
-	conflictActionUniquifyLabel.textContent = browser.i18n.getMessage("optionConflictActionUniquify");
-	conflictActionOverwriteLabel.textContent = browser.i18n.getMessage("optionConflictActionOverwrite");
-	conflictActionPromptLabel.textContent = browser.i18n.getMessage("optionConflictActionPrompt");
+	filenameConflictActionLabel.textContent = browser.i18n.getMessage("optionFilenameConflictAction");
+	filenameConflictActionUniquifyLabel.textContent = browser.i18n.getMessage("optionFilenameConflictActionUniquify");
+	filenameConflictActionOverwriteLabel.textContent = browser.i18n.getMessage("optionFilenameConflictActionOverwrite");
+	filenameConflictActionPromptLabel.textContent = browser.i18n.getMessage("optionFilenameConflictActionPrompt");
 	removeAudioLabel.textContent = browser.i18n.getMessage("optionRemoveAudio");
 	removeVideoLabel.textContent = browser.i18n.getMessage("optionRemoveVideo");
 	displayInfobarLabel.textContent = browser.i18n.getMessage("optionDisplayInfobar");
@@ -394,9 +394,9 @@
 		saveRawPageInput.checked = profileOptions.saveRawPage;
 		compressHTMLInput.checked = profileOptions.compressHTML;
 		compressCSSInput.checked = profileOptions.compressCSS;
-		lazyLoadImagesInput.checked = profileOptions.lazyLoadImages;
-		maxLazyLoadImagesIdleTimeInput.value = profileOptions.maxLazyLoadImagesIdleTime;
-		maxLazyLoadImagesIdleTimeInput.disabled = !profileOptions.lazyLoadImages;
+		loadDeferredImagesInput.checked = profileOptions.loadDeferredImages;
+		loadDeferredImagesMaxIdleTimeInput.value = profileOptions.loadDeferredImagesMaxIdleTime;
+		loadDeferredImagesMaxIdleTimeInput.disabled = !profileOptions.loadDeferredImages;
 		contextMenuEnabledInput.checked = profileOptions.contextMenuEnabled;
 		filenameTemplateInput.value = profileOptions.filenameTemplate;
 		shadowEnabledInput.checked = profileOptions.shadowEnabled;
@@ -404,7 +404,7 @@
 		maxResourceSizeInput.value = profileOptions.maxResourceSize;
 		maxResourceSizeInput.disabled = !profileOptions.maxResourceSizeEnabled;
 		confirmFilenameInput.checked = profileOptions.confirmFilename;
-		conflictActionInput.value = profileOptions.conflictAction;
+		filenameConflictActionInput.value = profileOptions.filenameConflictAction;
 		removeAudioSrcInput.checked = profileOptions.removeAudioSrc;
 		removeVideoSrcInput.checked = profileOptions.removeVideoSrc;
 		displayInfobarInput.checked = profileOptions.displayInfobar;
@@ -422,7 +422,7 @@
 		groupDuplicateImagesInput.checked = profileOptions.groupDuplicateImages;
 		removeAlternativeMediasInput.checked = profileOptions.removeAlternativeMedias;
 		infobarTemplateInput.value = profileOptions.infobarTemplate;
-		confirmInfobarInput.checked = profileOptions.confirmInfobar;
+		confirmInfobarInput.checked = profileOptions.confirmInfobarContent;
 	}
 
 	function getProfileText(profileName) {
@@ -440,15 +440,15 @@
 			saveRawPage: saveRawPageInput.checked,
 			compressHTML: compressHTMLInput.checked,
 			compressCSS: compressCSSInput.checked,
-			lazyLoadImages: lazyLoadImagesInput.checked,
-			maxLazyLoadImagesIdleTime: Math.max(maxLazyLoadImagesIdleTimeInput.value, 0),
+			loadDeferredImages: loadDeferredImagesInput.checked,
+			loadDeferredImagesMaxIdleTime: Math.max(loadDeferredImagesMaxIdleTimeInput.value, 0),
 			contextMenuEnabled: contextMenuEnabledInput.checked,
 			filenameTemplate: filenameTemplateInput.value,
 			shadowEnabled: shadowEnabledInput.checked,
 			maxResourceSizeEnabled: maxResourceSizeEnabledInput.checked,
 			maxResourceSize: Math.max(maxResourceSizeInput.value, 0),
 			confirmFilename: confirmFilenameInput.checked,
-			conflictAction: conflictActionInput.value,
+			filenameConflictAction: filenameConflictActionInput.value,
 			removeAudioSrc: removeAudioSrcInput.checked,
 			removeVideoSrc: removeVideoSrcInput.checked,
 			displayInfobar: displayInfobarInput.checked,
@@ -463,7 +463,7 @@
 			removeAlternativeMedias: removeAlternativeMediasInput.checked,
 			groupDuplicateImages: groupDuplicateImagesInput.checked,
 			infobarTemplate: infobarTemplateInput.value,
-			confirmInfobar: confirmInfobarInput.checked
+			confirmInfobarContent: confirmInfobarInput.checked
 		});
 		await pendingSave;
 		await singlefile.ui.menu.refresh();

extension/ui/pages/options.html

@@ -52,11 +52,11 @@
 			<input type="checkbox" id="confirmFilenameInput">
 		</div>
 		<div class="option">
-			<label for="conflictActionInput" id="conflictActionLabel"></label>
-			<select id="conflictActionInput">
-				<option id="conflictActionUniquifyLabel" value="uniquify"></option>
-				<option id="conflictActionOverwriteLabel" value="overwrite"></option>
-				<option id="conflictActionPromptLabel" value="prompt"></option>
+			<label for="filenameConflictActionInput" id="filenameConflictActionLabel"></label>
+			<select id="filenameConflictActionInput">
+				<option id="filenameConflictActionUniquifyLabel" value="uniquify"></option>
+				<option id="filenameConflictActionOverwriteLabel" value="overwrite"></option>
+				<option id="filenameConflictActionPromptLabel" value="prompt"></option>
 			</select>
 		</div>
 	</details>
@@ -86,12 +86,12 @@
 			<input type="checkbox" id="groupDuplicateImagesInput">
 		</div>
 		<div class="option">
-			<label for="lazyLoadImagesInput" id="lazyLoadImagesLabel"></label>
-			<input type="checkbox" id="lazyLoadImagesInput">
+			<label for="loadDeferredImagesInput" id="loadDeferredImagesLabel"></label>
+			<input type="checkbox" id="loadDeferredImagesInput">
 		</div>
 		<div class="option second-level">
-			<label for="maxLazyLoadImagesIdleTimeInput" id="maxLazyLoadImagesIdleTimeLabel"></label>
-			<input type="number" class="large-input" id="maxLazyLoadImagesIdleTimeInput">
+			<label for="loadDeferredImagesMaxIdleTimeInput" id="loadDeferredImagesMaxIdleTimeLabel"></label>
+			<input type="number" class="large-input" id="loadDeferredImagesMaxIdleTimeInput">
 		</div>
 		<div class="option">
 			<label for="removeAlternativeImagesInput" id="removeAlternativeImagesLabel"></label>

lib/frame-tree/frame-tree.js

@@ -45,7 +45,7 @@ this.frameTree = this.frameTree || (() => {
 			if (!TOP_WINDOW && message.method == INIT_REQUEST_MESSAGE) {
 				window.stop();
 				initRequest(message);
-				if (message.options.lazyLoadImages && window.lazyLoader) {
+				if (message.options.loadDeferredImages && window.lazyLoader) {
 					lazyLoader.process(message.options);
 				}
 			} else if (message.method == INIT_RESPONSE_MESSAGE) {

lib/lazy/content/content-lazy-loader.js

@@ -37,7 +37,7 @@ this.lazyLoader = this.lazyLoader || (() => {
 			setTimeout(() => {
 				clearTimeout(timeoutId);
 				lazyLoadEnd(idleTimeoutId, observer, resolve);
-			}, options.maxLazyLoadImagesIdleTime * 5);
+			}, options.loadDeferredImagesMaxIdleTime * 5);
 			const observer = new MutationObserver(async mutations => {
 				mutations = mutations.filter(mutation => mutation.type == ATTRIBUTES_MUTATION_TYPE);
 				if (mutations.length) {
@@ -61,14 +61,14 @@ this.lazyLoader = this.lazyLoader || (() => {
 					clearTimeout(timeoutId);
 					lazyLoadEnd(idleTimeoutId, observer, resolve);
 				}
-			}, options.maxLazyLoadImagesIdleTime * 1.2);
+			}, options.loadDeferredImagesMaxIdleTime * 1.2);
 			injectScript(SCRIPT_BEFORE_PATH);
 		});
 	}
 
 	async function deferLazyLoadEnd(timeoutId, idleTimeoutId, observer, options, resolve) {
 		await clearTimeout(timeoutId);
-		return setTimeout(async () => await lazyLoadEnd(idleTimeoutId, observer, resolve), options.maxLazyLoadImagesIdleTime);
+		return setTimeout(async () => await lazyLoadEnd(idleTimeoutId, observer, resolve), options.loadDeferredImagesMaxIdleTime);
 	}
 
 	function lazyLoadEnd(idleTimeoutId, observer, resolve) {

lib/single-file/single-file-core.js

@@ -524,7 +524,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 						imgElement.setAttribute("src", imgData.currentSrc);
 					}
 				});
-				if (!this.options.saveRawPage && this.options.lazyLoadImages) {
+				if (!this.options.saveRawPage && this.options.loadDeferredImages) {
 					this.doc.querySelectorAll("img[data-src]").forEach(imgElement => {
 						const imgData = this.options.imageData[Number(imgElement.getAttribute(dataAttributeName))];
 						if ((!imgElement.getAttribute("src") || imgElement.getAttribute("src") == EMPTY_IMAGE) && imgElement.getAttribute("data-src")) {

lib/single-file/util/doc-helper.js

@@ -281,7 +281,7 @@ this.docHelper = this.docHelper || (() => {
 			doc.querySelectorAll("img").forEach((imageElement, imageElementIndex) => {
 				imageElement.setAttribute(imagesAttributeName(options.sessionId), imageElementIndex);
 				const imageData = {
-					currentSrc: (options.lazyLoadImages && imageElement.getAttribute(LAZY_SRC_ATTRIBUTE_NAME)) || imageElement.currentSrc
+					currentSrc: (options.loadDeferredImages && imageElement.getAttribute(LAZY_SRC_ATTRIBUTE_NAME)) || imageElement.currentSrc
 				};
 				imageElement.removeAttribute(LAZY_SRC_ATTRIBUTE_NAME);
 				const computedStyle = win.getComputedStyle(imageElement);