Replaced GEarth.translation calls to LanguageBundle calls

G-Earth/src/main/java/gearth/GEarth.java

@@ -3,15 +3,12 @@ package gearth;
 import gearth.misc.AdminValidator;
 import gearth.misc.Cacher;
 import gearth.misc.UpdateChecker;
-import gearth.misc.listenerpattern.Observable;
 import gearth.misc.listenerpattern.ObservableObject;
 import gearth.ui.GEarthController;
-import gearth.ui.subforms.logger.loggerdisplays.PacketLogger;
 import gearth.ui.themes.Theme;
 import gearth.ui.themes.ThemeFactory;
 import gearth.ui.titlebar.TitleBarConfig;
 import gearth.ui.titlebar.TitleBarController;
-import gearth.ui.translations.LanguageBundle;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
@@ -28,7 +25,6 @@ public class GEarth extends Application {
     public static String version = "1.5.2";
     public static String gitApi = "https://api.github.com/repos/sirjonasxx/G-Earth/releases/latest";
     public static ObservableObject<Theme> observableTheme;
-    public static LanguageBundle translation;
 
     private Stage stage;
     private GEarthController controller;
@@ -46,9 +42,7 @@ public class GEarth extends Application {
         main = this;
         stage = primaryStage;
 
-        translation = new LanguageBundle();
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/gearth/ui/G-Earth.fxml"));
-
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/gearth/ui/G-Earth.fxml"), translation);
         Parent root = loader.load();
         controller = loader.getController();
         controller.setStage(primaryStage);

G-Earth/src/main/java/gearth/misc/AdminValidator.java

@@ -1,12 +1,11 @@
 package gearth.misc;
 
-import gearth.GEarth;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -48,7 +47,7 @@ public class AdminValidator {
             if (!AdminValidator.isAdmin()) {
                 Platform.runLater(() -> {
                     Alert alert = new Alert(Alert.AlertType.WARNING, "", ButtonType.OK);
-                    alert.getDialogPane().setContent(new Label(GEarth.translation.getString("alert.adminvalidator.content").replaceAll("\\\\n", System.lineSeparator())));
+                    alert.getDialogPane().setContent(new Label(LanguageBundle.get("alert.adminvalidator.content").replaceAll("\\\\n", System.lineSeparator())));
                     try {
                         TitleBarController.create(alert).showAlert();
                     } catch (IOException e) {

G-Earth/src/main/java/gearth/misc/UpdateChecker.java

@@ -2,6 +2,7 @@ package gearth.misc;
 
 import gearth.GEarth;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -37,10 +38,10 @@ public class UpdateChecker {
                         String body = (String)object.get("body");
                         boolean isForcedUpdate = body.contains("(!)");
 
-                        Alert alert = new Alert(isForcedUpdate ? Alert.AlertType.ERROR : Alert.AlertType.INFORMATION, GEarth.translation.getString("alert.outdated.title"), ButtonType.OK);
+                        Alert alert = new Alert(isForcedUpdate ? Alert.AlertType.ERROR : Alert.AlertType.INFORMATION, LanguageBundle.get("alert.outdated.title"), ButtonType.OK);
 
                         FlowPane fp = new FlowPane();
-                        Label lbl = new Label(GEarth.translation.getString("alert.outdated.content.newversion") + " ("+gitv+")" + System.lineSeparator()+ System.lineSeparator() + GEarth.translation.getString("alert.outdated.content.update") + ":");
+                        Label lbl = new Label(LanguageBundle.get("alert.outdated.content.newversion") + " ("+gitv+")" + System.lineSeparator()+ System.lineSeparator() + LanguageBundle.get("alert.outdated.content.update") + ":");
                         Hyperlink link = new Hyperlink("https://github.com/sirjonasxx/G-Earth/releases");
                         fp.getChildren().addAll( lbl, link);
                         link.setOnAction(event -> {
@@ -51,7 +52,7 @@ public class UpdateChecker {
 
 
                         WebView webView = new WebView();
-                        webView.getEngine().loadContent(String.format("<html>%s (%s)<br><br>%s:<br><a href=\"https://github.com/sirjonasxx/G-Earth/releases\">https://github.com/sirjonasxx/G-Earth/releases</a></html>", GEarth.translation.getString("alert.outdated.content.newversion"), gitv, GEarth.translation.getString("alert.outdated.content.update")));
+                        webView.getEngine().loadContent(String.format("<html>%s (%s)<br><br>%s:<br><a href=\"https://github.com/sirjonasxx/G-Earth/releases\">https://github.com/sirjonasxx/G-Earth/releases</a></html>", LanguageBundle.get("alert.outdated.content.newversion"), gitv, LanguageBundle.get("alert.outdated.content.update")));
                         webView.setPrefSize(500, 200);
 
                         alert.setResizable(false);

G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java

@@ -1,6 +1,5 @@
 package gearth.protocol.connection.proxy;
 
-import gearth.GEarth;
 import gearth.misc.Cacher;
 import gearth.misc.OSValidator;
 import gearth.protocol.HConnection;
@@ -10,6 +9,7 @@ import gearth.protocol.connection.proxy.flash.NormalFlashProxyProvider;
 import gearth.protocol.connection.proxy.flash.unix.LinuxRawIpFlashProxyProvider;
 import gearth.protocol.connection.proxy.flash.windows.WindowsRawIpFlashProxyProvider;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -108,7 +108,7 @@ public class ProxyProviderFactory {
 
                 Platform.runLater(() -> {
                     Alert alert = new Alert(Alert.AlertType.ERROR, "", ButtonType.OK);
-                    alert.getDialogPane().getChildren().add(new Label(GEarth.translation.getString("alert.alreadyconnected.content").replaceAll("\\\\n", System.lineSeparator())));
+                    alert.getDialogPane().getChildren().add(new Label(LanguageBundle.get("alert.alreadyconnected.content").replaceAll("\\\\n", System.lineSeparator())));
                     alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
                     alert.setResizable(false);
                     try {

G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java

@@ -1,6 +1,5 @@
 package gearth.protocol.connection.proxy.flash;
 
-import gearth.GEarth;
 import gearth.protocol.HConnection;
 import gearth.protocol.connection.HProxy;
 import gearth.protocol.connection.HProxySetter;
@@ -12,6 +11,7 @@ import gearth.protocol.packethandler.flash.IncomingFlashPacketHandler;
 import gearth.protocol.packethandler.flash.OutgoingFlashPacketHandler;
 import gearth.protocol.packethandler.flash.FlashPacketHandler;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -126,7 +126,7 @@ public abstract class FlashProxyProvider implements ProxyProvider {
     protected void showInvalidConnectionError() {
         Platform.runLater(() -> {
             Alert alert = new Alert(Alert.AlertType.ERROR, "", ButtonType.OK);
-            alert.getDialogPane().getChildren().add(new Label(GEarth.translation.getString("alert.invalidconnection.content")));
+            alert.getDialogPane().getChildren().add(new Label(LanguageBundle.get("alert.invalidconnection.content")));
             alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
             alert.setResizable(false);
             try {

G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java

@@ -1,11 +1,11 @@
 package gearth.protocol.connection.proxy.nitro.http;
 
-import gearth.GEarth;
 import gearth.misc.ConfirmationDialog;
 import gearth.protocol.connection.proxy.nitro.NitroConstants;
 import gearth.protocol.connection.proxy.nitro.os.NitroOsFunctions;
 import gearth.protocol.connection.proxy.nitro.os.NitroOsFunctionsFactory;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -53,12 +53,12 @@ public class NitroHttpProxy {
 
         Platform.runLater(() -> {
             Alert alert = ConfirmationDialog.createAlertWithOptOut(Alert.AlertType.WARNING, ADMIN_WARNING_KEY,
-                    GEarth.translation.getString("alert.rootcertificate.title"), null,
+                    LanguageBundle.get("alert.rootcertificate.title"), null,
-                    "", GEarth.translation.getString("alert.rootcertificate.remember"),
+                    "", LanguageBundle.get("alert.rootcertificate.remember"),
                     ButtonType.YES, ButtonType.NO
             );
 
-            alert.getDialogPane().setContent(new Label(GEarth.translation.getString("alert.rootcertificate.content").replaceAll("\\\\n", System.lineSeparator())));
+            alert.getDialogPane().setContent(new Label(LanguageBundle.get("alert.rootcertificate.content").replaceAll("\\\\n", System.lineSeparator())));
 
             try {
                 shouldInstall.set(TitleBarController.create(alert).showAlertAndWait()

G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java

@@ -10,6 +10,7 @@ import gearth.protocol.packethandler.PayloadBuffer;
 import gearth.protocol.packethandler.flash.BufferChangeListener;
 import gearth.protocol.packethandler.flash.FlashPacketHandler;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -72,10 +73,10 @@ public class Rc4Obtainer {
                 System.err.println("COULD NOT FIND RC4 TABLE");
 
                 Platform.runLater(() -> {
-                    Alert alert = new Alert(Alert.AlertType.WARNING, GEarth.translation.getString("alert.somethingwentwrong.title"), ButtonType.OK);
+                    Alert alert = new Alert(Alert.AlertType.WARNING, LanguageBundle.get("alert.somethingwentwrong.title"), ButtonType.OK);
 
                     FlowPane fp = new FlowPane();
-                    Label lbl = new Label(GEarth.translation.getString("alert.somethingwentwrong.content").replaceAll("\\\\n", System.lineSeparator()));
+                    Label lbl = new Label(LanguageBundle.get("alert.somethingwentwrong.content").replaceAll("\\\\n", System.lineSeparator()));
                     Hyperlink link = new Hyperlink("https://github.com/sirjonasxx/G-Earth/wiki/Troubleshooting");
                     fp.getChildren().addAll(lbl, link);
                     link.setOnAction(event -> {

G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java

@@ -1,9 +1,9 @@
 package gearth.services.extension_handler.extensions.implementations.network.authentication;
 
-import gearth.GEarth;
 import gearth.misc.ConfirmationDialog;
 import gearth.services.extension_handler.extensions.implementations.network.NetworkExtension;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -69,12 +69,12 @@ public class Authenticator {
             boolean[] done = {false};
             Platform.runLater(() -> {
                 Alert alert = ConfirmationDialog.createAlertWithOptOut(Alert.AlertType.WARNING, connectExtensionKey
-                        , GEarth.translation.getString("alert.confirmation.windowtitle"), null,
+                        , LanguageBundle.get("alert.confirmation.windowtitle"), null,
-                        "", GEarth.translation.getString("alert.confirmation.button.remember"),
+                        "", LanguageBundle.get("alert.confirmation.button.remember"),
                         ButtonType.YES, ButtonType.NO
                 );
 
-                alert.getDialogPane().setContent(new Label(String.format(GEarth.translation.getString("alert.extconnection.content"), extension.getTitle()).replaceAll("\\\\n", System.lineSeparator())));
+                alert.getDialogPane().setContent(new Label(String.format(LanguageBundle.get("alert.extconnection.content"), extension.getTitle()).replaceAll("\\\\n", System.lineSeparator())));
 
                 try {
                     if (!(TitleBarController.create(alert).showAlertAndWait()

G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java

@@ -3,6 +3,7 @@ package gearth.services.g_python;
 import gearth.GEarth;
 import gearth.ui.subforms.extra.ExtraController;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -170,11 +171,11 @@ public class GPythonShell {
 
     private void showError() {
         Platform.runLater(() -> {
-            Alert alert = new Alert(Alert.AlertType.ERROR, GEarth.translation.getString("alert.gpythonerror.title"), ButtonType.OK);
+            Alert alert = new Alert(Alert.AlertType.ERROR, LanguageBundle.get("alert.gpythonerror.title"), ButtonType.OK);
-            alert.setTitle(GEarth.translation.getString("alert.gpythonerror.title"));
+            alert.setTitle(LanguageBundle.get("alert.gpythonerror.title"));
 
             FlowPane fp = new FlowPane();
-            Label lbl = new Label(GEarth.translation.getString("alert.gpythonerror.content").replaceAll("\\\\n", System.lineSeparator()));
+            Label lbl = new Label(LanguageBundle.get("alert.gpythonerror.content").replaceAll("\\\\n", System.lineSeparator()));
             Hyperlink link = new Hyperlink(ExtraController.INFO_URL_GPYTHON);
             fp.getChildren().addAll(lbl, link);
             link.setOnAction(event -> {

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/WebUtils.java

@@ -1,6 +1,7 @@
 package gearth.services.internal_extensions.extensionstore.application;
 
 import gearth.GEarth;
+import gearth.ui.translations.LanguageBundle;
 import org.w3c.dom.Element;
 
 import java.time.LocalDateTime;
@@ -44,19 +45,19 @@ public class WebUtils {
     }
 
     public static String elapsedTime(long time) {
-        if (time < 60) return time + " " + GEarth.translation.getString("ext.store.elapsedtime.second." + (time == 1 ? "single": "multiple"));
+        if (time < 60) return time + " " + LanguageBundle.get("ext.store.elapsedtime.second." + (time == 1 ? "single": "multiple"));
         time = time/60;
-        if (time < 60) return time + " " + GEarth.translation.getString("ext.store.elapsedtime.minute." + (time == 1 ? "single": "multiple"));
+        if (time < 60) return time + " " + LanguageBundle.get("ext.store.elapsedtime.minute." + (time == 1 ? "single": "multiple"));
         time = time/60;
-        if (time < 24) return time + " " + GEarth.translation.getString("ext.store.elapsedtime.hour." + (time == 1 ? "single": "multiple"));
+        if (time < 24) return time + " " + LanguageBundle.get("ext.store.elapsedtime.hour." + (time == 1 ? "single": "multiple"));
         long days = time/24;
-        if (days < 7) return days + " " + GEarth.translation.getString("ext.store.elapsedtime.day." + (days == 1 ? "single": "multiple"));
+        if (days < 7) return days + " " + LanguageBundle.get("ext.store.elapsedtime.day." + (days == 1 ? "single": "multiple"));
         long weeks = days/7;
-        if (weeks < 6) return weeks + " " + GEarth.translation.getString("ext.store.elapsedtime.week." + (weeks == 1 ? "single": "multiple"));
+        if (weeks < 6) return weeks + " " + LanguageBundle.get("ext.store.elapsedtime.week." + (weeks == 1 ? "single": "multiple"));
         long months = days/31;
-        if (months < 12) return months + " " + GEarth.translation.getString("ext.store.elapsedtime.month." + (months == 1 ? "single": "multiple"));
+        if (months < 12) return months + " " + LanguageBundle.get("ext.store.elapsedtime.month." + (months == 1 ? "single": "multiple"));
         long years = days/365;
-        return years + " " + GEarth.translation.getString("ext.store.elapsedtime.year." + (years == 1 ? "single": "multiple"));
+        return years + " " + LanguageBundle.get("ext.store.elapsedtime.year." + (years == 1 ? "single": "multiple"));
     }
 
     public static String escapeMessage(String text) {

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/StoreExtensionItem.java

@@ -10,6 +10,7 @@ import gearth.services.internal_extensions.extensionstore.application.entities.e
 import gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews.CategorizedOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
+import gearth.ui.translations.LanguageBundle;
 import netscape.javascript.JSObject;
 
 public class StoreExtensionItem implements ContentItem {
@@ -57,12 +58,12 @@ public class StoreExtensionItem implements ContentItem {
 
                 .append("<div class=\"overview_item_info\">")
                 .append("<div onclick=\"").append(id).append(".onClick()\" class=\"oii_name clickable\">").append(WebUtils.escapeMessage(storeExtension.getTitle())).append("</div>")
-                .append("<div class=\"oii_desc\">").append(String.format(GEarth.translation.getString("ext.store.extension.madeby"), storeExtension.getAuthors().get(0).getName())).append(", ").append(String.format(GEarth.translation.getString("ext.store.extension.lastupdated"), WebUtils.elapsedSince(storeExtension.getUpdateDate()))).append("</div>")
+                .append("<div class=\"oii_desc\">").append(String.format(LanguageBundle.get("ext.store.extension.madeby"), storeExtension.getAuthors().get(0).getName())).append(", ").append(String.format(LanguageBundle.get("ext.store.extension.lastupdated"), WebUtils.elapsedSince(storeExtension.getUpdateDate()))).append("</div>")
                 .append("</div>")
 
                 .append("<div onclick=\"").append(id).append(".onClick()\" class=\"overview_item_msgs clickable\">")
-                .append("<div class=\"oim_top\">").append(GEarth.translation.getString("ext.store.extension.version")).append(": ").append(displayVersion()).append("</div>")
+                .append("<div class=\"oim_top\">").append(LanguageBundle.get("ext.store.extension.version")).append(": ").append(displayVersion()).append("</div>")
-                .append("<div class=\"oim_bottom\">").append(GEarth.translation.getString("ext.store.extension.rating")).append(": ").append(storeExtension.getRating()).append("</div>")
+                .append("<div class=\"oim_bottom\">").append(LanguageBundle.get("ext.store.extension.rating")).append(": ").append(storeExtension.getRating()).append("</div>")
 //                .append("<div class=\"oim_bottom\">").append(storeExtension.getFramework().getFramework().getName().replace("Native", "")).append(" </div>")
                 .append("</div>")
 

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/categories/CategoryItem.java

@@ -1,6 +1,5 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.categories;
 
-import gearth.GEarth;
 import gearth.services.internal_extensions.extensionstore.GExtensionStore;
 import gearth.services.internal_extensions.extensionstore.application.GExtensionStoreController;
 import gearth.services.internal_extensions.extensionstore.application.WebUtils;
@@ -9,6 +8,7 @@ import gearth.services.internal_extensions.extensionstore.application.entities.q
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.ExtCategory;
 import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering;
+import gearth.ui.translations.LanguageBundle;
 import netscape.javascript.JSObject;
 
 import java.util.Arrays;
@@ -59,7 +59,7 @@ public class CategoryItem implements ContentItem {
                 .append("</div>")
 
                 .append("<div onclick=\"").append(id).append(".onClick()\" class=\"overview_item_msgs clickable\">")
-                .append("<div class=\"oim_top\">").append(releasesCount).append(" ").append(GEarth.translation.getString("ext.store.extension.author.releases")).append("</div>")
+                .append("<div class=\"oim_top\">").append(releasesCount).append(" ").append(LanguageBundle.get("ext.store.extension.author.releases")).append("</div>")
 //                .append("<div class=\"oim_bottom\">").append(storeExtension.getFramework().getFramework().getName().replace("Native", "")).append(" </div>")
                 .append("</div>")
 

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/categories/CategoryOverview.java

@@ -6,6 +6,7 @@ import gearth.services.internal_extensions.extensionstore.application.entities.C
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.ExtCategory;
+import gearth.ui.translations.LanguageBundle;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -58,17 +59,17 @@ public class CategoryOverview extends HOverview {
 
             @Override
             public String title() {
-                return GEarth.translation.getString("ext.store.categories.title");
+                return LanguageBundle.get("ext.store.categories.title");
             }
 
             @Override
             public String description() {
-                return GEarth.translation.getString("ext.store.categories.description");
+                return LanguageBundle.get("ext.store.categories.description");
             }
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.categories.contenttitle");
+                return LanguageBundle.get("ext.store.categories.contenttitle");
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java

@@ -1,6 +1,5 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.extensiondetails;
 
-import gearth.GEarth;
 import gearth.services.internal_extensions.extensionstore.GExtensionStore;
 import gearth.services.internal_extensions.extensionstore.application.GExtensionStoreController;
 import gearth.services.internal_extensions.extensionstore.application.WebUtils;
@@ -9,6 +8,7 @@ import gearth.services.internal_extensions.extensionstore.application.entities.H
 import gearth.services.internal_extensions.extensionstore.repository.models.ExtCategory;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.tools.EncodingUtil;
+import gearth.ui.translations.LanguageBundle;
 import netscape.javascript.JSObject;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
@@ -46,32 +46,32 @@ public class StoreExtensionDetailsItem implements ContentItem {
 
         contentBuilder
                 .append(String.format("*%s*", storeExtension.getTitle())).append(" - v").append(storeExtension.getVersion()).append("\n\n")
-                .append("*").append(GEarth.translation.getString("ext.store.extension.details.description")).append(":*\n").append(descriptionQuoted).append("\n \n")
+                .append("*").append(LanguageBundle.get("ext.store.extension.details.description")).append(":*\n").append(descriptionQuoted).append("\n \n")
-                .append("*").append(GEarth.translation.getString("ext.store.extension.details.authors")).append(":* ").append(storeExtension.getAuthors().stream().map(StoreExtension.Author::getName).collect(Collectors.joining(", "))).append("\n\n")
+                .append("*").append(LanguageBundle.get("ext.store.extension.details.authors")).append(":* ").append(storeExtension.getAuthors().stream().map(StoreExtension.Author::getName).collect(Collectors.joining(", "))).append("\n\n")
-                .append("*").append(GEarth.translation.getString("ext.store.extension.details.categories")).append(":* ").append(storeExtension.getCategories().stream().map(ExtCategory::getName).collect(Collectors.joining(", "))).append("\n\n");
+                .append("*").append(LanguageBundle.get("ext.store.extension.details.categories")).append(":* ").append(storeExtension.getCategories().stream().map(ExtCategory::getName).collect(Collectors.joining(", "))).append("\n\n");
 
-        contentBuilder.append("*").append(GEarth.translation.getString("ext.store.extension.details.technical_information")).append("*").append("\n");
+        contentBuilder.append("*").append(LanguageBundle.get("ext.store.extension.details.technical_information")).append("*").append("\n");
 
         if(storeExtension.getReleases() != null)
-            contentBuilder.append("> ").append(GEarth.translation.getString("ext.store.extension.details.releases")).append(": --url:").append(GEarth.translation.getString("ext.store.extension.details.click_here")).append("-").append(storeExtension.getReleases()).append("\n");
+            contentBuilder.append("> ").append(LanguageBundle.get("ext.store.extension.details.releases")).append(": --url:").append(LanguageBundle.get("ext.store.extension.details.click_here")).append("-").append(storeExtension.getReleases()).append("\n");
 
-        contentBuilder.append("> ").append(GEarth.translation.getString("ext.store.extension.details.language")).append(": ").append(storeExtension.getLanguage()).append("\n")
+        contentBuilder.append("> ").append(LanguageBundle.get("ext.store.extension.details.language")).append(": ").append(storeExtension.getLanguage()).append("\n")
-                .append("> ").append(GEarth.translation.getString("ext.store.extension.details.source")).append(": --url:").append(GEarth.translation.getString("ext.store.extension.details.click_here")).append("-").append(storeExtension.getSource()).append("\n")
+                .append("> ").append(LanguageBundle.get("ext.store.extension.details.source")).append(": --url:").append(LanguageBundle.get("ext.store.extension.details.click_here")).append("-").append(storeExtension.getSource()).append("\n")
-                .append("> ").append(GEarth.translation.getString("ext.store.extension.details.framework")).append(": ").append(storeExtension.getFramework().getFramework().getName()).append(" - v").append(storeExtension.getFramework().getVersion()).append("\n")
+                .append("> ").append(LanguageBundle.get("ext.store.extension.details.framework")).append(": ").append(storeExtension.getFramework().getFramework().getName()).append(" - v").append(storeExtension.getFramework().getVersion()).append("\n")
-                .append("> ").append(GEarth.translation.getString("ext.store.extension.details.systems")).append(": ").append(String.join(", ", storeExtension.getCompatibility().getSystems())).append("\n \n");
+                .append("> ").append(LanguageBundle.get("ext.store.extension.details.systems")).append(": ").append(String.join(", ", storeExtension.getCompatibility().getSystems())).append("\n \n");
 
-        contentBuilder.append("*").append(GEarth.translation.getString("ext.store.extension.details.clients")).append(":* ").append(String.join(", ", storeExtension.getCompatibility().getClients())).append("\n\n");
+        contentBuilder.append("*").append(LanguageBundle.get("ext.store.extension.details.clients")).append(":* ").append(String.join(", ", storeExtension.getCompatibility().getClients())).append("\n\n");
 
         if (storeExtension.getFramework().getFramework().isInstallationRequired()) {
-            contentBuilder.append(GEarth.translation.getString("ext.store.extension.warning.requirement"))
+            contentBuilder.append(LanguageBundle.get("ext.store.extension.warning.requirement"))
                     .append(storeExtension.getFramework().getFramework().getInstallationInstructions()).append(" !\n\n");
         }
         if (!storeExtension.isStable()) {
-            contentBuilder.append(GEarth.translation.getString("ext.store.extension.warning.unstable")).append("\n\n");
+            contentBuilder.append(LanguageBundle.get("ext.store.extension.warning.unstable")).append("\n\n");
         }
 
         contentBuilder.append("--startdiv--")
-                .append("\n*").append(GEarth.translation.getString("ext.store.extension.details.screenshot")).append(": *").append("\n")
+                .append("\n*").append(LanguageBundle.get("ext.store.extension.details.screenshot")).append(": *").append("\n")
                 .append("--img:").append(gExtensionStore.getRepository().getResourceUrl("store", "extensions", storeExtension.getTitle(), "screenshot.png"))
                 .append(" --enddiv--");
 
@@ -152,8 +152,8 @@ public class StoreExtensionDetailsItem implements ContentItem {
                 .append("<div class=\"comment_body comment_open\">")
                 .append("<div class=\"cb_author\">")
                 .append("<div class=\"cba_name\">").append(WebUtils.escapeMessage(mainAuthor.getName())).append("</div>")
-                .append("<div class=\"cba_text\">").append(mainAuthor.getReputation()).append(" ").append(GEarth.translation.getString("ext.store.extension.author.reputation")).append("</div>")
+                .append("<div class=\"cba_text\">").append(mainAuthor.getReputation()).append(" ").append(LanguageBundle.get("ext.store.extension.author.reputation")).append("</div>")
-                .append("<div class=\"cba_text\">").append(mainAuthor.getExtensionsCount()).append(" ").append(GEarth.translation.getString("ext.store.extension.author.releases")).append("</div>")
+                .append("<div class=\"cba_text\">").append(mainAuthor.getExtensionsCount()).append(" ").append(LanguageBundle.get("ext.store.extension.author.releases")).append("</div>")
                 .append("<div class=\"cba_look\"><img src=\"").append(avatarLook).append("\" alt=\"\"></div>") // todo look
                 .append("</div>")
                 .append("<div class=\"cb_content\">").append(contentsInHtml()).append("</div>")

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsOverview.java

@@ -13,6 +13,7 @@ import gearth.services.internal_extensions.extensionstore.repository.models.Stor
 import gearth.services.internal_extensions.extensionstore.tools.InstalledExtension;
 import gearth.services.internal_extensions.extensionstore.tools.StoreExtensionTools;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -63,7 +64,7 @@ public class StoreExtensionDetailsOverview extends HOverview {
     public String buttonText() {
         int mode = mode();
 //        return mode == 2 ? "Update" : "Install";
-        return GEarth.translation.getString("ext.store.button." + (mode == 0 ? "install" : (mode == 1 ? "installed" : "update")));
+        return LanguageBundle.get("ext.store.button." + (mode == 0 ? "install" : (mode == 1 ? "installed" : "update")));
     }
 
     @Override
@@ -92,23 +93,23 @@ public class StoreExtensionDetailsOverview extends HOverview {
 
     private void awaitPopup(String mode) {
         popup(Alert.AlertType.WARNING,
-                GEarth.translation.getString(String.format("ext.store.extension.status.start.%s", mode)),
+                LanguageBundle.get(String.format("ext.store.extension.status.start.%s", mode)),
-                String.format("%s [%s]", GEarth.translation.getString(String.format("ext.store.extension.status.start.%s", mode)), extension.getTitle()),
+                String.format("%s [%s]", LanguageBundle.get(String.format("ext.store.extension.status.start.%s", mode)), extension.getTitle()),
-                GEarth.translation.getString(String.format("ext.store.extension.status.start.%s.message", mode)));
+                LanguageBundle.get(String.format("ext.store.extension.status.start.%s.message", mode)));
     }
 
     private void successPopup(String mode) {
         popup(Alert.AlertType.INFORMATION,
-                GEarth.translation.getString(String.format("ext.store.extension.status.success.%s", mode)),
+                LanguageBundle.get(String.format("ext.store.extension.status.success.%s", mode)),
-                String.format("%s [%s]", GEarth.translation.getString(String.format("ext.store.extension.status.success.%s", mode)), extension.getTitle()),
+                String.format("%s [%s]", LanguageBundle.get(String.format("ext.store.extension.status.success.%s", mode)), extension.getTitle()),
-                GEarth.translation.getString(String.format("ext.store.extension.status.success.%s.message", mode)));
+                LanguageBundle.get(String.format("ext.store.extension.status.success.%s.message", mode)));
     }
 
     private void errorPopup(String mode, String error) {
         popup(Alert.AlertType.ERROR,
-                GEarth.translation.getString(String.format("ext.store.extension.status.success.%s", mode)),
+                LanguageBundle.get(String.format("ext.store.extension.status.success.%s", mode)),
-                String.format("%s [%s]", GEarth.translation.getString(String.format("ext.store.extension.status.success.%s", mode)), extension.getTitle()),
+                String.format("%s [%s]", LanguageBundle.get(String.format("ext.store.extension.status.success.%s", mode)), extension.getTitle()),
-                String.format("%s: %s", GEarth.translation.getString(String.format("ext.store.extension.status.success.%s.message", mode)), error));
+                String.format("%s: %s", LanguageBundle.get(String.format("ext.store.extension.status.success.%s.message", mode)), error));
     }
 
     private void popup(Alert.AlertType alertType, String title, String header, String context) {

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/installed/InstalledOverview.java

@@ -1,6 +1,5 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.installed;
 
-import gearth.GEarth;
 import gearth.services.internal_extensions.extensionstore.GExtensionStore;
 import gearth.services.internal_extensions.extensionstore.application.entities.ContentItem;
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
@@ -8,6 +7,7 @@ import gearth.services.internal_extensions.extensionstore.repository.StoreReposi
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.tools.InstalledExtension;
 import gearth.services.internal_extensions.extensionstore.tools.StoreExtensionTools;
+import gearth.ui.translations.LanguageBundle;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 
 import java.awt.*;
@@ -31,7 +31,7 @@ public class InstalledOverview extends HOverview {
 
     @Override
     public String buttonText() {
-        return GEarth.translation.getString("ext.store.overview.folder");
+        return LanguageBundle.get("ext.store.overview.folder");
     }
 
     @Override
@@ -76,17 +76,17 @@ public class InstalledOverview extends HOverview {
 
             @Override
             public String title() {
-                return GEarth.translation.getString("ext.store.overview.title");
+                return LanguageBundle.get("ext.store.overview.title");
             }
 
             @Override
             public String description() {
-                return GEarth.translation.getString("ext.store.overview.description");
+                return LanguageBundle.get("ext.store.overview.description");
             }
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.overview.contenttitle");
+                return LanguageBundle.get("ext.store.overview.contenttitle");
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/installed/StoreExtensionInstalledItem.java

@@ -1,12 +1,12 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.installed;
 
-import gearth.GEarth;
 import gearth.services.internal_extensions.extensionstore.GExtensionStore;
 import gearth.services.internal_extensions.extensionstore.application.GExtensionStoreController;
 import gearth.services.internal_extensions.extensionstore.application.WebUtils;
 import gearth.services.internal_extensions.extensionstore.application.entities.StoreExtensionItem;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.tools.InstalledExtension;
+import gearth.ui.translations.LanguageBundle;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 
 public class StoreExtensionInstalledItem extends StoreExtensionItem {
@@ -56,11 +56,11 @@ public class StoreExtensionInstalledItem extends StoreExtensionItem {
 
                     .append("<div class=\"overview_item_info\">")
                     .append("<div class=\"oii_name\">").append(WebUtils.escapeMessage(installedExtension.getName())).append("</div>")
-                    .append("<div class=\"oii_desc\">").append(GEarth.translation.getString("ext.store.extension.notinstore")).append("</div>")
+                    .append("<div class=\"oii_desc\">").append(LanguageBundle.get("ext.store.extension.notinstore")).append("</div>")
                     .append("</div>")
 
                     .append("<div class=\"overview_item_msgs\">")
-                    .append("<div class=\"oim_top\">").append(GEarth.translation.getString("ext.store.extension.version")).append(": ").append(displayVersion()).append("</div>")
+                    .append("<div class=\"oim_top\">").append(LanguageBundle.get("ext.store.extension.version")).append(": ").append(displayVersion()).append("</div>")
                     .append("<div class=\"oim_bottom\"></div>")
                     .append("</div>")
 

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/ByDateOverview.java

@@ -1,12 +1,11 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews;
 
-import gearth.GEarth;
 import gearth.misc.OSValidator;
-import gearth.services.internal_extensions.extensionstore.application.GExtensionStoreController;
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering;
+import gearth.ui.translations.LanguageBundle;
 
 import java.util.Collections;
 import java.util.List;
@@ -33,17 +32,17 @@ public class ByDateOverview extends QueriedExtensionOverview {
 
             @Override
             public String title() {
-                return GEarth.translation.getString("ext.store.search.ordering.bydate.title");
+                return LanguageBundle.get("ext.store.search.ordering.bydate.title");
             }
 
             @Override
             public String description() {
-                return GEarth.translation.getString("ext.store.search.ordering.bydate.description");
+                return LanguageBundle.get("ext.store.search.ordering.bydate.description");
             }
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.search.ordering.bydate.contenttitle");
+                return LanguageBundle.get("ext.store.search.ordering.bydate.contenttitle");
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/ByRatingOverview.java

@@ -1,12 +1,11 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews;
 
-import gearth.GEarth;
 import gearth.misc.OSValidator;
-import gearth.services.internal_extensions.extensionstore.application.GExtensionStoreController;
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering;
+import gearth.ui.translations.LanguageBundle;
 
 import java.util.Collections;
 import java.util.List;
@@ -33,17 +32,17 @@ public class ByRatingOverview extends QueriedExtensionOverview {
 
             @Override
             public String title() {
-                return GEarth.translation.getString("ext.store.search.ordering.byrating.title");
+                return LanguageBundle.get("ext.store.search.ordering.byrating.title");
             }
 
             @Override
             public String description() {
-                return GEarth.translation.getString("ext.store.search.ordering.byrating.description");
+                return LanguageBundle.get("ext.store.search.ordering.byrating.description");
             }
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.search.ordering.byrating.contenttitle");
+                return LanguageBundle.get("ext.store.search.ordering.byrating.contenttitle");
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/ByUpdateOverview.java

@@ -1,11 +1,11 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews;
 
-import gearth.GEarth;
 import gearth.misc.OSValidator;
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering;
+import gearth.ui.translations.LanguageBundle;
 
 import java.util.Collections;
 import java.util.List;
@@ -32,17 +32,17 @@ public class ByUpdateOverview extends QueriedExtensionOverview {
 
             @Override
             public String title() {
-                return GEarth.translation.getString("ext.store.search.ordering.byupdate.title");
+                return LanguageBundle.get("ext.store.search.ordering.byupdate.title");
             }
 
             @Override
             public String description() {
-                return GEarth.translation.getString("ext.store.search.ordering.byupdate.description");
+                return LanguageBundle.get("ext.store.search.ordering.byupdate.description");
             }
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.search.ordering.byupdate.contenttitle");
+                return LanguageBundle.get("ext.store.search.ordering.byupdate.contenttitle");
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/CategorizedOverview.java

@@ -1,13 +1,12 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews;
 
-import gearth.GEarth;
 import gearth.misc.OSValidator;
-import gearth.services.internal_extensions.extensionstore.application.WebUtils;
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.ExtCategory;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering;
+import gearth.ui.translations.LanguageBundle;
 
 import java.util.Collections;
 import java.util.List;
@@ -48,7 +47,7 @@ public class CategorizedOverview extends QueriedExtensionOverview {
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.category") + ": " + category.getName();
+                return LanguageBundle.get("ext.store.category") + ": " + category.getName();
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/SearchedQueryOverview.java

@@ -1,11 +1,11 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews;
 
-import gearth.GEarth;
 import gearth.misc.OSValidator;
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
 import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering;
+import gearth.ui.translations.LanguageBundle;
 
 import java.util.Collections;
 import java.util.List;
@@ -49,17 +49,17 @@ public class SearchedQueryOverview extends QueriedExtensionOverview {
 
             @Override
             public String title() {
-                return GEarth.translation.getString("ext.store.search.title");
+                return LanguageBundle.get("ext.store.search.title");
             }
 
             @Override
             public String description() {
-                return GEarth.translation.getString("ext.store.search.description");
+                return LanguageBundle.get("ext.store.search.description");
             }
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.search.results");
+                return LanguageBundle.get("ext.store.search.results");
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/search/SearchComponent.java

@@ -6,6 +6,7 @@ import gearth.services.internal_extensions.extensionstore.application.GExtension
 import gearth.services.internal_extensions.extensionstore.application.entities.ContentItem;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering;
+import gearth.ui.translations.LanguageBundle;
 import netscape.javascript.JSObject;
 
 import java.util.ArrayList;
@@ -93,13 +94,13 @@ public class SearchComponent implements ContentItem {
                 .append("<div class=\"searchInnerContainer\">")
 
                 .append("<div class=\"centeredFlex\">")
-                .append("<label for=\"keyword\">").append(GEarth.translation.getString("ext.store.search.bykeyword")).append(":</label>")
+                .append("<label for=\"keyword\">").append(LanguageBundle.get("ext.store.search.bykeyword")).append(":</label>")
                 .append(String.format("<input id=\"keyword\" value=\"%s\" name=\"keyword\" class=\"inputBox\" type=\"text\" " +
                         "oninput=\"%s.setSearchKeyword(this.value);\">", searchKeyword, id))
                 .append("</div>")
 
                 .append("<div class=\"centeredFlex\">")
-                .append("<label for=\"ordering\">").append(GEarth.translation.getString("ext.store.search.ordering")).append("</label>");
+                .append("<label for=\"ordering\">").append(LanguageBundle.get("ext.store.search.ordering")).append("</label>");
 
         // add ordering stuff
         htmlBuilder.append(String.format("<select class=\"inputBox\" name=\"ordering\" id=\"ordering\" " +
@@ -120,13 +121,13 @@ public class SearchComponent implements ContentItem {
 
                 .append("<div class=\"filterStuff\">");
 
-        addFilterBoxHtml(htmlBuilder, "Client", GEarth.translation.getString("ext.store.search.filter.clients") + ":", clients, id);
+        addFilterBoxHtml(htmlBuilder, "Client", LanguageBundle.get("ext.store.search.filter.clients") + ":", clients, id);
-        addFilterBoxHtml(htmlBuilder, "Category", GEarth.translation.getString("ext.store.search.filter.categories") + ":", categories, id);
+        addFilterBoxHtml(htmlBuilder, "Category", LanguageBundle.get("ext.store.search.filter.categories") + ":", categories, id);
-        addFilterBoxHtml(htmlBuilder, "Framework", GEarth.translation.getString("ext.store.search.filter.frameworks") + ":", frameworks, id);
+        addFilterBoxHtml(htmlBuilder, "Framework", LanguageBundle.get("ext.store.search.filter.frameworks") + ":", frameworks, id);
 
         htmlBuilder
                 .append("</div>")
-                .append("<br><p>").append(GEarth.translation.getString("ext.store.search.info.automaticosfiltering")).append("</p>")
+                .append("<br><p>").append(LanguageBundle.get("ext.store.search.info.automaticosfiltering")).append("</p>")
 
                 .append("</div>")
                 .append("</div>");

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/search/SearchOverview.java

@@ -1,12 +1,12 @@
 package gearth.services.internal_extensions.extensionstore.application.entities.search;
 
-import gearth.GEarth;
 import gearth.services.internal_extensions.extensionstore.GExtensionStore;
 import gearth.services.internal_extensions.extensionstore.application.entities.ContentItem;
 import gearth.services.internal_extensions.extensionstore.application.entities.HOverview;
 import gearth.services.internal_extensions.extensionstore.application.entities.extensiondetails.StoreExtensionDetailsOverview;
 import gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews.SearchedQueryOverview;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
+import gearth.ui.translations.LanguageBundle;
 
 import java.util.Collections;
 import java.util.List;
@@ -28,7 +28,7 @@ public class SearchOverview extends HOverview {
 
     @Override
     public String buttonText() {
-        return GEarth.translation.getString("ext.store.button.search");
+        return LanguageBundle.get("ext.store.button.search");
     }
 
     @Override
@@ -75,17 +75,17 @@ public class SearchOverview extends HOverview {
 
             @Override
             public String title() {
-                return GEarth.translation.getString("ext.store.search.title");
+                return LanguageBundle.get("ext.store.search.title");
             }
 
             @Override
             public String description() {
-                return GEarth.translation.getString("ext.store.search.description");
+                return LanguageBundle.get("ext.store.search.description");
             }
 
             @Override
             public String contentTitle() {
-                return GEarth.translation.getString("ext.store.search.contenttitle");
+                return LanguageBundle.get("ext.store.search.contenttitle");
             }
         };
     }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/querying/ExtensionOrdering.java

@@ -1,27 +1,29 @@
 package gearth.services.internal_extensions.extensionstore.repository.querying;
 
+import gearth.ui.translations.LanguageBundle;
+
 public enum ExtensionOrdering {
 
-    RATING("Rating"),
+    RATING("ext.store.ordering.rating"),
-    ALPHABETICAL("Alphabetical"),
+    ALPHABETICAL("ext.store.ordering.alphabetical"),
-    LAST_UPDATED("Last updated"),
+    LAST_UPDATED("ext.store.ordering.lastupdated"),
-    NEW_RELEASES("New releases");
+    NEW_RELEASES("ext.store.ordering.newreleases");
 
 
 
-    private String orderName;
+    private String orderKey;
 
-    ExtensionOrdering(String orderName) {
+    ExtensionOrdering(String orderKey) {
-        this.orderName = orderName;
+        this.orderKey = orderKey;
     }
 
     public String getOrderName() {
-        return orderName;
+        return LanguageBundle.get(orderKey);
     }
 
     public static ExtensionOrdering fromString(String text) {
         for (ExtensionOrdering b : ExtensionOrdering.values()) {
-            if (b.orderName.equalsIgnoreCase(text)) {
+            if (LanguageBundle.get(b.orderKey).equalsIgnoreCase(text)) {
                 return b;
             }
         }

G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java

@@ -8,6 +8,7 @@ import gearth.services.extension_handler.extensions.implementations.network.exec
 import gearth.services.internal_extensions.extensionstore.repository.StoreFetch;
 import gearth.services.internal_extensions.extensionstore.repository.StoreRepository;
 import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension;
+import gearth.ui.translations.LanguageBundle;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.json.JSONArray;
@@ -137,29 +138,29 @@ public class StoreExtensionTools {
 
                         } catch (IOException e) {
                             e.printStackTrace();
-                            listener.fail("Error while unzipping");
+                            listener.fail(LanguageBundle.get("ext.store.fail.unzip"));
                             removeExtension(path);
                         }
 
                     } catch (MalformedURLException e) {
-                        listener.fail("Invalid extension URL");
+                        listener.fail(LanguageBundle.get("ext.store.fail.invalidurl"));
                         try {
                             removeExtension(path); // cleanup
                         } catch (IOException ignore) { }
                     } catch (IOException e) {
-                        listener.fail("Extension not available in repository");
+                        listener.fail(LanguageBundle.get("ext.store.fail.notavailable"));
                         try {
                             removeExtension(path); // cleanup
                         } catch (IOException ignore) { }
                     }
                 }
                 else {
-                    listener.fail("Something went wrong creating the extension directory, does the extension already exist?");
+                    listener.fail(LanguageBundle.get("ext.store.fail.alreadyexists"));
                     // don't do cleanup since you might not want removal of current extension files
                 }
             }
             else {
-                listener.fail("Extension wasn't found");
+                listener.fail(LanguageBundle.get("ext.store.fail.notfound"));
             }
 
         }).start();
@@ -233,8 +234,7 @@ public class StoreExtensionTools {
                 }
             }
         } catch (Exception e) {
-            listener.fail("Something went wrong with uninstalling the extension, make sure to disconnect" +
+            listener.fail(LanguageBundle.get("ext.store.fail.uninstall"));
-                    " the extension if it was still running.");
             return;
         }
 

G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerCreator.java

@@ -14,7 +14,7 @@ public class UiLoggerCreator extends InternalExtensionFormCreator<UiLogger> {
     public UiLogger createForm(Stage stage) throws Exception {
         UiLogger uiLogger = new UiLogger();
 
-        FXMLLoader loader = new FXMLLoader(UiLogger.class.getResource("UiLogger.fxml"), GEarth.translation);
+        FXMLLoader loader = new FXMLLoader(UiLogger.class.getResource("UiLogger.fxml"));
 
         Parent root = loader.load();
         stage.setTitle("G-Earth | Packet Logger");

G-Earth/src/main/java/gearth/ui/subforms/extra/ExtraController.java

@@ -11,6 +11,7 @@ import gearth.services.g_python.GPythonVersionUtils;
 import gearth.ui.SubForm;
 import gearth.ui.subforms.info.InfoController;
 import gearth.ui.titlebar.TitleBarController;
+import gearth.ui.translations.LanguageBundle;
 import gearth.ui.translations.TranslatableString;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
@@ -181,13 +182,13 @@ public class ExtraController extends SubForm implements SocksConfiguration {
                 });
                 if (!GPythonVersionUtils.validInstallation()) {
                     Platform.runLater(() -> {
-                        Alert alert = new Alert(Alert.AlertType.ERROR, GEarth.translation.getString("tab.extra.options.pythonscripting.alert.title"), ButtonType.OK);
+                        Alert alert = new Alert(Alert.AlertType.ERROR, LanguageBundle.get("tab.extra.options.pythonscripting.alert.title"), ButtonType.OK);
-                        alert.setTitle(GEarth.translation.getString("tab.extra.options.pythonscripting.alert.title"));
+                        alert.setTitle(LanguageBundle.get("tab.extra.options.pythonscripting.alert.title"));
 
                         FlowPane fp = new FlowPane();
-                        Label lbl = new Label(GEarth.translation.getString("tab.extra.options.pythonscripting.alert.content") +
+                        Label lbl = new Label(LanguageBundle.get("tab.extra.options.pythonscripting.alert.content") +
                                 System.lineSeparator() + System.lineSeparator() +
-                                GEarth.translation.getString("tab.extra.options.pythonscripting.alert.moreinformation"));
+                                LanguageBundle.get("tab.extra.options.pythonscripting.alert.moreinformation"));
                         Hyperlink link = new Hyperlink(INFO_URL_GPYTHON);
                         fp.getChildren().addAll( lbl, link);
                         link.setOnAction(event -> {

G-Earth/src/main/java/gearth/ui/subforms/injection/InjectedPackets.java

@@ -6,6 +6,7 @@ import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import gearth.services.packet_info.PacketInfo;
 import gearth.services.packet_info.PacketInfoManager;
+import gearth.ui.translations.LanguageBundle;
 import org.json.JSONObject;
 
 import java.util.HashMap;
@@ -20,7 +21,7 @@ public class InjectedPackets implements StringifyAble {
     public InjectedPackets(String packetsAsString, int amountPackets, PacketInfoManager packetInfoManager, HMessage.Direction direction) {
         String description;
         if (amountPackets > 1) {
-            description = String.format("(%s: %d, %s: %d)", GEarth.translation.getString("tab.injection.description.packets"), amountPackets, GEarth.translation.getString("tab.injection.description.length"), packetsAsString.length());
+            description = String.format("(%s: %d, %s: %d)", LanguageBundle.get("tab.injection.description.packets"), amountPackets, LanguageBundle.get("tab.injection.description.length"), packetsAsString.length());
         }
         else { // assume 1 packet
             HPacket packet = new HPacket(packetsAsString);
@@ -41,7 +42,7 @@ public class InjectedPackets implements StringifyAble {
                 description = String.format("%s", identifier);
             }
             else {
-                description = String.format("(%s: %d, %s: %d)", GEarth.translation.getString("tab.injection.description.id"), packet.headerId(), GEarth.translation.getString("tab.injection.description.length"), packet.length());
+                description = String.format("(%s: %d, %s: %d)", LanguageBundle.get("tab.injection.description.id"), packet.headerId(), LanguageBundle.get("tab.injection.description.length"), packet.length());
             }
         }
 

G-Earth/src/main/java/gearth/ui/subforms/injection/InjectionController.java

@@ -5,6 +5,7 @@ import gearth.misc.Cacher;
 import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.connection.HState;
+import gearth.ui.translations.LanguageBundle;
 import gearth.ui.translations.TranslatableString;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
@@ -182,7 +183,7 @@ public class InjectionController extends SubForm {
         HPacket[] packets = parsePackets(inputPacket.getText());
         for (HPacket packet : packets) {
             getHConnection().sendToServer(packet);
-            writeToLog(Color.BLUE, String.format("SS -> %s: %d", GEarth.translation.getString("tab.injection.log.packetwithid"), packet.headerId()));
+            writeToLog(Color.BLUE, String.format("SS -> %s: %d", LanguageBundle.get("tab.injection.log.packetwithid"), packet.headerId()));
         }
 
         addToHistory(packets, inputPacket.getText(), HMessage.Direction.TOSERVER);
@@ -192,7 +193,7 @@ public class InjectionController extends SubForm {
         HPacket[] packets = parsePackets(inputPacket.getText());
         for (HPacket packet : packets) {
             getHConnection().sendToClient(packet);
-            writeToLog(Color.RED, String.format("CS -> %s: %d", GEarth.translation.getString("tab.injection.log.packetwithid"), packet.headerId()));
+            writeToLog(Color.RED, String.format("CS -> %s: %d", LanguageBundle.get("tab.injection.log.packetwithid"), packet.headerId()));
         }
 
         addToHistory(packets, inputPacket.getText(), HMessage.Direction.TOCLIENT);

G-Earth/src/main/resources/gearth/ui/subforms/extra/Extra.fxml

@@ -77,8 +77,8 @@
                             <RowConstraints maxHeight="29.0" minHeight="29.0" prefHeight="29.0" vgrow="SOMETIMES" />
                           </rowConstraints>
                            <children>
-                              <Label fx:id="lbl_proxyIp" text="%tab.extra.options.advanced.proxy.ip" />
+                              <Label fx:id="lbl_proxyIp" text="Proxy IP:" />
-                              <Label fx:id="lbl_proxyPort" text="%tab.extra.options.advanced.proxy.port" GridPane.rowIndex="1" />
+                              <Label fx:id="lbl_proxyPort" text="Proxy port:" GridPane.rowIndex="1" />
                               <TextField fx:id="txt_socksPort" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.rowIndex="1">
                                  <opaqueInsets>
                                     <Insets />

G-Earth/src/main/resources/gearth/ui/translations/messages_de.properties

@@ -264,6 +264,17 @@ ext.store.categories.title=Kategorien
 ext.store.categories.description=Erkunde die verschiedenen Kategorien aller Erweiterungen.
 ext.store.categories.contenttitle=Kategorie
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Fenster

G-Earth/src/main/resources/gearth/ui/translations/messages_en.properties

@@ -261,6 +261,17 @@ ext.store.categories.title=Categories
 ext.store.categories.description=Explore the different kinds of extensions G-Earth has to offer
 ext.store.categories.contenttitle=Categories
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Window

G-Earth/src/main/resources/gearth/ui/translations/messages_es.properties

@@ -260,6 +260,17 @@ ext.store.categories.title=Categorias
 ext.store.categories.description=Explora las diferentes categorias que G-Earth tiene por ofrecerte
 ext.store.categories.contenttitle=Categorias
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Ventana

G-Earth/src/main/resources/gearth/ui/translations/messages_fi.properties

@@ -263,6 +263,17 @@ ext.store.categories.title=Categories
 ext.store.categories.description=Explore the different kinds of extensions G-Earth has to offer
 ext.store.categories.contenttitle=Categories
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Window
@@ -314,3 +325,4 @@ ext.logger.element.direction.incoming=Incoming
 ext.logger.element.skipped=packet skipped
 ext.logger.state.true=True
 ext.logger.state.false=False
+

G-Earth/src/main/resources/gearth/ui/translations/messages_fr.properties

@@ -263,6 +263,17 @@ ext.store.categories.title=Catégories
 ext.store.categories.description=Explorer les différentes extensions que G-Earth a à te proposer
 ext.store.categories.contenttitle=Catégories
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Fenêtre

G-Earth/src/main/resources/gearth/ui/translations/messages_it.properties

@@ -261,6 +261,17 @@ ext.store.categories.title=Categorie
 ext.store.categories.description=Esplora i diversi tipi di estensioni che G-Earth ha da offrire
 ext.store.categories.contenttitle=Categorie
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Finestra

G-Earth/src/main/resources/gearth/ui/translations/messages_nl.properties

@@ -259,7 +259,17 @@ ext.store.overview.folder=Open map
 ext.store.categories.title=Categorieën
 ext.store.categories.description=Doorzoek de verschillende soorten extensies die G-Earth aan te bieden heeft
 ext.store.categories.contenttitle=Categorieën
+ext.store.fail.unzip=Error bij het unzippen
+ext.store.fail.invalidurl=Ongeldige extensie URL
+ext.store.fail.notavailable=Extensie is niet beschikbaar in de repository
+ext.store.fail.alreadyexists=Er ging iets mis bij het aanmaken van de map, bestaat de extensie al?
+ext.store.fail.notfound=Extension kon niet worden gevonden
+ext.store.fail.uninstall=Er ging iets mis met het deinstalleren van de extensie, zorg dat de je eerst de extensie's verbinding verbreekt indien deze nog aan stond.
 
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alfabetisch
+ext.store.ordering.lastupdated=Laatst geüpdatet
+ext.store.ordering.newreleases=Nieuwe releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Venster

G-Earth/src/main/resources/gearth/ui/translations/messages_pt.properties

@@ -260,6 +260,17 @@ ext.store.categories.title=Categorias
 ext.store.categories.description=Explore os diferentes tipos de extensões que o G-Earth tem a oferecer
 ext.store.categories.contenttitle=Categorias
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Janela

G-Earth/src/main/resources/gearth/ui/translations/messages_tr.properties

@@ -263,6 +263,17 @@ ext.store.categories.title=Categories
 ext.store.categories.description=Explore the different kinds of extensions G-Earth has to offer
 ext.store.categories.contenttitle=Categories
 
+ext.store.fail.unzip=Error while unzipping
+ext.store.fail.invalidurl=Invalid extension URL
+ext.store.fail.notavailable=Extension not available in repository
+ext.store.fail.alreadyexists=Something went wrong creating the extension directory, does the extension already exist?
+ext.store.fail.notfound=Extension wasn't found
+ext.store.fail.uninstall=Something went wrong with uninstalling the extension, make sure to disconnect the extension if it was still running.
+
+ext.store.ordering.rating=Rating
+ext.store.ordering.alphabetical=Alphabetical
+ext.store.ordering.lastupdated=Last updated
+ext.store.ordering.newreleases=New releases
 
 ### Internal extension - Logger
 ext.logger.menu.window=Window