Improve English grammar in user-interface text. (#2075)

This commit is contained in:
brainchild0 2020-06-07 06:57:29 -04:00 committed by GitHub
parent 51e047f2fd
commit c79f84e5cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 80 additions and 80 deletions

View File

@ -6,7 +6,7 @@ export default function (keybindings) {
label: 'F&ormat',
submenu: [{
id: 'strongMenuItem',
label: 'Strong',
label: 'Bold',
type: 'checkbox',
accelerator: keybindings.getAccelerator('format.strong'),
click (menuItem, browserWindow) {
@ -14,7 +14,7 @@ export default function (keybindings) {
}
}, {
id: 'emphasisMenuItem',
label: 'Emphasis',
label: 'Italic',
type: 'checkbox',
accelerator: keybindings.getAccelerator('format.emphasis'),
click (menuItem, browserWindow) {
@ -74,7 +74,7 @@ export default function (keybindings) {
type: 'separator'
}, {
id: 'strikeMenuItem',
label: 'Strike',
label: 'Strikethrough',
type: 'checkbox',
accelerator: keybindings.getAccelerator('format.strike'),
click (menuItem, browserWindow) {
@ -99,7 +99,7 @@ export default function (keybindings) {
}, {
type: 'separator'
}, {
label: 'Clear Format',
label: 'Clear Formatting',
accelerator: keybindings.getAccelerator('format.clear-format'),
click (menuItem, browserWindow) {
actions.format(browserWindow, 'clear')

View File

@ -37,7 +37,7 @@ export default function () {
shell.openExternal('https://github.com/marktext/marktext/blob/master/docs/README.md')
}
}, {
label: 'Markdown syntax',
label: 'Markdown Reference',
click () {
shell.openExternal('https://github.com/marktext/marktext/blob/master/docs/MARKDOWN_SYNTAX.md')
}
@ -59,7 +59,7 @@ export default function () {
actions.showTweetDialog(win, 'twitter')
}
}, {
label: 'Report Issue or Feature request',
label: 'Report Issue or Request Feature',
click () {
shell.openExternal('https://github.com/marktext/marktext/issues')
}
@ -76,7 +76,7 @@ export default function () {
shell.openExternal('https://github.com/marktext/marktext')
}
}, {
label: 'Follow @Jocs on Github',
label: 'Follow us on Github',
click () {
shell.openExternal('https://github.com/Jocs')
}

View File

@ -56,14 +56,14 @@ export default function (keybindings) {
type: 'separator'
}, {
id: 'upgradeHeadingMenuItem',
label: 'Upgrade Heading',
label: 'Promote Heading',
accelerator: keybindings.getAccelerator('paragraph.upgrade-heading'),
click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'upgrade heading')
}
}, {
id: 'degradeHeadingMenuItem',
label: 'Degrade Heading',
label: 'Demote Heading',
accelerator: keybindings.getAccelerator('paragraph.degrade-heading'),
click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'degrade heading')
@ -114,7 +114,7 @@ export default function (keybindings) {
type: 'separator'
}, {
id: 'orderListMenuItem',
label: 'Order List',
label: 'Ordered List',
type: 'checkbox',
accelerator: keybindings.getAccelerator('paragraph.order-list'),
click (menuItem, browserWindow) {
@ -158,7 +158,7 @@ export default function (keybindings) {
}
}, {
id: 'horizontalLineMenuItem',
label: 'Horizontal Line',
label: 'Horizontal Rule',
type: 'checkbox',
accelerator: keybindings.getAccelerator('paragraph.horizontal-line'),
click (menuItem, browserWindow) {

View File

@ -54,7 +54,7 @@ export default function (keybindings) {
}, {
type: 'separator'
}, {
label: 'Toggle Sidebar',
label: 'Show Sidebar',
id: 'sideBarMenuItem',
accelerator: keybindings.getAccelerator('view.toggle-sidebar'),
type: 'checkbox',
@ -68,7 +68,7 @@ export default function (keybindings) {
actions.layout(item, browserWindow, 'showSideBar')
}
}, {
label: 'Toggle Tabbar',
label: 'Show Tab Bar',
id: 'tabBarMenuItem',
accelerator: keybindings.getAccelerator('view.toggle-tabbar'),
type: 'checkbox',
@ -88,7 +88,7 @@ export default function (keybindings) {
if (global.MARKTEXT_DEBUG) {
viewMenu.submenu.push({
label: 'Toggle Developer Tools',
label: 'Show Developer Tools',
accelerator: keybindings.getAccelerator('view.toggle-dev-tools'),
click (item, focusedWindow) {
if (focusedWindow) {

View File

@ -31,7 +31,7 @@ export default function (keybindings) {
}, {
type: 'separator'
}, {
label: 'Toggle Full Screen',
label: 'Show in Full Screen',
accelerator: keybindings.getAccelerator('window.toggle-full-screen'),
click (item, focusedWindow) {
if (focusedWindow) {

View File

@ -15,7 +15,7 @@ const COMMAND_KEY = isOsx ? '⌘' : 'Ctrl'
const icons = [
{
type: 'strong',
tooltip: 'Emphasize',
tooltip: 'Bold',
shortcut: `${COMMAND_KEY}+B`,
icon: strongIcon
}, {
@ -60,7 +60,7 @@ const icons = [
icon: imageIcon
}, {
type: 'clear',
tooltip: 'Eliminate',
tooltip: 'Clear Formatting',
shortcut: `⇧+${COMMAND_KEY}+R`,
icon: clearIcon
}

View File

@ -35,7 +35,7 @@ export const COPY_AS_HTML = {
}
export const PASTE_AS_PLAIN_TEXT = {
label: 'Paste As Plain Text',
label: 'Paste as Plain Text',
id: 'pasteAsPlainTextMenuItem',
click (menuItem, browserWindow) {
contextMenu.pasteAsPlainText()

View File

@ -4,24 +4,24 @@ export const endOfLineOptions = [{
label: 'Default',
value: 'default'
}, {
label: 'Carriage return and Line feed(CRLF)',
label: 'Carriage return and line feed (CRLF)',
value: 'crlf'
}, {
label: 'Line feed(Lf)',
label: 'Line feed (LF)',
value: 'lf'
}]
export const trimTrailingNewlineOptions = [{
label: 'Trim trailing newlines',
label: 'Trim all trailing',
value: 0
}, {
label: 'Ensure single trailing newline',
label: 'Ensure exactly one trailing',
value: 1
}, {
label: 'Automatically detect',
label: 'Preserve style of original document',
value: 2
}, {
label: 'Disabled',
label: 'Do nothing',
value: 3
}]

View File

@ -2,7 +2,7 @@
<div class="pref-editor">
<h4>Editor</h4>
<range
description="The font size of text in the editor."
description="Font size in text editor."
:value="fontSize"
:min="12"
:max="32"
@ -11,7 +11,7 @@
:onChange="value => onSelectChange('fontSize', value)"
></range>
<range
description="The line height of editor lines."
description="Line height in text editor."
:value="lineHeight"
:min="1.2"
:max="2.0"
@ -19,13 +19,13 @@
:onChange="value => onSelectChange('lineHeight', value)"
></range>
<font-text-box
description="The font used in the editor."
description="Font for text editor."
:value="editorFontFamily"
:onChange="value => onSelectChange('editorFontFamily', value)"
></font-text-box>
<separator></separator>
<range
description="The font size of text in code blocks."
description="Font size in code blocks."
:value="codeFontSize"
:min="12"
:max="28"
@ -34,7 +34,7 @@
:onChange="value => onSelectChange('codeFontSize', value)"
></range>
<font-text-box
description="The font used in code blocks."
description="Font for code blocks."
:onlyMonospace="true"
:value="codeFontFamily"
:onChange="value => onSelectChange('codeFontFamily', value)"
@ -42,12 +42,12 @@
<!-- FIXME: Disabled due to #1648. -->
<bool
v-show="false"
description="Whether to show line numbers in code blocks."
description="Show line numbers in code blocks."
:bool="codeBlockLineNumbers"
:onChange="value => onSelectChange('codeBlockLineNumbers', value)"
></bool>
<bool
description="Trim any empty lines at the beginning and end of code blocks when you open a markdown file."
description="Remove leading and trailing empty lines in code blocks."
:bool="trimUnnecessaryCodeBlockEmptyLines"
:onChange="value => onSelectChange('trimUnnecessaryCodeBlockEmptyLines', value)"
></bool>
@ -63,49 +63,49 @@
:onChange="value => onSelectChange('autoPairMarkdownSyntax', value)"
></bool>
<bool
description="Automatically complete quotes."
description="Automatically close quotation marks."
:bool="autoPairQuote"
:onChange="value => onSelectChange('autoPairQuote', value)"
></bool>
<separator></separator>
<cur-select
description="The newline character used at the end of each line. The default option selects your operating system's default newline character."
description="Line separator type."
:value="endOfLine"
:options="endOfLineOptions"
:onChange="value => onSelectChange('endOfLine', value)"
></cur-select>
<separator></separator>
<cur-select
description="The default encoding for files."
description="Default encoding."
:value="defaultEncoding"
:options="defaultEncodingOptions"
:onChange="value => onSelectChange('defaultEncoding', value)"
></cur-select>
<bool
description="Automatically guess the file's encoding when opening files."
description="Automatically detect file encoding."
:bool="autoGuessEncoding"
:onChange="value => onSelectChange('autoGuessEncoding', value)"
></bool>
<cur-select
description="What to do with traling newlines."
description="What to do with trailing newlines."
:value="trimTrailingNewline"
:options="trimTrailingNewlineOptions"
:onChange="value => onSelectChange('trimTrailingNewline', value)"
></cur-select>
<separator></separator>
<cur-select
description="The writing direction of text."
description="Text direction."
:value="textDirection"
:options="textDirectionOptions"
:onChange="value => onSelectChange('textDirection', value)"
></cur-select>
<bool
description="Whether to hide the hint for quickly creating paragraphs."
description="Hide hint for selecting type of new paragraph."
:bool="hideQuickInsertHint"
:onChange="value => onSelectChange('hideQuickInsertHint', value)"
></bool>
<bool
description="Whether to hide the link popup when the cursor is over a link."
description="Hide popup when cursor is over link."
:bool="hideLinkPopup"
:onChange="value => onSelectChange('hideLinkPopup', value)"
></bool>
@ -116,7 +116,7 @@
></bool>
<separator></separator>
<text-box
description="Defines the maximum editor area width. An empty string or suffixes of ch (characters), px (pixels) or % (percentage) are allowed."
description="Maximum width of text editor. Empty for theme default, otherwise number with unit suffix (`ch`: characters, `px`: pixels, `%`: percentage)."
:input="editorLineWidth"
:regexValidator="/^(?:$|[0-9]+(?:ch|px|%)$)/"
defaultValue="Default value from current theme"

View File

@ -7,10 +7,10 @@ export const titleBarStyleOptions = [{
}]
export const fileSortByOptions = [{
label: 'Create time',
label: 'Creation time',
value: 'created'
}, {
label: 'Modified time',
label: 'Modification time',
value: 'modified'
}, {
label: 'Title',

View File

@ -7,7 +7,7 @@
:onChange="value => onSelectChange('autoSave', value)"
></bool>
<range
description="The delay in milliseconds between a change being made and saved."
description="Delay following document edit before automatically saving (milliseconds)."
:value="autoSaveDelay"
:min="1000"
:max="10000"
@ -17,40 +17,40 @@
></range>
<cur-select
v-if="!isOsx"
description="The style of the title bar. You need to restart Mark Text after changing."
description="Title bar style (requires restart)."
:value="titleBarStyle"
:options="titleBarStyleOptions"
:onChange="value => onSelectChange('titleBarStyle', value)"
></cur-select>
<separator></separator>
<bool
description="Whether to open files in a new window."
description="Open files in new window."
:bool="openFilesInNewWindow"
:onChange="value => onSelectChange('openFilesInNewWindow', value)"
></bool>
<bool
description="Whether to open folders in a new window."
description="Open folders in new window."
:bool="openFolderInNewWindow"
:onChange="value => onSelectChange('openFolderInNewWindow', value)"
></bool>
<bool
description="Whether to hide scrollbars."
description="Hide scrollbars."
:bool="hideScrollbar"
:onChange="value => onSelectChange('hideScrollbar', value)"
></bool>
<bool
description="Whether to enable word wrap in TOC."
description="Wrap text in table of contents."
:bool="wordWrapInToc"
:onChange="value => onSelectChange('wordWrapInToc', value)"
></bool>
<bool
description="Whether to enable Aidou."
description="Use Aidou."
:bool="aidou"
:onChange="value => onSelectChange('aidou', value)"
></bool>
<separator></separator>
<cur-select
description="How to sort files in opened folders."
description="Sort field for files in open folders."
:value="fileSortBy"
:options="fileSortByOptions"
:onChange="value => onSelectChange('fileSortBy', value)"
@ -69,7 +69,7 @@
</el-radio-group>
</section>
<cur-select
description="What language Mark Text is in."
description="Language for user interface."
:value="language"
:options="languageOptions"
:onChange="value => onSelectChange('language', value)"

View File

@ -2,20 +2,20 @@
<div class="pref-image">
<h4>Image</h4>
<section class="image-ctrl">
<div>The default behavior after insert image from local folder.
<div>Default action after image is inserted from local folder.
<el-tooltip class='item' effect='dark' content='Mark Text can not get image path from paste event on Linux.' placement='top-start'>
<i class="el-icon-info"></i>
</el-tooltip>
</div>
<el-radio-group v-model="imageInsertAction">
<el-radio label="upload">Upload image to cloud by image uploader (you need to select one)</el-radio>
<el-radio label="folder">Move image to special folder</el-radio>
<el-radio label="path">Insert absolute or relative path of image</el-radio>
<el-radio label="upload">Upload to cloud using selected uploader (must be configured).</el-radio>
<el-radio label="folder">Move to designated local folder.</el-radio>
<el-radio label="path">Keep original location.</el-radio>
</el-radio-group>
</section>
<separator></separator>
<section class="image-folder">
<div class="description">The local image folder.</div>
<div class="description">Local image folder.</div>
<div class="path">{{imageFolderPath}}</div>
<div>
<el-button size="mini" @click="modifyImageFolderPath">Modify</el-button>

View File

@ -40,7 +40,7 @@
<el-input v-model="github.repo" placeholder="repo" size="mini"></el-input>
</div>
<div class="form-group">
<div class="label">Branch name(optional):</div>
<div class="label">Branch name (optional):</div>
<el-input v-model="github.branch" placeholder="branch" size="mini"></el-input>
</div>
<legal-notices-checkbox

View File

@ -40,22 +40,22 @@ export const tabSizeOptions = [{
}]
export const listIndentationOptions = [{
label: 'dfm',
label: 'DocFX style',
value: 'dfm'
}, {
label: 'tab',
label: 'True tab character',
value: 'tab'
}, {
label: '1 space',
label: 'Single space character',
value: 1
}, {
label: '2 spaces',
label: 'Two space characters',
value: 2
}, {
label: '3 spaces',
label: 'Three space characters',
value: 3
}, {
label: '4 spaces',
label: 'Four space characters',
value: 4
}]

View File

@ -2,40 +2,40 @@
<div class="pref-markdown">
<h4>markdown</h4>
<bool
description="Preferred loose list item."
description="Prefer loose list items."
:bool="preferLooseListItem"
:onChange="value => onSelectChange('preferLooseListItem', value)"
more="https://spec.commonmark.org/0.29/#loose"
></bool>
<cus-select
description="The preferred marker used in bullet list."
description="Preferred marker for bullet lists."
:value="bulletListMarker"
:options="bulletListMarkerOptions"
:onChange="value => onSelectChange('bulletListMarker', value)"
more="https://spec.commonmark.org/0.29/#bullet-list-marker"
></cus-select>
<cus-select
description="The preferred dilimiter used in order list."
description="Preferred marker for ordered lists."
:value="orderListDelimiter"
:options="orderListDelimiterOptions"
:onChange="value => onSelectChange('orderListDelimiter', value)"
more="https://spec.commonmark.org/0.29/#ordered-list"
></cus-select>
<cus-select
description="The preferred heading style"
description="Preferred heading style."
:value="preferHeadingStyle"
:options="preferHeadingStyleOptions"
:onChange="value => onSelectChange('preferHeadingStyle', value)"
:disable="true"
></cus-select>
<cus-select
description="The number of spaces a tab is equal to."
description="Preferred tab width."
:value="tabSize"
:options="tabSizeOptions"
:onChange="value => onSelectChange('tabSize', value)"
></cus-select>
<cus-select
description="The list indentation of sub list items or paragraphs."
description="Preferred list indentation."
:value="listIndentation"
:options="listIndentationOptions"
:onChange="value => onSelectChange('listIndentation', value)"
@ -43,7 +43,7 @@
<separator></separator>
<h5>Markdown extension syntax</h5>
<cus-select
description="The frontmatter type"
description="Format for front matter."
:value="frontmatterType"
:options="frontmatterTypeOptions"
:onChange="value => onSelectChange('frontmatterType', value)"

View File

@ -6,7 +6,7 @@
popper-class="pref-autocomplete"
v-model="state"
:fetch-suggestions="querySearch"
placeholder="Search preference..."
placeholder="Search preferences..."
:trigger-on-focus="false"
@select="handleSelect">
<i

View File

@ -2,33 +2,33 @@
<div class="pref-spellchecker">
<h4>Spelling</h4>
<bool
description="Whether the (experimental) spell checker is enabled."
description="Enable spell checker (experimental)."
:bool="spellcheckerEnabled"
:onChange="handleSpellcheckerEnabled"
></bool>
<separator></separator>
<bool
description="Whether Hunspell is used instead of the OS spell checker on macOS and Windows 10. The change takes effect after restarting Mark Text and for new editor windows."
description="Use Hunspell instead of system spell checker on macOS and Windows 10 (requires restart).
:bool="spellcheckerIsHunspell"
:disable="!isOsSpellcheckerSupported || !spellcheckerEnabled"
:onChange="value => onSelectChange('spellcheckerIsHunspell', value)"
></bool>
<bool
description="Don't underline spelling mistakes. You can still correct spelling mistakes via the right click menu."
description="Hide marks for spelling errors."
:bool="spellcheckerNoUnderline"
:disable="!spellcheckerEnabled"
:onChange="value => onSelectChange('spellcheckerNoUnderline', value)"
></bool>
<bool
v-show="isOsx && !spellcheckerIsHunspell"
description="Automatically identify the used language. This feature is currently unavailable when using Hunspell or if mistake underlining is disabled."
description="Automatically detect document language (requires showing marks for spelling errors).
:bool="spellcheckerAutoDetectLanguage"
:disable="!spellcheckerEnabled"
:onChange="value => onSelectChange('spellcheckerAutoDetectLanguage', value)"
></bool>
<separator></separator>
<cur-select
description="The default language for the spell checker."
description="Default language for spell checker."
:value="spellcheckerLanguage"
:options="availableDictionaries"
:disable="!spellcheckerEnabled"
@ -38,16 +38,16 @@
v-if="isOsx && !isHunspellSelected && spellcheckerEnabled"
class="description"
>
Please add required language dictionaries via "Language & Region" in your system preferences pane.
Additional languages may be added through "Language & Region" in your system preferences pane.
</div>
<div
v-if="isWindows && !isHunspellSelected && spellcheckerEnabled"
class="description"
>
Please add required language dictionaries via "Language" in your "Time & language" settings. Add the langauge and download the "Basic typing" option.
Additional languages may be added through "Language" in your "Time & language" settings.
</div>
<div v-if="isHunspellSelected && spellcheckerEnabled">
<div class="description">List of available Hunspell dictionaries. Please add additional language dictionaries via the drop-down menu below.</div>
<div class="description">Installed Hunspell dictionaries.</div>
<el-table
:data="availableDictionaries"
style="width: 100%">
@ -72,7 +72,7 @@
</el-table-column>
</el-table>
<div class="description">Download new dictionaries for Hunspell.</div>
<div class="description">Download additional Hunspell dictionaries.</div>
<div class="dictionary-group">
<el-select
v-model="selectedDictionaryToAdd"