From 5835087ea5002a1d611016346c0fbc622d472990 Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Sat, 17 Aug 2019 08:33:05 +0300
Subject: [PATCH] v0.6 Re-writing localization strings names

---
 .../Controllers/NSLMainController.java        | 16 ++---
 .../Controllers/NSTableViewController.java    | 12 ++--
 src/main/java/nsusbloader/NSLMain.java        |  4 +-
 src/main/resources/FrontTab.fxml              |  2 +-
 src/main/resources/NSLMain.fxml               |  4 +-
 src/main/resources/SettingsTab.fxml           | 28 ++++----
 src/main/resources/locale.properties          | 63 +++++++++---------
 src/main/resources/locale_fra.properties      | 60 +++++++++--------
 src/main/resources/locale_ita.properties      | 57 ++++++++---------
 src/main/resources/locale_kor.properties      | 61 +++++++++---------
 src/main/resources/locale_por.properties      | 61 +++++++++---------
 src/main/resources/locale_rus.properties      | 64 +++++++++----------
 src/main/resources/locale_spa.properties      | 63 +++++++++---------
 src/main/resources/locale_ukr.properties      | 63 +++++++++---------
 14 files changed, 267 insertions(+), 291 deletions(-)

diff --git a/src/main/java/nsusbloader/Controllers/NSLMainController.java b/src/main/java/nsusbloader/Controllers/NSLMainController.java
index 69d6c3e..7dd2655 100644
--- a/src/main/java/nsusbloader/Controllers/NSLMainController.java
+++ b/src/main/java/nsusbloader/Controllers/NSLMainController.java
@@ -48,12 +48,12 @@ public class NSLMainController implements Initializable {
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         this.resourceBundle = rb;
-        logArea.setText(rb.getString("logsGreetingsMessage")+" "+ NSLMain.appVersion+"!\n");
+        logArea.setText(rb.getString("tab3_Txt_GreetingsMessage")+" "+ NSLMain.appVersion+"!\n");
         if (System.getProperty("os.name").toLowerCase().startsWith("lin"))
             if (!System.getProperty("user.name").equals("root"))
-                logArea.appendText(rb.getString("logsEnteredAsMsg1")+System.getProperty("user.name")+"\n"+rb.getString("logsEnteredAsMsg2") + "\n");
+                logArea.appendText(rb.getString("tab3_Txt_EnteredAsMsg1")+System.getProperty("user.name")+"\n"+rb.getString("tab3_Txt_EnteredAsMsg2") + "\n");
 
-        logArea.appendText(rb.getString("logsGreetingsMessage2")+"\n");
+        logArea.appendText(rb.getString("tab3_Txt_GreetingsMessage2")+"\n");
 
         MediatorControl.getInstance().setController(this);
 
@@ -104,7 +104,7 @@ public class NSLMainController implements Initializable {
     private void selectFilesBtnAction(){
         List<File> filesList;
         FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle(resourceBundle.getString("btnFileOpen"));
+        fileChooser.setTitle(resourceBundle.getString("btn_OpenFile"));
 
         File validator = new File(previouslyOpenedPath);
         if (validator.exists())
@@ -133,12 +133,12 @@ public class NSLMainController implements Initializable {
             // Collect files
             List<File> nspToUpload;
             if ((nspToUpload = FrontTabController.tableFilesListController.getFilesForUpload()) == null && FrontTabController.getSelectedProtocol().equals("TinFoil")) {
-                logArea.setText(resourceBundle.getString("logsNoFolderFileSelected"));
+                logArea.setText(resourceBundle.getString("tab3_Txt_NoFolderOrFileSelected"));
                 return;
             }
             else {
                 if ((nspToUpload = FrontTabController.tableFilesListController.getFilesForUpload()) != null){
-                    logArea.setText(resourceBundle.getString("logsFilesToUploadTitle")+"\n");
+                    logArea.setText(resourceBundle.getString("tab3_Txt_FilesToUploadTitle")+"\n");
                     for (File item: nspToUpload)
                         logArea.appendText("  "+item.getAbsolutePath()+"\n");
                 }
@@ -199,7 +199,7 @@ public class NSLMainController implements Initializable {
             selectNspBtn.setDisable(true);
             uploadStopBtn.setOnAction(e->{ stopBtnAction(); });
 
-            uploadStopBtn.setText(resourceBundle.getString("btnStop"));
+            uploadStopBtn.setText(resourceBundle.getString("btn_Stop"));
 
             btnUpStopImage.getStyleClass().remove("regionUpload");
             btnUpStopImage.getStyleClass().add("regionStop");
@@ -211,7 +211,7 @@ public class NSLMainController implements Initializable {
             selectNspBtn.setDisable(false);
             uploadStopBtn.setOnAction(e->{ uploadBtnAction(); });
 
-            uploadStopBtn.setText(resourceBundle.getString("btnUpload"));
+            uploadStopBtn.setText(resourceBundle.getString("btn_Upload"));
 
             btnUpStopImage.getStyleClass().remove("regionStop");
             btnUpStopImage.getStyleClass().add("regionUpload");
diff --git a/src/main/java/nsusbloader/Controllers/NSTableViewController.java b/src/main/java/nsusbloader/Controllers/NSTableViewController.java
index c976d3c..8917fbf 100644
--- a/src/main/java/nsusbloader/Controllers/NSTableViewController.java
+++ b/src/main/java/nsusbloader/Controllers/NSTableViewController.java
@@ -60,10 +60,10 @@ public class NSTableViewController implements Initializable {
             }
         });
 
-        TableColumn<NSLRowModel, String> statusColumn = new TableColumn<>(resourceBundle.getString("tableStatusLbl"));
-        TableColumn<NSLRowModel, String> fileNameColumn = new TableColumn<>(resourceBundle.getString("tableFileNameLbl"));
-        TableColumn<NSLRowModel, String> fileSizeColumn = new TableColumn<>(resourceBundle.getString("tableSizeLbl"));
-        TableColumn<NSLRowModel, Boolean> uploadColumn = new TableColumn<>(resourceBundle.getString("tableUploadLbl"));
+        TableColumn<NSLRowModel, String> statusColumn = new TableColumn<>(resourceBundle.getString("tab1_table_Lbl_Status"));
+        TableColumn<NSLRowModel, String> fileNameColumn = new TableColumn<>(resourceBundle.getString("tab1_table_Lbl_FileName"));
+        TableColumn<NSLRowModel, String> fileSizeColumn = new TableColumn<>(resourceBundle.getString("tab1_table_Lbl_Size"));
+        TableColumn<NSLRowModel, Boolean> uploadColumn = new TableColumn<>(resourceBundle.getString("tab1_table_Lbl_Upload"));
 
         statusColumn.setEditable(false);
         fileNameColumn.setEditable(false);
@@ -122,7 +122,7 @@ public class NSTableViewController implements Initializable {
                     public TableRow<NSLRowModel> call(TableView<NSLRowModel> nslRowModelTableView) {
                         final TableRow<NSLRowModel> row = new TableRow<>();
                         ContextMenu contextMenu = new ContextMenu();
-                        MenuItem deleteMenuItem = new MenuItem(resourceBundle.getString("contextMenuBtnDelete"));
+                        MenuItem deleteMenuItem = new MenuItem(resourceBundle.getString("tab1_table_contextMenu_Btn_BtnDelete"));
                         deleteMenuItem.setOnAction(new EventHandler<ActionEvent>() {
                             @Override
                             public void handle(ActionEvent actionEvent) {
@@ -132,7 +132,7 @@ public class NSTableViewController implements Initializable {
                                 table.refresh();
                             }
                         });
-                        MenuItem deleteAllMenuItem = new MenuItem(resourceBundle.getString("contextMenuBtnDeleteAll"));
+                        MenuItem deleteAllMenuItem = new MenuItem(resourceBundle.getString("tab1_table_contextMenu_Btn_DeleteAll"));
                         deleteAllMenuItem.setOnAction(new EventHandler<ActionEvent>() {
                             @Override
                             public void handle(ActionEvent actionEvent) {
diff --git a/src/main/java/nsusbloader/NSLMain.java b/src/main/java/nsusbloader/NSLMain.java
index 5a0ab9d..4f10ef6 100644
--- a/src/main/java/nsusbloader/NSLMain.java
+++ b/src/main/java/nsusbloader/NSLMain.java
@@ -32,8 +32,8 @@ public class NSLMain extends Application {
 
         primaryStage.setTitle("NS-USBloader "+appVersion);
         primaryStage.setMinWidth(600);
-        primaryStage.setMinHeight(375);
-        Scene mainScene = new Scene(root, 800, 400);
+        primaryStage.setMinHeight(400);
+        Scene mainScene = new Scene(root, 800, 425);
 
         mainScene.getStylesheets().add(AppPreferences.getInstance().getTheme());
 
diff --git a/src/main/resources/FrontTab.fxml b/src/main/resources/FrontTab.fxml
index 5e83767..458fa2f 100644
--- a/src/main/resources/FrontTab.fxml
+++ b/src/main/resources/FrontTab.fxml
@@ -22,7 +22,7 @@
                <items>
                   <ChoiceBox fx:id="choiceProtocol" prefWidth="120.0" />
                   <ChoiceBox fx:id="choiceNetUsb" prefWidth="75.0" />
-                  <Label fx:id="nsIpLbl" text="%NSIPlable" visible="false" />
+                  <Label fx:id="nsIpLbl" text="%tab1_Lbl_NSIP" visible="false" />
                   <TextField fx:id="nsIpTextField" prefWidth="135.0" promptText="XXX.XXX.XXX.XXX" visible="false" />
                   <Pane HBox.hgrow="ALWAYS" />
                   <Button fx:id="switchThemeBtn" mnemonicParsing="false" />
diff --git a/src/main/resources/NSLMain.fxml b/src/main/resources/NSLMain.fxml
index 8bd5e33..4814235 100644
--- a/src/main/resources/NSLMain.fxml
+++ b/src/main/resources/NSLMain.fxml
@@ -59,7 +59,7 @@
             </ProgressBar>
             <HBox alignment="TOP_CENTER" VBox.vgrow="NEVER">
                <children>
-                  <Button fx:id="selectNspBtn" contentDisplay="TOP" mnemonicParsing="false" prefHeight="60.0" text="%btnFileOpen">
+                  <Button fx:id="selectNspBtn" contentDisplay="TOP" mnemonicParsing="false" prefHeight="60.0" text="%btn_OpenFile">
                      <HBox.margin>
                         <Insets />
                      </HBox.margin>
@@ -68,7 +68,7 @@
                      </graphic>
                   </Button>
                   <Pane HBox.hgrow="ALWAYS" />
-                  <Button fx:id="uploadStopBtn" contentDisplay="TOP" mnemonicParsing="false" prefHeight="60.0" prefWidth="130.0" text="%btnUpload">
+                  <Button fx:id="uploadStopBtn" contentDisplay="TOP" mnemonicParsing="false" prefHeight="60.0" prefWidth="130.0" text="%btn_Upload">
                      <HBox.margin>
                         <Insets />
                      </HBox.margin>
diff --git a/src/main/resources/SettingsTab.fxml b/src/main/resources/SettingsTab.fxml
index e9c85fa..7e3532f 100644
--- a/src/main/resources/SettingsTab.fxml
+++ b/src/main/resources/SettingsTab.fxml
@@ -16,32 +16,32 @@
 <ScrollPane fitToWidth="true" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nsusbloader.Controllers.SettingsController">
             <VBox spacing="5.0">
                <children>
-         <CheckBox fx:id="nspFilesFilterForGLCB" mnemonicParsing="false" text="%netTabGLshowNSPonly" />
-                  <CheckBox fx:id="validateNSHostNameCb" mnemonicParsing="false" text="%netTabValidateNSHostNameCb">
+         <CheckBox fx:id="nspFilesFilterForGLCB" mnemonicParsing="false" text="%tab2_Cb_GLshowNspOnly" />
+                  <CheckBox fx:id="validateNSHostNameCb" mnemonicParsing="false" text="%tab2_Cb_ValidateNSHostName">
                      <VBox.margin>
                         <Insets />
                      </VBox.margin>
                   </CheckBox>
-                  <CheckBox fx:id="expertModeCb" mnemonicParsing="false" text="%netTabExpertModeCb" />
+                  <CheckBox fx:id="expertModeCb" mnemonicParsing="false" text="%tab2_Cb_ExpertMode" />
                   <VBox fx:id="expertSettingsVBox" spacing="5.0">
                      <children>
-                        <CheckBox fx:id="autoDetectIpCb" mnemonicParsing="false" text="%netTabAutoDetectIpCb">
+                        <CheckBox fx:id="autoDetectIpCb" mnemonicParsing="false" text="%tab2_Cb_AutoDetectIp">
                            <VBox.margin>
                               <Insets />
                            </VBox.margin>
                         </CheckBox>
-                        <CheckBox fx:id="randPortCb" mnemonicParsing="false" text="%netTabRandSelectPortCb">
+                        <CheckBox fx:id="randPortCb" mnemonicParsing="false" text="%tab2_Cb_RandSelectPort">
                            <VBox.margin>
                               <Insets />
                            </VBox.margin>
                         </CheckBox>
                         <HBox>
                            <children>
-                              <Label text="%netTabHostIPLbl" />
+                              <Label text="%tab2_Lbl_HostIP" />
                               <Label text=":" />
-                              <Label text="%netTabHostPortLbl" />
+                              <Label text="%tab2_Lbl_HostPort" />
                               <Label text="/" />
-                              <Label text="%netTabHostExtraLbl" />
+                              <Label text="%tab2_Lbl_HostExtra" />
                            </children>
                         </HBox>
                         <HBox>
@@ -58,12 +58,12 @@
                            </children>
                         </HBox>
                         <Separator prefWidth="200.0" />
-                        <CheckBox fx:id="dontServeCb" mnemonicParsing="false" text="%netTabDontServeRequestsCb">
+                        <CheckBox fx:id="dontServeCb" mnemonicParsing="false" text="%tab2_Cb_DontServeRequests">
                            <VBox.margin>
                               <Insets />
                            </VBox.margin>
                         </CheckBox>
-                        <Label disable="true" text="%netTabDontServeRequestsDescription" wrapText="true">
+                        <Label disable="true" text="%tab2_Lbl_DontServeRequestsDesc" wrapText="true">
                            <VBox.margin>
                               <Insets />
                            </VBox.margin>
@@ -77,7 +77,7 @@
                      <children>
                         <VBox>
                            <children>
-                              <CheckBox fx:id="autoCheckUpdCb" mnemonicParsing="false" text="%netTabAutoCheckForUpdates" />
+                              <CheckBox fx:id="autoCheckUpdCb" mnemonicParsing="false" text="%tab2_Cb_AutoCheckForUpdates" />
                               <Hyperlink fx:id="newVersionLink" />
                            </children>
                         </VBox>
@@ -87,13 +87,13 @@
                   </HBox>
                   <HBox alignment="CENTER_LEFT" spacing="5.0">
                      <children>
-                        <Label text="%netTabLanguage" />
+                        <Label text="%tab2_Lbl_Language" />
                         <ChoiceBox fx:id="langCB" prefWidth="100.0" />
                         <Button fx:id="langBtn" mnemonicParsing="false" text="OK" />
                      </children>
                   </HBox>
-                  <CheckBox fx:id="tfXciSpprtCb" mnemonicParsing="false" text="%netTabAllowXciCb" />
-                  <Label disable="true" text="%netTabAllowXciTextField" wrapText="true" />
+                  <CheckBox fx:id="tfXciSpprtCb" mnemonicParsing="false" text="%tab2_Cb_AllowXci" />
+                  <Label disable="true" text="%tab2_Lbl_AllowXciDesc" wrapText="true" />
                </children>
                <padding>
                   <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
diff --git a/src/main/resources/locale.properties b/src/main/resources/locale.properties
index f2f8bf7..74de375 100644
--- a/src/main/resources/locale.properties
+++ b/src/main/resources/locale.properties
@@ -1,48 +1,45 @@
-btnFileOpen=Select .NSP files
-btnUpload=Upload to NS
-logsEnteredAsMsg1=You have been entered as: 
-logsEnteredAsMsg2=You should be root or have configured 'udev' rules for this user to avoid any issues.
-logsFilesToUploadTitle=Files to upload:
-logsGreetingsMessage=Welcome to NS-USBloader
-logsNoFolderFileSelected=No files selected: nothing to upload.
+btn_OpenFile=Select .NSP files
+btn_Upload=Upload to NS
+tab3_Txt_EnteredAsMsg1=You have been entered as: 
+tab3_Txt_EnteredAsMsg2=You should be root or have configured 'udev' rules for this user to avoid any issues.
+tab3_Txt_FilesToUploadTitle=Files to upload:
+tab3_Txt_GreetingsMessage=Welcome to NS-USBloader
+tab3_Txt_NoFolderOrFileSelected=No files selected: nothing to upload.
 windowBodyConfirmExit=Data transfer is in progress and closing this application will interrupt it.\nIt's the worse thing you can do now.\nInterrupt proccess and exit?
 windowTitleConfirmExit=No, don't do this!
-btnStop=Interrupt
-logsGreetingsMessage2=--\n\
+btn_Stop=Interrupt
+tab3_Txt_GreetingsMessage2=--\n\
 Source: https://github.com/developersu/ns-usbloader/\n\
 Site: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 Dmitry Isaenko [developer.su]
-windowTitleConfirmWrongPFS0=Incorrect file type
-windowBodyConfirmWrongPFS0=Selected NSP file has incrrect starting symbols. Most likely it's corrupted.\n\
-It's better to interrupt proccess now. Continue process anyway?
-tableStatusLbl=Status
-tableFileNameLbl=File name
-tableSizeLbl=Size
-tableUploadLbl=Upload?
-contextMenuBtnDelete=Remove
-contextMenuBtnDeleteAll=Remove all
-netTabHostIPLbl=Host IP
-NSIPlable=NS IP:
-netTabValidateNSHostNameCb=Always validate NS IP input.
+tab1_table_Lbl_Status=Status
+tab1_table_Lbl_FileName=File name
+tab1_table_Lbl_Size=Size
+tab1_table_Lbl_Upload=Upload?
+tab1_table_contextMenu_Btn_BtnDelete=Remove
+tab1_table_contextMenu_Btn_DeleteAll=Remove all
+tab2_Lbl_HostIP=Host IP
+tab1_Lbl_NSIP=NS IP:
+tab2_Cb_ValidateNSHostName=Always validate NS IP input.
 windowBodyBadIp=Are you sure that you entered NS IP address correctly?
 windowTitleBadIp=IP address of NS most likely incorrect
-netTabExpertModeCb=Expert mode
-netTabHostPortLbl=port
-netTabAutoDetectIpCb=Auto-detect IP
-netTabRandSelectPortCb=Randomly get port
-netTabDontServeRequestsCb=Don't serve requests
-netTabDontServeRequestsDescription=If selected, this computer won't reply to NSP files requests coming from NS (over the net) and use defined host settings to tell TinFoil where should it look for files.
-netTabHostExtraLbl=extra
+tab2_Cb_ExpertMode=Expert mode
+tab2_Lbl_HostPort=port
+tab2_Cb_AutoDetectIp=Auto-detect IP
+tab2_Cb_RandSelectPort=Randomly get port
+tab2_Cb_DontServeRequests=Don't serve requests
+tab2_Lbl_DontServeRequestsDesc=If selected, this computer won't reply to NSP files requests coming from NS (over the net) and use defined host settings to tell TinFoil where should it look for files.
+tab2_Lbl_HostExtra=extra
 windowTitleErrorPort=Port set incorrectly!
 windowBodyErrorPort=Port can't be 0 or greater than 65535.
-netTabAutoCheckForUpdates=Auto check for updates
+tab2_Cb_AutoCheckForUpdates=Auto check for updates
 windowTitleNewVersionAval=New version available
 windowTitleNewVersionNOTAval=No new versions available
 windowTitleNewVersionUnknown=Unable to check for new versions
 windowBodyNewVersionUnknown=Something went wrong\nMaybe internet unavailable, or GitHub is down
 windowBodyNewVersionNOTAval=You're using the latest version
-netTabAllowXciCb=Allow XCI files selection for TinFoil
-netTabAllowXciTextField=Used by some third-party applications that support XCI and utilizes TinFoil transfer protocol. Don't change if not sure.
-netTabLanguage=Language
+tab2_Cb_AllowXci=Allow XCI files selection for TinFoil
+tab2_Lbl_AllowXciDesc=Used by some third-party applications that support XCI and utilizes TinFoil transfer protocol. Don't change if not sure.
+tab2_Lbl_Language=Language
 windowBodyRestartToApplyLang=Please restart application to apply changes.
-netTabGLshowNSPonly=Show only *.nsp in GoldLeaf.
+tab2_Cb_GLshowNspOnly=Show only *.nsp in GoldLeaf.
diff --git a/src/main/resources/locale_fra.properties b/src/main/resources/locale_fra.properties
index f64cbf6..a0ef783 100644
--- a/src/main/resources/locale_fra.properties
+++ b/src/main/resources/locale_fra.properties
@@ -1,46 +1,44 @@
-btnFileOpen=Selectionner les fichiers .NSP
-btnUpload=Envoyer vers NS
-logsEnteredAsMsg1=Vous etes connect\u00E9 en tant que: 
-logsEnteredAsMsg2=Vous devez \u00EAtre root ou avoir configur\u00E9 les r\u00E8gles 'udev' pour cet utilisateur afin d'\u00E9viter tout probl\u00E8me.
-logsFilesToUploadTitle=Fichiers a envoyer:
-logsGreetingsMessage=Bienvenue sur NS-USBloader
-logsNoFolderFileSelected=Aucuns fichiers s\u00E9lectionn\u00E9s: Rien a envoyer.
+btn_OpenFile=Selectionner les fichiers .NSP
+btn_Upload=Envoyer vers NS
+tab3_Txt_EnteredAsMsg1=Vous etes connect\u00E9 en tant que: 
+tab3_Txt_EnteredAsMsg2=Vous devez \u00EAtre root ou avoir configur\u00E9 les r\u00E8gles 'udev' pour cet utilisateur afin d'\u00E9viter tout probl\u00E8me.
+tab3_Txt_FilesToUploadTitle=Fichiers a envoyer:
+tab3_Txt_GreetingsMessage=Bienvenue sur NS-USBloader
+tab3_Txt_NoFolderOrFileSelected=Aucuns fichiers s\u00E9lectionn\u00E9s: Rien a envoyer.
 windowBodyConfirmExit=Le transfert de donn\u00E9es est en cours et la fermeture de cette application l\u2019interrompra.\nC\u2019est la pire chose que vous puissiez faire maintenant.\nInterrompre le processus et quitter ?
 windowTitleConfirmExit=Non, ne faites pas \u00E7a!
-btnStop=Interrompre
-logsGreetingsMessage2=--\n\
+btn_Stop=Interrompre
+tab3_Txt_GreetingsMessage2=--\n\
 Source: https://github.com/developersu/ns-usbloader/\n\
 Site: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 Dmitry Isaenko [developer.su]
-windowTitleConfirmWrongPFS0=Type de fichier incorrect
-windowBodyConfirmWrongPFS0=Le fichier NSP s\u00E9lectionn\u00E9 a des symboles de d\u00E9part incorect. Il est tr\u00E8s probablement corrompu.\nIl est pr\u00E9f\u00E9rable d'interrompre le processus maintenant. Continuer le processus ?
-tableUploadLbl=Envoyer ?
-tableSizeLbl=Taille
-tableFileNameLbl=Nom de fichier
-tableStatusLbl=Statut
-contextMenuBtnDelete=Supprimer
-contextMenuBtnDeleteAll=Supprimer tout
-netTabHostIPLbl=IP de l'ordinateur
-NSIPlable=IP de NS:
-netTabValidateNSHostNameCb=Toujours v\u00E9rifier que l'adresse IP de NS entr\u00E9e est correcte
+tab1_table_Lbl_Upload=Envoyer ?
+tab1_table_Lbl_Size=Taille
+tab1_table_Lbl_FileName=Nom de fichier
+tab1_table_Lbl_Status=Statut
+tab1_table_contextMenu_Btn_BtnDelete=Supprimer
+tab1_table_contextMenu_Btn_DeleteAll=Supprimer tout
+tab2_Lbl_HostIP=IP de l'ordinateur
+tab1_Lbl_NSIP=IP de NS:
+tab2_Cb_ValidateNSHostName=Toujours v\u00E9rifier que l'adresse IP de NS entr\u00E9e est correcte
 windowTitleBadIp=L'adresse IP de NS est probablement incorrecte
 windowBodyBadIp=\u00CAtes-vous s\u00FBr que l'adresse IP de NS entr\u00E9e est correcte ?
-netTabExpertModeCb=Mode expert
-netTabHostPortLbl=port
-netTabAutoDetectIpCb=D\u00E9tection automatique d'IP
-netTabRandSelectPortCb=Obtenir un port al\u00E9atoire
-netTabDontServeRequestsCb=Ne pas servir les demandes
-netTabDontServeRequestsDescription=Si cette option est s\u00E9lectionn\u00E9e, cet ordinateur ne r\u00E9pond pas aux demandes de fichiers NSP provenant de NS (par le r\u00E9seau) et utilise les param\u00E8tres d\u2019h\u00F4te d\u00E9finis pour indiquer \u00E0 TinFoil o\u00F9 il doit rechercher les fichiers.
-netTabHostExtraLbl=extra
+tab2_Cb_ExpertMode=Mode expert
+tab2_Lbl_HostPort=port
+tab2_Cb_AutoDetectIp=D\u00E9tection automatique d'IP
+tab2_Cb_RandSelectPort=Obtenir un port al\u00E9atoire
+tab2_Cb_DontServeRequests=Ne pas servir les demandes
+tab2_Lbl_DontServeRequestsDesc=Si cette option est s\u00E9lectionn\u00E9e, cet ordinateur ne r\u00E9pond pas aux demandes de fichiers NSP provenant de NS (par le r\u00E9seau) et utilise les param\u00E8tres d\u2019h\u00F4te d\u00E9finis pour indiquer \u00E0 TinFoil o\u00F9 il doit rechercher les fichiers.
+tab2_Lbl_HostExtra=extra
 windowTitleErrorPort=Port mal configur\u00E9!
 windowBodyErrorPort=V\u00E9rifiez que le port est sup\u00E9rieur \u00E0 0 et inf\u00E9rieur ou \u00E9gal \u00E0 65535.
-netTabAutoCheckForUpdates=V\u00E9rifier automatiquement les mises \u00E0 jour
+tab2_Cb_AutoCheckForUpdates=V\u00E9rifier automatiquement les mises \u00E0 jour
 windowTitleNewVersionAval=Nouvelle version disponible
 windowTitleNewVersionNOTAval=Aucune nouvelle version disponible
 windowTitleNewVersionUnknown=Impossible de v\u00E9rifier les nouvelles versions
 windowBodyNewVersionNOTAval=Vous utilisez la derni\u00E8re version
 windowBodyNewVersionUnknown=Une erreur s'est produite\nPeut-\u00EAtre des probl\u00E8mes de connexion Internet ou GitHub est en panne
-netTabAllowXciCb=Autoriser la s\u00E9lection de fichiers XCI pour TinFoil
-netTabAllowXciTextField=Utilis\u00E9 par certaines applications tierces prenant en charge XCI et utilisant le protocole de transfert TinFoil. Ne changez pas en cas de doute.
-netTabLanguage=La langue
+tab2_Cb_AllowXci=Autoriser la s\u00E9lection de fichiers XCI pour TinFoil
+tab2_Lbl_AllowXciDesc=Utilis\u00E9 par certaines applications tierces prenant en charge XCI et utilisant le protocole de transfert TinFoil. Ne changez pas en cas de doute.
+tab2_Lbl_Language=La langue
 
diff --git a/src/main/resources/locale_ita.properties b/src/main/resources/locale_ita.properties
index c21af99..e47484a 100644
--- a/src/main/resources/locale_ita.properties
+++ b/src/main/resources/locale_ita.properties
@@ -1,44 +1,41 @@
-btnFileOpen=Seleziona file .NSP
-btnUpload=Invia a NS
-logsEnteredAsMsg1=Sei entrato come: 
-logsEnteredAsMsg2=Devi essere root o avere configurato le regole 'udev' per questo utente, per evitare eventuali problemi.
-logsFilesToUploadTitle=File da inviare:
-logsGreetingsMessage=Benvenuti in NS-USBloader
-logsNoFolderFileSelected=Nessun file selezionato: niente da inviare.
+btn_OpenFile=Seleziona file .NSP
+btn_Upload=Invia a NS
+tab3_Txt_EnteredAsMsg1=Sei entrato come: 
+tab3_Txt_EnteredAsMsg2=Devi essere root o avere configurato le regole 'udev' per questo utente, per evitare eventuali problemi.
+tab3_Txt_FilesToUploadTitle=File da inviare:
+tab3_Txt_GreetingsMessage=Benvenuti in NS-USBloader
+tab3_Txt_NoFolderOrFileSelected=Nessun file selezionato: niente da inviare.
 windowBodyConfirmExit=Il trasferimento dei dati \u00E8 in corso e la chiusura dell'applicazione lo interromper\u00E0.\n\u00C8 la cosa peggiore che tu possa fare ora.\nInterrompere il processo ed uscire?
 windowTitleConfirmExit=No, non farlo!
-btnStop=Interrompi
-logsGreetingsMessage2=--\n\
+btn_Stop=Interrompi
+tab3_Txt_GreetingsMessage2=--\n\
 Sorgenti: https://github.com/developersu/ns-usbloader/\n\
 Sito: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 Dmitry Isaenko [developer.su]
-windowTitleConfirmWrongPFS0=Tipo di file non valido
-windowBodyConfirmWrongPFS0=Il file NSP selezionato ha dei simboli iniziali non validi. Probabilmente \u00E8 danneggiato.\n\
-\u00C8 meglio interrompere subito il processo. Continuare comunque il processo?
-tableStatusLbl=Stato
-tableFileNameLbl=Nome file
-tableSizeLbl=Dimensione
-tableUploadLbl=Inviare?
-contextMenuBtnDelete=Rimuovi
-contextMenuBtnDeleteAll=Rimuovi tutto
-netTabHostIPLbl=IP host
-NSIPlable=IP NS:
-netTabValidateNSHostNameCb=Convalida sempre l'input dell'IP di NS.
+tab1_table_Lbl_Status=Stato
+tab1_table_Lbl_FileName=Nome file
+tab1_table_Lbl_Size=Dimensione
+tab1_table_Lbl_Upload=Inviare?
+tab1_table_contextMenu_Btn_BtnDelete=Rimuovi
+tab1_table_contextMenu_Btn_DeleteAll=Rimuovi tutto
+tab2_Lbl_HostIP=IP host
+tab1_Lbl_NSIP=IP NS:
+tab2_Cb_ValidateNSHostName=Convalida sempre l'input dell'IP di NS.
 windowBodyBadIp=Sei sicuro di aver inserito correttamente l'indirizzo IP di NS?
 windowTitleBadIp=Indirizzo IP di NS probabilmente sbagliato
-netTabExpertModeCb=Modalit\u00E0 esperto
-netTabHostPortLbl=porta
-netTabAutoDetectIpCb=Auto-rileva IP
-netTabRandSelectPortCb=Ottieni porta casualmente
-netTabDontServeRequestsCb=Non servire le richieste
-netTabDontServeRequestsDescription=Se selezionato, questo computer non risponder\u00E0 alle richieste di file NSP in arrivo da NS (tramite rete) e user\u00E0 le impostazioni dell'host definite per dire a TinFoil dove cercare i file.
-netTabHostExtraLbl=extra
+tab2_Cb_ExpertMode=Modalit\u00E0 esperto
+tab2_Lbl_HostPort=porta
+tab2_Cb_AutoDetectIp=Auto-rileva IP
+tab2_Cb_RandSelectPort=Ottieni porta casualmente
+tab2_Cb_DontServeRequests=Non servire le richieste
+tab2_Lbl_DontServeRequestsDesc=Se selezionato, questo computer non risponder\u00E0 alle richieste di file NSP in arrivo da NS (tramite rete) e user\u00E0 le impostazioni dell'host definite per dire a TinFoil dove cercare i file.
+tab2_Lbl_HostExtra=extra
 windowTitleErrorPort=Porta impostata impropriamente!
 windowBodyErrorPort=La porta non pu\u00F2 essere 0 o maggiore di 65535.
-netTabAutoCheckForUpdates=Controllo automatico degli aggiornamenti
+tab2_Cb_AutoCheckForUpdates=Controllo automatico degli aggiornamenti
 windowTitleNewVersionAval=Nuova versione disponibile
 windowTitleNewVersionNOTAval=Nessuna nuova versione disponibile
 windowTitleNewVersionUnknown=Impossibile cercare nuove versioni
 windowBodyNewVersionUnknown=Qualcosa \u00E8 andato storto\nForse internet non \u00E8 disponibile o GitHub ha problemi
 windowBodyNewVersionNOTAval=Stai usando la versione pi\u00F9 recente
-netTabLanguage=Linguaggio
+tab2_Lbl_Language=Linguaggio
diff --git a/src/main/resources/locale_kor.properties b/src/main/resources/locale_kor.properties
index 0c124e8..2f67c95 100644
--- a/src/main/resources/locale_kor.properties
+++ b/src/main/resources/locale_kor.properties
@@ -1,46 +1,43 @@
-btnFileOpen=.NSP \uD30C\uC77C \uC120\uD0DD
-btnUpload=NS\uC5D0 \uC5C5\uB85C\uB4DC
-logsEnteredAsMsg1=\uB2E4\uC74C\uACFC \uAC19\uC774 \uC785\uB825\uB418\uC5C8\uC2B5\uB2C8\uB2E4: 
-logsEnteredAsMsg2=\uC774 \uBB38\uC81C\uAC00 \uBC1C\uC0DD\uD558\uC9C0 \uC54A\uB3C4\uB85D\uD558\uB824\uBA74 root\uC774\uAC70\uB098 \uC774 \uC0AC\uC6A9\uC790\uC5D0 \uB300\uD55C 'udev' \uADDC\uCE59\uC744 \uAD6C\uC131\uD574\uC57C \uD569\uB2C8\uB2E4.
-logsFilesToUploadTitle=\uC5C5\uB85C\uB4DC \uD560 \uD30C\uC77C:
-logsGreetingsMessage=NS-USBloader\uC5D0 \uC624\uC2E0 \uAC83\uC744 \uD658\uC601\uD569\uB2C8\uB2E4.
-logsNoFolderFileSelected=\uC120\uD0DD\uD55C \uD30C\uC77C \uC5C6\uC74C: \uC5C5\uB85C\uB4DC \uD560 \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
+btn_OpenFile=.NSP \uD30C\uC77C \uC120\uD0DD
+btn_Upload=NS\uC5D0 \uC5C5\uB85C\uB4DC
+tab3_Txt_EnteredAsMsg1=\uB2E4\uC74C\uACFC \uAC19\uC774 \uC785\uB825\uB418\uC5C8\uC2B5\uB2C8\uB2E4: 
+tab3_Txt_EnteredAsMsg2=\uC774 \uBB38\uC81C\uAC00 \uBC1C\uC0DD\uD558\uC9C0 \uC54A\uB3C4\uB85D\uD558\uB824\uBA74 root\uC774\uAC70\uB098 \uC774 \uC0AC\uC6A9\uC790\uC5D0 \uB300\uD55C 'udev' \uADDC\uCE59\uC744 \uAD6C\uC131\uD574\uC57C \uD569\uB2C8\uB2E4.
+tab3_Txt_FilesToUploadTitle=\uC5C5\uB85C\uB4DC \uD560 \uD30C\uC77C:
+tab3_Txt_GreetingsMessage=NS-USBloader\uC5D0 \uC624\uC2E0 \uAC83\uC744 \uD658\uC601\uD569\uB2C8\uB2E4.
+tab3_Txt_NoFolderOrFileSelected=\uC120\uD0DD\uD55C \uD30C\uC77C \uC5C6\uC74C: \uC5C5\uB85C\uB4DC \uD560 \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
 windowBodyConfirmExit=\uB370\uC774\uD130 \uC804\uC1A1\uC774 \uC9C4\uD589 \uC911\uC774\uACE0 \uC774 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC744 \uB2EB\uC73C\uBA74 \uC911\uB2E8\uB429\uB2C8\uB2E4.\n\uC9C0\uAE08 \uD560 \uC218 \uC788\uB294 \uAC00\uC7A5 \uC548 \uC88B\uC740 \uC77C\uC785\uB2C8\uB2E4.\n\uD504\uB85C\uC138\uC2A4\uB97C \uC911\uB2E8\uD558\uACE0 \uC885\uB8CC \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 windowTitleConfirmExit=\uC544\uB2C8\uC624, \uC774\uAC83\uC744 \uD558\uC9C0 \uB9C8\uC2ED\uC2DC\uC624!
-btnStop=\uC778\uD130\uB7FD\uD2B8
-logsGreetingsMessage2=--\n\
+btn_Stop=\uC778\uD130\uB7FD\uD2B8
+tab3_Txt_GreetingsMessage2=--\n\
 \uC18C\uC2A4: https://github.com/developersu/ns-usbloader/\n\
 \uC0AC\uC774\uD2B8: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 Dmitry Isaenko [developer.su]
-windowTitleConfirmWrongPFS0=\uC798\uBABB\uB41C \uD30C\uC77C \uD615\uC2DD
-windowBodyConfirmWrongPFS0=\uC120\uD0DD\uD55C NSP \uD30C\uC77C\uC758 \uC2DC\uC791 \uAE30\uD638\uAC00 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB300\uBD80\uBD84 \uC190\uC0C1\uB418\uC5C8\uC744 \uAC00\uB2A5\uC131\uC774 \uD07D\uB2C8\uB2E4.\n\
-\uC774\uC81C \uD504\uB85C\uC138\uC2A4\uB97C \uC911\uB2E8\uD558\uB294 \uAC83\uC774 \uC88B\uC2B5\uB2C8\uB2E4. \uACC4\uC18D \uC9C4\uD589 \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
-tableStatusLbl=\uC0C1\uD0DC
-tableFileNameLbl=\uD30C\uC77C \uC774\uB984
-tableSizeLbl=\uD06C\uAE30
-tableUploadLbl=\uC5C5\uB85C\uB4DC \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
-contextMenuBtnDelete=\uC0AD\uC81C
-contextMenuBtnDeleteAll=\uBAA8\uB450 \uC0AD\uC81C
-netTabHostIPLbl=\uD638\uC2A4\uD2B8 IP
-NSIPlable=NS IP:
-netTabValidateNSHostNameCb=\uD56D\uC0C1 NS IP \uC785\uB825\uC758 \uC720\uD6A8\uC131\uC744 \uD655\uC778\uD558\uC2ED\uC2DC\uC624.
+tab1_table_Lbl_Status=\uC0C1\uD0DC
+tab1_table_Lbl_FileName=\uD30C\uC77C \uC774\uB984
+tab1_table_Lbl_Size=\uD06C\uAE30
+tab1_table_Lbl_Upload=\uC5C5\uB85C\uB4DC \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
+tab1_table_contextMenu_Btn_BtnDelete=\uC0AD\uC81C
+tab1_table_contextMenu_Btn_DeleteAll=\uBAA8\uB450 \uC0AD\uC81C
+tab2_Lbl_HostIP=\uD638\uC2A4\uD2B8 IP
+tab1_Lbl_NSIP=NS IP:
+tab2_Cb_ValidateNSHostName=\uD56D\uC0C1 NS IP \uC785\uB825\uC758 \uC720\uD6A8\uC131\uC744 \uD655\uC778\uD558\uC2ED\uC2DC\uC624.
 windowBodyBadIp=NS IP \uC8FC\uC18C\uB97C \uC62C\uBC14\uB974\uAC8C \uC785\uB825 \uD588\uC2B5\uB2C8\uAE4C?
 windowTitleBadIp=NS\uC758 IP \uC8FC\uC18C\uAC00 \uC798\uBABB\uB418\uC5C8\uC744 \uAC00\uB2A5\uC131\uC774 \uD07D\uB2C8\uB2E4.
-netTabExpertModeCb=\uC0C1\uAE09\uC790 \uBAA8\uB4DC
-netTabHostPortLbl=\uD3EC\uD2B8
-netTabAutoDetectIpCb=\uC790\uB3D9 \uAC10\uC9C0 IP
-netTabRandSelectPortCb=\uC784\uC758\uB85C \uD3EC\uD2B8 \uAC00\uC838 \uC624\uAE30
-netTabDontServeRequestsCb=\uC694\uCCAD\uC744 \uCC98\uB9AC\uD558\uC9C0 \uC54A\uC74C
-netTabDontServeRequestsDescription=\uC774 \uCEF4\uD4E8\uD130\uB97C \uC120\uD0DD\uD558\uBA74 NS\uC5D0\uC11C \uC624\uB294 NSP \uD30C\uC77C \uC694\uCCAD\uC5D0 \uD68C\uC2E0\uD558\uC9C0 \uC54A\uC73C\uBA70 \uC815\uC758\uB41C \uD638\uC2A4\uD2B8 \uC124\uC815\uC744 \uC0AC\uC6A9\uD558\uC5EC TinFoil\uC5D0\uAC8C \uD30C\uC77C\uC744 \uC5B4\uB514\uC5D0\uC11C \uCC3E\uC544\uC57C \uD558\uB294\uC9C0 \uC54C\uB824\uC90D\uB2C8\uB2E4.
-netTabHostExtraLbl=\uCD94\uAC00
+tab2_Cb_ExpertMode=\uC0C1\uAE09\uC790 \uBAA8\uB4DC
+tab2_Lbl_HostPort=\uD3EC\uD2B8
+tab2_Cb_AutoDetectIp=\uC790\uB3D9 \uAC10\uC9C0 IP
+tab2_Cb_RandSelectPort=\uC784\uC758\uB85C \uD3EC\uD2B8 \uAC00\uC838 \uC624\uAE30
+tab2_Cb_DontServeRequests=\uC694\uCCAD\uC744 \uCC98\uB9AC\uD558\uC9C0 \uC54A\uC74C
+tab2_Lbl_DontServeRequestsDesc=\uC774 \uCEF4\uD4E8\uD130\uB97C \uC120\uD0DD\uD558\uBA74 NS\uC5D0\uC11C \uC624\uB294 NSP \uD30C\uC77C \uC694\uCCAD\uC5D0 \uD68C\uC2E0\uD558\uC9C0 \uC54A\uC73C\uBA70 \uC815\uC758\uB41C \uD638\uC2A4\uD2B8 \uC124\uC815\uC744 \uC0AC\uC6A9\uD558\uC5EC TinFoil\uC5D0\uAC8C \uD30C\uC77C\uC744 \uC5B4\uB514\uC5D0\uC11C \uCC3E\uC544\uC57C \uD558\uB294\uC9C0 \uC54C\uB824\uC90D\uB2C8\uB2E4.
+tab2_Lbl_HostExtra=\uCD94\uAC00
 windowTitleErrorPort=\uD3EC\uD2B8\uAC00 \uC798\uBABB \uC124\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4!
 windowBodyErrorPort=\uD3EC\uD2B8\uB294 0 \uB610\uB294 65535\uBCF4\uB2E4 \uD074 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-netTabAutoCheckForUpdates=\uC5C5\uB370\uC774\uD2B8 \uC790\uB3D9 \uD655\uC778
+tab2_Cb_AutoCheckForUpdates=\uC5C5\uB370\uC774\uD2B8 \uC790\uB3D9 \uD655\uC778
 windowTitleNewVersionAval=\uC0C8\uB85C\uC6B4 \uBC84\uC804 \uC0AC\uC6A9 \uAC00\uB2A5
 windowTitleNewVersionNOTAval=\uC0C8\uB85C\uC6B4 \uBC84\uC804\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
 windowTitleNewVersionUnknown=\uC0C8 \uBC84\uC804\uC744 \uD655\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 windowBodyNewVersionUnknown=\uBB38\uC81C\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n\uC778\uD130\uB137\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uAC70\uB098 GitHub\uC774 \uB2E4\uC6B4\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 windowBodyNewVersionNOTAval=\uCD5C\uC2E0 \uBC84\uC804\uC744 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.
-netTabAllowXciCb=TinFoil\uC5D0 \uB300\uD55C XCI \uD30C\uC77C \uC120\uD0DD \uD5C8\uC6A9
-netTabAllowXciTextField=XCI\uB97C \uC9C0\uC6D0\uD558\uACE0 TinFoil \uC804\uC1A1 \uD504\uB85C\uD1A0\uCF5C\uC744 \uC0AC\uC6A9\uD558\uB294 \uC77C\uBD80 \uD0C0\uC0AC \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC0AC\uC6A9\uB429\uB2C8\uB2E4. \uD655\uC2E4\uD558\uC9C0 \uC54A\uC73C\uBA74 \uBCC0\uACBD\uD558\uC9C0 \uB9C8\uC2ED\uC2DC\uC624.
-netTabLanguage=\uC5B8\uC5B4
\ No newline at end of file
+tab2_Cb_AllowXci=TinFoil\uC5D0 \uB300\uD55C XCI \uD30C\uC77C \uC120\uD0DD \uD5C8\uC6A9
+tab2_Lbl_AllowXciDesc=XCI\uB97C \uC9C0\uC6D0\uD558\uACE0 TinFoil \uC804\uC1A1 \uD504\uB85C\uD1A0\uCF5C\uC744 \uC0AC\uC6A9\uD558\uB294 \uC77C\uBD80 \uD0C0\uC0AC \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC0AC\uC6A9\uB429\uB2C8\uB2E4. \uD655\uC2E4\uD558\uC9C0 \uC54A\uC73C\uBA74 \uBCC0\uACBD\uD558\uC9C0 \uB9C8\uC2ED\uC2DC\uC624.
+tab2_Lbl_Language=\uC5B8\uC5B4
\ No newline at end of file
diff --git a/src/main/resources/locale_por.properties b/src/main/resources/locale_por.properties
index 9793745..93bf08c 100644
--- a/src/main/resources/locale_por.properties
+++ b/src/main/resources/locale_por.properties
@@ -1,46 +1,43 @@
-btnFileOpen=Selecionar arquivos .NSP
-btnUpload=Upar para o Switch
-logsEnteredAsMsg1=Voce entrou como: 
-logsEnteredAsMsg2=Voce precisa ser root ou ter configurado as regras 'udev' para este usu\u00E1rio para evitar qualquer problema.
-logsFilesToUploadTitle=Arquivos para upar:
-logsGreetingsMessage=Bem-vindo ao NS-USBloader!
-logsNoFolderFileSelected=Nenhum arquivo selecionado: nada para upar.
+btn_OpenFile=Selecionar arquivos .NSP
+btn_Upload=Upar para o Switch
+tab3_Txt_EnteredAsMsg1=Voce entrou como: 
+tab3_Txt_EnteredAsMsg2=Voce precisa ser root ou ter configurado as regras 'udev' para este usu\u00E1rio para evitar qualquer problema.
+tab3_Txt_FilesToUploadTitle=Arquivos para upar:
+tab3_Txt_GreetingsMessage=Bem-vindo ao NS-USBloader!
+tab3_Txt_NoFolderOrFileSelected=Nenhum arquivo selecionado: nada para upar.
 windowBodyConfirmExit=A transfer\u00EAncia de dados em progresso: fechar ir\u00E1 interromp\u00EA-la e pode corromper os dados no switch.\nInterromper proccesso e sair?
 windowTitleConfirmExit=Faz isso n\u00E3o mano!
-btnStop=Interromper
-logsGreetingsMessage2=--\n\
+btn_Stop=Interromper
+tab3_Txt_GreetingsMessage2=--\n\
 Source: https://github.com/developersu/ns-usbloader/\n\
 Site: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 Dmitry Isaenko [developer.su]
-windowTitleConfirmWrongPFS0=Tipo de arquivo incorreto
-windowBodyConfirmWrongPFS0=Arquivo NSP Selecionado possui simbolos iniciais incorretos. Provavelmente corrompido.\n\
-\u00C9 melhor interromper o processo agora! Quer continuar mesmo assim?
-tableStatusLbl=Status
-tableFileNameLbl=Nome do arquivo
-tableSizeLbl=Tamanho
-tableUploadLbl=Upar?
-contextMenuBtnDelete=Remover
-contextMenuBtnDeleteAll=Remover todos
-netTabHostIPLbl=IP anfitri\u00E3o
-NSIPlable=NS IP:
-netTabValidateNSHostNameCb=Sempre validar entrada IP do NS.
+tab1_table_Lbl_Status=Status
+tab1_table_Lbl_FileName=Nome do arquivo
+tab1_table_Lbl_Size=Tamanho
+tab1_table_Lbl_Upload=Upar?
+tab1_table_contextMenu_Btn_BtnDelete=Remover
+tab1_table_contextMenu_Btn_DeleteAll=Remover todos
+tab2_Lbl_HostIP=IP anfitri\u00E3o
+tab1_Lbl_NSIP=NS IP:
+tab2_Cb_ValidateNSHostName=Sempre validar entrada IP do NS.
 windowBodyBadIp=Tem certeza que voce submeteu o IP do NS corretamente?
 windowTitleBadIp=Endere\u00E7o IP do NS provavelmente est\u00E1 incorreto.
-netTabExpertModeCb=Modo Expert
-netTabHostPortLbl=porta
-netTabAutoDetectIpCb=Auto-detectar IP
-netTabRandSelectPortCb=Obter porta automaticamente.
-netTabDontServeRequestsCb=N\u00E3o aceitar pedidos
-netTabDontServeRequestsDescription=Se selecionado, este computador nao ir\u00E1 responder a arquivos NSP vindos do NS (pela rede) e ir\u00E1 usar as configura\u00E7\u00E3o definida pelo anfitriao para comunicar ao Tinfoil onde buscar os arquivos.
-netTabHostExtraLbl=extra
+tab2_Cb_ExpertMode=Modo Expert
+tab2_Lbl_HostPort=porta
+tab2_Cb_AutoDetectIp=Auto-detectar IP
+tab2_Cb_RandSelectPort=Obter porta automaticamente.
+tab2_Cb_DontServeRequests=N\u00E3o aceitar pedidos
+tab2_Lbl_DontServeRequestsDesc=Se selecionado, este computador nao ir\u00E1 responder a arquivos NSP vindos do NS (pela rede) e ir\u00E1 usar as configura\u00E7\u00E3o definida pelo anfitriao para comunicar ao Tinfoil onde buscar os arquivos.
+tab2_Lbl_HostExtra=extra
 windowTitleErrorPort=Porta incorreta!
 windowBodyErrorPort=Porta nao pode ser 0 ou maior que 65535.
-netTabAutoCheckForUpdates=Auto-checar por atualiza\u00E7\u00F5es
+tab2_Cb_AutoCheckForUpdates=Auto-checar por atualiza\u00E7\u00F5es
 windowTitleNewVersionAval=Nova vers\u00E3o dispon\u00EDvel
 windowTitleNewVersionNOTAval=Nenhuma nova vers\u00E3o dispon\u00EDvel
 windowTitleNewVersionUnknown=Nao p\u00F4de checar por novas vers\u00F5es
 windowBodyNewVersionUnknown=Algo deu errado\nTalvez sem internet, ou github indispon\u00EDvel
 windowBodyNewVersionNOTAval=Voc\u00EA est\u00E1 usando a \u00FAltima vers\u00E3o
-netTabAllowXciCb=Permitir sele\u00E7\u00E3o de arquivos XCI para o TinFoil
-netTabAllowXciTextField=Usados por algumas aplica\u00E7\u00F5es de terceiros que suportam XCI (Exemplo: ZeroTwoXCI) e utilizam o protocolo de transfer\u00EAncia TinFoil. Nao aconselhado pela instabilidade. Nao mude se nao tem certeza.
-netTabLanguage=Idioma
\ No newline at end of file
+tab2_Cb_AllowXci=Permitir sele\u00E7\u00E3o de arquivos XCI para o TinFoil
+tab2_Lbl_AllowXciDesc=Usados por algumas aplica\u00E7\u00F5es de terceiros que suportam XCI (Exemplo: ZeroTwoXCI) e utilizam o protocolo de transfer\u00EAncia TinFoil. Nao aconselhado pela instabilidade. Nao mude se nao tem certeza.
+tab2_Lbl_Language=Idioma
\ No newline at end of file
diff --git a/src/main/resources/locale_rus.properties b/src/main/resources/locale_rus.properties
index 5d3d72c..1751e5b 100644
--- a/src/main/resources/locale_rus.properties
+++ b/src/main/resources/locale_rus.properties
@@ -1,50 +1,46 @@
-btnFileOpen=\u0412\u044B\u0431\u0440\u0430\u0442\u044C .NSP \u0444\u0430\u0439\u043B\u044B
-btnUpload=\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 NS
-logsEnteredAsMsg1=\u0412\u044B \u0432\u043E\u0448\u043B\u0438 \u043A\u0430\u043A: 
-logsEnteredAsMsg2=\u0427\u0442\u043E\u0431\u044B \u0438\u0437\u0431\u0435\u0436\u0430\u0442\u044C \u043E\u0448\u0438\u0431\u043E\u043A, \u0432\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0431\u044B\u0442\u044C root \u0438\u043B\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043F\u0440\u0430\u0432\u0438\u043B\u0430 'udev' \u0434\u043B\u044F \u044D\u0442\u043E\u0433\u043E \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F.  
-logsFilesToUploadTitle=\u0424\u0430\u0439\u043B\u044B \u0434\u043B\u044F \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438:
-logsGreetingsMessage=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C \u0432 NS-USBloader
-logsNoFolderFileSelected=\u0424\u0430\u0439\u043B\u044B \u043D\u0435 \u0432\u044B\u0431\u0440\u0430\u043D\u044B - \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E.
+btn_OpenFile=\u0412\u044B\u0431\u0440\u0430\u0442\u044C .NSP \u0444\u0430\u0439\u043B\u044B
+btn_Upload=\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 NS
+tab3_Txt_EnteredAsMsg1=\u0412\u044B \u0432\u043E\u0448\u043B\u0438 \u043A\u0430\u043A: 
+tab3_Txt_EnteredAsMsg2=\u0427\u0442\u043E\u0431\u044B \u0438\u0437\u0431\u0435\u0436\u0430\u0442\u044C \u043E\u0448\u0438\u0431\u043E\u043A, \u0432\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0431\u044B\u0442\u044C root \u0438\u043B\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043F\u0440\u0430\u0432\u0438\u043B\u0430 'udev' \u0434\u043B\u044F \u044D\u0442\u043E\u0433\u043E \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F.  
+tab3_Txt_FilesToUploadTitle=\u0424\u0430\u0439\u043B\u044B \u0434\u043B\u044F \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438:
+tab3_Txt_GreetingsMessage=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C \u0432 NS-USBloader
+tab3_Txt_NoFolderOrFileSelected=\u0424\u0430\u0439\u043B\u044B \u043D\u0435 \u0432\u044B\u0431\u0440\u0430\u043D\u044B - \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E.
 windowBodyConfirmExit=\u0421\u0435\u0439\u0447\u0430\u0441 \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u0438\u0442 \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0430 \u0434\u0430\u043D\u043D\u044B\u0445 \u0438 \u0437\u0430\u043A\u0440\u044B\u0442\u0438\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u043F\u0440\u0435\u0440\u0432\u0451\u0442 \u0435\u0451.\n\u042D\u0442\u043E \u0445\u0443\u0434\u0448\u0435\u0435 \u0447\u0442\u043E \u0442\u044B \u043C\u043E\u0436\u0435\u0448\u044C \u0441\u0435\u0439\u0447\u0430\u0441 \u0441\u0434\u0435\u043B\u0430\u0442\u044C.\n\u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u0438 \u0432\u044B\u0439\u0442\u0438?
 windowTitleConfirmExit=\u041D\u0435\u0442, \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0441\u044C!
-btnStop=\u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C
-logsGreetingsMessage2=--\n\
+btn_Stop=\u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C
+tab3_Txt_GreetingsMessage2=--\n\
 \u0418\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u043A\u043E\u0434: https://github.com/developersu/ns-usbloader/\n\
 \u0421\u0430\u0439\u0442: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 \u0418\u0441\u0430\u0435\u043D\u043A\u043E \u0414\u043C\u0438\u0442\u0440\u0438\u0439 [developer.su]
-windowTitleConfirmWrongPFS0=\u041D\u0435\u043F\u0440\u0438\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439 \u0442\u0438\u043F \u0444\u0430\u0439\u043B\u0430 
-windowBodyConfirmWrongPFS0=\u0412\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0444\u0430\u0439\u043B NSP \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043D\u0435\u0432\u0435\u0440\u043D\u044B\u0435 \u0441\u0438\u043C\u0432\u043E\u043B\u044B. \u041E\u043D \u043D\u0430\u0432\u0435\u0440\u043D\u044F\u043A\u0430 \u043F\u043E\u0432\u0440\u0435\u0436\u0434\u0451\u043D.\n\
-\u041B\u0443\u0447\u0448\u0435 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C\u0441\u044F \u043F\u0440\u044F\u043C\u043E \u0441\u0435\u0439\u0447\u0430\u0441. \u0425\u043E\u0447\u0435\u0448\u044C \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0442\u044C \u043D\u0438 \u0441\u043C\u043E\u0442\u0440\u044F \u043D\u0438 \u043D\u0430 \u0447\u0442\u043E?\
-
-tableUploadLbl=\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044C?
-tableSizeLbl=\u0420\u0430\u0437\u043C\u0435\u0440
-tableFileNameLbl=\u0418\u043C\u044F \u0444\u0430\u0439\u043B\u0430
-tableStatusLbl=\u0421\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435
-contextMenuBtnDelete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
-contextMenuBtnDeleteAll=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0451
-netTabHostIPLbl=IP \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u0430
-NSIPlable=NS IP:
-netTabValidateNSHostNameCb=\u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E\u0441\u0442\u044C NS IP.
+tab1_table_Lbl_Upload=\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044C?
+tab1_table_Lbl_Size=\u0420\u0430\u0437\u043C\u0435\u0440
+tab1_table_Lbl_FileName=\u0418\u043C\u044F \u0444\u0430\u0439\u043B\u0430
+tab1_table_Lbl_Status=\u0421\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435
+tab1_table_contextMenu_Btn_BtnDelete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
+tab1_table_contextMenu_Btn_DeleteAll=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0451
+tab2_Lbl_HostIP=IP \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u0430
+tab1_Lbl_NSIP=NS IP:
+tab2_Cb_ValidateNSHostName=\u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E\u0441\u0442\u044C NS IP.
 windowTitleBadIp=IP \u0430\u0434\u0440\u0435\u0441 NS \u043F\u043E\u0445\u043E\u0436\u0435 \u043D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439
 windowBodyBadIp=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B \u0447\u0442\u043E IP \u0430\u0434\u0440\u0435\u0441 NS \u0432\u0432\u0435\u0434\u0451\u043D \u0431\u0435\u0437 \u043E\u0448\u0438\u0431\u043E\u043A?
-netTabExpertModeCb=\u0420\u0435\u0436\u0438\u043C \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u0430
-netTabHostPortLbl=\u043F\u043E\u0440\u0442
-netTabAutoDetectIpCb=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0442\u044C IP
-netTabRandSelectPortCb=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0442\u044C \u043F\u043E\u0440\u0442 \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u044B\u043C \u043E\u0431\u0440\u0430\u0437\u043E\u043C
-netTabDontServeRequestsCb=\u041D\u0435 \u043E\u0431\u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u0442\u044C \u0437\u0430\u043F\u0440\u043E\u0441\u044B
-netTabDontServeRequestsDescription=\u0415\u0441\u043B\u0438 \u0432\u044B\u0431\u0440\u0430\u043D\u043E, \u0442\u043E\u0433\u0434\u0430 \u044D\u0442\u043E\u0442 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440 \u043D\u0435 \u0431\u0443\u0434\u0435\u0442 \u043E\u0442\u0432\u0435\u0447\u0430\u0442\u044C \u043D\u0430 \u0437\u0430\u043F\u0440\u043E\u0441\u044B NSP \u0444\u0430\u0439\u043B\u043E\u0432. \u0411\u0443\u0434\u0443\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0445\u043E\u0441\u0442\u0430 \u0447\u0442\u043E\u0431\u044B \u0443\u043A\u0430\u0437\u0430\u0442\u044C TinFoil \u043E\u0442\u043A\u0443\u0434\u0430 \u0435\u043C\u0443 \u0441\u043B\u0435\u0434\u0443\u0435\u0442 \u0431\u0440\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B.
-netTabHostExtraLbl=\u044D\u043A\u0441\u0442\u0440\u0430
+tab2_Cb_ExpertMode=\u0420\u0435\u0436\u0438\u043C \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u0430
+tab2_Lbl_HostPort=\u043F\u043E\u0440\u0442
+tab2_Cb_AutoDetectIp=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0442\u044C IP
+tab2_Cb_RandSelectPort=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0442\u044C \u043F\u043E\u0440\u0442 \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u044B\u043C \u043E\u0431\u0440\u0430\u0437\u043E\u043C
+tab2_Cb_DontServeRequests=\u041D\u0435 \u043E\u0431\u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u0442\u044C \u0437\u0430\u043F\u0440\u043E\u0441\u044B
+tab2_Lbl_DontServeRequestsDesc=\u0415\u0441\u043B\u0438 \u0432\u044B\u0431\u0440\u0430\u043D\u043E, \u0442\u043E\u0433\u0434\u0430 \u044D\u0442\u043E\u0442 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440 \u043D\u0435 \u0431\u0443\u0434\u0435\u0442 \u043E\u0442\u0432\u0435\u0447\u0430\u0442\u044C \u043D\u0430 \u0437\u0430\u043F\u0440\u043E\u0441\u044B NSP \u0444\u0430\u0439\u043B\u043E\u0432. \u0411\u0443\u0434\u0443\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0445\u043E\u0441\u0442\u0430 \u0447\u0442\u043E\u0431\u044B \u0443\u043A\u0430\u0437\u0430\u0442\u044C TinFoil \u043E\u0442\u043A\u0443\u0434\u0430 \u0435\u043C\u0443 \u0441\u043B\u0435\u0434\u0443\u0435\u0442 \u0431\u0440\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B.
+tab2_Lbl_HostExtra=\u044D\u043A\u0441\u0442\u0440\u0430
 windowTitleErrorPort=\u041F\u043E\u0440\u0442 \u0443\u043A\u0430\u0437\u0430\u043D \u043D\u0435\u0432\u0435\u0440\u043D\u043E!
 windowBodyErrorPort=\u041F\u043E\u0440\u0442 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C 0 \u0438\u043B\u0438 \u043F\u0440\u0435\u0432\u044B\u0448\u0430\u0442\u044C 65535.
-netTabAutoCheckForUpdates=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u043D\u0430\u043B\u0438\u0447\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0439
+tab2_Cb_AutoCheckForUpdates=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u043D\u0430\u043B\u0438\u0447\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0439
 windowTitleNewVersionAval=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u043D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F
 windowTitleNewVersionNOTAval=\u041D\u0435\u0442 \u043D\u043E\u0432\u044B\u0445 \u0432\u0435\u0440\u0441\u0438\u0439
 windowTitleNewVersionUnknown=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043D\u0430\u043B\u0438\u0447\u0438\u0435 \u043D\u043E\u0432\u044B\u0445 \u0432\u0435\u0440\u0441\u0438\u0439
 windowBodyNewVersionNOTAval=\u0412\u044B \u0443\u0436\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u044E\u044E \u0432\u0435\u0440\u0441\u0438\u044E
 windowBodyNewVersionUnknown=\u0427\u0442\u043E-\u0442\u043E \u043F\u043E\u0448\u043B\u043E \u043D\u0435 \u0442\u0430\u043A.\n\u041C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043D\u0435\u0442 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442\u0430 \u0438\u043B\u0438 GitHub \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D.
-netTabAllowXciCb=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044C \u0432\u044B\u0431\u0438\u0440\u0430\u0442\u044C XCI \u0444\u0430\u0439\u043B\u044B \u0434\u043B\u044F TinFoil
-netTabAllowXciTextField=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u043C\u0438 \u0441\u0442\u043E\u0440\u043E\u043D\u043D\u0438\u043C\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\u043C\u0438, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044E\u0442 XCI \u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044E\u0442 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0438 TinFoil. \u041D\u0435 \u043C\u0435\u043D\u044F\u0439\u0442\u0435 \u0435\u0441\u043B\u0438 \u043D\u0435 \u0443\u0432\u0435\u0440\u0435\u043D\u044B.
-netTabLanguage=\u042F\u0437\u044B\u043A
+tab2_Cb_AllowXci=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044C \u0432\u044B\u0431\u0438\u0440\u0430\u0442\u044C XCI \u0444\u0430\u0439\u043B\u044B \u0434\u043B\u044F TinFoil
+tab2_Lbl_AllowXciDesc=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u043C\u0438 \u0441\u0442\u043E\u0440\u043E\u043D\u043D\u0438\u043C\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\u043C\u0438, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044E\u0442 XCI \u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044E\u0442 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0438 TinFoil. \u041D\u0435 \u043C\u0435\u043D\u044F\u0439\u0442\u0435 \u0435\u0441\u043B\u0438 \u043D\u0435 \u0443\u0432\u0435\u0440\u0435\u043D\u044B.
+tab2_Lbl_Language=\u042F\u0437\u044B\u043A
 windowBodyRestartToApplyLang=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0447\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0432\u0441\u0442\u0443\u043F\u0438\u043B\u0438 \u0432 \u0441\u0438\u043B\u0443.
-netTabGLshowNSPonly=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0442\u044C \u0438\u0441\u043A\u043B\u044E\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0444\u0430\u0439\u043B\u044B *.nsp \u0432 GoldLeaf.
+tab2_Cb_GLshowNspOnly=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0442\u044C \u0438\u0441\u043A\u043B\u044E\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0444\u0430\u0439\u043B\u044B *.nsp \u0432 GoldLeaf.
 
diff --git a/src/main/resources/locale_spa.properties b/src/main/resources/locale_spa.properties
index b4dd0b7..fa9df19 100644
--- a/src/main/resources/locale_spa.properties
+++ b/src/main/resources/locale_spa.properties
@@ -1,48 +1,45 @@
-btnFileOpen=Seleccionar los archivos .NSP
-btnUpload=Enviar a NS
-logsEnteredAsMsg1=Est\u00E1 conectado como: 
-logsEnteredAsMsg2=Deber\u00EDa ser root o haber configurado las reglas 'udev' de este usuario para evitar problemas.
-logsFilesToUploadTitle=Archivos a subir:
-logsGreetingsMessage=Bienvenido a NS-USBloader
-logsNoFolderFileSelected=No ha seleccionado ning\u00FAn archivo: Nada se subir\u00E1.
+btn_OpenFile=Seleccionar los archivos .NSP
+btn_Upload=Enviar a NS
+tab3_Txt_EnteredAsMsg1=Est\u00E1 conectado como: 
+tab3_Txt_EnteredAsMsg2=Deber\u00EDa ser root o haber configurado las reglas 'udev' de este usuario para evitar problemas.
+tab3_Txt_FilesToUploadTitle=Archivos a subir:
+tab3_Txt_GreetingsMessage=Bienvenido a NS-USBloader
+tab3_Txt_NoFolderOrFileSelected=No ha seleccionado ning\u00FAn archivo: Nada se subir\u00E1.
 windowBodyConfirmExit=Transferencia de datos en progreso, cerrar la aplicaci\u00F3n lo interrumpir\u00E1.\nNo se recomienda.\nInterrumpir proceso y salir?
 windowTitleConfirmExit=No, no haga esto!
-btnStop=Interrumpir
-logsGreetingsMessage2=--\n\
+btn_Stop=Interrumpir
+tab3_Txt_GreetingsMessage2=--\n\
 Source: https://github.com/developersu/ns-usbloader/\n\
 Site: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 Dmitry Isaenko [developer.su]
-windowTitleConfirmWrongPFS0=Tipo de archivo incorrecto
-windowBodyConfirmWrongPFS0=El archivo NSP seleccionado tiene car\u00E1cteres no v\u00E1lidos o est\u00E1 corrupto.\n\
-Se recomienda interrumpir el proceso. Continuar de todas formas?
-tableStatusLbl=Estado
-tableFileNameLbl=Nombre del archivo
-tableSizeLbl=Tama\u00F1o
-tableUploadLbl=Enviar?
-contextMenuBtnDelete=Eliminar
-contextMenuBtnDeleteAll=Eliminar todo
-netTabHostIPLbl=IP del host
-NSIPlable=NS IP:
-netTabValidateNSHostNameCb=Validar siempre la entrada de IP de la NS.
+tab1_table_Lbl_Status=Estado
+tab1_table_Lbl_FileName=Nombre del archivo
+tab1_table_Lbl_Size=Tama\u00F1o
+tab1_table_Lbl_Upload=Enviar?
+tab1_table_contextMenu_Btn_BtnDelete=Eliminar
+tab1_table_contextMenu_Btn_DeleteAll=Eliminar todo
+tab2_Lbl_HostIP=IP del host
+tab1_Lbl_NSIP=NS IP:
+tab2_Cb_ValidateNSHostName=Validar siempre la entrada de IP de la NS.
 windowBodyBadIp=Est\u00E1 seguro de que ha introducido la IP de la NS correctamente?
 windowTitleBadIp=Es posible que la direcci\u00F3n IP de la NS sea incorrecta
-netTabExpertModeCb=Modo Experto
-netTabHostPortLbl=Puerto
-netTabAutoDetectIpCb=Detectar IP autom\u00E1ticamente
-netTabRandSelectPortCb=Obtener el puerto autom\u00E1ticamente
-netTabDontServeRequestsCb=No contestar solicitudes
-netTabDontServeRequestsDescription=Si habilita esta opci\u00F3n, el ordenador no responder\u00E1 solicitudes de archivos NSP de la NS (en la red), y usar\u00E1 las configuraciones definidas por el host para indicar a Tinfoil donde se encuentran los archivos
-netTabHostExtraLbl=Extra
+tab2_Cb_ExpertMode=Modo Experto
+tab2_Lbl_HostPort=Puerto
+tab2_Cb_AutoDetectIp=Detectar IP autom\u00E1ticamente
+tab2_Cb_RandSelectPort=Obtener el puerto autom\u00E1ticamente
+tab2_Cb_DontServeRequests=No contestar solicitudes
+tab2_Lbl_DontServeRequestsDesc=Si habilita esta opci\u00F3n, el ordenador no responder\u00E1 solicitudes de archivos NSP de la NS (en la red), y usar\u00E1 las configuraciones definidas por el host para indicar a Tinfoil donde se encuentran los archivos
+tab2_Lbl_HostExtra=Extra
 windowTitleErrorPort=Puerto asignado incorrectamente!
 windowBodyErrorPort=El puerto no puede ser 0 o mayor que 65535
-netTabAutoCheckForUpdates=Comprobar actualizaciones autom\u00E1ticamente
+tab2_Cb_AutoCheckForUpdates=Comprobar actualizaciones autom\u00E1ticamente
 windowTitleNewVersionAval=Actualizaci\u00F3n disponible
 windowTitleNewVersionNOTAval=No hay actualizaciones disponibles
 windowTitleNewVersionUnknown=No fue posible encontrar actualizaciones
 windowBodyNewVersionUnknown=Algo fall\u00F3\nLa conexi\u00F3n a internet no funciona correctamente, o GitHub est\u00E1 ca\u00EDdo
 windowBodyNewVersionNOTAval=Est\u00E1s usando la \u00FAltima versi\u00F3n
-netTabAllowXciCb=Permite la selecci\u00F3n de archivos XCI para Tinfoil
-netTabAllowXciTextField=Usado por algunas aplicaciones de terceros que soportan XCI y que utilizan el protocolo de transferencia de Tinfoil. Si no est\u00E1 seguro no cambie la opci\u00F3n.
-netTabLanguage=Idioma
+tab2_Cb_AllowXci=Permite la selecci\u00F3n de archivos XCI para Tinfoil
+tab2_Lbl_AllowXciDesc=Usado por algunas aplicaciones de terceros que soportan XCI y que utilizan el protocolo de transferencia de Tinfoil. Si no est\u00E1 seguro no cambie la opci\u00F3n.
+tab2_Lbl_Language=Idioma
 windowBodyRestartToApplyLang=Por favor, reinicie el programa para aplicar los cambios.
-netTabGLshowNSPonly=Mostrar solo *.nsp en GoldLeaf.
+tab2_Cb_GLshowNspOnly=Mostrar solo *.nsp en GoldLeaf.
diff --git a/src/main/resources/locale_ukr.properties b/src/main/resources/locale_ukr.properties
index 805c8e0..3cf30d5 100644
--- a/src/main/resources/locale_ukr.properties
+++ b/src/main/resources/locale_ukr.properties
@@ -1,48 +1,45 @@
-btnFileOpen=\u0412\u0438\u0431\u0440\u0430\u0442\u0438 .NSP \u0444\u0430\u0439\u043B\u0438
-btnUpload=\u0412\u0456\u0434\u0456\u0441\u043B\u0430\u0442\u0438 \u0443 NS
-logsEnteredAsMsg1=\u0412\u0438 \u0443\u0432\u0456\u0439\u0448\u043B\u0438 \u044F\u043A: 
-logsEnteredAsMsg2=\u0414\u043B\u044F \u0437\u0430\u043F\u043E\u0431\u0456\u0433\u0430\u043D\u043D\u044F \u043F\u043E\u043C\u0438\u043B\u043E\u043A \u0432\u0438 \u043C\u0430\u0454\u0442\u0435 \u0431\u0443\u0442\u0438 root \u0430\u0431\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0457\u0442\u0438 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 'udev' \u0434\u043B\u044F \u0446\u044C\u043E\u0433\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430.
-logsFilesToUploadTitle=\u0424\u0430\u0439\u043B\u0438 \u0434\u043B\u044F \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0435\u043D\u043D\u044F:
-logsGreetingsMessage=\u041B\u0430\u0441\u043A\u0430\u0432\u043E \u043F\u0440\u043E\u0441\u0438\u043C\u043E \u0434\u043E NS-USBloader
-logsNoFolderFileSelected=\u0424\u0430\u0439\u043B\u0438 \u043D\u0435 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 - \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0443\u0432\u0430\u0442\u0438 \u043D\u0456\u0447\u043E\u0433\u043E.
+btn_OpenFile=\u0412\u0438\u0431\u0440\u0430\u0442\u0438 .NSP \u0444\u0430\u0439\u043B\u0438
+btn_Upload=\u0412\u0456\u0434\u0456\u0441\u043B\u0430\u0442\u0438 \u0443 NS
+tab3_Txt_EnteredAsMsg1=\u0412\u0438 \u0443\u0432\u0456\u0439\u0448\u043B\u0438 \u044F\u043A: 
+tab3_Txt_EnteredAsMsg2=\u0414\u043B\u044F \u0437\u0430\u043F\u043E\u0431\u0456\u0433\u0430\u043D\u043D\u044F \u043F\u043E\u043C\u0438\u043B\u043E\u043A \u0432\u0438 \u043C\u0430\u0454\u0442\u0435 \u0431\u0443\u0442\u0438 root \u0430\u0431\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0457\u0442\u0438 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 'udev' \u0434\u043B\u044F \u0446\u044C\u043E\u0433\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430.
+tab3_Txt_FilesToUploadTitle=\u0424\u0430\u0439\u043B\u0438 \u0434\u043B\u044F \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0435\u043D\u043D\u044F:
+tab3_Txt_GreetingsMessage=\u041B\u0430\u0441\u043A\u0430\u0432\u043E \u043F\u0440\u043E\u0441\u0438\u043C\u043E \u0434\u043E NS-USBloader
+tab3_Txt_NoFolderOrFileSelected=\u0424\u0430\u0439\u043B\u0438 \u043D\u0435 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 - \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0443\u0432\u0430\u0442\u0438 \u043D\u0456\u0447\u043E\u0433\u043E.
 windowBodyConfirmExit=\u0417\u0430\u0440\u0430\u0437 \u0432\u0456\u0434\u0431\u0443\u0432\u0430\u0454\u0442\u044C\u0441\u044F \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0430 \u0434\u0430\u043D\u0438\u0445 \u0456 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043D\u044F \u0434\u043E\u0434\u0430\u0442\u043A\u0443 \u043F\u0440\u0435\u0440\u0432\u0435 \u0457\u0457.\n\u0426\u0435 \u043D\u0430\u0439\u0433\u0456\u0440\u0448\u0435 \u0449\u043E \u0442\u0438 \u043C\u043E\u0436\u0435\u0448 \u0437\u0430\u0440\u0430\u0437 \u0437\u0440\u043E\u0431\u0438\u0442\u0438.\n\u041F\u0440\u0435\u0440\u0432\u0430\u0442\u0438 \u043F\u0440\u043E\u0446\u0435\u0441 \u0456 \u0432\u0438\u0439\u0442\u0438? 
 windowTitleConfirmExit=\u041D\u0456, \u0437\u0443\u043F\u0438\u043D\u0438\u0441\u044C!
-btnStop=\u041F\u0435\u0440\u0435\u0440\u0432\u0430\u0442\u0438
-logsGreetingsMessage2=--\n\
+btn_Stop=\u041F\u0435\u0440\u0435\u0440\u0432\u0430\u0442\u0438
+tab3_Txt_GreetingsMessage2=--\n\
 \u0421\u0438\u0440\u0446\u0435\u0432\u0438\u0439 \u043A\u043E\u0434: https://github.com/developersu/ns-usbloader/\n\
 \u0421\u0430\u0439\u0442: https://developersu.blogspot.com/search/label/NS-USBloader\n\
 \u0418\u0441\u0430\u0454\u043D\u043A\u043E \u0414\u043C\u0438\u0442\u0440\u043E [developer.su]
-windowTitleConfirmWrongPFS0=\u041D\u0435\u0432\u0456\u0440\u043D\u0438\u0439 \u0442\u0438\u043F \u0444\u0430\u0439\u043B\u0443
-windowBodyConfirmWrongPFS0=\u0412\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0444\u0430\u0439\u043B NSP \u043C\u0430\u0454 \u043D\u0435\u0432\u0456\u0440\u043D\u0456 \u0441\u0438\u043C\u0432\u043E\u043B\u0438. \u0421\u043A\u043E\u0440\u0456\u0448\u0435 \u0437\u0430 \u0432\u0441\u0435 \u0432\u0456\u043D \u043F\u043E\u0448\u043A\u043E\u0434\u0436\u0435\u043D\u0438\u0439.\n\
-\u041A\u0440\u0430\u0449\u0435 \u0437\u0443\u043F\u0438\u043D\u0438\u0442\u0438\u0441\u044F \u043F\u0440\u044F\u043C\u043E \u0437\u0430\u0440\u0430\u0437. \u0425\u043E\u0447\u0435\u0448 \u043F\u0440\u043E\u0434\u043E\u0432\u0436\u0438\u0442\u0438 \u043D\u0435 \u0437\u0432\u0430\u0436\u0430\u044E\u0447\u0438 \u043D\u0456 \u043D\u0430 \u0449\u043E?  
-tableStatusLbl=\u0421\u0442\u0430\u043D
-tableFileNameLbl=\u0406\u043C'\u044F \u0444\u0430\u0439\u043B\u0443
-tableSizeLbl=\u0420\u043E\u0437\u043C\u0456\u0440
-tableUploadLbl=\u0417\u0430\u0432\u0430\u043D\u0442\u0430\u0436.?
-contextMenuBtnDelete=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
-contextMenuBtnDeleteAll=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0432\u0441\u0435
-netTabHostIPLbl=IP \u043A\u043E\u043C\u043F'\u044E\u0442\u0435\u0440\u0443
-NSIPlable=NS IP:
-netTabValidateNSHostNameCb=\u0417\u0430\u0432\u0436\u0434\u0438 \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u044F\u0442\u0438 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u0456\u0441\u0442\u044C NS IP.
+tab1_table_Lbl_Status=\u0421\u0442\u0430\u043D
+tab1_table_Lbl_FileName=\u0406\u043C'\u044F \u0444\u0430\u0439\u043B\u0443
+tab1_table_Lbl_Size=\u0420\u043E\u0437\u043C\u0456\u0440
+tab1_table_Lbl_Upload=\u0417\u0430\u0432\u0430\u043D\u0442\u0430\u0436.?
+tab1_table_contextMenu_Btn_BtnDelete=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
+tab1_table_contextMenu_Btn_DeleteAll=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0432\u0441\u0435
+tab2_Lbl_HostIP=IP \u043A\u043E\u043C\u043F'\u044E\u0442\u0435\u0440\u0443
+tab1_Lbl_NSIP=NS IP:
+tab2_Cb_ValidateNSHostName=\u0417\u0430\u0432\u0436\u0434\u0438 \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u044F\u0442\u0438 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u0456\u0441\u0442\u044C NS IP.
 windowTitleBadIp=IP \u0430\u0434\u0440\u0435\u0441\u0430 NS \u0441\u043A\u043E\u0440\u0456\u0448 \u0437\u0430 \u0432\u0441\u0435 \u043D\u0435\u0432\u0456\u0440\u043D\u0430
 windowBodyBadIp=\u0412\u0438 \u0432\u043F\u0435\u0432\u043D\u0435\u043D\u0456 \u0449\u043E IP \u0430\u0434\u0440\u0435\u0441\u0430 NS \u0432\u0432\u0435\u0434\u0435\u043D\u0430 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E?
-netTabExpertModeCb=\u0420\u0435\u0436\u0438\u043C \u0435\u043A\u0441\u043F\u0435\u0440\u0442\u0430
-netTabHostPortLbl=\u043F\u043E\u0440\u0442
-netTabAutoDetectIpCb=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0432\u0438\u0437\u043D\u0430\u0447\u0430\u0442\u0438 IP
-netTabRandSelectPortCb=\u0412\u0438\u0437\u043D\u0430\u0447\u0430\u0442\u0438 \u043F\u043E\u0440\u0442 \u0432\u0438\u043F\u0430\u0434\u043A\u043E\u0432\u0438\u043C \u0447\u0438\u043D\u043E\u043C
-netTabDontServeRequestsCb=\u041D\u0435 \u043E\u0431\u0440\u043E\u0431\u043B\u044F\u0442\u0438 \u0437\u0430\u043F\u0438\u0442\u0438
-netTabDontServeRequestsDescription=\u042F\u043A\u0449\u043E \u0432\u0438\u0431\u0440\u0430\u043D\u043E, \u0442\u043E\u0434\u0456 \u0446\u0435\u0439 \u043A\u043E\u043C\u043F'\u044E\u0442\u0435\u0440 \u043D\u0435 \u0432\u0456\u0434\u043F\u043E\u0432\u0456\u0434\u0430\u0442\u0438\u043C\u0435 \u043D\u0430 \u0437\u0430\u043F\u0438\u0442\u0438 NSP \u0444\u0430\u0439\u043B\u0456\u0432. \u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0432\u0430\u0442\u0438\u043C\u0443\u0442\u044C\u0441\u044F \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0445\u043E\u0441\u0442\u0430 \u0434\u043B\u044F \u0432\u043A\u0430\u0437\u0430\u043D\u043D\u044F TinFoil \u043C\u0456\u0441\u0446\u044F \u0437\u0432\u0456\u0434\u043A\u0438 \u0444\u0430\u0439\u043B\u0438 \u043C\u0430\u044E\u0442\u044C \u0431\u0440\u0430\u0442\u0438\u0441\u044F.
-netTabHostExtraLbl=\u0435\u043A\u0441\u0442\u0440\u0430
+tab2_Cb_ExpertMode=\u0420\u0435\u0436\u0438\u043C \u0435\u043A\u0441\u043F\u0435\u0440\u0442\u0430
+tab2_Lbl_HostPort=\u043F\u043E\u0440\u0442
+tab2_Cb_AutoDetectIp=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0432\u0438\u0437\u043D\u0430\u0447\u0430\u0442\u0438 IP
+tab2_Cb_RandSelectPort=\u0412\u0438\u0437\u043D\u0430\u0447\u0430\u0442\u0438 \u043F\u043E\u0440\u0442 \u0432\u0438\u043F\u0430\u0434\u043A\u043E\u0432\u0438\u043C \u0447\u0438\u043D\u043E\u043C
+tab2_Cb_DontServeRequests=\u041D\u0435 \u043E\u0431\u0440\u043E\u0431\u043B\u044F\u0442\u0438 \u0437\u0430\u043F\u0438\u0442\u0438
+tab2_Lbl_DontServeRequestsDesc=\u042F\u043A\u0449\u043E \u0432\u0438\u0431\u0440\u0430\u043D\u043E, \u0442\u043E\u0434\u0456 \u0446\u0435\u0439 \u043A\u043E\u043C\u043F'\u044E\u0442\u0435\u0440 \u043D\u0435 \u0432\u0456\u0434\u043F\u043E\u0432\u0456\u0434\u0430\u0442\u0438\u043C\u0435 \u043D\u0430 \u0437\u0430\u043F\u0438\u0442\u0438 NSP \u0444\u0430\u0439\u043B\u0456\u0432. \u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0432\u0430\u0442\u0438\u043C\u0443\u0442\u044C\u0441\u044F \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0445\u043E\u0441\u0442\u0430 \u0434\u043B\u044F \u0432\u043A\u0430\u0437\u0430\u043D\u043D\u044F TinFoil \u043C\u0456\u0441\u0446\u044F \u0437\u0432\u0456\u0434\u043A\u0438 \u0444\u0430\u0439\u043B\u0438 \u043C\u0430\u044E\u0442\u044C \u0431\u0440\u0430\u0442\u0438\u0441\u044F.
+tab2_Lbl_HostExtra=\u0435\u043A\u0441\u0442\u0440\u0430
 windowTitleErrorPort=\u041D\u0435\u0432\u0456\u0440\u043D\u043E \u0432\u0438\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0439 \u043F\u043E\u0440\u0442! 
 windowBodyErrorPort=\u041F\u043E\u0440\u0442 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0431\u0443\u0442\u0438 0 \u0430\u0431\u043E \u043F\u0440\u0438\u0432\u0438\u0449\u0443\u0432\u0430\u0442\u0438 65535.
-netTabAutoCheckForUpdates=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u044F\u0442\u0438 \u043D\u0430\u044F\u0432\u043D\u0456\u0441\u0442\u044C \u043E\u043D\u043E\u0432\u043B\u0435\u043D\u044C
+tab2_Cb_AutoCheckForUpdates=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u044F\u0442\u0438 \u043D\u0430\u044F\u0432\u043D\u0456\u0441\u0442\u044C \u043E\u043D\u043E\u0432\u043B\u0435\u043D\u044C
 windowTitleNewVersionAval=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u043D\u043E\u0432\u0430 \u0432\u0435\u0440\u0441\u0456\u044F
 windowTitleNewVersionNOTAval=\u041D\u0435\u043C\u0430\u0454 \u043D\u043E\u0432\u0438\u0445 \u0432\u0435\u0440\u0441\u0456\u0439
 windowTitleNewVersionUnknown=\u041D\u0435\u043C\u043E\u0436\u043B\u0438\u0432\u043E \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u0438\u0442\u0438 \u043D\u0430\u044F\u0432\u043D\u0456\u0441\u0442\u044C \u043D\u043E\u0432\u0438\u0445 \u0432\u0435\u0440\u0441\u0456\u0439
 windowBodyNewVersionNOTAval=\u0412\u0438 \u0432\u0436\u0435 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0454\u0442\u0435 \u043E\u0441\u0442\u0430\u043D\u043D\u044E \u0432\u0435\u0440\u0441\u0456\u044E
 windowBodyNewVersionUnknown=\u0429\u043E\u0441\u044C \u043F\u0456\u0448\u043B\u043E \u043D\u0435 \u0442\u0430\u043A.\n\u041C\u043E\u0436\u043B\u0438\u0432\u043E, \u0456\u043D\u0442\u0435\u0440\u043D\u0435\u0442 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0438\u0439, \u0430\u0431\u043E GitHub \u043D\u0435 \u043F\u0440\u0430\u0446\u044E\u0454.
-netTabAllowXciCb=\u0414\u043E\u0437\u0432\u043E\u043B\u0438\u0442\u0438 \u0432\u0438\u0431\u0456\u0440 XCI \u0444\u0430\u0439\u043B\u0456\u0432 \u0434\u043B\u044F \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u043D\u043D\u044F \u0443 TinFoil
-netTabAllowXciTextField=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0454\u0442\u044C\u0441\u044F \u0434\u0435\u044F\u043A\u0438\u043C\u0438 \u0441\u0442\u043E\u0440\u043E\u043D\u043D\u0456\u043C\u0438 \u0434\u043E\u0434\u0430\u0442\u043A\u0430\u043C\u0438, \u044F\u043A\u0456 \u043F\u0456\u0434\u0442\u0440\u0438\u043C\u0443\u044E\u0442\u044C XCI \u0456 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u044E\u0442\u044C \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0456 TinFoil. \u042F\u043A\u0449\u043E \u043D\u0435 \u0432\u043F\u0435\u0432\u043D\u0435\u043D\u0456 \u2014\u00A0\u043D\u0435 \u0437\u043C\u0456\u043D\u044E\u0439\u0442\u0435.
-netTabLanguage=\u041C\u043E\u0432\u0430
+tab2_Cb_AllowXci=\u0414\u043E\u0437\u0432\u043E\u043B\u0438\u0442\u0438 \u0432\u0438\u0431\u0456\u0440 XCI \u0444\u0430\u0439\u043B\u0456\u0432 \u0434\u043B\u044F \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u043D\u043D\u044F \u0443 TinFoil
+tab2_Lbl_AllowXciDesc=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0454\u0442\u044C\u0441\u044F \u0434\u0435\u044F\u043A\u0438\u043C\u0438 \u0441\u0442\u043E\u0440\u043E\u043D\u043D\u0456\u043C\u0438 \u0434\u043E\u0434\u0430\u0442\u043A\u0430\u043C\u0438, \u044F\u043A\u0456 \u043F\u0456\u0434\u0442\u0440\u0438\u043C\u0443\u044E\u0442\u044C XCI \u0456 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u044E\u0442\u044C \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0456 TinFoil. \u042F\u043A\u0449\u043E \u043D\u0435 \u0432\u043F\u0435\u0432\u043D\u0435\u043D\u0456 \u2014\u00A0\u043D\u0435 \u0437\u043C\u0456\u043D\u044E\u0439\u0442\u0435.
+tab2_Lbl_Language=\u041C\u043E\u0432\u0430
 windowBodyRestartToApplyLang=\u0411\u0443\u0434\u044C \u043B\u0430\u0441\u043A\u0430, \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u0442\u0456\u0442\u044C \u0434\u043E\u0434\u0430\u0442\u043E\u043A \u0449\u043E\u0431 \u0437\u043C\u0456\u043D\u0438 \u0432\u0441\u0442\u0443\u043F\u0438\u043B\u0438 \u0432 \u0441\u0438\u043B\u0443.
-netTabGLshowNSPonly=\u0412\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0430\u0442\u0438 \u0432\u0438\u043A\u043B\u044E\u0447\u043D\u043E *.nsp \u0444\u0430\u0439\u043B\u0438 \u0443 GoldLeaf.
\ No newline at end of file
+tab2_Cb_GLshowNspOnly=\u0412\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0430\u0442\u0438 \u0432\u0438\u043A\u043B\u044E\u0447\u043D\u043E *.nsp \u0444\u0430\u0439\u043B\u0438 \u0443 GoldLeaf.
\ No newline at end of file