From db1bf7e4882bc3f1eaaaf9b7bbf247539be527d8 Mon Sep 17 00:00:00 2001
From: r-q <scrisqiu@hotmail.com>
Date: Tue, 19 Jul 2022 23:33:42 +0800
Subject: [PATCH 01/10] feat: make i18n and add Chinese support

- make i18n using i18next
- add Chinese (Simplified) support
---
 electron-builder.yml                          |   3 +-
 lib/gui/app/app.ts                            |   7 +-
 .../drive-selector/drive-selector.tsx         |  27 +-
 .../drive-status-warning-modal.tsx            |  15 +-
 .../flash-another/flash-another.tsx           |   3 +-
 .../flash-results/flash-results.tsx           |  25 +-
 .../progress-button/progress-button.tsx       |   7 +-
 lib/gui/app/components/settings/settings.tsx  |  10 +-
 .../source-selector/source-selector.tsx       |  45 +--
 .../target-selector-button.tsx                |   9 +-
 .../target-selector/target-selector.tsx       |   5 +-
 lib/gui/app/i18n.ts                           | 318 ++++++++++++++++++
 lib/gui/app/modules/progress-status.ts        |  30 +-
 lib/gui/app/os/dialog.ts                      |  11 +-
 lib/gui/app/renderer.ts                       |   6 +
 lib/gui/etcher.ts                             |  18 +-
 lib/gui/menu.ts                               |  21 +-
 ...script.js => sudo-askpass.osascript-en.js} |   0
 .../sudo-askpass.osascript-zh.js              |  21 ++
 lib/shared/catalina-sudo/sudo.ts              |   5 +-
 lib/shared/messages.ts                        | 127 +++----
 package-lock.json                             |  54 ++-
 package.json                                  |   1 +
 23 files changed, 597 insertions(+), 171 deletions(-)
 create mode 100644 lib/gui/app/i18n.ts
 rename lib/shared/catalina-sudo/{sudo-askpass.osascript.js => sudo-askpass.osascript-en.js} (100%)
 create mode 100755 lib/shared/catalina-sudo/sudo-askpass.osascript-zh.js

diff --git a/electron-builder.yml b/electron-builder.yml
index dd7af17a5b..be9699050a 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -7,7 +7,8 @@ afterSign: ./afterSignHook.js
 asar: false
 files:
   - generated
-  - lib/shared/catalina-sudo/sudo-askpass.osascript.js
+  - lib/shared/catalina-sudo/sudo-askpass.osascript-zh.js
+  - lib/shared/catalina-sudo/sudo-askpass.osascript-en.js
 mac:
   icon: assets/icon.icns
   category: public.app-category.developer-tools
diff --git a/lib/gui/app/app.ts b/lib/gui/app/app.ts
index 979b0879e2..5fbf957475 100644
--- a/lib/gui/app/app.ts
+++ b/lib/gui/app/app.ts
@@ -38,6 +38,7 @@ import * as osDialog from './os/dialog';
 import * as windowProgress from './os/window-progress';
 import MainPage from './pages/main/MainPage';
 import './css/main.css';
