self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Merge master into encryption branch

Browse Source
This commit is contained in:
Laurent Cozic
2017-12-15 07:31:57 +00:00
parent 5bc72e2b44
commit d9c1e30e9b
19 changed files with 121 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/components/screens/notes.js
View File

@@ -69,7 +69,7 @@ class NotesScreenComponent extends BaseScreenComponent {
}
deleteFolder_onPress(folderId) {
dialogs.confirm(this, _('Delete notebook?')).then((ok) => {
dialogs.confirm(this, _('Delete notebook? All notes within this notebook will also be deleted.')).then((ok) => {
if (!ok) return;
Folder.delete(folderId).then(() => {