Snapshot of commit d5ec1d5018ed24f1b4f32b1d09df6dbd7e2fc425
from branch master of git://git.jetbrains.org/idea/community.git
diff --git a/resources-en/src/fileTemplates/includes/File Header.java.ft b/resources-en/src/fileTemplates/includes/File Header.java.ft
new file mode 100644
index 0000000..4b498f0
--- /dev/null
+++ b/resources-en/src/fileTemplates/includes/File Header.java.ft
@@ -0,0 +1,7 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: ${USER}
+ * Date: ${DATE}
+ * Time: ${TIME}
+ * To change this template use File | Settings | File Templates.
+ */
diff --git a/resources-en/src/fileTemplates/includes/File Header.java.html b/resources-en/src/fileTemplates/includes/File Header.java.html
new file mode 100644
index 0000000..91afe6f
--- /dev/null
+++ b/resources-en/src/fileTemplates/includes/File Header.java.html
@@ -0,0 +1,68 @@
+<html>
+<body>
+<table border="0" cellpadding="2" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
+ <tr>
+ <td colspan="3"><font face="verdana" size="-1">This is a built-in template. It contains a code fragment that can be included into file templates
+ (<b>Templates</b> tab) with the help of the <font color="#7F0000"><b><i>#parse</i></b></font> directive.<br>
+ The template is editable. Along with the static text, code and comments, you can also use the predefined variables
+ that will be then expanded like macros into the corresponding values.</font><br>
+ </td>
+ </tr>
+</table>
+<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
+ <tr>
+ <td colspan="3"><font face="verdana" size="-1">Predefined variables will take the following values:</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${PACKAGE_NAME}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">name of the package in which the new class/interface is created</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${USER}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current user system login name</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${DATE}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current system date</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${TIME}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current system time</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${YEAR}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current year</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${MONTH}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current month</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${DAY}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current day of the month</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${HOUR}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current hour</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${MINUTE}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current minute</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${PROJECT_NAME}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">the name of the current project</font></td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources-en/src/fileTemplates/includes/default.html b/resources-en/src/fileTemplates/includes/default.html
new file mode 100644
index 0000000..98339f5
--- /dev/null
+++ b/resources-en/src/fileTemplates/includes/default.html
@@ -0,0 +1,69 @@
+<html>
+<body>
+<table border="0" cellpadding="2" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
+ <tr>
+ <td colspan="3"><font face="verdana" size="-1">In this template, you can specify a code fragment to be included into file templates
+ (<b>Templates</b> tab) with the help of the <font color="#7F0000"><b><i>#parse</i></b></font> directive.<br>
+ One template can be easily used by several file templates.<br>
+ Along with the static text, code and comments, you can also use the predefined variables
+ that will be then expanded like macros into the corresponding values.</font><br>
+ </td>
+ </tr>
+</table>
+<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
+ <tr>
+ <td colspan="3"><font face="verdana" size="-1">Predefined variables will take the following values:</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${PACKAGE_NAME}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">name of the package in which the new class/interface is created</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${USER}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current user system login name</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${DATE}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current system date</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${TIME}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current system time</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${YEAR}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current year</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${MONTH}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current month</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${DAY}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current day of the month</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${HOUR}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current hour</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${MINUTE}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">current minute</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><nobr><font face="verdana" size="-2" color="#7F0000"><b><i>${PROJECT_NAME}</i></b></font></nobr></td>
+ <td width="10"> </td>
+ <td valign="top"><font face="verdana" size="-1">the name of the current project</font></td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file