RELEASE.

2.0. Version have significant improvements in password generation. Also development information and logging reduced.
lyubick · Apr 12, 2015 · 41fc66f · 41fc66f
1 parent 0a78fc2
commit 41fc66f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/projectBuilder.xml b/projectBuilder.xml
@@ -2,7 +2,8 @@
 <!-- Expect definition of JavaFX ant tasks is already imported -->
 
 <project name="pasSHA" basedir="." xmlns:fx="javafx:com.sun.javafx.tools.ant">
-
+	<buildnumber file="resources\build.version"/>
+
 	<path id="fxant">
 		<filelist>
 			<file name="C:\Program Files\Java\jdk1.8.0_40\lib\ant-javafx.jar" />
@@ -32,7 +33,7 @@
 		<!-- Customize jar manifest (optional) -->
 		<manifest>
 			<attribute name="Implementation-Vendor" value="KGBT" />
-			<attribute name="Implementation-Version" value="1.0.000" />
+			<attribute name="Implementation-Version" value="2.0.000" />
 		</manifest>
 	</fx:jar>
 </project>
diff --git a/resources/build.version b/resources/build.version
@@ -0,0 +1,3 @@
+#Build Number for ANT. Do not edit!
+#Sun Apr 12 15:41:27 EEST 2015
+build.number=1
diff --git a/src/languages/Texts.java b/src/languages/Texts.java
@@ -62,6 +62,9 @@ public enum TextID
         ERR_NAME_ALREADY_TAKEN(new String[]
         { "Error! Name already taken!", "Îøèáêà! Èìÿ óæå çàíÿòî!" }),
 
+        EXIT(new String[]
+        { "Exit", "Âûõîä" }),
+
         EXPORT(new String[]
         { "Export", "Ýêñïîðòèðîâàòü" }),
 
@@ -77,6 +80,9 @@ public enum TextID
         LENGTH(new String[]
         { "Length", "Äëèííà" }),
 
+        LOADING(new String[]
+        { "Loading", "Çàãðóçêà" }),
+
         LOGIN(new String[]
         { "Login", "Ðåãèñòðàöèÿ" }),
 
@@ -86,9 +92,6 @@ public enum TextID
         MS(new String[]
         { "milliseconds", "ìèëëèñåêóíäû" }),
 
-        S(new String[]
-        { "second(s)", "ñåêóíä(û)" }),
-
         MUST_CONTAIN_UPPER_CASE_CHAR(new String[]
         { "Must have UPPER case character", "Îáÿçàí èìåòü ÏÐÎÏÈÑÍÛÅ áóêâû" }),
 
@@ -104,9 +107,15 @@ public enum TextID
         OK(new String[]
         { "OK", "Ïîäòâåðäèòü" }),
 
+        PASSWORD_COPIED(new String[]
+        { "Password copied to Clipboard", "Ïàðîëü ïîìåù¸í â áóôåð îáìåíà" }),
+
         PASSWORD_INCORRECT(new String[]
         { "Password incorrect!", "Íå âåðíûé ïàðîëü!" }),
 
+        PASSWORD_REMOVED(new String[]
+        { "Password removed from Clipboard", "Ïàðîëü óáðàí èç áóôåðà îáìåíà" }),
+
         PASSWORDS_DONT_MATCH(new String[]
         { "Passwords don't match!", "Ïàðîëè íå èäåíòè÷íû" }),
 
@@ -128,9 +137,19 @@ public enum TextID
         RETYPE(new String[]
         { "Re-type", "Ïîâòîðèòå" }),
 
+        S(new String[]
+        { "second(s)", "ñåêóíä(û)" }),
+
         SAVE(new String[]
         { "Save", "Ñîõðàíèòü" }),
 
+        SAVE_CONFIRMATION(new String[]
+        { "There are unsaved changes. Save before exit?",
+                "Åñòü íåñîõðàí¸ííûå èçìåíåíèÿ. Ñîõðàíèòü?" }),
+
+        SAVING(new String[]
+        { "Saving", "Ñîõðàíåíèå" }),
+
         SETTINGS(new String[]
         { "Settings", "Íàñòðîéêè" }),
 
@@ -140,34 +159,15 @@ public enum TextID
         SPECIAL_CHARACTERS(new String[]
         { "Special characters", "Ñïåöèàëüíûå ñèìâîëû" }),
 
+        TIME_LEFT(new String[]
+        { "Time left", "Âðåìåíè îñòàëîñü" }),
+
         URL(new String[]
         { "URL", "URL" }),
 
         VERSION(new String[]
         { "v." + version, "â." + version }),
 
-        SAVE_CONFIRMATION(new String[]
-        { "There are unsaved changes. Save before exit?",
-                "Åñòü íåñîõðàí¸ííûå èçìåíåíèÿ. Ñîõðàíèòü?" }),
-
-        LOADING(new String[]
-        { "Loading", "Çàãðóçêà" }),
-
-        SAVING(new String[]
-        { "Saving", "Ñîõðàíåíèå" }),
-
-        EXIT(new String[]
-        { "Exit", "Âûõîä" }),
-
-        PASSWORD_COPIED(new String[]
-        { "Password copied to Clipboard", "Ïàðîëü ïîìåù¸í â áóôåð îáìåíà" }),
-
-        TIME_LEFT(new String[]
-        { "Time left", "Âðåìåíè îñòàëîñü" }),
-
-        PASSWORD_REMOVED(new String[]
-        { "Password removed from Clipboard", "Ïàðîëü óáðàí èç áóôåðà îáìåíà" }),
-
         Z_ETHALON(new String[]
         { "", "" }),
 
@@ -183,10 +183,9 @@ private TextID(final String[] text)
         @Override
         public String toString()
         {
-            // mb add log to see language and received text??
             return text[Settings.getLanguage()];
         }
     }
 
-    static String version = "1.0.000";
+    static String version = "2.0.000";
 }