self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Merge branch 'master' of github.com:laurent22/joplin

Browse Source
This commit is contained in:
Laurent Cozic 2019-06-06 16:05:26 +01:00
commit b5b228af15
7 changed files with 47 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CliClient/locales/pl_PL.po
View File

@ -231,7 +231,7 @@ msgid ""
"all` for the complete usage information."
msgstr ""
"Wpisz `help [komenda]` aby uzyskać więcej informacji o komendzie; lub wpisz "
"`help all` aby wszystkie informacje na temat funkcji programu."
"`help all` aby uzyskać wszystkie informacje na temat funkcji programu."
msgid "The possible commands are:"
msgstr "Dostępne komendy:"
@ -324,7 +324,7 @@ msgstr "Wyświetla jedynie pierwsze <num> notatek."
msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
msgstr ""
"Sortuje obiekty po <field> (np. tytuł, data aktualizacji, data utworzenia)."
"Sortuje obiekty po <field> (np. tytuł, data_aktualizacji, data_utworzenia)."
msgid "Reverses the sorting order."
msgstr "Odwraca kierunek sortowania."
@ -434,7 +434,7 @@ msgstr ""
"poniżej:"
msgid "Step 1: Open this URL in your browser to authorise the application:"
msgstr "Krok 1: Otwórz URL w swojej przeglądarce aby autoryzować aplikację:"
msgstr "Krok 1: Otwórz odnośnik w swojej przeglądarce aby autoryzować aplikację:"
msgid "Step 2: Enter the code provided by Dropbox:"
msgstr "Krok 2: Wpisz kod podany przez Dropbox:"
@ -1541,7 +1541,7 @@ msgstr "Interwał synchronizacji"
#, javascript-format
msgid "%d minutes"
msgstr "%d minuta"
msgstr "%d minut"
#, javascript-format
msgid "%d hour"
@ -1576,22 +1576,26 @@ msgstr ""
"parametry, które są nazwane jako `sync.NUM.NAME` (udokumentowane poniżej)."
msgid "Attachment download behaviour"
msgstr ""
msgstr "Zachowanie przy pobieraniu załączników"
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
"W trybie \"Ręczny\", załączniki zostaną pobrane po naciśnięciu."
"W trybie \"Automatyczny\", załączniki zostaną pobrane przy otwieraniu notatki. "
"W trybie \"Zawsze\", wszystkie załączniki zostaną pobrane bez względu na"
"otwarcie notatki."
msgid "Always"
msgstr ""
msgstr "Zawsze"
msgid "Manual"
msgstr ""
msgstr "Ręczny"
msgid "Auto"
msgstr ""
msgstr "Automatyczny"
msgid "Directory to synchronise with (absolute path)"
msgstr "Katalog z którym nastąpi synchronizacja (ścieżka absolutna)"
@ -1945,8 +1949,7 @@ msgstr "Brak przedmiotu z ID %s"
#, javascript-format
msgid "The Joplin mobile app does not currently support this type of link: %s"
msgstr ""
"Aplikacja mobilna Joplin nie wspiera aktualnie odnośników tego typu: %s"
msgstr "Aplikacja mobilna Joplin nie wspiera aktualnie odnośników tego typu: %s"
#, javascript-format
msgid "Unsupported image type: %s"

12
ElectronClient/app/package-lock.json generated
View File

