Skip to content

Commit a6114a3

Browse files
committed
Merge branch 'develop'
2 parents 2917982 + c7bdd1f commit a6114a3

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## not released
44

5+
## v1.3.2 (2023-06-02)
6+
7+
- Fix: #51 for translation zh_CN
8+
59
## v1.3.1 (2023-05-19)
610

711
- Add: #55 Simplified Chinese(zh_CN) translation, thanks to @wh201906

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "joplin-plugin-backup",
3-
"version": "1.3.1",
3+
"version": "1.3.2",
44
"scripts": {
55
"dist": "webpack --joplin-plugin-config buildMain && webpack --joplin-plugin-config buildExtraScripts && webpack --joplin-plugin-config createArchive",
66
"prepare": "npm run dist && husky install",

src/locales/zh_CN.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
22
"settings.path": "备份路径",
33
"settings.exportPath": "临时导出路径",
4-
"settings.exportPath.description": "用于在导出日志的临时Temporary path for note export from Joplin, before they are copyed to backup destination",
4+
"settings.exportPath.description": "用于导出的临时路径,笔记在被移动到“备份路径”前会存于此处",
55
"settings.backupRetention": "保留 x 个备份",
66
"settings.backupRetention.description": "如果设置了多个备份, 则会根据“备份集名称”在“备份路径”下创建多个子文件夹",
77
"settings.backupInterval": "备份间隔(以小时为单位)",
88
"settings.backupInterval.description": "0 = 停止自动备份",
99
"settings.onlyOnChange": "仅在更改时备份",
1010
"settings.onlyOnChange.description": "仅当笔记发生更改时,在指定的备份间隔内创建备份",
1111
"settings.usePassword": "使用密码保护备份",
12-
"settings.usePassword.description": "备份将通过加密的ZIP压缩文件进行保护",
12+
"settings.usePassword.description": "备份将通过加密的压缩文件进行保护",
1313
"settings.password": "密码",
1414
"settings.password.description": "如果输入了密码,则备份将受到密码保护",
1515
"settings.passwordRepeat": "重复密码",
1616
"settings.passwordRepeat.description": "请重复输入密码以确认",
1717
"settings.fileLogLevel": "日志级别",
1818
"settings.createSubfolder": "创建子文件夹",
1919
"settings.createSubfolder.description": "在配置的备份路径中创建一个子文件夹。请在“备份路径”中没有其他数据时才禁用!",
20-
"settings.zipArchive": "创建ZIP压缩文件",
21-
"settings.zipArchive.description": "如果设置了“使用密码保护备份”,则总是会创建ZIP压缩文件",
22-
"settings.compressionLevel": "ZIP压缩级别",
23-
"settings.compressionLevel.description": "ZIP压缩文件的压缩级别",
20+
"settings.zipArchive": "创建压缩文件",
21+
"settings.zipArchive.description": "如果设置了“使用密码保护备份”,则总是会创建压缩文件",
22+
"settings.compressionLevel": "压缩等级",
23+
"settings.compressionLevel.description": "压缩文件的压缩等级",
2424
"settings.backupSetName": "备份集名称",
2525
"settings.backupSetName.description": "如果要保留多个备份,请为备份集指定名称",
2626
"settings.backupPlugins": "备份插件",

src/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 1,
33
"id": "io.github.jackgruber.backup",
44
"app_min_version": "2.1.3",
5-
"version": "1.3.1",
5+
"version": "1.3.2",
66
"name": "Simple Backup",
77
"description": "Plugin to create manual and automatic backups.",
88
"author": "JackGruber",

0 commit comments

Comments
 (0)