Merge remote-tracking branch 'refs/remotes/upstream/master'

I updated a little bit of typos and grammatical errors in the en/setting.json

app/view/make/language/en/setting.json

@@ -13,13 +13,13 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
+  "backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "webview": "Webview Integration",
-  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
+  "webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
   "theme": "Themes",
   "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
@@ -28,7 +28,7 @@
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
   "width": "Width of columns",
-  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
   "margin": "Margin between timelines",
@@ -37,7 +37,7 @@
   "fontwarn": "Select your favorite font to 'Select'(On Linux, it may not work.)",
   "fontsize": "Font size",
   "savefolder": "Folder to save",
-  "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
   "useragent":"User agent",
   "useragentWarn":"Restart when changed",
   "frame": "Window frame",
@@ -61,7 +61,7 @@
   "modalFooter": "Background of modal window's footer",
   "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
   "forthColor": "Title bar(same scheme to Background)",
-  "bottom":"Background of menu-bar at bottom of window",
+  "bottom":"Background of menu-bar at the bottom of the window",
   "emphasized": "Emphasized toot's background",
   "postbox":"Background of post-box and menu",
   "active": "Background of 'active' elements",
@@ -163,7 +163,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",
@@ -230,7 +230,7 @@
   "reply": "Reply to this toot",
   "keyselecttop": "Select the top & left(No.1 column) toot",
   "reset": "Reset(Danger)",
-  "resetconfirm": "Delete all data. You cannot undo. Continue?",
+  "resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
   "about": "About TheDesk",
   "hp": "Website",
   "support": "Support",