From 4e2dcfbfb8389840cf1a78660559feb35352aadf Mon Sep 17 00:00:00 2001 From: troyeguo <13820674+troyeguo@users.noreply.github.com> Date: Sat, 27 Nov 2021 12:15:24 +0800 Subject: [PATCH] fix bug Former-commit-id: cd4a652cc748eb8c9a6100845c14c9b46543d374 --- package.json | 1 - src/assets/locales/en/translation.json | 33 ++++++++++++++-- src/assets/locales/ru/translation.json | 35 ++++++++++++++++- src/assets/locales/tw/translation.json | 41 +++++++++++++++++--- yarn.lock | 52 +------------------------- 5 files changed, 100 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index 4ac6e552..6f93cbb7 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "electron-google-analytics": "^1.0.2", "electron-is-dev": "^1.1.0", "electron-store": "^8.0.1", - "event-stream": "^4.0.1", "font-list": "^1.3.1", "fs-extra": "^9.1.0", "iconv-lite": "^0.6.2", diff --git a/src/assets/locales/en/translation.json b/src/assets/locales/en/translation.json index 39db7955..327760e7 100644 --- a/src/assets/locales/en/translation.json +++ b/src/assets/locales/en/translation.json @@ -294,9 +294,36 @@ "Edit": "Edit", "Add": "Add", "Survey": "Survey", - "What's new about this version": "What's new about this version", "Our Website": "Our Website", "What's New": "What's New", - "What's been fixed": "What's been fixed" -} + "What's been fixed": "What's been fixed", + "Target": "Target", + "Select All": "Select All", + "Excute Successfully": "Excute Successfully", + "Disable screen blanking": "Disable screen blanking", + "When Koodo is running, your computer won't enter sleep mode": "When Koodo is running, your computer won't enter sleep mode", + "Prevent accidental trigger": "Prevent accidental trigger", + "Import books as link": "Import books as link", + "Close main window while reading": "Close main window while reading", + "Merge reader into Word": "Merge reader into Word", + "Get rid of window frame, make reader hide into Word or any text editor, and can't be detected. You need to set up the reader's position, size and style first.": "Get rid of window frame, make reader hide into Word or any text editor, and can't be detected. You need to set up the reader's position, size and style first.", + "The imported books will not be copied to library, only linked to the original book path": "The imported books will not be copied to library, only linked to the original book path", + "Reader menu will not be triggered by hovering but clicking on the area": "Reader menu will not be triggered by hovering but clicking on the area", + "Gesture and UI optimization for touch screen": "Gesture and UI optimization for touch screen", + "The book that you read from last time will be open automatically when launching": "The book that you read from last time will be open automatically when launching", + "All the folded content will be expanded in the navigation panel": "All the folded content will be expanded in the navigation panel", + "Reader window will be maximized to fit the screen when opening a book": "Reader window will be maximized to fit the screen when opening a book", + "Open books in the main window": "Open books in the main window", + "Book won't be opened in a seperate window but directly opened in the main window": "Book won't be opened in a seperate window but directly opened in the main window", + "Book not exsits": "Book not exsits", + "Reach frequency limit": "Reach frequency limit", + "Error happens": "Error happens", + "Text Indent": "Text Indent", + "Deselect All": "Deselect All", + "Open book without adding it to library": "Open book without adding it to library", + "When opening books in the file manager with Koodo, the opened books won't be added to the library": "When opening books in the file manager with Koodo, the opened books won't be added to the library", + "Hide menu button": "Hide menu button", + "Manage": "Manage", + "Please turn off open books in the main window": "Please turn off open books in the main window" +} \ No newline at end of file diff --git a/src/assets/locales/ru/translation.json b/src/assets/locales/ru/translation.json index 456dcad8..d3e16221 100644 --- a/src/assets/locales/ru/translation.json +++ b/src/assets/locales/ru/translation.json @@ -294,5 +294,36 @@ "What's New": "What's New", "What's been fixed": "What's been fixed", "Voice": "Voice", - "Speed": "Speed" -} + "Speed": "Speed", + "Target": "Target", + "Select All": "Select All", + "Excute Successfully": "Excute Successfully", + "Disable screen blanking": "Disable screen blanking", + "When Koodo is running, your computer won't enter sleep mode": "When Koodo is running, your computer won't enter sleep mode", + "Prevent accidental trigger": "Prevent accidental trigger", + "Import books as link": "Import books as link", + "Close main window while reading": "Close main window while reading", + "Merge reader into Word": "Merge reader into Word", + "Get rid of window frame, make reader hide into Word or any text editor, and can't be detected. You need to set up the reader's position, size and style first.": "Get rid of window frame, make reader hide into Word or any text editor, and can't be detected. You need to set up the reader's position, size and style first.", + "The imported books will not be copied to library, only linked to the original book path": "The imported books will not be copied to library, only linked to the original book path", + "Reader menu will not be triggered by hovering but clicking on the area": "Reader menu will not be triggered by hovering but clicking on the area", + "Gesture and UI optimization for touch screen": "Gesture and UI optimization for touch screen", + "The book that you read from last time will be open automatically when launching": "The book that you read from last time will be open automatically when launching", + "All the folded content will be expanded in the navigation panel": "All the folded content will be expanded in the navigation panel", + "Reader window will be maximized to fit the screen when opening a book": "Reader window will be maximized to fit the screen when opening a book", + "Open books in the main window": "Open books in the main window", + "Book won't be opened in a seperate window but directly opened in the main window": "Book won't be opened in a seperate window but directly opened in the main window", + "Please turn off open books in the main window first": "Please turn off open books in the main window first", + "Please turn off merge with word first": "Please turn off merge with word first", + "Book not exsits": "Book not exsits", + "Reach frequency limit": "Reach frequency limit", + "Error happens": "Error happens", + "Text Indent": "Text Indent", + "Deselect All": "Deselect All", + "Open book without adding it to library": "Open book without adding it to library", + "When opening books in the file manager with Koodo, the opened books won't be added to the library": "When opening books in the file manager with Koodo, the opened books won't be added to the library", + "Total books": "Total books", + "Hide menu button": "Hide menu button", + "Manage": "Manage", + "Please turn off open books in the main window": "Please turn off open books in the main window" +} \ No newline at end of file diff --git a/src/assets/locales/tw/translation.json b/src/assets/locales/tw/translation.json index 9a5b96ce..e6af1e70 100644 --- a/src/assets/locales/tw/translation.json +++ b/src/assets/locales/tw/translation.json @@ -287,10 +287,41 @@ "Take effect at next startup": "下次打開圖書生效", "Auto Update relys on Github Release for package hosting, if your internet doesn't have stable connection to Github, we highly recommand you to turn off this option": "自動更新功能依賴Github，如果您本地網絡無法穩定訪問Github，則不建議開啟此功能，開啟之後，將不再單獨提供更新提醒。", "Bold Font": "字體加粗", - "Disable analytics service": "关闭统计功能", - "Hide navigation button": "不显示翻页按钮", - "More": "显示笔记出处", + "Disable analytics service": "關閉統計功能", + "Hide navigation button": "不顯示翻頁按鈕", + "More": "顯示筆記出處", "Survey": "用戶調查", - "Sync data from storage": "从存储位置同步数据", - "Scale": "页面宽度" + "Sync data from storage": "從存儲位置同步數據", + "Scale": "頁面寬度", + "Target": "目標語言", + "Select All": "全選", + "Excute Successfully": "執行成功", + "Disable screen blanking": "阻止電腦進入休眠模式", + "When Koodo is running, your computer won't enter sleep mode": "Koodo運行時，電腦不會進入休眠模式", + "Prevent accidental trigger": "開啟防誤觸模式", + "Import books as link": "以引用的方式導入圖書", + "Close main window while reading": "打開圖書時自動關閉主窗口", + "Merge reader into Word": "開啟摸魚模式", + "Get rid of window frame, make reader hide into Word or any text editor, and can't be detected. You need to set up the reader's position, size and style first.": "隱藏閱讀器邊框，使其混入Word，無法被發現，需要您提前設置好窗口的大小、位置和樣式", + "The imported books will not be copied to library, only linked to the original book path": "打開圖書時直接在原始路徑打開圖書，不會把圖書再復製到圖書庫中", + "Reader menu will not be triggered by hovering but clicking on the area": "閱讀器菜單不是進入特定區域就觸發，而是需要點擊相關區域才能觸發", + "Gesture and UI optimization for touch screen": "針對觸控屏進行了UI和手勢操作的優化", + "The book that you read from last time will be open automatically when launching": "軟件啟動時，自動打開上次閱讀的圖書", + "All the folded content will be expanded in the navigation panel": "自動展開圖書的多級目錄", + "Reader window will be maximized to fit the screen when opening a book": "打開圖書時，窗口自動最大化", + "Open books in the main window": "直接在主窗口打開圖書", + "Book won't be opened in a seperate window but directly opened in the main window": "圖書不會在一個單獨的窗口打開，而是直接在主窗口打開", + "Please turn off open books in the main window first": "請關閉直接在主窗口打開圖書", + "Please turn off merge with word first": "請關閉摸魚模式", + "Book not exsits": "圖書文件不存在", + "Reach frequency limit": "請求頻率太快", + "Error happens": "出錯了", + "Text Indent": "首行縮進", + "Deselect All": "全不選", + "Open book without adding it to library": "打開圖書但不添加到書庫", + "When opening books in the file manager with Koodo, the opened books won't be added to the library": "當您使用Koodo打開文件夾中的圖書時，圖書不會被添加到書庫中", + "Total books": "一共{{count}}本書", + "Hide menu button": "不顯示菜單按鈕", + "Manage": "管理", + "Please turn off open books in the main window": "請關閉直接在主窗口打開圖書的選項" } diff --git a/yarn.lock b/yarn.lock index 0728040a..85f820db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5144,7 +5144,7 @@ duplexer3@^0.1.4: resolved "https://registry.npm.taobao.org/duplexer3/download/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= -duplexer@^0.1.1, duplexer@^0.1.2, duplexer@~0.1.1: +duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" resolved "https://registry.nlark.com/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY= @@ -5737,19 +5737,6 @@ etag@~1.8.1: resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -event-stream@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz#4092808ec995d0dd75ea4580c1df6a74db2cde65" - integrity sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA== - dependencies: - duplexer "^0.1.1" - from "^0.1.7" - map-stream "0.0.7" - pause-stream "^0.0.11" - split "^1.0.1" - stream-combiner "^0.2.2" - through "^2.3.8" - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -6230,11 +6217,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -from@^0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= - fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/fs-constants/download/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -8744,11 +8726,6 @@ map-obj@^1.0.0, map-obj@^1.0.1: resolved "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz?cache=0&sync_timestamp=1617771296262&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmap-obj%2Fdownload%2Fmap-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= -map-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" - integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg= - map-visit@^1.0.0: version "1.0.0" resolved "https://registry.nlark.com/map-visit/download/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -9884,13 +9861,6 @@ path-type@^4.0.0: resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= -pause-stream@^0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= - dependencies: - through "~2.3" - pbkdf2@^3.0.3: version "3.1.2" resolved "https://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" @@ -12415,13 +12385,6 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== - dependencies: - through "2" - sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -12511,14 +12474,6 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -stream-combiner@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" - integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg= - dependencies: - duplexer "~0.1.1" - through "~2.3.4" - stream-each@^1.1.0: version "1.2.3" resolved "https://registry.npm.taobao.org/stream-each/download/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" @@ -12990,11 +12945,6 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@2, through@^2.3.8, through@~2.3, through@~2.3.4: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - thunky@^1.0.2: version "1.1.0" resolved "https://registry.npm.taobao.org/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"