From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Tue, 31 May 2016 17:43:09 +0000 (+0200)
Subject: Merge branch 'italian-translation' into next
X-Git-Tag: 0.13^2~1
X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=commitdiff_plain;h=0f1855d94540e29163a648d6004e2331ecf9f5b2;hp=-c

Merge branch 'italian-translation' into next
---

0f1855d94540e29163a648d6004e2331ecf9f5b2
diff --combined src/main/java/de/todesbaum/jsite/main/Main.java
index 3a0024b,545a887..a6ac559
--- a/src/main/java/de/todesbaum/jsite/main/Main.java
+++ b/src/main/java/de/todesbaum/jsite/main/Main.java
@@@ -126,6 -126,7 +126,7 @@@ public class Main implements ActionList
  			Locale.ENGLISH,
  			Locale.GERMAN,
  			Locale.FRENCH,
+ 			Locale.ITALIAN,
  			new Locale("pl"),
  			new Locale("fi")
  	};
@@@ -196,7 -197,7 +197,7 @@@
  		jSiteIcon = IconLoader.loadIcon("/jsite-icon.png");
  		wizard.setIcon(jSiteIcon);
  
 -		updateChecker = new UpdateChecker(freenetInterface);
 +		updateChecker = new UpdateChecker(freenetInterface, getVersion());
  		updateChecker.addUpdateListener(this);
  		updateChecker.start();