diff --git a/bin/mssql.ResX.nupkg b/bin/mssql.ResX.nupkg
new file mode 100644
index 00000000..0012be07
Binary files /dev/null and b/bin/mssql.ResX.nupkg differ
diff --git a/bin/mssql.XliffParser.nupkg b/bin/mssql.XliffParser.nupkg
new file mode 100644
index 00000000..dbae7fbf
Binary files /dev/null and b/bin/mssql.XliffParser.nupkg differ
diff --git a/build.cake b/build.cake
index 595c7818..9005628b 100644
--- a/build.cake
+++ b/build.cake
@@ -1,4 +1,6 @@
 #addin "Newtonsoft.Json"
+#addin "mssql.ResX"
+#addin "mssql.XliffParser"
 
 #load "scripts/runhelpers.cake"
 #load "scripts/archiving.cake"
@@ -9,7 +11,8 @@ using System.ComponentModel;
 using System.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Cake.Common.IO
+using Cake.Common.IO;
+using XliffParser;
 
 // Basic arguments
 var target = Argument("target", "Default");
@@ -510,39 +513,58 @@ Task("SetPackageVersions")
 Task("SRGen")
 	.Does(() =>
 {
-	var projects = System.IO.Directory.GetFiles(sourceFolder, "project.json", SearchOption.AllDirectories).ToList();
-	foreach(var project in projects) {
-		var projectDir = System.IO.Path.GetDirectoryName(project);
-		var projectName = (new System.IO.DirectoryInfo(projectDir)).Name;
-		var projectStrings = System.IO.Path.Combine(projectDir, "sr.strings");
+    var projects = System.IO.Directory.GetFiles(sourceFolder, "project.json", SearchOption.AllDirectories).ToList();
 
-		if (!System.IO.File.Exists(projectStrings))
-		{
-			Information("Project {0} doesn't contain 'sr.strings' file", projectName);
-			continue;
-		}
+    foreach(var project in projects) {
+        var projectDir = System.IO.Path.GetDirectoryName(project);
+        var localizationDir = System.IO.Path.Combine(projectDir, "Localization");  
+        var projectName = (new System.IO.DirectoryInfo(projectDir)).Name;
+        var projectNameSpace = projectName + ".Localization";
+        var projectStrings = System.IO.Path.Combine(localizationDir, "sr.strings");
 
-		var srgenPath = System.IO.Path.Combine(toolsFolder, "Microsoft.DataTools.SrGen", "lib", "netcoreapp1.0", "srgen.dll");
-		var outputResx = System.IO.Path.Combine(projectDir, "sr.resx");
-		var outputCs = System.IO.Path.Combine(projectDir, "sr.cs");
+        if (!System.IO.File.Exists(projectStrings))
+        {
+            Information("Project {0} doesn't contain 'sr.strings' file", projectName);
+            continue;
+        }
 
-		// Delete preexisting resx and designer files
-		if (System.IO.File.Exists(outputResx))
-		{
-			System.IO.File.Delete(outputResx);
-		}
-		if (System.IO.File.Exists(outputCs))
-		{
-			System.IO.File.Delete(outputCs);
-		}
+        var srgenPath = System.IO.Path.Combine(toolsFolder, "Microsoft.DataTools.SrGen", "lib", "netcoreapp1.0", "srgen.dll");
+        var outputResx = System.IO.Path.Combine(localizationDir, "sr.resx");
+        var inputXliff = System.IO.Path.Combine(localizationDir, "transXliff");
+        var outputXlf = System.IO.Path.Combine(localizationDir, "sr.xlf");
+        var outputCs = System.IO.Path.Combine(localizationDir, "sr.cs");
 
-		// Run SRGen
-		var dotnetArgs = string.Format("{0} -or \"{1}\" -oc \"{2}\" -ns \"{3}\" -an \"{4}\" -cn SR -l CS -dnx \"{5}\"",
-			srgenPath, outputResx, outputCs, projectName, projectName, projectStrings);
-		Information("{0}", dotnetArgs);
-		Run(dotnetcli, dotnetArgs)
-			.ExceptionOnError("Failed to run SRGen.");
-	}
+        // Delete preexisting resx and designer files
+        if (System.IO.File.Exists(outputResx))
+        {
+            System.IO.File.Delete(outputResx);
+        }
+        if (System.IO.File.Exists(outputCs))
+        {
+            System.IO.File.Delete(outputCs);
+        }
+
+        // Run SRGen
+        var dotnetArgs = string.Format("{0} -or \"{1}\" -oc \"{2}\" -ns \"{3}\" -an \"{4}\" -cn SR -l CS -dnx \"{5}\"",
+        srgenPath, outputResx, outputCs, projectName, projectNameSpace, projectStrings);
+        Information("{0}", dotnetArgs);
+        Run(dotnetcli, dotnetArgs)
+        .ExceptionOnError("Failed to run SRGen.");
+
+        // Update XLF file from new Resx file
+        var doc = new XliffParser.XlfDocument(outputXlf);
+        doc.UpdateFromSource();
+        doc.Save();
+
+        // Update ResX files from new xliff files
+        var xlfDocNames = System.IO.Directory.GetFiles(inputXliff, "*.xlf", SearchOption.AllDirectories).ToList();
+        foreach(var docName in xlfDocNames)
+        {
+            var xlfDoc = new XliffParser.XlfDocument(docName);
+            var newPath = System.IO.Path.Combine(localizationDir, System.IO.Path.GetFileName(docName));
+            xlfDoc.SaveAsResX(newPath.Replace("xlf","resx"));        
+        }
+    }
 });
 
 /// <summary>
