From 6eabcb4c9daef48162fdfe3e528d712e73b8aa63 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 13 Jan 2023 21:45:50 +0000
Subject: [PATCH] [internal] add pull_request_template.md and update
 issue_template.md

* Also remove .github/ directory from source archives.
---
 .gitattributes                   |  1 +
 .github/ISSUE_TEMPLATE.md        | 26 ------------------
 .github/issue_template.md        | 47 ++++++++++++++++++++++++++++++++
 .github/pull_request_template.md |  4 +++
 src/rufus.rc                     | 10 +++----
 5 files changed, 57 insertions(+), 31 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/issue_template.md
 create mode 100644 .github/pull_request_template.md

diff --git a/.gitattributes b/.gitattributes
index 24037174..e227a7f8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,5 +17,6 @@ install-sh      eol=lf
 *.cmd           export-ignore
 .gitattributes  export-ignore
 .gitignore      export-ignore
+.github         export-ignore
 *.creole        export-ignore
 
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 46d03239..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--PLEASE READ THIS CAREFULLY: You *MUST* read and complete the checklist below, by placing an x into each [ ] (so that it shows '[x]', NOT '[ x]' or '[x ]'), BEFORE clicking on 'Submit new issue'. Failure to perform these steps, WHICH ARE ONLY THERE TO HELP *YOU*, will result in the issue being dismissed without warning.-->
-
-Checklist
----------
-- [ ] I looked at https://github.com/pbatard/rufus/wiki/FAQ to see if my question has already been answered.
-- [ ] I performed a search in the issue tracker for similar issues using keywords relevant to my problem, such as the error message I got from the log.
-- [ ] I clicked the 'Log' button or pressed <kbd>Ctrl</kbd>-<kbd>L</kbd> in Rufus, and copy/pasted the log into the line that says `<FULL LOG>` below.
-- [ ] The log I am copying is the FULL log, starting with the line `Rufus version: x.y.z` - I have NOT removed any part of it.
-
-Additionally (if applicable):
-- [ ] I ran a bad blocks check, by clicking _Show advanced format options_ then _Check device for bad blocks_, and confirmed that my USB is not defective.
-- [ ] I also tried one or more of the following:
-  - [ ] Using a different USB drive.
-  - [ ] Plugging the USB into a different port.
-  - [ ] Running Rufus on a different computer.
-- [ ] If using an image, I clicked on the `(✓)` button to compute the MD5, SHA1 and SHA256 checksums, which are therefore present in the log I copied. I confirmed, by performing an internet search, that these values match the ones from the official image.
-
-Issue description
------------------
-<Please describe your issue here>
-
-Log
----
-```
-<FULL LOG>
-```
diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 00000000..3195d5c5
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,47 @@
+<!-- 
+PLEASE READ THIS CAREFULLY:
+
+1. You *MUST* read and complete the steps from the checklist below, by placing
+   an x into each [ ] (so that it shows '[x]', NOT '[ x]' or '[x ]'), BEFORE
+   clicking on 'Submit new issue'.
+
+2. Failure to perform these steps, WHICH ARE ONLY THERE TO HELP *YOU*, will
+   usually result in your issue being dismissed without notice.
+
+3. If you are reporting an issue when trying to run Rufus, or when trying to
+   boot a media created by Rufus, you *MUST* provide a log, period. Please do
+   not assume that the developer(s) will be able to "guess" the specifics of
+   your environment, what image you used, what type of media you used it with
+   or the many many other critical parameters that the log provides data for.
+   To investigate an issue, a log from Rufus is ALWAYS required.
+
+4. If you still *choose* not to provide a log when reporting a problem, you
+   agree that your issue will be closed without any further investigation.
+
+YOU HAVE BEEN WARNED.
+-->
+
+Checklist
+---------
+- [ ] I looked at https://github.com/pbatard/rufus/wiki/FAQ to see if my question has already been answered.
+- [ ] I performed a search in the issue tracker for similar issues using keywords relevant to my problem, such as the error message I got from the log.
+- [ ] I clicked the 'Log' button or pressed <kbd>Ctrl</kbd>-<kbd>L</kbd> in Rufus, or used [DebugView](https://learn.microsoft.com/en-us/sysinternals/downloads/debugview), and copy/pasted the log into the section that says `<FULL LOG>` below.
+- [ ] The log I am copying is the FULL log, starting with the line `Rufus version: x.y.z` - I have NOT removed any part of it.
+
+Additionally (if applicable):
+- [ ] I ran a bad blocks check, by clicking _Show advanced format options_ then _Check device for bad blocks_, and confirmed that my USB is not defective.
+- [ ] I also tried one or more of the following:
+  - [ ] Using a different USB drive.
+  - [ ] Plugging the USB into a different port.
+  - [ ] Running Rufus on a different computer.
+- [ ] If using an image, I clicked on the `(✓)` button to compute the MD5, SHA1 and SHA256 checksums, which are therefore present in the log I copied. I confirmed, by performing an internet search, that these values match the ones from the official image.
+
+Issue description
+-----------------
+<Please describe your issue here>
+
+Log
+---
+```
+<FULL LOG>
+```
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..1e0f4014
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,4 @@
+<!--
+Please do not create an unsolicited Pull Requests for a translation update.
+See https://github.com/pbatard/rufus/wiki/FAQ#user-content-Why_dont_you_accept_unsolicited_translation_updates.
+-->
\ No newline at end of file
diff --git a/src/rufus.rc b/src/rufus.rc
index e3493a82..6c882b8f 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.22.1956"
+CAPTION "Rufus 3.22.1957"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -396,8 +396,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,22,1956,0
- PRODUCTVERSION 3,22,1956,0
+ FILEVERSION 3,22,1957,0
+ PRODUCTVERSION 3,22,1957,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -415,13 +415,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.22.1956"
+            VALUE "FileVersion", "3.22.1957"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.22.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.22.1956"
+            VALUE "ProductVersion", "3.22.1957"
         END
     END
     BLOCK "VarFileInfo"