Fix up CONTRIBUTING and the issue templates

2 files changed, 26 insertions, 12 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9f0531c01..59ca6db13 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,14 +9,26 @@ DELETE ME
 
 Use the search function to see if someone else has already submitted the same bug report.
 
+Try to describe the problem with as much detail as possible.
+
+Some bugs may only occur on certain devices or versions of Android. Please add information about your device and the version of Android that is running on it (you can look these up under `Settings → About Phone`), as well as which version of AntennaPod you are using.
+
+If the bug only seems to occur with a certain podcast, please include the URL of that podcast.
+
+If possible, add instructions on how to reproduce the bug.
+
+If possible, add a logfile to your post. This is especially useful if the bug makes the application crash. You can create logfiles with apps like `aLogcat`. Just launch `alogcat`, then start AntennaPod and reproduce the bug. aLogcat should now display information about the bug when you start it. AntennaPod also has an `export logs` feature.
+
+Usually, you can take a screenshot of your smartphone by pressing *Power* + *Volume down* for a few seconds.
+
 You don't need to adhere to the template strictly. Feel free to leave out information you feel is not important or does not make sense.
 
 If you are experiencing a crash, including the stacktrace will likely get it fixed sooner.
 -->
 
-**App version**: 1.x (from Google Play/F-Droid/Custom build)
+**App version**: 1.x (state whether from Google Play/F-Droid/Custom built APK)
 
-**Android version**: 5.x [Please mention if you are using a custom rom!]
+**Android version**: 5.x (Please mention if you are using a custom rom!)
 
 **Device model**:
 
@@ -24,15 +36,15 @@ If you are experiencing a crash, including the stacktrace will likely get it fix
 
 **Current behaviour**:
 
-**First occurred**: Version 1.x / about x days/weeks ago
+**First occurred**: (e.g. about x days/weeks ago)
 
 **Steps to reproduce**:
-
 1. This
-1. Than that
-1. Then
+2. Then that
+3. Then this
+4. Etc.
 
-**Environment**: [Settings you have changed, e.g. Auto Download. "Unusual" devices you use, e.g. Bluetooth headphones. Did you select another media player?]
+**Environment**: (Settings you have changed (e.g. Auto Download). "Unusual" devices you use (e.g. Bluetooth headphones). Did you select another media player?)
 
 **Stacktrace/Logcat**: 
 ```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 878b857c8..f473dc7dd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,18 +7,20 @@ about: Request a new feature
 <!--
 DELETE ME
 
-Use the search function to see if someone else has already submitted the same feature request. If there already is another request, please upvote the first post instead of commenting something like "I also want this".
+Make sure you are using the latest version of AntennaPod. Perhaps the feature you are looking for has already been implemented.
+
+Use the search function to see if someone else has already submitted the same feature request. If there is another request already, please upvote the first post instead of commenting something like "I also want this".
 
 To make it easier for us to keep track of requests, please only make one feature request per issue.
 
-Give a brief explanation about the problem that currently exists and why your requested feature solves this problem.
+Give a brief explanation about the problem that may currently exist and how your requested feature solves this problem.
 
-Try do be as specific as possible. Please not only explain what the feature does, but also how. When your request is about changing or extending the UI, describe what the UI would look like and how the user would interact with it.
+Try to be as specific as possible. Please not only explain what the feature does, but also how. If your request is about (or includes) changing or extending the UI, describe what the UI would look like and how the user would interact with it.
 -->
 
-**App version**: 1.x (from Google Play/F-Droid/Custom build)
+**App version**: 1.x (state whether from Google Play/F-Droid/Custom built APK)
 
-**Problem you are having**:
+**Problem you may be having**:
 
 **Suggested solution**: