Merge branch 'develop'

# Conflicts: # CHANGELOG.md
Otiel · Apr 25, 2019 · a011d37 · a011d37
2 parents be1636b + f3ffa17
commit a011d37
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Bug fixes
 
-*  Fixed a bug preventing the "Playlist file name format setting" to be saved in the _ini_ file.
+*  Fixed a bug preventing the "Playlist file name format" setting to be saved in the _ini_ file.
 
 # 0.2.8.0
 
@@ -350,4 +350,4 @@ Huge thanks to @ajsnyde for implementing all these new features!
 
 # 0.1.0.0
 
-This is the first release of BandcampDownloader.
+This is the first release of BandcampDownloader.
diff --git a/docs/commits-conventions.md b/docs/commits-conventions.md
@@ -30,8 +30,7 @@ Type     | Release | Description | Changelog
 feat     | `minor` | New feature or enhancement (for the user - not a new feature for a build script). | Visible
 fix      | `patch` | Bug fix (for the user - not a fix to a build script). | Visible
 docs     | `patch` | A change to the documentation. | Hidden
-style    | `patch` | Formatting, missing semi colons, etc; no production code change | Hidden
-refactor | `patch` | Refactoring production code, eg. renaming a variable | Hidden
+refactor | `patch` | Refactoring production code, eg. renaming a variable, formatting, etc | Hidden
 test     | `patch` | Adding tests, refactoring tests; no production code change | Hidden
 chore    | `patch` | Updating grunt tasks, updating a library, etc | Conditional
 
@@ -40,7 +39,7 @@ chore    | `patch` | Updating grunt tasks, updating a library, etc | Conditional
 * Keep it wrapped at 72 characters.
 * Use the imperative, present tense: "change", not "changed" nor "changes".
 * Include motivation for the change and contrasts with previous behavior.
-* Don't forget to start the body with a blank line.
+* Start the body with a blank line.
 
 ## Footer
 

diff --git a/docs/help-translate.md b/docs/help-translate.md
@@ -7,6 +7,8 @@ If you wish to help translate the application, the following should get you star
 Translations are stored in resources (_resx_) files, one file per language. As of today, the following translations exist:
 * English: [_Resources.resx_](/src/BandcampDownloader/Properties/Resources.resx)
 * French: [_Resources.fr.resx_](/src/BandcampDownloader/Properties/Resources.fr.resx)
+* German: [_Resources.de.resx_](/src/BandcampDownloader/Properties/Resources.de.resx)
+* Italian: [_Resources.it.resx_](/src/BandcampDownloader/Properties/Resources.it.resx)
 
 In order to modify the translations, you can either edit the files with your favorite text editor, or use a tool such as [Zeta Resource Editor](https://www.zeta-resource-editor.com). When editing a _resx_ file with a text editor, you will find the translations at the end of the file. A translation looks like this:
 ```
@@ -27,7 +29,7 @@ If you wish to create a new language file, simply duplicate the English file (_R
 
 ## Submit changes
 
-Once you're done, commit your changes on a new branch and create a pull request.
+Once you're done, commit your changes and create a pull request.
 
 ## Closing