Merge remote-tracking branch 'origin/master'

docs/admin/projects.rst

@@ -197,6 +197,8 @@ Pre-commit script
 Additional commit file
     Additional file to include in commit, usually this one is generated by pre
     commit script described above. 
+    Supply the %(language)s in the path like this: /path/to/addditinal/%(language)s_file.example
+    
 Save translation history
     Whether to store history of translation changes in database.
 Suggestion voting