From c79f84e5cb7f1c4633ad52de3fd8130fafcda2f5 Mon Sep 17 00:00:00 2001 From: brainchild0 <34869175+brainchild0@users.noreply.github.com> Date: Sun, 7 Jun 2020 06:57:29 -0400 Subject: [PATCH] Improve English grammar in user-interface text. (#2075) --- src/main/menu/templates/format.js | 8 ++--- src/main/menu/templates/help.js | 6 ++-- src/main/menu/templates/paragraph.js | 8 ++--- src/main/menu/templates/view.js | 6 ++-- src/main/menu/templates/window.js | 2 +- src/muya/lib/ui/formatPicker/config.js | 4 +-- src/renderer/contextMenu/editor/menuItems.js | 2 +- src/renderer/prefComponents/editor/config.js | 12 +++---- src/renderer/prefComponents/editor/index.vue | 32 +++++++++---------- src/renderer/prefComponents/general/config.js | 4 +-- src/renderer/prefComponents/general/index.vue | 18 +++++------ src/renderer/prefComponents/image/index.vue | 10 +++--- .../prefComponents/imageUploader/index.vue | 2 +- .../prefComponents/markdown/config.js | 12 +++---- .../prefComponents/markdown/index.vue | 14 ++++---- src/renderer/prefComponents/sideBar/index.vue | 2 +- .../prefComponents/spellchecker/index.vue | 18 +++++------ 17 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/main/menu/templates/format.js b/src/main/menu/templates/format.js index 68311547..c7e3b280 100644 --- a/src/main/menu/templates/format.js +++ b/src/main/menu/templates/format.js @@ -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') diff --git a/src/main/menu/templates/help.js b/src/main/menu/templates/help.js index 8d771b66..c24fea24 100755 --- a/src/main/menu/templates/help.js +++ b/src/main/menu/templates/help.js @@ -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') } diff --git a/src/main/menu/templates/paragraph.js b/src/main/menu/templates/paragraph.js index e4dd2ff3..b3a3e54f 100644 --- a/src/main/menu/templates/paragraph.js +++ b/src/main/menu/templates/paragraph.js @@ -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) { diff --git a/src/main/menu/templates/view.js b/src/main/menu/templates/view.js index c4ff0f93..6ba4bf90 100755 --- a/src/main/menu/templates/view.js +++ b/src/main/menu/templates/view.js @@ -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) { diff --git a/src/main/menu/templates/window.js b/src/main/menu/templates/window.js index 14ea1c18..c3a353e3 100755 --- a/src/main/menu/templates/window.js +++ b/src/main/menu/templates/window.js @@ -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) { diff --git a/src/muya/lib/ui/formatPicker/config.js b/src/muya/lib/ui/formatPicker/config.js index 84981c10..a49dfa3a 100644 --- a/src/muya/lib/ui/formatPicker/config.js +++ b/src/muya/lib/ui/formatPicker/config.js @@ -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 } diff --git a/src/renderer/contextMenu/editor/menuItems.js b/src/renderer/contextMenu/editor/menuItems.js index 14d2e1a0..9d370b87 100644 --- a/src/renderer/contextMenu/editor/menuItems.js +++ b/src/renderer/contextMenu/editor/menuItems.js @@ -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() diff --git a/src/renderer/prefComponents/editor/config.js b/src/renderer/prefComponents/editor/config.js index 50ce9987..6fc3eaa5 100644 --- a/src/renderer/prefComponents/editor/config.js +++ b/src/renderer/prefComponents/editor/config.js @@ -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 }] diff --git a/src/renderer/prefComponents/editor/index.vue b/src/renderer/prefComponents/editor/index.vue index 67848da5..603eb4c3 100644 --- a/src/renderer/prefComponents/editor/index.vue +++ b/src/renderer/prefComponents/editor/index.vue @@ -2,7 +2,7 @@