From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Sat, 22 Sep 2012 07:54:42 +0000 (+0200)
Subject: Merge branch 'next' into polish-translation
X-Git-Tag: 0.11.1^2~2^2~3
X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=commitdiff_plain;h=f71b39f07e4a5538521d0571ed05fce94b6846ec;hp=-c

Merge branch 'next' into polish-translation
---

f71b39f07e4a5538521d0571ed05fce94b6846ec
diff --combined src/main/java/de/todesbaum/jsite/main/Main.java
index e8f6277,92143a4..5e1e67a
--- a/src/main/java/de/todesbaum/jsite/main/Main.java
+++ b/src/main/java/de/todesbaum/jsite/main/Main.java
@@@ -80,7 -80,7 +80,7 @@@ public class Main implements ActionList
  	private static final Logger logger = Logger.getLogger(Main.class.getName());
  
  	/** The version. */
- 	private static final Version VERSION = new Version(0, 10);
+ 	private static final Version VERSION = new Version(0, 11);
  
  	/** The configuration. */
  	private Configuration configuration;
@@@ -122,7 -122,7 +122,7 @@@
  	}
  
  	/** The supported locales. */
 -	private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH };
 +	private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH, new Locale("pl") };
  
  	/** The actions that switch the language. */
  	private Map<Locale, Action> languageActions = new HashMap<Locale, Action>();