@ -3695,9 +3695,9 @@
}
},
"linkify-it": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
"integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz",
"integrity": "sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==",
"requires": {
"uc.micro": "^1.0.1"
}
@ -3965,9 +3965,9 @@
"integrity": "sha1-y5yf+RpSVawI8/09YyhuFd8KH8M="
},
"markdown-it-toc-done-right": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-3.0.1.tgz",
"integrity": "sha512-pppqoXWFyMD/JCLL7YZSYPnxJHr7DH7psXfHzTOXWof8b6XGhbCDYYha6Vi6EDwDEKY+dthNVtMSLHPlk0c1xw=="
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.0.0.tgz",
"integrity": "sha512-jaoIC02ehqUrT6RpbNZMe+ug7BaW3V6G1qTi/hTtcswuFWunP2H2GzmVobWIyOb3nQ4HNBXHqdbsv8fEsMCKWA=="
},
"match-at": {
"version": "0.1.1",

2
ElectronClient/app/package.json
View File

@ -120,7 +120,7 @@
"markdown-it-multimd-table": "^3.2.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"markdown-it-toc-done-right": "^3.0.1",
"markdown-it-toc-done-right": "^4.0.0",
"md5": "^2.2.1",
"mime": "^2.3.1",
"moment": "^2.22.2",

7
ElectronClient/app/theme.js
View File

@ -247,10 +247,13 @@ function themeStyle(theme) {
const cacheKey = [theme, zoomRatio, editorFontSize].join('-');
if (themeCache_[cacheKey]) return themeCache_[cacheKey];
// Font size are not theme specific, but they must be referenced
// and computed here to allow them to respond to settings changes
// without the need to restart
let fontSizes = {
fontSize: Math.round(12 * zoomRatio),
fontSize: Math.round(globalStyle.fontSize * zoomRatio),
editorFontSize: editorFontSize,
textAreaLineHeight: Math.round(17 * editorFontSize / 12),
textAreaLineHeight: Math.round(globalStyle.textAreaLineHeight * editorFontSize / 12),
// For WebView - must correspond to the properties above
htmlFontSize: Math.round(15 * zoomRatio) + 'px',

5
Joplin_install_and_update.sh
View File

@ -56,7 +56,8 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; t
# Download icon
echo 'Downloading icon...'
wget -nv -O ~/.joplin/Icon512.png https://joplinapp.org/images/Icon512.png
mkdir -p ~/.local/share/icons/hicolor/512x512/apps
wget -nv -O ~/.local/share/icons/hicolor/512x512/apps/joplin.png https://joplinapp.org/images/Icon512.png
echo "${COLOR_GREEN}OK${COLOR_RESET}"
# Detect desktop environment
@ -83,7 +84,7 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; t
# On some systems this directory doesn't exist by default
mkdir -p ~/.local/share/applications
echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=/home/$USER/.joplin/Icon512.png\nStartupWMClass=Joplin\nType=Application\nCategories=Application;\n$APPIMAGE_VERSION" >> ~/.local/share/applications/appimagekit-joplin.desktop
echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=joplin\nStartupWMClass=Joplin\nType=Application\nCategories=Application;\n$APPIMAGE_VERSION" >> ~/.local/share/applications/appimagekit-joplin.desktop
echo "${COLOR_GREEN}OK${COLOR_RESET}"
else
echo "${COLOR_RED}NOT DONE${COLOR_RESET}"

53
ReactNativeClient/package-lock.json generated
View File

@ -2685,8 +2685,7 @@
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"optional": true
"bundled": true
},
"aproba": {
"version": "1.2.0",
@ -2704,13 +2703,11 @@
},
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"optional": true
"bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -2723,18 +2720,15 @@
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"optional": true
"bundled": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"core-util-is": {
"version": "1.0.2",
@ -2837,8 +2831,7 @@
},
"inherits": {
"version": "2.0.3",
"bundled": true,
"optional": true
"bundled": true
},
"ini": {
"version": "1.3.5",
@ -2848,7 +2841,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -2861,20 +2853,17 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true,
"optional": true
"bundled": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -2891,7 +2880,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -2964,8 +2952,7 @@
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"optional": true
"bundled": true
},
"object-assign": {
"version": "4.1.1",
@ -2975,7 +2962,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -3051,8 +3037,7 @@
},
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"optional": true
"bundled": true
},
"safer-buffer": {
"version": "2.1.2",
@ -3082,7 +3067,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -3100,7 +3084,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -3139,13 +3122,11 @@
},
"wrappy": {
"version": "1.0.2",
"bundled": true,
"optional": true
"bundled": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"optional": true
"bundled": true
}
}
},
@ -3981,9 +3962,9 @@
"integrity": "sha1-y5yf+RpSVawI8/09YyhuFd8KH8M="
},
"markdown-it-toc-done-right": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-3.0.1.tgz",
"integrity": "sha512-pppqoXWFyMD/JCLL7YZSYPnxJHr7DH7psXfHzTOXWof8b6XGhbCDYYha6Vi6EDwDEKY+dthNVtMSLHPlk0c1xw=="
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.0.0.tgz",
"integrity": "sha512-jaoIC02ehqUrT6RpbNZMe+ug7BaW3V6G1qTi/hTtcswuFWunP2H2GzmVobWIyOb3nQ4HNBXHqdbsv8fEsMCKWA=="
},
"match-at": {
"version": "0.1.1",
@ -4147,7 +4128,7 @@
},
"load-json-file": {
"version": "2.0.0",
"resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
"requires": {
"graceful-fs": "^4.1.2",
@ -5302,7 +5283,7 @@
},
"load-json-file": {
"version": "2.0.0",
"resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
"requires": {
"graceful-fs": "^4.1.2",
@ -7396,7 +7377,7 @@
"dependencies": {
"uuid": {
"version": "3.0.1",
"resolved": "http://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
"integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
}
}

4
ReactNativeClient/package.json
View File

@ -28,10 +28,10 @@
"markdown-it-ins": "^2.0.0",
"markdown-it-katex": "^2.0.3",
"markdown-it-mark": "^2.0.0",
"markdown-it-multimd-table": "^3.1.3",
"markdown-it-multimd-table": "^3.2.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"markdown-it-toc-done-right": "^3.0.1",
"markdown-it-toc-done-right": "^4.0.0",
"md5": "^2.2.1",
"moment": "^2.18.1",
"prop-types": "^15.6.0",