Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

2 files changed, 117 insertions, 10 deletions

diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs
index cd17a31..9dcd2fd 100644
--- a/ShiftOS.WinForms/Properties/Resources.Designer.cs
+++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs
@@ -160,6 +160,35 @@ namespace ShiftOS.WinForms.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to {
+        ///  &quot;Name&quot;: &quot;appscape_main&quot;,
+        ///  &quot;Files&quot;: [],
+        ///  &quot;Subdirectories&quot;: [
+        ///    {
+        ///      &quot;Name&quot;: &quot;bans&quot;,
+        ///      &quot;Files&quot;: [
+        ///        {
+        ///          &quot;Name&quot;: &quot;hacker101.txt&quot;,
+        ///          &quot;Data&quot;: &quot;RGF0ZTogMTAvMy8yMDE4DQpVc2VyOiBoYWNrZXIxMDENCg0KQmFuIHR5cGU6IEF1dG9tYXRlZA0KDQpEZXNjcmlwdGlvbjoNCg0KVGhpcyB1c2VyIGhhcyBiZWVuIGJhbm5lZCBieSB0aGUgYXV0b21hdGVkIGFudGktaGFja2luZyBzeXN0ZW0gZm9yIGNyZWF0aW9uIG9mIG1hbGljaW91cyBzb2Z0d2FyZSBhbmQgZXhwbG9pdGF0aW9uIHV0aWxpdGllcy4=&quot;,
+        ///          &quot;HeaderData&quot;: null,
+        ///          &quot;ReadAccessToLo [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string AppscapeServerFS {
+            get {
+                return ResourceManager.GetString("AppscapeServerFS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to RGF0ZTogMDQvMS8yMDE4DQpVc2VyOiBtYXVyZWVuX2Zlbm4NCg0KQmFuIHR5cGU6IENlYXNlIGFuZCBkZXNpc3QgKERldlgpDQoNCkRlc2NyaXB0aW9uOg0KDQpEZXZYIGhhcyBzZW50IGEgY2Vhc2UgYW5kIGRlc2lzdCByZXF1ZXN0IHRvIEFwcHNjYXBlIGZvciBob3N0aW5nIHRoaXMgdXNlcidzIGFwcGxpY2F0aW9ucyBhbmQgc2VuZGluZyBwcm9maXRzIG92ZXIuIFRoaXMgdXNlcidzIHNvZnR3YXJlIHdpbGwgbm90IGJlIHB1bGxlZCwgYnV0IGFsbCBDb2RlcG9pbnRzIGVhcm5lZCBmcm9tIGl0IHdpbGwgbm90IGJlIHJlZGlyZWN0ZWQgYW5kIHRoZSB1c2VyIHdpbGwgbm90IGJlIGFibGUgdG8gYWNjZXNzIHRoZWlyIGRldmVsb3BtZW50IHBhbmVsLg==.
+        /// </summary>
+        internal static string AppscapeWantedFile {
+            get {
+                return ResourceManager.GetString("AppscapeWantedFile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ArtPadcirclerubber {
@@ -362,6 +391,26 @@ namespace ShiftOS.WinForms.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        internal static System.Drawing.Bitmap BlueBlueVerticalGradient {
+            get {
+                object obj = ResourceManager.GetObject("BlueBlueVerticalGradient", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] brute {
+            get {
+                object obj = ResourceManager.GetObject("brute", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap DefaultMouse {
             get {
                 object obj = ResourceManager.GetObject("DefaultMouse", resourceCulture);
@@ -1089,6 +1138,38 @@ namespace ShiftOS.WinForms.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to {
+        ///  &quot;Name&quot;: &quot;pebcak_devel&quot;,
+        ///  &quot;Files&quot;: [],
+        ///  &quot;Subdirectories&quot;: [
+        ///    {
+        ///      &quot;Name&quot;: &quot;home&quot;,
+        ///      &quot;Files&quot;: [],
+        ///      &quot;Subdirectories&quot;: [
+        ///        {
+        ///          &quot;Name&quot;: &quot;desktop&quot;,
+        ///          &quot;Files&quot;: [],
+        ///          &quot;Subdirectories&quot;: [],
+        ///          &quot;ReadAccessToLowUsers&quot;: false,
+        ///          &quot;permissions&quot;: 0
+        ///        },
+        ///        {
+        ///          &quot;Name&quot;: &quot;documents&quot;,
+        ///          &quot;Files&quot;: [],
+        ///          &quot;Subdirectories&quot;: [],
+        ///          &quot;ReadAccessToLowUsers&quot;: false,
+        ///          &quot;permissions&quot;: 0
+        ///        },
+        ///        {
+        ///          &quot;Name&quot; [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string PebcakDevelFS {
+            get {
+                return ResourceManager.GetString("PebcakDevelFS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap RegularDesktopGlyph {
@@ -1114,7 +1195,7 @@ namespace ShiftOS.WinForms.Properties {
         ///		Name: &quot;NetXtreme Hyper Edition&quot;,
         ///		CostPerMonth: 150,
         ///		DownloadSpeed: 524288, //512 kb/s
-        ///		Description: &quot;It&apos;s time to supercharge your Shift [rest of string was truncated]&quot;;.
+        ///		Description: &quot;It&apos;s time to supercharge your Shiftnet experience. [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string ShiftnetServices {
             get {
@@ -1136,7 +1217,8 @@ namespace ShiftOS.WinForms.Properties {
         ///		Name: &quot;Icon Manager&quot;,
         ///		Cost: 450,
         ///		Description: &quot;This tool allows you to add and edit application icons within ShiftOS for the small prive of 450 Codepoints!&quot;,
-        ///		Dependencies: &quot;skinning [rest of string was truncated]&quot;;.
+        ///		Dependencies: &quot;skinning&quot;,
+        ///		Category [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Shiftorium {
             get {
@@ -1146,7 +1228,7 @@ namespace ShiftOS.WinForms.Properties {
         
         /// <summary>
         ///   Looks up a localized string similar to {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-        ///{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fl [rest of string was truncated]&quot;;.
+        ///{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\flo [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string ShiftOS {
             get {
@@ -1295,7 +1377,8 @@ namespace ShiftOS.WinForms.Properties {
         ///Eine kurze Erklärung wie du das Terminal benutzt lautet wiefolgt. Du kannst das command &apos;sos.help&apos; benutzen um eine Liste aller commands aufzurufen. Schreib es
         ///einfach in das Terminal und drücke &lt;enter&gt; um alle commands anzuzeigen.
         /// 
-        ///Commands können mit argumenten versehen werden, indem du ein key-value Paar in einem {} Block hinter dem command angibst. Zum Be [rest of string was truncated]&quot;;.
+        ///Commands können mit argumenten versehen werden, indem du ein key-value Paar in einem {} Block hinter dem command angibst. Zum Beispiel:
+        /// [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string strings_de {
             get {
@@ -1320,7 +1403,7 @@ namespace ShiftOS.WinForms.Properties {
         ///  &quot;{GEN_WELCOME}&quot;: &quot;Welcome to ShiftOS.&quot;,
         ///  &quot;{GEN_SYSTEMNAME}&quot;: &quot;System name&quot;,
         ///  &quot;{GEN_PASSWORD}&quot;: &quot;Password&quot;,
-        ///  &quot;{GEN_LPROMPT [rest of string was truncated]&quot;;.
+        ///  &quot;{GEN_LPROMPT}&quot;: &quot;%sysname lo [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string strings_en {
             get {
@@ -1330,14 +1413,22 @@ namespace ShiftOS.WinForms.Properties {
         
         /// <summary>
         ///   Looks up a localized string similar to /*
-        /// * French translation
-        /// * 
-        /// * Made by Michael VanOverbeek with his grade 9 french skills because why not.
+        /// * ShiftOS French Language Pack
         /// *
+        /// * This is a default language pack distributed within the game.
         /// */
         ///
         ///{
-        ///}.
+        ///  //General strings
+        ///  //These strings can be used anywhere in the UI where language context isn&apos;t necessary.
+        ///  &quot;{GEN_PROGRAMS}&quot;: &quot;Les programmes&quot;,
+        ///  &quot;{GEN_COMMANDS}&quot;: &quot;Les ordres&quot;,
+        ///  &quot;{GEN_OBJECTIVES}&quot;: &quot;Les objectifs&quot;,
+        ///  &quot;{GEN_CURRENTPROCESSES}&quot;: &quot;Les procèdures actuelles&quot;,
+        ///  &quot;{GEN_WELCOME}&quot;: &quot;Bienvenue au ShiftOS.&quot;,
+        ///  &quot;{GEN_SYSTEMNAME}&quot;: &quot;Nom de système&quot;,
+        ///  &quot;{GEN_PASSWORD}&quot;: &quot;Mot de passe&quot;,
+        ///  &quot;{GEN [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string strings_fr {
             get {
@@ -1525,7 +1616,7 @@ namespace ShiftOS.WinForms.Properties {
         ///		&quot;Before you can begin with ShiftOS, you&apos;ll need to know a few things about it.&quot;,
         ///		&quot;One: Terminal command syntax.&quot;,
         ///		&quot;Inside ShiftOS, the bulk of your time is going to be spent within the Terminal.&quot;,
-        ///		&quot;The Terminal is an application that starts up when you turn on your computer. It allows you to execute system commands, ope [rest of string was truncated]&quot;;.
+        ///		&quot;The Terminal is an application that starts up when you turn on your computer. It allows you to execute system commands, open program [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string sys_shiftoriumstory {
             get {
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx
index 175c52d..1e47fbf 100644
--- a/ShiftOS.WinForms/Properties/Resources.resx
+++ b/ShiftOS.WinForms/Properties/Resources.resx
@@ -34618,4 +34618,20 @@
   <data name="strings_fr" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\strings_fr.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="AppscapeServerFS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AppscapeServerFS.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="AppscapeWantedFile" xml:space="preserve">
+    <value>RGF0ZTogMDQvMS8yMDE4DQpVc2VyOiBtYXVyZWVuX2Zlbm4NCg0KQmFuIHR5cGU6IENlYXNlIGFuZCBkZXNpc3QgKERldlgpDQoNCkRlc2NyaXB0aW9uOg0KDQpEZXZYIGhhcyBzZW50IGEgY2Vhc2UgYW5kIGRlc2lzdCByZXF1ZXN0IHRvIEFwcHNjYXBlIGZvciBob3N0aW5nIHRoaXMgdXNlcidzIGFwcGxpY2F0aW9ucyBhbmQgc2VuZGluZyBwcm9maXRzIG92ZXIuIFRoaXMgdXNlcidzIHNvZnR3YXJlIHdpbGwgbm90IGJlIHB1bGxlZCwgYnV0IGFsbCBDb2RlcG9pbnRzIGVhcm5lZCBmcm9tIGl0IHdpbGwgbm90IGJlIHJlZGlyZWN0ZWQgYW5kIHRoZSB1c2VyIHdpbGwgbm90IGJlIGFibGUgdG8gYWNjZXNzIHRoZWlyIGRldmVsb3BtZW50IHBhbmVsLg==</value>
+    <comment>The file that Maureen Fenn wants to see in the Appscape Troubles storyline.</comment>
+  </data>
+  <data name="brute" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\brute.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="PebcakDevelFS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PebcakDevelFS.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="BlueBlueVerticalGradient" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BlueBlueVerticalGradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file