Skip to content

Commit f320492

Browse files
JohnNiangJohnNiang
authored
Refine English translation (#7247)
1 parent d8fd430 commit f320492

File tree

34 files changed

+624
-635
lines changed

34 files changed

+624
-635
lines changed

‎backend/i18n/lang/en.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ ErrPathNotDelete: "The selected directory cannot be deleted"
9191
ErrDomainIsExist: "Domain is already exist"
9292
ErrAliasIsExist: "Alias is already exist"
9393
ErrAppDelete: 'Other Website use this App'
94-
ErrGroupIsUsed: 'The group is in use and cannot be deleted'
95-
ErrBackupMatch: 'the backup file does not match the current partial data of the website: {{ .detail}}'
94+
ErrGroupIsUsed: "The group is in use and can't be deleted"
95+
ErrBackupMatch: "the backup file doesn't match the current partial data of the website: {{ .detail}}"
9696
ErrBackupExist: 'the backup file corresponds to a portion of the original data that does not exist: {{ .detail}}'
9797
ErrPHPResource: 'The local runtime does not support switching!'
9898
ErrPathPermission: 'A folder with non-1000:1000 permissions was detected in the index directory, which may cause an Access denied error when accessing the website. Please click the save button above'
@@ -122,7 +122,7 @@ DNSAccountName: 'DNS account [{{ .name }}] manufacturer [{{.type}}]'
122122
PushDirLog: 'Certificate pushed to directory [{{ .path }}] {{ .status }}'
123123
ErrDeleteCAWithSSL: "There is an issued certificate under the current organization and cannot be deleted"
124124
ErrDeleteWithPanelSSL: "Panel SSL configuration uses this certificate and cannot be deleted"
125-
ErrDefaultCA: "The default organization cannot be deleted"
125+
ErrDefaultCA: "The default Certificate Authority can't be deleted"
126126
ApplyWebSiteSSLLog: "Start updating {{ .name }} website certificate"
127127
ErrUpdateWebsiteSSL: "{{ .name }} website failed to update certificate: {{ .err }}"
128128
ApplyWebSiteSSLSuccess: "Update website certificate successfully"
@@ -143,8 +143,8 @@ ErrLocalExist: "The local database already exists with that name, please modify
143143
ErrTypeOfRedis: "The recovery file type does not match the current persistence mode. Modify the file type and try again"
144144

145145
#container
146-
ErrInUsed: "{{ .detail }} is in use and cannot be deleted"
147-
ErrObjectInUsed: "This object is in use and cannot be deleted"
146+
ErrInUsed: "{{ .detail }} is in use and can't be deleted"
147+
ErrObjectInUsed: "This object is in use and can't be deleted"
148148
ErrPortRules: "The number of ports does not match, please re-enter!"
149149
ErrPgImagePull: "Image pull timeout. Please configure image acceleration or manually pull the postgres:16.0-alpine image and try again"
150150

‎frontend/src/lang/modules/en.ts‎

Lines changed: 562 additions & 579 deletions
Large diffs are not rendered by default.

‎frontend/src/lang/modules/tw.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ const message = {
408408
loadBackup: '導入備份',
409409
remoteAccess: '遠程訪問',
410410
remoteHelper: '多個 ip 以逗號分隔，例：172.16.10.111,172.16.10.112',
411-
remoteConnHelper: 'root 帳號遠程連接 mysql 有安全風險，開啟需謹慎！',
411+
remoteConnHelper: 'root 帳號遠程連接 MySQL 有安全風險，開啟需謹慎！',
412412
changePassword: '改密',
413413
changePasswordHelper: '當前數據庫已經關聯應用，修改密碼將同步修改應用中數據庫密碼，修改後重啟生效。',
414414

@@ -826,6 +826,7 @@ const message = {
826826
enableMsg: '啟用計劃任務會讓該任務定期自動執行。是否繼續？',
827827
taskType: '任務類型',
828828
record: '報告',
829+
viewRecords: '查看報告',
829830
shell: 'Shell 腳本',
830831
log: '備份日誌',
831832
logHelper: '備份系統日誌',
@@ -2262,6 +2263,7 @@ const message = {
22622263
numConnections: '連接',
22632264
startTime: '啟動時間',
22642265
status: '狀態',
2266+
state: '狀態',
22652267
running: '運行中',
22662268
sleep: '睡眠',
22672269
stop: '停止',
@@ -2281,6 +2283,7 @@ const message = {
22812283
laddr: '源地址/端口',
22822284
raddr: '目標地址/端口',
22832285
stopProcess: '結束',
2286+
viewDetails: '查看詳情',
22842287
stopProcessWarn: '是否確定結束此進程 (PID:{0})？',
22852288
processName: '進程名稱',
22862289
},

‎frontend/src/lang/modules/zh.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ const message = {
410410
loadBackup: '导入备份',
411411
remoteAccess: '远程访问',
412412
remoteHelper: '多个 ip 以逗号分隔，例：172.16.10.111,172.16.10.112',
413-
remoteConnHelper: 'root 帐号远程连接 mysql 有安全风险，开启需谨慎！',
413+
remoteConnHelper: 'root 帐号远程连接 MySQL 有安全风险，开启需谨慎！',
414414
changePassword: '改密',
415415
changePasswordHelper: '当前数据库已经关联应用，修改密码将同步修改应用中数据库密码，修改后重启生效。',
416416

@@ -623,8 +623,8 @@ const message = {
623623
ip: 'IP 地址',
624624
cpuShare: 'CPU 权重',
625625
cpuShareHelper: '容器默认份额为 1024 个 CPU，增大可使当前容器获得更多的 CPU 时间',
626-
inputIpv4: '请输入 ipv4 地址',
627-
inputIpv6: '请输入 ipv6 地址',
626+
inputIpv4: '请输入 IPv4 地址',
627+
inputIpv6: '请输入 IPv6 地址',
628628

629629
containerFromAppHelper: '检测到该容器来源于应用商店，应用操作可能会导致当前编辑失效',
630630
containerFromAppHelper1: '在应用商店的已安装页面，点击 [参数] 按钮，进入编辑页面修改容器名称。',
@@ -827,6 +827,7 @@ const message = {
827827
enableMsg: '启用计划任务会让该任务定期自动执行。是否继续？',
828828
taskType: '任务类型',
829829
record: '报告',
830+
viewRecords: '查看报告',
830831
shell: 'Shell 脚本',
831832
log: '备份日志',
832833
logHelper: '备份系统日志',
@@ -2192,7 +2193,7 @@ const message = {
21922193
targetPort: '目标端口',
21932194
forwardHelper1: '如果是本机端口转发，目标IP为：127.0.0.1',
21942195
forwardHelper2: '如果目标IP不填写，则默认为本机端口转发',
2195-
forwardHelper3: '当前仅支持 ipv4 的端口转发',
2196+
forwardHelper3: '当前仅支持 IPv4 的端口转发',
21962197
},
21972198
runtime: {
21982199
runtime: '运行环境',
@@ -2264,6 +2265,7 @@ const message = {
22642265
numConnections: '连接',
22652266
startTime: '启动时间',
22662267
status: '状态',
2268+
state: '状态',
22672269
running: '运行中',
22682270
sleep: '睡眠',
22692271
stop: '停止',
@@ -2283,6 +2285,7 @@ const message = {
22832285
laddr: '源地址/端口',
22842286
raddr: '目标地址/端口',
22852287
stopProcess: '结束',
2288+
viewDetails: '查看详情',
22862289
stopProcessWarn: '是否确定结束此进程 (PID:{0})？',
22872290
processName: '进程名称',
22882291
},

‎frontend/src/views/container/container/operate/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@
131131
</el-select>
132132
</el-form-item>
133133

134-
<el-form-item label="ipv4" prop="ipv4">
134+
<el-form-item label="IPv4" prop="ipv4">
135135
<el-input v-model="dialogData.rowData!.ipv4" :placeholder="$t('container.inputIpv4')" />
136136
</el-form-item>
137-
<el-form-item label="ipv6" prop="ipv6">
137+
<el-form-item label="IPv6" prop="ipv6">
138138
<el-input v-model="dialogData.rowData!.ipv6" :placeholder="$t('container.inputIpv6')" />
139139
</el-form-item>
140140

‎frontend/src/views/container/container/upgrade/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
v-if="form.fromApp"
1818
class="common-prompt"
1919
:closable="false"
20-
type="error"
20+
type="warning"
2121
/>
2222
<el-form @submit.prevent ref="formRef" :model="form" label-position="top">
2323
<el-form-item :label="$t('container.oldImage')" prop="oldImage">

‎frontend/src/views/container/repo/operator/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
:placeholder="'172.16.10.10:8081'"
5555
></el-input>
5656
<span v-if="dialogData.rowData!.downloadUrl" class="input-help">
57-
docker pull {{ dialogData.rowData!.downloadUrl }}/nginx
57+
Pull example: docker pull {{ dialogData.rowData!.downloadUrl }}/nginx
5858
</span>
5959
</el-form-item>
6060
<el-form-item :label="$t('commons.table.protocol')" prop="protocol">

‎frontend/src/views/container/setting/index.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
</el-input>
9999
</el-form-item>
100100

101-
<el-form-item label="ipv6" prop="ipv6">
101+
<el-form-item label="IPv6" prop="ipv6">
102102
<el-switch v-model="form.ipv6" @change="handleIPv6"></el-switch>
103103
<span class="input-help"></span>
104104
<div v-if="ipv6OptionShow">
@@ -131,7 +131,7 @@
131131
<el-switch v-model="form.iptables" @change="handleIptables"></el-switch>
132132
<span class="input-help">{{ $t('container.iptablesHelper1') }}</span>
133133
</el-form-item>
134-
<el-form-item label="live-restore" prop="liveRestore">
134+
<el-form-item label="Live restore" prop="liveRestore">
135135
<el-switch
136136
:disabled="form.isSwarm"
137137
v-model="form.liveRestore"
@@ -142,7 +142,7 @@
142142
{{ $t('container.liveWithSwarmHelper') }}
143143
</span>
144144
</el-form-item>
145-
<el-form-item label="cgroup-driver" prop="cgroupDriver">
145+
<el-form-item label="cgroup driver" prop="cgroupDriver">
146146
<el-radio-group v-model="form.cgroupDriver" @change="handleCgroup">
147147
<el-radio value="cgroupfs">cgroupfs</el-radio>
148148
<el-radio value="systemd">systemd</el-radio>

‎frontend/src/views/cronjob/index.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
icon="VideoPlay"
6565
type="success"
6666
>
67-
{{ $t('commons.button.enable') }}
67+
{{ $t('commons.status.enabled') }}
6868
</el-button>
6969
<el-button
7070
v-else
@@ -73,7 +73,7 @@
7373
type="danger"
7474
@click="onChangeStatus(row.id, 'enable')"
7575
>
76-
{{ $t('commons.button.disable') }}
76+
{{ $t('commons.status.disabled') }}
7777
</el-button>
7878
</template>
7979
</el-table-column>
@@ -390,7 +390,7 @@ const buttons = [
390390
},
391391
},
392392
{
393-
label: i18n.global.t('cronjob.record'),
393+
label: i18n.global.t('cronjob.viewRecords'),
394394
click: (row: Cronjob.CronjobInfo) => {
395395
loadDetail(row);
396396
},

‎frontend/src/views/host/process/network/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<el-table-column
5252
prop="status"
5353
column-key="status"
54-
:label="$t('app.status')"
54+
:label="$t('process.state')"
5555
:filters="[
5656
{ text: 'LISTEN', value: 'LISTEN' },
5757
{ text: 'ESTABLISHED', value: 'ESTABLISHED' },

0 commit comments

Comments
 (0)