X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2FSetLanguage.java;h=44078084ef4af0d7510f476d01f07086bf97f91d;hb=f1b92378a792131ac8fb33a869405851d5b2d1f7;hp=f2ef5d3bb3073a5617fe3f2e38ca01a39dec658f;hpb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;p=GpsPrune.git

diff --git a/tim/prune/function/SetLanguage.java b/tim/prune/function/SetLanguage.java
index f2ef5d3..4407808 100644
--- a/tim/prune/function/SetLanguage.java
+++ b/tim/prune/function/SetLanguage.java
@@ -41,15 +41,15 @@ public class SetLanguage extends GenericFunction
 	private int _startIndex = 0;
 
 	/** Names of languages for display in dropdown (not translated) */
-	private static final String[] LANGUAGE_NAMES = {"\u010de\u0161tina", "deutsch", "english",
+	private static final String[] LANGUAGE_NAMES = {"\u010de\u0161tina", "deutsch", "english", "american english",
 		"espa\u00F1ol", "fran\u00E7ais", "italiano", "magyar", "nederlands", "polski",
-		"portugu\u00EAs", "\u4e2d\u6587 (chinese)", "\u65E5\u672C\u8A9E (japanese)",
+		"portugu\u00EAs", "\u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian)", "\u4e2d\u6587 (chinese)", "\u65E5\u672C\u8A9E (japanese)",
 		"\uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean)", "schwiizerd\u00FC\u00FCtsch", "t\u00FCrk\u00E7e",
-		"rom\u00E2n\u0103", "afrikaans", "bahasa indonesia", "farsi"
+		"rom\u00E2n\u0103", "afrikaans", "bahasa indonesia"
 	};
 	/** Associated language codes (must be in same order as names!) */
-	private static final String[] LANGUAGE_CODES = {"cz", "de", "en", "es", "fr", "it", "hu",
-		"nl", "pl", "pt", "zh", "ja", "ko", "de_ch", "tr", "ro", "af", "in", "fa"
+	private static final String[] LANGUAGE_CODES = {"cz", "de", "en", "en_us", "es", "fr", "it", "hu",
+		"nl", "pl", "pt", "ru", "zh", "ja", "ko", "de_ch", "tr", "ro", "af", "in"
 	};
 
 
@@ -327,8 +327,10 @@ public class SetLanguage extends GenericFunction
 	 */
 	private void showEndMessage()
 	{
+		final String messageKey = Config.getConfigBoolean(Config.KEY_AUTOSAVE_SETTINGS)?
+			"dialog.setlanguage.endmessagewithautosave":"dialog.setlanguage.endmessage";
 		JOptionPane.showMessageDialog(_parentFrame,
-			I18nManager.getText("dialog.setlanguage.endmessage"),
+			I18nManager.getText(messageKey),
 			I18nManager.getText(getNameKey()), JOptionPane.INFORMATION_MESSAGE);
 	}
 }