self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

Merge branch 'dev' of github.com:laurent22/joplin into dev

Browse Source
This commit is contained in:
Laurent Cozic 2021-01-31 15:20:40 +00:00
commit 98e5810197
4 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.md
View File

@ -24,7 +24,7 @@ There are also a few forks of existing packages under the "fork-*" name.
- macOS, Linux: Install rsync - https://nodejs.org/en/
- macOS: Install Cocoapods - `brew install cocoapods`
- Windows: Install Windows Build Tools - `npm install -g windows-build-tools`
- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev`
- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev python`
## Building
@ -110,4 +110,4 @@ It still requires you to quit the application each time you want it to rebuild,
# Troubleshooting
Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md) for various tips on how to get the build working.
Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md) for various tips on how to get the build working.

2
packages/generator-joplin/generators/app/templates/src/index.ts
View File

@ -2,6 +2,6 @@ import joplin from 'api';
joplin.plugins.register({
onStart: async function() {
console.info('Test plugin started!');
console.info('Hello world. Test plugin started!');
},
});

52
packages/tools/locales/ko.po
View File

@ -15,6 +15,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
#: packages/app-desktop/bridge.js:106 packages/app-desktop/bridge.js:110
#: packages/app-desktop/bridge.js:126 packages/app-desktop/bridge.js:134
@ -403,9 +405,8 @@ msgid "Creating new %s..."
msgstr "%s 새로 만들기..."
#: packages/app-desktop/gui/NoteEditor/NoteEditor.js:285
#, fuzzy
msgid "Click to add tags..."
msgstr "업데이트 확인..."
msgstr "태그를 추가하려면 클릭하세요..."
#: packages/app-desktop/gui/NoteEditor/NoteEditor.js:337
msgid ""
@ -1400,7 +1401,7 @@ msgstr "고급 옵션"
#: packages/app-desktop/gui/ConfigScreen/ConfigScreen.js:412
msgid "Path:"
msgstr ""
msgstr "경로:"
#: packages/app-desktop/gui/ConfigScreen/ConfigScreen.js:417
msgid "Browse..."
@ -1408,7 +1409,7 @@ msgstr "찾아보기..."
#: packages/app-desktop/gui/ConfigScreen/ConfigScreen.js:419
msgid "Arguments:"
msgstr ""
msgstr "전달할 인수:"
#: packages/app-desktop/gui/ConfigScreen/ConfigScreen.js:467
msgid "The application must be restarted for these changes to take effect."
@ -1442,75 +1443,66 @@ msgid "Delete plugin \"%s\"?"
msgstr "\"%s\" 플러그인을 삭제할까요?"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:155
#, fuzzy
msgid "Browse all plugins"
msgstr "플러그인 설치하기"
msgstr "모든 플러그인 보기"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:159
msgid "Install from file"
msgstr ""
msgstr "플러그인 파일로 설치"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:193
msgid "You do not have any installed plugin."
msgstr ""
msgstr "설치된 플러그인이 없습니다."
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:208
#, fuzzy
msgid "Plugin tools"
msgstr "플러그인"
msgstr "플러그인 도구"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:209
msgid "Manage your plugins"
msgstr ""
msgstr "플러그인 관리"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js:68
#, fuzzy
msgid "No results"
msgstr "없는 리소스입니다!"
msgstr "결과 없음"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js:80
#, fuzzy
msgid "Search for plugins..."
msgstr "찾기..."
msgstr "플러그인 찾기..."
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:127
#, fuzzy
msgid "Install"
msgstr "플러그인 설치하기"
msgstr "설치"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:129
#, fuzzy
msgid "Installing..."
msgstr "취소하는 중..."
msgstr "설치 중..."
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:131
#, fuzzy
msgid "Installed"
msgstr "플러그인 설치하기"
msgstr "설치됨"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:137
#, fuzzy
msgid "Update"
msgstr "갱신됨"
msgstr "업데이트"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:139
#, fuzzy
msgid "Updating..."
msgstr "외부 보기..."
msgstr "업데이트 중..."
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:151
msgid "Please upgrade Joplin to use this plugin"
msgstr ""
msgstr "이 플러그인을 사용하기 위해서는 Joplin을 업그레이드 해주세요."
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:165
#, javascript-format
msgid "(%s)"
msgstr ""
msgstr "(%s)"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.js:49
#, fuzzy, javascript-format
#, javascript-format
msgid "Could not install plugin: %s"
msgstr "노트를 내보낼 수 없습니다: %s"
msgstr "플러그인을 설치할 수 없습니다: %s"
#: packages/app-desktop/gui/PromptDialog.min.js:249
msgid "Clear"
@ -1972,7 +1964,7 @@ msgstr "Joplin 웹사이트"
#: packages/app-mobile/components/screens/config.js:523
msgid "Privacy Policy"
msgstr ""
msgstr "개인 정보 보호 정책"
#: packages/app-mobile/components/screens/Note.js:98
msgid "This note has been modified:"

10
readme/build_troubleshooting.md
View File

@ -19,6 +19,16 @@ If there's an error `while loading shared libraries: libgconf-2.so.4: cannot ope
If you get a node-gyp related error, you might need to manually install it: `npm install -g node-gyp`.
If you get unexpected `npm` dependency errors on a fresh git pull, try `npm run clean`
If `npm i` gives you a fatal error like the following:
```
node-pre-gyp WARN Tried to download(403): https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v5.0.1/napi-v6-linux-x64.tar.gz
node-pre-gyp WARN Pre-built binaries not found for sqlite3@5.0.1 and node@14.15.4 (node-v83 ABI, glibc) (falling back to source compile with node-gyp)
/bin/sh: 1: python: not found
```
Try `sudo apt install python` (or the `apt` equivalent for your operating system) and then run `npm i` again.
If you get the error `libtool: unrecognized option '-static'`, follow the instructions [in this post](https://stackoverflow.com/a/38552393/561309) to use the correct libtool version.
## Other issues