diff options
| author | Alexey 'Cluster' Avdyukhin <ClusterM@users.noreply.github.com> | 2017-12-09 18:07:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 18:07:58 +0300 |
| commit | 14c8ffae3ae0c39d7ee49b53e7416dd99db902f1 (patch) | |
| tree | 5ee86a1842bfb4f1d0bfd64fdf757007baadb090 /Properties | |
| parent | 9362198698e0416d130ebd2ddea95abda558a7f3 (diff) | |
| parent | 3e8af5d45b2d1c0aa4fd9879283cb6b3d418dbac (diff) | |
Merge branch 'stable' into export-games
Diffstat (limited to 'Properties')
| -rw-r--r-- | Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | Properties/Resources.resx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index eb55492b..1b2b155a 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Resources; // set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("hakchi2")]
-[assembly: AssemblyDescription("Based on hakchi by madmonkey.\r\n\r\nTranslators:\r\nBritish English: Jhynjhiruu Rekrap\r\nFrench: Ac_K, Xavier M-M\r\nSpanish of Spain: Naiki (https://twitter.com/___naiki___)\r\nSpanish of Argentina: KNTRO\r\nGerman: Peamur\r\nItalian: student\r\nCatalan: Truchen\r\nDutch: Mark Dekker - Mad Mega\r\nSlovak: Patrik Žec aka PATWIST\r\nGerman: Peamur\r\nGreek: Miltos Arpazopoulos\r\nFinnish: Luoti-Lasse\r\nBulgarian: Jelmer de Groot\r\nChinese: 九五二七\r\nUkrainian: Пестренко Олекса\r\n\r\nSpecial thanks:\r\nmadmonkey and pcm720 for great help with everything.\r\nxsnake for Japanese font.\r\nPete Batard/Akeo for Zadig.\r\npbatard for libwdi.\r\nThomas Bleeker for WinUSBNet lib.\r\nbootgod for cartridge database.\r\nMarkovtsev Vadim for SevenZipSharp lib.\r\nNeoRame for Graphics.\r\nNhakin for Game Genie database.\r\nmooware for mooftpserv.\r\nNintendo for my childhood.\r\n\r\nMy site: http://clusterrr.com\r\nEmail: clusterrr@clusterrr.com\r\nPayPal for donations: clusterrr@clusterrr.com")]
+[assembly: AssemblyDescription("Based on hakchi by madmonkey.\r\n\r\nTranslators:\r\nBritish English: Jhynjhiruu Rekrap\r\nFrench: Ac_K, Xavier M-M, JumpmanFR\r\nSpanish of Spain: Naiki (https://twitter.com/___naiki___)\r\nSpanish of Argentina: KNTRO\r\nGerman: Peamur\r\nItalian: student\r\nCatalan: Truchen\r\nDutch: Mark Dekker - Mad Mega\r\nSlovak: Patrik Žec aka PATWIST\r\nGerman: Peamur\r\nGreek: Miltos Arpazopoulos\r\nFinnish: Luoti-Lasse\r\nBulgarian: Jelmer de Groot\r\nChinese: 九五二七\r\nUkrainian: Пестренко Олекса\r\n\r\nSpecial thanks:\r\nmadmonkey and pcm720 for great help with everything.\r\nxsnake for Japanese font.\r\nPete Batard/Akeo for Zadig.\r\npbatard for libwdi.\r\nThomas Bleeker for WinUSBNet lib.\r\nbootgod for cartridge database.\r\nMarkovtsev Vadim for SevenZipSharp lib.\r\nNeoRame for Graphics.\r\nNhakin for Game Genie database.\r\nmooware for mooftpserv.\r\nNintendo for my childhood.\r\n\r\nMy site: http://clusterrr.com\r\nEmail: clusterrr@clusterrr.com\r\nPayPal for donations: clusterrr@clusterrr.com")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Alexey 'Cluster' Avdyukhin")]
[assembly: AssemblyProduct("hakchi2")]
diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 86a1b7fe..809c1fd0 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -682,7 +682,7 @@ <data name="InvalidConsoleSelected" xml:space="preserve">
<value>Invalid console selected! Detected console:</value>
</data>
- <data name="gamepad_SNES" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <data name="gamepad_snes" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\gamepad_snes.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Cover" xml:space="preserve">
|