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

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
-					{allFailed ? i18next.t('failed') : i18next.t('completed')}!
+						? 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>

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:

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 报告运行错误和使用统计',

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 報告運行錯誤和使用統計',

lib/shared/messages.ts

@@ -44,16 +44,15 @@ export const info = {
 		} else {
 			if (successful) {
 				targets.push(
-					i18next.t('message.to') +
+					i18next.t('message.succeedTarget', {
-						successful +
+						count: successful,
-						i18next.t('message.target', { count: successful }),
+						num: successful,
+					}),
 				);
 			}
 			if (failed) {
 				targets.push(
-					i18next.t('message.andFail') +
+					i18next.t('message.andFailTarget', { count: failed, num: failed }),
-						failed +
-						i18next.t('message.target', { count: failed }),
 				);
 			}
 		}