Skip to content

Commit a0def65

Browse files
authored
Merge pull request #782 from MrBMT/update-app-wording
Update application wording
2 parents 0a758f2 + 4873b40 commit a0def65

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

browser/main/Detail/MarkdownNoteDetail.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ class MarkdownNoteDetail extends React.Component {
190190
if (isTrashed) {
191191
let dialogueButtonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
192192
type: 'warning',
193-
message: 'Delete a note',
194-
detail: 'This work cannot be undone.',
193+
message: 'Confirm note deletion',
194+
detail: 'This will permanently remove this note.',
195195
buttons: ['Confirm', 'Cancel']
196196
})
197197
if (dialogueButtonIndex === 1) return

browser/main/Detail/SnippetNoteDetail.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ class SnippetNoteDetail extends React.Component {
176176
if (isTrashed) {
177177
let dialogueButtonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
178178
type: 'warning',
179-
message: 'Delete a note',
180-
detail: 'This work cannot be undone.',
179+
message: 'Confirm note deletion',
180+
detail: 'This will permanently remove this note.',
181181
buttons: ['Confirm', 'Cancel']
182182
})
183183
if (dialogueButtonIndex === 1) return

browser/main/Detail/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Detail extends React.Component {
4949
tabIndex='0'
5050
>
5151
<div styleName='empty'>
52-
<div styleName='empty-message'>{OSX ? 'Command(⌘)' : 'Ctrl(^)'} + N<br />to create a new post</div>
52+
<div styleName='empty-message'>{OSX ? 'Command(⌘)' : 'Ctrl(^)'} + N<br />to create a new note</div>
5353
</div>
5454
<StatusBar
5555
{..._.pick(this.props, ['config', 'location', 'dispatch'])}

browser/main/NoteList/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,9 @@ class NoteList extends React.Component {
446446
value={config.sortBy}
447447
onChange={(e) => this.handleSortByChange(e)}
448448
>
449-
<option value='UPDATED_AT'>Updated Time</option>
450-
<option value='CREATED_AT'>Created Time</option>
451-
<option value='ALPHABETICAL'>Alphabetical</option>
449+
<option value='UPDATED_AT'>Last Updated</option>
450+
<option value='CREATED_AT'>Creation Time</option>
451+
<option value='ALPHABETICAL'>Alphabetically</option>
452452
</select>
453453
</div>
454454
<div styleName='control-button-area'>

browser/main/modals/PreferencesModal/StorageItem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ class StorageItem extends React.Component {
298298
let index = dialog.showMessageBox(remote.getCurrentWindow(), {
299299
type: 'warning',
300300
message: 'Unlink Storage',
301-
detail: 'This work just detatches a storage from Boostnote. (Any data won\'t be deleted.)',
302-
buttons: ['Confirm', 'Cancel']
301+
detail: 'Unlinking removes this linked storage from Boostnote. No data is removed, please manually delete the folder from your hard drive if needed.',
302+
buttons: ['Unlink', 'Cancel']
303303
})
304304

305305
if (index === 0) {

browser/main/modals/PreferencesModal/UiTab.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@ class UiTab extends React.Component {
192192

193193
<div styleName='group-section'>
194194
<div styleName='group-section-label'>
195-
Switching Preview
195+
Switch to Preview
196196
</div>
197197
<div styleName='group-section-control'>
198198
<select value={config.editor.switchPreview}
199199
ref='editorSwitchPreview'
200200
onChange={(e) => this.handleUIChange(e)}
201201
>
202202
<option value='BLUR'>When Editor Blurred</option>
203-
<option value='RIGHTCLICK'>When Right Clicking</option>
203+
<option value='RIGHTCLICK'>On Right Click</option>
204204
</select>
205205
</div>
206206
</div>
@@ -218,7 +218,7 @@ class UiTab extends React.Component {
218218
<option value='vim'>vim</option>
219219
<option value='emacs'>emacs</option>
220220
</select>
221-
<span styleName='note-for-keymap'>Please reload boostnote after you change the keymap</span>
221+
<span styleName='note-for-keymap'>Please restart boostnote after you change the keymap</span>
222222
</div>
223223
</div>
224224

@@ -271,7 +271,7 @@ class UiTab extends React.Component {
271271
ref='previewLineNumber'
272272
type='checkbox'
273273
/>&nbsp;
274-
Code block line numbering
274+
Show line numbers for preview code blocks
275275
</label>
276276
</div>
277277

0 commit comments

Comments
 (0)