From 8fc488e09735a5ae82121103e755d18ccc8aa6b8 Mon Sep 17 00:00:00 2001
From: YFdyh000 <yfdyh000@gmail.com>
Date: Sat, 22 Jul 2017 21:04:25 +0800
Subject: [PATCH] Fixes some extensions strings missing for i18n

---
 extensions/css/package.json            | 8 ++++----
 extensions/css/package.nls.json        | 4 ++++
 extensions/html/package.json           | 2 +-
 extensions/html/package.nls.json       | 1 +
 extensions/merge-conflict/package.json | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/extensions/css/package.json b/extensions/css/package.json
index 88da0e07ff7..787f7e09624 100644
--- a/extensions/css/package.json
+++ b/extensions/css/package.json
@@ -57,7 +57,7 @@
           "title": "CSS",
           "allOf": [
             {
-              "title": "Controls CSS validation and problem severities.",
+              "title": "%css.validate.title%",
               "properties": {
                 "css.validate": {
                   "type": "boolean",
@@ -257,7 +257,7 @@
                     "verbose"
                   ],
                   "default": "off",
-                  "description": "Traces the communication between VS Code and the CSS language server."
+                  "description": "%css.trace.server.desc%"
                 }
               }
             }
@@ -269,7 +269,7 @@
           "title": "SCSS (Sass)",
           "allOf": [
             {
-              "title": "Controls SCSS validation and problem severities.",
+              "title": "%scss.validate.title%",
               "properties": {
                 "scss.validate": {
                   "type": "boolean",
@@ -472,7 +472,7 @@
           "title": "LESS",
           "allOf": [
             {
-              "title": "Controls LESS validation and problem severities.",
+              "title": "%less.validate.title%",
               "properties": {
                 "less.validate": {
                   "type": "boolean",
diff --git a/extensions/css/package.nls.json b/extensions/css/package.nls.json
index a5f76536626..e3a08ea95ff 100644
--- a/extensions/css/package.nls.json
+++ b/extensions/css/package.nls.json
@@ -17,6 +17,8 @@
 	"css.lint.unknownVendorSpecificProperties.desc": "Unknown vendor specific property.",
 	"css.lint.vendorPrefix.desc": "When using a vendor-specific prefix also include the standard property",
 	"css.lint.zeroUnits.desc": "No unit for zero needed",
+	"css.trace.server.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
+	"css.validate.title": "Controls CSS validation and problem severities.",
 	"css.validate.desc": "Enables or disables all validations",
 	"less.lint.argumentsInColorFunction.desc": "Invalid number of parameters",
 	"less.lint.boxModel.desc": "Do not use width or height when using padding or border",
@@ -36,6 +38,7 @@
 	"less.lint.unknownVendorSpecificProperties.desc": "Unknown vendor specific property.",
 	"less.lint.vendorPrefix.desc": "When using a vendor-specific prefix also include the standard property",
 	"less.lint.zeroUnits.desc": "No unit for zero needed",
+	"less.validate.title": "Controls LESS validation and problem severities.",
 	"less.validate.desc": "Enables or disables all validations",
 	"scss.lint.argumentsInColorFunction.desc": "Invalid number of parameters",
 	"scss.lint.boxModel.desc": "Do not use width or height when using padding or border",
@@ -55,6 +58,7 @@
 	"scss.lint.unknownVendorSpecificProperties.desc": "Unknown vendor specific property.",
 	"scss.lint.vendorPrefix.desc": "When using a vendor-specific prefix also include the standard property",
 	"scss.lint.zeroUnits.desc": "No unit for zero needed",
+	"scss.validate.title": "Controls SCSS validation and problem severities.",
 	"scss.validate.desc": "Enables or disables all validations",
 	"less.colorDecorators.enable.desc": "Enables or disables color decorators",
 	"scss.colorDecorators.enable.desc": "Enables or disables color decorators",
diff --git a/extensions/html/package.json b/extensions/html/package.json
index f79ac361538..3c3963880c6 100644
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@@ -185,7 +185,7 @@
             "verbose"
           ],
           "default": "off",
-          "description": "Traces the communication between VS Code and the HTML language server."
+          "description": "%html.trace.server.desc%"
         }
       }
     }
diff --git a/extensions/html/package.nls.json b/extensions/html/package.nls.json
index b27892fe954..6bf0f1717cb 100644
--- a/extensions/html/package.nls.json
+++ b/extensions/html/package.nls.json
@@ -17,6 +17,7 @@
 	"html.suggest.angular1.desc":  "Configures if the built-in HTML language support suggests Angular V1 tags and properties.",
 	"html.suggest.ionic.desc": "Configures if the built-in HTML language support suggests Ionic tags, properties and values.",
 	"html.suggest.html5.desc":"Configures if the built-in HTML language support suggests HTML5 tags, properties and values.",
+	"html.trace.server.desc": "Traces the communication between VS Code and the HTML language server.",
 	"html.validate.scripts": "Configures if the built-in HTML language support validates embedded scripts.",
 	"html.validate.styles": "Configures if the built-in HTML language support validates embedded styles."
 }
\ No newline at end of file
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 05fa4d772e8..4ecece640ea 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -43,7 +43,7 @@
       },
       {
         "category": "%command.category%",
-        "title": "Accept selection",
+        "title": "%command.accept.selection%",
         "command": "merge-conflict.accept.selection"
       },
       {