Merge branch 'release/0.4.0' into develop

daneeldeveloper · daneeldeveloper · commit f111500f7042 · 2018-01-09T15:45:32.000+01:00
Conflicts:
	pom.xml
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.fugerit.java</groupId>
 	<artifactId>github-issue-export</artifactId>
 
-	<version>0.5.0-SNAPSHOT</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>github-issue-export</name>
diff --git a/src/main/resources/org/fugerit/java/github/issue/export/config/gui/gui-label_xml.xml b/src/main/resources/org/fugerit/java/github/issue/export/config/gui/gui-label_xml.xml
@@ -66,7 +66,7 @@ For a simple guide click on Help (?) Menu - Quickstart
 <body>
 <div style="font-family: Arial; margin: 5px;">
 <h3>GUI For github-issue-export utility</h3>
-<p>Version 0.3.0 (2017-09-29)</p>
+<p>Version 0.4.0 (2018-01-09)</p>
 </div>
 </body>
 </html>
diff --git a/src/main/resources/org/fugerit/java/github/issue/export/config/gui/gui-label_xml_it.xml b/src/main/resources/org/fugerit/java/github/issue/export/config/gui/gui-label_xml_it.xml
@@ -40,7 +40,7 @@
 Per le istruzioni di utilizzo premi sul menu di aiuto (?) e poi Guida.
 </entry>
 <entry key="label.output.area.generate.validate.noOutputFile"> Devi impostare il percorso del file excel  </entry>
-<entry key="label.output.area.generate.start"> Inizio generatione  </entry>
+<entry key="label.output.area.generate.start"> Inizio generazione  </entry>
 <entry key="label.output.area.generate.ok"> Report generato correttamente :  </entry>
 <entry key="label.output.area.generate.ko"> Errore generazione report : </entry>
 <entry key="label.output.area.configuration.saved"> Configurazione salvata correttamente </entry>
@@ -77,7 +77,7 @@ Pertanto anche se non obbligatoria, può essere utile impostare l'utenza github
 <body>
 <div style="font-family: Arial; margin: 5px;">
 <h3>GUI For github-issue-export utility</h3>
-<p>Version 0.3.0 (2017-09-29)</p>
+<p>Version 0.4.0 (2018-01-09)</p>
 </div>
 </body>
 </html>