+import i18next from 'i18next';
 
 window.addEventListener(
 	'unhandledrejection',
@@ -313,9 +314,9 @@ window.addEventListener('beforeunload', async (event) => {
 
 	try {
 		const confirmed = await osDialog.showWarning({
-			confirmationLabel: 'Yes, quit',
-			rejectionLabel: 'Cancel',
-			title: 'Are you sure you want to close Etcher?',
+			confirmationLabel: i18next.t('yesExit'),
+			rejectionLabel: i18next.t('cancel'),
+			title: i18next.t('reallyExit'),
 			description: messages.warning.exitWhileFlashing(),
 		});
 		if (confirmed) {
diff --git a/lib/gui/app/components/drive-selector/drive-selector.tsx b/lib/gui/app/components/drive-selector/drive-selector.tsx
index 4088271ada..a4d25cfafc 100644
--- a/lib/gui/app/components/drive-selector/drive-selector.tsx
+++ b/lib/gui/app/components/drive-selector/drive-selector.tsx
@@ -44,6 +44,7 @@ import {
 
 import { SourceMetadata } from '../source-selector/source-selector';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
+import i18next from 'i18next';
 
 interface UsbbootDrive extends sourceDestination.UsbbootDrive {
 	progress: number;
@@ -189,7 +190,7 @@ export class DriveSelector extends React.Component<
 		this.tableColumns = [
 			{
 				field: 'description',
-				label: 'Name',
+				label: i18next.t('drives.name'),
 				render: (description: string, drive: Drive) => {
 					if (isDrivelistDrive(drive)) {
 						const isLargeDrive = isDriveSizeLarge(drive);
@@ -215,7 +216,7 @@ export class DriveSelector extends React.Component<
 			{
 				field: 'description',
 				key: 'size',
-				label: 'Size',
+				label: i18next.t('drives.size'),
 				render: (_description: string, drive: Drive) => {
 					if (isDrivelistDrive(drive) && drive.size !== null) {
 						return prettyBytes(drive.size);
@@ -225,7 +226,7 @@ export class DriveSelector extends React.Component<
 			{
 				field: 'description',
 				key: 'link',
-				label: 'Location',
+				label: i18next.t('drives.location'),
 				render: (_description: string, drive: Drive) => {
 					return (
 						<Txt>
@@ -399,14 +400,14 @@ export class DriveSelector extends React.Component<
 							color="#5b82a7"
 							style={{ fontWeight: 600 }}
 						>
-							{drives.length} found
+							{i18next.t('drives.find', { length: drives.length })}
 						</Txt>
 					</Flex>
 				}
 				titleDetails={<Txt fontSize={11}>{getDrives().length} found</Txt>}
 				cancel={() => cancel(this.originalList)}
 				done={() => done(selectedList)}
-				action={`Select (${selectedList.length})`}
+				action={i18next.t('drives.select', { select: selectedList.length })}
 				primaryButtonProps={{
 					primary: !showWarnings,
 					warning: showWarnings,
@@ -512,7 +513,11 @@ export class DriveSelector extends React.Component<
 							>
 								<Flex alignItems="center">
 									<ChevronDownSvg height="1em" fill="currentColor" />
-									<Txt ml={8}>Show {numberOfHiddenSystemDrives} hidden</Txt>
+									<Txt ml={8}>
+										{i18next.t('drives.showHidden', {
+											num: numberOfHiddenSystemDrives,
+										})}
+									</Txt>
 								</Flex>
 							</Link>
 						)}
@@ -520,7 +525,7 @@ export class DriveSelector extends React.Component<
 				)}
 				{this.props.showWarnings && hasSystemDrives ? (
 					<Alert className="system-drive-alert" style={{ width: '67%' }}>
-						Selecting your system drive is dangerous and will erase your drive!
+						{i18next.t('drives.systemDriveDanger')}
 					</Alert>
 				) : null}
 
@@ -540,13 +545,15 @@ export class DriveSelector extends React.Component<
 								this.setState({ missingDriversModal: {} });
 							}
 						}}
-						action="Yes, continue"
+						action={i18next.t('yesContinue')}
 						cancelButtonProps={{
-							children: 'Cancel',
+							children: i18next.t('cancel'),
 						}}
 						children={
 							missingDriversModal.drive.linkMessage ||
-							`Etcher will open ${missingDriversModal.drive.link} in your browser`
+							i18next.t('drives.openInBrowser', {
+								link: missingDriversModal.drive.link,
+							})
 						}
 					/>
 				)}
diff --git a/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx b/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
index 4000917e50..2f246da554 100644
--- a/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
+++ b/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
@@ -7,6 +7,7 @@ import { middleEllipsis } from '../../utils/middle-ellipsis';
 
 import * as prettyBytes from 'pretty-bytes';
 import { DriveWithWarnings } from '../../pages/main/Flash';
+import i18next from 'i18next';
 
 const DriveStatusWarningModal = ({
 	done,
@@ -17,12 +18,12 @@ const DriveStatusWarningModal = ({
 	isSystem: boolean;
 	drivesWithWarnings: DriveWithWarnings[];
 }) => {
-	let warningSubtitle = 'You are about to erase an unusually large drive';
-	let warningCta = 'Are you sure the selected drive is not a storage drive?';
+	let warningSubtitle = i18next.t('drives.largeDriveWarning');
+	let warningCta = i18next.t('drives.largeDriveWarningMsg');
 
 	if (isSystem) {
-		warningSubtitle = "You are about to erase your computer's drives";
-		warningCta = 'Are you sure you want to flash your system drive?';
+		warningSubtitle = i18next.t('drives.systemDriveWarning');
+		warningCta = i18next.t('drives.systemDriveWarningMsg');
 	}
 	return (
 		<Modal
@@ -33,9 +34,9 @@ const DriveStatusWarningModal = ({
 			cancelButtonProps={{
 				primary: false,
 				warning: true,
-				children: 'Change target',
+				children: i18next.t('drives.changeTarget'),
 			}}
-			action={"Yes, I'm sure"}
+			action={i18next.t('sure')}
 			primaryButtonProps={{
 				primary: false,
 				outline: true,
@@ -50,7 +51,7 @@ const DriveStatusWarningModal = ({
 				<Flex flexDirection="column">
 					<ExclamationTriangleSvg height="2em" fill="#fca321" />
 					<Txt fontSize="24px" color="#fca321">
-						WARNING!
+						{i18next.t('warning')}
 					</Txt>
 				</Flex>
 				<Txt fontSize="24px">{warningSubtitle}</Txt>
diff --git a/lib/gui/app/components/flash-another/flash-another.tsx b/lib/gui/app/components/flash-another/flash-another.tsx
index 3b5741a374..a0cfd43ca2 100644
--- a/lib/gui/app/components/flash-another/flash-another.tsx
+++ b/lib/gui/app/components/flash-another/flash-another.tsx
@@ -17,6 +17,7 @@
 import * as React from 'react';
 
 import { BaseButton } from '../../styled-components';
+import i18next from 'i18next';
 
 export interface FlashAnotherProps {
 	onClick: () => void;
@@ -25,7 +26,7 @@ export interface FlashAnotherProps {
 export const FlashAnother = (props: FlashAnotherProps) => {
 	return (
 		<BaseButton primary onClick={props.onClick}>
-			Flash another
+			{i18next.t('flash.another')}
 		</BaseButton>
 	);
 };
diff --git a/lib/gui/app/components/flash-results/flash-results.tsx b/lib/gui/app/components/flash-results/flash-results.tsx
index 05de2b3d7d..51c8a03281 100644
--- a/lib/gui/app/components/flash-results/flash-results.tsx
+++ b/lib/gui/app/components/flash-results/flash-results.tsx
@@ -31,6 +31,7 @@ import { resetState } from '../../models/flash-state';
 import * as selection from '../../models/selection-state';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
 import { Modal, Table } from '../../styled-components';
+import i18next from 'i18next';
 
 const ErrorsTable = styled((props) => <Table<FlashError> {...props} />)`
 	&&& [data-display='table-head'],
@@ -88,15 +89,15 @@ function formattedErrors(errors: FlashError[]) {
 const columns: Array<TableColumn<FlashError>> = [
 	{
 		field: 'description',
-		label: 'Target',
+		label: i18next.t('flash.target'),
 	},
 	{
 		field: 'device',
-		label: 'Location',
+		label: i18next.t('flash.location'),
 	},
 	{
 		field: 'message',
-		label: 'Error',
+		label: i18next.t('flash.error'),
 		render: (message: string, { code }: FlashError) => {
 			return message ?? code;
 		},
@@ -162,9 +163,10 @@ export function FlashResults({
 					<Txt>{middleEllipsis(image, 24)}</Txt>
 				</Flex>
 				<Txt fontSize={24} color="#fff" mb="17px">
-					Flash {allFailed ? 'Failed' : 'Complete'}!
+					{i18next.t('flash.flash')}{' '}
+					{allFailed ? i18next.t('failed') : i18next.t('completed')}!
 				</Txt>
-				{skip ? <Txt color="#7e8085">Validation has been skipped</Txt> : null}
+				{skip ? <Txt color="#7e8085">{i18next.t('flash.skip')}</Txt> : null}
 			</Flex>
 			<Flex flexDirection="column" color="#7e8085">
 				{results.devices.successful !== 0 ? (
@@ -188,7 +190,7 @@ export function FlashResults({
 							{progress.failed(errors.length)}
 						</Txt>
 						<Link ml="10px" onClick={() => setShowErrorsInfo(true)}>
-							more info
+							{i18next.t('flash.moreInfo')}
 						</Link>
 					</Flex>
 				) : null}
@@ -199,12 +201,9 @@ export function FlashResults({
 							fontWeight: 500,
 							textAlign: 'center',
 						}}
-						tooltip={outdent({ newline: ' ' })`
-							The speed is calculated by dividing the image size by the flashing time.
-							Disk images with ext partitions flash faster as we are able to skip unused parts.
-						`}
+						tooltip={i18next.t('flash.speedTip')}
 					>
-						Effective speed: {effectiveSpeed} MB/s
+						{i18next.t('flash.speed')} {effectiveSpeed} MB/s
 					</Txt>
 				)}
 			</Flex>
@@ -214,11 +213,11 @@ export function FlashResults({
 					titleElement={
 						<Flex alignItems="baseline" mb={18}>
 							<Txt fontSize={24} align="left">
-								Failed targets
+								{i18next.t('failedTarget')}
 							</Txt>
 						</Flex>
 					}
-					action="Retry failed targets"
+					action={i18next.t('failedRetry')}
 					cancel={() => setShowErrorsInfo(false)}
 					done={() => {
 						setShowErrorsInfo(false);
diff --git a/lib/gui/app/components/progress-button/progress-button.tsx b/lib/gui/app/components/progress-button/progress-button.tsx
index 43fe70e0fa..c84dfb0dbf 100644
--- a/lib/gui/app/components/progress-button/progress-button.tsx
+++ b/lib/gui/app/components/progress-button/progress-button.tsx
@@ -20,6 +20,7 @@ import { default as styled } from 'styled-components';
 
 import { fromFlashState } from '../../modules/progress-status';
 import { StepButton } from '../../styled-components';
+import i18next from 'i18next';
 
 const FlashProgressBar = styled(ProgressBar)`
 	> div {
@@ -28,6 +29,7 @@ const FlashProgressBar = styled(ProgressBar)`
 		color: white !important;
 		text-shadow: none !important;
 		transition-duration: 0s;
+
 		> div {
 			transition-duration: 0s;
 		}
@@ -61,7 +63,7 @@ const colors = {
 } as const;
 
 const CancelButton = styled(({ type, onClick, ...props }) => {
-	const status = type === 'verifying' ? 'Skip' : 'Cancel';
+	const status = type === 'verifying' ? i18next.t('skip') : i18next.t('cancel');
 	return (
 		<Button plain onClick={() => onClick(status)} {...props}>
 			{status}
@@ -69,6 +71,7 @@ const CancelButton = styled(({ type, onClick, ...props }) => {
 	);
 })`
 	font-weight: 600;
+
 	&&& {
 		width: auto;
 		height: auto;
@@ -126,7 +129,7 @@ export class ProgressButton extends React.PureComponent<ProgressButtonProps> {
 					marginTop: 30,
 				}}
 			>
-				Flash!
+				{i18next.t('flash.flashNow')}
 			</StepButton>
 		);
 	}
diff --git a/lib/gui/app/components/settings/settings.tsx b/lib/gui/app/components/settings/settings.tsx
index 2c91658f1b..5618b4a2f9 100644
--- a/lib/gui/app/components/settings/settings.tsx
+++ b/lib/gui/app/components/settings/settings.tsx
@@ -24,6 +24,7 @@ import * as settings from '../../models/settings';
 import * as analytics from '../../modules/analytics';
 import { open as openExternal } from '../../os/open-external/services/open-external';
 import { Modal } from '../../styled-components';
+import i18next from 'i18next';
 
 interface Setting {
 	name: string;
@@ -34,13 +35,13 @@ async function getSettingsList(): Promise<Setting[]> {
 	const list: Setting[] = [
 		{
 			name: 'errorReporting',
-			label: 'Anonymously report errors and usage statistics to balena.io',
+			label: i18next.t('settings.errorReporting'),
 		},
 	];
 	if (['appimage', 'nsis', 'dmg'].includes(packageType)) {
 		list.push({
 			name: 'updatesEnabled',
-			label: 'Auto-updates enabled',
+			label: i18next.t('settings.autoUpdate'),
 		});
 	}
 	return list;
@@ -58,6 +59,7 @@ const InfoBox = (props: any) => (
 		<TextWithCopy code text={props.value} copy={props.value} />
 	</Box>
 );
+
 export function SettingsModal({ toggleModal }: SettingsModalProps) {
 	const [settingsList, setCurrentSettingsList] = React.useState<Setting[]>([]);
 	React.useEffect(() => {
@@ -92,7 +94,7 @@ export function SettingsModal({ toggleModal }: SettingsModalProps) {
 		<Modal
 			titleElement={
 				<Txt fontSize={24} mb={24}>
-					Settings
+					{i18next.t('settings.settings')}
 				</Txt>
 			}
 			done={() => toggleModal(false)}
@@ -113,7 +115,7 @@ export function SettingsModal({ toggleModal }: SettingsModalProps) {
 				})}
 				{UUID !== undefined && (
 					<Flex flexDirection="column">
-						<Txt fontSize={24}>System Information</Txt>
+						<Txt fontSize={24}>{i18next.t('settings.systemInformation')}</Txt>
 						<InfoBox label="UUID" value={UUID.substr(0, 7)} />
 					</Flex>
 				)}
diff --git a/lib/gui/app/components/source-selector/source-selector.tsx b/lib/gui/app/components/source-selector/source-selector.tsx
index d6fdc637e6..6834a2de23 100644
--- a/lib/gui/app/components/source-selector/source-selector.tsx
+++ b/lib/gui/app/components/source-selector/source-selector.tsx
@@ -66,6 +66,7 @@ import { DriveSelector } from '../drive-selector/drive-selector';
 import { DrivelistDrive } from '../../../../shared/drive-constraints';
 import axios, { AxiosRequestConfig } from 'axios';
 import { isJson } from '../../../../shared/utils';
+import i18next from 'i18next';
 
 const recentUrlImagesKey = 'recentUrlImages';
 
@@ -160,7 +161,7 @@ const URLSelector = ({
 			primaryButtonProps={{
 				disabled: loading || !imageURL,
 			}}
-			action={loading ? <Spinner /> : 'OK'}
+			action={loading ? <Spinner /> : i18next.t('ok')}
 			done={async () => {
 				setLoading(true);
 				const urlStrings = recentImages.map((url: URL) => url.href);
@@ -176,11 +177,11 @@ const URLSelector = ({
 			<Flex flexDirection="column">
 				<Flex mb={15} style={{ width: '100%' }} flexDirection="column">
 					<Txt mb="10px" fontSize="24px">
-						Use Image URL
+						{i18next.t('source.useSourceURL')}
 					</Txt>
 					<Input
 						value={imageURL}
-						placeholder="Enter a valid URL"
+						placeholder={i18next.t('source.enterValidURL')}
 						type="text"
 						onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
 							setImageURL(evt.target.value)
@@ -205,7 +206,7 @@ const URLSelector = ({
 							{!showBasicAuth && (
 								<ChevronRightSvg height="1em" fill="currentColor" />
 							)}
-							<Txt ml={8}>Authentication</Txt>
+							<Txt ml={8}>{i18next.t('source.auth')}</Txt>
 						</Flex>
 					</Link>
 					{showBasicAuth && (
@@ -213,7 +214,7 @@ const URLSelector = ({
 							<Input
 								mb={15}
 								value={username}
-								placeholder="Enter username"
+								placeholder={i18next.t('source.username')}
 								type="text"
 								onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
 									setUsername(evt.target.value)
@@ -221,7 +222,7 @@ const URLSelector = ({
 							/>
 							<Input
 								value={password}
-								placeholder="Enter password"
+								placeholder={i18next.t('source.password')}
 								type="password"
 								onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
 									setPassword(evt.target.value)
@@ -295,7 +296,7 @@ const FlowSelector = styled(
 		font-weight: 600;
 
 		svg {
-			color: ${colors.primary.foreground}!important;
+			color: ${colors.primary.foreground} !important;
 		}
 	}
 `;
@@ -453,7 +454,7 @@ export class SourceSelector extends React.Component<
 						!isURL(this.normalizeImagePath(selected))
 					) {
 						this.handleError(
-							'Unsupported protocol',
+							i18next.t('source.unsupportedProtocol'),
 							selected,
 							messages.error.unsupportedProtocol(),
 						);
@@ -465,7 +466,7 @@ export class SourceSelector extends React.Component<
 						this.setState({
 							warning: {
 								message: messages.warning.looksLikeWindowsImage(),
-								title: 'Possible Windows image detected',
+								title: i18next.t('source.windowsImage'),
 							},
 						});
 					}
@@ -491,13 +492,13 @@ export class SourceSelector extends React.Component<
 							this.setState({
 								warning: {
 									message: messages.warning.missingPartitionTable(),
-									title: 'Missing partition table',
+									title: i18next.t('source.partitionTable'),
 								},
 							});
 						}
 					} catch (error: any) {
 						this.handleError(
-							'Error opening source',
+							i18next.t('source.errorOpen'),
 							sourcePath,
 							messages.error.openSource(sourcePath, error.message),
 							error,
@@ -515,7 +516,7 @@ export class SourceSelector extends React.Component<
 						this.setState({
 							warning: {
 								message: messages.warning.driveMissingPartitionTable(),
-								title: 'Missing partition table',
+								title: i18next.t('source.partitionTable'),
 							},
 						});
 					}
@@ -719,7 +720,7 @@ export class SourceSelector extends React.Component<
 									mb={14}
 									onClick={() => this.reselectSource()}
 								>
-									Remove
+									{i18next.t('cancel')}
 								</ChangeButton>
 							)}
 							{!_.isNil(imageSize) && !imageLoading && (
@@ -734,7 +735,7 @@ export class SourceSelector extends React.Component<
 								key="Flash from file"
 								flow={{
 									onClick: () => this.openImageSelector(),
-									label: 'Flash from file',
+									label: i18next.t('source.fromFile'),
 									icon: <FileSvg height="1em" fill="currentColor" />,
 								}}
 								onMouseEnter={() => this.setDefaultFlowActive(false)}
@@ -744,7 +745,7 @@ export class SourceSelector extends React.Component<
 								key="Flash from URL"
 								flow={{
 									onClick: () => this.openURLSelector(),
-									label: 'Flash from URL',
+									label: i18next.t('source.fromURL'),
 									icon: <LinkSvg height="1em" fill="currentColor" />,
 								}}
 								onMouseEnter={() => this.setDefaultFlowActive(false)}
@@ -754,7 +755,7 @@ export class SourceSelector extends React.Component<
 								key="Clone drive"
 								flow={{
 									onClick: () => this.openDriveSelector(),
-									label: 'Clone drive',
+									label: i18next.t('source.clone'),
 									icon: <CopySvg height="1em" fill="currentColor" />,
 								}}
 								onMouseEnter={() => this.setDefaultFlowActive(false)}
@@ -775,7 +776,7 @@ export class SourceSelector extends React.Component<
 								<span>{this.state.warning.title}</span>
 							</span>
 						}
-						action="Continue"
+						action={i18next.t('continue')}
 						cancel={() => {
 							this.setState({ warning: null });
 							this.reselectSource();
@@ -793,17 +794,17 @@ export class SourceSelector extends React.Component<
 
 				{showImageDetails && (
 					<SmallModal
-						title="Image"
+						title={i18next.t('source.image')}
 						done={() => {
 							this.setState({ showImageDetails: false });
 						}}
 					>
 						<Txt.p>
-							<Txt.span bold>Name: </Txt.span>
+							<Txt.span bold>{i18next.t('source.name')}</Txt.span>
 							<Txt.span>{imageName || imageBasename}</Txt.span>
 						</Txt.p>
 						<Txt.p>
-							<Txt.span bold>Path: </Txt.span>
+							<Txt.span bold>{i18next.t('source.path')}</Txt.span>
 							<Txt.span>{imagePath}</Txt.span>
 						</Txt.p>
 					</SmallModal>
@@ -842,8 +843,8 @@ export class SourceSelector extends React.Component<
 					<DriveSelector
 						write={false}
 						multipleSelection={false}
-						titleLabel="Select source"
-						emptyListLabel="Plug a source drive"
+						titleLabel={i18next.t('source.selectSource')}
+						emptyListLabel={i18next.t('source.plugSource')}
 						emptyListIcon={<SrcSvg width="40px" />}
 						cancel={(originalList) => {
 							if (originalList.length) {
diff --git a/lib/gui/app/components/target-selector/target-selector-button.tsx b/lib/gui/app/components/target-selector/target-selector-button.tsx
index 9f13f3ea80..f8c56b2d0c 100644
--- a/lib/gui/app/components/target-selector/target-selector-button.tsx
+++ b/lib/gui/app/components/target-selector/target-selector-button.tsx
@@ -32,6 +32,7 @@ import {
 	StepNameButton,
 } from '../../styled-components';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
+import i18next from 'i18next';
 
 interface TargetSelectorProps {
 	targets: any[];
@@ -95,7 +96,7 @@ export function TargetSelectorButton(props: TargetSelectorProps) {
 				</StepNameButton>
 				{!props.flashing && (
 					<ChangeButton plain mb={14} onClick={props.reselectDrive}>
-						Change
+						{i18next.t('target.change')}
 					</ChangeButton>
 				)}
 				{target.size != null && (
@@ -132,11 +133,11 @@ export function TargetSelectorButton(props: TargetSelectorProps) {
 		return (
 			<>
 				<StepNameButton plain tooltip={props.tooltip}>
-					{targets.length} Targets
+					{targets.length} {i18next.t('target.targets')}
 				</StepNameButton>
 				{!props.flashing && (
 					<ChangeButton plain onClick={props.reselectDrive} mb={14}>
-						Change
+						{i18next.t('target.change')}
 					</ChangeButton>
 				)}
 				{targetsTemplate}
@@ -151,7 +152,7 @@ export function TargetSelectorButton(props: TargetSelectorProps) {
 			disabled={props.disabled}
 			onClick={props.openDriveSelector}
 		>
-			Select target
+			{i18next.t('target.selectTarget')}
 		</StepButton>
 	);
 }
diff --git a/lib/gui/app/components/target-selector/target-selector.tsx b/lib/gui/app/components/target-selector/target-selector.tsx
index 7c132ab0ba..767cebc1fa 100644
--- a/lib/gui/app/components/target-selector/target-selector.tsx
+++ b/lib/gui/app/components/target-selector/target-selector.tsx
@@ -37,6 +37,7 @@ import TgtSvg from '../../../assets/tgt.svg';
 import DriveSvg from '../../../assets/drive.svg';
 import { warning } from '../../../../shared/messages';
 import { DrivelistDrive } from '../../../../shared/drive-constraints';
+import i18next from 'i18next';
 
 export const getDriveListLabel = () => {
 	return getSelectedDrives()
@@ -60,8 +61,8 @@ export const TargetSelectorModal = (
 ) => (
 	<DriveSelector
 		multipleSelection={true}
-		titleLabel="Select target"
-		emptyListLabel="Plug a target drive"
+		titleLabel={i18next.t('target.selectTarget')}
+		emptyListLabel={i18next.t('target.plugTarget')}
 		emptyListIcon={<TgtSvg width="40px" />}
 		showWarnings={true}
 		selectedList={getSelectedDrives()}
diff --git a/lib/gui/app/i18n.ts b/lib/gui/app/i18n.ts
new file mode 100644
index 0000000000..debb94304e
--- /dev/null
+++ b/lib/gui/app/i18n.ts
@@ -0,0 +1,318 @@
+import i18next from 'i18next';
+import { initReactI18next } from 'react-i18next';
+
+let lang = Intl.DateTimeFormat().resolvedOptions().locale;
+lang = lang.substr(0, 2);
+
+i18next.use(initReactI18next).init({
+	lng: lang,
+	fallbackLng: 'en',
+	interpolation: {
+		escapeValue: false,
+	},
+	resources: {
+		zh: {
+			translation: {
+				ok: '好',
+				cancel: '取消',
+				continue: '继续',
+				skip: '跳过',
+				sure: '我确定',
+				warning: '请注意！',
+				attention: '请注意',
+				failed: '失败',
+				completed: '完毕',
+				yesExit: '是的，可以退出',
+				reallyExit: '真的要现在退出 Etcher 吗？',
+				yesContinue: '是的，继续',
+				progress: {
+					starting: '正在启动……',
+					decompressing: '正在解压……',
+					flashing: '正在烧录……',
+					finishing: '正在结束……',
+					verifying: '正在验证……',
+					failing: '失败……',
+				},
+				message: {
+					sizeNotRecommended: '大小不推荐',
+					tooSmall: '空间太小',
+					locked: '被锁定',
+					system: '系统盘',
+					containsImage: '存放源镜像',
+					largeDrive: '很大的磁盘',
+					sourceLarger: '所选的镜像比目标盘大了 {{byte}} 比特。',
+					flashSucceed_one: '烧录成功',
+					flashSucceed_other: '烧录成功',
+					flashFail_one: '烧录失败',
+					flashFail_other: '烧录失败',
+					to: '到 ',
+					andFail: '并烧录失败了 ',
+					target_one: ' 个目标',
+					target_other: ' 个目标',
+					succeedTo: '被成功烧录',
+					exitWhileFlashing:
+						'您当前正在刷机。 关闭 Etcher 可能会导致您的磁盘无法使用。',
+					looksLikeWindowsImage:
+						'看起来您正在尝试刻录 Windows 镜像。\n\n与其他镜像不同，Windows 镜像需要特殊处理才能使其可启动。 我们建议您使用专门为此目的设计的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
+					missingPartitionTable:
+						'看起来这不是一个可启动的镜像。\n\n这个镜像似乎不包含分区表，因此您的设备可能无法识别或无法正确启动。',
+					driveMissingPartitionTable:
+						'看起来这不是可引导磁盘。\n这个磁盘似乎不包含分区表，\n因此您的设备可能无法识别或无法正确启动。',
+					largeDriveSize:
+						'这是个很大的磁盘！请检查并确认它不包含对您很重要的信息',
+					systemDrive: '选择系统盘很危险，因为这将会删除你的系统',
+					sourceDrive: '源镜像位于这个分区中',
+					noSpace: '磁盘空间不足。 请插入另一个较大的磁盘并重试。',
+					genericFlashError:
+						'出了点问题。如果源镜像曾被压缩过，请检查它是否已损坏。',
+					validation:
+						'写入已成功完成，但 Etcher 在从磁盘读取镜像时检测到潜在的损坏问题。 \n\n请考虑将镜像写入其他磁盘。',
+					openError: '打开 {{source}} 时出错。\n\n错误信息： {{error}}',
+					flashError: '烧录 {{image}} 到 {{target}} 失败。',
+					unplug:
+						'看起来 Etcher 失去了对磁盘的连接。 它是不是被意外拔掉了？\n\n有时这个错误是因为读卡器出了故障。',
+					cannotWrite:
+						'看起来 Etcher 无法写入磁盘的这个位置。 此错误通常是由故障的磁盘、读取器或端口引起的。 \n\n请使用其他磁盘、读卡器或端口重试。',
+					childWriterDied:
+						'写入进程意外崩溃。请再试一次，如果问题仍然存在，请联系 Etcher 团队。',
+					badProtocol: '仅支持 http:// 和 https:// 开头的网址。',
+				},
+				target: {
+					selectTarget: '选择目标磁盘',
+					plugTarget: '请插入目标磁盘',
+					targets: '个目标',
+					change: '更改',
+				},
+				menu: {
+					edit: '编辑',
+					view: '视图',
+					devTool: '打开开发者工具',
+					window: '窗口',
+					help: '帮助',
+					pro: 'Etcher 专业版',
+					website: 'Etcher 的官网',
+					issue: '提交一个 issue',
+					about: '关于 Etcher',
+					hide: '隐藏 Etcher',
+					hideOthers: '隐藏其它窗口',
+					unhide: '取消隐藏',
+					quit: '退出 Etcher',
+				},
+				source: {
+					useSourceURL: '使用镜像网络地址',
+					auth: '验证',
+					username: '输入用户名',
+					password: '输入密码',
+					unsupportedProtocol: '不支持的协议',
+					windowsImage: '这可能是 Windows 系统镜像',
+					partitionTable: '找不到分区表',
+					errorOpen: '打开源镜像时出错',
+					fromFile: '从文件烧录',
+					fromURL: '从在线地址烧录',
+					clone: '克隆磁盘',
+					image: '镜像信息',
+					name: '名称：',
+					path: '路径：',
+					selectSource: '选择源',
+					plugSource: '请插入源磁盘',
+					osImages: '系统镜像格式',
+					allFiles: '任何文件格式',
+					enterValidURL: '请输入一个正确的地址',
+				},
+				drives: {
+					name: '名称',
+					size: '大小',
+					location: '位置',
+					find: '找到 {{length}} 个',
+					select: '选定 {{select}}',
+					showHidden: '显示 {{num}} 个隐藏的磁盘',
+					systemDriveDanger: '选择系统盘很危险，因为这将会删除你的系统！',
+					openInBrowser: 'Etcher 会在浏览器中打开 {{link}}',
+					changeTarget: '改变目标',
+					largeDriveWarning: '您即将擦除一个非常大的磁盘',
+					largeDriveWarningMsg: '您确定所选磁盘不是存储磁盘吗？',
+					systemDriveWarning: '您将要擦除系统盘',
+					systemDriveWarningMsg: '您确定要烧录到系统盘吗？',
+				},
+				flash: {
+					another: '烧录另一目标',
+					target: '目标',
+					location: '位置',
+					error: '错误',
+					flash: '烧录',
+					flashNow: '现在烧录！',
+					skip: '跳过了验证',
+					moreInfo: '更多信息',
+					speedTip:
+						'通过将图像大小除以烧录时间来计算速度。\n由于我们能够跳过未使用的部分，因此具有EXT分区的磁盘镜像烧录速度更快。',
+					speed: '速度：',
+					failedTarget: '失败的烧录目标',
+					failedRetry: '重试烧录失败目标',
+				},
+				settings: {
+					errorReporting: '匿名地向 balena.io 报告运行错误和使用统计',
+					autoUpdate: '自动更新',
+					settings: '软件设置',
+					systemInformation: '系统信息',
+				},
+			},
+		},
+		en: {
+			translation: {
+				continue: 'Continue',
+				ok: 'OK',
+				cancel: 'Cancel',
+				skip: 'Skip',
+				sure: "Yes, I'm sure",
+				warning: 'WARNING! ',
+				attention: 'Attention',
+				failed: 'Failed',
+				completed: 'Completed',
+				yesContinue: 'Yes, continue',
+				reallyExit: 'Are you sure you want to close Etcher?',
+				yesExit: 'Yes, quit',
+				progress: {
+					starting: 'Starting...',
+					decompressing: 'Decompressing...',
+					flashing: 'Flashing...',
+					finishing: 'Finishing...',
+					verifying: 'Verifying...',
+					failing: 'Failed',
+				},
+				message: {
+					sizeNotRecommended: 'Not recommended',
+					tooSmall: 'Too small',
+					locked: 'Locked',
+					system: 'System drive',
+					containsImage: 'Source drive',
+					largeDrive: 'Large drive',
+					sourceLarger:
+						'The selected source is {{byte}} larger than this drive.',
+					flashSucceed_one: 'Successful target',
+					flashSucceed_other: 'Successful targets',
+					flashFail_one: 'Failed target',
+					flashFail_other: 'Failed targets',
+					to: 'to ',
+					andFail: 'and failed to be flashed to ',
+					target_one: ' target',
+					target_other: ' targets',
+					succeedTo: 'was successfully flashed',
+					exitWhileFlashing:
+						'You are currently flashing a drive. Closing Etcher may leave your drive in an unusable state.',
+					looksLikeWindowsImage:
+						'It looks like you are trying to burn a Windows image.\n\nUnlike other images, Windows images require special processing to be made bootable. We suggest you use a tool specially designed for this purpose, such as <a href="https://rufus.akeo.ie">Rufus</a> (Windows), <a href="https://github.com/slacka/WoeUSB">WoeUSB</a> (Linux), or Boot Camp Assistant (macOS).',
+					missingPartitionTable:
+						'It looks like this is not a bootable image.\n\nThe image does not appear to contain a partition table, and might not be recognized or bootable by your device.',
+					driveMissingPartitionTable:
+						'It looks like this is not a bootable drive.\nThe drive does not appear to contain a partition table,\nand might not be recognized or bootable by your device.',
+					largeDriveSize:
+						"This is a large drive! Make sure it doesn't contain files that you want to keep.",
+					systemDrive:
+						'Selecting your system drive is dangerous and will erase your drive!',
+					sourceDrive: 'Contains the image you chose to flash',
+					noSpace:
+						'Not enough space on the drive. Please insert larger one and try again.',
+					genericFlashError:
+						'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.',
+					validation:
+						'The write has been completed successfully but Etcher detected potential corruption issues when reading the image back from the drive. \n\nPlease consider writing the image to a different drive.',
+					openError:
+						'Something went wrong while opening {{source}}.\n\nError: {{error}}',
+					flashError:
+						'Something went wrong while writing {{image}} to {{target}}.',
+					unplug:
+						"Looks like Etcher lost access to the drive. Did it get unplugged accidentally?\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
+					cannotWrite:
+						'Looks like Etcher is not able to write to this location of the drive. This error is usually caused by a faulty drive, reader, or port. \n\nPlease try again with another drive, reader, or port.',
+					childWriterDied:
+						'The writer process ended unexpectedly. Please try again, and contact the Etcher team if the problem persists.',
+					badProtocol: 'Only http:// and https:// URLs are supported.',
+				},
+				target: {
+					selectTarget: 'Select target',
+					plugTarget: 'Plug a target drive',
+					targets: 'Targets',
+					change: 'Change',
+				},
+				source: {
+					useSourceURL: 'Use Image URL',
+					auth: 'Authentication',
+					username: 'Enter username',
+					password: 'Enter password',
+					unsupportedProtocol: 'Unsupported protocol',
+					windowsImage: 'Possible Windows image detected',
+					partitionTable: 'Missing partition table',
+					errorOpen: 'Error opening source',
+					fromFile: 'Flash from file',
+					fromURL: 'Flash from URL',
+					clone: 'Clone drive',
+					image: 'Image',
+					name: 'Name: ',
+					path: 'Path: ',
+					selectSource: 'Select source',
+					plugSource: 'Plug a source drive',
+					osImages: 'OS Images',
+					allFiles: 'All',
+					enterValidURL: 'Enter a valid URL',
+				},
+				drives: {
+					name: 'Name',
+					size: 'Size',
+					location: 'Location',
+					find: '{{length}} found',
+					select: 'Select {{select}}',
+					showHidden: 'Show {{num}} hidden',
+					systemDriveDanger:
+						'Selecting your system drive is dangerous and will erase your drive!',
+					openInBrowser: '`Etcher will open {{link}} in your browser`',
+					changeTarget: 'Change target',
+					largeDriveWarning: 'You are about to erase an unusually large drive',
+					largeDriveWarningMsg:
+						'Are you sure the selected drive is not a storage drive?',
+					systemDriveWarning: "You are about to erase your computer's drives",
+					systemDriveWarningMsg:
+						'Are you sure you want to flash your system drive?',
+				},
+				flash: {
+					another: 'Flash another',
+					target: 'Target',
+					location: 'Location',
+					error: 'Error',
+					flash: 'Flash',
+					flashNow: 'Flash!',
+					skip: 'Validation has been skipped',
+					moreInfo: 'more info',
+					speedTip:
+						'The speed is calculated by dividing the image size by the flashing time.\nDisk images with ext partitions flash faster as we are able to skip unused parts.',
+					speed: 'Effective speed: ',
+					failedTarget: 'Failed targets',
+					failedRetry: 'Retry failed targets',
+				},
+				settings: {
+					errorReporting:
+						'Anonymously report errors and usage statistics to balena.io',
+					autoUpdate: 'Auto-updates enabled',
+					settings: 'Settings',
+					systemInformation: 'System Information',
+				},
+				menu: {
+					edit: 'Edit',
+					view: 'View',
+					devTool: 'Toggle Developer Tools',
+					window: 'Window',
+					help: 'Help',
+					pro: 'Etcher Pro',
+					website: 'Etcher Website',
+					issue: 'Report an issue',
+					about: 'About Etcher',
+					hide: 'Hide Etcher',
+					hideOthers: 'Hide Others',
+					unhide: 'Unhide All',
+					quit: 'Quit Etcher',
+				},
+			},
+		},
+	},
+});
+
+export default i18next;
diff --git a/lib/gui/app/modules/progress-status.ts b/lib/gui/app/modules/progress-status.ts
index 6c48b2c2ae..1a05e8e771 100644
--- a/lib/gui/app/modules/progress-status.ts
+++ b/lib/gui/app/modules/progress-status.ts
@@ -15,6 +15,7 @@
  */
 
 import * as prettyBytes from 'pretty-bytes';
+import i18next from 'i18next';
 
 export interface FlashState {
 	active: number;
@@ -34,36 +35,45 @@ export function fromFlashState({
 	position?: string;
 } {
 	if (type === undefined) {
-		return { status: 'Starting...' };
+		return { status: i18next.t('progress.starting') };
 	} else if (type === 'decompressing') {
 		if (percentage == null) {
-			return { status: 'Decompressing...' };
+			return { status: i18next.t('progress.decompressing') };
 		} else {
-			return { position: `${percentage}%`, status: 'Decompressing...' };
+			return {
+				position: `${percentage}%`,
+				status: i18next.t('progress.decompressing'),
+			};
 		}
 	} else if (type === 'flashing') {
 		if (percentage != null) {
 			if (percentage < 100) {
-				return { position: `${percentage}%`, status: 'Flashing...' };
+				return {
+					position: `${percentage}%`,
+					status: i18next.t('progress.flashing'),
+				};
 			} else {
-				return { status: 'Finishing...' };
+				return { status: i18next.t('progress.finishing') };
 			}
 		} else {
 			return {
-				status: 'Flashing...',
+				status: i18next.t('progress.flashing'),
 				position: `${position ? prettyBytes(position) : ''}`,
 			};
 		}
 	} else if (type === 'verifying') {
 		if (percentage == null) {
-			return { status: 'Validating...' };
+			return { status: i18next.t('progress.verifying') };
 		} else if (percentage < 100) {
-			return { position: `${percentage}%`, status: 'Validating...' };
+			return {
+				position: `${percentage}%`,
+				status: i18next.t('progress.verifying'),
+			};
 		} else {
-			return { status: 'Finishing...' };
+			return { status: i18next.t('progress.finishing') };
 		}
 	}
-	return { status: 'Failed' };
+	return { status: i18next.t('progress.failing') };
 }
 
 export function titleFromFlashState(
diff --git a/lib/gui/app/os/dialog.ts b/lib/gui/app/os/dialog.ts
index cdce28c25c..a55113ea74 100644
--- a/lib/gui/app/os/dialog.ts
+++ b/lib/gui/app/os/dialog.ts
@@ -20,6 +20,7 @@ import * as _ from 'lodash';
 import * as errors from '../../../shared/errors';
 import * as settings from '../../../gui/app/models/settings';
 import { SUPPORTED_EXTENSIONS } from '../../../shared/supported-formats';
+import i18next from 'i18next';
 
 async function mountSourceDrive() {
 	// sourceDrivePath is the name of the link in /dev/disk/by-path
@@ -53,11 +54,11 @@ export async function selectImage(): Promise<string | undefined> {
 		properties: ['openFile', 'treatPackageAsDirectory'],
 		filters: [
 			{
-				name: 'OS Images',
+				name: i18next.t('source.osImages'),
 				extensions: SUPPORTED_EXTENSIONS,
 			},
 			{
-				name: 'All',
+				name: i18next.t('source.allFiles'),
 				extensions: ['*'],
 			},
 		],
@@ -79,8 +80,8 @@ export async function showWarning(options: {
 	description: string;
 }): Promise<boolean> {
 	_.defaults(options, {
-		confirmationLabel: 'OK',
-		rejectionLabel: 'Cancel',
+		confirmationLabel: i18next.t('ok'),
+		rejectionLabel: i18next.t('cancel'),
 	});
 
 	const BUTTONS = [options.confirmationLabel, options.rejectionLabel];
@@ -98,7 +99,7 @@ export async function showWarning(options: {
 			buttons: BUTTONS,
 			defaultId: BUTTON_REJECTION_INDEX,
 			cancelId: BUTTON_REJECTION_INDEX,
-			title: 'Attention',
+			title: i18next.t('attention'),
 			message: options.title,
 			detail: options.description,
 		},
diff --git a/lib/gui/app/renderer.ts b/lib/gui/app/renderer.ts
index 66b2786a80..55c8733ff2 100644
--- a/lib/gui/app/renderer.ts
+++ b/lib/gui/app/renderer.ts
@@ -1,5 +1,11 @@
 // @ts-nocheck
 import { main } from './app';
+import './i18n';
+import { ipcRenderer } from 'electron';
+
+let lang = Intl.DateTimeFormat().resolvedOptions().locale;
+lang = lang.substr(0, 2);
+ipcRenderer.send('change-lng', lang);
 
 if (module.hot) {
 	module.hot.accept('./app', () => {
diff --git a/lib/gui/etcher.ts b/lib/gui/etcher.ts
index 34be1a15f8..38dab53bb3 100644
--- a/lib/gui/etcher.ts
+++ b/lib/gui/etcher.ts
@@ -21,18 +21,22 @@ import { platform } from 'os';
 import * as path from 'path';
 import * as semver from 'semver';
 
+import './app/i18n';
+
 import { packageType, version } from '../../package.json';
 import * as EXIT_CODES from '../shared/exit-codes';
 import { delay, getConfig } from '../shared/utils';
 import * as settings from './app/models/settings';
 import { logException } from './app/modules/analytics';
 import { buildWindowMenu } from './menu';
+import i18n from 'i18next';
 
 const customProtocol = 'etcher';
 const scheme = `${customProtocol}://`;
 const updatablePackageTypes = ['appimage', 'nsis', 'dmg'];
 const packageUpdatable = updatablePackageTypes.includes(packageType);
 let packageUpdated = false;
+let mainWindow: any = null;
 
 async function checkForUpdates(interval: number) {
 	// We use a while loop instead of a setInterval to preserve
@@ -130,7 +134,7 @@ async function createMainWindow() {
 	if (fullscreen) {
 		({ width, height } = electron.screen.getPrimaryDisplay().bounds);
 	}
-	const mainWindow = new electron.BrowserWindow({
+	mainWindow = new electron.BrowserWindow({
 		width,
 		height,
 		frame: !fullscreen,
@@ -157,7 +161,6 @@ async function createMainWindow() {
 
 	electron.app.setAsDefaultProtocolClient(customProtocol);
 
-	buildWindowMenu(mainWindow);
 	mainWindow.setFullScreen(true);
 
 	// Prevent flash of white when starting the application
@@ -240,6 +243,17 @@ async function main(): Promise<void> {
 			await selectImageURL(await getCommandLineURL(argv));
 		});
 		await selectImageURL(await getCommandLineURL(process.argv));
+
+		electron.ipcMain.on('change-lng', function (event, args) {
+			i18n.changeLanguage(args, () => {
+				console.log('Language changed to: ' + args);
+			});
+			if (mainWindow != null) {
+				buildWindowMenu(mainWindow);
+			} else {
+				console.log('Build menu failed. ');
+			}
+		});
 	}
 }
 
diff --git a/lib/gui/menu.ts b/lib/gui/menu.ts
index 317814d850..8580b2c2d1 100644
--- a/lib/gui/menu.ts
+++ b/lib/gui/menu.ts
@@ -17,6 +17,8 @@
 import * as electron from 'electron';
 import { displayName } from '../../package.json';
 
+import i18next from 'i18next';
+
 /**
  * @summary Builds a native application menu for a given window
  */
@@ -42,12 +44,13 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 	const menuTemplate: electron.MenuItemConstructorOptions[] = [
 		{
 			role: 'editMenu',
+			label: i18next.t('menu.edit'),
 		},
 		{
-			label: 'View',
+			label: i18next.t('menu.view'),
 			submenu: [
 				{
-					label: 'Toggle Developer Tools',
+					label: i18next.t('menu.devTool'),
 					accelerator:
 						process.platform === 'darwin' ? 'Command+Alt+I' : 'Control+Shift+I',
 					click: toggleDevTools,
@@ -56,12 +59,14 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 		},
 		{
 			role: 'windowMenu',
+			label: i18next.t('menu.window'),
 		},
 		{
 			role: 'help',
+			label: i18next.t('menu.help'),
 			submenu: [
 				{
-					label: 'Etcher Pro',
+					label: i18next.t('menu.pro'),
 					click() {
 						electron.shell.openExternal(
 							'https://etcher.io/pro?utm_source=etcher_menu&ref=etcher_menu',
@@ -69,13 +74,13 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 					},
 				},
 				{
-					label: 'Etcher Website',
+					label: i18next.t('menu.website'),
 					click() {
 						electron.shell.openExternal('https://etcher.io?ref=etcher_menu');
 					},
 				},
 				{
-					label: 'Report an issue',
+					label: i18next.t('menu.issue'),
 					click() {
 						electron.shell.openExternal(
 							'https://github.com/balena-io/etcher/issues',
@@ -92,25 +97,29 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 			submenu: [
 				{
 					role: 'about' as const,
-					label: 'About Etcher',
+					label: i18next.t('menu.about'),
 				},
 				{
 					type: 'separator' as const,
 				},
 				{
 					role: 'hide' as const,
+					label: i18next.t('menu.hide'),
 				},
 				{
 					role: 'hideOthers' as const,
+					label: i18next.t('menu.hideOthers'),
 				},
 				{
 					role: 'unhide' as const,
+					label: i18next.t('menu.unhide'),
 				},
 				{
 					type: 'separator' as const,
 				},
 				{
 					role: 'quit' as const,
+					label: i18next.t('menu.quit'),
 				},
 			],
 		});
diff --git a/lib/shared/catalina-sudo/sudo-askpass.osascript.js b/lib/shared/catalina-sudo/sudo-askpass.osascript-en.js
similarity index 100%
rename from lib/shared/catalina-sudo/sudo-askpass.osascript.js
rename to lib/shared/catalina-sudo/sudo-askpass.osascript-en.js
diff --git a/lib/shared/catalina-sudo/sudo-askpass.osascript-zh.js b/lib/shared/catalina-sudo/sudo-askpass.osascript-zh.js
new file mode 100755
index 0000000000..bf2e01f81d
--- /dev/null
+++ b/lib/shared/catalina-sudo/sudo-askpass.osascript-zh.js
@@ -0,0 +1,21 @@
+#!/usr/bin/env osascript -l JavaScript
+
+ObjC.import('stdlib')
+
+const app = Application.currentApplication()
+app.includeStandardAdditions = true
+
+const result = app.displayDialog('balenaEtcher 需要来自管理员的权限才能烧录镜像到磁盘。\n\n输入您的密码以允许此操作。', {
+  defaultAnswer: '',
+  withIcon: 'caution',
+  buttons: ['取消', '好'],
+  defaultButton: '好',
+  hiddenAnswer: true,
+})
+
+if (result.buttonReturned === '好') {
+  result.textReturned
+} else {
+  $.exit(255)
+}
+
diff --git a/lib/shared/catalina-sudo/sudo.ts b/lib/shared/catalina-sudo/sudo.ts
index ad96a82c33..3653e50a91 100644
--- a/lib/shared/catalina-sudo/sudo.ts
+++ b/lib/shared/catalina-sudo/sudo.ts
@@ -30,6 +30,9 @@ export async function sudo(
 	command: string,
 ): Promise<{ cancelled: boolean; stdout?: string; stderr?: string }> {
 	try {
+		let lang = Intl.DateTimeFormat().resolvedOptions().locale;
+		lang = lang.substr(0, 2);
+
 		const { stdout, stderr } = await execFileAsync(
 			'sudo',
 			['--askpass', 'sh', '-c', `echo ${SUCCESSFUL_AUTH_MARKER} && ${command}`],
@@ -40,7 +43,7 @@ export async function sudo(
 					SUDO_ASKPASS: join(
 						getAppPath(),
 						__dirname,
-						'sudo-askpass.osascript.js',
+						'sudo-askpass.osascript-' + lang + '.js',
 					),
 				},
 			},
diff --git a/lib/shared/messages.ts b/lib/shared/messages.ts
index 14034e958f..a0c6672702 100644
--- a/lib/shared/messages.ts
+++ b/lib/shared/messages.ts
@@ -17,16 +17,16 @@
 import { Dictionary } from 'lodash';
 import { outdent } from 'outdent';
 import * as prettyBytes from 'pretty-bytes';
+import '../gui/app/i18n';
+import i18next from 'i18next';
 
 export const progress: Dictionary<(quantity: number) => string> = {
 	successful: (quantity: number) => {
-		const plural = quantity === 1 ? '' : 's';
-		return `Successful target${plural}`;
+		return i18next.t('message.flashSucceed', { count: quantity });
 	},
 
 	failed: (quantity: number) => {
-		const plural = quantity === 1 ? '' : 's';
-		return `Failed target${plural}`;
+		return i18next.t('message.flashFail', { count: quantity });
 	},
 };
 
@@ -38,129 +38,116 @@ export const info = {
 	) => {
 		const targets = [];
 		if (failed + successful === 1) {
-			targets.push(`to ${drive.description} (${drive.displayName})`);
+			targets.push(
+				i18next.t('message.to') + `${drive.description} (${drive.displayName})`,
+			);
 		} else {
 			if (successful) {
-				const plural = successful === 1 ? '' : 's';
-				targets.push(`to ${successful} target${plural}`);
+				targets.push(
+					i18next.t('message.to') +
+						successful +
+						i18next.t('message.target', { count: successful }),
+				);
 			}
 			if (failed) {
-				const plural = failed === 1 ? '' : 's';
-				targets.push(`and failed to be flashed to ${failed} target${plural}`);
+				targets.push(
+					i18next.t('message.andFail') +
+						failed +
+						i18next.t('message.target', { count: failed }),
+				);
 			}
 		}
-		return `${imageBasename} was successfully flashed ${targets.join(' ')}`;
+		return (
+			`${imageBasename} ` +
+			i18next.t('message.succeedTo') +
+			` ${targets.join(' ')}`
+		);
 	},
 };
 
 export const compatibility = {
 	sizeNotRecommended: () => {
-		return 'Not recommended';
+		return i18next.t('message.sizeNotRecommended');
 	},
 
 	tooSmall: () => {
-		return 'Too small';
+		return i18next.t('message.tooSmall');
 	},
 
 	locked: () => {
-		return 'Locked';
+		return i18next.t('message.locked');
 	},
 
 	system: () => {
-		return 'System drive';
+		return i18next.t('message.system');
 	},
 
 	containsImage: () => {
-		return 'Source drive';
+		return i18next.t('message.containsImage');
 	},
 
 	// The drive is large and therefore likely not a medium you want to write to.
 	largeDrive: () => {
-		return 'Large drive';
+		return i18next.t('message.largeDrive');
 	},
 } as const;
 
 export const warning = {
 	tooSmall: (source: { size: number }, target: { size: number }) => {
 		return outdent({ newline: ' ' })`
-			The selected source is ${prettyBytes(source.size - target.size)}
-			larger than this drive.
+			 ${i18next.t('message.sourceLarger', {
+					byte: prettyBytes(source.size - target.size),
+				})}
 		`;
 	},
 
 	exitWhileFlashing: () => {
-		return [
-			'You are currently flashing a drive.',
-			'Closing Etcher may leave your drive in an unusable state.',
-		].join(' ');
+		return i18next.t('message.exitWhileFlashing');
 	},
 
 	looksLikeWindowsImage: () => {
-		return [
-			'It looks like you are trying to burn a Windows image.\n\n',
-			'Unlike other images, Windows images require special processing to be made bootable.',
-			'We suggest you use a tool specially designed for this purpose, such as',
-			'<a href="https://rufus.akeo.ie">Rufus</a> (Windows),',
-			'<a href="https://github.com/slacka/WoeUSB">WoeUSB</a> (Linux),',
-			'or Boot Camp Assistant (macOS).',
-		].join(' ');
+		return i18next.t('message.looksLikeWindowsImage');
 	},
 
 	missingPartitionTable: () => {
-		return [
-			'It looks like this is not a bootable image.\n\n',
-			'The image does not appear to contain a partition table,',
-			'and might not be recognized or bootable by your device.',
-		].join(' ');
+		return i18next.t('message.missingPartitionTable');
 	},
 
 	driveMissingPartitionTable: () => {
-		return outdent({ newline: ' ' })`
-			It looks like this is not a bootable drive.
-			The drive does not appear to contain a partition table,
-			and might not be recognized or bootable by your device.
-		`;
+		return i18next.t('message.driveMissingPartitionTable');
 	},
 
 	largeDriveSize: () => {
-		return "This is a large drive! Make sure it doesn't contain files that you want to keep.";
+		return i18next.t('message.largeDriveSize');
 	},
 
 	systemDrive: () => {
-		return 'Selecting your system drive is dangerous and will erase your drive!';
+		return i18next.t('message.systemDrive');
 	},
 
 	sourceDrive: () => {
-		return 'Contains the image you chose to flash';
+		return i18next.t('message.sourceDrive');
 	},
 };
 
 export const error = {
 	notEnoughSpaceInDrive: () => {
-		return [
-			'Not enough space on the drive.',
-			'Please insert larger one and try again.',
-		].join(' ');
+		return i18next.t('message.noSpace');
 	},
 
 	genericFlashError: (err: Error) => {
-		return `Something went wrong. If it is a compressed image, please check that the archive is not corrupted.\n${err.message}`;
+		return i18next.t('message.genericFlashError') + `\n${err.message}`;
 	},
 
 	validation: () => {
-		return [
-			'The write has been completed successfully but Etcher detected potential',
-			'corruption issues when reading the image back from the drive.',
-			'\n\nPlease consider writing the image to a different drive.',
-		].join(' ');
+		return i18next.t('message.validation');
 	},
 
 	openSource: (sourceName: string, errorMessage: string) => {
-		return outdent`
-			Something went wrong while opening ${sourceName}
-
-			Error: ${errorMessage}
-		`;
+		return i18next.t('message.openError', {
+			source: sourceName,
+			error: errorMessage,
+		});
 	},
 
 	flashFailure: (
@@ -170,34 +157,24 @@ export const error = {
 		const target =
 			drives.length === 1
 				? `${drives[0].description} (${drives[0].displayName})`
-				: `${drives.length} targets`;
-		return `Something went wrong while writing ${imageBasename} to ${target}.`;
+				: `${drives.length}` +
+				  i18next.t('message.target', { count: drives.length });
+		return i18next.t('message.flashError', { image: imageBasename, target });
 	},
 
 	driveUnplugged: () => {
-		return [
-			'Looks like Etcher lost access to the drive.',
-			'Did it get unplugged accidentally?',
-			"\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
-		].join(' ');
+		return i18next.t('message.unplug');
 	},
 
 	inputOutput: () => {
-		return [
-			'Looks like Etcher is not able to write to this location of the drive.',
-			'This error is usually caused by a faulty drive, reader, or port.',
-			'\n\nPlease try again with another drive, reader, or port.',
-		].join(' ');
+		return i18next.t('message.cannotWrite');
 	},
 
 	childWriterDied: () => {
-		return [
-			'The writer process ended unexpectedly.',
-			'Please try again, and contact the Etcher team if the problem persists.',
-		].join(' ');
+		return i18next.t('message.childWriterDied');
 	},
 
 	unsupportedProtocol: () => {
-		return 'Only http:// and https:// URLs are supported.';
+		return i18next.t('message.badProtocol');
 	},
 };
diff --git a/package-lock.json b/package-lock.json
index 29578bf0c5..e4afa88f84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2353,7 +2353,6 @@
       "version": "7.16.3",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
       "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
-      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -9888,6 +9887,14 @@
       "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==",
       "dev": true
     },
+    "html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "requires": {
+        "void-elements": "3.1.0"
+      }
+    },
     "html-void-elements": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
@@ -10108,6 +10115,24 @@
         }
       }
     },
+    "i18next": {
+      "version": "21.8.14",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/i18next/-/i18next-21.8.14.tgz",
+      "integrity": "sha512-4Yi+DtexvMm/Yw3Q9fllzY12SgLk+Mcmar+rCAccsOPul/2UmnBzoHbTGn/L48IPkFcmrNaH7xTLboBWIbH6pw==",
+      "requires": {
+        "@babel/runtime": "^7.17.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.18.6",
+          "resolved": "https://mirrors.huaweicloud.com/repository/npm/@babel/runtime/-/runtime-7.18.6.tgz",
+          "integrity": "sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
+      }
+    },
     "iconv-corefoundation": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
@@ -13967,6 +13992,16 @@
             "buffer": "^5.2.1",
             "through": "^2.3.8"
           }
+        },
+        "unbzip2-stream": {
+          "version": "1.4.3",
+          "resolved": "https://mirrors.huaweicloud.com/repository/npm/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+          "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+          "dev": true,
+          "requires": {
+            "buffer": "^5.2.1",
+            "through": "^2.3.8"
+          }
         }
       }
     },
@@ -14193,6 +14228,15 @@
         "react-side-effect": "^2.1.0"
       }
     },
+    "react-i18next": {
+      "version": "11.18.1",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/react-i18next/-/react-i18next-11.18.1.tgz",
+      "integrity": "sha512-S8cl4mvIOSA7OQCE5jNy2yhv705Vwi+7PinpqKIYcBmX/trJtHKqrf6CL67WJSA8crr2JU+oxE9jn9DQIrQezg==",
+      "requires": {
+        "@babel/runtime": "^7.14.5",
+        "html-parse-stringify": "^3.0.1"
+      }
+    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -14386,8 +14430,7 @@
     "regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "regenerator-transform": {
       "version": "0.14.5",
@@ -17098,6 +17141,11 @@
         "unist-util-stringify-position": "^2.0.0"
       }
     },
+    "void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
+    },
     "watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
diff --git a/package.json b/package.json
index 9765928855..8ee4199087 100644
--- a/package.json
+++ b/package.json
@@ -127,3 +127,4 @@
     "publishedAt": "2022-12-13T02:27:42.254Z"
   }
 }
+

From 17f2008d8844c841d8f47026c3a86e5e85b1038a Mon Sep 17 00:00:00 2001
From: r-q <scrisqiu@hotmail.com>
Date: Wed, 20 Jul 2022 23:20:41 +0800
Subject: [PATCH 02/10] refactor: split translations to files

- split translations from i18n.ts to several .ts files in lib/gui/app/i18n
- make a README for new language changes
- add zh-TW instead of only zh-CN
---
 lib/gui/app/i18n.ts        | 327 +++----------------------------------
 lib/gui/app/i18n/README.md |  23 +++
 lib/gui/app/i18n/en.ts     | 155 ++++++++++++++++++
 lib/gui/app/i18n/zh-CN.ts  | 147 +++++++++++++++++
 lib/gui/app/i18n/zh-TW.ts  | 147 +++++++++++++++++
 lib/gui/app/renderer.ts    |   5 +-
 6 files changed, 497 insertions(+), 307 deletions(-)
 create mode 100644 lib/gui/app/i18n/README.md
 create mode 100644 lib/gui/app/i18n/en.ts
 create mode 100644 lib/gui/app/i18n/zh-CN.ts
 create mode 100644 lib/gui/app/i18n/zh-TW.ts

diff --git a/lib/gui/app/i18n.ts b/lib/gui/app/i18n.ts
index debb94304e..c7c7e83a16 100644
--- a/lib/gui/app/i18n.ts
+++ b/lib/gui/app/i18n.ts
@@ -1,317 +1,36 @@
 import i18next from 'i18next';
 import { initReactI18next } from 'react-i18next';
+import zh_CN_translation from './i18n/zh-CN';
+import zh_TW_translation from './i18n/zh-TW';
+import en_translation from './i18n/en';
 
-let lang = Intl.DateTimeFormat().resolvedOptions().locale;
-lang = lang.substr(0, 2);
+export function langParser() {
+	const lang = Intl.DateTimeFormat().resolvedOptions().locale;
+
+	switch (lang.substr(0, 2)) {
+		case 'zh':
+			if (lang === 'zh-CN' || lang === 'zh-SG') {
+				return 'zh-CN';
+			} // Simplified Chinese
+			else {
+				return 'zh-TW';
+			} // Traditional Chinese
+		default:
+			return lang.substr(0, 2);
+	}
+}
 
 i18next.use(initReactI18next).init({
-	lng: lang,
+	lng: langParser(),
 	fallbackLng: 'en',
+	nonExplicitSupportedLngs: true,
 	interpolation: {
 		escapeValue: false,
 	},
 	resources: {
-		zh: {
-			translation: {
-				ok: '好',
-				cancel: '取消',
-				continue: '继续',
-				skip: '跳过',
-				sure: '我确定',
-				warning: '请注意！',
-				attention: '请注意',
-				failed: '失败',
-				completed: '完毕',
-				yesExit: '是的，可以退出',
-				reallyExit: '真的要现在退出 Etcher 吗？',
-				yesContinue: '是的，继续',
-				progress: {
-					starting: '正在启动……',
-					decompressing: '正在解压……',
-					flashing: '正在烧录……',
-					finishing: '正在结束……',
-					verifying: '正在验证……',
-					failing: '失败……',
-				},
-				message: {
-					sizeNotRecommended: '大小不推荐',
-					tooSmall: '空间太小',
-					locked: '被锁定',
-					system: '系统盘',
-					containsImage: '存放源镜像',
-					largeDrive: '很大的磁盘',
-					sourceLarger: '所选的镜像比目标盘大了 {{byte}} 比特。',
-					flashSucceed_one: '烧录成功',
-					flashSucceed_other: '烧录成功',
-					flashFail_one: '烧录失败',
-					flashFail_other: '烧录失败',
-					to: '到 ',
-					andFail: '并烧录失败了 ',
-					target_one: ' 个目标',
-					target_other: ' 个目标',
-					succeedTo: '被成功烧录',
-					exitWhileFlashing:
-						'您当前正在刷机。 关闭 Etcher 可能会导致您的磁盘无法使用。',
-					looksLikeWindowsImage:
-						'看起来您正在尝试刻录 Windows 镜像。\n\n与其他镜像不同，Windows 镜像需要特殊处理才能使其可启动。 我们建议您使用专门为此目的设计的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
-					missingPartitionTable:
-						'看起来这不是一个可启动的镜像。\n\n这个镜像似乎不包含分区表，因此您的设备可能无法识别或无法正确启动。',
-					driveMissingPartitionTable:
-						'看起来这不是可引导磁盘。\n这个磁盘似乎不包含分区表，\n因此您的设备可能无法识别或无法正确启动。',
-					largeDriveSize:
-						'这是个很大的磁盘！请检查并确认它不包含对您很重要的信息',
-					systemDrive: '选择系统盘很危险，因为这将会删除你的系统',
-					sourceDrive: '源镜像位于这个分区中',
-					noSpace: '磁盘空间不足。 请插入另一个较大的磁盘并重试。',
-					genericFlashError:
-						'出了点问题。如果源镜像曾被压缩过，请检查它是否已损坏。',
-					validation:
-						'写入已成功完成，但 Etcher 在从磁盘读取镜像时检测到潜在的损坏问题。 \n\n请考虑将镜像写入其他磁盘。',
-					openError: '打开 {{source}} 时出错。\n\n错误信息： {{error}}',
-					flashError: '烧录 {{image}} 到 {{target}} 失败。',
-					unplug:
-						'看起来 Etcher 失去了对磁盘的连接。 它是不是被意外拔掉了？\n\n有时这个错误是因为读卡器出了故障。',
-					cannotWrite:
-						'看起来 Etcher 无法写入磁盘的这个位置。 此错误通常是由故障的磁盘、读取器或端口引起的。 \n\n请使用其他磁盘、读卡器或端口重试。',
-					childWriterDied:
-						'写入进程意外崩溃。请再试一次，如果问题仍然存在，请联系 Etcher 团队。',
-					badProtocol: '仅支持 http:// 和 https:// 开头的网址。',
-				},
-				target: {
-					selectTarget: '选择目标磁盘',
-					plugTarget: '请插入目标磁盘',
-					targets: '个目标',
-					change: '更改',
-				},
-				menu: {
-					edit: '编辑',
-					view: '视图',
-					devTool: '打开开发者工具',
-					window: '窗口',
-					help: '帮助',
-					pro: 'Etcher 专业版',
-					website: 'Etcher 的官网',
-					issue: '提交一个 issue',
-					about: '关于 Etcher',
-					hide: '隐藏 Etcher',
-					hideOthers: '隐藏其它窗口',
-					unhide: '取消隐藏',
-					quit: '退出 Etcher',
-				},
-				source: {
-					useSourceURL: '使用镜像网络地址',
-					auth: '验证',
-					username: '输入用户名',
-					password: '输入密码',
-					unsupportedProtocol: '不支持的协议',
-					windowsImage: '这可能是 Windows 系统镜像',
-					partitionTable: '找不到分区表',
-					errorOpen: '打开源镜像时出错',
-					fromFile: '从文件烧录',
-					fromURL: '从在线地址烧录',
-					clone: '克隆磁盘',
-					image: '镜像信息',
-					name: '名称：',
-					path: '路径：',
-					selectSource: '选择源',
-					plugSource: '请插入源磁盘',
-					osImages: '系统镜像格式',
-					allFiles: '任何文件格式',
-					enterValidURL: '请输入一个正确的地址',
-				},
-				drives: {
-					name: '名称',
-					size: '大小',
-					location: '位置',
-					find: '找到 {{length}} 个',
-					select: '选定 {{select}}',
-					showHidden: '显示 {{num}} 个隐藏的磁盘',
-					systemDriveDanger: '选择系统盘很危险，因为这将会删除你的系统！',
-					openInBrowser: 'Etcher 会在浏览器中打开 {{link}}',
-					changeTarget: '改变目标',
-					largeDriveWarning: '您即将擦除一个非常大的磁盘',
-					largeDriveWarningMsg: '您确定所选磁盘不是存储磁盘吗？',
-					systemDriveWarning: '您将要擦除系统盘',
-					systemDriveWarningMsg: '您确定要烧录到系统盘吗？',
-				},
-				flash: {
-					another: '烧录另一目标',
-					target: '目标',
-					location: '位置',
-					error: '错误',
-					flash: '烧录',
-					flashNow: '现在烧录！',
-					skip: '跳过了验证',
-					moreInfo: '更多信息',
-					speedTip:
-						'通过将图像大小除以烧录时间来计算速度。\n由于我们能够跳过未使用的部分，因此具有EXT分区的磁盘镜像烧录速度更快。',
-					speed: '速度：',
-					failedTarget: '失败的烧录目标',
-					failedRetry: '重试烧录失败目标',
-				},
-				settings: {
-					errorReporting: '匿名地向 balena.io 报告运行错误和使用统计',
-					autoUpdate: '自动更新',
-					settings: '软件设置',
-					systemInformation: '系统信息',
-				},
-			},
-		},
-		en: {
-			translation: {
-				continue: 'Continue',
-				ok: 'OK',
-				cancel: 'Cancel',
-				skip: 'Skip',
-				sure: "Yes, I'm sure",
-				warning: 'WARNING! ',
-				attention: 'Attention',
-				failed: 'Failed',
-				completed: 'Completed',
-				yesContinue: 'Yes, continue',
-				reallyExit: 'Are you sure you want to close Etcher?',
-				yesExit: 'Yes, quit',
-				progress: {
-					starting: 'Starting...',
-					decompressing: 'Decompressing...',
-					flashing: 'Flashing...',
-					finishing: 'Finishing...',
-					verifying: 'Verifying...',
-					failing: 'Failed',
-				},
-				message: {
-					sizeNotRecommended: 'Not recommended',
-					tooSmall: 'Too small',
-					locked: 'Locked',
-					system: 'System drive',
-					containsImage: 'Source drive',
-					largeDrive: 'Large drive',
-					sourceLarger:
-						'The selected source is {{byte}} larger than this drive.',
-					flashSucceed_one: 'Successful target',
-					flashSucceed_other: 'Successful targets',
-					flashFail_one: 'Failed target',
-					flashFail_other: 'Failed targets',
-					to: 'to ',
-					andFail: 'and failed to be flashed to ',
-					target_one: ' target',
-					target_other: ' targets',
-					succeedTo: 'was successfully flashed',
-					exitWhileFlashing:
-						'You are currently flashing a drive. Closing Etcher may leave your drive in an unusable state.',
-					looksLikeWindowsImage:
-						'It looks like you are trying to burn a Windows image.\n\nUnlike other images, Windows images require special processing to be made bootable. We suggest you use a tool specially designed for this purpose, such as <a href="https://rufus.akeo.ie">Rufus</a> (Windows), <a href="https://github.com/slacka/WoeUSB">WoeUSB</a> (Linux), or Boot Camp Assistant (macOS).',
-					missingPartitionTable:
-						'It looks like this is not a bootable image.\n\nThe image does not appear to contain a partition table, and might not be recognized or bootable by your device.',
-					driveMissingPartitionTable:
-						'It looks like this is not a bootable drive.\nThe drive does not appear to contain a partition table,\nand might not be recognized or bootable by your device.',
-					largeDriveSize:
-						"This is a large drive! Make sure it doesn't contain files that you want to keep.",
-					systemDrive:
-						'Selecting your system drive is dangerous and will erase your drive!',
-					sourceDrive: 'Contains the image you chose to flash',
-					noSpace:
-						'Not enough space on the drive. Please insert larger one and try again.',
-					genericFlashError:
-						'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.',
-					validation:
-						'The write has been completed successfully but Etcher detected potential corruption issues when reading the image back from the drive. \n\nPlease consider writing the image to a different drive.',
-					openError:
-						'Something went wrong while opening {{source}}.\n\nError: {{error}}',
-					flashError:
-						'Something went wrong while writing {{image}} to {{target}}.',
-					unplug:
-						"Looks like Etcher lost access to the drive. Did it get unplugged accidentally?\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
-					cannotWrite:
-						'Looks like Etcher is not able to write to this location of the drive. This error is usually caused by a faulty drive, reader, or port. \n\nPlease try again with another drive, reader, or port.',
-					childWriterDied:
-						'The writer process ended unexpectedly. Please try again, and contact the Etcher team if the problem persists.',
-					badProtocol: 'Only http:// and https:// URLs are supported.',
-				},
-				target: {
-					selectTarget: 'Select target',
-					plugTarget: 'Plug a target drive',
-					targets: 'Targets',
-					change: 'Change',
-				},
-				source: {
-					useSourceURL: 'Use Image URL',
-					auth: 'Authentication',
-					username: 'Enter username',
-					password: 'Enter password',
-					unsupportedProtocol: 'Unsupported protocol',
-					windowsImage: 'Possible Windows image detected',
-					partitionTable: 'Missing partition table',
-					errorOpen: 'Error opening source',
-					fromFile: 'Flash from file',
-					fromURL: 'Flash from URL',
-					clone: 'Clone drive',
-					image: 'Image',
-					name: 'Name: ',
-					path: 'Path: ',
-					selectSource: 'Select source',
-					plugSource: 'Plug a source drive',
-					osImages: 'OS Images',
-					allFiles: 'All',
-					enterValidURL: 'Enter a valid URL',
-				},
-				drives: {
-					name: 'Name',
-					size: 'Size',
-					location: 'Location',
-					find: '{{length}} found',
-					select: 'Select {{select}}',
-					showHidden: 'Show {{num}} hidden',
-					systemDriveDanger:
-						'Selecting your system drive is dangerous and will erase your drive!',
-					openInBrowser: '`Etcher will open {{link}} in your browser`',
-					changeTarget: 'Change target',
-					largeDriveWarning: 'You are about to erase an unusually large drive',
-					largeDriveWarningMsg:
-						'Are you sure the selected drive is not a storage drive?',
-					systemDriveWarning: "You are about to erase your computer's drives",
-					systemDriveWarningMsg:
-						'Are you sure you want to flash your system drive?',
-				},
-				flash: {
-					another: 'Flash another',
-					target: 'Target',
-					location: 'Location',
-					error: 'Error',
-					flash: 'Flash',
-					flashNow: 'Flash!',
-					skip: 'Validation has been skipped',
-					moreInfo: 'more info',
-					speedTip:
-						'The speed is calculated by dividing the image size by the flashing time.\nDisk images with ext partitions flash faster as we are able to skip unused parts.',
-					speed: 'Effective speed: ',
-					failedTarget: 'Failed targets',
-					failedRetry: 'Retry failed targets',
-				},
-				settings: {
-					errorReporting:
-						'Anonymously report errors and usage statistics to balena.io',
-					autoUpdate: 'Auto-updates enabled',
-					settings: 'Settings',
-					systemInformation: 'System Information',
-				},
-				menu: {
-					edit: 'Edit',
-					view: 'View',
-					devTool: 'Toggle Developer Tools',
-					window: 'Window',
-					help: 'Help',
-					pro: 'Etcher Pro',
-					website: 'Etcher Website',
-					issue: 'Report an issue',
-					about: 'About Etcher',
-					hide: 'Hide Etcher',
-					hideOthers: 'Hide Others',
-					unhide: 'Unhide All',
-					quit: 'Quit Etcher',
-				},
-			},
-		},
+		'zh-CN': zh_CN_translation,
+		'zh-TW': zh_TW_translation,
+		en: en_translation,
 	},
 });
 
diff --git a/lib/gui/app/i18n/README.md b/lib/gui/app/i18n/README.md
new file mode 100644
index 0000000000..1eb97aac0e
--- /dev/null
+++ b/lib/gui/app/i18n/README.md
@@ -0,0 +1,23 @@
+# i18n
+
+## How it was done
+
+Using the open-source lib [i18next](https://www.i18next.com/).
+
+## How to add your own language
+
+1. Go to `lib/gui/app/i18n` and add a file named `xx.ts` (use the codes mentioned
+   in [the link](https://www.science.co.il/language/Locale-codes.php), and we support styles as `fr`, `de`, `es-ES`
+   and `pt-BR`)
+   .
+2. Copy the content from an existing translation and start to translate.
+3. Once done, go to `lib/gui/app/i18n.ts` and add a line of `import xx_translation from './i18n/xx'` after the
+   already-added imports and add `xx: xx_translation` in the `resources` section of `i18next.init()` function.
+4. Now go to `lib/shared/catalina-sudo/` and copy the `sudo-askpass.osascript-en.js`, change it to
+   be `sudo-askpass.osascript-xx.js` and edit
+   the `'balenaEtcher needs privileged access in order to flash disks.\n\nType your password to allow this.'` line and
+   those `Ok`s and `Cancel`s to your own language.
+5. If, your language has several variations when they are used in several countries/regions, such as `zh-CN` and `zh-TW`
+   , or `pt-BR` and `pt-PT`, edit
+   the `langParser()` in the `lib/gui/app/i18n.ts` file to meet your need.
+6. Make a commit, and then a pull request on GitHub.
\ No newline at end of file
diff --git a/lib/gui/app/i18n/en.ts b/lib/gui/app/i18n/en.ts
new file mode 100644
index 0000000000..a608745c0f
--- /dev/null
+++ b/lib/gui/app/i18n/en.ts
@@ -0,0 +1,155 @@
+const translation = {
+	translation: {
+		continue: 'Continue',
+		ok: 'OK',
+		cancel: 'Cancel',
+		skip: 'Skip',
+		sure: "Yes, I'm sure",
+		warning: 'WARNING! ',
+		attention: 'Attention',
+		failed: 'Failed',
+		completed: 'Completed',
+		yesContinue: 'Yes, continue',
+		reallyExit: 'Are you sure you want to close Etcher?',
+		yesExit: 'Yes, quit',
+		progress: {
+			starting: 'Starting...',
+			decompressing: 'Decompressing...',
+			flashing: 'Flashing...',
+			finishing: 'Finishing...',
+			verifying: 'Verifying...',
+			failing: 'Failed',
+		},
+		message: {
+			sizeNotRecommended: 'Not recommended',
+			tooSmall: 'Too small',
+			locked: 'Locked',
+			system: 'System drive',
+			containsImage: 'Source drive',
+			largeDrive: 'Large drive',
+			sourceLarger: 'The selected source is {{byte}} larger than this drive.',
+			flashSucceed_one: 'Successful target',
+			flashSucceed_other: 'Successful targets',
+			flashFail_one: 'Failed target',
+			flashFail_other: 'Failed targets',
+			to: 'to ',
+			andFail: 'and failed to be flashed to ',
+			target_one: ' target',
+			target_other: ' targets',
+			succeedTo: 'was successfully flashed',
+			exitWhileFlashing:
+				'You are currently flashing a drive. Closing Etcher may leave your drive in an unusable state.',
+			looksLikeWindowsImage:
+				'It looks like you are trying to burn a Windows image.\n\nUnlike other images, Windows images require special processing to be made bootable. We suggest you use a tool specially designed for this purpose, such as <a href="https://rufus.akeo.ie">Rufus</a> (Windows), <a href="https://github.com/slacka/WoeUSB">WoeUSB</a> (Linux), or Boot Camp Assistant (macOS).',
+			missingPartitionTable:
+				'It looks like this is not a bootable image.\n\nThe image does not appear to contain a partition table, and might not be recognized or bootable by your device.',
+			driveMissingPartitionTable:
+				'It looks like this is not a bootable drive.\nThe drive does not appear to contain a partition table,\nand might not be recognized or bootable by your device.',
+			largeDriveSize:
+				"This is a large drive! Make sure it doesn't contain files that you want to keep.",
+			systemDrive:
+				'Selecting your system drive is dangerous and will erase your drive!',
+			sourceDrive: 'Contains the image you chose to flash',
+			noSpace:
+				'Not enough space on the drive. Please insert larger one and try again.',
+			genericFlashError:
+				'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.',
+			validation:
+				'The write has been completed successfully but Etcher detected potential corruption issues when reading the image back from the drive. \n\nPlease consider writing the image to a different drive.',
+			openError:
+				'Something went wrong while opening {{source}}.\n\nError: {{error}}',
+			flashError: 'Something went wrong while writing {{image}} to {{target}}.',
+			unplug:
+				"Looks like Etcher lost access to the drive. Did it get unplugged accidentally?\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
+			cannotWrite:
+				'Looks like Etcher is not able to write to this location of the drive. This error is usually caused by a faulty drive, reader, or port. \n\nPlease try again with another drive, reader, or port.',
+			childWriterDied:
+				'The writer process ended unexpectedly. Please try again, and contact the Etcher team if the problem persists.',
+			badProtocol: 'Only http:// and https:// URLs are supported.',
+		},
+		target: {
+			selectTarget: 'Select target',
+			plugTarget: 'Plug a target drive',
+			targets: 'Targets',
+			change: 'Change',
+		},
+		source: {
+			useSourceURL: 'Use Image URL',
+			auth: 'Authentication',
+			username: 'Enter username',
+			password: 'Enter password',
+			unsupportedProtocol: 'Unsupported protocol',
+			windowsImage: 'Possible Windows image detected',
+			partitionTable: 'Missing partition table',
+			errorOpen: 'Error opening source',
+			fromFile: 'Flash from file',
+			fromURL: 'Flash from URL',
+			clone: 'Clone drive',
+			image: 'Image',
+			name: 'Name: ',
+			path: 'Path: ',
+			selectSource: 'Select source',
+			plugSource: 'Plug a source drive',
+			osImages: 'OS Images',
+			allFiles: 'All',
+			enterValidURL: 'Enter a valid URL',
+		},
+		drives: {
+			name: 'Name',
+			size: 'Size',
+			location: 'Location',
+			find: '{{length}} found',
+			select: 'Select {{select}}',
+			showHidden: 'Show {{num}} hidden',
+			systemDriveDanger:
+				'Selecting your system drive is dangerous and will erase your drive!',
+			openInBrowser: '`Etcher will open {{link}} in your browser`',
+			changeTarget: 'Change target',
+			largeDriveWarning: 'You are about to erase an unusually large drive',
+			largeDriveWarningMsg:
+				'Are you sure the selected drive is not a storage drive?',
+			systemDriveWarning: "You are about to erase your computer's drives",
+			systemDriveWarningMsg:
+				'Are you sure you want to flash your system drive?',
+		},
+		flash: {
+			another: 'Flash another',
+			target: 'Target',
+			location: 'Location',
+			error: 'Error',
+			flash: 'Flash',
+			flashNow: 'Flash!',
+			skip: 'Validation has been skipped',
+			moreInfo: 'more info',
+			speedTip:
+				'The speed is calculated by dividing the image size by the flashing time.\nDisk images with ext partitions flash faster as we are able to skip unused parts.',
+			speed: 'Effective speed: ',
+			failedTarget: 'Failed targets',
+			failedRetry: 'Retry failed targets',
+		},
+		settings: {
+			errorReporting:
+				'Anonymously report errors and usage statistics to balena.io',
+			autoUpdate: 'Auto-updates enabled',
+			settings: 'Settings',
+			systemInformation: 'System Information',
+		},
+		menu: {
+			edit: 'Edit',
+			view: 'View',
+			devTool: 'Toggle Developer Tools',
+			window: 'Window',
+			help: 'Help',
+			pro: 'Etcher Pro',
+			website: 'Etcher Website',
+			issue: 'Report an issue',
+			about: 'About Etcher',
+			hide: 'Hide Etcher',
+			hideOthers: 'Hide Others',
+			unhide: 'Unhide All',
+			quit: 'Quit Etcher',
+		},
+	},
+};
+
+export default translation;
diff --git a/lib/gui/app/i18n/zh-CN.ts b/lib/gui/app/i18n/zh-CN.ts
new file mode 100644
index 0000000000..5c83b33a30
--- /dev/null
+++ b/lib/gui/app/i18n/zh-CN.ts
@@ -0,0 +1,147 @@
+const translation = {
+	translation: {
+		ok: '好',
+		cancel: '取消',
+		continue: '继续',
+		skip: '跳过',
+		sure: '我确定',
+		warning: '请注意！',
+		attention: '请注意',
+		failed: '失败',
+		completed: '完毕',
+		yesExit: '是的，可以退出',
+		reallyExit: '真的要现在退出 Etcher 吗？',
+		yesContinue: '是的，继续',
+		progress: {
+			starting: '正在启动……',
+			decompressing: '正在解压……',
+			flashing: '正在烧录……',
+			finishing: '正在结束……',
+			verifying: '正在验证……',
+			failing: '失败……',
+		},
+		message: {
+			sizeNotRecommended: '大小不推荐',
+			tooSmall: '空间太小',
+			locked: '被锁定',
+			system: '系统盘',
+			containsImage: '存放源镜像',
+			largeDrive: '很大的磁盘',
+			sourceLarger: '所选的镜像比目标盘大了 {{byte}} 比特。',
+			flashSucceed_one: '烧录成功',
+			flashSucceed_other: '烧录成功',
+			flashFail_one: '烧录失败',
+			flashFail_other: '烧录失败',
+			to: '到 ',
+			andFail: '并烧录失败了 ',
+			target_one: ' 个目标',
+			target_other: ' 个目标',
+			succeedTo: '被成功烧录',
+			exitWhileFlashing:
+				'您当前正在刷机。 关闭 Etcher 可能会导致您的磁盘无法使用。',
+			looksLikeWindowsImage:
+				'看起来您正在尝试刻录 Windows 镜像。\n\n与其他镜像不同，Windows 镜像需要特殊处理才能使其可启动。 我们建议您使用专门为此目的设计的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
+			missingPartitionTable:
+				'看起来这不是一个可启动的镜像。\n\n这个镜像似乎不包含分区表，因此您的设备可能无法识别或无法正确启动。',
+			driveMissingPartitionTable:
+				'看起来这不是可引导磁盘。\n这个磁盘似乎不包含分区表，\n因此您的设备可能无法识别或无法正确启动。',
+			largeDriveSize: '这是个很大的磁盘！请检查并确认它不包含对您很重要的信息',
+			systemDrive: '选择系统盘很危险，因为这将会删除你的系统',
+			sourceDrive: '源镜像位于这个分区中',
+			noSpace: '磁盘空间不足。 请插入另一个较大的磁盘并重试。',
+			genericFlashError:
+				'出了点问题。如果源镜像曾被压缩过，请检查它是否已损坏。',
+			validation:
+				'写入已成功完成，但 Etcher 在从磁盘读取镜像时检测到潜在的损坏问题。 \n\n请考虑将镜像写入其他磁盘。',
+			openError: '打开 {{source}} 时出错。\n\n错误信息： {{error}}',
+			flashError: '烧录 {{image}} 到 {{target}} 失败。',
+			unplug:
+				'看起来 Etcher 失去了对磁盘的连接。 它是不是被意外拔掉了？\n\n有时这个错误是因为读卡器出了故障。',
+			cannotWrite:
+				'看起来 Etcher 无法写入磁盘的这个位置。 此错误通常是由故障的磁盘、读取器或端口引起的。 \n\n请使用其他磁盘、读卡器或端口重试。',
+			childWriterDied:
+				'写入进程意外崩溃。请再试一次，如果问题仍然存在，请联系 Etcher 团队。',
+			badProtocol: '仅支持 http:// 和 https:// 开头的网址。',
+		},
+		target: {
+			selectTarget: '选择目标磁盘',
+			plugTarget: '请插入目标磁盘',
+			targets: '个目标',
+			change: '更改',
+		},
+		menu: {
+			edit: '编辑',
+			view: '视图',
+			devTool: '打开开发者工具',
+			window: '窗口',
+			help: '帮助',
+			pro: 'Etcher 专业版',
+			website: 'Etcher 的官网',
+			issue: '提交一个 issue',
+			about: '关于 Etcher',
+			hide: '隐藏 Etcher',
+			hideOthers: '隐藏其它窗口',
+			unhide: '取消隐藏',
+			quit: '退出 Etcher',
+		},
+		source: {
+			useSourceURL: '使用镜像网络地址',
+			auth: '验证',
+			username: '输入用户名',
+			password: '输入密码',
+			unsupportedProtocol: '不支持的协议',
+			windowsImage: '这可能是 Windows 系统镜像',
+			partitionTable: '找不到分区表',
+			errorOpen: '打开源镜像时出错',
+			fromFile: '从文件烧录',
+			fromURL: '从在线地址烧录',
+			clone: '克隆磁盘',
+			image: '镜像信息',
+			name: '名称：',
+			path: '路径：',
+			selectSource: '选择源',
+			plugSource: '请插入源磁盘',
+			osImages: '系统镜像格式',
+			allFiles: '任何文件格式',
+			enterValidURL: '请输入一个正确的地址',
+		},
+		drives: {
+			name: '名称',
+			size: '大小',
+			location: '位置',
+			find: '找到 {{length}} 个',
+			select: '选定 {{select}}',
+			showHidden: '显示 {{num}} 个隐藏的磁盘',
+			systemDriveDanger: '选择系统盘很危险，因为这将会删除你的系统！',
+			openInBrowser: 'Etcher 会在浏览器中打开 {{link}}',
+			changeTarget: '改变目标',
+			largeDriveWarning: '您即将擦除一个非常大的磁盘',
+			largeDriveWarningMsg: '您确定所选磁盘不是存储磁盘吗？',
+			systemDriveWarning: '您将要擦除系统盘',
+			systemDriveWarningMsg: '您确定要烧录到系统盘吗？',
+		},
+		flash: {
+			another: '烧录另一目标',
+			target: '目标',
+			location: '位置',
+			error: '错误',
+			flash: '烧录',
+			flashNow: '现在烧录！',
+			skip: '跳过了验证',
+			moreInfo: '更多信息',
+			speedTip:
+				'通过将图像大小除以烧录时间来计算速度。\n由于我们能够跳过未使用的部分，因此具有EXT分区的磁盘镜像烧录速度更快。',
+			speed: '速度：',
+			failedTarget: '失败的烧录目标',
+			failedRetry: '重试烧录失败目标',
+		},
+		settings: {
+			errorReporting: '匿名地向 balena.io 报告运行错误和使用统计',
+			autoUpdate: '自动更新',
+			settings: '软件设置',
+			systemInformation: '系统信息',
+		},
+	},
+};
+
+export default translation;
diff --git a/lib/gui/app/i18n/zh-TW.ts b/lib/gui/app/i18n/zh-TW.ts
new file mode 100644
index 0000000000..21ebf63e4c
--- /dev/null
+++ b/lib/gui/app/i18n/zh-TW.ts
@@ -0,0 +1,147 @@
+const translation = {
+	translation: {
+		ok: '好',
+		cancel: '取消',
+		continue: '繼續',
+		skip: '跳過',
+		sure: '我確定',
+		warning: '請注意！',
+		attention: '請注意',
+		failed: '失敗',
+		completed: '完畢',
+		yesExit: '是的，可以退出',
+		reallyExit: '真的要現在退出 Etcher 嗎？',
+		yesContinue: '是的，繼續',
+		progress: {
+			starting: '正在啓動……',
+			decompressing: '正在解壓……',
+			flashing: '正在燒錄……',
+			finishing: '正在結束……',
+			verifying: '正在驗證……',
+			failing: '失敗……',
+		},
+		message: {
+			sizeNotRecommended: '大小不推薦',
+			tooSmall: '空間太小',
+			locked: '被鎖定',
+			system: '系統盤',
+			containsImage: '存放源鏡像',
+			largeDrive: '很大的磁盤',
+			sourceLarger: '所選的鏡像比目標盤大了 {{byte}} 比特。',
+			flashSucceed_one: '燒錄成功',
+			flashSucceed_other: '燒錄成功',
+			flashFail_one: '燒錄失敗',
+			flashFail_other: '燒錄失敗',
+			to: '到 ',
+			andFail: '並燒錄失敗了 ',
+			target_one: ' 個目標',
+			target_other: ' 個目標',
+			succeedTo: '被成功燒錄',
+			exitWhileFlashing:
+				'您當前正在刷機。 關閉 Etcher 可能會導致您的磁盤無法使用。',
+			looksLikeWindowsImage:
+				'看起來您正在嘗試刻錄 Windows 鏡像。\n\n與其他鏡像不同，Windows 鏡像需要特殊處理才能使其可啓動。 我們建議您使用專門爲此目的設計的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
+			missingPartitionTable:
+				'看起來這不是一個可啓動的鏡像。\n\n這個鏡像似乎不包含分區表，因此您的設備可能無法識別或無法正確啓動。',
+			driveMissingPartitionTable:
+				'看起來這不是可引導磁盤。\n這個磁盤似乎不包含分區表，\n因此您的設備可能無法識別或無法正確啓動。',
+			largeDriveSize: '這是個很大的磁盤！請檢查並確認它不包含對您很重要的信息',
+			systemDrive: '選擇系統盤很危險，因爲這將會刪除你的系統',
+			sourceDrive: '源鏡像位於這個分區中',
+			noSpace: '磁盤空間不足。 請插入另一個較大的磁盤並重試。',
+			genericFlashError:
+				'出了點問題。如果源鏡像曾被壓縮過，請檢查它是否已損壞。',
+			validation:
+				'寫入已成功完成，但 Etcher 在從磁盤讀取鏡像時檢測到潛在的損壞問題。 \n\n請考慮將鏡像寫入其他磁盤。',
+			openError: '打開 {{source}} 時出錯。\n\n錯誤信息： {{error}}',
+			flashError: '燒錄 {{image}} 到 {{target}} 失敗。',
+			unplug:
+				'看起來 Etcher 失去了對磁盤的連接。 它是不是被意外拔掉了？\n\n有時這個錯誤是因爲讀卡器出了故障。',
+			cannotWrite:
+				'看起來 Etcher 無法寫入磁盤的這個位置。 此錯誤通常是由故障的磁盤、讀取器或端口引起的。 \n\n請使用其他磁盤、讀卡器或端口重試。',
+			childWriterDied:
+				'寫入進程意外崩潰。請再試一次，如果問題仍然存在，請聯繫 Etcher 團隊。',
+			badProtocol: '僅支持 http:// 和 https:// 開頭的網址。',
+		},
+		target: {
+			selectTarget: '選擇目標磁盤',
+			plugTarget: '請插入目標磁盤',
+			targets: '個目標',
+			change: '更改',
+		},
+		menu: {
+			edit: '編輯',
+			view: '視圖',
+			devTool: '打開開發者工具',
+			window: '窗口',
+			help: '幫助',
+			pro: 'Etcher 專業版',
+			website: 'Etcher 的官網',
+			issue: '提交一個 issue',
+			about: '關於 Etcher',
+			hide: '隱藏 Etcher',
+			hideOthers: '隱藏其它窗口',
+			unhide: '取消隱藏',
+			quit: '退出 Etcher',
+		},
+		source: {
+			useSourceURL: '使用鏡像網絡地址',
+			auth: '驗證',
+			username: '輸入用戶名',
+			password: '輸入密碼',
+			unsupportedProtocol: '不支持的協議',
+			windowsImage: '這可能是 Windows 系統鏡像',
+			partitionTable: '找不到分區表',
+			errorOpen: '打開源鏡像時出錯',
+			fromFile: '從文件燒錄',
+			fromURL: '從在線地址燒錄',
+			clone: '克隆磁盤',
+			image: '鏡像信息',
+			name: '名稱：',
+			path: '路徑：',
+			selectSource: '選擇源',
+			plugSource: '請插入源磁盤',
+			osImages: '系統鏡像格式',
+			allFiles: '任何文件格式',
+			enterValidURL: '請輸入一個正確的地址',
+		},
+		drives: {
+			name: '名稱',
+			size: '大小',
+			location: '位置',
+			find: '找到 {{length}} 個',
+			select: '選定 {{select}}',
+			showHidden: '顯示 {{num}} 個隱藏的磁盤',
+			systemDriveDanger: '選擇系統盤很危險，因爲這將會刪除你的系統！',
+			openInBrowser: 'Etcher 會在瀏覽器中打開 {{link}}',
+			changeTarget: '改變目標',
+			largeDriveWarning: '您即將擦除一個非常大的磁盤',
+			largeDriveWarningMsg: '您確定所選磁盤不是存儲磁盤嗎？',
+			systemDriveWarning: '您將要擦除系統盤',
+			systemDriveWarningMsg: '您確定要燒錄到系統盤嗎？',
+		},
+		flash: {
+			another: '燒錄另一目標',
+			target: '目標',
+			location: '位置',
+			error: '錯誤',
+			flash: '燒錄',
+			flashNow: '現在燒錄！',
+			skip: '跳過了驗證',
+			moreInfo: '更多信息',
+			speedTip:
+				'通過將圖像大小除以燒錄時間來計算速度。\n由於我們能夠跳過未使用的部分，因此具有EXT分區的磁盤鏡像燒錄速度更快。',
+			speed: '速度：',
+			failedTarget: '失敗的燒錄目標',
+			failedRetry: '重試燒錄失敗目標',
+		},
+		settings: {
+			errorReporting: '匿名地向 balena.io 報告運行錯誤和使用統計',
+			autoUpdate: '自動更新',
+			settings: '軟件設置',
+			systemInformation: '系統信息',
+		},
+	},
+};
+
+export default translation;
diff --git a/lib/gui/app/renderer.ts b/lib/gui/app/renderer.ts
index 55c8733ff2..6c0f8d9443 100644
--- a/lib/gui/app/renderer.ts
+++ b/lib/gui/app/renderer.ts
@@ -1,11 +1,10 @@
 // @ts-nocheck
 import { main } from './app';
 import './i18n';
+import { langParser } from './i18n';
 import { ipcRenderer } from 'electron';
 
-let lang = Intl.DateTimeFormat().resolvedOptions().locale;
-lang = lang.substr(0, 2);
-ipcRenderer.send('change-lng', lang);
+ipcRenderer.send('change-lng', langParser());
 
 if (module.hot) {
 	module.hot.accept('./app', () => {

From 67d26ff7902c272e8113c9b650382a1dcb0cdde0 Mon Sep 17 00:00:00 2001
From: r-q <scrisqiu@hotmail.com>
Date: Thu, 21 Jul 2022 23:06:17 +0800
Subject: [PATCH 03/10] minor: optimize i18n

Optimized several translations.
This commit itself is only a patch, but as a pull request must have at least one commit with a change-type.

Change-Type: minor
---
 .../app/components/flash-results/flash-results.tsx    |  7 ++++---
 lib/gui/app/i18n/en.ts                                |  9 +++++++--
 lib/gui/app/i18n/zh-CN.ts                             |  9 +++++++--
 lib/gui/app/i18n/zh-TW.ts                             |  9 +++++++--
 lib/shared/messages.ts                                | 11 +++++------
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/lib/gui/app/components/flash-results/flash-results.tsx b/lib/gui/app/components/flash-results/flash-results.tsx
index 51c8a03281..766df43c54 100644
--- a/lib/gui/app/components/flash-results/flash-results.tsx
+++ b/lib/gui/app/components/flash-results/flash-results.tsx
@@ -163,8 +163,9 @@ export function FlashResults({
 					<Txt>{middleEllipsis(image, 24)}</Txt>
 				</Flex>
 				<Txt fontSize={24} color="#fff" mb="17px">
-					{i18next.t('flash.flash')}{' '}
-					{allFailed ? i18next.t('failed') : i18next.t('completed')}!
+					{allFailed
+						? i18next.t('flash.flashFailed')
+						: i18next.t('flash.flashCompleted')}
 				</Txt>
 				{skip ? <Txt color="#7e8085">{i18next.t('flash.skip')}</Txt> : null}
 			</Flex>
@@ -203,7 +204,7 @@ export function FlashResults({
 						}}
 						tooltip={i18next.t('flash.speedTip')}
 					>
-						{i18next.t('flash.speed')} {effectiveSpeed} MB/s
+						{i18next.t('flash.speed', { speed: effectiveSpeed })}
 					</Txt>
 				)}
 			</Flex>
diff --git a/lib/gui/app/i18n/en.ts b/lib/gui/app/i18n/en.ts
index a608745c0f..a201d4ef8e 100644
--- a/lib/gui/app/i18n/en.ts
+++ b/lib/gui/app/i18n/en.ts
@@ -33,7 +33,10 @@ const translation = {
 			flashFail_one: 'Failed target',
 			flashFail_other: 'Failed targets',
 			to: 'to ',
-			andFail: 'and failed to be flashed to ',
+			succeedTarget_one: 'to {{num}} target',
+			succeedTarget_other: 'to {{num}} targets',
+			andFailTarget_one: 'and failed to be flashed to {{num}} target',
+			andFailTarget_other: 'and failed to be flashed to {{num}} targets',
 			target_one: ' target',
 			target_other: ' targets',
 			succeedTo: 'was successfully flashed',
@@ -123,9 +126,11 @@ const translation = {
 			moreInfo: 'more info',
 			speedTip:
 				'The speed is calculated by dividing the image size by the flashing time.\nDisk images with ext partitions flash faster as we are able to skip unused parts.',
-			speed: 'Effective speed: ',
+			speed: 'Effective speed: {{speed}} MB/s',
 			failedTarget: 'Failed targets',
 			failedRetry: 'Retry failed targets',
+			flashFailed: 'Flash Failed.',
+			flashCompleted: 'Flash Completed!',
 		},
 		settings: {
 			errorReporting:
diff --git a/lib/gui/app/i18n/zh-CN.ts b/lib/gui/app/i18n/zh-CN.ts
index 5c83b33a30..2df35d8b7e 100644
--- a/lib/gui/app/i18n/zh-CN.ts
+++ b/lib/gui/app/i18n/zh-CN.ts
@@ -33,7 +33,10 @@ const translation = {
 			flashFail_one: '烧录失败',
 			flashFail_other: '烧录失败',
 			to: '到 ',
-			andFail: '并烧录失败了 ',
+			succeedTarget_one: '到 {{num}} 个目标',
+			succeedTarget_other: '到 {{num}} 个目标',
+			andFailTarget_one: '并烧录失败了 {{num}} 个目标',
+			andFailTarget_other: '并烧录失败了 {{num}} 个目标',
 			target_one: ' 个目标',
 			target_other: ' 个目标',
 			succeedTo: '被成功烧录',
@@ -131,9 +134,11 @@ const translation = {
 			moreInfo: '更多信息',
 			speedTip:
 				'通过将图像大小除以烧录时间来计算速度。\n由于我们能够跳过未使用的部分，因此具有EXT分区的磁盘镜像烧录速度更快。',
-			speed: '速度：',
+			speed: '速度：{{speed}} MB/秒',
 			failedTarget: '失败的烧录目标',
 			failedRetry: '重试烧录失败目标',
+			flashFailed: '烧录失败。',
+			flashCompleted: '烧录成功！',
 		},
 		settings: {
 			errorReporting: '匿名地向 balena.io 报告运行错误和使用统计',
diff --git a/lib/gui/app/i18n/zh-TW.ts b/lib/gui/app/i18n/zh-TW.ts
index 21ebf63e4c..87592aca9a 100644
--- a/lib/gui/app/i18n/zh-TW.ts
+++ b/lib/gui/app/i18n/zh-TW.ts
@@ -33,7 +33,10 @@ const translation = {
 			flashFail_one: '燒錄失敗',
 			flashFail_other: '燒錄失敗',
 			to: '到 ',
-			andFail: '並燒錄失敗了 ',
+			succeedTarget_one: '到 {{num}} 個目標',
+			succeedTarget_other: '到 {{num}} 個目標',
+			andFailTarget_one: '並燒錄失敗了 {{num}} 個目標',
+			andFailTarget_other: '並燒錄失敗了 {{num}} 個目標',
 			target_one: ' 個目標',
 			target_other: ' 個目標',
 			succeedTo: '被成功燒錄',
@@ -131,9 +134,11 @@ const translation = {
 			moreInfo: '更多信息',
 			speedTip:
 				'通過將圖像大小除以燒錄時間來計算速度。\n由於我們能夠跳過未使用的部分，因此具有EXT分區的磁盤鏡像燒錄速度更快。',
-			speed: '速度：',
+			speed: '速度：{{speed}} MB/秒',
 			failedTarget: '失敗的燒錄目標',
 			failedRetry: '重試燒錄失敗目標',
+			flashFailed: '燒錄失敗。',
+			flashCompleted: '燒錄成功！',
 		},
 		settings: {
 			errorReporting: '匿名地向 balena.io 報告運行錯誤和使用統計',
diff --git a/lib/shared/messages.ts b/lib/shared/messages.ts
index a0c6672702..cf60aac7a2 100644
--- a/lib/shared/messages.ts
+++ b/lib/shared/messages.ts
@@ -44,16 +44,15 @@ export const info = {
 		} else {
 			if (successful) {
 				targets.push(
-					i18next.t('message.to') +
-						successful +
-						i18next.t('message.target', { count: successful }),
+					i18next.t('message.succeedTarget', {
+						count: successful,
+						num: successful,
+					}),
 				);
 			}
 			if (failed) {
 				targets.push(
-					i18next.t('message.andFail') +
-						failed +
-						i18next.t('message.target', { count: failed }),
+					i18next.t('message.andFailTarget', { count: failed, num: failed }),
 				);
 			}
 		}

From eb5f5bbb9e6f679914d552f98583de45e0f57519 Mon Sep 17 00:00:00 2001
From: r-q <scrisqiu@hotmail.com>
Date: Thu, 21 Jul 2022 23:44:07 +0800
Subject: [PATCH 04/10] fix: optimize translations

more direct string-concatenation, thanks to @lurch
---
 lib/gui/app/i18n/en.ts    | 12 +++++++-----
 lib/gui/app/i18n/zh-CN.ts | 11 ++++++-----
 lib/gui/app/i18n/zh-TW.ts | 11 ++++++-----
 lib/shared/messages.ts    | 34 ++++++++++++++++++++++------------
 4 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/lib/gui/app/i18n/en.ts b/lib/gui/app/i18n/en.ts
index a201d4ef8e..aaeb26315c 100644
--- a/lib/gui/app/i18n/en.ts
+++ b/lib/gui/app/i18n/en.ts
@@ -33,13 +33,14 @@ const translation = {
 			flashFail_one: 'Failed target',
 			flashFail_other: 'Failed targets',
 			to: 'to ',
-			succeedTarget_one: 'to {{num}} target',
-			succeedTarget_other: 'to {{num}} targets',
+			toDrive: 'to {{description}} ({{name}})',
+			toTarget_one: 'to {{num}} target',
+			toTarget_other: 'to {{num}} targets',
 			andFailTarget_one: 'and failed to be flashed to {{num}} target',
 			andFailTarget_other: 'and failed to be flashed to {{num}} targets',
 			target_one: ' target',
 			target_other: ' targets',
-			succeedTo: 'was successfully flashed',
+			succeedTo: '{{name}} was successfully flashed to {{target}}',
 			exitWhileFlashing:
 				'You are currently flashing a drive. Closing Etcher may leave your drive in an unusable state.',
 			looksLikeWindowsImage:
@@ -56,12 +57,13 @@ const translation = {
 			noSpace:
 				'Not enough space on the drive. Please insert larger one and try again.',
 			genericFlashError:
-				'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.',
+				'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.\n{{error}}',
 			validation:
 				'The write has been completed successfully but Etcher detected potential corruption issues when reading the image back from the drive. \n\nPlease consider writing the image to a different drive.',
 			openError:
 				'Something went wrong while opening {{source}}.\n\nError: {{error}}',
-			flashError: 'Something went wrong while writing {{image}} to {{target}}.',
+			flashError:
+				'Something went wrong while writing {{image}} to {{targets}}.',
 			unplug:
 				"Looks like Etcher lost access to the drive. Did it get unplugged accidentally?\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
 			cannotWrite:
diff --git a/lib/gui/app/i18n/zh-CN.ts b/lib/gui/app/i18n/zh-CN.ts
index 2df35d8b7e..7a37035998 100644
--- a/lib/gui/app/i18n/zh-CN.ts
+++ b/lib/gui/app/i18n/zh-CN.ts
@@ -33,13 +33,14 @@ const translation = {
 			flashFail_one: '烧录失败',
 			flashFail_other: '烧录失败',
 			to: '到 ',
-			succeedTarget_one: '到 {{num}} 个目标',
-			succeedTarget_other: '到 {{num}} 个目标',
+			toDrive: '到 {{description}} ({{name}})',
+			toTarget_one: '到 {{num}} 个目标',
+			toTarget_other: '到 {{num}} 个目标',
 			andFailTarget_one: '并烧录失败了 {{num}} 个目标',
 			andFailTarget_other: '并烧录失败了 {{num}} 个目标',
 			target_one: ' 个目标',
 			target_other: ' 个目标',
-			succeedTo: '被成功烧录',
+			succeedTo: '{{name}} 被成功烧录到 {{target}}',
 			exitWhileFlashing:
 				'您当前正在刷机。 关闭 Etcher 可能会导致您的磁盘无法使用。',
 			looksLikeWindowsImage:
@@ -53,11 +54,11 @@ const translation = {
 			sourceDrive: '源镜像位于这个分区中',
 			noSpace: '磁盘空间不足。 请插入另一个较大的磁盘并重试。',
 			genericFlashError:
-				'出了点问题。如果源镜像曾被压缩过，请检查它是否已损坏。',
+				'出了点问题。如果源镜像曾被压缩过，请检查它是否已损坏。\n{{error}}',
 			validation:
 				'写入已成功完成，但 Etcher 在从磁盘读取镜像时检测到潜在的损坏问题。 \n\n请考虑将镜像写入其他磁盘。',
 			openError: '打开 {{source}} 时出错。\n\n错误信息： {{error}}',
-			flashError: '烧录 {{image}} 到 {{target}} 失败。',
+			flashError: '烧录 {{image}} 到 {{targets}} 失败。',
 			unplug:
 				'看起来 Etcher 失去了对磁盘的连接。 它是不是被意外拔掉了？\n\n有时这个错误是因为读卡器出了故障。',
 			cannotWrite:
diff --git a/lib/gui/app/i18n/zh-TW.ts b/lib/gui/app/i18n/zh-TW.ts
index 87592aca9a..3ad8be83bb 100644
--- a/lib/gui/app/i18n/zh-TW.ts
+++ b/lib/gui/app/i18n/zh-TW.ts
@@ -33,13 +33,14 @@ const translation = {
 			flashFail_one: '燒錄失敗',
 			flashFail_other: '燒錄失敗',
 			to: '到 ',
-			succeedTarget_one: '到 {{num}} 個目標',
-			succeedTarget_other: '到 {{num}} 個目標',
+			toDrive: '到 {{description}} ({{name}})',
+			toTarget_one: '到 {{num}} 個目標',
+			toTarget_other: '到 {{num}} 個目標',
 			andFailTarget_one: '並燒錄失敗了 {{num}} 個目標',
 			andFailTarget_other: '並燒錄失敗了 {{num}} 個目標',
 			target_one: ' 個目標',
 			target_other: ' 個目標',
-			succeedTo: '被成功燒錄',
+			succeedTo: '{{name}} 被成功燒錄到 {{target}}',
 			exitWhileFlashing:
 				'您當前正在刷機。 關閉 Etcher 可能會導致您的磁盤無法使用。',
 			looksLikeWindowsImage:
@@ -53,11 +54,11 @@ const translation = {
 			sourceDrive: '源鏡像位於這個分區中',
 			noSpace: '磁盤空間不足。 請插入另一個較大的磁盤並重試。',
 			genericFlashError:
-				'出了點問題。如果源鏡像曾被壓縮過，請檢查它是否已損壞。',
+				'出了點問題。如果源鏡像曾被壓縮過，請檢查它是否已損壞。\n{{error}}',
 			validation:
 				'寫入已成功完成，但 Etcher 在從磁盤讀取鏡像時檢測到潛在的損壞問題。 \n\n請考慮將鏡像寫入其他磁盤。',
 			openError: '打開 {{source}} 時出錯。\n\n錯誤信息： {{error}}',
-			flashError: '燒錄 {{image}} 到 {{target}} 失敗。',
+			flashError: '燒錄 {{image}} 到 {{targets}} 失敗。',
 			unplug:
 				'看起來 Etcher 失去了對磁盤的連接。 它是不是被意外拔掉了？\n\n有時這個錯誤是因爲讀卡器出了故障。',
 			cannotWrite:
diff --git a/lib/shared/messages.ts b/lib/shared/messages.ts
index cf60aac7a2..8f9e4a4114 100644
--- a/lib/shared/messages.ts
+++ b/lib/shared/messages.ts
@@ -39,12 +39,15 @@ export const info = {
 		const targets = [];
 		if (failed + successful === 1) {
 			targets.push(
-				i18next.t('message.to') + `${drive.description} (${drive.displayName})`,
+				i18next.t('message.toDrive', {
+					description: drive.description,
+					name: drive.displayName,
+				}),
 			);
 		} else {
 			if (successful) {
 				targets.push(
-					i18next.t('message.succeedTarget', {
+					i18next.t('message.toTarget', {
 						count: successful,
 						num: successful,
 					}),
@@ -56,11 +59,10 @@ export const info = {
 				);
 			}
 		}
-		return (
-			`${imageBasename} ` +
-			i18next.t('message.succeedTo') +
-			` ${targets.join(' ')}`
-		);
+		return i18next.t('message.succeedTo', {
+			name: imageBasename,
+			target: targets.join(' '),
+		});
 	},
 };
 
@@ -135,7 +137,7 @@ export const error = {
 	},
 
 	genericFlashError: (err: Error) => {
-		return i18next.t('message.genericFlashError') + `\n${err.message}`;
+		return i18next.t('message.genericFlashError', { error: err.message });
 	},
 
 	validation: () => {
@@ -155,10 +157,18 @@ export const error = {
 	) => {
 		const target =
 			drives.length === 1
-				? `${drives[0].description} (${drives[0].displayName})`
-				: `${drives.length}` +
-				  i18next.t('message.target', { count: drives.length });
-		return i18next.t('message.flashError', { image: imageBasename, target });
+				? i18next.t('message.toDrive', {
+						description: drives[0].description,
+						name: drives[0].displayName,
+				  })
+				: i18next.t('message.toTarget', {
+						count: drives.length,
+						num: drives.length,
+				  });
+		return i18next.t('message.flashError', {
+			image: imageBasename,
+			targets: target,
+		});
 	},
 
 	driveUnplugged: () => {

From 0f10f2d4831e37c10f0297d86c20f290ad7f7a39 Mon Sep 17 00:00:00 2001
From: r-q <scrisqiu@hotmail.com>
Date: Fri, 22 Jul 2022 21:35:25 +0800
Subject: [PATCH 05/10] fix: suit i18n with mocha and optimize translation

- use `import * as i18next from 'i18next';` instead of `import i18next from 'i18next';` and add an specific env to bypass mocha test
- optimized several translations
---
 lib/gui/app/app.ts                                  |  2 +-
 .../components/drive-selector/drive-selector.tsx    |  2 +-
 .../drive-status-warning-modal.tsx                  |  2 +-
 .../app/components/flash-another/flash-another.tsx  |  2 +-
 .../app/components/flash-results/flash-results.tsx  |  2 +-
 .../components/progress-button/progress-button.tsx  |  2 +-
 lib/gui/app/components/settings/settings.tsx        |  2 +-
 .../components/source-selector/source-selector.tsx  |  2 +-
 .../target-selector/target-selector-button.tsx      |  2 +-
 .../components/target-selector/target-selector.tsx  |  2 +-
 lib/gui/app/i18n.ts                                 |  7 ++++++-
 lib/gui/app/i18n/en.ts                              | 12 +++++-------
 lib/gui/app/i18n/zh-CN.ts                           | 11 +++++------
 lib/gui/app/i18n/zh-TW.ts                           | 11 +++++------
 lib/gui/app/modules/progress-status.ts              |  2 +-
 lib/gui/app/os/dialog.ts                            |  2 +-
 lib/gui/app/pages/main/Flash.tsx                    | 13 +++++++++++--
 lib/gui/menu.ts                                     |  2 +-
 lib/shared/messages.ts                              |  2 +-
 19 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/lib/gui/app/app.ts b/lib/gui/app/app.ts
index 5fbf957475..27a397344e 100644
--- a/lib/gui/app/app.ts
+++ b/lib/gui/app/app.ts
@@ -38,7 +38,7 @@ import * as osDialog from './os/dialog';
 import * as windowProgress from './os/window-progress';
 import MainPage from './pages/main/MainPage';
 import './css/main.css';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 window.addEventListener(
 	'unhandledrejection',
diff --git a/lib/gui/app/components/drive-selector/drive-selector.tsx b/lib/gui/app/components/drive-selector/drive-selector.tsx
index a4d25cfafc..c10413dca4 100644
--- a/lib/gui/app/components/drive-selector/drive-selector.tsx
+++ b/lib/gui/app/components/drive-selector/drive-selector.tsx
@@ -44,7 +44,7 @@ import {
 
 import { SourceMetadata } from '../source-selector/source-selector';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 interface UsbbootDrive extends sourceDestination.UsbbootDrive {
 	progress: number;
diff --git a/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx b/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
index 2f246da554..d5096b40ed 100644
--- a/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
+++ b/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
@@ -7,7 +7,7 @@ import { middleEllipsis } from '../../utils/middle-ellipsis';
 
 import * as prettyBytes from 'pretty-bytes';
 import { DriveWithWarnings } from '../../pages/main/Flash';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 const DriveStatusWarningModal = ({
 	done,
diff --git a/lib/gui/app/components/flash-another/flash-another.tsx b/lib/gui/app/components/flash-another/flash-another.tsx
index a0cfd43ca2..c2246317a7 100644
--- a/lib/gui/app/components/flash-another/flash-another.tsx
+++ b/lib/gui/app/components/flash-another/flash-another.tsx
@@ -17,7 +17,7 @@
 import * as React from 'react';
 
 import { BaseButton } from '../../styled-components';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 export interface FlashAnotherProps {
 	onClick: () => void;
diff --git a/lib/gui/app/components/flash-results/flash-results.tsx b/lib/gui/app/components/flash-results/flash-results.tsx
index 766df43c54..99e66937e5 100644
--- a/lib/gui/app/components/flash-results/flash-results.tsx
+++ b/lib/gui/app/components/flash-results/flash-results.tsx
@@ -31,7 +31,7 @@ import { resetState } from '../../models/flash-state';
 import * as selection from '../../models/selection-state';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
 import { Modal, Table } from '../../styled-components';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 const ErrorsTable = styled((props) => <Table<FlashError> {...props} />)`
 	&&& [data-display='table-head'],
diff --git a/lib/gui/app/components/progress-button/progress-button.tsx b/lib/gui/app/components/progress-button/progress-button.tsx
index c84dfb0dbf..0986bee642 100644
--- a/lib/gui/app/components/progress-button/progress-button.tsx
+++ b/lib/gui/app/components/progress-button/progress-button.tsx
@@ -20,7 +20,7 @@ import { default as styled } from 'styled-components';
 
 import { fromFlashState } from '../../modules/progress-status';
 import { StepButton } from '../../styled-components';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 const FlashProgressBar = styled(ProgressBar)`
 	> div {
diff --git a/lib/gui/app/components/settings/settings.tsx b/lib/gui/app/components/settings/settings.tsx
index 5618b4a2f9..f99adea8fc 100644
--- a/lib/gui/app/components/settings/settings.tsx
+++ b/lib/gui/app/components/settings/settings.tsx
@@ -24,7 +24,7 @@ import * as settings from '../../models/settings';
 import * as analytics from '../../modules/analytics';
 import { open as openExternal } from '../../os/open-external/services/open-external';
 import { Modal } from '../../styled-components';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 interface Setting {
 	name: string;
diff --git a/lib/gui/app/components/source-selector/source-selector.tsx b/lib/gui/app/components/source-selector/source-selector.tsx
index 6834a2de23..46daa0295d 100644
--- a/lib/gui/app/components/source-selector/source-selector.tsx
+++ b/lib/gui/app/components/source-selector/source-selector.tsx
@@ -66,7 +66,7 @@ import { DriveSelector } from '../drive-selector/drive-selector';
 import { DrivelistDrive } from '../../../../shared/drive-constraints';
 import axios, { AxiosRequestConfig } from 'axios';
 import { isJson } from '../../../../shared/utils';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 const recentUrlImagesKey = 'recentUrlImages';
 
diff --git a/lib/gui/app/components/target-selector/target-selector-button.tsx b/lib/gui/app/components/target-selector/target-selector-button.tsx
index f8c56b2d0c..28f1409921 100644
--- a/lib/gui/app/components/target-selector/target-selector-button.tsx
+++ b/lib/gui/app/components/target-selector/target-selector-button.tsx
@@ -32,7 +32,7 @@ import {
 	StepNameButton,
 } from '../../styled-components';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 interface TargetSelectorProps {
 	targets: any[];
diff --git a/lib/gui/app/components/target-selector/target-selector.tsx b/lib/gui/app/components/target-selector/target-selector.tsx
index 767cebc1fa..965db59f68 100644
--- a/lib/gui/app/components/target-selector/target-selector.tsx
+++ b/lib/gui/app/components/target-selector/target-selector.tsx
@@ -37,7 +37,7 @@ import TgtSvg from '../../../assets/tgt.svg';
 import DriveSvg from '../../../assets/drive.svg';
 import { warning } from '../../../../shared/messages';
 import { DrivelistDrive } from '../../../../shared/drive-constraints';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 export const getDriveListLabel = () => {
 	return getSelectedDrives()
diff --git a/lib/gui/app/i18n.ts b/lib/gui/app/i18n.ts
index c7c7e83a16..78ec6225ee 100644
--- a/lib/gui/app/i18n.ts
+++ b/lib/gui/app/i18n.ts
@@ -1,10 +1,15 @@
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import zh_CN_translation from './i18n/zh-CN';
 import zh_TW_translation from './i18n/zh-TW';
 import en_translation from './i18n/en';
 
 export function langParser() {
+	if (process.env.LANG !== undefined) {
+		// Bypass mocha, where lang-detect don't works
+		return 'en';
+	}
+
 	const lang = Intl.DateTimeFormat().resolvedOptions().locale;
 
 	switch (lang.substr(0, 2)) {
diff --git a/lib/gui/app/i18n/en.ts b/lib/gui/app/i18n/en.ts
index aaeb26315c..d6e37eee99 100644
--- a/lib/gui/app/i18n/en.ts
+++ b/lib/gui/app/i18n/en.ts
@@ -17,7 +17,7 @@ const translation = {
 			decompressing: 'Decompressing...',
 			flashing: 'Flashing...',
 			finishing: 'Finishing...',
-			verifying: 'Verifying...',
+			verifying: 'Validating...',
 			failing: 'Failed',
 		},
 		message: {
@@ -32,15 +32,12 @@ const translation = {
 			flashSucceed_other: 'Successful targets',
 			flashFail_one: 'Failed target',
 			flashFail_other: 'Failed targets',
-			to: 'to ',
 			toDrive: 'to {{description}} ({{name}})',
 			toTarget_one: 'to {{num}} target',
 			toTarget_other: 'to {{num}} targets',
 			andFailTarget_one: 'and failed to be flashed to {{num}} target',
 			andFailTarget_other: 'and failed to be flashed to {{num}} targets',
-			target_one: ' target',
-			target_other: ' targets',
-			succeedTo: '{{name}} was successfully flashed to {{target}}',
+			succeedTo: '{{name}} was successfully flashed {{target}}',
 			exitWhileFlashing:
 				'You are currently flashing a drive. Closing Etcher may leave your drive in an unusable state.',
 			looksLikeWindowsImage:
@@ -62,8 +59,7 @@ const translation = {
 				'The write has been completed successfully but Etcher detected potential corruption issues when reading the image back from the drive. \n\nPlease consider writing the image to a different drive.',
 			openError:
 				'Something went wrong while opening {{source}}.\n\nError: {{error}}',
-			flashError:
-				'Something went wrong while writing {{image}} to {{targets}}.',
+			flashError: 'Something went wrong while writing {{image}} {{targets}}.',
 			unplug:
 				"Looks like Etcher lost access to the drive. Did it get unplugged accidentally?\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
 			cannotWrite:
@@ -129,6 +125,8 @@ const translation = {
 			speedTip:
 				'The speed is calculated by dividing the image size by the flashing time.\nDisk images with ext partitions flash faster as we are able to skip unused parts.',
 			speed: 'Effective speed: {{speed}} MB/s',
+			speedShort: '{{speed}} MB/s',
+			eta: 'ETA: {{eta}}',
 			failedTarget: 'Failed targets',
 			failedRetry: 'Retry failed targets',
 			flashFailed: 'Flash Failed.',
diff --git a/lib/gui/app/i18n/zh-CN.ts b/lib/gui/app/i18n/zh-CN.ts
index 7a37035998..f458653a93 100644
--- a/lib/gui/app/i18n/zh-CN.ts
+++ b/lib/gui/app/i18n/zh-CN.ts
@@ -32,15 +32,12 @@ const translation = {
 			flashSucceed_other: '烧录成功',
 			flashFail_one: '烧录失败',
 			flashFail_other: '烧录失败',
-			to: '到 ',
 			toDrive: '到 {{description}} ({{name}})',
 			toTarget_one: '到 {{num}} 个目标',
 			toTarget_other: '到 {{num}} 个目标',
 			andFailTarget_one: '并烧录失败了 {{num}} 个目标',
 			andFailTarget_other: '并烧录失败了 {{num}} 个目标',
-			target_one: ' 个目标',
-			target_other: ' 个目标',
-			succeedTo: '{{name}} 被成功烧录到 {{target}}',
+			succeedTo: '{{name}} 被成功烧录 {{target}}',
 			exitWhileFlashing:
 				'您当前正在刷机。 关闭 Etcher 可能会导致您的磁盘无法使用。',
 			looksLikeWindowsImage:
@@ -58,7 +55,7 @@ const translation = {
 			validation:
 				'写入已成功完成，但 Etcher 在从磁盘读取镜像时检测到潜在的损坏问题。 \n\n请考虑将镜像写入其他磁盘。',
 			openError: '打开 {{source}} 时出错。\n\n错误信息： {{error}}',
-			flashError: '烧录 {{image}} 到 {{targets}} 失败。',
+			flashError: '烧录 {{image}} {{targets}} 失败。',
 			unplug:
 				'看起来 Etcher 失去了对磁盘的连接。 它是不是被意外拔掉了？\n\n有时这个错误是因为读卡器出了故障。',
 			cannotWrite:
@@ -134,8 +131,10 @@ const translation = {
 			skip: '跳过了验证',
 			moreInfo: '更多信息',
 			speedTip:
-				'通过将图像大小除以烧录时间来计算速度。\n由于我们能够跳过未使用的部分，因此具有EXT分区的磁盘镜像烧录速度更快。',
+				'通过将镜像大小除以烧录时间来计算速度。\n由于我们能够跳过未使用的部分，因此具有EXT分区的磁盘镜像烧录速度更快。',
 			speed: '速度：{{speed}} MB/秒',
+			speedShort: '{{speed}} MB/秒',
+			eta: '预计还需要：{{eta}}',
 			failedTarget: '失败的烧录目标',
 			failedRetry: '重试烧录失败目标',
 			flashFailed: '烧录失败。',
diff --git a/lib/gui/app/i18n/zh-TW.ts b/lib/gui/app/i18n/zh-TW.ts
index 3ad8be83bb..f9957e2054 100644
--- a/lib/gui/app/i18n/zh-TW.ts
+++ b/lib/gui/app/i18n/zh-TW.ts
@@ -32,15 +32,12 @@ const translation = {
 			flashSucceed_other: '燒錄成功',
 			flashFail_one: '燒錄失敗',
 			flashFail_other: '燒錄失敗',
-			to: '到 ',
 			toDrive: '到 {{description}} ({{name}})',
 			toTarget_one: '到 {{num}} 個目標',
 			toTarget_other: '到 {{num}} 個目標',
 			andFailTarget_one: '並燒錄失敗了 {{num}} 個目標',
 			andFailTarget_other: '並燒錄失敗了 {{num}} 個目標',
-			target_one: ' 個目標',
-			target_other: ' 個目標',
-			succeedTo: '{{name}} 被成功燒錄到 {{target}}',
+			succeedTo: '{{name}} 被成功燒錄 {{target}}',
 			exitWhileFlashing:
 				'您當前正在刷機。 關閉 Etcher 可能會導致您的磁盤無法使用。',
 			looksLikeWindowsImage:
@@ -58,7 +55,7 @@ const translation = {
 			validation:
 				'寫入已成功完成，但 Etcher 在從磁盤讀取鏡像時檢測到潛在的損壞問題。 \n\n請考慮將鏡像寫入其他磁盤。',
 			openError: '打開 {{source}} 時出錯。\n\n錯誤信息： {{error}}',
-			flashError: '燒錄 {{image}} 到 {{targets}} 失敗。',
+			flashError: '燒錄 {{image}} {{targets}} 失敗。',
 			unplug:
 				'看起來 Etcher 失去了對磁盤的連接。 它是不是被意外拔掉了？\n\n有時這個錯誤是因爲讀卡器出了故障。',
 			cannotWrite:
@@ -134,8 +131,10 @@ const translation = {
 			skip: '跳過了驗證',
 			moreInfo: '更多信息',
 			speedTip:
-				'通過將圖像大小除以燒錄時間來計算速度。\n由於我們能夠跳過未使用的部分，因此具有EXT分區的磁盤鏡像燒錄速度更快。',
+				'通過將鏡像大小除以燒錄時間來計算速度。\n由於我們能夠跳過未使用的部分，因此具有EXT分區的磁盤鏡像燒錄速度更快。',
 			speed: '速度：{{speed}} MB/秒',
+			speedShort: '{{speed}} MB/秒',
+			eta: '預計還需要：{{eta}}',
 			failedTarget: '失敗的燒錄目標',
 			failedRetry: '重試燒錄失敗目標',
 			flashFailed: '燒錄失敗。',
diff --git a/lib/gui/app/modules/progress-status.ts b/lib/gui/app/modules/progress-status.ts
index 1a05e8e771..32d492d994 100644
--- a/lib/gui/app/modules/progress-status.ts
+++ b/lib/gui/app/modules/progress-status.ts
@@ -15,7 +15,7 @@
  */
 
 import * as prettyBytes from 'pretty-bytes';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 export interface FlashState {
 	active: number;
diff --git a/lib/gui/app/os/dialog.ts b/lib/gui/app/os/dialog.ts
index a55113ea74..0fbe4883b3 100644
--- a/lib/gui/app/os/dialog.ts
+++ b/lib/gui/app/os/dialog.ts
@@ -20,7 +20,7 @@ import * as _ from 'lodash';
 import * as errors from '../../../shared/errors';
 import * as settings from '../../../gui/app/models/settings';
 import { SUPPORTED_EXTENSIONS } from '../../../shared/supported-formats';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 async function mountSourceDrive() {
 	// sourceDrivePath is the name of the link in /dev/disk/by-path
diff --git a/lib/gui/app/pages/main/Flash.tsx b/lib/gui/app/pages/main/Flash.tsx
index 4fc526cabb..53d20c897d 100644
--- a/lib/gui/app/pages/main/Flash.tsx
+++ b/lib/gui/app/pages/main/Flash.tsx
@@ -37,6 +37,7 @@ import {
 
 import FlashSvg from '../../../assets/flash.svg';
 import DriveStatusWarningModal from '../../components/drive-status-warning-modal/drive-status-warning-modal';
+import * as i18next from 'i18next';
 
 const COMPLETED_PERCENTAGE = 100;
 const SPEED_PRECISION = 2;
@@ -293,9 +294,17 @@ export class FlashStep extends React.PureComponent<
 								color="#7e8085"
 								width="100%"
 							>
-								<Txt>{this.props.speed.toFixed(SPEED_PRECISION)} MB/s</Txt>
+								<Txt>
+									{i18next.t('flash.speedShort', {
+										speed: this.props.speed.toFixed(SPEED_PRECISION),
+									})}
+								</Txt>
 								{!_.isNil(this.props.eta) && (
-									<Txt>ETA: {formatSeconds(this.props.eta)}</Txt>
+									<Txt>
+										{i18next.t('flash.eta', {
+											eta: formatSeconds(this.props.eta),
+										})}
+									</Txt>
 								)}
 							</Flex>
 						)}
diff --git a/lib/gui/menu.ts b/lib/gui/menu.ts
index 8580b2c2d1..e6e30e68d0 100644
--- a/lib/gui/menu.ts
+++ b/lib/gui/menu.ts
@@ -17,7 +17,7 @@
 import * as electron from 'electron';
 import { displayName } from '../../package.json';
 
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 /**
  * @summary Builds a native application menu for a given window
diff --git a/lib/shared/messages.ts b/lib/shared/messages.ts
index 8f9e4a4114..090b8836f1 100644
--- a/lib/shared/messages.ts
+++ b/lib/shared/messages.ts
@@ -18,7 +18,7 @@ import { Dictionary } from 'lodash';
 import { outdent } from 'outdent';
 import * as prettyBytes from 'pretty-bytes';
 import '../gui/app/i18n';
-import i18next from 'i18next';
+import * as i18next from 'i18next';
 
 export const progress: Dictionary<(quantity: number) => string> = {
 	successful: (quantity: number) => {

From 78b0f00e8867de9e2eeed130024d375f69a1f271 Mon Sep 17 00:00:00 2001
From: r-q <scrisqiu@hotmail.com>
Date: Fri, 22 Jul 2022 22:40:24 +0800
Subject: [PATCH 06/10] chore: bind some translations

according to a suggestion of @lurch
---
 lib/gui/app/i18n/en.ts    | 6 +++---
 lib/gui/app/i18n/zh-CN.ts | 6 +++---
 lib/gui/app/i18n/zh-TW.ts | 6 +++---
 lib/shared/messages.ts    | 8 ++++++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/gui/app/i18n/en.ts b/lib/gui/app/i18n/en.ts
index d6e37eee99..582b6f4bbe 100644
--- a/lib/gui/app/i18n/en.ts
+++ b/lib/gui/app/i18n/en.ts
@@ -42,10 +42,10 @@ const translation = {
 				'You are currently flashing a drive. Closing Etcher may leave your drive in an unusable state.',
 			looksLikeWindowsImage:
 				'It looks like you are trying to burn a Windows image.\n\nUnlike other images, Windows images require special processing to be made bootable. We suggest you use a tool specially designed for this purpose, such as <a href="https://rufus.akeo.ie">Rufus</a> (Windows), <a href="https://github.com/slacka/WoeUSB">WoeUSB</a> (Linux), or Boot Camp Assistant (macOS).',
+			image: 'image',
+			drive: 'drive',
 			missingPartitionTable:
-				'It looks like this is not a bootable image.\n\nThe image does not appear to contain a partition table, and might not be recognized or bootable by your device.',
-			driveMissingPartitionTable:
-				'It looks like this is not a bootable drive.\nThe drive does not appear to contain a partition table,\nand might not be recognized or bootable by your device.',
+				'It looks like this is not a bootable {{type}}.\n\nThe {{type}} does not appear to contain a partition table, and might not be recognized or bootable by your device.',
 			largeDriveSize:
 				"This is a large drive! Make sure it doesn't contain files that you want to keep.",
 			systemDrive:
diff --git a/lib/gui/app/i18n/zh-CN.ts b/lib/gui/app/i18n/zh-CN.ts
index f458653a93..621be1fe39 100644
--- a/lib/gui/app/i18n/zh-CN.ts
+++ b/lib/gui/app/i18n/zh-CN.ts
@@ -42,10 +42,10 @@ const translation = {
 				'您当前正在刷机。 关闭 Etcher 可能会导致您的磁盘无法使用。',
 			looksLikeWindowsImage:
 				'看起来您正在尝试刻录 Windows 镜像。\n\n与其他镜像不同，Windows 镜像需要特殊处理才能使其可启动。 我们建议您使用专门为此目的设计的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
+			image: '镜像',
+			drive: '磁盘',
 			missingPartitionTable:
-				'看起来这不是一个可启动的镜像。\n\n这个镜像似乎不包含分区表，因此您的设备可能无法识别或无法正确启动。',
-			driveMissingPartitionTable:
-				'看起来这不是可引导磁盘。\n这个磁盘似乎不包含分区表，\n因此您的设备可能无法识别或无法正确启动。',
+				'看起来这不是一个可启动的{{type}}。\n\n这个{{type}}似乎不包含分区表，因此您的设备可能无法识别或无法正确启动。',
 			largeDriveSize: '这是个很大的磁盘！请检查并确认它不包含对您很重要的信息',
 			systemDrive: '选择系统盘很危险，因为这将会删除你的系统',
 			sourceDrive: '源镜像位于这个分区中',
diff --git a/lib/gui/app/i18n/zh-TW.ts b/lib/gui/app/i18n/zh-TW.ts
index f9957e2054..9ddfe0e5dd 100644
--- a/lib/gui/app/i18n/zh-TW.ts
+++ b/lib/gui/app/i18n/zh-TW.ts
@@ -42,10 +42,10 @@ const translation = {
 				'您當前正在刷機。 關閉 Etcher 可能會導致您的磁盤無法使用。',
 			looksLikeWindowsImage:
 				'看起來您正在嘗試刻錄 Windows 鏡像。\n\n與其他鏡像不同，Windows 鏡像需要特殊處理才能使其可啓動。 我們建議您使用專門爲此目的設計的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
+			image: '鏡像',
+			drive: '磁盤',
 			missingPartitionTable:
-				'看起來這不是一個可啓動的鏡像。\n\n這個鏡像似乎不包含分區表，因此您的設備可能無法識別或無法正確啓動。',
-			driveMissingPartitionTable:
-				'看起來這不是可引導磁盤。\n這個磁盤似乎不包含分區表，\n因此您的設備可能無法識別或無法正確啓動。',
+				'看起來這不是一個可啓動的{{type}}。\n\n這個{{type}}似乎不包含分區表，因此您的設備可能無法識別或無法正確啓動。',
 			largeDriveSize: '這是個很大的磁盤！請檢查並確認它不包含對您很重要的信息',
 			systemDrive: '選擇系統盤很危險，因爲這將會刪除你的系統',
 			sourceDrive: '源鏡像位於這個分區中',
diff --git a/lib/shared/messages.ts b/lib/shared/messages.ts
index 090b8836f1..e9bf96096e 100644
--- a/lib/shared/messages.ts
+++ b/lib/shared/messages.ts
@@ -111,11 +111,15 @@ export const warning = {
 	},
 
 	missingPartitionTable: () => {
-		return i18next.t('message.missingPartitionTable');
+		return i18next.t('message.missingPartitionTable', {
+			type: i18next.t('message.image'),
+		});
 	},
 
 	driveMissingPartitionTable: () => {
-		return i18next.t('message.driveMissingPartitionTable');
+		return i18next.t('message.missingPartitionTable', {
+			type: i18next.t('message.drive'),
+		});
 	},
 
 	largeDriveSize: () => {

From 8fc574f0596f256382523c3b269e647a9aed5747 Mon Sep 17 00:00:00 2001
From: ab77 <anton@balena.io>
Date: Mon, 12 Dec 2022 08:38:46 -0800
Subject: [PATCH 07/10] i18n support and Chinese translation

Change-type: minor
---
 package-lock.json | 122 ++++++++++++++++------------------------------
 package.json      |   1 -
 2 files changed, 41 insertions(+), 82 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e4afa88f84..99e101b676 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2353,6 +2353,7 @@
       "version": "7.16.3",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
       "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
+      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -4494,7 +4495,7 @@
     "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
       "dev": true
     },
     "asar": {
@@ -4657,7 +4658,7 @@
     "babel-plugin-syntax-jsx": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
       "dev": true
     },
     "bail": {
@@ -5400,7 +5401,7 @@
     "change-emitter": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz",
-      "integrity": "sha512-YXzt1cQ4a2jqazhcuSWEOc1K2q8g9H6eWNsyZgi640LDzRWVQ2eDe+Y/kVdftH+vYdPF2rgDb3dLdpxE1jvAxw==",
+      "integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=",
       "dev": true
     },
     "character-entities": {
@@ -5436,7 +5437,7 @@
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
       "dev": true
     },
     "chokidar": {
@@ -5599,7 +5600,7 @@
     "codemirror-spell-checker": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz",
-      "integrity": "sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ==",
+      "integrity": "sha1-HGYPkIlIPMtRE7m6nKGcP0mTNx4=",
       "dev": true,
       "requires": {
         "typo-js": "*"
@@ -6082,7 +6083,7 @@
     "css-color-keywords": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
+      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=",
       "dev": true
     },
     "css-loader": {
@@ -6701,7 +6702,7 @@
     "dedent": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
       "dev": true
     },
     "deep-eql": {
@@ -9106,7 +9107,7 @@
         "core-js": {
           "version": "1.2.7",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
           "dev": true
         },
         "promise": {
@@ -9421,7 +9422,7 @@
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
       "dev": true
     },
     "get-intrinsic": {
@@ -9887,14 +9888,6 @@
       "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==",
       "dev": true
     },
-    "html-parse-stringify": {
-      "version": "3.0.1",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
-      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
-      "requires": {
-        "void-elements": "3.1.0"
-      }
-    },
     "html-void-elements": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
@@ -10115,24 +10108,6 @@
         }
       }
     },
-    "i18next": {
-      "version": "21.8.14",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/i18next/-/i18next-21.8.14.tgz",
-      "integrity": "sha512-4Yi+DtexvMm/Yw3Q9fllzY12SgLk+Mcmar+rCAccsOPul/2UmnBzoHbTGn/L48IPkFcmrNaH7xTLboBWIbH6pw==",
-      "requires": {
-        "@babel/runtime": "^7.17.2"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.18.6",
-          "resolved": "https://mirrors.huaweicloud.com/repository/npm/@babel/runtime/-/runtime-7.18.6.tgz",
-          "integrity": "sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==",
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        }
-      }
-    },
     "iconv-corefoundation": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
@@ -10140,7 +10115,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "cli-truncate": "^2.1.0"
+        "cli-truncate": "^2.1.0",
+        "node-addon-api": "^1.6.3"
       }
     },
     "iconv-lite": {
@@ -10640,7 +10616,7 @@
     "is-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
       "dev": true
     },
     "is-shared-array-buffer": {
@@ -10748,7 +10724,7 @@
     "isomorphic-fetch": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
       "dev": true,
       "requires": {
         "node-fetch": "^1.0.1",
@@ -10945,7 +10921,7 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
     "json-stringify-safe": {
@@ -11256,7 +11232,7 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
       "dev": true
     },
     "lodash.isequal": {
@@ -11680,7 +11656,7 @@
     "mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
       "dev": true
     },
     "media-typer": {
@@ -12726,6 +12702,13 @@
         }
       }
     },
+    "node-addon-api": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
+      "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+      "dev": true,
+      "optional": true
+    },
     "node-api-version": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz",
@@ -12759,7 +12742,7 @@
         "is-stream": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
           "dev": true
         }
       }
@@ -13493,7 +13476,7 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true
         }
       }
@@ -13519,7 +13502,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
     "picocolors": {
@@ -13837,7 +13820,7 @@
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
       "dev": true
     },
     "pseudomap": {
@@ -13992,16 +13975,6 @@
             "buffer": "^5.2.1",
             "through": "^2.3.8"
           }
-        },
-        "unbzip2-stream": {
-          "version": "1.4.3",
-          "resolved": "https://mirrors.huaweicloud.com/repository/npm/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-          "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-          "dev": true,
-          "requires": {
-            "buffer": "^5.2.1",
-            "through": "^2.3.8"
-          }
         }
       }
     },
@@ -14228,15 +14201,6 @@
         "react-side-effect": "^2.1.0"
       }
     },
-    "react-i18next": {
-      "version": "11.18.1",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/react-i18next/-/react-i18next-11.18.1.tgz",
-      "integrity": "sha512-S8cl4mvIOSA7OQCE5jNy2yhv705Vwi+7PinpqKIYcBmX/trJtHKqrf6CL67WJSA8crr2JU+oxE9jn9DQIrQezg==",
-      "requires": {
-        "@babel/runtime": "^7.14.5",
-        "html-parse-stringify": "^3.0.1"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -14430,7 +14394,8 @@
     "regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
     },
     "regenerator-transform": {
       "version": "0.14.5",
@@ -14694,7 +14659,7 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
     "require-directory": {
@@ -15239,7 +15204,7 @@
     "setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
       "dev": true
     },
     "setprototypeof": {
@@ -15474,7 +15439,7 @@
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
       "dev": true,
       "requires": {
         "is-arrayish": "^0.3.1"
@@ -15977,7 +15942,7 @@
         "is-obj": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-          "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
           "dev": true
         }
       }
@@ -16339,7 +16304,7 @@
     "toggle-selection": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
-      "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==",
+      "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI=",
       "dev": true
     },
     "toidentifier": {
@@ -16363,7 +16328,7 @@
     "trim": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
       "dev": true
     },
     "trim-trailing-lines": {
@@ -17052,19 +17017,19 @@
     "validate.io-array": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz",
-      "integrity": "sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==",
+      "integrity": "sha1-W1osr9j4uFq7L4hroVPy2Tond00=",
       "dev": true
     },
     "validate.io-function": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz",
-      "integrity": "sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==",
+      "integrity": "sha1-NDoZgC7TsZaCaceA5VjpNBHAutc=",
       "dev": true
     },
     "validate.io-integer": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz",
-      "integrity": "sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==",
+      "integrity": "sha1-FoSWSAuVviJH7EQ/IjPeT4mHgGg=",
       "dev": true,
       "requires": {
         "validate.io-number": "^1.0.3"
@@ -17073,7 +17038,7 @@
     "validate.io-integer-array": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz",
-      "integrity": "sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==",
+      "integrity": "sha1-LKveAzKTpry+Bj/q/pHq9GsToIk=",
       "dev": true,
       "requires": {
         "validate.io-array": "^1.0.3",
@@ -17083,7 +17048,7 @@
     "validate.io-number": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz",
-      "integrity": "sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==",
+      "integrity": "sha1-9j/+2iSL8opnqNSODjtGGhZluvg=",
       "dev": true
     },
     "vary": {
@@ -17141,11 +17106,6 @@
         "unist-util-stringify-position": "^2.0.0"
       }
     },
-    "void-elements": {
-      "version": "3.1.0",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/void-elements/-/void-elements-3.1.0.tgz",
-      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
-    },
     "watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
diff --git a/package.json b/package.json
index 8ee4199087..9765928855 100644
--- a/package.json
+++ b/package.json
@@ -127,4 +127,3 @@
     "publishedAt": "2022-12-13T02:27:42.254Z"
   }
 }
-

From 38ad9c97c602389097576936c39852d85dbe81ed Mon Sep 17 00:00:00 2001
From: mcraa <6892971+mcraa@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:03:30 +0100
Subject: [PATCH 08/10] added i18next to devDependencies

---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index 9765928855..c9181dbf74 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
     "etcher-sdk": "7.4.0",
     "file-loader": "6.2.0",
     "husky": "4.3.8",
+    "i18next": "21.8.14",
     "immutable": "3.8.2",
     "lint-staged": "10.5.4",
     "lodash": "4.17.21",
@@ -98,6 +99,7 @@
     "pretty-bytes": "5.6.0",
     "react": "16.8.5",
     "react-dom": "16.8.5",
+    "react-i18next": "11.18.1",
     "redux": "4.2.0",
     "rendition": "19.3.2",
     "resin-corvus": "2.0.5",

From baf59c73ac8606461ae0ada6d7216a9dd450ceb7 Mon Sep 17 00:00:00 2001
From: Peter Makra <6892971+mcraa@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:24:40 +0100
Subject: [PATCH 09/10] populated lockfile

---
 package-lock.json | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 99e101b676..279421beb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9888,6 +9888,15 @@
       "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==",
       "dev": true
     },
+    "html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "dev": true,
+      "requires": {
+        "void-elements": "3.1.0"
+      }
+    },
     "html-void-elements": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
@@ -10108,6 +10117,32 @@
         }
       }
     },
+    "i18next": {
+      "version": "21.8.14",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.14.tgz",
+      "integrity": "sha512-4Yi+DtexvMm/Yw3Q9fllzY12SgLk+Mcmar+rCAccsOPul/2UmnBzoHbTGn/L48IPkFcmrNaH7xTLboBWIbH6pw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.17.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.20.6",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz",
+          "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.11"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.11",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+          "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+          "dev": true
+        }
+      }
+    },
     "iconv-corefoundation": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
@@ -14201,6 +14236,16 @@
         "react-side-effect": "^2.1.0"
       }
     },
+    "react-i18next": {
+      "version": "11.18.1",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.1.tgz",
+      "integrity": "sha512-S8cl4mvIOSA7OQCE5jNy2yhv705Vwi+7PinpqKIYcBmX/trJtHKqrf6CL67WJSA8crr2JU+oxE9jn9DQIrQezg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.14.5",
+        "html-parse-stringify": "^3.0.1"
+      }
+    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -17106,6 +17151,12 @@
         "unist-util-stringify-position": "^2.0.0"
       }
     },
+    "void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "dev": true
+    },
     "watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",

From 7e805662d14ca1304b41ea0caaf3137aa3bf02f8 Mon Sep 17 00:00:00 2001
From: Peter Makra <6892971+mcraa@users.noreply.github.com>
Date: Wed, 14 Dec 2022 15:48:48 +0100
Subject: [PATCH 10/10] check if modal children is aray

---
 lib/gui/app/styled-components.tsx | 2 +-
 lib/gui/etcher.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gui/app/styled-components.tsx b/lib/gui/app/styled-components.tsx
index 3bd78c1a07..22dd02d2cf 100644
--- a/lib/gui/app/styled-components.tsx
+++ b/lib/gui/app/styled-components.tsx
@@ -142,7 +142,7 @@ export const Modal = styled(({ style, children, ...props }) => {
 			{...props}
 		>
 			<ScrollableFlex flexDirection="column" width="100%" height="90%">
-				{...children}
+				{children.length ? children.map((c: any) => <>{c}</>) : children}
 			</ScrollableFlex>
 		</ModalBase>
 	);
diff --git a/lib/gui/etcher.ts b/lib/gui/etcher.ts
index 38dab53bb3..5154964528 100644
--- a/lib/gui/etcher.ts
+++ b/lib/gui/etcher.ts
@@ -29,7 +29,7 @@ import { delay, getConfig } from '../shared/utils';
 import * as settings from './app/models/settings';
 import { logException } from './app/modules/analytics';
 import { buildWindowMenu } from './menu';
-import i18n from 'i18next';
+import * as i18n from 'i18next';
 
 const customProtocol = 'etcher';
 const scheme = `${customProtocol}://`;