diff --git a/scripts/cake-bootstrap.ps1 b/scripts/cake-bootstrap.ps1
index 7f0bc382..a6e34175 100644
--- a/scripts/cake-bootstrap.ps1
+++ b/scripts/cake-bootstrap.ps1
@@ -89,6 +89,7 @@ if(-Not $SkipToolPackageRestore.IsPresent)
     Set-Location $TOOLS_DIR
 
     Write-Verbose -Message "Restoring tools from NuGet..."
+    $NuGetConfig = Invoke-Expression "&`"$NUGET_EXE`" config -configfile ../nuget.config"
     $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install $PACKAGES_CONFIG -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
     Write-Verbose -Message ($NuGetOutput | out-string)
 
diff --git a/scripts/cake-bootstrap.sh b/scripts/cake-bootstrap.sh
index abc3ed43..6d8f0664 100644
--- a/scripts/cake-bootstrap.sh
+++ b/scripts/cake-bootstrap.sh
@@ -48,6 +48,7 @@ fi
 
 # Restore tools from NuGet.
 pushd "$TOOLS_DIR" >/dev/null
+mono "$NUGET_EXE" config -configfile ../nuget.config
 mono "$NUGET_EXE" install "$PACKAGES_CONFIG" -ExcludeVersion -OutputDirectory "$TOOLS_DIR"
 if [ $? -ne 0 ]; then
     echo "Could not restore NuGet packages."
diff --git a/scripts/packages.config b/scripts/packages.config
index fd0de851..10e4f480 100644
--- a/scripts/packages.config
+++ b/scripts/packages.config
@@ -4,4 +4,5 @@
     <package id="Newtonsoft.Json" version="8.0.3" />
     <package id="Microsoft.DataTools.SrGen" version="1.0.2" />
     <package id="Mono.TextTransform" version="1.0.0" />
+    <package id="mssql.XliffParser" version="0.5.3" />
 </packages>
\ No newline at end of file
diff --git a/src/Microsoft.SqlTools.ServiceLayer/sr.Designer.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.Designer.cs
similarity index 100%
rename from src/Microsoft.SqlTools.ServiceLayer/sr.Designer.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Localization/sr.Designer.cs
diff --git a/src/Microsoft.SqlTools.ServiceLayer/sr.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/sr.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
index dd310334..221bfe95 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/sr.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
@@ -788,7 +788,7 @@ namespace Microsoft.SqlTools.ServiceLayer
         [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
         public class Keys
         {
-            static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ServiceLayer.SR", typeof(SR).GetTypeInfo().Assembly);
+            static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ServiceLayer.Localization.SR", typeof(SR).GetTypeInfo().Assembly);
 
             static CultureInfo _culture = null;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/sr.es.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/sr.es.resx
rename to src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx
index b1657f70..d65a6f96 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/sr.es.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/sr.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
similarity index 100%
rename from src/Microsoft.SqlTools.ServiceLayer/sr.resx
rename to src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
diff --git a/src/Microsoft.SqlTools.ServiceLayer/sr.strings b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/sr.strings
rename to src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
index 90ea969c..12108e6a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/sr.strings
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
@@ -63,10 +63,15 @@ CredentialServiceWin32CredentialDisposed = Win32Credential object is already dis
 # Extensibility
 
 ServiceAlreadyRegistered = Cannot register service for type {0}, one or more services already registered
+
 MultipleServicesFound = Multiple services found for type {0}, expected only 1
+
 IncompatibleServiceForExtensionLoader = Service of type {0} cannot be created by ExtensionLoader<{1}>
+
 ServiceProviderNotSet = SetServiceProvider() was not called to establish the required service provider
+
 ServiceNotFound = Service {0} was not found in the service provider
+
 ServiceNotOfExpectedType = Service of Type {0} is not compatible with registered Type {1}
 
 ############################################################################
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
new file mode 100644
index 00000000..fdf394be
--- /dev/null
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
@@ -0,0 +1,514 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" original="sr.resx" source-language="en">
+    <body>
+      <trans-unit id="ConnectionServiceConnectErrorNullParams">
+        <source>Connection parameters cannot be null</source>
+        <target state="new">Connection parameters cannot be null</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ConnectionServiceListDbErrorNullOwnerUri">
+        <source>OwnerUri cannot be null or empty</source>
+        <target state="new">OwnerUri cannot be null or empty</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ConnectionServiceListDbErrorNotConnected">
+        <source>SpecifiedUri '{0}' does not have existing connection</source>
+        <target state="new">SpecifiedUri '{0}' does not have existing connection</target>
+        <note>.
+ Parameters: 0 - uri (string) </note>
+      </trans-unit>
+      <trans-unit id="ConnectionServiceConnStringInvalidAuthType">
+        <source>Invalid value '{0}' for AuthenticationType.  Valid values are 'Integrated' and 'SqlLogin'.</source>
+        <target state="new">Invalid value '{0}' for AuthenticationType.  Valid values are 'Integrated' and 'SqlLogin'.</target>
+        <note>.
+ Parameters: 0 - authType (string) </note>
+      </trans-unit>
+      <trans-unit id="ConnectionServiceConnStringInvalidIntent">
+        <source>Invalid value '{0}' for ApplicationIntent. Valid values are 'ReadWrite' and 'ReadOnly'.</source>
+        <target state="new">Invalid value '{0}' for ApplicationIntent. Valid values are 'ReadWrite' and 'ReadOnly'.</target>
+        <note>.
+ Parameters: 0 - intent (string) </note>
+      </trans-unit>
+      <trans-unit id="ConnectionServiceConnectionCanceled">
+        <source>Connection canceled</source>
+        <target state="new">Connection canceled</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ConnectionParamsValidateNullOwnerUri">
+        <source>OwnerUri cannot be null or empty</source>
+        <target state="new">OwnerUri cannot be null or empty</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ConnectionParamsValidateNullConnection">
+        <source>Connection details object cannot be null</source>
+        <target state="new">Connection details object cannot be null</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ConnectionParamsValidateNullServerName">
+        <source>ServerName cannot be null or empty</source>
+        <target state="new">ServerName cannot be null or empty</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ConnectionParamsValidateNullSqlAuth">
+        <source>{0} cannot be null or empty when using SqlLogin authentication</source>
+        <target state="new">{0} cannot be null or empty when using SqlLogin authentication</target>
+        <note>.
+ Parameters: 0 - component (string) </note>
+      </trans-unit>
+      <trans-unit id="CredentialsServiceInvalidCriticalHandle">
+        <source>Invalid CriticalHandle!</source>
+        <target state="new">Invalid CriticalHandle!</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="CredentialsServicePasswordLengthExceeded">
+        <source>The password has exceeded 512 bytes</source>
+        <target state="new">The password has exceeded 512 bytes</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="CredentialsServiceTargetForDelete">
+        <source>Target must be specified to delete a credential</source>
+        <target state="new">Target must be specified to delete a credential</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="CredentialsServiceTargetForLookup">
+        <source>Target must be specified to check existance of a credential</source>
+        <target state="new">Target must be specified to check existance of a credential</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="CredentialServiceWin32CredentialDisposed">
+        <source>Win32Credential object is already disposed</source>
+        <target state="new">Win32Credential object is already disposed</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="HostingUnexpectedEndOfStream">
+        <source>MessageReader's input stream ended unexpectedly, terminating</source>
+        <target state="new">MessageReader's input stream ended unexpectedly, terminating</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="HostingHeaderMissingColon">
+        <source>Message header must separate key and value using ':'</source>
+        <target state="new">Message header must separate key and value using ':'</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="HostingHeaderMissingContentLengthHeader">
+        <source>Fatal error: Content-Length header must be provided</source>
+        <target state="new">Fatal error: Content-Length header must be provided</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="HostingHeaderMissingContentLengthValue">
+        <source>Fatal error: Content-Length value is not an integer</source>
+        <target state="new">Fatal error: Content-Length value is not an integer</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceCancelAlreadyCompleted">
+        <source>The query has already completed, it cannot be cancelled</source>
+        <target state="new">The query has already completed, it cannot be cancelled</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceCancelDisposeFailed">
+        <source>Query successfully cancelled, failed to dispose query. Owner URI not found.</source>
+        <target state="new">Query successfully cancelled, failed to dispose query. Owner URI not found.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceQueryCancelled">
+        <source>Query was canceled by user</source>
+        <target state="new">Query was canceled by user</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceSubsetBatchNotCompleted">
+        <source>The batch has not completed, yet</source>
+        <target state="new">The batch has not completed, yet</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceSubsetBatchOutOfRange">
+        <source>Batch index cannot be less than 0 or greater than the number of batches</source>
+        <target state="new">Batch index cannot be less than 0 or greater than the number of batches</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceSubsetResultSetOutOfRange">
+        <source>Result set index cannot be less than 0 or greater than the number of result sets</source>
+        <target state="new">Result set index cannot be less than 0 or greater than the number of result sets</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceDataReaderByteCountInvalid">
+        <source>Maximum number of bytes to return must be greater than zero</source>
+        <target state="new">Maximum number of bytes to return must be greater than zero</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceDataReaderCharCountInvalid">
+        <source>Maximum number of chars to return must be greater than zero</source>
+        <target state="new">Maximum number of chars to return must be greater than zero</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceDataReaderXmlCountInvalid">
+        <source>Maximum number of XML bytes to return must be greater than zero</source>
+        <target state="new">Maximum number of XML bytes to return must be greater than zero</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceFileWrapperWriteOnly">
+        <source>Access method cannot be write-only</source>
+        <target state="new">Access method cannot be write-only</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceFileWrapperNotInitialized">
+        <source>FileStreamWrapper must be initialized before performing operations</source>
+        <target state="new">FileStreamWrapper must be initialized before performing operations</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceFileWrapperReadOnly">
+        <source>This FileStreamWrapper cannot be used for writing</source>
+        <target state="new">This FileStreamWrapper cannot be used for writing</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceAffectedOneRow">
+        <source>(1 row affected)</source>
+        <target state="new">(1 row affected)</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceAffectedRows">
+        <source>({0} rows affected)</source>
+        <target state="new">({0} rows affected)</target>
+        <note>.
+ Parameters: 0 - rows (long) </note>
+      </trans-unit>
+      <trans-unit id="QueryServiceCompletedSuccessfully">
+        <source>Commands completed successfully.</source>
+        <target state="new">Commands completed successfully.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceErrorFormat">
+        <source>Msg {0}, Level {1}, State {2}, Line {3}{4}{5}</source>
+        <target state="new">Msg {0}, Level {1}, State {2}, Line {3}{4}{5}</target>
+        <note>.
+ Parameters: 0 - msg (int), 1 - lvl (int), 2 - state (int), 3 - line (int), 4 - newLine (string), 5 - message (string) </note>
+      </trans-unit>
+      <trans-unit id="QueryServiceQueryFailed">
+        <source>Query failed: {0}</source>
+        <target state="new">Query failed: {0}</target>
+        <note>.
+ Parameters: 0 - message (string) </note>
+      </trans-unit>
+      <trans-unit id="QueryServiceColumnNull">
+        <source>(No column name)</source>
+        <target state="new">(No column name)</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceRequestsNoQuery">
+        <source>The requested query does not exist</source>
+        <target state="new">The requested query does not exist</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceQueryInvalidOwnerUri">
+        <source>This editor is not connected to a database</source>
+        <target state="new">This editor is not connected to a database</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceQueryInProgress">
+        <source>A query is already in progress for this editor session. Please cancel this query or wait for its completion.</source>
+        <target state="new">A query is already in progress for this editor session. Please cancel this query or wait for its completion.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceMessageSenderNotSql">
+        <source>Sender for OnInfoMessage event must be a SqlConnection</source>
+        <target state="new">Sender for OnInfoMessage event must be a SqlConnection</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceResultSetReaderNull">
+        <source>Reader cannot be null</source>
+        <target state="new">Reader cannot be null</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceSaveAsResultSetNotComplete">
+        <source>Result cannot be saved until query execution has completed</source>
+        <target state="new">Result cannot be saved until query execution has completed</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceSaveAsMiscStartingError">
+        <source>Internal error occurred while starting save task</source>
+        <target state="new">Internal error occurred while starting save task</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceSaveAsInProgress">
+        <source>A save request to the same path is in progress</source>
+        <target state="new">A save request to the same path is in progress</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceSaveAsFail">
+        <source>Failed to save {0}: {1}</source>
+        <target state="new">Failed to save {0}: {1}</target>
+        <note>.
+ Parameters: 0 - fileName (string), 1 - message (string) </note>
+      </trans-unit>
+      <trans-unit id="QueryServiceResultSetNotRead">
+        <source>Cannot read subset unless the results have been read from the server</source>
+        <target state="new">Cannot read subset unless the results have been read from the server</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceResultSetStartRowOutOfRange">
+        <source>Start row cannot be less than 0 or greater than the number of rows in the result set</source>
+        <target state="new">Start row cannot be less than 0 or greater than the number of rows in the result set</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceResultSetRowCountOutOfRange">
+        <source>Row count must be a positive integer</source>
+        <target state="new">Row count must be a positive integer</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceResultSetNoColumnSchema">
+        <source>Could not retrieve column schema for result set</source>
+        <target state="new">Could not retrieve column schema for result set</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="QueryServiceExecutionPlanNotFound">
+        <source>Could not retrieve an execution plan from the result set </source>
+        <target state="new">Could not retrieve an execution plan from the result set </target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="PeekDefinitionAzureError">
+        <source>This feature is currently not supported on Azure SQL DB and Data Warehouse: {0}</source>
+        <target state="new">This feature is currently not supported on Azure SQL DB and Data Warehouse: {0}</target>
+        <note>.
+ Parameters: 0 - errorMessage (string) </note>
+      </trans-unit>
+      <trans-unit id="PeekDefinitionError">
+        <source>An unexpected error occurred during Peek Definition execution: {0}</source>
+        <target state="new">An unexpected error occurred during Peek Definition execution: {0}</target>
+        <note>.
+ Parameters: 0 - errorMessage (string) </note>
+      </trans-unit>
+      <trans-unit id="PeekDefinitionNoResultsError">
+        <source>No results were found.</source>
+        <target state="new">No results were found.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="PeekDefinitionDatabaseError">
+        <source>No database object was retrieved.</source>
+        <target state="new">No database object was retrieved.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="PeekDefinitionNotConnectedError">
+        <source>Please connect to a server.</source>
+        <target state="new">Please connect to a server.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="PeekDefinitionTimedoutError">
+        <source>Operation timed out.</source>
+        <target state="new">Operation timed out.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="PeekDefinitionTypeNotSupportedError">
+        <source>This object type is currently not supported by this feature.</source>
+        <target state="new">This object type is currently not supported by this feature.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="WorkspaceServicePositionLineOutOfRange">
+        <source>Position is outside of file line range</source>
+        <target state="new">Position is outside of file line range</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="WorkspaceServicePositionColumnOutOfRange">
+        <source>Position is outside of column range for line {0}</source>
+        <target state="new">Position is outside of column range for line {0}</target>
+        <note>.
+ Parameters: 0 - line (int) </note>
+      </trans-unit>
+      <trans-unit id="WorkspaceServiceBufferPositionOutOfOrder">
+        <source>Start position ({0}, {1}) must come before or be equal to the end position ({2}, {3})</source>
+        <target state="new">Start position ({0}, {1}) must come before or be equal to the end position ({2}, {3})</target>
+        <note>.
+ Parameters: 0 - sLine (int), 1 - sCol (int), 2 - eLine (int), 3 - eCol (int) </note>
+      </trans-unit>
+      <trans-unit id="EE_BatchSqlMessageNoProcedureInfo">
+        <source>Msg {0}, Level {1}, State {2}, Line {3}</source>
+        <target state="new">Msg {0}, Level {1}, State {2}, Line {3}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_BatchSqlMessageWithProcedureInfo">
+        <source>Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4}</source>
+        <target state="new">Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_BatchSqlMessageNoLineInfo">
+        <source>Msg {0}, Level {1}, State {2}</source>
+        <target state="new">Msg {0}, Level {1}, State {2}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_BatchError_Exception">
+        <source>An error occurred while the batch was being processed. The error message is: {0}</source>
+        <target state="new">An error occurred while the batch was being processed. The error message is: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_BatchExecutionInfo_RowsAffected">
+        <source>({0} row(s) affected)</source>
+        <target state="new">({0} row(s) affected)</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ExecutionNotYetCompleteError">
+        <source>The previous execution is not yet complete.</source>
+        <target state="new">The previous execution is not yet complete.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ScriptError_Error">
+        <source>A scripting error occurred.</source>
+        <target state="new">A scripting error occurred.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ScriptError_ParsingSyntax">
+        <source>Incorrect syntax was encountered while {0} was being parsed.</source>
+        <target state="new">Incorrect syntax was encountered while {0} was being parsed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ScriptError_FatalError">
+        <source>A fatal error occurred.</source>
+        <target state="new">A fatal error occurred.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ExecutionInfo_FinalizingLoop">
+        <source>Execution completed {0} times...</source>
+        <target state="new">Execution completed {0} times...</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ExecutionInfo_QueryCancelledbyUser">
+        <source>You cancelled the query.</source>
+        <target state="new">You cancelled the query.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_BatchExecutionError_Halting">
+        <source>An error occurred while the batch was being executed.</source>
+        <target state="new">An error occurred while the batch was being executed.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_BatchExecutionError_Ignoring">
+        <source>An error occurred while the batch was being executed, but the error has been ignored.</source>
+        <target state="new">An error occurred while the batch was being executed, but the error has been ignored.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+        <source>Starting execution loop of {0} times...</source>
+        <target state="new">Starting execution loop of {0} times...</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ExecutionError_CommandNotSupported">
+        <source>Command {0} is not supported.</source>
+        <target state="new">Command {0} is not supported.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ExecutionError_VariableNotFound">
+        <source>The variable {0} could not be found.</source>
+        <target state="new">The variable {0} could not be found.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParserWrapperExecutionEngineError">
+        <source>SQL Execution error: {0}</source>
+        <target state="new">SQL Execution error: {0}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParserWrapperExecutionError">
+        <source>Batch parser wrapper execution: {0} found... at line {1}: {2}    Description: {3}</source>
+        <target state="new">Batch parser wrapper execution: {0} found... at line {1}: {2}    Description: {3}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParserWrapperExecutionEngineBatchMessage">
+        <source>Batch parser wrapper execution engine batch message received:  Message: {0}    Detailed message: {1}</source>
+        <target state="new">Batch parser wrapper execution engine batch message received:  Message: {0}    Detailed message: {1}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParserWrapperExecutionEngineBatchResultSetProcessing">
+        <source>Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0}  DataReader.RecordsAffected: {1}</source>
+        <target state="new">Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0}  DataReader.RecordsAffected: {1}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParserWrapperExecutionEngineBatchResultSetFinished">
+        <source>Batch parser wrapper execution engine batch ResultSet finished.</source>
+        <target state="new">Batch parser wrapper execution engine batch ResultSet finished.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParserWrapperExecutionEngineBatchCancelling">
+        <source>Canceling batch parser wrapper batch execution.</source>
+        <target state="new">Canceling batch parser wrapper batch execution.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="EE_ScriptError_Warning">
+        <source>Scripting warning.</source>
+        <target state="new">Scripting warning.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="TroubleshootingAssistanceMessage">
+        <source>For more information about this error, see the troubleshooting topics in the product documentation.</source>
+        <target state="new">For more information about this error, see the troubleshooting topics in the product documentation.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParser_CircularReference">
+        <source>File '{0}' recursively included.</source>
+        <target state="new">File '{0}' recursively included.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParser_CommentNotTerminated">
+        <source>Missing end comment mark '*/'.</source>
+        <target state="new">Missing end comment mark '*/'.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParser_StringNotTerminated">
+        <source>Unclosed quotation mark after the character string.</source>
+        <target state="new">Unclosed quotation mark after the character string.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParser_IncorrectSyntax">
+        <source>Incorrect syntax was encountered while parsing '{0}'.</source>
+        <target state="new">Incorrect syntax was encountered while parsing '{0}'.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="BatchParser_VariableNotDefined">
+        <source>Variable {0} is not defined.</source>
+        <target state="new">Variable {0} is not defined.</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="TestLocalizationConstant">
+        <source>EN_LOCALIZATION</source>
+        <target state="new">EN_LOCALIZATION</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ServiceAlreadyRegistered">
+        <source>Cannot register service for type {0}, one or more services already registered</source>
+        <target state="new">Cannot register service for type {0}, one or more services already registered</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="MultipleServicesFound">
+        <source>Multiple services found for type {0}, expected only 1</source>
+        <target state="new">Multiple services found for type {0}, expected only 1</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="IncompatibleServiceForExtensionLoader">
+        <source>Service of type {0} cannot be created by ExtensionLoader&lt;{1}&gt;</source>
+        <target state="new">Service of type {0} cannot be created by ExtensionLoader&lt;{1}&gt;</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ServiceProviderNotSet">
+        <source>SetServiceProvider() was not called to establish the required service provider</source>
+        <target state="new">SetServiceProvider() was not called to establish the required service provider</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ServiceNotFound">
+        <source>Service {0} was not found in the service provider</source>
+        <target state="new">Service {0} was not found in the service provider</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ServiceNotOfExpectedType">
+        <source>Service of Type {0} is not compatible with registered Type {1}</source>
+        <target state="new">Service of Type {0} is not compatible with registered Type {1}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCodeObjectType">
+        <source>Cannot convert SqlCodeObject Type {0} to Type {1}</source>
+        <target state="new">Cannot convert SqlCodeObject Type {0} to Type {1}</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="ErrorEmptyStringReplacement">
+        <source>Replacement of an empty string by an empty string.</source>
+        <target state="new">Replacement of an empty string by an empty string.</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.es.xlf b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.es.xlf
new file mode 100644
index 00000000..3860e1bf
--- /dev/null
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.es.xlf
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" original="sr.es.resx" source-language="en" target-language="es">
+    <body>
+      <trans-unit id="TestLocalizationConstant">
+        <source>ES_LOCALIZATION</source>
+        <target state="new">ES_LOCALIZATION</target>
+        <note></note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file