diff options
| author | lempamo <[email protected]> | 2017-06-20 17:21:27 -0400 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-06-20 17:21:27 -0400 |
| commit | fc728100a39bff88215b0b21602afbda9ff6b00b (patch) | |
| tree | 5d99edd1c5320dc47872a829306a02641577543c /TimeHACK.Main/Properties | |
| parent | e83df06641d130fb979b562ab74e284f5952c9e0 (diff) | |
| parent | ffc4a480f23e38d58a3b4c940e3045237835a342 (diff) | |
| download | histacom2-fc728100a39bff88215b0b21602afbda9ff6b00b.tar.gz histacom2-fc728100a39bff88215b0b21602afbda9ff6b00b.tar.bz2 histacom2-fc728100a39bff88215b0b21602afbda9ff6b00b.zip | |
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
Diffstat (limited to 'TimeHACK.Main/Properties')
| -rw-r--r-- | TimeHACK.Main/Properties/Resources.Designer.cs | 4 | ||||
| -rw-r--r-- | TimeHACK.Main/Properties/Resources.resx | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index ffe7f8f..f05a298 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -268,9 +268,7 @@ namespace TimeHACK.Properties { /// "btn4txt": "", /// "btn4tag": "", /// "btn5txt": "", - /// "btn5tag": "" - /// }, - /// "inthe [rest of string was truncated]";. + /// "btn5tag": " [rest of string was truncated]";. /// </summary> internal static string std_story { get { diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 88fd4f5..e2ac293 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -437,7 +437,7 @@ }, "noextinguisher": { "time": "4:03 AM", - "txt": "You run to the kitchen to get the fire extinguisher but you remeber that your neighbour had to borrow it yesterday and has not yet returned it. The fire has now burnt down your whole room and is starting to burn down the hallway. You look around you with not many options. You need to find another way to put the fire out.", + "txt": "You run to the kitchen to get the fire extinguisher but you remember that your neighbour had to borrow it yesterday and has not yet returned it. The fire has now burnt down your whole room and is starting to burn down the hallway. You look around you with not many options. You need to find another way to put the fire out.", "over": false, "overtxt": "", "btn1txt": "Pour Some Water From The Kitchen Over The Fire", |