CSM 36 Beta 2

CSM/beta/VersionFeed.xml

@@ -5,7 +5,30 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager beta version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-06-03T00:00:00Z</updated>
+  <updated>2020-06-05T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:F8EFE628-42BC-4B0E-92E8-BDC88C1C14E0</id>
+    <title>1.1.36 (1.1.36.2)</title>
+    <summary>1.1.36.2</summary>
+    <link href="" />
+    <updated>2020-06-05T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Globalisation - added some additional strings to the globalisation files.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:855F4319-6E7D-4DB7-A7C8-AD6DC2A4C074</id>

CSM/beta/en-US.xaml

@@ -8,6 +8,8 @@
     >
 
     <!--#region Generic -->
+    <sys:String x:Key="Generic_TranslatedByLabel">Last Updated By:</sys:String>
+    <sys:String x:Key="Generic_TranslatedBy">unknown</sys:String>
     <sys:String x:Key="Generic_ErrorLabel">Error</sys:String>
     <!--#endregion-->
 
@@ -896,6 +898,7 @@
     <sys:String x:Key="ServerSettings_UpdateServer_NoSteamCredentialsLabel">The server update failed as the steam username or password has not been setup in the Global Settings.</sys:String>
     <sys:String x:Key="ServerSettings_BackupServer_Title">Backup Server</sys:String>
     <sys:String x:Key="ServerSettings_BackupServer_FailedTitle">Backup Server Error</sys:String>
+    <sys:String x:Key="ServerSettings_BackupServer_SuccessfulLabel">The backup was successful.</sys:String>
     <sys:String x:Key="ServerSettings_ShutdownServer_FailedTitle">Shutdown Server Error</sys:String>
     <sys:String x:Key="ServerSettings_ShutdownServer_CancelledTitle">Shutdown Server Cancelled</sys:String>
     <sys:String x:Key="ServerSettings_ShutdownServer_AlreadyOpenLabel">The shutdown window is already open for this server.</sys:String>
@@ -1077,6 +1080,9 @@
     <!--#endregion-->
 
     <!--#region Profile Validation -->
+    <sys:String x:Key="ProfileValidation_Title">Profile Validation</sys:String>
+    <sys:String x:Key="ProfileValidation_WarningLabel">The following validation problems were encountered.\r\n\r\n{validateMessage}\r\n\r\nDo you want to continue with the server start, this could cause problems?</sys:String>
+
     <sys:String x:Key="ProfileValidation_ServerPort">The server port is outside the valid range ({PortMinimum}-{PortMaximum}).</sys:String>
     <sys:String x:Key="ProfileValidation_ServerPeerPort">The server peer port is outside the valid range ({PortMinimum}-{PortMaximum}).</sys:String>
     <sys:String x:Key="ProfileValidation_QueryPort">The query port is outside the valid range ({PortMinimum}-{PortMaximum}).</sys:String>
@@ -1109,4 +1115,9 @@
     <sys:String x:Key="RestoreSaveFiles_MissingWorldSaveFile">The backup does not contain the world save file.</sys:String>
     <!--#endregion-->
 
+    <!--#region Server Update -->
+    <sys:String x:Key="ServerUpdate_Title">Server Update</sys:String>
+    <sys:String x:Key="ServerUpdate_WarningLabel">There was a problem while performing the server update. This may leave your server in a incomplete state.\r\n\r\nDo you want to continue with the server start, this could cause problems?</sys:String>
+    <!--#endregion-->
+
 </Globalization:GlobalizationResourceDictionary>

CSM/beta/latest.txt

@@ -1 +1 @@
-1.1.36.1
+1.1.36.2