diff options
| author | william341 <[email protected]> | 2017-06-19 12:16:31 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-06-19 12:16:31 -0700 |
| commit | 09e2268bc220b299ef2c1b8779c4df0b5ef4df3c (patch) | |
| tree | 4ebdeea150ea168678d6b08c8d1d20d246ee6ac2 /ShiftOS.WinForms/Properties | |
| parent | c22370d643008e55121c0ddeaca0b81d755573ff (diff) | |
| parent | df37f3c366fe5884b17fa0b66d154536f8df93d2 (diff) | |
| download | shiftos_thereturn-09e2268bc220b299ef2c1b8779c4df0b5ef4df3c.tar.gz shiftos_thereturn-09e2268bc220b299ef2c1b8779c4df0b5ef4df3c.tar.bz2 shiftos_thereturn-09e2268bc220b299ef2c1b8779c4df0b5ef4df3c.zip | |
Merge pull request #4 from shiftos-game/master
pulling
Diffstat (limited to 'ShiftOS.WinForms/Properties')
| -rw-r--r-- | ShiftOS.WinForms/Properties/Resources.Designer.cs | 17 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Properties/Resources.resx | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index f56285a..cd17a31 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -1329,6 +1329,23 @@ 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. + /// * + /// */ + /// + ///{ + ///}. + /// </summary> + internal static string strings_fr { + get { + return ResourceManager.GetString("strings_fr", resourceCulture); + } + } + + /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> internal static System.Drawing.Bitmap SuperDesk_screenshot { diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index 5e5555b..175c52d 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -34615,4 +34615,7 @@ <data name="austmicrotrends" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\austmicrotrends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <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> </root>
\ No newline at end of file |